From 617bae9f4c7e7d8ef271c9f256a35bd673e49ba9 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 16:35:14 -0600 Subject: [PATCH 001/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-crispr-ruby-prism/.gitattributes | 2 +- gems/ast-crispr-ruby-prism/.kettle-drift.lock | 60 ++- gems/ast-crispr-ruby-prism/Gemfile | 40 ++ gems/ast-crispr-ruby-prism/Gemfile.lock | 17 +- gems/ast-crispr/.gitattributes | 2 +- gems/ast-crispr/.kettle-drift.lock | 60 ++- gems/ast-crispr/.rubocop_gradual.lock | 213 -------- gems/ast-crispr/Gemfile | 40 ++ gems/ast-crispr/Gemfile.lock | 400 +++++++++++++-- gems/ast-merge/Gemfile.lock | 347 ++++++++++++- gems/kettle-jem/Gemfile.lock | 36 +- gems/kettle-jem/bin/kettle-jem-workflow-pins | 2 +- gems/kettle-jem/lib/kettle/jem.rb | 42 +- .../spec/bin/kettle_jem_workflow_pins_spec.rb | 24 + gems/tree_haver/.gitattributes | 2 +- gems/tree_haver/.rubocop_gradual.lock | 465 ------------------ gems/tree_haver/Gemfile | 22 +- gems/tree_haver/Gemfile.lock | 444 ++++++++++++----- gems/tree_haver/Rakefile | 18 +- gems/tree_haver/bin/yard | 2 +- gems/tree_haver/lib/tree_haver/version.rb | 2 +- 21 files changed, 1283 insertions(+), 957 deletions(-) delete mode 100644 gems/ast-crispr/.rubocop_gradual.lock delete mode 100644 gems/tree_haver/.rubocop_gradual.lock diff --git a/gems/ast-crispr-ruby-prism/.gitattributes b/gems/ast-crispr-ruby-prism/.gitattributes index 0ac65aaa7..35a3c7359 100644 --- a/gems/ast-crispr-ruby-prism/.gitattributes +++ b/gems/ast-crispr-ruby-prism/.gitattributes @@ -1,5 +1,5 @@ # <> do not edit below this line -*.rb diff=smorg-ruby +*.rb diff=smorg-rb *.go diff=smorg-go *.rs diff=smorg-rs # <> diff --git a/gems/ast-crispr-ruby-prism/.kettle-drift.lock b/gems/ast-crispr-ruby-prism/.kettle-drift.lock index 1dad17e1d..9878fb8f5 100644 --- a/gems/ast-crispr-ruby-prism/.kettle-drift.lock +++ b/gems/ast-crispr-ruby-prism/.kettle-drift.lock @@ -4,7 +4,8 @@ "file": "Gemfile", "lines": [ 79, - 119 + 119, + 159 ] } ], @@ -13,7 +14,8 @@ "file": "Gemfile", "lines": [ 90, - 130 + 130, + 170 ] } ], @@ -22,7 +24,8 @@ "file": "Gemfile", "lines": [ 80, - 120 + 120, + 160 ] } ], @@ -31,7 +34,8 @@ "file": "Gemfile", "lines": [ 92, - 132 + 132, + 172 ] } ], @@ -40,7 +44,8 @@ "file": "Gemfile", "lines": [ 95, - 135 + 135, + 175 ] } ], @@ -49,7 +54,8 @@ "file": "Gemfile", "lines": [ 81, - 121 + 121, + 161 ] } ], @@ -59,7 +65,8 @@ "lines": [ 59, 99, - 139 + 139, + 179 ] } ], @@ -68,7 +75,8 @@ "file": "Gemfile", "lines": [ 100, - 140 + 140, + 180 ] } ], @@ -78,7 +86,8 @@ "lines": [ 42, 86, - 126 + 126, + 166 ] } ], @@ -87,7 +96,8 @@ "file": "Gemfile", "lines": [ 109, - 149 + 149, + 189 ] } ], @@ -97,7 +107,8 @@ "lines": [ 34, 78, - 118 + 118, + 158 ] } ], @@ -107,7 +118,8 @@ "lines": [ 68, 108, - 148 + 148, + 188 ] } ], @@ -116,7 +128,8 @@ "file": "Gemfile", "lines": [ 84, - 124 + 124, + 164 ] } ], @@ -126,7 +139,8 @@ "lines": [ 47, 91, - 131 + 131, + 171 ] } ], @@ -136,7 +150,8 @@ "lines": [ 43, 87, - 127 + 127, + 167 ] } ], @@ -145,7 +160,8 @@ "file": "Gemfile", "lines": [ 85, - 125 + 125, + 165 ] } ], @@ -154,7 +170,8 @@ "file": "Gemfile", "lines": [ 102, - 142 + 142, + 182 ] } ], @@ -163,7 +180,8 @@ "file": "Gemfile", "lines": [ 101, - 141 + 141, + 181 ] } ], @@ -172,7 +190,8 @@ "file": "Gemfile", "lines": [ 96, - 136 + 136, + 176 ] } ], @@ -181,7 +200,8 @@ "file": "Gemfile", "lines": [ 105, - 145 + 145, + 185 ] } ], diff --git a/gems/ast-crispr-ruby-prism/Gemfile b/gems/ast-crispr-ruby-prism/Gemfile index 871cc8e98..9aa4318a3 100644 --- a/gems/ast-crispr-ruby-prism/Gemfile +++ b/gems/ast-crispr-ruby-prism/Gemfile @@ -151,6 +151,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/ast-crispr-ruby-prism/Gemfile.lock b/gems/ast-crispr-ruby-prism/Gemfile.lock index 95c539be8..dc4c780a5 100644 --- a/gems/ast-crispr-ruby-prism/Gemfile.lock +++ b/gems/ast-crispr-ruby-prism/Gemfile.lock @@ -16,6 +16,14 @@ PATH prism (>= 1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,10 +35,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) ast-merge (7.1.0) benchmark token-resolver (~> 2.0, >= 2.0.4) @@ -102,7 +106,7 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - kettle-dev (2.3.6) + kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) @@ -366,6 +370,7 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + ast-crispr! ast-crispr-ruby-prism! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) @@ -441,7 +446,7 @@ CHECKSUMS io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae + kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 diff --git a/gems/ast-crispr/.gitattributes b/gems/ast-crispr/.gitattributes index 0ac65aaa7..35a3c7359 100644 --- a/gems/ast-crispr/.gitattributes +++ b/gems/ast-crispr/.gitattributes @@ -1,5 +1,5 @@ # <> do not edit below this line -*.rb diff=smorg-ruby +*.rb diff=smorg-rb *.go diff=smorg-go *.rs diff=smorg-rs # <> diff --git a/gems/ast-crispr/.kettle-drift.lock b/gems/ast-crispr/.kettle-drift.lock index 1dad17e1d..9878fb8f5 100644 --- a/gems/ast-crispr/.kettle-drift.lock +++ b/gems/ast-crispr/.kettle-drift.lock @@ -4,7 +4,8 @@ "file": "Gemfile", "lines": [ 79, - 119 + 119, + 159 ] } ], @@ -13,7 +14,8 @@ "file": "Gemfile", "lines": [ 90, - 130 + 130, + 170 ] } ], @@ -22,7 +24,8 @@ "file": "Gemfile", "lines": [ 80, - 120 + 120, + 160 ] } ], @@ -31,7 +34,8 @@ "file": "Gemfile", "lines": [ 92, - 132 + 132, + 172 ] } ], @@ -40,7 +44,8 @@ "file": "Gemfile", "lines": [ 95, - 135 + 135, + 175 ] } ], @@ -49,7 +54,8 @@ "file": "Gemfile", "lines": [ 81, - 121 + 121, + 161 ] } ], @@ -59,7 +65,8 @@ "lines": [ 59, 99, - 139 + 139, + 179 ] } ], @@ -68,7 +75,8 @@ "file": "Gemfile", "lines": [ 100, - 140 + 140, + 180 ] } ], @@ -78,7 +86,8 @@ "lines": [ 42, 86, - 126 + 126, + 166 ] } ], @@ -87,7 +96,8 @@ "file": "Gemfile", "lines": [ 109, - 149 + 149, + 189 ] } ], @@ -97,7 +107,8 @@ "lines": [ 34, 78, - 118 + 118, + 158 ] } ], @@ -107,7 +118,8 @@ "lines": [ 68, 108, - 148 + 148, + 188 ] } ], @@ -116,7 +128,8 @@ "file": "Gemfile", "lines": [ 84, - 124 + 124, + 164 ] } ], @@ -126,7 +139,8 @@ "lines": [ 47, 91, - 131 + 131, + 171 ] } ], @@ -136,7 +150,8 @@ "lines": [ 43, 87, - 127 + 127, + 167 ] } ], @@ -145,7 +160,8 @@ "file": "Gemfile", "lines": [ 85, - 125 + 125, + 165 ] } ], @@ -154,7 +170,8 @@ "file": "Gemfile", "lines": [ 102, - 142 + 142, + 182 ] } ], @@ -163,7 +180,8 @@ "file": "Gemfile", "lines": [ 101, - 141 + 141, + 181 ] } ], @@ -172,7 +190,8 @@ "file": "Gemfile", "lines": [ 96, - 136 + 136, + 176 ] } ], @@ -181,7 +200,8 @@ "file": "Gemfile", "lines": [ 105, - 145 + 145, + 185 ] } ], diff --git a/gems/ast-crispr/.rubocop_gradual.lock b/gems/ast-crispr/.rubocop_gradual.lock deleted file mode 100644 index d920cf89f..000000000 --- a/gems/ast-crispr/.rubocop_gradual.lock +++ /dev/null @@ -1,213 +0,0 @@ -{ - ".simplecov:3928423310": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:918344237": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "ast-crispr.gemspec:2262341056": [ - [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/ast-crispr.rb:247837913": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`ast-crispr.rb`) should use snake_case.", 5381] - ], - "lib/ast/crispr.rb:3730230259": [ - [12, 5, 11, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Error`.", 62528179], - [22, 5, 11, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Limit`.", 51888158], - [47, 7, 622, "Metrics/MethodLength: Method has too many lines. [14/10]", 2816807495], - [61, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], - [65, 7, 1168, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_hash` is too high. [<6, 29, 10> 31.26/17]", 3515286222], - [65, 7, 1168, "Metrics/MethodLength: Method has too many lines. [27/10]", 3515286222], - [90, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3685471369], - [96, 7, 822, "Metrics/AbcSize: Assignment Branch Condition size for `constraint_for_operator` is too high. [<5, 11, 13> 17.75/17]", 1402705503], - [96, 7, 822, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `constraint_for_operator` is too high. [8/7]", 1402705503], - [96, 7, 822, "Metrics/MethodLength: Method has too many lines. [19/10]", 1402705503], - [124, 5, 11, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Match`.", 52676120], - [127, 21, 73, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 344717847], - [172, 5, 18, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::MatchProfile`.", 365273299], - [172, 5, 4350, "Metrics/ClassLength: Class has too many lines. [115/100]", 1575766989], - [273, 7, 596, "Metrics/MethodLength: Method has too many lines. [14/10]", 2070486858], - [314, 5, 24, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::DestinationProfile`.", 3442102524], - [314, 5, 4581, "Metrics/ClassLength: Class has too many lines. [119/100]", 3503477661], - [352, 21, 126, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 931636409], - [417, 7, 667, "Metrics/MethodLength: Method has too many lines. [15/10]", 4004247638], - [460, 5, 27, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::DestinationResolution`.", 1305107769], - [474, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::StructureProfile`.", 614380405], - [512, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::SelectionProfile`.", 2464089216], - [531, 21, 165, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1182500333], - [566, 7, 585, "Metrics/MethodLength: Method has too many lines. [13/10]", 13786997], - [583, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::OperationProfile`.", 1974079861], - [607, 21, 188, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2526147676], - [662, 7, 478, "Metrics/MethodLength: Method has too many lines. [11/10]", 795235914], - [695, 7, 10, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Adapters::Null`.", 3515430288], - [728, 5, 21, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::DocumentContext`.", 594998459], - [788, 5, 19, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::OwnerSelector`.", 3092459999], - [791, 21, 81, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2293822273], - [853, 7, 606, "Metrics/MethodLength: Method has too many lines. [16/10]", 422136278], - [883, 5, 16, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::Selectors`.", 2133324825], - [883, 5, 5586, "Metrics/ModuleLength: Module has too many lines. [130/100]", 3440946513], - [886, 7, 1642, "Metrics/AbcSize: Assignment Branch Condition size for `owner_filter` is too high. [<6, 18, 11> 21.93/17]", 3224577904], - [886, 7, 1642, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `owner_filter` is too high. [10/7]", 3224577904], - [886, 7, 1642, "Metrics/MethodLength: Method has too many lines. [37/10]", 3224577904], - [886, 7, 1642, "Metrics/PerceivedComplexity: Perceived complexity for `owner_filter` is too high. [11/8]", 3224577904], - [886, 23, 135, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3231562627], - [930, 7, 1936, "Metrics/AbcSize: Assignment Branch Condition size for `comment_region_owned_owner` is too high. [<7, 16, 7> 18.81/17]", 2629441148], - [930, 7, 1936, "Metrics/MethodLength: Method has too many lines. [40/10]", 2629441148], - [930, 37, 190, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 4159525724], - [931, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 940069302], - [975, 7, 1731, "Metrics/AbcSize: Assignment Branch Condition size for `line_block` is too high. [<12, 22, 14> 28.71/17]", 1307990669], - [975, 7, 1731, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `line_block` is too high. [12/7]", 1307990669], - [975, 7, 1731, "Metrics/MethodLength: Method has too many lines. [38/10]", 1307990669], - [975, 7, 1731, "Metrics/PerceivedComplexity: Perceived complexity for `line_block` is too high. [12/8]", 1307990669], - [975, 21, 130, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 515174999], - [1027, 5, 23, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::OperationSupport`.", 343849029], - [1027, 5, 6491, "Metrics/ModuleLength: Module has too many lines. [139/100]", 2271788056], - [1072, 7, 1758, "Metrics/AbcSize: Assignment Branch Condition size for `insertion_from` is too high. [<5, 21, 11> 24.23/17]", 29011294], - [1072, 7, 1758, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `insertion_from` is too high. [9/7]", 29011294], - [1072, 7, 1758, "Metrics/MethodLength: Method has too many lines. [28/10]", 29011294], - [1072, 7, 1758, "Metrics/PerceivedComplexity: Perceived complexity for `insertion_from` is too high. [10/8]", 29011294], - [1115, 7, 827, "Metrics/AbcSize: Assignment Branch Condition size for `splice_after_anchor` is too high. [<4, 19, 2> 19.52/17]", 14691010], - [1115, 7, 827, "Metrics/MethodLength: Method has too many lines. [16/10]", 14691010], - [1119, 9, 72, "Style/RaiseArgs: Provide an exception class and message as arguments to `raise`.", 789091243], - [1121, 23, 72, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 2503424841], - [1153, 9, 25, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 768340433], - [1197, 5, 26, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::OperationProfilable`.", 4114431854], - [1206, 7, 19, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::OperationProfilable::ClassMethods`.", 3606528253], - [1218, 5, 13, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Replace`.", 1563590855], - [1243, 7, 643, "Metrics/AbcSize: Assignment Branch Condition size for `call` is too high. [<10, 32, 3> 33.66/17]", 3656683885], - [1243, 7, 643, "Metrics/MethodLength: Method has too many lines. [14/10]", 3656683885], - [1262, 5, 12, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Delete`.", 2011475922], - [1286, 7, 538, "Metrics/AbcSize: Assignment Branch Condition size for `call` is too high. [<7, 21, 1> 22.16/17]", 2655200768], - [1286, 7, 538, "Metrics/MethodLength: Method has too many lines. [13/10]", 2655200768], - [1304, 5, 12, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Insert`.", 1590185308], - [1338, 5, 10, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Move`.", 3515667002], - [1366, 7, 1182, "Metrics/AbcSize: Assignment Branch Condition size for `call` is too high. [<14, 40, 7> 42.95/17]", 172197360], - [1366, 7, 1182, "Metrics/MethodLength: Method has too many lines. [22/10]", 172197360], - [1383, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2688172402], - [1396, 3, 13, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr`.", 315644438], - [1396, 3, 12758, "Metrics/ModuleLength: Module has too many lines. [180/100]", 2662313186], - [1397, 5, 33, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::ProfileReportCompatibility`.", 3039519892], - [1419, 5, 18, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::MatchProfile`.", 365273299], - [1431, 7, 28, "Lint/DuplicateMethods: Method `Ast::Crispr::MatchProfile#normalize_start_boundary` is defined at both lib/ast/crispr.rb:292 and lib/ast/crispr.rb:1431.", 2362701855], - [1435, 7, 26, "Lint/DuplicateMethods: Method `Ast::Crispr::MatchProfile#normalize_end_boundary` is defined at both lib/ast/crispr.rb:299 and lib/ast/crispr.rb:1435.", 2613594544], - [1439, 7, 26, "Lint/DuplicateMethods: Method `Ast::Crispr::MatchProfile#normalize_payload_kind` is defined at both lib/ast/crispr.rb:306 and lib/ast/crispr.rb:1439.", 2604742721], - [1444, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::SelectionProfile`.", 2464089216], - [1466, 7, 14, "Lint/DuplicateMethods: Method `Ast::Crispr::SelectionProfile#initialize` is defined at both lib/ast/crispr.rb:531 and lib/ast/crispr.rb:1466.", 956205738], - [1466, 7, 773, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `initialize` is too high. [8/7]", 771809109], - [1466, 7, 773, "Metrics/MethodLength: Method has too many lines. [11/10]", 771809109], - [1466, 21, 190, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 4167448336], - [1481, 7, 1286, "Metrics/AbcSize: Assignment Branch Condition size for `report` is too high. [<5, 29, 13> 32.17/17]", 1720478959], - [1481, 7, 1286, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report` is too high. [11/7]", 1720478959], - [1481, 7, 1286, "Metrics/MethodLength: Method has too many lines. [17/10]", 1720478959], - [1481, 7, 1286, "Metrics/PerceivedComplexity: Perceived complexity for `report` is too high. [11/8]", 1720478959], - [1496, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 1470192175], - [1520, 5, 24, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::DestinationProfile`.", 3442102524], - [1534, 7, 29, "Lint/DuplicateMethods: Method `Ast::Crispr::DestinationProfile#normalize_resolution_kind` is defined at both lib/ast/crispr.rb:437 and lib/ast/crispr.rb:1534.", 99310177], - [1538, 7, 31, "Lint/DuplicateMethods: Method `Ast::Crispr::DestinationProfile#normalize_resolution_source` is defined at both lib/ast/crispr.rb:444 and lib/ast/crispr.rb:1538.", 1692065396], - [1542, 7, 29, "Lint/DuplicateMethods: Method `Ast::Crispr::DestinationProfile#normalize_anchor_boundary` is defined at both lib/ast/crispr.rb:452 and lib/ast/crispr.rb:1542.", 3028754726], - [1547, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::OperationProfile`.", 1974079861], - [1550, 7, 733, "Metrics/MethodLength: Method has too many lines. [13/10]", 2619513218], - [1570, 7, 25, "Lint/DuplicateMethods: Method `Ast::Crispr::OperationProfile#normalize_requirement` is defined at both lib/ast/crispr.rb:678 and lib/ast/crispr.rb:1570.", 440444039], - [1574, 7, 32, "Lint/DuplicateMethods: Method `Ast::Crispr::OperationProfile#normalize_replacement_source` is defined at both lib/ast/crispr.rb:686 and lib/ast/crispr.rb:1574.", 3533021156], - [1579, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::StructureProfile`.", 614380405], - [1595, 5, 6309, "Metrics/ClassLength: Class has too many lines. [172/100]", 1270437788], - [1600, 7, 2717, "Metrics/MethodLength: Method has too many lines. [67/10]", 1469599129], - [1665, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 259030389], - [1678, 28, 247, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3385598543], - [1710, 28, 242, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1038219895] - ], - "lib/ast/crispr/rspec/shared_examples/destination_profile.rb:2529475135": [ - [3, 1, 2386, "Metrics/BlockLength: Block has too many lines. [28/25]", 2846758965], - [4, 3, 2311, "Metrics/BlockLength: Block has too many lines. [26/25]", 2123267236] - ], - "lib/ast/crispr/rspec/shared_examples/match_profile.rb:2566447993": [ - [3, 1, 1997, "Metrics/BlockLength: Block has too many lines. [26/25]", 1032277788] - ], - "lib/ast/crispr/rspec/shared_examples/operation_profile.rb:3583567850": [ - [3, 1, 2148, "Metrics/BlockLength: Block has too many lines. [26/25]", 2745151209] - ], - "spec/old_runtime_spec.rb:1564590841": [ - [3, 1, 17728, "Metrics/BlockLength: Block has too many lines. [383/25]", 205400157], - [4, 3, 69, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3712453399], - [5, 3, 68, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1429320782], - [6, 3, 59, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 253007150], - [8, 3, 891, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 361389624], - [18, 37, 11, "Lint/UnusedMethodArgument: Unused method argument - `owner_scope`.", 3846606321], - [22, 46, 6, "Lint/UnusedMethodArgument: Unused method argument - `region`.", 2124512157], - [22, 64, 11, "Lint/UnusedMethodArgument: Unused method argument - `owner_scope`.", 3846606321], - [73, 3, 8534, "Metrics/BlockLength: Block has too many lines. [176/25]", 3042299525], - [313, 3, 3640, "Metrics/BlockLength: Block has too many lines. [72/25]", 1133370152], - [418, 3, 1663, "Metrics/BlockLength: Block has too many lines. [41/25]", 115074475] - ] -} diff --git a/gems/ast-crispr/Gemfile b/gems/ast-crispr/Gemfile index 2ebdddbb1..5c4f95a0c 100644 --- a/gems/ast-crispr/Gemfile +++ b/gems/ast-crispr/Gemfile @@ -151,6 +151,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/ast-crispr/Gemfile.lock b/gems/ast-crispr/Gemfile.lock index 72148c0bf..609b5a080 100644 --- a/gems/ast-crispr/Gemfile.lock +++ b/gems/ast-crispr/Gemfile.lock @@ -16,6 +16,280 @@ PATH service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.0) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +301,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +309,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -48,7 +323,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -104,15 +378,6 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -131,6 +396,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -275,22 +541,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -324,11 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -376,22 +638,44 @@ DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-drift! + kettle-jem! + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -400,18 +684,26 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -419,20 +711,34 @@ CHECKSUMS appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -445,19 +751,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae + kettle-drift (1.0.5) + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.0) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -472,10 +786,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -483,6 +801,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -510,18 +829,19 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -535,14 +855,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -550,6 +875,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ast-merge/Gemfile.lock b/gems/ast-merge/Gemfile.lock index 822e1aad1..7854c7383 100644 --- a/gems/ast-merge/Gemfile.lock +++ b/gems/ast-merge/Gemfile.lock @@ -17,6 +17,263 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -36,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -99,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -127,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -266,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -318,11 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -369,23 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -394,31 +684,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -426,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -438,19 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -465,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -476,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -503,9 +830,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -514,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -527,14 +858,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -542,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/kettle-jem/Gemfile.lock b/gems/kettle-jem/Gemfile.lock index ad7a65291..200a066cc 100644 --- a/gems/kettle-jem/Gemfile.lock +++ b/gems/kettle-jem/Gemfile.lock @@ -28,7 +28,7 @@ PATH yaml-merge (= 7.1.0) 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.0) ast-crispr (= 7.1.0) @@ -36,7 +36,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-crispr (= 7.1.0) @@ -44,7 +44,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -53,7 +53,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge specs: bash-merge (7.1.0) ast-merge (= 7.1.0) @@ -61,7 +61,7 @@ PATH version_gem (~> 1.1, >= 1.1.14) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge specs: citrus-toml-merge (7.1.0) toml-merge (= 7.1.0) @@ -69,7 +69,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) commonmarker (~> 2.2) @@ -77,7 +77,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-merge (= 7.1.0) @@ -85,7 +85,7 @@ PATH version_gem (~> 1.1, >= 1.1.14) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: json-merge (7.1.0) ast-merge (= 7.1.0) @@ -93,7 +93,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) kramdown (~> 2.5) @@ -101,7 +101,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-merge (= 7.1.0) @@ -109,7 +109,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) markdown-merge (= 7.1.0) @@ -117,7 +117,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) prism (~> 1.6) @@ -125,7 +125,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-merge (= 7.1.0) @@ -134,7 +134,7 @@ PATH yaml-merge (= 7.1.0) 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.0) ast-merge (= 7.1.0) @@ -143,7 +143,7 @@ PATH version_gem (~> 1.1, >= 1.1.14) 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.0) ast-merge (= 7.1.0) @@ -151,7 +151,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: toml-merge (7.1.0) ast-merge (= 7.1.0) @@ -159,7 +159,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) citrus (~> 3.0) @@ -168,7 +168,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: yaml-merge (7.1.0) ast-merge (= 7.1.0) diff --git a/gems/kettle-jem/bin/kettle-jem-workflow-pins b/gems/kettle-jem/bin/kettle-jem-workflow-pins index 937b7e433..f27dc1ebf 100755 --- a/gems/kettle-jem/bin/kettle-jem-workflow-pins +++ b/gems/kettle-jem/bin/kettle-jem-workflow-pins @@ -14,7 +14,7 @@ class KettleJemWorkflowPins VALID_UPGRADE_LEVELS = %w[major minor patch].freeze DEFAULT_UPGRADE_LEVEL = "major" DEFAULT_PROJECT_ROOT = File.expand_path("..", __dir__) - PIN_PATTERN = %r{(([-\w.]+/[-\w.]+(?:/[-\w.]+)*)@[0-9a-f]{40}\s*#\s*\S+)} + PIN_PATTERN = %r{(([-\w.]+/[-\w.]+(?:/[-\w.]+)*)@[0-9a-f]{40}[ \t]*#[ \t]*[^\s"',]+)} def initialize(project_root:, env: ENV, options: {}) @project_root = File.expand_path(project_root) diff --git a/gems/kettle-jem/lib/kettle/jem.rb b/gems/kettle-jem/lib/kettle/jem.rb index f53119ddd..d9a0516f9 100644 --- a/gems/kettle-jem/lib/kettle/jem.rb +++ b/gems/kettle-jem/lib/kettle/jem.rb @@ -13936,7 +13936,7 @@ def synchronize_github_actions_ci(content, facts) "", " steps:", " - name: Checkout #{package.fetch(:name)}", - " uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + " uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0", "", *github_actions_setup_ruby_steps(indent: " ").lines(chomp: true), "", @@ -14006,7 +14006,7 @@ def synchronize_github_actions_framework_ci(content, facts) "", " steps:", " - name: Checkout", - " uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + " uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0", "", *github_actions_setup_ruby_steps(indent: " ").lines(chomp: true), "", @@ -14143,10 +14143,10 @@ def synchronize_github_actions_coverage_ci(content, facts) "", " steps:", " - name: Checkout", - " uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + " uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0", "", " - name: Setup Ruby & RubyGems", - " uses: ruby/setup-ruby@003a5c4d8d6321bd302e38f6f0ec593f77f06600 # v1.319.0 + " uses: ruby/setup-ruby@003a5c4d8d6321bd302e38f6f0ec593f77f06600 # v1.319.0", " with:", " ruby-version: \"${{ matrix.ruby }}\"", " rubygems: \"${{ matrix.rubygems }}\"", @@ -14582,23 +14582,23 @@ def yaml_mapping_value_node(content, key, node_class) def github_actions_step_pins { - "actions/checkout" => "actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 - "actions/cache" => "actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 - "ruby/setup-ruby" => "ruby/setup-ruby@003a5c4d8d6321bd302e38f6f0ec593f77f06600 # v1.319.0 - "coverallsapp/github-action" => "coverallsapp/github-action@5cbfd81b66ca5d10c19b062c04de0199c215fb6e # v2.3.7 - "qltysh/qlty-action/coverage" => "qltysh/qlty-action/coverage@08a0a862c159eae9b9003081da6663d96efef637 # v2.3.0 - "codecov/codecov-action" => "codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7 - "irongut/CodeCoverageSummary" => "irongut/CodeCoverageSummary@51cc3a756ddcd398d447c044c02cb6aa83fdae95 # v1.3.0 - "marocchino/sticky-pull-request-comment" => "marocchino/sticky-pull-request-comment@5770ad5eb8f42dd2c4f34da00c94c5381e49af88 # v3.0.5 - "actions/upload-artifact" => "actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 - "amancevice/setup-code-climate" => "amancevice/setup-code-climate@0daf2985a225e8ac15975b4d233010e94d65b76a # v2 - "actions/dependency-review-action" => "actions/dependency-review-action@a1d282b36b6f3519aa1f3fc636f609c47dddb294 # v5.0.0 - "github/codeql-action/init" => "github/codeql-action/init@7188fc363630916deb702c7fdcf4e481b751f97a # v4.37.1 - "github/codeql-action/autobuild" => "github/codeql-action/autobuild@7188fc363630916deb702c7fdcf4e481b751f97a # v4.37.1 - "github/codeql-action/analyze" => "github/codeql-action/analyze@7188fc363630916deb702c7fdcf4e481b751f97a # v4.37.1 - "pozil/auto-assign-issue" => "pozil/auto-assign-issue@af6beea6bdf1e8eb373f061c5bc168681fc6d011 # v4.0.1 - "apache/skywalking-eyes/dependency" => "apache/skywalking-eyes/dependency@61275cc80d0798a405cb070f7d3a8aaf7cf2c2c1 # v0.8.0 - "sarisia/actions-status-discord" => "sarisia/actions-status-discord@eb045afee445dc055c18d3d90bd0f244fd062708 # v1.16.0 + "actions/checkout" => "actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0", + "actions/cache" => "actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0", + "ruby/setup-ruby" => "ruby/setup-ruby@003a5c4d8d6321bd302e38f6f0ec593f77f06600 # v1.319.0", + "coverallsapp/github-action" => "coverallsapp/github-action@5cbfd81b66ca5d10c19b062c04de0199c215fb6e # v2.3.7", + "qltysh/qlty-action/coverage" => "qltysh/qlty-action/coverage@08a0a862c159eae9b9003081da6663d96efef637 # v2.3.0", + "codecov/codecov-action" => "codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7", + "irongut/CodeCoverageSummary" => "irongut/CodeCoverageSummary@51cc3a756ddcd398d447c044c02cb6aa83fdae95 # v1.3.0", + "marocchino/sticky-pull-request-comment" => "marocchino/sticky-pull-request-comment@5770ad5eb8f42dd2c4f34da00c94c5381e49af88 # v3.0.5", + "actions/upload-artifact" => "actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1", + "amancevice/setup-code-climate" => "amancevice/setup-code-climate@0daf2985a225e8ac15975b4d233010e94d65b76a # v2", + "actions/dependency-review-action" => "actions/dependency-review-action@a1d282b36b6f3519aa1f3fc636f609c47dddb294 # v5.0.0", + "github/codeql-action/init" => "github/codeql-action/init@7188fc363630916deb702c7fdcf4e481b751f97a # v4.37.1", + "github/codeql-action/autobuild" => "github/codeql-action/autobuild@7188fc363630916deb702c7fdcf4e481b751f97a # v4.37.1", + "github/codeql-action/analyze" => "github/codeql-action/analyze@7188fc363630916deb702c7fdcf4e481b751f97a # v4.37.1", + "pozil/auto-assign-issue" => "pozil/auto-assign-issue@af6beea6bdf1e8eb373f061c5bc168681fc6d011 # v4.0.1", + "apache/skywalking-eyes/dependency" => "apache/skywalking-eyes/dependency@61275cc80d0798a405cb070f7d3a8aaf7cf2c2c1 # v0.8.0", + "sarisia/actions-status-discord" => "sarisia/actions-status-discord@eb045afee445dc055c18d3d90bd0f244fd062708 # v1.16.0" } end diff --git a/gems/kettle-jem/spec/bin/kettle_jem_workflow_pins_spec.rb b/gems/kettle-jem/spec/bin/kettle_jem_workflow_pins_spec.rb index 059f2460d..5a11fc24b 100644 --- a/gems/kettle-jem/spec/bin/kettle_jem_workflow_pins_spec.rb +++ b/gems/kettle-jem/spec/bin/kettle_jem_workflow_pins_spec.rb @@ -65,6 +65,30 @@ expect(File.read(workflow_path)).to include("uses: #{new_pin}") end + it "preserves Ruby source delimiters around pins when writing updates" do + File.write(pin_index_path, <<~RUBY) + def generated_workflow + [ + " uses: #{old_pin}", + "" + ] + end + + def github_actions_step_pins + { + "actions/checkout" => "#{old_pin}" + } + end + RUBY + + result = described_class.new(project_root: project_root, options: {write: true}).run + updated = File.read(pin_index_path) + + expect(result[:updated_actions]).to eq(["actions/checkout"]) + expect(updated).to include(%(" uses: #{new_pin}",)) + expect(updated).to include(%("actions/checkout" => "#{new_pin}")) + end + it "updates sub-action pins when kettle-gha-sha-pins reports the parent action repository" do sub_action = "github/codeql-action/init" old_sub_pin = "#{sub_action}@#{old_sha} # v4.36.0" diff --git a/gems/tree_haver/.gitattributes b/gems/tree_haver/.gitattributes index 0ac65aaa7..35a3c7359 100644 --- a/gems/tree_haver/.gitattributes +++ b/gems/tree_haver/.gitattributes @@ -1,5 +1,5 @@ # <> do not edit below this line -*.rb diff=smorg-ruby +*.rb diff=smorg-rb *.go diff=smorg-go *.rs diff=smorg-rs # <> diff --git a/gems/tree_haver/.rubocop_gradual.lock b/gems/tree_haver/.rubocop_gradual.lock deleted file mode 100644 index 66df63bfc..000000000 --- a/gems/tree_haver/.rubocop_gradual.lock +++ /dev/null @@ -1,465 +0,0 @@ -{ - ".simplecov:3575099246": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Gemfile:1933889768": [ - [28, 1, 59, "Lint/EmptyConditionalBody: Avoid `if` branches without a body.", 4279378582] - ], - "Rakefile:1868927885": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/tree_haver.rb:1043643469": [ - [48, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465], - [48, 1, 14703, "Metrics/ModuleLength: Module has too many lines. [395/100]", 2758907023], - [66, 3, 566, "Metrics/MethodLength: Method has too many lines. [12/10]", 1536513137], - [123, 3, 272, "Metrics/MethodLength: Method has too many lines. [11/10]", 505877912], - [155, 3, 543, "Metrics/MethodLength: Method has too many lines. [14/10]", 3733215372], - [220, 3, 458, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `backend_module` is too high. [9/7]", 73937708], - [220, 3, 458, "Metrics/MethodLength: Method has too many lines. [12/10]", 73937708], - [220, 3, 458, "Metrics/PerceivedComplexity: Perceived complexity for `backend_module` is too high. [9/8]", 73937708], - [256, 3, 1024, "Metrics/AbcSize: Assignment Branch Condition size for `register_language` is too high. [<0, 20, 10> 22.36/17]", 53014028], - [256, 3, 1024, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `register_language` is too high. [11/7]", 53014028], - [256, 3, 1024, "Metrics/MethodLength: Method has too many lines. [12/10]", 53014028], - [256, 3, 1024, "Metrics/PerceivedComplexity: Perceived complexity for `register_language` is too high. [11/8]", 53014028], - [256, 24, 150, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 893242366], - [281, 3, 1355, "Metrics/AbcSize: Assignment Branch Condition size for `parser_for` is too high. [<11, 25, 13> 30.25/17]", 4004028797], - [281, 3, 1355, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parser_for` is too high. [14/7]", 4004028797], - [281, 3, 1355, "Metrics/MethodLength: Method has too many lines. [27/10]", 4004028797], - [281, 3, 1355, "Metrics/PerceivedComplexity: Perceived complexity for `parser_for` is too high. [14/8]", 4004028797], - [320, 3, 2089, "Metrics/MethodLength: Method has too many lines. [51/10]", 2791676388], - [374, 3, 565, "Metrics/AbcSize: Assignment Branch Condition size for `requested_backend_type` is too high. [<3, 16, 8> 18.14/17]", 2317624457], - [374, 3, 565, "Metrics/MethodLength: Method has too many lines. [12/10]", 2317624457], - [392, 3, 696, "Metrics/MethodLength: Method has too many lines. [14/10]", 307274721], - [470, 3, 425, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `backend_module_for` is too high. [9/7]", 3448932255], - [470, 3, 425, "Metrics/MethodLength: Method has too many lines. [20/10]", 3448932255] - ], - "lib/tree_haver/backend_api.rb:3354059061": [ - [30, 3, 12181, "Metrics/ModuleLength: Module has too many lines. [243/100]", 205645546], - [139, 5, 8882, "Metrics/ClassLength: Class has too many lines. [180/100]", 4281605197], - [145, 7, 1502, "Metrics/AbcSize: Assignment Branch Condition size for `validate` is too high. [<4, 22, 10> 24.49/17]", 747017743], - [145, 7, 1502, "Metrics/MethodLength: Method has too many lines. [31/10]", 747017743], - [145, 7, 1502, "Metrics/PerceivedComplexity: Perceived complexity for `validate` is too high. [11/8]", 747017743], - [213, 7, 903, "Metrics/MethodLength: Method has too many lines. [24/10]", 3041411230], - [261, 7, 1271, "Metrics/AbcSize: Assignment Branch Condition size for `validate_capabilities_hash` is too high. [<7, 27, 7> 28.76/17]", 3965262932], - [261, 7, 1271, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_capabilities_hash` is too high. [8/7]", 3965262932], - [261, 7, 1271, "Metrics/MethodLength: Method has too many lines. [25/10]", 3965262932], - [277, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2253399502], - [296, 7, 908, "Metrics/AbcSize: Assignment Branch Condition size for `validate_language` is too high. [<6, 17, 4> 18.47/17]", 733551867], - [315, 7, 797, "Metrics/AbcSize: Assignment Branch Condition size for `validate_parser` is too high. [<5, 16, 7> 18.17/17]", 1229041751], - [315, 7, 797, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_parser` is too high. [8/7]", 1229041751], - [315, 7, 797, "Metrics/MethodLength: Method has too many lines. [15/10]", 1229041751], - [349, 7, 862, "Metrics/AbcSize: Assignment Branch Condition size for `validate_node_class` is too high. [<8, 18, 8> 21.26/17]", 1873188195], - [349, 7, 862, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_node_class` is too high. [8/7]", 1873188195], - [349, 7, 862, "Metrics/MethodLength: Method has too many lines. [20/10]", 1873188195], - [349, 7, 862, "Metrics/PerceivedComplexity: Perceived complexity for `validate_node_class` is too high. [9/8]", 1873188195], - [375, 11, 20, "Naming/PredicatePrefix: Rename `has_method_or_alias?` to `method_or_alias?`.", 285116235] - ], - "lib/tree_haver/backend_context.rb:159197618": [ - [3, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465] - ], - "lib/tree_haver/backend_registry.rb:4046212912": [ - [4, 3, 22, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver::BackendRegistry`.", 733935278], - [4, 3, 5121, "Metrics/ModuleLength: Module has too many lines. [152/100]", 1483988260], - [39, 5, 382, "Metrics/MethodLength: Method has too many lines. [11/10]", 2000730238], - [48, 16, 1, "Style/DoubleNegation: Avoid the use of double negation (`!!`).", 177540], - [55, 5, 889, "Metrics/AbcSize: Assignment Branch Condition size for `register_tag` is too high. [<5, 20, 5> 21.21/17]", 2276764069], - [55, 5, 889, "Metrics/MethodLength: Method has too many lines. [18/10]", 2276764069], - [105, 5, 397, "Metrics/MethodLength: Method has too many lines. [11/10]", 4007185633] - ], - "lib/tree_haver/backends/citrus.rb:3181984499": [ - [40, 9, 449, "Metrics/MethodLength: Method has too many lines. [11/10]", 1138819533], - [173, 11, 1133, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [11/7]", 2613019266], - [173, 11, 1133, "Metrics/MethodLength: Method has too many lines. [16/10]", 2613019266], - [173, 11, 1133, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [11/8]", 2613019266], - [230, 9, 597, "Metrics/MethodLength: Method has too many lines. [12/10]", 3923424594], - [403, 9, 810, "Metrics/AbcSize: Assignment Branch Condition size for `structural?` is too high. [<3, 19, 8> 20.83/17]", 3166173256], - [403, 9, 810, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structural?` is too high. [9/7]", 3166173256], - [403, 9, 810, "Metrics/MethodLength: Method has too many lines. [12/10]", 3166173256], - [403, 9, 810, "Metrics/PerceivedComplexity: Perceived complexity for `structural?` is too high. [9/8]", 3166173256], - [436, 9, 1272, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_type_from_event` is too high. [9/7]", 2022108773], - [436, 9, 1272, "Metrics/MethodLength: Method has too many lines. [16/10]", 2022108773], - [436, 9, 1272, "Metrics/PerceivedComplexity: Perceived complexity for `extract_type_from_event` is too high. [10/8]", 2022108773], - [460, 11, 207, "Style/CaseLikeIf: Convert `if-elsif` to `case-when`.", 1995588659], - [476, 61, 10, "Style/NumericPredicate: Use `offset.positive?` instead of `offset > 0`.", 2454414278] - ], - "lib/tree_haver/backends/ffi.rb:691415497": [ - [83, 9, 853, "Metrics/MethodLength: Method has too many lines. [15/10]", 1876257977], - [147, 7, 7352, "Metrics/ModuleLength: Module has too many lines. [111/100]", 4125377349], - [148, 9, 7320, "Metrics/ClassLength: Class has too many lines. [109/100]", 1130902814], - [183, 11, 559, "Metrics/MethodLength: Method has too many lines. [11/10]", 678018999], - [232, 11, 4265, "Metrics/AbcSize: Assignment Branch Condition size for `try_load!` is too high. [<11, 40, 10> 42.67/17]", 2312962113], - [232, 11, 4265, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `try_load!` is too high. [10/7]", 2312962113], - [232, 11, 4265, "Metrics/MethodLength: Method has too many lines. [58/10]", 2312962113], - [232, 11, 4265, "Metrics/PerceivedComplexity: Perceived complexity for `try_load!` is too high. [11/8]", 2312962113], - [260, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2086221887], - [262, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2163360042], - [367, 9, 312, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `<=>` is too high. [8/7]", 2433292528], - [437, 11, 4377, "Metrics/AbcSize: Assignment Branch Condition size for `from_library` is too high. [<16, 30, 18> 38.47/17]", 3403850855], - [437, 11, 4377, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [17/7]", 3403850855], - [437, 11, 4377, "Metrics/MethodLength: Method has too many lines. [43/10]", 3403850855], - [437, 11, 4377, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [19/8]", 3403850855], - [437, 47, 4, "Lint/UnusedMethodArgument: Unused method argument - `name`.", 2087876002], - [502, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2415433817], - [554, 9, 3159, "Metrics/AbcSize: Assignment Branch Condition size for `language=` is too high. [<4, 44, 11> 45.53/17]", 1815427493], - [554, 9, 3159, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `language=` is too high. [10/7]", 1815427493], - [554, 9, 3159, "Metrics/MethodLength: Method has too many lines. [40/10]", 1815427493], - [554, 9, 3159, "Metrics/PerceivedComplexity: Perceived complexity for `language=` is too high. [10/8]", 1815427493], - [715, 7, 10494, "Metrics/ClassLength: Class has too many lines. [129/100]", 3710916551], - [744, 45, 9, "Style/NumericPredicate: Use `index.negative?` instead of `index < 0`.", 4215255415], - [807, 13, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183], - [889, 21, 9, "Style/NumericPredicate: Use `index.negative?` instead of `index < 0`.", 4215255415], - [933, 9, 694, "Metrics/AbcSize: Assignment Branch Condition size for `descendant_for_point_range` is too high. [<7, 21, 5> 22.69/17]", 979329510], - [953, 9, 706, "Metrics/AbcSize: Assignment Branch Condition size for `named_descendant_for_point_range` is too high. [<7, 21, 5> 22.69/17]", 2494446138] - ], - "lib/tree_haver/backends/java.rb:3360169733": [ - [134, 7, 815, "Metrics/AbcSize: Assignment Branch Condition size for `configure_native_library_path!` is too high. [<4, 17, 6> 18.47/17]", 1362415302], - [227, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3409700051], - [260, 7, 9885, "Metrics/ClassLength: Class has too many lines. [114/100]", 136252046], - [292, 9, 312, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `<=>` is too high. [8/7]", 2433292528], - [340, 11, 4098, "Metrics/AbcSize: Assignment Branch Condition size for `from_library` is too high. [<19, 32, 14> 39.76/17]", 3050250526], - [340, 11, 4098, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [14/7]", 3050250526], - [340, 11, 4098, "Metrics/MethodLength: Method has too many lines. [48/10]", 3050250526], - [340, 11, 4098, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [16/8]", 3050250526], - [426, 11, 2084, "Metrics/AbcSize: Assignment Branch Condition size for `load_by_name` is too high. [<11, 17, 6> 21.12/17]", 226213748], - [426, 11, 2084, "Metrics/MethodLength: Method has too many lines. [35/10]", 226213748], - [542, 9, 1016, "Metrics/MethodLength: Method has too many lines. [17/10]", 4123264427], - [649, 9, 702, "Metrics/MethodLength: Method has too many lines. [14/10]", 1334016319], - [649, 17, 89, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3152137646], - [728, 9, 583, "Metrics/MethodLength: Method has too many lines. [11/10]", 2457478600], - [816, 13, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183] - ], - "lib/tree_haver/backends/mri.rb:863330290": [ - [59, 9, 916, "Metrics/MethodLength: Method has too many lines. [15/10]", 749971754], - [179, 9, 312, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `<=>` is too high. [8/7]", 2433292528], - [232, 11, 1562, "Metrics/MethodLength: Method has too many lines. [11/10]", 3858647816] - ], - "lib/tree_haver/backends/parslet.rb:4170691266": [ - [41, 9, 323, "Metrics/MethodLength: Method has too many lines. [11/10]", 694290592], - [108, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193340030], - [172, 11, 1133, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [11/7]", 2613019266], - [172, 11, 1133, "Metrics/MethodLength: Method has too many lines. [16/10]", 2613019266], - [172, 11, 1133, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [11/8]", 2613019266], - [246, 9, 591, "Metrics/MethodLength: Method has too many lines. [12/10]", 3007454066], - [335, 7, 6287, "Metrics/ClassLength: Class has too many lines. [155/100]", 3100555518], - [362, 9, 452, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `start_byte` is too high. [8/7]", 2663206926], - [362, 9, 452, "Metrics/MethodLength: Method has too many lines. [12/10]", 2663206926], - [380, 9, 557, "Metrics/MethodLength: Method has too many lines. [12/10]", 2982914846], - [443, 9, 404, "Metrics/MethodLength: Method has too many lines. [11/10]", 1111982079], - [495, 61, 10, "Style/NumericPredicate: Use `offset.positive?` instead of `offset > 0`.", 2454414278], - [501, 9, 313, "Metrics/MethodLength: Method has too many lines. [13/10]", 1927903077], - [519, 9, 448, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_first_slice` is too high. [8/7]", 229178429], - [519, 9, 448, "Metrics/MethodLength: Method has too many lines. [16/10]", 229178429], - [524, 17, 11, "Style/HashEachMethods: Use `each_value` instead of `values.each`.", 236538172], - [539, 9, 461, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_last_slice` is too high. [8/7]", 3960808114], - [539, 9, 461, "Metrics/MethodLength: Method has too many lines. [16/10]", 3960808114] - ], - "lib/tree_haver/backends/prism.rb:265399087": [ - [39, 9, 448, "Metrics/MethodLength: Method has too many lines. [11/10]", 2383415890], - [70, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 721867551], - [71, 9, 712, "Metrics/MethodLength: Method has too many lines. [12/10]", 1576927704], - [145, 41, 6, "Lint/UnusedMethodArgument: Unused method argument - `symbol`.", 2153517219], - [182, 9, 554, "Metrics/MethodLength: Method has too many lines. [16/10]", 3452414947], - [250, 13, 11, "Naming/PredicatePrefix: Rename `has_errors?` to `errors?`.", 1181419252], - [275, 69, 27, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1979346241], - [301, 13, 64, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1942915391], - [305, 9, 519, "Metrics/AbcSize: Assignment Branch Condition size for `classify_comment_hint` is too high. [<5, 20, 5> 21.21/17]", 869270335], - [485, 13, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183], - [554, 24, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] - ], - "lib/tree_haver/backends/psych.rb:1528613408": [ - [30, 9, 448, "Metrics/MethodLength: Method has too many lines. [11/10]", 2367418678], - [59, 9, 601, "Metrics/MethodLength: Method has too many lines. [11/10]", 2824278890], - [342, 9, 901, "Metrics/AbcSize: Assignment Branch Condition size for `extract_text_from_location` is too high. [<8, 23, 18> 30.28/17]", 1252700264], - [342, 9, 901, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_text_from_location` is too high. [14/7]", 1252700264], - [342, 9, 901, "Metrics/MethodLength: Method has too many lines. [22/10]", 1252700264], - [342, 9, 901, "Metrics/PerceivedComplexity: Perceived complexity for `extract_text_from_location` is too high. [16/8]", 1252700264] - ], - "lib/tree_haver/backends/rust.rb:3784474048": [ - [52, 9, 548, "Metrics/MethodLength: Method has too many lines. [15/10]", 3791803966], - [156, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548] - ], - "lib/tree_haver/base/comment.rb:699160654": [ - [10, 5, 8183, "Metrics/ClassLength: Class has too many lines. [152/100]", 4001235397] - ], - "lib/tree_haver/base/node.rb:586469776": [ - [36, 5, 7668, "Metrics/ClassLength: Class has too many lines. [156/100]", 171773185], - [162, 11, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183], - [208, 27, 8, "Style/NumericPredicate: Use `cmp.zero?` instead of `cmp == 0`.", 736104011], - [239, 7, 888, "Metrics/AbcSize: Assignment Branch Condition size for `source_position` is too high. [<6, 20, 12> 24.08/17]", 3968023659], - [239, 7, 888, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `source_position` is too high. [9/7]", 3968023659], - [239, 7, 888, "Metrics/MethodLength: Method has too many lines. [28/10]", 3968023659], - [239, 7, 888, "Metrics/PerceivedComplexity: Perceived complexity for `source_position` is too high. [13/8]", 3968023659], - [306, 7, 355, "Metrics/MethodLength: Method has too many lines. [11/10]", 1012295608] - ], - "lib/tree_haver/base/tree.rb:3081630142": [ - [89, 15, 145, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1155535733], - [103, 11, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183] - ], - "lib/tree_haver/citrus_grammar_finder.rb:2540014236": [ - [31, 3, 7013, "Metrics/ClassLength: Class has too many lines. [102/100]", 245808593], - [66, 5, 3770, "Metrics/AbcSize: Assignment Branch Condition size for `available?` is too high. [<16, 52, 21> 58.32/17]", 3886463212], - [66, 5, 3770, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `available?` is too high. [22/7]", 3886463212], - [66, 5, 3770, "Metrics/MethodLength: Method has too many lines. [50/10]", 3886463212], - [66, 5, 3770, "Metrics/PerceivedComplexity: Perceived complexity for `available?` is too high. [22/8]", 3886463212], - [94, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858894] - ], - "lib/tree_haver/contracts.rb:1759652181": [ - [3, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465], - [3, 1, 30217, "Metrics/ModuleLength: Module has too many lines. [1005/100]", 1179515902], - [91, 5, 732, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 18, 2> 18.11/17]", 3031678572], - [91, 5, 732, "Metrics/MethodLength: Method has too many lines. [17/10]", 3031678572], - [170, 5, 697, "Metrics/MethodLength: Method has too many lines. [18/10]", 389212725], - [231, 5, 507, "Metrics/MethodLength: Method has too many lines. [13/10]", 2631332781], - [351, 5, 580, "Metrics/MethodLength: Method has too many lines. [13/10]", 2166080747], - [580, 5, 558, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 17, 4> 17.46/17]", 2109105399], - [580, 5, 558, "Metrics/MethodLength: Method has too many lines. [18/10]", 2109105399], - [632, 3, 780, "Metrics/AbcSize: Assignment Branch Condition size for `library_path_errors` is too high. [<3, 20, 10> 22.56/17]", 1003454820], - [632, 3, 780, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `library_path_errors` is too high. [10/7]", 1003454820], - [632, 3, 780, "Metrics/MethodLength: Method has too many lines. [14/10]", 1003454820], - [632, 3, 780, "Metrics/PerceivedComplexity: Perceived complexity for `library_path_errors` is too high. [10/8]", 1003454820], - [674, 3, 686, "Metrics/MethodLength: Method has too many lines. [16/10]", 2530945134], - [696, 3, 483, "Metrics/MethodLength: Method has too many lines. [15/10]", 3654427448], - [715, 3, 511, "Metrics/MethodLength: Method has too many lines. [16/10]", 145071639], - [792, 5, 384, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 19, 6> 19.92/17]", 1287649270], - [863, 5, 449, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [10/7]", 1722332092], - [863, 5, 449, "Metrics/PerceivedComplexity: Perceived complexity for `to_h` is too high. [10/8]", 1722332092], - [895, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177610], - [896, 5, 420, "Metrics/MethodLength: Method has too many lines. [12/10]", 722580369], - [936, 42, 8, "Lint/StructNewOverride: `:entries` member overrides `Struct#entries` and it may be unexpected.", 999966509], - [959, 3, 473, "Metrics/MethodLength: Method has too many lines. [18/10]", 1284459726], - [980, 3, 655, "Metrics/AbcSize: Assignment Branch Condition size for `byte_offset_for_point` is too high. [<7, 25, 14> 29.5/17]", 1278853347], - [980, 3, 655, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `byte_offset_for_point` is too high. [9/7]", 1278853347], - [980, 3, 655, "Metrics/MethodLength: Method has too many lines. [17/10]", 1278853347], - [980, 3, 655, "Metrics/PerceivedComplexity: Perceived complexity for `byte_offset_for_point` is too high. [10/8]", 1278853347] - ], - "lib/tree_haver/grammar_finder.rb:3769422606": [ - [55, 3, 13963, "Metrics/ClassLength: Class has too many lines. [213/100]", 842233610], - [120, 5, 516, "Metrics/AbcSize: Assignment Branch Condition size for `search_paths` is too high. [<6, 15, 6> 17.23/17]", 2953596940], - [120, 5, 516, "Metrics/MethodLength: Method has too many lines. [15/10]", 2953596940], - [160, 5, 1737, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_library_path` is too high. [8/7]", 4164717952], - [160, 5, 1737, "Metrics/MethodLength: Method has too many lines. [25/10]", 4164717952], - [272, 7, 845, "Metrics/MethodLength: Method has too many lines. [12/10]", 916567473], - [333, 5, 479, "Metrics/MethodLength: Method has too many lines. [13/10]", 309140318], - [352, 5, 805, "Metrics/MethodLength: Method has too many lines. [11/10]", 667615068], - [389, 5, 1028, "Metrics/MethodLength: Method has too many lines. [22/10]", 3088457603] - ], - "lib/tree_haver/kaitai_backend.rb:335397596": [ - [3, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465] - ], - "lib/tree_haver/language.rb:2775049278": [ - [39, 3, 12087, "Metrics/ModuleLength: Module has too many lines. [115/100]", 221887443], - [40, 5, 12061, "Metrics/ClassLength: Class has too many lines. [113/100]", 309443185], - [89, 7, 1966, "Metrics/AbcSize: Assignment Branch Condition size for `from_library` is too high. [<4, 20, 10> 22.72/17]", 980659500], - [89, 7, 1966, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [9/7]", 980659500], - [89, 7, 1966, "Metrics/MethodLength: Method has too many lines. [31/10]", 980659500], - [89, 7, 1966, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [11/8]", 980659500], - [114, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177538], - [156, 7, 4289, "Metrics/AbcSize: Assignment Branch Condition size for `method_missing` is too high. [<10, 39, 30> 50.21/17]", 1314689525], - [156, 7, 4289, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `method_missing` is too high. [24/7]", 1314689525], - [156, 7, 4289, "Metrics/MethodLength: Method has too many lines. [56/10]", 1314689525], - [156, 7, 4289, "Metrics/PerceivedComplexity: Perceived complexity for `method_missing` is too high. [26/8]", 1314689525], - [274, 7, 786, "Metrics/MethodLength: Method has too many lines. [12/10]", 3697766033] - ], - "lib/tree_haver/language_pack.rb:3634605947": [ - [6, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465], - [6, 1, 10559, "Metrics/ModuleLength: Module has too many lines. [285/100]", 1485243593], - [47, 3, 1095, "Metrics/AbcSize: Assignment Branch Condition size for `parse_with_language_pack` is too high. [<5, 25, 3> 25.67/17]", 2100474993], - [47, 3, 1095, "Metrics/MethodLength: Method has too many lines. [20/10]", 2100474993], - [72, 3, 1420, "Metrics/AbcSize: Assignment Branch Condition size for `process_with_language_pack` is too high. [<5, 31, 3> 31.54/17]", 3796531166], - [72, 3, 1420, "Metrics/MethodLength: Method has too many lines. [27/10]", 3796531166], - [110, 3, 708, "Metrics/AbcSize: Assignment Branch Condition size for `language_pack_result_hash` is too high. [<4, 22, 8> 23.75/17]", 3436019149], - [110, 3, 708, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `language_pack_result_hash` is too high. [9/7]", 3436019149], - [110, 3, 708, "Metrics/MethodLength: Method has too many lines. [14/10]", 3436019149], - [110, 3, 708, "Metrics/PerceivedComplexity: Perceived complexity for `language_pack_result_hash` is too high. [9/8]", 3436019149], - [165, 3, 403, "Metrics/MethodLength: Method has too many lines. [11/10]", 1836909640], - [180, 3, 398, "Metrics/MethodLength: Method has too many lines. [11/10]", 2881064520], - [247, 3, 436, "Metrics/MethodLength: Method has too many lines. [13/10]", 4289517332], - [265, 3, 508, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_typescript_import` is too high. [<6, 14, 10> 18.22/17]", 4201027767], - [265, 3, 508, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_typescript_import` is too high. [9/7]", 4201027767], - [265, 3, 508, "Metrics/MethodLength: Method has too many lines. [11/10]", 4201027767], - [265, 3, 508, "Metrics/PerceivedComplexity: Perceived complexity for `normalize_typescript_import` is too high. [10/8]", 4201027767], - [312, 20, 2, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 5861217] - ], - "lib/tree_haver/language_registry.rb:3950096220": [ - [83, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861089] - ], - "lib/tree_haver/library_path_utils.rb:1552423902": [ - [32, 5, 861, "Metrics/MethodLength: Method has too many lines. [12/10]", 1638068630] - ], - "lib/tree_haver/node.rb:715762930": [ - [62, 3, 16601, "Metrics/ClassLength: Class has too many lines. [237/100]", 2290466920], - [136, 5, 708, "Metrics/AbcSize: Assignment Branch Condition size for `start_point` is too high. [<2, 19, 7> 20.35/17]", 2066418249], - [136, 5, 708, "Metrics/MethodLength: Method has too many lines. [17/10]", 2066418249], - [161, 5, 694, "Metrics/AbcSize: Assignment Branch Condition size for `end_point` is too high. [<2, 19, 7> 20.35/17]", 2127773446], - [161, 5, 694, "Metrics/MethodLength: Method has too many lines. [17/10]", 2127773446], - [232, 5, 948, "Metrics/AbcSize: Assignment Branch Condition size for `text` is too high. [<1, 14, 11> 17.83/17]", 748349201], - [232, 5, 948, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `text` is too high. [9/7]", 748349201], - [232, 5, 948, "Metrics/MethodLength: Method has too many lines. [16/10]", 748349201], - [232, 5, 948, "Metrics/PerceivedComplexity: Perceived complexity for `text` is too high. [11/8]", 748349201], - [259, 9, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183], - [328, 5, 994, "Metrics/AbcSize: Assignment Branch Condition size for `named_child` is too high. [<6, 13, 10> 17.46/17]", 3449163117], - [328, 5, 994, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `named_child` is too high. [9/7]", 3449163117], - [328, 5, 994, "Metrics/MethodLength: Method has too many lines. [21/10]", 3449163117], - [328, 5, 994, "Metrics/PerceivedComplexity: Perceived complexity for `named_child` is too high. [10/8]", 3449163117], - [366, 5, 734, "Metrics/MethodLength: Method has too many lines. [15/10]", 3099919150], - [425, 7, 4, "Style/EmptyElse: Redundant `else`-clause.", 2087423834] - ], - "lib/tree_haver/parser.rb:1959976510": [ - [71, 3, 15231, "Metrics/ClassLength: Class has too many lines. [181/100]", 2262931609], - [84, 5, 938, "Metrics/MethodLength: Method has too many lines. [13/10]", 569209133], - [116, 5, 844, "Metrics/MethodLength: Method has too many lines. [11/10]", 3700471369], - [141, 5, 583, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `backend` is too high. [9/7]", 942469984], - [141, 5, 583, "Metrics/MethodLength: Method has too many lines. [20/10]", 942469984], - [237, 5, 1114, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_string` is too high. [8/7]", 2146281390], - [237, 5, 1114, "Metrics/MethodLength: Method has too many lines. [16/10]", 2146281390], - [237, 5, 1114, "Metrics/PerceivedComplexity: Perceived complexity for `parse_string` is too high. [10/8]", 2146281390], - [273, 5, 1162, "Metrics/AbcSize: Assignment Branch Condition size for `switch_backend_for_language` is too high. [<10, 11, 11> 18.49/17]", 3918477333], - [273, 5, 1162, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `switch_backend_for_language` is too high. [11/7]", 3918477333], - [273, 5, 1162, "Metrics/MethodLength: Method has too many lines. [26/10]", 3918477333], - [273, 5, 1162, "Metrics/PerceivedComplexity: Perceived complexity for `switch_backend_for_language` is too high. [9/8]", 3918477333], - [320, 5, 3598, "Metrics/AbcSize: Assignment Branch Condition size for `unwrap_language` is too high. [<4, 32, 32> 45.43/17]", 2683894777], - [320, 5, 3598, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `unwrap_language` is too high. [29/7]", 2683894777], - [320, 5, 3598, "Metrics/MethodLength: Method has too many lines. [55/10]", 2683894777], - [320, 5, 3598, "Metrics/PerceivedComplexity: Perceived complexity for `unwrap_language` is too high. [23/8]", 2683894777], - [414, 5, 892, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `try_reload_language_for_backend` is too high. [9/7]", 1872419716], - [414, 5, 892, "Metrics/MethodLength: Method has too many lines. [14/10]", 1872419716], - [414, 5, 892, "Metrics/PerceivedComplexity: Perceived complexity for `try_reload_language_for_backend` is too high. [9/8]", 1872419716] - ], - "lib/tree_haver/parslet_grammar_finder.rb:756779364": [ - [32, 3, 6418, "Metrics/ClassLength: Class has too many lines. [105/100]", 2916347470], - [67, 5, 2630, "Metrics/AbcSize: Assignment Branch Condition size for `available?` is too high. [<14, 39, 19> 45.59/17]", 1827795944], - [67, 5, 2630, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `available?` is too high. [20/7]", 1827795944], - [67, 5, 2630, "Metrics/MethodLength: Method has too many lines. [43/10]", 1827795944], - [67, 5, 2630, "Metrics/PerceivedComplexity: Perceived complexity for `available?` is too high. [20/8]", 1827795944] - ], - "lib/tree_haver/path_validator.rb:1827441298": [ - [31, 3, 11571, "Metrics/ModuleLength: Module has too many lines. [133/100]", 3916793077], - [71, 5, 1048, "Metrics/AbcSize: Assignment Branch Condition size for `trusted_directories` is too high. [<4, 16, 5> 17.23/17]", 2683168069], - [71, 5, 1048, "Metrics/MethodLength: Method has too many lines. [13/10]", 2683168069], - [182, 5, 1000, "Metrics/AbcSize: Assignment Branch Condition size for `safe_library_path?` is too high. [<1, 15, 15> 21.24/17]", 3331427816], - [182, 5, 1000, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `safe_library_path?` is too high. [15/7]", 3331427816], - [182, 5, 1000, "Metrics/MethodLength: Method has too many lines. [11/10]", 3331427816], - [182, 5, 1000, "Metrics/PerceivedComplexity: Perceived complexity for `safe_library_path?` is too high. [15/8]", 3331427816], - [314, 5, 911, "Metrics/AbcSize: Assignment Branch Condition size for `validation_errors` is too high. [<2, 21, 13> 24.78/17]", 1249065882], - [314, 5, 911, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validation_errors` is too high. [13/7]", 1249065882], - [314, 5, 911, "Metrics/MethodLength: Method has too many lines. [14/10]", 1249065882], - [314, 5, 911, "Metrics/PerceivedComplexity: Perceived complexity for `validation_errors` is too high. [13/8]", 1249065882], - [345, 9, 20, "Naming/PredicatePrefix: Rename `has_valid_extension?` to `valid_extension?`.", 2041908655] - ], - "lib/tree_haver/peg_backends.rb:2882446693": [ - [3, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465], - [37, 3, 611, "Metrics/MethodLength: Method has too many lines. [21/10]", 2394303132], - [39, 11, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [61, 3, 377, "Metrics/MethodLength: Method has too many lines. [13/10]", 1137341195] - ], - "lib/tree_haver/rspec/dependency_tags.rb:2954930617": [ - [7, 5, 21, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver::RSpec::DependencyTags`.", 2626933713] - ], - "lib/tree_haver/tree.rb:3332079774": [ - [129, 5, 1443, "Metrics/AbcSize: Assignment Branch Condition size for `edit` is too high. [<8, 18, 7> 20.9/17]", 4208399016], - [129, 5, 1443, "Metrics/MethodLength: Method has too many lines. [24/10]", 4208399016], - [129, 13, 89, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3152137646] - ], - "spec/backend_registry_spec.rb:2685433903": [ - [5, 1, 2560, "Metrics/BlockLength: Block has too many lines. [49/25]", 3697376763] - ], - "spec/fixtures_integration_spec.rb:433811098": [ - [3, 1, 49194, "Metrics/BlockLength: Block has too many lines. [1024/25]", 2138474637], - [108, 3, 1282, "Metrics/BlockLength: Block has too many lines. [29/25]", 505243730], - [141, 3, 1840, "Metrics/BlockLength: Block has too many lines. [35/25]", 1365684528], - [180, 3, 1365, "Metrics/BlockLength: Block has too many lines. [33/25]", 1597100003], - [247, 3, 2110, "Metrics/BlockLength: Block has too many lines. [41/25]", 219204301], - [294, 3, 2166, "Metrics/BlockLength: Block has too many lines. [27/25]", 2219571348], - [354, 3, 1786, "Metrics/BlockLength: Block has too many lines. [30/25]", 1655451032], - [432, 3, 1345, "Metrics/BlockLength: Block has too many lines. [26/25]", 1188499098], - [534, 3, 3250, "Metrics/BlockLength: Block has too many lines. [64/25]", 2852118886], - [589, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 2115564430], - [602, 3, 752, "Metrics/AbcSize: Assignment Branch Condition size for `normalized_tree_node` is too high. [<0, 19, 4> 19.42/17]", 1725197185], - [602, 3, 752, "Metrics/MethodLength: Method has too many lines. [18/10]", 1725197185], - [623, 3, 850, "Metrics/AbcSize: Assignment Branch Condition size for `backend_capability` is too high. [<0, 20, 0> 20/17]", 3278569026], - [623, 3, 850, "Metrics/MethodLength: Method has too many lines. [14/10]", 3278569026], - [640, 3, 744, "Metrics/MethodLength: Method has too many lines. [13/10]", 1675624229], - [679, 3, 492, "Metrics/MethodLength: Method has too many lines. [11/10]", 4123526878], - [714, 3, 566, "Metrics/AbcSize: Assignment Branch Condition size for `parse_error_tolerance` is too high. [<1, 17, 1> 17.06/17]", 933590597], - [714, 3, 566, "Metrics/MethodLength: Method has too many lines. [14/10]", 933590597], - [739, 3, 2652, "Metrics/BlockLength: Block has too many lines. [47/25]", 214520278], - [997, 3, 1160, "Metrics/BlockLength: Block has too many lines. [36/25]", 728731748], - [1106, 7, 87, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3860036845], - [1112, 7, 60, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1411318317] - ], - "tree_haver.gemspec:665267582": [ - [16, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1512975621], - [129, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [146, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [147, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [154, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ] -} diff --git a/gems/tree_haver/Gemfile b/gems/tree_haver/Gemfile index ffa800806..999620d43 100644 --- a/gems/tree_haver/Gemfile +++ b/gems/tree_haver/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source 'https://gem.coop' +source "https://gem.coop" git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,8 +19,8 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ['~> 1.0', '>= 1.0.8'] -gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ["~> 1.0", ">= 1.0.8"] +gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 # Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = @@ -29,25 +29,25 @@ if !tslp_declared_by_templating && tslp_dev.to_s.empty? end # Modular sibling dependencies (env-switched inside each modular Gemfile) -eval_gemfile 'gemfiles/modular/templating.gemfile' +eval_gemfile "gemfiles/modular/templating.gemfile" # Debugging -eval_gemfile 'gemfiles/modular/debug.gemfile' +eval_gemfile "gemfiles/modular/debug.gemfile" # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile 'gemfiles/modular/coverage.gemfile' +eval_gemfile "gemfiles/modular/coverage.gemfile" # Linting -eval_gemfile 'gemfiles/modular/style.gemfile' +eval_gemfile "gemfiles/modular/style.gemfile" # Documentation -eval_gemfile 'gemfiles/modular/documentation.gemfile' +eval_gemfile "gemfiles/modular/documentation.gemfile" # Optional -eval_gemfile 'gemfiles/modular/optional.gemfile' +eval_gemfile "gemfiles/modular/optional.gemfile" ### Std Lib Extracted Gems -eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' +eval_gemfile "gemfiles/modular/x_std_libs.gemfile" # See unlocked_deps appraisal for more details on irb inclusion -gem 'irb', '~> 1.17' # ruby >= 2.7 +gem "irb", "~> 1.17" # ruby >= 2.7 diff --git a/gems/tree_haver/Gemfile.lock b/gems/tree_haver/Gemfile.lock index bc820a4ea..030a8301c 100644 --- a/gems/tree_haver/Gemfile.lock +++ b/gems/tree_haver/Gemfile.lock @@ -7,59 +7,303 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -GEM - remote: https://gem.coop/ +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - ansi (1.6.0) - appraisal2 (3.1.4) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - ast (2.4.3) - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) ast-crispr-markdown-markly (7.1.0) ast-crispr (= 7.1.0) markly-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) prism (>= 1.0) version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: ast-merge (7.1.0) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) - backports (3.25.3) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: bash-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.0) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + +GEM + remote: https://gem.coop/ + specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + ansi (1.6.0) + appraisal2 (3.1.4) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + 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) citrus (3.0.2) - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) cmdparse (3.0.7) commonmarker (2.9.0-aarch64-linux) commonmarker (2.9.0-aarch64-linux-musl) commonmarker (2.9.0-arm64-darwin) commonmarker (2.9.0-x86_64-linux) commonmarker (2.9.0-x86_64-linux-musl) - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -68,11 +312,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -122,52 +361,12 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) kettle-dev (2.3.6) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -181,24 +380,12 @@ GEM turbo_tests2 (~> 3.1, >= 3.1.12) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) 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.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -224,18 +411,9 @@ GEM prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) psych (5.4.0) date stringio - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -244,11 +422,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) rdoc (6.17.0) erb psych (>= 4.0.0) @@ -344,10 +517,6 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -356,22 +525,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -407,10 +572,6 @@ GEM version_gem (~> 1.1, >= 1.1.13) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) @@ -434,10 +595,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.13) - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) yard (0.9.45) yard-fence (0.9.6) rdoc (>= 6.11, < 8) @@ -470,24 +627,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem (>= 7.0) - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-drift! + kettle-jem! + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -496,20 +674,27 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml (~> 0.3) + toml-merge! toml-rb (~> 4.1) tree_haver! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -520,10 +705,13 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) @@ -540,7 +728,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -554,16 +741,17 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.0) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -587,6 +775,8 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 @@ -630,15 +820,15 @@ 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -661,6 +851,7 @@ CHECKSUMS tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) sha256=ad6743a373eeac954c1b659b17af3aff1c82918b3ce9c9dc572a7c70ff843cdd tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -673,6 +864,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/tree_haver/Rakefile b/gems/tree_haver/Rakefile index ab2dc23d9..0a3c6f7a9 100644 --- a/gems/tree_haver/Rakefile +++ b/gems/tree_haver/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require 'kettle/drift' + require "kettle/drift" Kettle::Drift.install_tasks rescue LoadError - desc('(stub) kettle:drift:check is unavailable') - task('kettle:drift:check') do + desc("(stub) kettle:drift:check is unavailable") + task("kettle:drift:check") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:update is unavailable') - task('kettle:drift:update') do + desc("(stub) kettle:drift:update is unavailable") + task("kettle:drift:update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:force_update is unavailable') - task('kettle:drift:force_update') do + desc("(stub) kettle:drift:force_update is unavailable") + task("kettle:drift:force_update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift is unavailable') - task('kettle:drift' => 'kettle:drift:update') + desc("(stub) kettle:drift is unavailable") + task("kettle:drift" => "kettle:drift:update") end ### TEMPLATING TASKS diff --git a/gems/tree_haver/bin/yard b/gems/tree_haver/bin/yard index 5d516ad6f..a7e8b6eed 100755 --- a/gems/tree_haver/bin/yard +++ b/gems/tree_haver/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec('bundle', 'exec', 'rake', 'yard') +exec("bundle", "exec", "rake", "yard") diff --git a/gems/tree_haver/lib/tree_haver/version.rb b/gems/tree_haver/lib/tree_haver/version.rb index 43365bf4e..9bd0db819 100644 --- a/gems/tree_haver/lib/tree_haver/version.rb +++ b/gems/tree_haver/lib/tree_haver/version.rb @@ -2,7 +2,7 @@ module TreeHaver module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end From 24ef8e089c002142114ffd45a8a492fa89ccd4cd Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 16:35:20 -0600 Subject: [PATCH 002/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-crispr-ruby-prism/Gemfile.lock | 331 ++++++++++++++- gems/ast-crispr/.rubocop_gradual.lock | 213 ++++++++++ gems/ast-crispr/Gemfile.lock | 389 ++---------------- gems/ast-merge/.kettle-drift.lock | 60 ++- gems/ast-merge/Gemfile | 70 +++- gems/ast-merge/README.md | 1 + gems/ast-merge/Rakefile | 18 +- gems/ast-merge/lib/ast/merge/version.rb | 2 +- gems/tree_haver/.rubocop_gradual.lock | 465 ++++++++++++++++++++++ gems/tree_haver/Gemfile | 22 +- gems/tree_haver/Rakefile | 18 +- gems/tree_haver/bin/yard | 2 +- gems/tree_haver/lib/tree_haver/version.rb | 2 +- 13 files changed, 1163 insertions(+), 430 deletions(-) create mode 100644 gems/ast-crispr/.rubocop_gradual.lock create mode 100644 gems/tree_haver/.rubocop_gradual.lock diff --git a/gems/ast-crispr-ruby-prism/Gemfile.lock b/gems/ast-crispr-ruby-prism/Gemfile.lock index dc4c780a5..97f9b1499 100644 --- a/gems/ast-crispr-ruby-prism/Gemfile.lock +++ b/gems/ast-crispr-ruby-prism/Gemfile.lock @@ -16,6 +16,256 @@ PATH prism (>= 1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: @@ -35,11 +285,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -48,6 +293,8 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -111,6 +358,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -139,6 +388,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-x86_64-linux-gnu) racc (~> 1.4) @@ -324,11 +574,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -371,23 +621,44 @@ DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -396,18 +667,26 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -415,14 +694,23 @@ CHECKSUMS appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -430,6 +718,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -442,19 +731,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-x86_64-linux-gnu) sha256=379fae440b28915e3f19d752ce2dcf8465ed2b2fbefd2a7ca0dd497bc981a06a nokogiri (1.19.4-x86_64-linux-musl) sha256=17dfb7c1fa194ae02fbf7c51a7afc8d278045ab3fdacfd86f91d02d7b274470b @@ -465,10 +762,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -476,6 +777,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -503,9 +805,11 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -515,6 +819,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -528,14 +833,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -543,6 +853,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ast-crispr/.rubocop_gradual.lock b/gems/ast-crispr/.rubocop_gradual.lock new file mode 100644 index 000000000..d920cf89f --- /dev/null +++ b/gems/ast-crispr/.rubocop_gradual.lock @@ -0,0 +1,213 @@ +{ + ".simplecov:3928423310": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:918344237": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "ast-crispr.gemspec:2262341056": [ + [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/ast-crispr.rb:247837913": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`ast-crispr.rb`) should use snake_case.", 5381] + ], + "lib/ast/crispr.rb:3730230259": [ + [12, 5, 11, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Error`.", 62528179], + [22, 5, 11, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Limit`.", 51888158], + [47, 7, 622, "Metrics/MethodLength: Method has too many lines. [14/10]", 2816807495], + [61, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], + [65, 7, 1168, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_hash` is too high. [<6, 29, 10> 31.26/17]", 3515286222], + [65, 7, 1168, "Metrics/MethodLength: Method has too many lines. [27/10]", 3515286222], + [90, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3685471369], + [96, 7, 822, "Metrics/AbcSize: Assignment Branch Condition size for `constraint_for_operator` is too high. [<5, 11, 13> 17.75/17]", 1402705503], + [96, 7, 822, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `constraint_for_operator` is too high. [8/7]", 1402705503], + [96, 7, 822, "Metrics/MethodLength: Method has too many lines. [19/10]", 1402705503], + [124, 5, 11, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Match`.", 52676120], + [127, 21, 73, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 344717847], + [172, 5, 18, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::MatchProfile`.", 365273299], + [172, 5, 4350, "Metrics/ClassLength: Class has too many lines. [115/100]", 1575766989], + [273, 7, 596, "Metrics/MethodLength: Method has too many lines. [14/10]", 2070486858], + [314, 5, 24, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::DestinationProfile`.", 3442102524], + [314, 5, 4581, "Metrics/ClassLength: Class has too many lines. [119/100]", 3503477661], + [352, 21, 126, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 931636409], + [417, 7, 667, "Metrics/MethodLength: Method has too many lines. [15/10]", 4004247638], + [460, 5, 27, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::DestinationResolution`.", 1305107769], + [474, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::StructureProfile`.", 614380405], + [512, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::SelectionProfile`.", 2464089216], + [531, 21, 165, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1182500333], + [566, 7, 585, "Metrics/MethodLength: Method has too many lines. [13/10]", 13786997], + [583, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::OperationProfile`.", 1974079861], + [607, 21, 188, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2526147676], + [662, 7, 478, "Metrics/MethodLength: Method has too many lines. [11/10]", 795235914], + [695, 7, 10, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Adapters::Null`.", 3515430288], + [728, 5, 21, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::DocumentContext`.", 594998459], + [788, 5, 19, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::OwnerSelector`.", 3092459999], + [791, 21, 81, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2293822273], + [853, 7, 606, "Metrics/MethodLength: Method has too many lines. [16/10]", 422136278], + [883, 5, 16, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::Selectors`.", 2133324825], + [883, 5, 5586, "Metrics/ModuleLength: Module has too many lines. [130/100]", 3440946513], + [886, 7, 1642, "Metrics/AbcSize: Assignment Branch Condition size for `owner_filter` is too high. [<6, 18, 11> 21.93/17]", 3224577904], + [886, 7, 1642, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `owner_filter` is too high. [10/7]", 3224577904], + [886, 7, 1642, "Metrics/MethodLength: Method has too many lines. [37/10]", 3224577904], + [886, 7, 1642, "Metrics/PerceivedComplexity: Perceived complexity for `owner_filter` is too high. [11/8]", 3224577904], + [886, 23, 135, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3231562627], + [930, 7, 1936, "Metrics/AbcSize: Assignment Branch Condition size for `comment_region_owned_owner` is too high. [<7, 16, 7> 18.81/17]", 2629441148], + [930, 7, 1936, "Metrics/MethodLength: Method has too many lines. [40/10]", 2629441148], + [930, 37, 190, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 4159525724], + [931, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 940069302], + [975, 7, 1731, "Metrics/AbcSize: Assignment Branch Condition size for `line_block` is too high. [<12, 22, 14> 28.71/17]", 1307990669], + [975, 7, 1731, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `line_block` is too high. [12/7]", 1307990669], + [975, 7, 1731, "Metrics/MethodLength: Method has too many lines. [38/10]", 1307990669], + [975, 7, 1731, "Metrics/PerceivedComplexity: Perceived complexity for `line_block` is too high. [12/8]", 1307990669], + [975, 21, 130, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 515174999], + [1027, 5, 23, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::OperationSupport`.", 343849029], + [1027, 5, 6491, "Metrics/ModuleLength: Module has too many lines. [139/100]", 2271788056], + [1072, 7, 1758, "Metrics/AbcSize: Assignment Branch Condition size for `insertion_from` is too high. [<5, 21, 11> 24.23/17]", 29011294], + [1072, 7, 1758, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `insertion_from` is too high. [9/7]", 29011294], + [1072, 7, 1758, "Metrics/MethodLength: Method has too many lines. [28/10]", 29011294], + [1072, 7, 1758, "Metrics/PerceivedComplexity: Perceived complexity for `insertion_from` is too high. [10/8]", 29011294], + [1115, 7, 827, "Metrics/AbcSize: Assignment Branch Condition size for `splice_after_anchor` is too high. [<4, 19, 2> 19.52/17]", 14691010], + [1115, 7, 827, "Metrics/MethodLength: Method has too many lines. [16/10]", 14691010], + [1119, 9, 72, "Style/RaiseArgs: Provide an exception class and message as arguments to `raise`.", 789091243], + [1121, 23, 72, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 2503424841], + [1153, 9, 25, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 768340433], + [1197, 5, 26, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::OperationProfilable`.", 4114431854], + [1206, 7, 19, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::OperationProfilable::ClassMethods`.", 3606528253], + [1218, 5, 13, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Replace`.", 1563590855], + [1243, 7, 643, "Metrics/AbcSize: Assignment Branch Condition size for `call` is too high. [<10, 32, 3> 33.66/17]", 3656683885], + [1243, 7, 643, "Metrics/MethodLength: Method has too many lines. [14/10]", 3656683885], + [1262, 5, 12, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Delete`.", 2011475922], + [1286, 7, 538, "Metrics/AbcSize: Assignment Branch Condition size for `call` is too high. [<7, 21, 1> 22.16/17]", 2655200768], + [1286, 7, 538, "Metrics/MethodLength: Method has too many lines. [13/10]", 2655200768], + [1304, 5, 12, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Insert`.", 1590185308], + [1338, 5, 10, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Move`.", 3515667002], + [1366, 7, 1182, "Metrics/AbcSize: Assignment Branch Condition size for `call` is too high. [<14, 40, 7> 42.95/17]", 172197360], + [1366, 7, 1182, "Metrics/MethodLength: Method has too many lines. [22/10]", 172197360], + [1383, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2688172402], + [1396, 3, 13, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr`.", 315644438], + [1396, 3, 12758, "Metrics/ModuleLength: Module has too many lines. [180/100]", 2662313186], + [1397, 5, 33, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::ProfileReportCompatibility`.", 3039519892], + [1419, 5, 18, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::MatchProfile`.", 365273299], + [1431, 7, 28, "Lint/DuplicateMethods: Method `Ast::Crispr::MatchProfile#normalize_start_boundary` is defined at both lib/ast/crispr.rb:292 and lib/ast/crispr.rb:1431.", 2362701855], + [1435, 7, 26, "Lint/DuplicateMethods: Method `Ast::Crispr::MatchProfile#normalize_end_boundary` is defined at both lib/ast/crispr.rb:299 and lib/ast/crispr.rb:1435.", 2613594544], + [1439, 7, 26, "Lint/DuplicateMethods: Method `Ast::Crispr::MatchProfile#normalize_payload_kind` is defined at both lib/ast/crispr.rb:306 and lib/ast/crispr.rb:1439.", 2604742721], + [1444, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::SelectionProfile`.", 2464089216], + [1466, 7, 14, "Lint/DuplicateMethods: Method `Ast::Crispr::SelectionProfile#initialize` is defined at both lib/ast/crispr.rb:531 and lib/ast/crispr.rb:1466.", 956205738], + [1466, 7, 773, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `initialize` is too high. [8/7]", 771809109], + [1466, 7, 773, "Metrics/MethodLength: Method has too many lines. [11/10]", 771809109], + [1466, 21, 190, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 4167448336], + [1481, 7, 1286, "Metrics/AbcSize: Assignment Branch Condition size for `report` is too high. [<5, 29, 13> 32.17/17]", 1720478959], + [1481, 7, 1286, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report` is too high. [11/7]", 1720478959], + [1481, 7, 1286, "Metrics/MethodLength: Method has too many lines. [17/10]", 1720478959], + [1481, 7, 1286, "Metrics/PerceivedComplexity: Perceived complexity for `report` is too high. [11/8]", 1720478959], + [1496, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 1470192175], + [1520, 5, 24, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::DestinationProfile`.", 3442102524], + [1534, 7, 29, "Lint/DuplicateMethods: Method `Ast::Crispr::DestinationProfile#normalize_resolution_kind` is defined at both lib/ast/crispr.rb:437 and lib/ast/crispr.rb:1534.", 99310177], + [1538, 7, 31, "Lint/DuplicateMethods: Method `Ast::Crispr::DestinationProfile#normalize_resolution_source` is defined at both lib/ast/crispr.rb:444 and lib/ast/crispr.rb:1538.", 1692065396], + [1542, 7, 29, "Lint/DuplicateMethods: Method `Ast::Crispr::DestinationProfile#normalize_anchor_boundary` is defined at both lib/ast/crispr.rb:452 and lib/ast/crispr.rb:1542.", 3028754726], + [1547, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::OperationProfile`.", 1974079861], + [1550, 7, 733, "Metrics/MethodLength: Method has too many lines. [13/10]", 2619513218], + [1570, 7, 25, "Lint/DuplicateMethods: Method `Ast::Crispr::OperationProfile#normalize_requirement` is defined at both lib/ast/crispr.rb:678 and lib/ast/crispr.rb:1570.", 440444039], + [1574, 7, 32, "Lint/DuplicateMethods: Method `Ast::Crispr::OperationProfile#normalize_replacement_source` is defined at both lib/ast/crispr.rb:686 and lib/ast/crispr.rb:1574.", 3533021156], + [1579, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::StructureProfile`.", 614380405], + [1595, 5, 6309, "Metrics/ClassLength: Class has too many lines. [172/100]", 1270437788], + [1600, 7, 2717, "Metrics/MethodLength: Method has too many lines. [67/10]", 1469599129], + [1665, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 259030389], + [1678, 28, 247, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3385598543], + [1710, 28, 242, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1038219895] + ], + "lib/ast/crispr/rspec/shared_examples/destination_profile.rb:2529475135": [ + [3, 1, 2386, "Metrics/BlockLength: Block has too many lines. [28/25]", 2846758965], + [4, 3, 2311, "Metrics/BlockLength: Block has too many lines. [26/25]", 2123267236] + ], + "lib/ast/crispr/rspec/shared_examples/match_profile.rb:2566447993": [ + [3, 1, 1997, "Metrics/BlockLength: Block has too many lines. [26/25]", 1032277788] + ], + "lib/ast/crispr/rspec/shared_examples/operation_profile.rb:3583567850": [ + [3, 1, 2148, "Metrics/BlockLength: Block has too many lines. [26/25]", 2745151209] + ], + "spec/old_runtime_spec.rb:1564590841": [ + [3, 1, 17728, "Metrics/BlockLength: Block has too many lines. [383/25]", 205400157], + [4, 3, 69, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3712453399], + [5, 3, 68, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1429320782], + [6, 3, 59, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 253007150], + [8, 3, 891, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 361389624], + [18, 37, 11, "Lint/UnusedMethodArgument: Unused method argument - `owner_scope`.", 3846606321], + [22, 46, 6, "Lint/UnusedMethodArgument: Unused method argument - `region`.", 2124512157], + [22, 64, 11, "Lint/UnusedMethodArgument: Unused method argument - `owner_scope`.", 3846606321], + [73, 3, 8534, "Metrics/BlockLength: Block has too many lines. [176/25]", 3042299525], + [313, 3, 3640, "Metrics/BlockLength: Block has too many lines. [72/25]", 1133370152], + [418, 3, 1663, "Metrics/BlockLength: Block has too many lines. [41/25]", 115074475] + ] +} diff --git a/gems/ast-crispr/Gemfile.lock b/gems/ast-crispr/Gemfile.lock index 609b5a080..641e73147 100644 --- a/gems/ast-crispr/Gemfile.lock +++ b/gems/ast-crispr/Gemfile.lock @@ -16,271 +16,6 @@ PATH service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.0) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -309,12 +44,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -323,6 +52,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -372,12 +102,21 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - kettle-dev (2.3.6) + kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -396,7 +135,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -541,18 +279,22 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -586,11 +328,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -638,44 +380,23 @@ DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -684,26 +405,18 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -711,34 +424,20 @@ CHECKSUMS appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -751,27 +450,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) - kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae - kettle-drift (1.0.5) - kettle-jem (7.1.0) + kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.0) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -786,14 +477,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -801,7 +488,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -829,19 +515,18 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -855,19 +540,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -875,7 +555,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ast-merge/.kettle-drift.lock b/gems/ast-merge/.kettle-drift.lock index 8ee6a7081..6561994e4 100644 --- a/gems/ast-merge/.kettle-drift.lock +++ b/gems/ast-merge/.kettle-drift.lock @@ -4,7 +4,8 @@ "file": "Gemfile", "lines": [ 79, - 119 + 119, + 159 ] } ], @@ -13,7 +14,8 @@ "file": "Gemfile", "lines": [ 90, - 130 + 130, + 170 ] } ], @@ -22,7 +24,8 @@ "file": "Gemfile", "lines": [ 80, - 120 + 120, + 160 ] } ], @@ -31,7 +34,8 @@ "file": "Gemfile", "lines": [ 92, - 132 + 132, + 172 ] } ], @@ -40,7 +44,8 @@ "file": "Gemfile", "lines": [ 95, - 135 + 135, + 175 ] } ], @@ -49,7 +54,8 @@ "file": "Gemfile", "lines": [ 81, - 121 + 121, + 161 ] } ], @@ -59,7 +65,8 @@ "lines": [ 59, 99, - 139 + 139, + 179 ] } ], @@ -68,7 +75,8 @@ "file": "Gemfile", "lines": [ 100, - 140 + 140, + 180 ] } ], @@ -78,7 +86,8 @@ "lines": [ 42, 86, - 126 + 126, + 166 ] } ], @@ -87,7 +96,8 @@ "file": "Gemfile", "lines": [ 109, - 149 + 149, + 189 ] } ], @@ -97,7 +107,8 @@ "lines": [ 34, 78, - 118 + 118, + 158 ] } ], @@ -107,7 +118,8 @@ "lines": [ 68, 108, - 148 + 148, + 188 ] } ], @@ -116,7 +128,8 @@ "file": "Gemfile", "lines": [ 84, - 124 + 124, + 164 ] } ], @@ -126,7 +139,8 @@ "lines": [ 47, 91, - 131 + 131, + 171 ] } ], @@ -136,7 +150,8 @@ "lines": [ 43, 87, - 127 + 127, + 167 ] } ], @@ -145,7 +160,8 @@ "file": "Gemfile", "lines": [ 85, - 125 + 125, + 165 ] } ], @@ -154,7 +170,8 @@ "file": "Gemfile", "lines": [ 102, - 142 + 142, + 182 ] } ], @@ -163,7 +180,8 @@ "file": "Gemfile", "lines": [ 101, - 141 + 141, + 181 ] } ], @@ -172,7 +190,8 @@ "file": "Gemfile", "lines": [ 96, - 136 + 136, + 176 ] } ], @@ -181,7 +200,8 @@ "file": "Gemfile", "lines": [ 105, - 145 + 145, + 185 ] } ], diff --git a/gems/ast-merge/Gemfile b/gems/ast-merge/Gemfile index 4289cdf5c..28d1c5ba4 100644 --- a/gems/ast-merge/Gemfile +++ b/gems/ast-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source 'https://gem.coop' +source "https://gem.coop" git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,17 +19,61 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ['~> 1.0', '>= 1.0.8'] -gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ["~> 1.0", ">= 1.0.8"] +gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ tree_haver ] -direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') +direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? + +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) + direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") + direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == "nomono" } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + if nomono_locked + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] + end + end + Kernel.send(:gem, "nomono", *nomono_activation_requirements) + require "nomono/bundler" + if direct_sibling_templating && !direct_sibling_local + ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + end + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: "STRUCTUREDMERGE", + path_env: "STRUCTUREDMERGE_DEV", + root: ["src", "my", "structuredmerge"] + ) + rescue LoadError + warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + else + ENV.delete("STRUCTUREDMERGE_DEV") + end + end + end +end if direct_sibling_gems.any? && (direct_sibling_local || @@ -169,25 +213,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? # Debugging -eval_gemfile 'gemfiles/modular/debug.gemfile' +eval_gemfile "gemfiles/modular/debug.gemfile" # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile 'gemfiles/modular/coverage.gemfile' +eval_gemfile "gemfiles/modular/coverage.gemfile" # Linting -eval_gemfile 'gemfiles/modular/style.gemfile' +eval_gemfile "gemfiles/modular/style.gemfile" # Documentation -eval_gemfile 'gemfiles/modular/documentation.gemfile' +eval_gemfile "gemfiles/modular/documentation.gemfile" # Optional -eval_gemfile 'gemfiles/modular/optional.gemfile' +eval_gemfile "gemfiles/modular/optional.gemfile" ### Std Lib Extracted Gems -eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' +eval_gemfile "gemfiles/modular/x_std_libs.gemfile" # See unlocked_deps appraisal for more details on irb inclusion -gem 'irb', '~> 1.17' # ruby >= 2.7 +gem "irb", "~> 1.17" # ruby >= 2.7 diff --git a/gems/ast-merge/README.md b/gems/ast-merge/README.md index b3c8f629b..4622d5c87 100644 --- a/gems/ast-merge/README.md +++ b/gems/ast-merge/README.md @@ -564,6 +564,7 @@ If none of the available licenses suit your use case, please [contact us](mailto [🖐contrib-rocks]: https://contrib.rocks [🖐contributors]: https://github.com/structuredmerge/structuredmerge-ruby/graphs/contributors [🖐contributors-img]: https://contrib.rocks/image?repo=structuredmerge/structuredmerge-ruby +[🚎contributors-gl]: https://gitlab.com/structuredmerge/structuredmerge-ruby/-/graphs/main [🪇conduct]: https://github.com/structuredmerge/structuredmerge-ruby/blob/main/CODE_OF_CONDUCT.md [🪇conduct-img]: https://img.shields.io/badge/Contributor_Covenant-2.1-259D6C.svg [📌pvc]: http://guides.rubygems.org/patterns/#pessimistic-version-constraint diff --git a/gems/ast-merge/Rakefile b/gems/ast-merge/Rakefile index 339c9a3cb..6b4e21dec 100644 --- a/gems/ast-merge/Rakefile +++ b/gems/ast-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require 'kettle/drift' + require "kettle/drift" Kettle::Drift.install_tasks rescue LoadError - desc('(stub) kettle:drift:check is unavailable') - task('kettle:drift:check') do + desc("(stub) kettle:drift:check is unavailable") + task("kettle:drift:check") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:update is unavailable') - task('kettle:drift:update') do + desc("(stub) kettle:drift:update is unavailable") + task("kettle:drift:update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:force_update is unavailable') - task('kettle:drift:force_update') do + desc("(stub) kettle:drift:force_update is unavailable") + task("kettle:drift:force_update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift is unavailable') - task('kettle:drift' => 'kettle:drift:update') + desc("(stub) kettle:drift is unavailable") + task("kettle:drift" => "kettle:drift:update") end ### TEMPLATING TASKS diff --git a/gems/ast-merge/lib/ast/merge/version.rb b/gems/ast-merge/lib/ast/merge/version.rb index 6e7dc90f7..3ef823f4d 100644 --- a/gems/ast-merge/lib/ast/merge/version.rb +++ b/gems/ast-merge/lib/ast/merge/version.rb @@ -3,7 +3,7 @@ module Ast module Merge module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/tree_haver/.rubocop_gradual.lock b/gems/tree_haver/.rubocop_gradual.lock new file mode 100644 index 000000000..66df63bfc --- /dev/null +++ b/gems/tree_haver/.rubocop_gradual.lock @@ -0,0 +1,465 @@ +{ + ".simplecov:3575099246": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Gemfile:1933889768": [ + [28, 1, 59, "Lint/EmptyConditionalBody: Avoid `if` branches without a body.", 4279378582] + ], + "Rakefile:1868927885": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/tree_haver.rb:1043643469": [ + [48, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465], + [48, 1, 14703, "Metrics/ModuleLength: Module has too many lines. [395/100]", 2758907023], + [66, 3, 566, "Metrics/MethodLength: Method has too many lines. [12/10]", 1536513137], + [123, 3, 272, "Metrics/MethodLength: Method has too many lines. [11/10]", 505877912], + [155, 3, 543, "Metrics/MethodLength: Method has too many lines. [14/10]", 3733215372], + [220, 3, 458, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `backend_module` is too high. [9/7]", 73937708], + [220, 3, 458, "Metrics/MethodLength: Method has too many lines. [12/10]", 73937708], + [220, 3, 458, "Metrics/PerceivedComplexity: Perceived complexity for `backend_module` is too high. [9/8]", 73937708], + [256, 3, 1024, "Metrics/AbcSize: Assignment Branch Condition size for `register_language` is too high. [<0, 20, 10> 22.36/17]", 53014028], + [256, 3, 1024, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `register_language` is too high. [11/7]", 53014028], + [256, 3, 1024, "Metrics/MethodLength: Method has too many lines. [12/10]", 53014028], + [256, 3, 1024, "Metrics/PerceivedComplexity: Perceived complexity for `register_language` is too high. [11/8]", 53014028], + [256, 24, 150, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 893242366], + [281, 3, 1355, "Metrics/AbcSize: Assignment Branch Condition size for `parser_for` is too high. [<11, 25, 13> 30.25/17]", 4004028797], + [281, 3, 1355, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parser_for` is too high. [14/7]", 4004028797], + [281, 3, 1355, "Metrics/MethodLength: Method has too many lines. [27/10]", 4004028797], + [281, 3, 1355, "Metrics/PerceivedComplexity: Perceived complexity for `parser_for` is too high. [14/8]", 4004028797], + [320, 3, 2089, "Metrics/MethodLength: Method has too many lines. [51/10]", 2791676388], + [374, 3, 565, "Metrics/AbcSize: Assignment Branch Condition size for `requested_backend_type` is too high. [<3, 16, 8> 18.14/17]", 2317624457], + [374, 3, 565, "Metrics/MethodLength: Method has too many lines. [12/10]", 2317624457], + [392, 3, 696, "Metrics/MethodLength: Method has too many lines. [14/10]", 307274721], + [470, 3, 425, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `backend_module_for` is too high. [9/7]", 3448932255], + [470, 3, 425, "Metrics/MethodLength: Method has too many lines. [20/10]", 3448932255] + ], + "lib/tree_haver/backend_api.rb:3354059061": [ + [30, 3, 12181, "Metrics/ModuleLength: Module has too many lines. [243/100]", 205645546], + [139, 5, 8882, "Metrics/ClassLength: Class has too many lines. [180/100]", 4281605197], + [145, 7, 1502, "Metrics/AbcSize: Assignment Branch Condition size for `validate` is too high. [<4, 22, 10> 24.49/17]", 747017743], + [145, 7, 1502, "Metrics/MethodLength: Method has too many lines. [31/10]", 747017743], + [145, 7, 1502, "Metrics/PerceivedComplexity: Perceived complexity for `validate` is too high. [11/8]", 747017743], + [213, 7, 903, "Metrics/MethodLength: Method has too many lines. [24/10]", 3041411230], + [261, 7, 1271, "Metrics/AbcSize: Assignment Branch Condition size for `validate_capabilities_hash` is too high. [<7, 27, 7> 28.76/17]", 3965262932], + [261, 7, 1271, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_capabilities_hash` is too high. [8/7]", 3965262932], + [261, 7, 1271, "Metrics/MethodLength: Method has too many lines. [25/10]", 3965262932], + [277, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2253399502], + [296, 7, 908, "Metrics/AbcSize: Assignment Branch Condition size for `validate_language` is too high. [<6, 17, 4> 18.47/17]", 733551867], + [315, 7, 797, "Metrics/AbcSize: Assignment Branch Condition size for `validate_parser` is too high. [<5, 16, 7> 18.17/17]", 1229041751], + [315, 7, 797, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_parser` is too high. [8/7]", 1229041751], + [315, 7, 797, "Metrics/MethodLength: Method has too many lines. [15/10]", 1229041751], + [349, 7, 862, "Metrics/AbcSize: Assignment Branch Condition size for `validate_node_class` is too high. [<8, 18, 8> 21.26/17]", 1873188195], + [349, 7, 862, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_node_class` is too high. [8/7]", 1873188195], + [349, 7, 862, "Metrics/MethodLength: Method has too many lines. [20/10]", 1873188195], + [349, 7, 862, "Metrics/PerceivedComplexity: Perceived complexity for `validate_node_class` is too high. [9/8]", 1873188195], + [375, 11, 20, "Naming/PredicatePrefix: Rename `has_method_or_alias?` to `method_or_alias?`.", 285116235] + ], + "lib/tree_haver/backend_context.rb:159197618": [ + [3, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465] + ], + "lib/tree_haver/backend_registry.rb:4046212912": [ + [4, 3, 22, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver::BackendRegistry`.", 733935278], + [4, 3, 5121, "Metrics/ModuleLength: Module has too many lines. [152/100]", 1483988260], + [39, 5, 382, "Metrics/MethodLength: Method has too many lines. [11/10]", 2000730238], + [48, 16, 1, "Style/DoubleNegation: Avoid the use of double negation (`!!`).", 177540], + [55, 5, 889, "Metrics/AbcSize: Assignment Branch Condition size for `register_tag` is too high. [<5, 20, 5> 21.21/17]", 2276764069], + [55, 5, 889, "Metrics/MethodLength: Method has too many lines. [18/10]", 2276764069], + [105, 5, 397, "Metrics/MethodLength: Method has too many lines. [11/10]", 4007185633] + ], + "lib/tree_haver/backends/citrus.rb:3181984499": [ + [40, 9, 449, "Metrics/MethodLength: Method has too many lines. [11/10]", 1138819533], + [173, 11, 1133, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [11/7]", 2613019266], + [173, 11, 1133, "Metrics/MethodLength: Method has too many lines. [16/10]", 2613019266], + [173, 11, 1133, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [11/8]", 2613019266], + [230, 9, 597, "Metrics/MethodLength: Method has too many lines. [12/10]", 3923424594], + [403, 9, 810, "Metrics/AbcSize: Assignment Branch Condition size for `structural?` is too high. [<3, 19, 8> 20.83/17]", 3166173256], + [403, 9, 810, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structural?` is too high. [9/7]", 3166173256], + [403, 9, 810, "Metrics/MethodLength: Method has too many lines. [12/10]", 3166173256], + [403, 9, 810, "Metrics/PerceivedComplexity: Perceived complexity for `structural?` is too high. [9/8]", 3166173256], + [436, 9, 1272, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_type_from_event` is too high. [9/7]", 2022108773], + [436, 9, 1272, "Metrics/MethodLength: Method has too many lines. [16/10]", 2022108773], + [436, 9, 1272, "Metrics/PerceivedComplexity: Perceived complexity for `extract_type_from_event` is too high. [10/8]", 2022108773], + [460, 11, 207, "Style/CaseLikeIf: Convert `if-elsif` to `case-when`.", 1995588659], + [476, 61, 10, "Style/NumericPredicate: Use `offset.positive?` instead of `offset > 0`.", 2454414278] + ], + "lib/tree_haver/backends/ffi.rb:691415497": [ + [83, 9, 853, "Metrics/MethodLength: Method has too many lines. [15/10]", 1876257977], + [147, 7, 7352, "Metrics/ModuleLength: Module has too many lines. [111/100]", 4125377349], + [148, 9, 7320, "Metrics/ClassLength: Class has too many lines. [109/100]", 1130902814], + [183, 11, 559, "Metrics/MethodLength: Method has too many lines. [11/10]", 678018999], + [232, 11, 4265, "Metrics/AbcSize: Assignment Branch Condition size for `try_load!` is too high. [<11, 40, 10> 42.67/17]", 2312962113], + [232, 11, 4265, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `try_load!` is too high. [10/7]", 2312962113], + [232, 11, 4265, "Metrics/MethodLength: Method has too many lines. [58/10]", 2312962113], + [232, 11, 4265, "Metrics/PerceivedComplexity: Perceived complexity for `try_load!` is too high. [11/8]", 2312962113], + [260, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2086221887], + [262, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2163360042], + [367, 9, 312, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `<=>` is too high. [8/7]", 2433292528], + [437, 11, 4377, "Metrics/AbcSize: Assignment Branch Condition size for `from_library` is too high. [<16, 30, 18> 38.47/17]", 3403850855], + [437, 11, 4377, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [17/7]", 3403850855], + [437, 11, 4377, "Metrics/MethodLength: Method has too many lines. [43/10]", 3403850855], + [437, 11, 4377, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [19/8]", 3403850855], + [437, 47, 4, "Lint/UnusedMethodArgument: Unused method argument - `name`.", 2087876002], + [502, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2415433817], + [554, 9, 3159, "Metrics/AbcSize: Assignment Branch Condition size for `language=` is too high. [<4, 44, 11> 45.53/17]", 1815427493], + [554, 9, 3159, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `language=` is too high. [10/7]", 1815427493], + [554, 9, 3159, "Metrics/MethodLength: Method has too many lines. [40/10]", 1815427493], + [554, 9, 3159, "Metrics/PerceivedComplexity: Perceived complexity for `language=` is too high. [10/8]", 1815427493], + [715, 7, 10494, "Metrics/ClassLength: Class has too many lines. [129/100]", 3710916551], + [744, 45, 9, "Style/NumericPredicate: Use `index.negative?` instead of `index < 0`.", 4215255415], + [807, 13, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183], + [889, 21, 9, "Style/NumericPredicate: Use `index.negative?` instead of `index < 0`.", 4215255415], + [933, 9, 694, "Metrics/AbcSize: Assignment Branch Condition size for `descendant_for_point_range` is too high. [<7, 21, 5> 22.69/17]", 979329510], + [953, 9, 706, "Metrics/AbcSize: Assignment Branch Condition size for `named_descendant_for_point_range` is too high. [<7, 21, 5> 22.69/17]", 2494446138] + ], + "lib/tree_haver/backends/java.rb:3360169733": [ + [134, 7, 815, "Metrics/AbcSize: Assignment Branch Condition size for `configure_native_library_path!` is too high. [<4, 17, 6> 18.47/17]", 1362415302], + [227, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3409700051], + [260, 7, 9885, "Metrics/ClassLength: Class has too many lines. [114/100]", 136252046], + [292, 9, 312, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `<=>` is too high. [8/7]", 2433292528], + [340, 11, 4098, "Metrics/AbcSize: Assignment Branch Condition size for `from_library` is too high. [<19, 32, 14> 39.76/17]", 3050250526], + [340, 11, 4098, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [14/7]", 3050250526], + [340, 11, 4098, "Metrics/MethodLength: Method has too many lines. [48/10]", 3050250526], + [340, 11, 4098, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [16/8]", 3050250526], + [426, 11, 2084, "Metrics/AbcSize: Assignment Branch Condition size for `load_by_name` is too high. [<11, 17, 6> 21.12/17]", 226213748], + [426, 11, 2084, "Metrics/MethodLength: Method has too many lines. [35/10]", 226213748], + [542, 9, 1016, "Metrics/MethodLength: Method has too many lines. [17/10]", 4123264427], + [649, 9, 702, "Metrics/MethodLength: Method has too many lines. [14/10]", 1334016319], + [649, 17, 89, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3152137646], + [728, 9, 583, "Metrics/MethodLength: Method has too many lines. [11/10]", 2457478600], + [816, 13, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183] + ], + "lib/tree_haver/backends/mri.rb:863330290": [ + [59, 9, 916, "Metrics/MethodLength: Method has too many lines. [15/10]", 749971754], + [179, 9, 312, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `<=>` is too high. [8/7]", 2433292528], + [232, 11, 1562, "Metrics/MethodLength: Method has too many lines. [11/10]", 3858647816] + ], + "lib/tree_haver/backends/parslet.rb:4170691266": [ + [41, 9, 323, "Metrics/MethodLength: Method has too many lines. [11/10]", 694290592], + [108, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193340030], + [172, 11, 1133, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [11/7]", 2613019266], + [172, 11, 1133, "Metrics/MethodLength: Method has too many lines. [16/10]", 2613019266], + [172, 11, 1133, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [11/8]", 2613019266], + [246, 9, 591, "Metrics/MethodLength: Method has too many lines. [12/10]", 3007454066], + [335, 7, 6287, "Metrics/ClassLength: Class has too many lines. [155/100]", 3100555518], + [362, 9, 452, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `start_byte` is too high. [8/7]", 2663206926], + [362, 9, 452, "Metrics/MethodLength: Method has too many lines. [12/10]", 2663206926], + [380, 9, 557, "Metrics/MethodLength: Method has too many lines. [12/10]", 2982914846], + [443, 9, 404, "Metrics/MethodLength: Method has too many lines. [11/10]", 1111982079], + [495, 61, 10, "Style/NumericPredicate: Use `offset.positive?` instead of `offset > 0`.", 2454414278], + [501, 9, 313, "Metrics/MethodLength: Method has too many lines. [13/10]", 1927903077], + [519, 9, 448, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_first_slice` is too high. [8/7]", 229178429], + [519, 9, 448, "Metrics/MethodLength: Method has too many lines. [16/10]", 229178429], + [524, 17, 11, "Style/HashEachMethods: Use `each_value` instead of `values.each`.", 236538172], + [539, 9, 461, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_last_slice` is too high. [8/7]", 3960808114], + [539, 9, 461, "Metrics/MethodLength: Method has too many lines. [16/10]", 3960808114] + ], + "lib/tree_haver/backends/prism.rb:265399087": [ + [39, 9, 448, "Metrics/MethodLength: Method has too many lines. [11/10]", 2383415890], + [70, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 721867551], + [71, 9, 712, "Metrics/MethodLength: Method has too many lines. [12/10]", 1576927704], + [145, 41, 6, "Lint/UnusedMethodArgument: Unused method argument - `symbol`.", 2153517219], + [182, 9, 554, "Metrics/MethodLength: Method has too many lines. [16/10]", 3452414947], + [250, 13, 11, "Naming/PredicatePrefix: Rename `has_errors?` to `errors?`.", 1181419252], + [275, 69, 27, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1979346241], + [301, 13, 64, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1942915391], + [305, 9, 519, "Metrics/AbcSize: Assignment Branch Condition size for `classify_comment_hint` is too high. [<5, 20, 5> 21.21/17]", 869270335], + [485, 13, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183], + [554, 24, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] + ], + "lib/tree_haver/backends/psych.rb:1528613408": [ + [30, 9, 448, "Metrics/MethodLength: Method has too many lines. [11/10]", 2367418678], + [59, 9, 601, "Metrics/MethodLength: Method has too many lines. [11/10]", 2824278890], + [342, 9, 901, "Metrics/AbcSize: Assignment Branch Condition size for `extract_text_from_location` is too high. [<8, 23, 18> 30.28/17]", 1252700264], + [342, 9, 901, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_text_from_location` is too high. [14/7]", 1252700264], + [342, 9, 901, "Metrics/MethodLength: Method has too many lines. [22/10]", 1252700264], + [342, 9, 901, "Metrics/PerceivedComplexity: Perceived complexity for `extract_text_from_location` is too high. [16/8]", 1252700264] + ], + "lib/tree_haver/backends/rust.rb:3784474048": [ + [52, 9, 548, "Metrics/MethodLength: Method has too many lines. [15/10]", 3791803966], + [156, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548] + ], + "lib/tree_haver/base/comment.rb:699160654": [ + [10, 5, 8183, "Metrics/ClassLength: Class has too many lines. [152/100]", 4001235397] + ], + "lib/tree_haver/base/node.rb:586469776": [ + [36, 5, 7668, "Metrics/ClassLength: Class has too many lines. [156/100]", 171773185], + [162, 11, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183], + [208, 27, 8, "Style/NumericPredicate: Use `cmp.zero?` instead of `cmp == 0`.", 736104011], + [239, 7, 888, "Metrics/AbcSize: Assignment Branch Condition size for `source_position` is too high. [<6, 20, 12> 24.08/17]", 3968023659], + [239, 7, 888, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `source_position` is too high. [9/7]", 3968023659], + [239, 7, 888, "Metrics/MethodLength: Method has too many lines. [28/10]", 3968023659], + [239, 7, 888, "Metrics/PerceivedComplexity: Perceived complexity for `source_position` is too high. [13/8]", 3968023659], + [306, 7, 355, "Metrics/MethodLength: Method has too many lines. [11/10]", 1012295608] + ], + "lib/tree_haver/base/tree.rb:3081630142": [ + [89, 15, 145, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1155535733], + [103, 11, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183] + ], + "lib/tree_haver/citrus_grammar_finder.rb:2540014236": [ + [31, 3, 7013, "Metrics/ClassLength: Class has too many lines. [102/100]", 245808593], + [66, 5, 3770, "Metrics/AbcSize: Assignment Branch Condition size for `available?` is too high. [<16, 52, 21> 58.32/17]", 3886463212], + [66, 5, 3770, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `available?` is too high. [22/7]", 3886463212], + [66, 5, 3770, "Metrics/MethodLength: Method has too many lines. [50/10]", 3886463212], + [66, 5, 3770, "Metrics/PerceivedComplexity: Perceived complexity for `available?` is too high. [22/8]", 3886463212], + [94, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858894] + ], + "lib/tree_haver/contracts.rb:1759652181": [ + [3, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465], + [3, 1, 30217, "Metrics/ModuleLength: Module has too many lines. [1005/100]", 1179515902], + [91, 5, 732, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 18, 2> 18.11/17]", 3031678572], + [91, 5, 732, "Metrics/MethodLength: Method has too many lines. [17/10]", 3031678572], + [170, 5, 697, "Metrics/MethodLength: Method has too many lines. [18/10]", 389212725], + [231, 5, 507, "Metrics/MethodLength: Method has too many lines. [13/10]", 2631332781], + [351, 5, 580, "Metrics/MethodLength: Method has too many lines. [13/10]", 2166080747], + [580, 5, 558, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 17, 4> 17.46/17]", 2109105399], + [580, 5, 558, "Metrics/MethodLength: Method has too many lines. [18/10]", 2109105399], + [632, 3, 780, "Metrics/AbcSize: Assignment Branch Condition size for `library_path_errors` is too high. [<3, 20, 10> 22.56/17]", 1003454820], + [632, 3, 780, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `library_path_errors` is too high. [10/7]", 1003454820], + [632, 3, 780, "Metrics/MethodLength: Method has too many lines. [14/10]", 1003454820], + [632, 3, 780, "Metrics/PerceivedComplexity: Perceived complexity for `library_path_errors` is too high. [10/8]", 1003454820], + [674, 3, 686, "Metrics/MethodLength: Method has too many lines. [16/10]", 2530945134], + [696, 3, 483, "Metrics/MethodLength: Method has too many lines. [15/10]", 3654427448], + [715, 3, 511, "Metrics/MethodLength: Method has too many lines. [16/10]", 145071639], + [792, 5, 384, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 19, 6> 19.92/17]", 1287649270], + [863, 5, 449, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [10/7]", 1722332092], + [863, 5, 449, "Metrics/PerceivedComplexity: Perceived complexity for `to_h` is too high. [10/8]", 1722332092], + [895, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177610], + [896, 5, 420, "Metrics/MethodLength: Method has too many lines. [12/10]", 722580369], + [936, 42, 8, "Lint/StructNewOverride: `:entries` member overrides `Struct#entries` and it may be unexpected.", 999966509], + [959, 3, 473, "Metrics/MethodLength: Method has too many lines. [18/10]", 1284459726], + [980, 3, 655, "Metrics/AbcSize: Assignment Branch Condition size for `byte_offset_for_point` is too high. [<7, 25, 14> 29.5/17]", 1278853347], + [980, 3, 655, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `byte_offset_for_point` is too high. [9/7]", 1278853347], + [980, 3, 655, "Metrics/MethodLength: Method has too many lines. [17/10]", 1278853347], + [980, 3, 655, "Metrics/PerceivedComplexity: Perceived complexity for `byte_offset_for_point` is too high. [10/8]", 1278853347] + ], + "lib/tree_haver/grammar_finder.rb:3769422606": [ + [55, 3, 13963, "Metrics/ClassLength: Class has too many lines. [213/100]", 842233610], + [120, 5, 516, "Metrics/AbcSize: Assignment Branch Condition size for `search_paths` is too high. [<6, 15, 6> 17.23/17]", 2953596940], + [120, 5, 516, "Metrics/MethodLength: Method has too many lines. [15/10]", 2953596940], + [160, 5, 1737, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_library_path` is too high. [8/7]", 4164717952], + [160, 5, 1737, "Metrics/MethodLength: Method has too many lines. [25/10]", 4164717952], + [272, 7, 845, "Metrics/MethodLength: Method has too many lines. [12/10]", 916567473], + [333, 5, 479, "Metrics/MethodLength: Method has too many lines. [13/10]", 309140318], + [352, 5, 805, "Metrics/MethodLength: Method has too many lines. [11/10]", 667615068], + [389, 5, 1028, "Metrics/MethodLength: Method has too many lines. [22/10]", 3088457603] + ], + "lib/tree_haver/kaitai_backend.rb:335397596": [ + [3, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465] + ], + "lib/tree_haver/language.rb:2775049278": [ + [39, 3, 12087, "Metrics/ModuleLength: Module has too many lines. [115/100]", 221887443], + [40, 5, 12061, "Metrics/ClassLength: Class has too many lines. [113/100]", 309443185], + [89, 7, 1966, "Metrics/AbcSize: Assignment Branch Condition size for `from_library` is too high. [<4, 20, 10> 22.72/17]", 980659500], + [89, 7, 1966, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [9/7]", 980659500], + [89, 7, 1966, "Metrics/MethodLength: Method has too many lines. [31/10]", 980659500], + [89, 7, 1966, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [11/8]", 980659500], + [114, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177538], + [156, 7, 4289, "Metrics/AbcSize: Assignment Branch Condition size for `method_missing` is too high. [<10, 39, 30> 50.21/17]", 1314689525], + [156, 7, 4289, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `method_missing` is too high. [24/7]", 1314689525], + [156, 7, 4289, "Metrics/MethodLength: Method has too many lines. [56/10]", 1314689525], + [156, 7, 4289, "Metrics/PerceivedComplexity: Perceived complexity for `method_missing` is too high. [26/8]", 1314689525], + [274, 7, 786, "Metrics/MethodLength: Method has too many lines. [12/10]", 3697766033] + ], + "lib/tree_haver/language_pack.rb:3634605947": [ + [6, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465], + [6, 1, 10559, "Metrics/ModuleLength: Module has too many lines. [285/100]", 1485243593], + [47, 3, 1095, "Metrics/AbcSize: Assignment Branch Condition size for `parse_with_language_pack` is too high. [<5, 25, 3> 25.67/17]", 2100474993], + [47, 3, 1095, "Metrics/MethodLength: Method has too many lines. [20/10]", 2100474993], + [72, 3, 1420, "Metrics/AbcSize: Assignment Branch Condition size for `process_with_language_pack` is too high. [<5, 31, 3> 31.54/17]", 3796531166], + [72, 3, 1420, "Metrics/MethodLength: Method has too many lines. [27/10]", 3796531166], + [110, 3, 708, "Metrics/AbcSize: Assignment Branch Condition size for `language_pack_result_hash` is too high. [<4, 22, 8> 23.75/17]", 3436019149], + [110, 3, 708, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `language_pack_result_hash` is too high. [9/7]", 3436019149], + [110, 3, 708, "Metrics/MethodLength: Method has too many lines. [14/10]", 3436019149], + [110, 3, 708, "Metrics/PerceivedComplexity: Perceived complexity for `language_pack_result_hash` is too high. [9/8]", 3436019149], + [165, 3, 403, "Metrics/MethodLength: Method has too many lines. [11/10]", 1836909640], + [180, 3, 398, "Metrics/MethodLength: Method has too many lines. [11/10]", 2881064520], + [247, 3, 436, "Metrics/MethodLength: Method has too many lines. [13/10]", 4289517332], + [265, 3, 508, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_typescript_import` is too high. [<6, 14, 10> 18.22/17]", 4201027767], + [265, 3, 508, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_typescript_import` is too high. [9/7]", 4201027767], + [265, 3, 508, "Metrics/MethodLength: Method has too many lines. [11/10]", 4201027767], + [265, 3, 508, "Metrics/PerceivedComplexity: Perceived complexity for `normalize_typescript_import` is too high. [10/8]", 4201027767], + [312, 20, 2, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 5861217] + ], + "lib/tree_haver/language_registry.rb:3950096220": [ + [83, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861089] + ], + "lib/tree_haver/library_path_utils.rb:1552423902": [ + [32, 5, 861, "Metrics/MethodLength: Method has too many lines. [12/10]", 1638068630] + ], + "lib/tree_haver/node.rb:715762930": [ + [62, 3, 16601, "Metrics/ClassLength: Class has too many lines. [237/100]", 2290466920], + [136, 5, 708, "Metrics/AbcSize: Assignment Branch Condition size for `start_point` is too high. [<2, 19, 7> 20.35/17]", 2066418249], + [136, 5, 708, "Metrics/MethodLength: Method has too many lines. [17/10]", 2066418249], + [161, 5, 694, "Metrics/AbcSize: Assignment Branch Condition size for `end_point` is too high. [<2, 19, 7> 20.35/17]", 2127773446], + [161, 5, 694, "Metrics/MethodLength: Method has too many lines. [17/10]", 2127773446], + [232, 5, 948, "Metrics/AbcSize: Assignment Branch Condition size for `text` is too high. [<1, 14, 11> 17.83/17]", 748349201], + [232, 5, 948, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `text` is too high. [9/7]", 748349201], + [232, 5, 948, "Metrics/MethodLength: Method has too many lines. [16/10]", 748349201], + [232, 5, 948, "Metrics/PerceivedComplexity: Perceived complexity for `text` is too high. [11/8]", 748349201], + [259, 9, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183], + [328, 5, 994, "Metrics/AbcSize: Assignment Branch Condition size for `named_child` is too high. [<6, 13, 10> 17.46/17]", 3449163117], + [328, 5, 994, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `named_child` is too high. [9/7]", 3449163117], + [328, 5, 994, "Metrics/MethodLength: Method has too many lines. [21/10]", 3449163117], + [328, 5, 994, "Metrics/PerceivedComplexity: Perceived complexity for `named_child` is too high. [10/8]", 3449163117], + [366, 5, 734, "Metrics/MethodLength: Method has too many lines. [15/10]", 3099919150], + [425, 7, 4, "Style/EmptyElse: Redundant `else`-clause.", 2087423834] + ], + "lib/tree_haver/parser.rb:1959976510": [ + [71, 3, 15231, "Metrics/ClassLength: Class has too many lines. [181/100]", 2262931609], + [84, 5, 938, "Metrics/MethodLength: Method has too many lines. [13/10]", 569209133], + [116, 5, 844, "Metrics/MethodLength: Method has too many lines. [11/10]", 3700471369], + [141, 5, 583, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `backend` is too high. [9/7]", 942469984], + [141, 5, 583, "Metrics/MethodLength: Method has too many lines. [20/10]", 942469984], + [237, 5, 1114, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_string` is too high. [8/7]", 2146281390], + [237, 5, 1114, "Metrics/MethodLength: Method has too many lines. [16/10]", 2146281390], + [237, 5, 1114, "Metrics/PerceivedComplexity: Perceived complexity for `parse_string` is too high. [10/8]", 2146281390], + [273, 5, 1162, "Metrics/AbcSize: Assignment Branch Condition size for `switch_backend_for_language` is too high. [<10, 11, 11> 18.49/17]", 3918477333], + [273, 5, 1162, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `switch_backend_for_language` is too high. [11/7]", 3918477333], + [273, 5, 1162, "Metrics/MethodLength: Method has too many lines. [26/10]", 3918477333], + [273, 5, 1162, "Metrics/PerceivedComplexity: Perceived complexity for `switch_backend_for_language` is too high. [9/8]", 3918477333], + [320, 5, 3598, "Metrics/AbcSize: Assignment Branch Condition size for `unwrap_language` is too high. [<4, 32, 32> 45.43/17]", 2683894777], + [320, 5, 3598, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `unwrap_language` is too high. [29/7]", 2683894777], + [320, 5, 3598, "Metrics/MethodLength: Method has too many lines. [55/10]", 2683894777], + [320, 5, 3598, "Metrics/PerceivedComplexity: Perceived complexity for `unwrap_language` is too high. [23/8]", 2683894777], + [414, 5, 892, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `try_reload_language_for_backend` is too high. [9/7]", 1872419716], + [414, 5, 892, "Metrics/MethodLength: Method has too many lines. [14/10]", 1872419716], + [414, 5, 892, "Metrics/PerceivedComplexity: Perceived complexity for `try_reload_language_for_backend` is too high. [9/8]", 1872419716] + ], + "lib/tree_haver/parslet_grammar_finder.rb:756779364": [ + [32, 3, 6418, "Metrics/ClassLength: Class has too many lines. [105/100]", 2916347470], + [67, 5, 2630, "Metrics/AbcSize: Assignment Branch Condition size for `available?` is too high. [<14, 39, 19> 45.59/17]", 1827795944], + [67, 5, 2630, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `available?` is too high. [20/7]", 1827795944], + [67, 5, 2630, "Metrics/MethodLength: Method has too many lines. [43/10]", 1827795944], + [67, 5, 2630, "Metrics/PerceivedComplexity: Perceived complexity for `available?` is too high. [20/8]", 1827795944] + ], + "lib/tree_haver/path_validator.rb:1827441298": [ + [31, 3, 11571, "Metrics/ModuleLength: Module has too many lines. [133/100]", 3916793077], + [71, 5, 1048, "Metrics/AbcSize: Assignment Branch Condition size for `trusted_directories` is too high. [<4, 16, 5> 17.23/17]", 2683168069], + [71, 5, 1048, "Metrics/MethodLength: Method has too many lines. [13/10]", 2683168069], + [182, 5, 1000, "Metrics/AbcSize: Assignment Branch Condition size for `safe_library_path?` is too high. [<1, 15, 15> 21.24/17]", 3331427816], + [182, 5, 1000, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `safe_library_path?` is too high. [15/7]", 3331427816], + [182, 5, 1000, "Metrics/MethodLength: Method has too many lines. [11/10]", 3331427816], + [182, 5, 1000, "Metrics/PerceivedComplexity: Perceived complexity for `safe_library_path?` is too high. [15/8]", 3331427816], + [314, 5, 911, "Metrics/AbcSize: Assignment Branch Condition size for `validation_errors` is too high. [<2, 21, 13> 24.78/17]", 1249065882], + [314, 5, 911, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validation_errors` is too high. [13/7]", 1249065882], + [314, 5, 911, "Metrics/MethodLength: Method has too many lines. [14/10]", 1249065882], + [314, 5, 911, "Metrics/PerceivedComplexity: Perceived complexity for `validation_errors` is too high. [13/8]", 1249065882], + [345, 9, 20, "Naming/PredicatePrefix: Rename `has_valid_extension?` to `valid_extension?`.", 2041908655] + ], + "lib/tree_haver/peg_backends.rb:2882446693": [ + [3, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465], + [37, 3, 611, "Metrics/MethodLength: Method has too many lines. [21/10]", 2394303132], + [39, 11, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [61, 3, 377, "Metrics/MethodLength: Method has too many lines. [13/10]", 1137341195] + ], + "lib/tree_haver/rspec/dependency_tags.rb:2954930617": [ + [7, 5, 21, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver::RSpec::DependencyTags`.", 2626933713] + ], + "lib/tree_haver/tree.rb:3332079774": [ + [129, 5, 1443, "Metrics/AbcSize: Assignment Branch Condition size for `edit` is too high. [<8, 18, 7> 20.9/17]", 4208399016], + [129, 5, 1443, "Metrics/MethodLength: Method has too many lines. [24/10]", 4208399016], + [129, 13, 89, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3152137646] + ], + "spec/backend_registry_spec.rb:2685433903": [ + [5, 1, 2560, "Metrics/BlockLength: Block has too many lines. [49/25]", 3697376763] + ], + "spec/fixtures_integration_spec.rb:433811098": [ + [3, 1, 49194, "Metrics/BlockLength: Block has too many lines. [1024/25]", 2138474637], + [108, 3, 1282, "Metrics/BlockLength: Block has too many lines. [29/25]", 505243730], + [141, 3, 1840, "Metrics/BlockLength: Block has too many lines. [35/25]", 1365684528], + [180, 3, 1365, "Metrics/BlockLength: Block has too many lines. [33/25]", 1597100003], + [247, 3, 2110, "Metrics/BlockLength: Block has too many lines. [41/25]", 219204301], + [294, 3, 2166, "Metrics/BlockLength: Block has too many lines. [27/25]", 2219571348], + [354, 3, 1786, "Metrics/BlockLength: Block has too many lines. [30/25]", 1655451032], + [432, 3, 1345, "Metrics/BlockLength: Block has too many lines. [26/25]", 1188499098], + [534, 3, 3250, "Metrics/BlockLength: Block has too many lines. [64/25]", 2852118886], + [589, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 2115564430], + [602, 3, 752, "Metrics/AbcSize: Assignment Branch Condition size for `normalized_tree_node` is too high. [<0, 19, 4> 19.42/17]", 1725197185], + [602, 3, 752, "Metrics/MethodLength: Method has too many lines. [18/10]", 1725197185], + [623, 3, 850, "Metrics/AbcSize: Assignment Branch Condition size for `backend_capability` is too high. [<0, 20, 0> 20/17]", 3278569026], + [623, 3, 850, "Metrics/MethodLength: Method has too many lines. [14/10]", 3278569026], + [640, 3, 744, "Metrics/MethodLength: Method has too many lines. [13/10]", 1675624229], + [679, 3, 492, "Metrics/MethodLength: Method has too many lines. [11/10]", 4123526878], + [714, 3, 566, "Metrics/AbcSize: Assignment Branch Condition size for `parse_error_tolerance` is too high. [<1, 17, 1> 17.06/17]", 933590597], + [714, 3, 566, "Metrics/MethodLength: Method has too many lines. [14/10]", 933590597], + [739, 3, 2652, "Metrics/BlockLength: Block has too many lines. [47/25]", 214520278], + [997, 3, 1160, "Metrics/BlockLength: Block has too many lines. [36/25]", 728731748], + [1106, 7, 87, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3860036845], + [1112, 7, 60, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1411318317] + ], + "tree_haver.gemspec:665267582": [ + [16, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1512975621], + [129, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [146, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [147, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [154, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ] +} diff --git a/gems/tree_haver/Gemfile b/gems/tree_haver/Gemfile index 999620d43..ffa800806 100644 --- a/gems/tree_haver/Gemfile +++ b/gems/tree_haver/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source "https://gem.coop" +source 'https://gem.coop' git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,8 +19,8 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ["~> 1.0", ">= 1.0.8"] -gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ['~> 1.0', '>= 1.0.8'] +gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 # Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = @@ -29,25 +29,25 @@ if !tslp_declared_by_templating && tslp_dev.to_s.empty? end # Modular sibling dependencies (env-switched inside each modular Gemfile) -eval_gemfile "gemfiles/modular/templating.gemfile" +eval_gemfile 'gemfiles/modular/templating.gemfile' # Debugging -eval_gemfile "gemfiles/modular/debug.gemfile" +eval_gemfile 'gemfiles/modular/debug.gemfile' # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile "gemfiles/modular/coverage.gemfile" +eval_gemfile 'gemfiles/modular/coverage.gemfile' # Linting -eval_gemfile "gemfiles/modular/style.gemfile" +eval_gemfile 'gemfiles/modular/style.gemfile' # Documentation -eval_gemfile "gemfiles/modular/documentation.gemfile" +eval_gemfile 'gemfiles/modular/documentation.gemfile' # Optional -eval_gemfile "gemfiles/modular/optional.gemfile" +eval_gemfile 'gemfiles/modular/optional.gemfile' ### Std Lib Extracted Gems -eval_gemfile "gemfiles/modular/x_std_libs.gemfile" +eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' # See unlocked_deps appraisal for more details on irb inclusion -gem "irb", "~> 1.17" # ruby >= 2.7 +gem 'irb', '~> 1.17' # ruby >= 2.7 diff --git a/gems/tree_haver/Rakefile b/gems/tree_haver/Rakefile index 0a3c6f7a9..ab2dc23d9 100644 --- a/gems/tree_haver/Rakefile +++ b/gems/tree_haver/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require "kettle/drift" + require 'kettle/drift' Kettle::Drift.install_tasks rescue LoadError - desc("(stub) kettle:drift:check is unavailable") - task("kettle:drift:check") do + desc('(stub) kettle:drift:check is unavailable') + task('kettle:drift:check') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:update is unavailable") - task("kettle:drift:update") do + desc('(stub) kettle:drift:update is unavailable') + task('kettle:drift:update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:force_update is unavailable") - task("kettle:drift:force_update") do + desc('(stub) kettle:drift:force_update is unavailable') + task('kettle:drift:force_update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift is unavailable") - task("kettle:drift" => "kettle:drift:update") + desc('(stub) kettle:drift is unavailable') + task('kettle:drift' => 'kettle:drift:update') end ### TEMPLATING TASKS diff --git a/gems/tree_haver/bin/yard b/gems/tree_haver/bin/yard index a7e8b6eed..5d516ad6f 100755 --- a/gems/tree_haver/bin/yard +++ b/gems/tree_haver/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec("bundle", "exec", "rake", "yard") +exec('bundle', 'exec', 'rake', 'yard') diff --git a/gems/tree_haver/lib/tree_haver/version.rb b/gems/tree_haver/lib/tree_haver/version.rb index 9bd0db819..43365bf4e 100644 --- a/gems/tree_haver/lib/tree_haver/version.rb +++ b/gems/tree_haver/lib/tree_haver/version.rb @@ -2,7 +2,7 @@ module TreeHaver module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end From ef230243acbeadbad95d54b03f92239710cd6cb4 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 16:35:22 -0600 Subject: [PATCH 003/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-merge/README.md | 1 - gems/markdown-merge/Gemfile.lock | 352 +++++++++++++++++++++++- gems/tree_haver/Gemfile.lock | 448 +++++++++---------------------- 3 files changed, 470 insertions(+), 331 deletions(-) diff --git a/gems/ast-merge/README.md b/gems/ast-merge/README.md index 4622d5c87..b3c8f629b 100644 --- a/gems/ast-merge/README.md +++ b/gems/ast-merge/README.md @@ -564,7 +564,6 @@ If none of the available licenses suit your use case, please [contact us](mailto [🖐contrib-rocks]: https://contrib.rocks [🖐contributors]: https://github.com/structuredmerge/structuredmerge-ruby/graphs/contributors [🖐contributors-img]: https://contrib.rocks/image?repo=structuredmerge/structuredmerge-ruby -[🚎contributors-gl]: https://gitlab.com/structuredmerge/structuredmerge-ruby/-/graphs/main [🪇conduct]: https://github.com/structuredmerge/structuredmerge-ruby/blob/main/CODE_OF_CONDUCT.md [🪇conduct-img]: https://img.shields.io/badge/Contributor_Covenant-2.1-259D6C.svg [📌pvc]: http://guides.rubygems.org/patterns/#pessimistic-version-constraint diff --git a/gems/markdown-merge/Gemfile.lock b/gems/markdown-merge/Gemfile.lock index d3673f046..c5162409f 100644 --- a/gems/markdown-merge/Gemfile.lock +++ b/gems/markdown-merge/Gemfile.lock @@ -16,6 +16,264 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +285,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -103,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -131,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -322,11 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -373,23 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -398,31 +684,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -430,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -442,20 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -470,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -481,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -508,9 +830,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -519,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -532,14 +858,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -547,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/tree_haver/Gemfile.lock b/gems/tree_haver/Gemfile.lock index 030a8301c..313641ac1 100644 --- a/gems/tree_haver/Gemfile.lock +++ b/gems/tree_haver/Gemfile.lock @@ -7,303 +7,59 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /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) + ansi (1.6.0) + appraisal2 (3.1.4) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + ast (2.4.3) + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) ast-crispr-markdown-markly (7.1.0) ast-crispr (= 7.1.0) markly-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) prism (>= 1.0) version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: ast-merge (7.1.0) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: + backports (3.25.3) bash-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.0) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - -GEM - remote: https://gem.coop/ - specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - ansi (1.6.0) - appraisal2 (3.1.4) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - 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) citrus (3.0.2) + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) cmdparse (3.0.7) commonmarker (2.9.0-aarch64-linux) commonmarker (2.9.0-aarch64-linux-musl) commonmarker (2.9.0-arm64-darwin) commonmarker (2.9.0-x86_64-linux) commonmarker (2.9.0-x86_64-linux-musl) + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -312,6 +68,11 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -361,12 +122,52 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - kettle-dev (2.3.6) + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -380,12 +181,24 @@ GEM turbo_tests2 (~> 3.1, >= 3.1.12) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) 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.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -411,9 +224,18 @@ GEM prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) psych (5.4.0) date stringio + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -422,6 +244,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) rdoc (6.17.0) erb psych (>= 4.0.0) @@ -517,6 +344,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -525,18 +356,22 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -572,6 +407,10 @@ GEM version_gem (~> 1.1, >= 1.1.13) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) @@ -595,6 +434,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.13) + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) yard (0.9.45) yard-fence (0.9.6) rdoc (>= 6.11, < 8) @@ -627,45 +470,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem (>= 7.0) + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -674,27 +496,20 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml (~> 0.3) - toml-merge! toml-rb (~> 4.1) tree_haver! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -705,13 +520,10 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) @@ -728,6 +540,7 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -741,17 +554,16 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) - kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae - kettle-drift (1.0.5) + kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.0) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -775,8 +587,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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 @@ -820,15 +630,15 @@ 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -851,7 +661,6 @@ CHECKSUMS tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) sha256=ad6743a373eeac954c1b659b17af3aff1c82918b3ce9c9dc572a7c70ff843cdd tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -864,7 +673,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 377c71c44e3ec32a3352452fd58797ba92919a1d Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 16:35:58 -0600 Subject: [PATCH 004/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ast-crispr-markdown-markly/.gitattributes | 2 +- .../.kettle-drift.lock | 60 +- gems/ast-crispr-markdown-markly/Gemfile | 40 + gems/ast-crispr-markdown-markly/Gemfile.lock | 407 ++- gems/ast-crispr/Gemfile.lock | 334 +- gems/ast-merge/.gitattributes | 2 +- gems/ast-merge/.rubocop_gradual.lock | 2827 ----------------- gems/ast-merge/Gemfile.lock | 59 +- gems/ast-merge/bin/yard | 2 +- gems/markdown-merge/.gitattributes | 2 +- gems/markdown-merge/.kettle-drift.lock | 60 +- gems/markdown-merge/Gemfile | 40 + gems/markdown-merge/Gemfile.lock | 326 +- gems/markly-merge/.gitattributes | 2 +- gems/markly-merge/.kettle-drift.lock | 60 +- gems/markly-merge/.rubocop_gradual.lock | 126 - gems/markly-merge/Gemfile | 40 + gems/markly-merge/Gemfile.lock | 404 ++- gems/markly-merge/lib/markly/merge/version.rb | 2 +- gems/tree_haver/Gemfile.lock | 385 ++- 20 files changed, 1616 insertions(+), 3564 deletions(-) delete mode 100644 gems/ast-merge/.rubocop_gradual.lock delete mode 100644 gems/markly-merge/.rubocop_gradual.lock diff --git a/gems/ast-crispr-markdown-markly/.gitattributes b/gems/ast-crispr-markdown-markly/.gitattributes index 0ac65aaa7..35a3c7359 100644 --- a/gems/ast-crispr-markdown-markly/.gitattributes +++ b/gems/ast-crispr-markdown-markly/.gitattributes @@ -1,5 +1,5 @@ # <> do not edit below this line -*.rb diff=smorg-ruby +*.rb diff=smorg-rb *.go diff=smorg-go *.rs diff=smorg-rs # <> diff --git a/gems/ast-crispr-markdown-markly/.kettle-drift.lock b/gems/ast-crispr-markdown-markly/.kettle-drift.lock index 9295a3562..628aa923c 100644 --- a/gems/ast-crispr-markdown-markly/.kettle-drift.lock +++ b/gems/ast-crispr-markdown-markly/.kettle-drift.lock @@ -4,7 +4,8 @@ "file": "Gemfile", "lines": [ 80, - 120 + 120, + 160 ] } ], @@ -13,7 +14,8 @@ "file": "Gemfile", "lines": [ 91, - 131 + 131, + 171 ] } ], @@ -22,7 +24,8 @@ "file": "Gemfile", "lines": [ 81, - 121 + 121, + 161 ] } ], @@ -31,7 +34,8 @@ "file": "Gemfile", "lines": [ 93, - 133 + 133, + 173 ] } ], @@ -40,7 +44,8 @@ "file": "Gemfile", "lines": [ 96, - 136 + 136, + 176 ] } ], @@ -49,7 +54,8 @@ "file": "Gemfile", "lines": [ 82, - 122 + 122, + 162 ] } ], @@ -59,7 +65,8 @@ "lines": [ 60, 100, - 140 + 140, + 180 ] } ], @@ -68,7 +75,8 @@ "file": "Gemfile", "lines": [ 101, - 141 + 141, + 181 ] } ], @@ -78,7 +86,8 @@ "lines": [ 43, 87, - 127 + 127, + 167 ] } ], @@ -87,7 +96,8 @@ "file": "Gemfile", "lines": [ 110, - 150 + 150, + 190 ] } ], @@ -97,7 +107,8 @@ "lines": [ 35, 79, - 119 + 119, + 159 ] } ], @@ -107,7 +118,8 @@ "lines": [ 69, 109, - 149 + 149, + 189 ] } ], @@ -116,7 +128,8 @@ "file": "Gemfile", "lines": [ 85, - 125 + 125, + 165 ] } ], @@ -126,7 +139,8 @@ "lines": [ 48, 92, - 132 + 132, + 172 ] } ], @@ -136,7 +150,8 @@ "lines": [ 44, 88, - 128 + 128, + 168 ] } ], @@ -145,7 +160,8 @@ "file": "Gemfile", "lines": [ 86, - 126 + 126, + 166 ] } ], @@ -154,7 +170,8 @@ "file": "Gemfile", "lines": [ 103, - 143 + 143, + 183 ] } ], @@ -163,7 +180,8 @@ "file": "Gemfile", "lines": [ 102, - 142 + 142, + 182 ] } ], @@ -172,7 +190,8 @@ "file": "Gemfile", "lines": [ 97, - 137 + 137, + 177 ] } ], @@ -181,7 +200,8 @@ "file": "Gemfile", "lines": [ 106, - 146 + 146, + 186 ] } ], diff --git a/gems/ast-crispr-markdown-markly/Gemfile b/gems/ast-crispr-markdown-markly/Gemfile index 7fbfaad74..9be79023e 100644 --- a/gems/ast-crispr-markdown-markly/Gemfile +++ b/gems/ast-crispr-markdown-markly/Gemfile @@ -152,6 +152,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/ast-crispr-markdown-markly/Gemfile.lock b/gems/ast-crispr-markdown-markly/Gemfile.lock index c9f436940..6cb850069 100644 --- a/gems/ast-crispr-markdown-markly/Gemfile.lock +++ b/gems/ast-crispr-markdown-markly/Gemfile.lock @@ -16,6 +16,280 @@ PATH markly-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.0) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,15 +301,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -44,6 +309,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -52,7 +323,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -108,15 +378,6 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -135,15 +396,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -288,22 +541,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -337,11 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -388,23 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-drift! + kettle-jem! + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -413,18 +684,26 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -433,20 +712,33 @@ CHECKSUMS ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -459,15 +751,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae + kettle-drift (1.0.5) + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.0) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 @@ -489,10 +786,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -500,6 +801,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -527,18 +829,19 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -552,14 +855,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -567,6 +875,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ast-crispr/Gemfile.lock b/gems/ast-crispr/Gemfile.lock index 641e73147..a142a37aa 100644 --- a/gems/ast-crispr/Gemfile.lock +++ b/gems/ast-crispr/Gemfile.lock @@ -16,6 +16,255 @@ PATH service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -44,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -107,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -135,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -328,11 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -380,23 +638,44 @@ DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -405,18 +684,26 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -424,13 +711,27 @@ CHECKSUMS appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -438,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -450,19 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -477,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -488,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -515,9 +830,11 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -527,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -540,14 +858,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -555,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ast-merge/.gitattributes b/gems/ast-merge/.gitattributes index 0ac65aaa7..35a3c7359 100644 --- a/gems/ast-merge/.gitattributes +++ b/gems/ast-merge/.gitattributes @@ -1,5 +1,5 @@ # <> do not edit below this line -*.rb diff=smorg-ruby +*.rb diff=smorg-rb *.go diff=smorg-go *.rs diff=smorg-rs # <> diff --git a/gems/ast-merge/.rubocop_gradual.lock b/gems/ast-merge/.rubocop_gradual.lock deleted file mode 100644 index ca390a589..000000000 --- a/gems/ast-merge/.rubocop_gradual.lock +++ /dev/null @@ -1,2827 +0,0 @@ -{ - ".simplecov:3463276878": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:429706125": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "ast-merge.gemspec:1182320030": [ - [16, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1168797721], - [129, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [144, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [145, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [152, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/ast-merge.rb:3005639624": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`ast-merge.rb`) should use snake_case.", 5381] - ], - "lib/ast/merge.rb:3429747270": [ - [11, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge`.", 2866359175], - [11, 3, 270037, "Metrics/ModuleLength: Module has too many lines. [5702/100]", 2847709439], - [22, 5, 16, "Style/Documentation: Missing top-level documentation comment for `class Ast::Merge::ParseError`.", 362242086], - [33, 7, 362, "Metrics/AbcSize: Assignment Branch Condition size for `build_message` is too high. [<2, 16, 6> 17.2/17]", 3988736327], - [47, 5, 31, "Style/Documentation: Missing top-level documentation comment for `class Ast::Merge::PlaceholderCollisionError`.", 218924302], - [161, 7, 337, "Metrics/MethodLength: Method has too many lines. [11/10]", 2388996629], - [178, 7, 327, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [8/7]", 979795121], - [309, 7, 383, "Metrics/MethodLength: Method has too many lines. [11/10]", 634650261], - [473, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 3450568485], - [474, 7, 461, "Metrics/MethodLength: Method has too many lines. [12/10]", 43929779], - [491, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1299979089], - [492, 7, 377, "Metrics/MethodLength: Method has too many lines. [11/10]", 3704151253], - [508, 121, 39, "Layout/LineLength: Line is too long. [159/120]", 85503958], - [509, 7, 447, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [8/7]", 298553749], - [509, 7, 447, "Metrics/MethodLength: Method has too many lines. [12/10]", 298553749], - [538, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1441148616], - [539, 7, 453, "Metrics/MethodLength: Method has too many lines. [14/10]", 1899007021], - [558, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193342990], - [559, 7, 400, "Metrics/MethodLength: Method has too many lines. [11/10]", 298553749], - [588, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860750], - [589, 7, 411, "Metrics/MethodLength: Method has too many lines. [12/10]", 2893925621], - [606, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3137791633], - [607, 7, 454, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [8/7]", 298553749], - [607, 7, 454, "Metrics/MethodLength: Method has too many lines. [12/10]", 298553749], - [666, 7, 385, "Metrics/MethodLength: Method has too many lines. [11/10]", 794265461], - [703, 7, 419, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [10/7]", 3313546353], - [703, 7, 419, "Metrics/PerceivedComplexity: Perceived complexity for `to_h` is too high. [10/8]", 3313546353], - [753, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 398187770], - [765, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 2746783933], - [812, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860841], - [820, 121, 156, "Layout/LineLength: Line is too long. [276/120]", 1149525480], - [825, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 2538424426], - [837, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 2285382915], - [847, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3962419360], - [860, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 398187770], - [862, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3195178507], - [866, 121, 85, "Layout/LineLength: Line is too long. [205/120]", 4238980637], - [868, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 2678411233], - [870, 121, 39, "Layout/LineLength: Line is too long. [159/120]", 4028520110], - [881, 121, 110, "Layout/LineLength: Line is too long. [230/120]", 3837814921], - [895, 5, 2283, "Metrics/MethodLength: Method has too many lines. [57/10]", 2282416447], - [955, 5, 2654, "Metrics/MethodLength: Method has too many lines. [63/10]", 2491520565], - [1006, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1823519875], - [1015, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1874311968], - [1021, 5, 10660, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_downstream_merge_gem_feature_matrix` is too high. [<0, 21, 0> 21/17]", 2277322577], - [1021, 5, 10660, "Metrics/MethodLength: Method has too many lines. [248/10]", 2277322577], - [1272, 5, 1546, "Metrics/MethodLength: Method has too many lines. [37/10]", 208933754], - [1306, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 2658452668], - [1312, 5, 4206, "Metrics/MethodLength: Method has too many lines. [96/10]", 1997530776], - [1389, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 183246985], - [1405, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 3268438356], - [1411, 5, 1598, "Metrics/MethodLength: Method has too many lines. [46/10]", 849757258], - [1454, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1323237892], - [1460, 5, 1164, "Metrics/MethodLength: Method has too many lines. [36/10]", 1477831421], - [1493, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 931876829], - [1499, 5, 1699, "Metrics/MethodLength: Method has too many lines. [43/10]", 1125544678], - [1545, 5, 1016, "Metrics/MethodLength: Method has too many lines. [27/10]", 2194427985], - [1575, 5, 1058, "Metrics/MethodLength: Method has too many lines. [30/10]", 47860722], - [1608, 5, 1186, "Metrics/MethodLength: Method has too many lines. [31/10]", 676863486], - [1636, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 2689509078], - [1642, 5, 1517, "Metrics/MethodLength: Method has too many lines. [41/10]", 3855445172], - [1655, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 817380904], - [1680, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 409671963], - [1686, 5, 2116, "Metrics/MethodLength: Method has too many lines. [61/10]", 524104794], - [1750, 5, 820, "Metrics/MethodLength: Method has too many lines. [12/10]", 1888457180], - [1750, 37, 298, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 789483382], - [1751, 121, 100, "Layout/LineLength: Line is too long. [220/120]", 3288750271], - [1766, 5, 3595, "Metrics/AbcSize: Assignment Branch Condition size for `initial_profile_promotion_policy` is too high. [<9, 20, 0> 21.93/17]", 83685787], - [1766, 5, 3595, "Metrics/MethodLength: Method has too many lines. [77/10]", 83685787], - [1846, 5, 768, "Metrics/MethodLength: Method has too many lines. [17/10]", 314059802], - [1867, 5, 1493, "Metrics/AbcSize: Assignment Branch Condition size for `evaluate_profile_selection_requirement` is too high. [<7, 23, 9> 25.67/17]", 3177555163], - [1867, 5, 1493, "Metrics/MethodLength: Method has too many lines. [29/10]", 3177555163], - [1868, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2145168012], - [1875, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 683002336], - [1909, 5, 985, "Metrics/AbcSize: Assignment Branch Condition size for `profile_promotion_blocking_reasons` is too high. [<4, 25, 13> 28.46/17]", 1146627465], - [1909, 5, 985, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `profile_promotion_blocking_reasons` is too high. [10/7]", 1146627465], - [1909, 5, 985, "Metrics/MethodLength: Method has too many lines. [18/10]", 1146627465], - [1909, 5, 985, "Metrics/PerceivedComplexity: Perceived complexity for `profile_promotion_blocking_reasons` is too high. [10/8]", 1146627465], - [1930, 5, 3173, "Metrics/AbcSize: Assignment Branch Condition size for `validate_language_backend_profile` is too high. [<25, 68, 20> 75.16/17]", 2100389324], - [1930, 5, 3173, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_language_backend_profile` is too high. [21/7]", 2100389324], - [1930, 5, 3173, "Metrics/MethodLength: Method has too many lines. [60/10]", 2100389324], - [1930, 5, 3173, "Metrics/PerceivedComplexity: Perceived complexity for `validate_language_backend_profile` is too high. [23/8]", 2100389324], - [2002, 5, 1523, "Metrics/AbcSize: Assignment Branch Condition size for `validate_backend_inventory` is too high. [<13, 38, 13> 42.21/17]", 1899037537], - [2002, 5, 1523, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_backend_inventory` is too high. [13/7]", 1899037537], - [2002, 5, 1523, "Metrics/MethodLength: Method has too many lines. [25/10]", 1899037537], - [2002, 5, 1523, "Metrics/PerceivedComplexity: Perceived complexity for `validate_backend_inventory` is too high. [13/8]", 1899037537], - [2045, 5, 906, "Metrics/MethodLength: Method has too many lines. [20/10]", 3137959843], - [2068, 5, 2744, "Metrics/AbcSize: Assignment Branch Condition size for `detect_raw_merge_inconsistencies` is too high. [<8, 43, 21> 48.52/17]", 3717440692], - [2068, 5, 2744, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_raw_merge_inconsistencies` is too high. [17/7]", 3717440692], - [2068, 5, 2744, "Metrics/MethodLength: Method has too many lines. [53/10]", 3717440692], - [2068, 5, 2744, "Metrics/PerceivedComplexity: Perceived complexity for `detect_raw_merge_inconsistencies` is too high. [17/8]", 3717440692], - [2083, 7, 1894, "Metrics/BlockLength: Block has too many lines. [33/25]", 758887611], - [2129, 5, 762, "Metrics/MethodLength: Method has too many lines. [11/10]", 3021402342], - [2143, 5, 490, "Metrics/MethodLength: Method has too many lines. [11/10]", 578473475], - [2157, 5, 881, "Metrics/AbcSize: Assignment Branch Condition size for `execute_independent_commutative_insertions` is too high. [<6, 16, 7> 18.47/17]", 259417386], - [2157, 5, 881, "Metrics/MethodLength: Method has too many lines. [21/10]", 259417386], - [2184, 5, 1107, "Metrics/AbcSize: Assignment Branch Condition size for `execute_independent_keyed_member_edits` is too high. [<10, 31, 15> 35.86/17]", 4271501385], - [2184, 5, 1107, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `execute_independent_keyed_member_edits` is too high. [14/7]", 4271501385], - [2184, 5, 1107, "Metrics/MethodLength: Method has too many lines. [24/10]", 4271501385], - [2184, 5, 1107, "Metrics/PerceivedComplexity: Perceived complexity for `execute_independent_keyed_member_edits` is too high. [14/8]", 4271501385], - [2228, 5, 3149, "Metrics/AbcSize: Assignment Branch Condition size for `parse_compact_ruleset` is too high. [<16, 68, 24> 73.86/17]", 3149098803], - [2228, 5, 3149, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_compact_ruleset` is too high. [22/7]", 3149098803], - [2228, 5, 3149, "Metrics/MethodLength: Method has too many lines. [67/10]", 3149098803], - [2228, 5, 3149, "Metrics/PerceivedComplexity: Perceived complexity for `parse_compact_ruleset` is too high. [23/8]", 3149098803], - [2234, 7, 2544, "Metrics/BlockLength: Block has too many lines. [50/25]", 2484860466], - [2261, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193420054], - [2307, 5, 2658, "Metrics/AbcSize: Assignment Branch Condition size for `compact_ruleset_feature_profile` is too high. [<11, 67, 38> 77.81/17]", 4022599673], - [2307, 5, 2658, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compact_ruleset_feature_profile` is too high. [29/7]", 4022599673], - [2307, 5, 2658, "Metrics/MethodLength: Method has too many lines. [66/10]", 4022599673], - [2307, 5, 2658, "Metrics/PerceivedComplexity: Perceived complexity for `compact_ruleset_feature_profile` is too high. [16/8]", 4022599673], - [2325, 7, 2243, "Metrics/BlockLength: Block has too many lines. [47/25]", 965041772], - [2392, 5, 2733, "Metrics/AbcSize: Assignment Branch Condition size for `classify_template_target_path` is too high. [<4, 36, 23> 42.91/17]", 3661828596], - [2392, 5, 2733, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `classify_template_target_path` is too high. [21/7]", 3661828596], - [2392, 5, 2733, "Metrics/MethodLength: Method has too many lines. [39/10]", 3661828596], - [2392, 5, 2733, "Metrics/PerceivedComplexity: Perceived complexity for `classify_template_target_path` is too high. [17/8]", 3661828596], - [2424, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [2438, 5, 416, "Metrics/MethodLength: Method has too many lines. [12/10]", 1388641773], - [2481, 5, 388, "Metrics/MethodLength: Method has too many lines. [12/10]", 2360583514], - [2510, 5, 820, "Metrics/MethodLength: Method has too many lines. [13/10]", 354674808], - [2526, 5, 929, "Metrics/AbcSize: Assignment Branch Condition size for `enrich_template_plan_entries` is too high. [<9, 12, 10> 18.03/17]", 2666747528], - [2526, 5, 929, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `enrich_template_plan_entries` is too high. [9/7]", 2666747528], - [2526, 5, 929, "Metrics/MethodLength: Method has too many lines. [19/10]", 2666747528], - [2526, 5, 929, "Metrics/PerceivedComplexity: Perceived complexity for `enrich_template_plan_entries` is too high. [10/8]", 2666747528], - [2549, 5, 1245, "Metrics/AbcSize: Assignment Branch Condition size for `enrich_template_plan_entries_with_token_state` is too high. [<11, 23, 14> 29.09/17]", 1507113977], - [2549, 5, 1245, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `enrich_template_plan_entries_with_token_state` is too high. [13/7]", 1507113977], - [2549, 5, 1245, "Metrics/MethodLength: Method has too many lines. [19/10]", 1507113977], - [2549, 5, 1245, "Metrics/PerceivedComplexity: Perceived complexity for `enrich_template_plan_entries_with_token_state` is too high. [13/8]", 1507113977], - [2573, 5, 1353, "Metrics/AbcSize: Assignment Branch Condition size for `prepare_template_entries` is too high. [<6, 18, 11> 21.93/17]", 2774310942], - [2573, 5, 1353, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `prepare_template_entries` is too high. [11/7]", 2774310942], - [2573, 5, 1353, "Metrics/MethodLength: Method has too many lines. [24/10]", 2774310942], - [2573, 5, 1353, "Metrics/PerceivedComplexity: Perceived complexity for `prepare_template_entries` is too high. [12/8]", 2774310942], - [2603, 5, 1494, "Metrics/AbcSize: Assignment Branch Condition size for `plan_template_execution` is too high. [<8, 22, 17> 28.93/17]", 3876421385], - [2603, 5, 1494, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `plan_template_execution` is too high. [14/7]", 3876421385], - [2603, 5, 1494, "Metrics/MethodLength: Method has too many lines. [29/10]", 3876421385], - [2603, 5, 1494, "Metrics/PerceivedComplexity: Perceived complexity for `plan_template_execution` is too high. [15/8]", 3876421385], - [2604, 7, 1421, "Metrics/BlockLength: Block has too many lines. [27/25]", 2887810383], - [2637, 5, 822, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 2749235529], - [2637, 37, 220, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 447165880], - [2638, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 518382509], - [2652, 5, 2060, "Metrics/AbcSize: Assignment Branch Condition size for `preview_template_execution` is too high. [<11, 42, 26> 50.61/17]", 2270817206], - [2652, 5, 2060, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preview_template_execution` is too high. [25/7]", 2270817206], - [2652, 5, 2060, "Metrics/MethodLength: Method has too many lines. [39/10]", 2270817206], - [2652, 5, 2060, "Metrics/PerceivedComplexity: Perceived complexity for `preview_template_execution` is too high. [23/8]", 2270817206], - [2662, 7, 1809, "Metrics/BlockLength: Block has too many lines. [28/25]", 310337564], - [2700, 5, 2513, "Metrics/AbcSize: Assignment Branch Condition size for `apply_template_execution` is too high. [<14, 50, 25> 57.63/17]", 177708331], - [2700, 5, 2513, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_template_execution` is too high. [26/7]", 177708331], - [2700, 5, 2513, "Metrics/MethodLength: Method has too many lines. [50/10]", 177708331], - [2700, 5, 2513, "Metrics/PerceivedComplexity: Perceived complexity for `apply_template_execution` is too high. [23/8]", 177708331], - [2711, 7, 2239, "Metrics/BlockLength: Block has too many lines. [38/25]", 1651205014], - [2761, 5, 1696, "Metrics/AbcSize: Assignment Branch Condition size for `evaluate_template_tree_convergence` is too high. [<11, 29, 17> 35.37/17]", 2507998041], - [2761, 5, 1696, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `evaluate_template_tree_convergence` is too high. [17/7]", 2507998041], - [2761, 5, 1696, "Metrics/MethodLength: Method has too many lines. [35/10]", 2507998041], - [2761, 5, 1696, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 2507998041], - [2761, 5, 1696, "Metrics/PerceivedComplexity: Perceived complexity for `evaluate_template_tree_convergence` is too high. [17/8]", 2507998041], - [2761, 43, 198, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 4214374277], - [2762, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 2983874608], - [2804, 5, 688, "Metrics/MethodLength: Method has too many lines. [15/10]", 3064253784], - [2804, 5, 688, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 3064253784], - [2804, 36, 216, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 448029307], - [2805, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3840139076], - [2848, 5, 664, "Metrics/MethodLength: Method has too many lines. [13/10]", 995637868], - [2848, 5, 664, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 995637868], - [2848, 53, 202, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 4227116196], - [2849, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 418683952], - [2866, 5, 649, "Metrics/MethodLength: Method has too many lines. [13/10]", 1831524792], - [2866, 5, 649, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 1831524792], - [2866, 54, 178, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2962381850], - [2867, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 3690915627], - [2884, 5, 1280, "Metrics/AbcSize: Assignment Branch Condition size for `apply_template_tree_execution_to_directory` is too high. [<6, 16, 6> 18.11/17]", 305449363], - [2884, 5, 1280, "Metrics/MethodLength: Method has too many lines. [23/10]", 305449363], - [2884, 5, 1280, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 305449363], - [2884, 51, 200, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1352434212], - [2885, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 1139621482], - [2913, 5, 2199, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_tree_run` is too high. [<15, 42, 31> 54.31/17]", 975627723], - [2913, 5, 2199, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_tree_run` is too high. [25/7]", 975627723], - [2913, 5, 2199, "Metrics/MethodLength: Method has too many lines. [38/10]", 975627723], - [2913, 5, 2199, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_tree_run` is too high. [26/8]", 975627723], - [2957, 5, 1515, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_apply` is too high. [<13, 35, 21> 42.84/17]", 3710254295], - [2957, 5, 1515, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_directory_apply` is too high. [17/7]", 3710254295], - [2957, 5, 1515, "Metrics/MethodLength: Method has too many lines. [26/10]", 3710254295], - [2957, 5, 1515, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_directory_apply` is too high. [17/8]", 3710254295], - [2972, 20, 1, "Style/DoubleNegation: Avoid the use of double negation (`!!`).", 177540], - [2989, 5, 1656, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_plan` is too high. [<11, 24, 25> 36.36/17]", 2946319293], - [2989, 5, 1656, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_directory_plan` is too high. [18/7]", 2946319293], - [2989, 5, 1656, "Metrics/MethodLength: Method has too many lines. [36/10]", 2946319293], - [2989, 5, 1656, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_directory_plan` is too high. [16/8]", 2946319293], - [3061, 7, 9, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 3648222389], - [3082, 5, 410, "Metrics/MethodLength: Method has too many lines. [12/10]", 248324428], - [3088, 7, 11, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 848344986], - [3132, 5, 712, "Metrics/MethodLength: Method has too many lines. [12/10]", 2500743043], - [3132, 27, 178, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 873705194], - [3132, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3023611470], - [3158, 42, 167, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2002181571], - [3171, 5, 1097, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structured_edit_selection_profile` is too high. [8/7]", 1149325233], - [3171, 5, 1097, "Metrics/MethodLength: Method has too many lines. [14/10]", 1149325233], - [3171, 42, 311, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 3814063337], - [3172, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 198450264], - [3185, 34, 47, "Style/SafeNavigation: Use safe navigation (`&.`) instead of checking if an object exists before calling the method.", 3204815976], - [3190, 5, 869, "Metrics/MethodLength: Method has too many lines. [11/10]", 83957392], - [3190, 41, 250, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1486072775], - [3191, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1967186495], - [3201, 36, 47, "Style/SafeNavigation: Use safe navigation (`&.`) instead of checking if an object exists before calling the method.", 3204815976], - [3206, 5, 1156, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structured_edit_match_profile` is too high. [10/7]", 4112674787], - [3206, 5, 1156, "Metrics/MethodLength: Method has too many lines. [15/10]", 4112674787], - [3206, 5, 1156, "Metrics/PerceivedComplexity: Perceived complexity for `structured_edit_match_profile` is too high. [10/8]", 4112674787], - [3206, 38, 321, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [12/5]", 823565876], - [3207, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859667], - [3208, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3673982236], - [3226, 5, 933, "Metrics/MethodLength: Method has too many lines. [14/10]", 2099388915], - [3226, 37, 319, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [12/5]", 250907892], - [3227, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177545], - [3228, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 4154814685], - [3245, 5, 907, "Metrics/MethodLength: Method has too many lines. [12/10]", 2242846328], - [3245, 42, 275, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 246196330], - [3246, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1439117336], - [3262, 5, 1057, "Metrics/MethodLength: Method has too many lines. [14/10]", 2891607970], - [3262, 44, 323, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 1386547750], - [3263, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1676243675], - [3264, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 4154814685], - [3281, 5, 1375, "Metrics/AbcSize: Assignment Branch Condition size for `structured_edit_request` is too high. [<11, 25, 10> 29.09/17]", 4153786554], - [3281, 5, 1375, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structured_edit_request` is too high. [11/7]", 4153786554], - [3281, 5, 1375, "Metrics/MethodLength: Method has too many lines. [16/10]", 4153786554], - [3281, 5, 1375, "Metrics/PerceivedComplexity: Perceived complexity for `structured_edit_request` is too high. [11/8]", 4153786554], - [3281, 32, 370, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [13/5]", 2381882467], - [3282, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177545], - [3303, 5, 728, "Metrics/MethodLength: Method has too many lines. [11/10]", 4026157473], - [3303, 31, 175, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 773121544], - [3335, 5, 597, "Metrics/MethodLength: Method has too many lines. [11/10]", 4143495860], - [3374, 5, 577, "Metrics/MethodLength: Method has too many lines. [11/10]", 4169131743], - [3389, 5, 1011, "Metrics/AbcSize: Assignment Branch Condition size for `structured_edit_execution_report` is too high. [<7, 16, 7> 18.81/17]", 876221899], - [3389, 5, 1011, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structured_edit_execution_report` is too high. [8/7]", 876221899], - [3389, 5, 1011, "Metrics/MethodLength: Method has too many lines. [12/10]", 876221899], - [3389, 41, 245, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 2484440861], - [3390, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 4036992717], - [3415, 55, 170, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 668161765], - [3438, 5, 819, "Metrics/MethodLength: Method has too many lines. [12/10]", 2287133436], - [3438, 56, 217, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3198032135], - [3439, 121, 51, "Layout/LineLength: Line is too long. [171/120]", 3526181051], - [3472, 5, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 1853778635], - [3481, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], - [3513, 5, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 1132214891], - [3522, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], - [3544, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 556747511], - [3553, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1808630920], - [3575, 5, 708, "Metrics/MethodLength: Method has too many lines. [11/10]", 3590891170], - [3584, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1367166441], - [3607, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 689748855], - [3616, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1808630920], - [3638, 5, 708, "Metrics/MethodLength: Method has too many lines. [11/10]", 1478642210], - [3647, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1367166441], - [3671, 5, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 239506091], - [3680, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], - [3702, 5, 693, "Metrics/MethodLength: Method has too many lines. [11/10]", 3803476550], - [3711, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], - [3734, 5, 728, "Metrics/MethodLength: Method has too many lines. [11/10]", 748161230], - [3743, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 2807086497], - [3765, 5, 758, "Metrics/MethodLength: Method has too many lines. [11/10]", 3900524558], - [3774, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3463884836], - [3798, 5, 748, "Metrics/MethodLength: Method has too many lines. [11/10]", 2076716686], - [3807, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 609414023], - [3829, 5, 778, "Metrics/MethodLength: Method has too many lines. [11/10]", 867958318], - [3833, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193343749], - [3838, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 1202823007], - [3862, 5, 728, "Metrics/MethodLength: Method has too many lines. [11/10]", 2078323790], - [3871, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 2807086497], - [3893, 5, 758, "Metrics/MethodLength: Method has too many lines. [11/10]", 121025422], - [3902, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3463884836], - [3924, 5, 733, "Metrics/MethodLength: Method has too many lines. [11/10]", 1216456558], - [3933, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 145839927], - [3955, 5, 763, "Metrics/MethodLength: Method has too many lines. [11/10]", 2946525998], - [3964, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 275709226], - [3988, 5, 768, "Metrics/MethodLength: Method has too many lines. [11/10]", 3281402414], - [3992, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177656], - [3997, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 1427340581], - [4034, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3673982236], - [4091, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193417070], - [4102, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2768444], - [4109, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3833204035], - [4117, 5, 863, "Metrics/MethodLength: Method has too many lines. [11/10]", 3731153486], - [4121, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 4054494590], - [4126, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 2084326338], - [4132, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 4201858364], - [4136, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861122], - [4140, 5, 873, "Metrics/MethodLength: Method has too many lines. [11/10]", 1866057614], - [4144, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3893180930], - [4149, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 863421408], - [4155, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 3247130491], - [4159, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1171438608], - [4163, 5, 883, "Metrics/MethodLength: Method has too many lines. [11/10]", 2352924462], - [4163, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860841], - [4164, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861334], - [4167, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 465221046], - [4172, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 1922522532], - [4188, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 4067226670], - [4192, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2033573170], - [4196, 5, 893, "Metrics/MethodLength: Method has too many lines. [11/10]", 1633175534], - [4196, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087926422], - [4197, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087421565], - [4200, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 615151909], - [4205, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 884393597], - [4231, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 417844693], - [4235, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1233681340], - [4239, 5, 903, "Metrics/MethodLength: Method has too many lines. [11/10]", 3964877742], - [4239, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873471], - [4240, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1322899615], - [4243, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 3471008807], - [4248, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 627945471], - [4254, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 2960084092], - [4258, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2148514258], - [4262, 5, 913, "Metrics/MethodLength: Method has too many lines. [11/10]", 385546958], - [4262, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2970472935], - [4263, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3808956371], - [4266, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 3412499338], - [4271, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 3274208144], - [4277, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 4275923717], - [4285, 5, 848, "Metrics/MethodLength: Method has too many lines. [11/10]", 457851502], - [4289, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 413805135], - [4294, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 951908917], - [4300, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 1859200227], - [4308, 5, 808, "Metrics/MethodLength: Method has too many lines. [11/10]", 884695726], - [4312, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 2011807620], - [4317, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 384138219], - [4323, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1176320663], - [4331, 5, 798, "Metrics/MethodLength: Method has too many lines. [11/10]", 1422521838], - [4335, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3247420006], - [4340, 121, 35, "Layout/LineLength: Line is too long. [155/120]", 1408316702], - [4346, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 938465266], - [4354, 5, 803, "Metrics/MethodLength: Method has too many lines. [11/10]", 2370839950], - [4358, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 74128911], - [4363, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 1364659899], - [4369, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2059517661], - [4377, 5, 803, "Metrics/MethodLength: Method has too many lines. [11/10]", 3379336814], - [4381, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 74128911], - [4386, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 1364659899], - [4434, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 4281772560], - [4442, 5, 833, "Metrics/MethodLength: Method has too many lines. [11/10]", 3245498510], - [4446, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3542644754], - [4451, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1916814773], - [4457, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 859690879], - [4465, 5, 833, "Metrics/MethodLength: Method has too many lines. [11/10]", 4138830126], - [4469, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3542644754], - [4474, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1916814773], - [4480, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3880141603], - [4488, 5, 828, "Metrics/MethodLength: Method has too many lines. [11/10]", 3621010990], - [4492, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3917260126], - [4497, 121, 41, "Layout/LineLength: Line is too long. [161/120]", 1879260859], - [4503, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1776611011], - [4511, 5, 838, "Metrics/MethodLength: Method has too many lines. [11/10]", 514585454], - [4515, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1353518231], - [4520, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 1228459824], - [4526, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 3932349968], - [4530, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087903307], - [4534, 5, 878, "Metrics/MethodLength: Method has too many lines. [11/10]", 1525737454], - [4534, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], - [4535, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177538], - [4538, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 2895681070], - [4543, 121, 51, "Layout/LineLength: Line is too long. [171/120]", 4040662298], - [4549, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 66929045], - [4557, 5, 808, "Metrics/MethodLength: Method has too many lines. [11/10]", 1626746606], - [4561, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 2011807620], - [4566, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 384138219], - [4580, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 849230508], - [4588, 5, 838, "Metrics/MethodLength: Method has too many lines. [11/10]", 3531122670], - [4592, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1353518231], - [4597, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 1228459824], - [4612, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1176320663], - [4620, 5, 798, "Metrics/MethodLength: Method has too many lines. [11/10]", 1118421486], - [4624, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3247420006], - [4629, 121, 35, "Layout/LineLength: Line is too long. [155/120]", 1408316702], - [4651, 5, 693, "Metrics/MethodLength: Method has too many lines. [11/10]", 1668406662], - [4660, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], - [4674, 5, 648, "Metrics/MethodLength: Method has too many lines. [11/10]", 3479836893], - [4683, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193343749], - [4705, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 3147549879], - [4714, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1808630920], - [4749, 5, 677, "Metrics/MethodLength: Method has too many lines. [11/10]", 1206941784], - [4758, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3937819337], - [4781, 5, 672, "Metrics/MethodLength: Method has too many lines. [11/10]", 3634903061], - [4790, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], - [4812, 5, 683, "Metrics/MethodLength: Method has too many lines. [11/10]", 3417053461], - [4821, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], - [4845, 5, 668, "Metrics/MethodLength: Method has too many lines. [11/10]", 1540762726], - [4854, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1808630920], - [4876, 5, 698, "Metrics/MethodLength: Method has too many lines. [11/10]", 2804825893], - [4885, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1367166441], - [4908, 5, 683, "Metrics/MethodLength: Method has too many lines. [11/10]", 3165010613], - [4917, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], - [4939, 5, 713, "Metrics/MethodLength: Method has too many lines. [11/10]", 2795628035], - [4948, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 497133415], - [4954, 5, 864, "Metrics/MethodLength: Method has too many lines. [12/10]", 1086224878], - [4954, 50, 268, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 4022739767], - [4955, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1607400384], - [4979, 5, 658, "Metrics/MethodLength: Method has too many lines. [11/10]", 3999796489], - [4988, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 102058825], - [5002, 59, 179, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1569981428], - [5003, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 1515849732], - [5034, 5, 694, "Metrics/MethodLength: Method has too many lines. [11/10]", 3830236120], - [5043, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2250857971], - [5057, 5, 673, "Metrics/MethodLength: Method has too many lines. [11/10]", 2413908653], - [5066, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1225026887], - [5080, 5, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 3935895659], - [5089, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], - [5103, 5, 692, "Metrics/MethodLength: Method has too many lines. [11/10]", 3660669627], - [5112, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3558241761], - [5126, 5, 612, "Metrics/MethodLength: Method has too many lines. [11/10]", 100391811], - [5165, 5, 693, "Metrics/MethodLength: Method has too many lines. [11/10]", 3138587622], - [5174, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], - [5196, 5, 688, "Metrics/MethodLength: Method has too many lines. [11/10]", 2736088861], - [5205, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1992103013], - [5228, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 2275602867], - [5237, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3598350322], - [5260, 5, 602, "Metrics/MethodLength: Method has too many lines. [11/10]", 3023166371], - [5275, 36, 181, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1071580945], - [5288, 5, 787, "Metrics/AbcSize: Assignment Branch Condition size for `group_projected_child_review_cases` is too high. [<4, 17, 4> 17.92/17]", 3391527151], - [5288, 5, 787, "Metrics/MethodLength: Method has too many lines. [18/10]", 3391527151], - [5312, 5, 705, "Metrics/MethodLength: Method has too many lines. [13/10]", 2629923275], - [5339, 5, 547, "Metrics/MethodLength: Method has too many lines. [12/10]", 1911190850], - [5364, 5, 1516, "Metrics/AbcSize: Assignment Branch Condition size for `review_projected_child_groups` is too high. [<11, 21, 9> 25.36/17]", 3333110579], - [5364, 5, 1516, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `review_projected_child_groups` is too high. [8/7]", 3333110579], - [5364, 5, 1516, "Metrics/MethodLength: Method has too many lines. [39/10]", 3333110579], - [5364, 5, 1516, "Metrics/PerceivedComplexity: Perceived complexity for `review_projected_child_groups` is too high. [9/8]", 3333110579], - [5398, 7, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], - [5410, 5, 562, "Metrics/MethodLength: Method has too many lines. [14/10]", 3083915102], - [5429, 5, 1898, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_delegated_child_outputs` is too high. [<11, 21, 6> 24.45/17]", 2739722546], - [5429, 5, 1898, "Metrics/MethodLength: Method has too many lines. [49/10]", 2739722546], - [5484, 5, 942, "Metrics/AbcSize: Assignment Branch Condition size for `execute_nested_merge` is too high. [<3, 17, 6> 18.28/17]", 766157172], - [5484, 5, 942, "Metrics/MethodLength: Method has too many lines. [20/10]", 766157172], - [5484, 29, 144, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1404367793], - [5511, 5, 652, "Metrics/MethodLength: Method has too many lines. [13/10]", 2105803856], - [5530, 38, 140, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1682835820], - [5560, 5, 577, "Metrics/MethodLength: Method has too many lines. [12/10]", 2659610443], - [5629, 5, 569, "Metrics/MethodLength: Method has too many lines. [14/10]", 20616641], - [5657, 5, 772, "Metrics/AbcSize: Assignment Branch Condition size for `conformance_manifest_review_request_ids` is too high. [<7, 16, 8> 19.21/17]", 3577418475], - [5657, 5, 772, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `conformance_manifest_review_request_ids` is too high. [9/7]", 3577418475], - [5657, 5, 772, "Metrics/MethodLength: Method has too many lines. [14/10]", 3577418475], - [5657, 5, 772, "Metrics/PerceivedComplexity: Perceived complexity for `conformance_manifest_review_request_ids` is too high. [9/8]", 3577418475], - [5711, 5, 606, "Metrics/MethodLength: Method has too many lines. [11/10]", 2675086662], - [5726, 5, 562, "Metrics/MethodLength: Method has too many lines. [11/10]", 3811715870], - [5741, 5, 578, "Metrics/MethodLength: Method has too many lines. [11/10]", 1776197415], - [5756, 5, 1298, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_conformance_family_context` is too high. [<7, 28, 9> 30.23/17]", 4265202259], - [5756, 5, 1298, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `resolve_conformance_family_context` is too high. [10/7]", 4265202259], - [5756, 5, 1298, "Metrics/MethodLength: Method has too many lines. [23/10]", 4265202259], - [5756, 5, 1298, "Metrics/PerceivedComplexity: Perceived complexity for `resolve_conformance_family_context` is too high. [10/8]", 4265202259], - [5785, 5, 1994, "Metrics/AbcSize: Assignment Branch Condition size for `review_conformance_family_context` is too high. [<12, 24, 10> 28.64/17]", 2834851944], - [5785, 5, 1994, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `review_conformance_family_context` is too high. [10/7]", 2834851944], - [5785, 5, 1994, "Metrics/MethodLength: Method has too many lines. [41/10]", 2834851944], - [5785, 5, 1994, "Metrics/PerceivedComplexity: Perceived complexity for `review_conformance_family_context` is too high. [11/8]", 2834851944], - [5808, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 641612328], - [5845, 5, 1844, "Metrics/AbcSize: Assignment Branch Condition size for `select_conformance_case` is too high. [<2, 43, 14> 45.27/17]", 670673209], - [5845, 5, 1844, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `select_conformance_case` is too high. [14/7]", 670673209], - [5845, 5, 1844, "Metrics/MethodLength: Method has too many lines. [30/10]", 670673209], - [5845, 5, 1844, "Metrics/PerceivedComplexity: Perceived complexity for `select_conformance_case` is too high. [16/8]", 670673209], - [5850, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 2135503892], - [5852, 121, 41, "Layout/LineLength: Line is too long. [161/120]", 3932054828], - [5861, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 3169124957], - [5883, 5, 509, "Metrics/MethodLength: Method has too many lines. [11/10]", 3552283123], - [5972, 5, 4195, "Metrics/AbcSize: Assignment Branch Condition size for `review_conformance_manifest` is too high. [<37, 63, 16> 74.79/17]", 2166560528], - [5972, 5, 4195, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `review_conformance_manifest` is too high. [14/7]", 2166560528], - [5972, 5, 4195, "Metrics/MethodLength: Method has too many lines. [89/10]", 2166560528], - [5972, 5, 4195, "Metrics/PerceivedComplexity: Perceived complexity for `review_conformance_manifest` is too high. [17/8]", 2166560528], - [6037, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2746826653], - [6053, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 3035993839], - [6075, 5, 676, "Metrics/MethodLength: Method has too many lines. [15/10]", 3048335475], - [6098, 5, 1054, "Metrics/AbcSize: Assignment Branch Condition size for `plan_conformance_suite` is too high. [<11, 18, 8> 22.56/17]", 1855254788], - [6098, 5, 1054, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `plan_conformance_suite` is too high. [8/7]", 1855254788], - [6098, 5, 1054, "Metrics/MethodLength: Method has too many lines. [25/10]", 1855254788], - [6098, 31, 84, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 172854173], - [6163, 5, 1274, "Metrics/AbcSize: Assignment Branch Condition size for `plan_named_conformance_suites_with_diagnostics` is too high. [<11, 21, 7> 24.72/17]", 3991300730], - [6163, 5, 1274, "Metrics/MethodLength: Method has too many lines. [27/10]", 3991300730], - [6190, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 3035993839], - [6255, 5, 2071, "Metrics/AbcSize: Assignment Branch Condition size for `review_decision_for_family_context` is too high. [<7, 22, 16> 28.09/17]", 4245377184], - [6255, 5, 2071, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `review_decision_for_family_context` is too high. [12/7]", 4245377184], - [6255, 5, 2071, "Metrics/MethodLength: Method has too many lines. [46/10]", 4245377184], - [6255, 5, 2071, "Metrics/PerceivedComplexity: Perceived complexity for `review_decision_for_family_context` is too high. [12/8]", 4245377184], - [6260, 7, 1766, "Metrics/BlockLength: Block has too many lines. [40/25]", 65448241], - [6312, 5, 686, "Metrics/MethodLength: Method has too many lines. [13/10]", 4030291682] - ], - "lib/ast/merge/ast_node.rb:2037773320": [ - [44, 5, 7086, "Metrics/ClassLength: Class has too many lines. [114/100]", 201314721], - [220, 11, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183] - ], - "lib/ast/merge/comment/attachment.rb:2388154769": [ - [42, 23, 180, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3775370530], - [75, 24, 2, "Lint/SafeNavigationConsistency: Use `.` instead of unnecessary `&.`.", 5858765], - [81, 25, 2, "Lint/SafeNavigationConsistency: Use `.` instead of unnecessary `&.`.", 5858765], - [114, 9, 410, "Metrics/AbcSize: Assignment Branch Condition size for `inspect` is too high. [<1, 17, 4> 17.49/17]", 605978105], - [115, 32, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] - ], - "lib/ast/merge/comment/augmenter.rb:633395157": [ - [12, 7, 13967, "Metrics/ClassLength: Class has too many lines. [291/100]", 2806660144], - [33, 9, 721, "Metrics/MethodLength: Method has too many lines. [16/10]", 200402816], - [33, 23, 91, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2938734913], - [64, 9, 1335, "Metrics/AbcSize: Assignment Branch Condition size for `build!` is too high. [<12, 29, 6> 31.95/17]", 3904283188], - [64, 9, 1335, "Metrics/MethodLength: Method has too many lines. [22/10]", 3904283188], - [94, 9, 867, "Metrics/AbcSize: Assignment Branch Condition size for `infer_leading_comments` is too high. [<8, 19, 14> 24.92/17]", 1941464872], - [94, 9, 867, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_leading_comments` is too high. [11/7]", 1941464872], - [94, 9, 867, "Metrics/MethodLength: Method has too many lines. [20/10]", 1941464872], - [94, 9, 867, "Metrics/PerceivedComplexity: Perceived complexity for `infer_leading_comments` is too high. [12/8]", 1941464872], - [122, 9, 429, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_inline_comments` is too high. [8/7]", 2688935834], - [133, 9, 934, "Metrics/AbcSize: Assignment Branch Condition size for `infer_trailing_comments` is too high. [<8, 21, 18> 28.79/17]", 1551855281], - [133, 9, 934, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_trailing_comments` is too high. [15/7]", 1551855281], - [133, 9, 934, "Metrics/MethodLength: Method has too many lines. [20/10]", 1551855281], - [133, 9, 934, "Metrics/PerceivedComplexity: Perceived complexity for `infer_trailing_comments` is too high. [15/8]", 1551855281], - [160, 9, 488, "Metrics/AbcSize: Assignment Branch Condition size for `infer_postlude!` is too high. [<5, 17, 8> 19.44/17]", 2562637949], - [160, 9, 488, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_postlude!` is too high. [8/7]", 2562637949], - [173, 9, 1529, "Metrics/AbcSize: Assignment Branch Condition size for `infer_remaining_regions!` is too high. [<12, 27, 23> 37.44/17]", 3911657050], - [173, 9, 1529, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_remaining_regions!` is too high. [18/7]", 3911657050], - [173, 9, 1529, "Metrics/MethodLength: Method has too many lines. [28/10]", 3911657050], - [173, 9, 1529, "Metrics/PerceivedComplexity: Perceived complexity for `infer_remaining_regions!` is too high. [20/8]", 3911657050], - [216, 9, 507, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split_preamble_group` is too high. [8/7]", 336784898], - [231, 9, 588, "Metrics/MethodLength: Method has too many lines. [17/10]", 3445626532], - [274, 9, 965, "Metrics/AbcSize: Assignment Branch Condition size for `build_region` is too high. [<6, 17, 7> 19.34/17]", 344809006], - [274, 9, 965, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_region` is too high. [8/7]", 344809006], - [274, 9, 965, "Metrics/MethodLength: Method has too many lines. [24/10]", 344809006] - ], - "lib/ast/merge/comment/block.rb:3806757604": [ - [31, 7, 6754, "Metrics/ClassLength: Class has too many lines. [106/100]", 2308582303], - [57, 9, 1059, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<12, 13, 14> 22.56/17]", 2656171724], - [57, 9, 1059, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `initialize` is too high. [14/7]", 2656171724], - [57, 9, 1059, "Metrics/MethodLength: Method has too many lines. [21/10]", 2656171724], - [57, 9, 1059, "Metrics/PerceivedComplexity: Perceived complexity for `initialize` is too high. [15/8]", 2656171724], - [113, 9, 511, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `freeze_action` is too high. [9/7]", 55014877], - [113, 9, 511, "Metrics/MethodLength: Method has too many lines. [12/10]", 55014877], - [113, 9, 511, "Metrics/PerceivedComplexity: Perceived complexity for `freeze_action` is too high. [9/8]", 55014877], - [181, 9, 439, "Metrics/AbcSize: Assignment Branch Condition size for `first_meaningful_content` is too high. [<2, 16, 11> 19.52/17]", 680479883], - [181, 9, 439, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `first_meaningful_content` is too high. [11/7]", 680479883], - [181, 9, 439, "Metrics/PerceivedComplexity: Perceived complexity for `first_meaningful_content` is too high. [12/8]", 680479883], - [197, 9, 765, "Metrics/AbcSize: Assignment Branch Condition size for `extract_block_content` is too high. [<7, 24, 9> 26.57/17]", 621871624], - [197, 9, 765, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_block_content` is too high. [9/7]", 621871624], - [197, 9, 765, "Metrics/PerceivedComplexity: Perceived complexity for `extract_block_content` is too high. [9/8]", 621871624] - ], - "lib/ast/merge/comment/c_style_tracker_base.rb:1569556520": [ - [22, 7, 15053, "Metrics/ClassLength: Class has too many lines. [284/100]", 3599183270], - [83, 9, 509, "Metrics/MethodLength: Method has too many lines. [11/10]", 1639553915], - [102, 9, 492, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `leading_comments_before` is too high. [8/7]", 3127043491], - [102, 9, 492, "Metrics/MethodLength: Method has too many lines. [11/10]", 3127043491], - [124, 9, 487, "Metrics/MethodLength: Method has too many lines. [11/10]", 1869933531], - [176, 9, 713, "Metrics/AbcSize: Assignment Branch Condition size for `trailing_comments_after` is too high. [<6, 12, 13> 18.68/17]", 543703521], - [176, 9, 713, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trailing_comments_after` is too high. [11/7]", 543703521], - [176, 9, 713, "Metrics/MethodLength: Method has too many lines. [14/10]", 543703521], - [176, 9, 713, "Metrics/PerceivedComplexity: Perceived complexity for `trailing_comments_after` is too high. [11/8]", 543703521], - [184, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177549], - [202, 9, 598, "Metrics/MethodLength: Method has too many lines. [12/10]", 1628921093], - [222, 9, 1271, "Metrics/MethodLength: Method has too many lines. [21/10]", 612335469], - [222, 35, 137, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1823300034], - [329, 35, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [348, 9, 2271, "Metrics/AbcSize: Assignment Branch Condition size for `extract_comments` is too high. [<17, 32, 13> 38.5/17]", 2751274968], - [348, 9, 2271, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_comments` is too high. [14/7]", 2751274968], - [348, 9, 2271, "Metrics/MethodLength: Method has too many lines. [59/10]", 2751274968], - [348, 9, 2271, "Metrics/PerceivedComplexity: Perceived complexity for `extract_comments` is too high. [14/8]", 2751274968], - [353, 11, 2045, "Metrics/BlockLength: Block has too many lines. [52/25]", 575665179], - [418, 9, 659, "Metrics/MethodLength: Method has too many lines. [15/10]", 177254901], - [439, 71, 4, "Lint/UnusedMethodArgument: Unused method argument - `line`.", 2087656651], - [439, 78, 8, "Lint/UnusedMethodArgument: Unused method argument - `line_num`.", 622661090] - ], - "lib/ast/merge/comment/hash_tracker_base.rb:861186417": [ - [32, 7, 19362, "Metrics/ClassLength: Class has too many lines. [221/100]", 1031055222], - [118, 9, 444, "Metrics/MethodLength: Method has too many lines. [11/10]", 3347260807], - [142, 9, 921, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `leading_comments_before` is too high. [8/7]", 415734636], - [142, 9, 921, "Metrics/MethodLength: Method has too many lines. [11/10]", 415734636], - [172, 9, 440, "Metrics/MethodLength: Method has too many lines. [11/10]", 2464474004], - [225, 9, 623, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trailing_comments_after` is too high. [10/7]", 543703521], - [225, 9, 623, "Metrics/MethodLength: Method has too many lines. [12/10]", 543703521], - [225, 9, 623, "Metrics/PerceivedComplexity: Perceived complexity for `trailing_comments_after` is too high. [10/8]", 543703521], - [249, 9, 551, "Metrics/MethodLength: Method has too many lines. [12/10]", 2783654570], - [278, 9, 1271, "Metrics/MethodLength: Method has too many lines. [21/10]", 612335469], - [278, 35, 137, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1823300034], - [374, 35, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [439, 9, 826, "Metrics/MethodLength: Method has too many lines. [12/10]", 1706632542] - ], - "lib/ast/merge/comment/parser.rb:2674748021": [ - [34, 7, 8372, "Metrics/ClassLength: Class has too many lines. [141/100]", 2541983664], - [84, 9, 357, "Metrics/MethodLength: Method has too many lines. [12/10]", 2265493710], - [104, 9, 545, "Metrics/AbcSize: Assignment Branch Condition size for `auto_detect_style` is too high. [<5, 17, 7> 19.05/17]", 868366444], - [104, 9, 545, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `auto_detect_style` is too high. [8/7]", 868366444], - [125, 9, 1650, "Metrics/AbcSize: Assignment Branch Condition size for `parse_line_comments` is too high. [<8, 28, 7> 29.95/17]", 1511562163], - [125, 9, 1650, "Metrics/MethodLength: Method has too many lines. [31/10]", 1511562163], - [176, 9, 2670, "Metrics/AbcSize: Assignment Branch Condition size for `parse_with_block_comments` is too high. [<15, 47, 15> 51.57/17]", 2963765048], - [176, 9, 2670, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_with_block_comments` is too high. [15/7]", 2963765048], - [176, 9, 2670, "Metrics/MethodLength: Method has too many lines. [47/10]", 2963765048], - [176, 9, 2670, "Metrics/PerceivedComplexity: Perceived complexity for `parse_with_block_comments` is too high. [16/8]", 2963765048], - [181, 11, 2390, "Metrics/BlockLength: Block has too many lines. [40/25]", 3720582340] - ], - "lib/ast/merge/comment/quoted_hash_line_parser.rb:2878420841": [ - [74, 9, 458, "Metrics/MethodLength: Method has too many lines. [11/10]", 1526360697], - [91, 9, 620, "Metrics/AbcSize: Assignment Branch Condition size for `inline_result` is too high. [<3, 16, 6> 17.35/17]", 2706755447], - [91, 9, 620, "Metrics/MethodLength: Method has too many lines. [14/10]", 2706755447] - ], - "lib/ast/merge/comment/region_merge_policy.rb:176745155": [ - [23, 23, 98, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1029631546], - [55, 9, 423, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `freeze_sensitive?` is too high. [8/7]", 4102661282], - [61, 41, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [61, 85, 2, "Lint/SafeNavigationConsistency: Use `.` instead of unnecessary `&.`.", 5858765], - [96, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3491399903] - ], - "lib/ast/merge/comment/style.rb:3045051983": [ - [27, 7, 9109, "Metrics/ClassLength: Class has too many lines. [143/100]", 131723516], - [142, 11, 911, "Metrics/MethodLength: Method has too many lines. [17/10]", 355862493], - [142, 23, 164, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 668558018], - [203, 23, 164, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 668558018] - ], - "lib/ast/merge/comment/tracked_hash_adapter.rb:3235547929": [ - [99, 11, 553, "Metrics/AbcSize: Assignment Branch Condition size for `line_text_from` is too high. [<4, 20, 4> 20.78/17]", 2680273536], - [99, 11, 553, "Metrics/MethodLength: Method has too many lines. [13/10]", 2680273536] - ], - "lib/ast/merge/composite_match_refiner.rb:1718969703": [ - [58, 7, 668, "Metrics/MethodLength: Method has too many lines. [14/10]", 2649148714] - ], - "lib/ast/merge/conflict_resolver_base.rb:765343263": [ - [69, 5, 14959, "Metrics/ClassLength: Class has too many lines. [170/100]", 633092728], - [156, 7, 919, "Metrics/MethodLength: Method has too many lines. [13/10]", 1701319380], - [156, 21, 200, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3369976202], - [367, 7, 972, "Metrics/MethodLength: Method has too many lines. [22/10]", 2870739148], - [434, 47, 13, "Style/NumericPredicate: Use `recursive.positive?` instead of `recursive > 0`.", 462999281], - [436, 99, 14, "Style/NumericPredicate: Use `recursive.zero?` instead of `recursive == 0`.", 2394069519] - ], - "lib/ast/merge/content_match_refiner.rb:3628272158": [ - [47, 5, 7719, "Metrics/ClassLength: Class has too many lines. [108/100]", 651494487], - [87, 7, 750, "Metrics/MethodLength: Method has too many lines. [17/10]", 3624290009], - [165, 37, 48, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 953994744], - [232, 7, 846, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<13, 29, 8> 32.77/17]", 3597737347], - [232, 7, 846, "Metrics/MethodLength: Method has too many lines. [20/10]", 3597737347] - ], - "lib/ast/merge/debug_logger.rb:1783610128": [ - [72, 5, 7614, "Metrics/ModuleLength: Module has too many lines. [118/100]", 736598454], - [85, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 941621], - [206, 7, 584, "Metrics/AbcSize: Assignment Branch Condition size for `time` is too high. [<3, 17, 2> 17.38/17]", 3468868523], - [206, 7, 584, "Metrics/MethodLength: Method has too many lines. [14/10]", 3468868523], - [269, 7, 450, "Metrics/PerceivedComplexity: Perceived complexity for `extract_lines` is too high. [9/8]", 680738666], - [287, 7, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631] - ], - "lib/ast/merge/detector/base.rb:343830240": [ - [175, 25, 73, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2991095115] - ], - "lib/ast/merge/detector/fenced_code_block.rb:3555142063": [ - [36, 7, 6302, "Metrics/ClassLength: Class has too many lines. [116/100]", 852968953], - [71, 9, 2492, "Metrics/AbcSize: Assignment Branch Condition size for `detect_all` is too high. [<31, 28, 12> 43.46/17]", 3575218793], - [71, 9, 2492, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_all` is too high. [11/7]", 3575218793], - [71, 9, 2492, "Metrics/MethodLength: Method has too many lines. [54/10]", 3575218793], - [71, 9, 2492, "Metrics/PerceivedComplexity: Perceived complexity for `detect_all` is too high. [13/8]", 3575218793], - [84, 11, 2060, "Metrics/BlockLength: Block has too many lines. [41/25]", 1744553779] - ], - "lib/ast/merge/detector/mergeable.rb:354817747": [ - [54, 7, 11933, "Metrics/ModuleLength: Module has too many lines. [140/100]", 1453034870], - [162, 9, 601, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_region_configs` is too high. [8/7]", 1278024890], - [162, 9, 601, "Metrics/MethodLength: Method has too many lines. [16/10]", 1278024890], - [189, 9, 1054, "Metrics/AbcSize: Assignment Branch Condition size for `extract_regions` is too high. [<11, 16, 3> 19.65/17]", 663241096], - [189, 9, 1054, "Metrics/MethodLength: Method has too many lines. [20/10]", 663241096], - [285, 9, 1005, "Metrics/AbcSize: Assignment Branch Condition size for `merge_and_substitute_regions` is too high. [<16, 19, 4> 25.16/17]", 4123525156], - [285, 9, 1005, "Metrics/MethodLength: Method has too many lines. [16/10]", 4123525156], - [318, 9, 1369, "Metrics/AbcSize: Assignment Branch Condition size for `merge_region` is too high. [<11, 20, 14> 26.78/17]", 746321843], - [318, 9, 1369, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_region` is too high. [15/7]", 746321843], - [318, 9, 1369, "Metrics/MethodLength: Method has too many lines. [16/10]", 746321843], - [318, 9, 1369, "Metrics/PerceivedComplexity: Perceived complexity for `merge_region` is too high. [15/8]", 746321843] - ], - "lib/ast/merge/detector/toml_frontmatter.rb:3255696517": [ - [50, 9, 892, "Metrics/MethodLength: Method has too many lines. [20/10]", 3132005303] - ], - "lib/ast/merge/detector/yaml_frontmatter.rb:2551474823": [ - [49, 9, 958, "Metrics/MethodLength: Method has too many lines. [20/10]", 3132005303] - ], - "lib/ast/merge/diff_mapper_base.rb:3204989377": [ - [22, 5, 7793, "Metrics/ClassLength: Class has too many lines. [141/100]", 2217731166], - [80, 7, 2598, "Metrics/AbcSize: Assignment Branch Condition size for `parse_diff` is too high. [<21, 31, 15> 40.34/17]", 939898835], - [80, 7, 2598, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_diff` is too high. [16/7]", 939898835], - [80, 7, 2598, "Metrics/MethodLength: Method has too many lines. [65/10]", 939898835], - [80, 7, 2598, "Metrics/PerceivedComplexity: Perceived complexity for `parse_diff` is too high. [12/8]", 939898835], - [90, 9, 2162, "Metrics/BlockLength: Block has too many lines. [50/25]", 3403609416], - [169, 7, 394, "Metrics/MethodLength: Method has too many lines. [11/10]", 2028641628] - ], - "lib/ast/merge/emitter_base.rb:655463559": [ - [26, 5, 14449, "Metrics/ClassLength: Class has too many lines. [226/100]", 2015391034], - [95, 7, 653, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_comment_region` is too high. [9/7]", 24580929], - [95, 7, 653, "Metrics/MethodLength: Method has too many lines. [12/10]", 24580929], - [95, 7, 653, "Metrics/PerceivedComplexity: Perceived complexity for `emit_comment_region` is too high. [9/8]", 24580929], - [120, 7, 1311, "Metrics/AbcSize: Assignment Branch Condition size for `emit_comment_attachment` is too high. [<5, 25, 16> 30.1/17]", 964928813], - [120, 7, 1311, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_comment_attachment` is too high. [17/7]", 964928813], - [120, 7, 1311, "Metrics/MethodLength: Method has too many lines. [17/10]", 964928813], - [120, 7, 1311, "Metrics/PerceivedComplexity: Perceived complexity for `emit_comment_attachment` is too high. [17/8]", 964928813], - [120, 34, 127, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 628879795], - [152, 7, 984, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_layout_gap` is too high. [8/7]", 1954418889], - [152, 7, 984, "Metrics/MethodLength: Method has too many lines. [13/10]", 1954418889], - [152, 7, 984, "Metrics/PerceivedComplexity: Perceived complexity for `emit_layout_gap` is too high. [9/8]", 1954418889], - [152, 26, 136, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3839882587], - [183, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861198], - [184, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087656651], - [186, 7, 1307, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_layout_attachment` is too high. [9/7]", 708408665], - [186, 7, 1307, "Metrics/MethodLength: Method has too many lines. [26/10]", 708408665], - [186, 7, 1307, "Metrics/PerceivedComplexity: Perceived complexity for `emit_layout_attachment` is too high. [9/8]", 708408665], - [186, 33, 218, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1552587384], - [187, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 1763090185], - [189, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1371312610], - [256, 31, 17, "Style/NumericPredicate: Use `@indent_level.positive?` instead of `@indent_level > 0`.", 1892475678], - [302, 56, 12, "Lint/UnusedMethodArgument: Unused method argument - `current_line`. You can also write as `inline_comment_region_target_column(*)` if you want the method to accept any arguments but don't care about them.", 2091263933], - [306, 42, 6, "Lint/UnusedMethodArgument: Unused method argument - `region`.", 2124512157], - [306, 51, 13, "Lint/UnusedMethodArgument: Unused method argument - `target_column`.", 3246375805], - [321, 7, 1141, "Metrics/AbcSize: Assignment Branch Condition size for `inline_comment_node_text` is too high. [<6, 29, 8> 30.68/17]", 2583471562], - [321, 7, 1141, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `inline_comment_node_text` is too high. [9/7]", 2583471562], - [321, 7, 1141, "Metrics/MethodLength: Method has too many lines. [22/10]", 2583471562], - [321, 7, 1141, "Metrics/PerceivedComplexity: Perceived complexity for `inline_comment_node_text` is too high. [9/8]", 2583471562], - [339, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861626], - [350, 7, 510, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_region_gap_lines` is too high. [8/7]", 1999747697], - [350, 7, 510, "Metrics/PerceivedComplexity: Perceived complexity for `emit_region_gap_lines` is too high. [9/8]", 1999747697] - ], - "lib/ast/merge/emitter_line_metadata_support.rb:3153033769": [ - [5, 5, 33, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::EmitterLineMetadataSupport`.", 2926748997], - [23, 7, 541, "Metrics/MethodLength: Method has too many lines. [12/10]", 2407359355] - ], - "lib/ast/merge/file_aligner_base.rb:4032045257": [ - [13, 5, 7473, "Metrics/ClassLength: Class has too many lines. [187/100]", 1391880441], - [27, 7, 2244, "Metrics/AbcSize: Assignment Branch Condition size for `align` is too high. [<19, 37, 12> 43.29/17]", 1243937217], - [27, 7, 2244, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `align` is too high. [12/7]", 1243937217], - [27, 7, 2244, "Metrics/MethodLength: Method has too many lines. [55/10]", 1243937217], - [27, 7, 2244, "Metrics/PerceivedComplexity: Perceived complexity for `align` is too high. [12/8]", 1243937217], - [148, 7, 655, "Metrics/MethodLength: Method has too many lines. [14/10]", 2468821688], - [180, 7, 455, "Metrics/MethodLength: Method has too many lines. [13/10]", 2361153066], - [199, 7, 1557, "Metrics/AbcSize: Assignment Branch Condition size for `apply_match_refiner!` is too high. [<10, 28, 12> 32.06/17]", 2386945712], - [199, 7, 1557, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_match_refiner!` is too high. [13/7]", 2386945712], - [199, 7, 1557, "Metrics/MethodLength: Method has too many lines. [31/10]", 2386945712], - [199, 7, 1557, "Metrics/PerceivedComplexity: Perceived complexity for `apply_match_refiner!` is too high. [13/8]", 2386945712] - ], - "lib/ast/merge/file_analyzable.rb:607555963": [ - [36, 5, 31229, "Metrics/ModuleLength: Module has too many lines. [316/100]", 1247752256], - [99, 19, 9, "Style/NumericPredicate: Use `index.negative?` instead of `index < 0`.", 4215255415], - [148, 7, 793, "Metrics/MethodLength: Method has too many lines. [22/10]", 1467470910], - [202, 7, 771, "Metrics/MethodLength: Method has too many lines. [16/10]", 1412317163], - [344, 7, 844, "Metrics/MethodLength: Method has too many lines. [12/10]", 2335919661], - [369, 7, 730, "Metrics/MethodLength: Method has too many lines. [11/10]", 1047958652], - [431, 7, 863, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_layout_owned_comment_attachment` is too high. [<0, 20, 4> 20.4/17]", 3284843691], - [431, 7, 863, "Metrics/MethodLength: Method has too many lines. [17/10]", 3284843691], - [481, 7, 683, "Metrics/MethodLength: Method has too many lines. [15/10]", 241044926], - [520, 14, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [614, 7, 6095, "Metrics/AbcSize: Assignment Branch Condition size for `generate_signature` is too high. [<4, 21, 13> 25.02/17]", 2828809875], - [614, 7, 6095, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `generate_signature` is too high. [11/7]", 2828809875], - [614, 7, 6095, "Metrics/MethodLength: Method has too many lines. [30/10]", 2828809875], - [614, 7, 6095, "Metrics/PerceivedComplexity: Perceived complexity for `generate_signature` is too high. [14/8]", 2828809875], - [676, 24, 390, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 3279112483] - ], - "lib/ast/merge/freeze_node_base.rb:2110274026": [ - [59, 5, 14572, "Metrics/ClassLength: Class has too many lines. [171/100]", 3038607603], - [108, 25, 545, "Style/MutableConstant: Freeze mutable objects assigned to constants.", 2366014160], - [186, 9, 1100, "Metrics/MethodLength: Method has too many lines. [15/10]", 2506841532], - [288, 7, 758, "Metrics/MethodLength: Method has too many lines. [11/10]", 136868205], - [288, 21, 276, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 1720059801], - [335, 7, 660, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `reason` is too high. [8/7]", 3127566048], - [418, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] - ], - "lib/ast/merge/healer.rb:3642412735": [ - [18, 7, 588, "Metrics/MethodLength: Method has too many lines. [15/10]", 3172269921], - [18, 17, 84, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1781025196], - [41, 7, 687, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `filter_items` is too high. [8/7]", 1200842691], - [41, 7, 687, "Metrics/MethodLength: Method has too many lines. [17/10]", 1200842691], - [41, 7, 687, "Metrics/PerceivedComplexity: Perceived complexity for `filter_items` is too high. [9/8]", 1200842691], - [41, 23, 130, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 33939503] - ], - "lib/ast/merge/jaccard_similarity.rb:678558736": [ - [87, 19, 1, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 177604], - [87, 22, 1, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 177607] - ], - "lib/ast/merge/key_path_partial_template_merger_base.rb:1818613864": [ - [22, 5, 6114, "Metrics/ClassLength: Class has too many lines. [155/100]", 1269962119], - [43, 21, 214, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 3637591635], - [68, 7, 489, "Metrics/MethodLength: Method has too many lines. [12/10]", 3170411580], - [118, 7, 640, "Metrics/AbcSize: Assignment Branch Condition size for `find_key_path` is too high. [<8, 14, 10> 18.97/17]", 2613403604], - [118, 7, 640, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_key_path` is too high. [8/7]", 2613403604], - [118, 7, 640, "Metrics/MethodLength: Method has too many lines. [16/10]", 2613403604], - [118, 7, 640, "Metrics/PerceivedComplexity: Perceived complexity for `find_key_path` is too high. [9/8]", 2613403604], - [140, 7, 536, "Metrics/MethodLength: Method has too many lines. [17/10]", 3598062652], - [168, 7, 804, "Metrics/MethodLength: Method has too many lines. [19/10]", 2773364183] - ], - "lib/ast/merge/layout.rb:3670500101": [ - [23, 36, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] - ], - "lib/ast/merge/layout/augmenter.rb:2556116722": [ - [8, 7, 5498, "Metrics/ClassLength: Class has too many lines. [129/100]", 3693754698], - [21, 23, 125, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 3395039982], - [53, 9, 1795, "Metrics/AbcSize: Assignment Branch Condition size for `build!` is too high. [<20, 32, 17> 41.39/17]", 3542913254], - [53, 9, 1795, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build!` is too high. [15/7]", 3542913254], - [53, 9, 1795, "Metrics/MethodLength: Method has too many lines. [43/10]", 3542913254], - [53, 9, 1795, "Metrics/PerceivedComplexity: Perceived complexity for `build!` is too high. [15/8]", 3542913254], - [58, 11, 1227, "Metrics/BlockLength: Block has too many lines. [29/25]", 55360131], - [105, 9, 504, "Metrics/MethodLength: Method has too many lines. [16/10]", 1953725517] - ], - "lib/ast/merge/layout/gap.rb:1678106201": [ - [11, 7, 7558, "Metrics/ClassLength: Class has too many lines. [151/100]", 2254377349], - [23, 9, 655, "Metrics/MethodLength: Method has too many lines. [11/10]", 3584854768], - [23, 23, 146, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 361396001], - [157, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859545], - [162, 9, 303, "Metrics/MethodLength: Method has too many lines. [12/10]", 2236444774], - [203, 9, 688, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_adjacency!` is too high. [10/7]", 1112786311], - [203, 9, 688, "Metrics/MethodLength: Method has too many lines. [13/10]", 1112786311] - ], - "lib/ast/merge/match_refiner_base.rb:1760054866": [ - [248, 7, 503, "Metrics/MethodLength: Method has too many lines. [11/10]", 2844230268], - [275, 7, 1056, "Metrics/AbcSize: Assignment Branch Condition size for `greedy_match` is too high. [<9, 24, 8> 26.85/17]", 2497617815], - [275, 7, 1056, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `greedy_match` is too high. [8/7]", 2497617815], - [275, 7, 1056, "Metrics/MethodLength: Method has too many lines. [24/10]", 2497617815] - ], - "lib/ast/merge/merge_result_base.rb:764500297": [ - [17, 5, 18646, "Metrics/ClassLength: Class has too many lines. [335/100]", 314460772], - [88, 21, 187, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1067369198], - [187, 7, 843, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_blank_line_runs!` is too high. [<12, 12, 10> 19.7/17]", 2347011594], - [187, 7, 843, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_blank_line_runs!` is too high. [9/7]", 2347011594], - [187, 7, 843, "Metrics/MethodLength: Method has too many lines. [22/10]", 2347011594], - [187, 7, 843, "Metrics/PerceivedComplexity: Perceived complexity for `normalize_blank_line_runs!` is too high. [10/8]", 2347011594], - [227, 7, 1004, "Metrics/MethodLength: Method has too many lines. [21/10]", 59539336], - [227, 35, 211, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 709487711], - [266, 7, 602, "Metrics/MethodLength: Method has too many lines. [13/10]", 320027623], - [341, 7, 927, "Metrics/AbcSize: Assignment Branch Condition size for `validate_review_state_compatibility!` is too high. [<8, 15, 4> 17.46/17]", 1596840080], - [341, 7, 927, "Metrics/MethodLength: Method has too many lines. [16/10]", 1596840080], - [403, 7, 936, "Metrics/AbcSize: Assignment Branch Condition size for `review_state_metadata` is too high. [<7, 18, 4> 19.72/17]", 4128292066], - [403, 7, 936, "Metrics/MethodLength: Method has too many lines. [14/10]", 4128292066], - [413, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 20421901], - [438, 7, 1194, "Metrics/MethodLength: Method has too many lines. [21/10]", 4289697646], - [448, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3342583337] - ], - "lib/ast/merge/merger_config.rb:3582657829": [ - [46, 5, 10581, "Metrics/ClassLength: Class has too many lines. [148/100]", 1598770872], - [96, 21, 234, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 720509970] - ], - "lib/ast/merge/navigable/injection_point_finder.rb:4117743218": [ - [45, 9, 1707, "Metrics/AbcSize: Assignment Branch Condition size for `find` is too high. [<9, 18, 17> 26.34/17]", 1445381162], - [45, 9, 1707, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find` is too high. [15/7]", 1445381162], - [45, 9, 1707, "Metrics/MethodLength: Method has too many lines. [28/10]", 1445381162], - [45, 9, 1707, "Metrics/PerceivedComplexity: Perceived complexity for `find` is too high. [16/8]", 1445381162], - [45, 17, 156, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 3876813166] - ], - "lib/ast/merge/navigable/statement.rb:3050515622": [ - [42, 7, 11078, "Metrics/ClassLength: Class has too many lines. [179/100]", 2550894515], - [96, 11, 550, "Metrics/AbcSize: Assignment Branch Condition size for `find_matching` is too high. [<7, 16, 12> 21.19/17]", 3492534565], - [96, 11, 550, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_matching` is too high. [12/7]", 3492534565], - [96, 11, 550, "Metrics/PerceivedComplexity: Perceived complexity for `find_matching` is too high. [12/8]", 3492534565], - [222, 13, 20, "Naming/PredicatePrefix: Rename `has_tree_navigation?` to `tree_navigation?`.", 733442156] - ], - "lib/ast/merge/node_typing.rb:4008165135": [ - [175, 9, 694, "Metrics/MethodLength: Method has too many lines. [12/10]", 777909930], - [213, 9, 891, "Metrics/AbcSize: Assignment Branch Condition size for `find_typing_callable` is too high. [<3, 23, 13> 26.59/17]", 3835052858], - [213, 9, 891, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_typing_callable` is too high. [14/7]", 3835052858], - [213, 9, 891, "Metrics/PerceivedComplexity: Perceived complexity for `find_typing_callable` is too high. [14/8]", 3835052858] - ], - "lib/ast/merge/node_wrapper_base.rb:3796877358": [ - [62, 5, 10228, "Metrics/ClassLength: Class has too many lines. [135/100]", 3832956007], - [92, 21, 81, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 4261369704] - ], - "lib/ast/merge/owner_selection.rb:2568070127": [ - [9, 7, 757, "Metrics/MethodLength: Method has too many lines. [13/10]", 2069564552] - ], - "lib/ast/merge/partial_template_merger_base.rb:2252899061": [ - [27, 5, 16780, "Metrics/ClassLength: Class has too many lines. [266/100]", 2205844189], - [48, 23, 81, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2112244807], - [106, 7, 757, "Metrics/MethodLength: Method has too many lines. [11/10]", 571708764], - [106, 21, 293, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 871709580], - [135, 7, 788, "Metrics/AbcSize: Assignment Branch Condition size for `merge` is too high. [<4, 19, 5> 20.05/17]", 467674580], - [135, 7, 788, "Metrics/MethodLength: Method has too many lines. [13/10]", 467674580], - [213, 7, 533, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_matcher` is too high. [<7, 20, 6> 22.02/17]", 1798972396], - [238, 7, 922, "Metrics/MethodLength: Method has too many lines. [25/10]", 1846154069], - [242, 25, 37, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 939456830], - [251, 25, 31, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 1024894473], - [268, 7, 1905, "Metrics/AbcSize: Assignment Branch Condition size for `perform_section_merge` is too high. [<13, 15, 2> 19.95/17]", 2711014340], - [268, 7, 1905, "Metrics/MethodLength: Method has too many lines. [34/10]", 2711014340], - [316, 50, 15, "Lint/UnusedMethodArgument: Unused method argument - `section_context`.", 2872123372], - [334, 7, 690, "Metrics/MethodLength: Method has too many lines. [14/10]", 1807124523], - [367, 7, 1122, "Metrics/AbcSize: Assignment Branch Condition size for `build_merged_content` is too high. [<1, 29, 14> 32.22/17]", 3938410418], - [367, 7, 1122, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_merged_content` is too high. [15/7]", 3938410418], - [367, 7, 1122, "Metrics/MethodLength: Method has too many lines. [18/10]", 3938410418], - [367, 7, 1122, "Metrics/PerceivedComplexity: Perceived complexity for `build_merged_content` is too high. [15/8]", 3938410418], - [397, 7, 596, "Metrics/MethodLength: Method has too many lines. [12/10]", 2602121883], - [397, 32, 144, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1463491208], - [414, 7, 1589, "Metrics/AbcSize: Assignment Branch Condition size for `source_splice_plan_for` is too high. [<6, 18, 9> 21/17]", 2889667289], - [414, 7, 1589, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `source_splice_plan_for` is too high. [9/7]", 2889667289], - [414, 7, 1589, "Metrics/MethodLength: Method has too many lines. [30/10]", 2889667289], - [414, 7, 1589, "Metrics/PerceivedComplexity: Perceived complexity for `source_splice_plan_for` is too high. [9/8]", 2889667289] - ], - "lib/ast/merge/recipe/config.rb:3990762705": [ - [54, 7, 14970, "Metrics/ClassLength: Class has too many lines. [296/100]", 2492031021], - [142, 9, 673, "Metrics/MethodLength: Method has too many lines. [12/10]", 3011978845], - [170, 9, 484, "Metrics/MethodLength: Method has too many lines. [15/10]", 183356432], - [246, 9, 710, "Metrics/AbcSize: Assignment Branch Condition size for `parse_injection` is too high. [<8, 13, 8> 17.23/17]", 641239814], - [246, 9, 710, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_injection` is too high. [9/7]", 641239814], - [246, 9, 710, "Metrics/MethodLength: Method has too many lines. [16/10]", 641239814], - [246, 9, 710, "Metrics/PerceivedComplexity: Perceived complexity for `parse_injection` is too high. [9/8]", 641239814], - [278, 9, 871, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_step` is too high. [8/7]", 3989307721], - [278, 9, 871, "Metrics/MethodLength: Method has too many lines. [20/10]", 3989307721], - [338, 9, 1758, "Metrics/AbcSize: Assignment Branch Condition size for `parse_step_merge_overrides` is too high. [<11, 43, 25> 50.94/17]", 806370438], - [338, 9, 1758, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_step_merge_overrides` is too high. [22/7]", 806370438], - [338, 9, 1758, "Metrics/MethodLength: Method has too many lines. [30/10]", 806370438], - [338, 9, 1758, "Metrics/PerceivedComplexity: Perceived complexity for `parse_step_merge_overrides` is too high. [22/8]", 806370438], - [373, 9, 566, "Metrics/MethodLength: Method has too many lines. [14/10]", 3671206955], - [391, 9, 547, "Metrics/MethodLength: Method has too many lines. [16/10]", 3273587697], - [459, 9, 799, "Metrics/AbcSize: Assignment Branch Condition size for `validate_injection!` is too high. [<2, 15, 12> 19.31/17]", 1665903587], - [459, 9, 799, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_injection!` is too high. [13/7]", 1665903587], - [459, 9, 799, "Metrics/MethodLength: Method has too many lines. [11/10]", 1665903587], - [459, 9, 799, "Metrics/PerceivedComplexity: Perceived complexity for `validate_injection!` is too high. [13/8]", 1665903587] - ], - "lib/ast/merge/recipe/preset.rb:2311326866": [ - [195, 9, 662, "Metrics/MethodLength: Method has too many lines. [12/10]", 1640897447] - ], - "lib/ast/merge/recipe/runner.rb:2243867806": [ - [27, 7, 28612, "Metrics/ClassLength: Class has too many lines. [547/100]", 79000832], - [73, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1411864995], - [77, 23, 136, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1636278032], - [92, 9, 849, "Metrics/MethodLength: Method has too many lines. [14/10]", 3083064345], - [128, 24, 129, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2642826282], - [210, 9, 788, "Metrics/MethodLength: Method has too many lines. [23/10]", 743008161], - [241, 9, 3397, "Metrics/AbcSize: Assignment Branch Condition size for `create_partial_template_merger` is too high. [<3, 52, 16> 54.49/17]", 2086180075], - [241, 9, 3397, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `create_partial_template_merger` is too high. [14/7]", 2086180075], - [241, 9, 3397, "Metrics/MethodLength: Method has too many lines. [63/10]", 2086180075], - [241, 9, 3397, "Metrics/PerceivedComplexity: Perceived complexity for `create_partial_template_merger` is too high. [13/8]", 2086180075], - [250, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2857356312], - [274, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177538], - [312, 9, 2210, "Metrics/AbcSize: Assignment Branch Condition size for `create_smart_merger` is too high. [<1, 39, 7> 39.64/17]", 1694660188], - [312, 9, 2210, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `create_smart_merger` is too high. [8/7]", 1694660188], - [312, 9, 2210, "Metrics/MethodLength: Method has too many lines. [45/10]", 1694660188], - [357, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 195423462], - [370, 9, 1087, "Metrics/MethodLength: Method has too many lines. [24/10]", 3850049530], - [370, 31, 124, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3466458723], - [401, 9, 1008, "Metrics/MethodLength: Method has too many lines. [19/10]", 2010895303], - [401, 25, 143, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2360959504], - [424, 9, 1263, "Metrics/AbcSize: Assignment Branch Condition size for `execute_partial_merge_step` is too high. [<3, 22, 1> 22.23/17]", 2850918453], - [424, 9, 1263, "Metrics/MethodLength: Method has too many lines. [25/10]", 2850918453], - [453, 9, 835, "Metrics/MethodLength: Method has too many lines. [14/10]", 1478843287], - [471, 9, 808, "Metrics/MethodLength: Method has too many lines. [15/10]", 1127254660], - [471, 37, 155, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 838578768], - [491, 9, 1126, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_smart_merge_result` is too high. [<8, 17, 12> 22.29/17]", 1786697339], - [491, 9, 1126, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_smart_merge_result` is too high. [9/7]", 1786697339], - [491, 9, 1126, "Metrics/MethodLength: Method has too many lines. [23/10]", 1786697339], - [491, 9, 1126, "Metrics/PerceivedComplexity: Perceived complexity for `normalize_smart_merge_result` is too high. [11/8]", 1786697339], - [518, 9, 2523, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_script_step_result` is too high. [<5, 40, 32> 51.47/17]", 2162420067], - [518, 9, 2523, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_script_step_result` is too high. [26/7]", 2162420067], - [518, 9, 2523, "Metrics/MethodLength: Method has too many lines. [48/10]", 2162420067], - [518, 9, 2523, "Metrics/PerceivedComplexity: Perceived complexity for `normalize_script_step_result` is too high. [29/8]", 2162420067], - [547, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 93872446], - [556, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 1527250939], - [586, 11, 155, "Style/HashTransformKeys: Prefer `transform_keys` over `each_with_object`.", 837503672], - [591, 9, 698, "Metrics/MethodLength: Method has too many lines. [11/10]", 1116310304], - [635, 9, 2582, "Metrics/AbcSize: Assignment Branch Condition size for `create_result_from_steps` is too high. [<8, 30, 31> 43.87/17]", 2040042265], - [635, 9, 2582, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `create_result_from_steps` is too high. [23/7]", 2040042265], - [635, 9, 2582, "Metrics/MethodLength: Method has too many lines. [60/10]", 2040042265], - [635, 9, 2582, "Metrics/PerceivedComplexity: Perceived complexity for `create_result_from_steps` is too high. [27/8]", 2040042265], - [635, 37, 133, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 789257106], - [649, 42, 40, "Style/SymbolProc: Pass `&:has_anchor` as an argument to `any?` instead of a block.", 4233626321] - ], - "lib/ast/merge/recipe/script_loader.rb:1397873218": [ - [145, 9, 1126, "Metrics/AbcSize: Assignment Branch Condition size for `load_script_file` is too high. [<6, 19, 4> 20.32/17]", 3417625171], - [145, 9, 1126, "Metrics/MethodLength: Method has too many lines. [17/10]", 3417625171] - ], - "lib/ast/merge/rspec/comment_behavior_matrix_adapters.rb:3429217018": [ - [9, 46, 341, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 532439002], - [31, 9, 901, "Metrics/MethodLength: Method has too many lines. [11/10]", 584608092], - [31, 59, 308, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 883491898], - [54, 9, 1269, "Metrics/MethodLength: Method has too many lines. [20/10]", 1021031182], - [65, 51, 6, "Lint/UnusedBlockArgument: Unused block argument - `inline`. If it's necessary, use `_` or `_inline` as an argument name to indicate that it won't be used.", 1605470060], - [69, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 4226982364], - [70, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1440420861] - ], - "lib/ast/merge/rspec/dependency_tags_config.rb:3604516304": [ - [30, 1, 2102, "Metrics/BlockLength: Block has too many lines. [26/25]", 113766065] - ], - "lib/ast/merge/rspec/merge_gem_registry.rb:3009576030": [ - [58, 7, 12129, "Metrics/ModuleLength: Module has too many lines. [158/100]", 335549747], - [90, 9, 780, "Metrics/MethodLength: Method has too many lines. [14/10]", 978965737], - [90, 21, 99, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3580433546], - [118, 9, 650, "Metrics/MethodLength: Method has too many lines. [12/10]", 3143160805], - [118, 31, 130, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2575863904], - [143, 9, 823, "Metrics/MethodLength: Method has too many lines. [17/10]", 4033116153], - [200, 9, 765, "Metrics/AbcSize: Assignment Branch Condition size for `register_known_gems` is too high. [<3, 17, 3> 17.52/17]", 1367620151], - [200, 9, 765, "Metrics/MethodLength: Method has too many lines. [17/10]", 1367620151] - ], - "lib/ast/merge/rspec/shared_examples.rb:2878318351": [ - [29, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 330577472] - ], - "lib/ast/merge/rspec/shared_examples/comment_behavior_matrix.rb:3695671858": [ - [36, 1, 27847, "Metrics/BlockLength: Block has too many lines. [540/25]", 3796645407], - [38, 55, 15, "Style/SymbolProc: Pass `&:value` as an argument to `lambda` instead of a block.", 1808354951], - [42, 64, 23, "Style/SymbolProc: Pass `&:statements` as an argument to `lambda` instead of a block.", 277221641], - [69, 3, 4455, "Metrics/BlockLength: Block has too many lines. [82/25]", 3672334777], - [72, 5, 1763, "Metrics/BlockLength: Block has too many lines. [34/25]", 164750821], - [165, 3, 22093, "Metrics/BlockLength: Block has too many lines. [429/25]", 229312375], - [292, 5, 1918, "Metrics/BlockLength: Block has too many lines. [29/25]", 1312741055], - [323, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1902517440], - [325, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 173482512], - [328, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 167607404], - [476, 5, 1605, "Metrics/BlockLength: Block has too many lines. [35/25]", 1943633697], - [677, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1902517440] - ], - "lib/ast/merge/rspec/shared_examples/conflict_resolver_base.rb:624045197": [ - [30, 1, 7893, "Metrics/BlockLength: Block has too many lines. [197/25]", 3450672926], - [37, 3, 1372, "Metrics/BlockLength: Block has too many lines. [33/25]", 3389152504], - [83, 3, 1206, "Metrics/BlockLength: Block has too many lines. [35/25]", 1580202348], - [128, 3, 1177, "Metrics/BlockLength: Block has too many lines. [33/25]", 2178974049], - [215, 3, 2443, "Metrics/BlockLength: Block has too many lines. [51/25]", 2538475273], - [219, 5, 1909, "Metrics/BlockLength: Block has too many lines. [35/25]", 880175101], - [279, 1, 2518, "Metrics/BlockLength: Block has too many lines. [74/25]", 958151448], - [286, 3, 2235, "Metrics/BlockLength: Block has too many lines. [70/25]", 2123260684], - [391, 1, 1317, "Metrics/BlockLength: Block has too many lines. [37/25]", 2321517041], - [439, 1, 1639, "Metrics/BlockLength: Block has too many lines. [37/25]", 276150366] - ], - "lib/ast/merge/rspec/shared_examples/debug_logger.rb:2747003588": [ - [23, 1, 4741, "Metrics/BlockLength: Block has too many lines. [121/25]", 3341338388], - [47, 3, 976, "Metrics/BlockLength: Block has too many lines. [27/25]", 2640321404], - [85, 3, 1452, "Metrics/BlockLength: Block has too many lines. [34/25]", 554663062] - ], - "lib/ast/merge/rspec/shared_examples/feature_profile.rb:4172143324": [ - [30, 1, 4249, "Metrics/BlockLength: Block has too many lines. [53/25]", 3787230403] - ], - "lib/ast/merge/rspec/shared_examples/file_analyzable.rb:2391547213": [ - [44, 1, 6468, "Metrics/BlockLength: Block has too many lines. [145/25]", 3744642916] - ], - "lib/ast/merge/rspec/shared_examples/freeze_node_base.rb:1711126715": [ - [23, 1, 5952, "Metrics/BlockLength: Block has too many lines. [157/25]", 3152271039], - [29, 3, 2836, "Metrics/BlockLength: Block has too many lines. [69/25]", 2082270913], - [115, 3, 1552, "Metrics/BlockLength: Block has too many lines. [46/25]", 4180117745] - ], - "lib/ast/merge/rspec/shared_examples/layout_attachment.rb:4130619694": [ - [30, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 1263574869], - [31, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 4282300883] - ], - "lib/ast/merge/rspec/shared_examples/layout_augmenter.rb:1928277603": [ - [18, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1311107624], - [19, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1311107624] - ], - "lib/ast/merge/rspec/shared_examples/merge_result_base.rb:2962043558": [ - [18, 1, 2330, "Metrics/BlockLength: Block has too many lines. [67/25]", 3496673178], - [53, 3, 1271, "Metrics/BlockLength: Block has too many lines. [42/25]", 2278976858] - ], - "lib/ast/merge/rspec/shared_examples/merger_config.rb:2413785902": [ - [18, 1, 8240, "Metrics/BlockLength: Block has too many lines. [193/25]", 3665443345], - [57, 3, 1628, "Metrics/BlockLength: Block has too many lines. [32/25]", 7828299], - [98, 3, 1266, "Metrics/BlockLength: Block has too many lines. [28/25]", 317929439], - [159, 3, 1740, "Metrics/BlockLength: Block has too many lines. [42/25]", 1736487820], - [217, 3, 1373, "Metrics/BlockLength: Block has too many lines. [30/25]", 442933563] - ], - "lib/ast/merge/rspec/shared_examples/recipe_preset_contract.rb:1495545061": [ - [7, 1, 2558, "Metrics/BlockLength: Block has too many lines. [51/25]", 4091815632] - ], - "lib/ast/merge/rspec/shared_examples/removal_mode_compliance.rb:3645548199": [ - [24, 1, 1860, "Metrics/BlockLength: Block has too many lines. [33/25]", 1115825136] - ], - "lib/ast/merge/rspec/shared_examples/reproducible_merge.rb:2276592459": [ - [51, 1, 2030, "Metrics/BlockLength: Block has too many lines. [52/25]", 563553381] - ], - "lib/ast/merge/rspec/shared_examples/reproducible_partial_merge.rb:524436129": [ - [3, 1, 2321, "Metrics/BlockLength: Block has too many lines. [44/25]", 3206099540] - ], - "lib/ast/merge/rspec/shared_examples/runtime_debug_contract.rb:4244040583": [ - [8, 1, 2808, "Metrics/BlockLength: Block has too many lines. [48/25]", 3274492878] - ], - "lib/ast/merge/rspec/shared_examples/unresolved_helper_contract.rb:2916431464": [ - [9, 1, 5998, "Metrics/BlockLength: Block has too many lines. [126/25]", 4174562424], - [94, 3, 1515, "Metrics/BlockLength: Block has too many lines. [32/25]", 1928238376] - ], - "lib/ast/merge/rspec/shared_examples/unresolved_review_state_transport_contract.rb:3368966854": [ - [14, 1, 3386, "Metrics/BlockLength: Block has too many lines. [68/25]", 2910343214], - [65, 3, 317, "Metrics/MethodLength: Method has too many lines. [12/10]", 2653897690] - ], - "lib/ast/merge/rspec/shared_examples/unresolved_runtime_contract.rb:1424234700": [ - [10, 1, 2652, "Metrics/BlockLength: Block has too many lines. [42/25]", 960283638], - [31, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2892620242], - [46, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193437756] - ], - "lib/ast/merge/rspec/shared_examples/unresolved_runtime_debug_contract.rb:2897026147": [ - [25, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2418171787], - [26, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 235635831] - ], - "lib/ast/merge/ruleset/config.rb:4242726919": [ - [7, 7, 3664, "Metrics/ClassLength: Class has too many lines. [101/100]", 1968929597], - [36, 9, 933, "Metrics/MethodLength: Method has too many lines. [15/10]", 3334511209], - [36, 23, 319, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [15/5]", 1652945408], - [65, 9, 515, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 18, 3> 18.25/17]", 2614325513], - [65, 9, 515, "Metrics/MethodLength: Method has too many lines. [14/10]", 2614325513] - ], - "lib/ast/merge/ruleset/feature_profile.rb:3980745364": [ - [12, 7, 6054, "Metrics/ClassLength: Class has too many lines. [155/100]", 2818730231], - [29, 9, 1351, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<17, 18, 7> 25.73/17]", 2248702332], - [29, 9, 1351, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `initialize` is too high. [8/7]", 2248702332], - [29, 9, 1351, "Metrics/MethodLength: Method has too many lines. [17/10]", 2248702332], - [29, 23, 422, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 1415781648], - [138, 9, 1509, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 36, 6> 36.5/17]", 3793816437], - [138, 9, 1509, "Metrics/MethodLength: Method has too many lines. [31/10]", 3793816437] - ], - "lib/ast/merge/ruleset/parser.rb:698282871": [ - [7, 7, 9396, "Metrics/ClassLength: Class has too many lines. [199/100]", 1305123525], - [43, 9, 473, "Metrics/AbcSize: Assignment Branch Condition size for `parse` is too high. [<0, 17, 2> 17.12/17]", 1400394586], - [43, 9, 473, "Metrics/MethodLength: Method has too many lines. [12/10]", 1400394586], - [71, 9, 1053, "Metrics/MethodLength: Method has too many lines. [24/10]", 1569959910], - [101, 9, 1123, "Metrics/AbcSize: Assignment Branch Condition size for `parse_single_value_directive!` is too high. [<7, 13, 10> 17.83/17]", 706129883], - [101, 9, 1123, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_single_value_directive!` is too high. [8/7]", 706129883], - [101, 9, 1123, "Metrics/MethodLength: Method has too many lines. [24/10]", 706129883], - [170, 9, 605, "Metrics/MethodLength: Method has too many lines. [11/10]", 336127382], - [186, 9, 687, "Metrics/MethodLength: Method has too many lines. [11/10]", 2962844982] - ], - "lib/ast/merge/ruleset/profile_vocabulary.rb:2359837647": [ - [7, 7, 3956, "Metrics/ModuleLength: Module has too many lines. [107/100]", 1680256705] - ], - "lib/ast/merge/ruleset/runtime_declaration.rb:1016848190": [ - [18, 9, 819, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<11, 13, 5> 17.75/17]", 4043304883], - [18, 9, 819, "Metrics/MethodLength: Method has too many lines. [11/10]", 4043304883], - [18, 23, 240, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 3868000276], - [49, 9, 551, "Metrics/MethodLength: Method has too many lines. [13/10]", 448215861] - ], - "lib/ast/merge/ruleset/runtime_translator.rb:3255492631": [ - [9, 11, 816, "Metrics/MethodLength: Method has too many lines. [19/10]", 225301385], - [31, 11, 986, "Metrics/AbcSize: Assignment Branch Condition size for `feature_profile` is too high. [<1, 17, 0> 17.03/17]", 1395467476], - [31, 11, 986, "Metrics/MethodLength: Method has too many lines. [19/10]", 1395467476] - ], - "lib/ast/merge/ruleset/support_style_resolver.rb:508975884": [ - [9, 11, 864, "Metrics/MethodLength: Method has too many lines. [22/10]", 3902551296] - ], - "lib/ast/merge/runtime/child_result.rb:4083710804": [ - [16, 9, 698, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<7, 16, 2> 17.58/17]", 2208366179], - [16, 23, 227, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 3688358290], - [38, 9, 584, "Metrics/MethodLength: Method has too many lines. [11/10]", 3113479157], - [55, 11, 106, "Style/HashTransformKeys: Prefer `transform_keys` over `each_with_object`.", 4262612225] - ], - "lib/ast/merge/runtime/delegate.rb:3607371286": [ - [17, 23, 285, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 2793452069] - ], - "lib/ast/merge/runtime/diagnostic.rb:805162185": [ - [10, 23, 72, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1875462867] - ], - "lib/ast/merge/runtime/operation.rb:1030261783": [ - [20, 9, 767, "Metrics/MethodLength: Method has too many lines. [11/10]", 2728174753], - [20, 23, 278, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 694444911], - [100, 9, 617, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<2, 24, 6> 24.82/17]", 1175382849], - [100, 9, 617, "Metrics/MethodLength: Method has too many lines. [11/10]", 1175382849] - ], - "lib/ast/merge/runtime/resolution_case.rb:250040454": [ - [8, 9, 707, "Metrics/AbcSize: Assignment Branch Condition size for `from_h` is too high. [<1, 19, 6> 19.95/17]", 2592154170], - [29, 23, 189, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 818714714], - [81, 11, 111, "Style/HashTransformKeys: Prefer `transform_keys` over `each_with_object`.", 2712537644] - ], - "lib/ast/merge/runtime/root_session_support.rb:1917388966": [ - [10, 9, 2153, "Metrics/AbcSize: Assignment Branch Condition size for `start_runtime_root_session!` is too high. [<5, 20, 3> 20.83/17]", 1888056651], - [10, 9, 2153, "Metrics/MethodLength: Method has too many lines. [41/10]", 1888056651], - [10, 40, 421, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 2297301282], - [60, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2312419928], - [68, 9, 771, "Metrics/MethodLength: Method has too many lines. [13/10]", 1787620786], - [68, 43, 191, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3635875424] - ], - "lib/ast/merge/runtime/session.rb:628419040": [ - [66, 9, 1203, "Metrics/AbcSize: Assignment Branch Condition size for `summary` is too high. [<5, 43, 13> 45.2/17]", 550888870], - [66, 9, 1203, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `summary` is too high. [14/7]", 550888870], - [66, 9, 1203, "Metrics/MethodLength: Method has too many lines. [20/10]", 550888870], - [66, 9, 1203, "Metrics/PerceivedComplexity: Perceived complexity for `summary` is too high. [14/8]", 550888870] - ], - "lib/ast/merge/runtime/surface.rb:3684795905": [ - [17, 23, 230, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 469229117], - [44, 9, 418, "Metrics/MethodLength: Method has too many lines. [11/10]", 998969973] - ], - "lib/ast/merge/section_typing.rb:4261989256": [ - [112, 9, 710, "Metrics/MethodLength: Method has too many lines. [15/10]", 3600335459], - [176, 9, 67, "Lint/MissingSuper: Call `super` to initialize state of the parent class.", 4077537758], - [216, 9, 85, "Lint/MissingSuper: Call `super` to initialize state of the parent class.", 3648782014], - [245, 9, 1446, "Metrics/AbcSize: Assignment Branch Condition size for `merge_sections` is too high. [<13, 20, 12> 26.7/17]", 525095633], - [245, 9, 1446, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_sections` is too high. [12/7]", 525095633], - [245, 9, 1446, "Metrics/MethodLength: Method has too many lines. [28/10]", 525095633], - [245, 9, 1446, "Metrics/PerceivedComplexity: Perceived complexity for `merge_sections` is too high. [13/8]", 525095633] - ], - "lib/ast/merge/smart_merger_base.rb:4189972287": [ - [109, 5, 15324, "Metrics/ClassLength: Class has too many lines. [172/100]", 3547407870], - [214, 7, 1974, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<20, 14, 5> 24.92/17]", 2211610736], - [214, 7, 1974, "Metrics/MethodLength: Method has too many lines. [23/10]", 2211610736], - [214, 21, 443, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [15/5]", 1530523783], - [424, 7, 1312, "Metrics/AbcSize: Assignment Branch Condition size for `parse_and_analyze` is too high. [<7, 25, 11> 28.2/17]", 1640248187], - [424, 7, 1312, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_and_analyze` is too high. [10/7]", 1640248187], - [424, 7, 1312, "Metrics/MethodLength: Method has too many lines. [15/10]", 1640248187], - [424, 7, 1312, "Metrics/PerceivedComplexity: Perceived complexity for `parse_and_analyze` is too high. [10/8]", 1640248187], - [517, 12, 52, "Style/NumericPredicate: Use `result_class.instance_method(:initialize).arity.zero?` instead of `result_class.instance_method(:initialize).arity == 0`.", 1312375552] - ], - "lib/ast/merge/structural_edit/boundary.rb:2838060197": [ - [20, 23, 93, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3901214537], - [41, 38, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [51, 38, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [60, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087440865] - ], - "lib/ast/merge/structural_edit/boundary_support.rb:2036464761": [ - [31, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861061], - [32, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 97596930] - ], - "lib/ast/merge/structural_edit/plan_set.rb:538463647": [ - [116, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 2855200692] - ], - "lib/ast/merge/structural_edit/rehome_plan.rb:2152178780": [ - [23, 23, 123, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3433617242], - [100, 9, 519, "Metrics/MethodLength: Method has too many lines. [11/10]", 318006380], - [136, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 2367140872] - ], - "lib/ast/merge/structural_edit/remove_plan.rb:1189569486": [ - [11, 7, 9717, "Metrics/ClassLength: Class has too many lines. [160/100]", 3652701475], - [25, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861091], - [27, 9, 1409, "Metrics/MethodLength: Method has too many lines. [22/10]", 3344870777], - [27, 23, 255, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 3970946607], - [28, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 1637059282], - [36, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859104], - [196, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 1617827253], - [224, 9, 1032, "Metrics/MethodLength: Method has too many lines. [20/10]", 968444047] - ], - "lib/ast/merge/structural_edit/remove_plan_support.rb:877461974": [ - [9, 9, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631], - [19, 9, 1429, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_remove_plan` is too high. [8/7]", 4091314919], - [19, 9, 1429, "Metrics/MethodLength: Method has too many lines. [32/10]", 4091314919] - ], - "lib/ast/merge/structural_edit/splice_plan.rb:2675806114": [ - [39, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1683893295], - [42, 23, 203, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3653221702], - [113, 9, 517, "Metrics/MethodLength: Method has too many lines. [11/10]", 634912361] - ], - "lib/ast/merge/structured_emitter_provenance_support.rb:445323365": [ - [5, 5, 41, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::StructuredEmitterProvenanceSupport`.", 3548518830] - ], - "lib/ast/merge/structured_review_apply_support.rb:3649736380": [ - [5, 5, 35, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::StructuredReviewApplySupport`.", 1282380463], - [22, 7, 782, "Metrics/AbcSize: Assignment Branch Condition size for `current_output_span_for` is too high. [<6, 19, 11> 22.76/17]", 4137750179], - [22, 7, 782, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `current_output_span_for` is too high. [8/7]", 4137750179], - [22, 7, 782, "Metrics/MethodLength: Method has too many lines. [14/10]", 4137750179], - [42, 7, 595, "Metrics/MethodLength: Method has too many lines. [12/10]", 2080934521], - [60, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3151172498] - ], - "lib/ast/merge/text/conflict_resolver.rb:989169286": [ - [19, 7, 9182, "Metrics/ClassLength: Class has too many lines. [159/100]", 1070563745], - [28, 23, 211, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2639535499], - [53, 9, 2507, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_batch` is too high. [<15, 34, 5> 37.5/17]", 825130797], - [53, 9, 2507, "Metrics/MethodLength: Method has too many lines. [44/10]", 825130797], - [196, 9, 2458, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_matched_pair` is too high. [<2, 30, 11> 32.02/17]", 4037214978], - [196, 9, 2458, "Metrics/MethodLength: Method has too many lines. [46/10]", 4037214978] - ], - "lib/ast/merge/text/file_analysis.rb:1530312707": [ - [106, 9, 1484, "Metrics/AbcSize: Assignment Branch Condition size for `parse_statements` is too high. [<11, 15, 6> 19.54/17]", 1858083071], - [106, 9, 1484, "Metrics/MethodLength: Method has too many lines. [34/10]", 1858083071], - [160, 9, 449, "Metrics/MethodLength: Method has too many lines. [11/10]", 1902035813] - ], - "lib/ast/merge/text/line_node.rb:3385927013": [ - [145, 9, 699, "Metrics/MethodLength: Method has too many lines. [17/10]", 2201872249] - ], - "lib/ast/merge/text/section_splitter.rb:129704488": [ - [141, 9, 1442, "Metrics/AbcSize: Assignment Branch Condition size for `merge_section_lists` is too high. [<13, 20, 6> 24.6/17]", 3551729170], - [141, 9, 1442, "Metrics/MethodLength: Method has too many lines. [23/10]", 3551729170], - [322, 9, 1767, "Metrics/AbcSize: Assignment Branch Condition size for `split` is too high. [<11, 29, 10> 32.59/17]", 2207922758], - [322, 9, 1767, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split` is too high. [10/7]", 2207922758], - [322, 9, 1767, "Metrics/MethodLength: Method has too many lines. [46/10]", 2207922758], - [322, 9, 1767, "Metrics/PerceivedComplexity: Perceived complexity for `split` is too high. [13/8]", 2207922758], - [328, 11, 1019, "Metrics/BlockLength: Block has too many lines. [26/25]", 1561634792] - ], - "lib/ast/merge/text/smart_merger.rb:2405807903": [ - [67, 9, 831, "Metrics/MethodLength: Method has too many lines. [12/10]", 584426022], - [67, 23, 350, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 3074172637] - ], - "lib/ast/merge/trailing_groups/alignment_sort.rb:2593404330": [ - [40, 9, 513, "Metrics/MethodLength: Method has too many lines. [12/10]", 89360683] - ], - "lib/ast/merge/trailing_groups/core.rb:4231959665": [ - [61, 9, 812, "Metrics/MethodLength: Method has too many lines. [17/10]", 1777526069], - [101, 9, 998, "Metrics/AbcSize: Assignment Branch Condition size for `flush_ready_trailing_groups` is too high. [<8, 18, 15> 24.76/17]", 2397698441], - [101, 9, 998, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `flush_ready_trailing_groups` is too high. [13/7]", 2397698441], - [101, 9, 998, "Metrics/MethodLength: Method has too many lines. [17/10]", 2397698441], - [101, 9, 998, "Metrics/PerceivedComplexity: Perceived complexity for `flush_ready_trailing_groups` is too high. [13/8]", 2397698441] - ], - "lib/ast/merge/trailing_groups/dest_iterate.rb:3897205087": [ - [69, 9, 751, "Metrics/MethodLength: Method has too many lines. [12/10]", 3915657972], - [69, 47, 199, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2545849044] - ], - "lib/ast/merge/unresolved_support.rb:2881272494": [ - [7, 5, 24, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::UnresolvedSupport`.", 990281691], - [7, 5, 4392, "Metrics/ModuleLength: Module has too many lines. [116/100]", 3475162940], - [32, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [67, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [85, 7, 1038, "Metrics/MethodLength: Method has too many lines. [14/10]", 3139619197], - [85, 40, 338, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 71164914] - ], - "spec/ast/merge/ast_node_spec.rb:1362065144": [ - [3, 1, 8199, "Metrics/BlockLength: Block has too many lines. [254/25]", 1649868231], - [18, 3, 1030, "Metrics/BlockLength: Block has too many lines. [33/25]", 1409835577] - ], - "spec/ast/merge/block_directive_spec.rb:2305756581": [ - [3, 1, 5181, "Metrics/BlockLength: Block has too many lines. [138/25]", 1887900896], - [128, 3, 1391, "Metrics/BlockLength: Block has too many lines. [39/25]", 3626371694] - ], - "spec/ast/merge/comment/attachment_spec.rb:2571833836": [ - [3, 1, 5536, "Metrics/BlockLength: Block has too many lines. [150/25]", 1841571757], - [93, 3, 1639, "Metrics/BlockLength: Block has too many lines. [37/25]", 212730671] - ], - "spec/ast/merge/comment/augmenter_spec.rb:4266625483": [ - [3, 1, 9141, "Metrics/BlockLength: Block has too many lines. [212/25]", 530365996], - [16, 3, 6849, "Metrics/BlockLength: Block has too many lines. [154/25]", 503152628], - [200, 3, 1244, "Metrics/BlockLength: Block has too many lines. [33/25]", 3565041107] - ], - "spec/ast/merge/comment/block_spec.rb:4138473890": [ - [3, 1, 9021, "Metrics/BlockLength: Block has too many lines. [250/25]", 1617505173], - [8, 3, 1115, "Metrics/BlockLength: Block has too many lines. [27/25]", 2958989619], - [93, 3, 1127, "Metrics/BlockLength: Block has too many lines. [33/25]", 196340527], - [123, 45, 16, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 155572628], - [159, 3, 1432, "Metrics/BlockLength: Block has too many lines. [35/25]", 281400319] - ], - "spec/ast/merge/comment/c_style_tracker_base_spec.rb:3154319400": [ - [3, 1, 5816, "Metrics/BlockLength: Block has too many lines. [133/25]", 680831933], - [100, 3, 1450, "Metrics/BlockLength: Block has too many lines. [35/25]", 4153882185] - ], - "spec/ast/merge/comment/capability_spec.rb:2763521225": [ - [3, 1, 3522, "Metrics/BlockLength: Block has too many lines. [89/25]", 1487980773], - [4, 3, 1954, "Metrics/BlockLength: Block has too many lines. [41/25]", 160187362] - ], - "spec/ast/merge/comment/empty_spec.rb:1801324640": [ - [3, 1, 2584, "Metrics/BlockLength: Block has too many lines. [70/25]", 270179899], - [4, 3, 1047, "Metrics/BlockLength: Block has too many lines. [27/25]", 3056449816] - ], - "spec/ast/merge/comment/hash_tracker_base_spec.rb:3624528747": [ - [3, 1, 9653, "Metrics/BlockLength: Block has too many lines. [271/25]", 3748659406], - [8, 3, 1210, "Metrics/BlockLength: Block has too many lines. [37/25]", 2566766302], - [21, 7, 872, "Metrics/AbcSize: Assignment Branch Condition size for `extract_comments` is too high. [<7, 24, 5> 25.5/17]", 1213080161], - [21, 7, 872, "Metrics/MethodLength: Method has too many lines. [25/10]", 1213080161], - [275, 3, 1171, "Metrics/BlockLength: Block has too many lines. [29/25]", 1425466742] - ], - "spec/ast/merge/comment/line_spec.rb:1487829548": [ - [3, 1, 5291, "Metrics/BlockLength: Block has too many lines. [128/25]", 587604747], - [6, 3, 1573, "Metrics/BlockLength: Block has too many lines. [37/25]", 4105920006] - ], - "spec/ast/merge/comment/parser_spec.rb:2443973508": [ - [3, 1, 9855, "Metrics/BlockLength: Block has too many lines. [237/25]", 404174977], - [4, 3, 1013, "Metrics/BlockLength: Block has too many lines. [26/25]", 182655397], - [38, 3, 1282, "Metrics/BlockLength: Block has too many lines. [28/25]", 2303702609] - ], - "spec/ast/merge/comment/quoted_hash_line_parser_spec.rb:3795390831": [ - [3, 1, 1810, "Metrics/BlockLength: Block has too many lines. [44/25]", 2575838586], - [6, 3, 1700, "Metrics/BlockLength: Block has too many lines. [41/25]", 1553834548] - ], - "spec/ast/merge/comment/region_merge_policy_spec.rb:4175996936": [ - [3, 1, 3618, "Metrics/BlockLength: Block has too many lines. [75/25]", 4006378358], - [11, 3, 2752, "Metrics/BlockLength: Block has too many lines. [52/25]", 494211987] - ], - "spec/ast/merge/comment/region_spec.rb:2674736508": [ - [3, 1, 4033, "Metrics/BlockLength: Block has too many lines. [91/25]", 1828104331] - ], - "spec/ast/merge/comment/style_spec.rb:1875195890": [ - [3, 1, 4040, "Metrics/BlockLength: Block has too many lines. [101/25]", 2759361650] - ], - "spec/ast/merge/comment/support_style_spec.rb:1350169032": [ - [3, 1, 1577, "Metrics/BlockLength: Block has too many lines. [39/25]", 3414039011] - ], - "spec/ast/merge/comment/tracked_hash_adapter_spec.rb:1256807736": [ - [3, 1, 4482, "Metrics/BlockLength: Block has too many lines. [97/25]", 264417763], - [4, 3, 3101, "Metrics/BlockLength: Block has too many lines. [63/25]", 1050939978], - [81, 3, 1313, "Metrics/BlockLength: Block has too many lines. [30/25]", 515655104] - ], - "spec/ast/merge/comment_spec.rb:81945459": [ - [3, 1, 15888, "Metrics/BlockLength: Block has too many lines. [384/25]", 2229554982], - [4, 3, 3957, "Metrics/BlockLength: Block has too many lines. [84/25]", 660667217], - [5, 5, 1187, "Metrics/BlockLength: Block has too many lines. [26/25]", 241562105], - [105, 3, 1371, "Metrics/BlockLength: Block has too many lines. [30/25]", 1901983597], - [159, 3, 1296, "Metrics/BlockLength: Block has too many lines. [30/25]", 1749880380], - [239, 3, 1151, "Metrics/BlockLength: Block has too many lines. [28/25]", 183967322], - [272, 3, 2004, "Metrics/BlockLength: Block has too many lines. [45/25]", 2594323837], - [349, 3, 3220, "Metrics/BlockLength: Block has too many lines. [83/25]", 790417809], - [350, 5, 2347, "Metrics/BlockLength: Block has too many lines. [60/25]", 4016801881] - ], - "spec/ast/merge/composite_match_refiner_spec.rb:2888297870": [ - [3, 1, 6152, "Metrics/BlockLength: Block has too many lines. [143/25]", 3308692548], - [55, 3, 4118, "Metrics/BlockLength: Block has too many lines. [87/25]", 1405655464] - ], - "spec/ast/merge/conflict_resolver_base_spec.rb:3331938447": [ - [5, 1, 20643, "Metrics/BlockLength: Block has too many lines. [516/25]", 3129196558], - [14, 59, 14, "Lint/UnusedMethodArgument: Unused method argument - `template_index`.", 1809801172], - [14, 76, 10, "Lint/UnusedMethodArgument: Unused method argument - `dest_index`.", 2703999490], - [47, 61, 14, "Lint/UnusedMethodArgument: Unused method argument - `template_index`. You can also write as `resolve_node_pair(*)` if you want the method to accept any arguments but don't care about them.", 1809801172], - [47, 78, 10, "Lint/UnusedMethodArgument: Unused method argument - `dest_index`. You can also write as `resolve_node_pair(*)` if you want the method to accept any arguments but don't care about them.", 2703999490], - [105, 3, 17203, "Metrics/BlockLength: Block has too many lines. [425/25]", 1114912980], - [154, 5, 1797, "Metrics/BlockLength: Block has too many lines. [37/25]", 515146940], - [203, 5, 1373, "Metrics/BlockLength: Block has too many lines. [32/25]", 603210832], - [292, 5, 2874, "Metrics/BlockLength: Block has too many lines. [77/25]", 3918129775], - [341, 7, 1292, "Metrics/BlockLength: Block has too many lines. [34/25]", 1769555944], - [402, 5, 1857, "Metrics/BlockLength: Block has too many lines. [44/25]", 1516406612], - [456, 5, 1209, "Metrics/BlockLength: Block has too many lines. [31/25]", 430489898], - [514, 5, 2021, "Metrics/BlockLength: Block has too many lines. [37/25]", 144128170], - [515, 7, 1953, "Metrics/BlockLength: Block has too many lines. [35/25]", 1574966248], - [567, 5, 1500, "Metrics/BlockLength: Block has too many lines. [40/25]", 2509466150] - ], - "spec/ast/merge/content_match_refiner_spec.rb:4058001158": [ - [3, 1, 14348, "Metrics/BlockLength: Block has too many lines. [318/25]", 1171164704], - [25, 3, 1238, "Metrics/BlockLength: Block has too many lines. [29/25]", 2139810386], - [63, 3, 4077, "Metrics/BlockLength: Block has too many lines. [95/25]", 3471153375], - [325, 3, 2213, "Metrics/BlockLength: Block has too many lines. [37/25]", 3370370915] - ], - "spec/ast/merge/debug_logger_spec.rb:429510168": [ - [3, 1, 17306, "Metrics/BlockLength: Block has too many lines. [358/25]", 2287792973], - [251, 3, 1598, "Metrics/BlockLength: Block has too many lines. [27/25]", 3227542816], - [358, 3, 5118, "Metrics/BlockLength: Block has too many lines. [77/25]", 1759761803] - ], - "spec/ast/merge/detector/base_spec.rb:4157102211": [ - [3, 1, 3172, "Metrics/BlockLength: Block has too many lines. [100/25]", 3745104028], - [11, 7, 498, "Metrics/MethodLength: Method has too many lines. [13/10]", 3178368155], - [49, 3, 900, "Metrics/BlockLength: Block has too many lines. [28/25]", 2333048204] - ], - "spec/ast/merge/detector/fenced_code_block_spec.rb:495797689": [ - [3, 1, 11589, "Metrics/BlockLength: Block has too many lines. [363/25]", 3764545134], - [38, 3, 4467, "Metrics/BlockLength: Block has too many lines. [150/25]", 1597401000], - [41, 5, 1077, "Metrics/BlockLength: Block has too many lines. [31/25]", 2269642514], - [115, 5, 848, "Metrics/BlockLength: Block has too many lines. [27/25]", 1704866975], - [220, 3, 4815, "Metrics/BlockLength: Block has too many lines. [146/25]", 3797214474] - ], - "spec/ast/merge/detector/mergeable_spec.rb:1307688846": [ - [3, 1, 23175, "Metrics/BlockLength: Block has too many lines. [654/25]", 2932391114], - [77, 3, 2079, "Metrics/BlockLength: Block has too many lines. [53/25]", 1093085347], - [177, 3, 2217, "Metrics/BlockLength: Block has too many lines. [69/25]", 926985871], - [188, 5, 948, "Metrics/BlockLength: Block has too many lines. [26/25]", 4186135901], - [225, 5, 898, "Metrics/BlockLength: Block has too many lines. [31/25]", 513446836], - [266, 3, 1168, "Metrics/BlockLength: Block has too many lines. [29/25]", 774699411], - [304, 3, 1188, "Metrics/BlockLength: Block has too many lines. [27/25]", 4282853126], - [339, 3, 918, "Metrics/BlockLength: Block has too many lines. [28/25]", 1759590109], - [372, 3, 870, "Metrics/BlockLength: Block has too many lines. [28/25]", 131542026], - [410, 3, 3768, "Metrics/BlockLength: Block has too many lines. [111/25]", 181819560], - [483, 5, 1536, "Metrics/BlockLength: Block has too many lines. [47/25]", 385085357], - [540, 3, 1891, "Metrics/BlockLength: Block has too many lines. [52/25]", 602757329], - [664, 3, 1927, "Metrics/BlockLength: Block has too many lines. [56/25]", 48062261], - [691, 5, 1146, "Metrics/BlockLength: Block has too many lines. [31/25]", 1961728737], - [721, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3104497040], - [729, 3, 1625, "Metrics/BlockLength: Block has too many lines. [46/25]", 1570579215] - ], - "spec/ast/merge/detector/region_spec.rb:594725562": [ - [3, 1, 8128, "Metrics/BlockLength: Block has too many lines. [290/25]", 1984713692], - [4, 3, 806, "Metrics/BlockLength: Block has too many lines. [28/25]", 1515087192], - [58, 3, 1236, "Metrics/BlockLength: Block has too many lines. [45/25]", 2464968707], - [128, 3, 1063, "Metrics/BlockLength: Block has too many lines. [33/25]", 239148700], - [250, 3, 2010, "Metrics/BlockLength: Block has too many lines. [76/25]", 2595033382] - ], - "spec/ast/merge/detector/toml_frontmatter_spec.rb:1135160129": [ - [3, 1, 6717, "Metrics/BlockLength: Block has too many lines. [218/25]", 2273975625], - [12, 3, 5534, "Metrics/BlockLength: Block has too many lines. [187/25]", 538920673], - [13, 5, 1456, "Metrics/BlockLength: Block has too many lines. [38/25]", 3113759139] - ], - "spec/ast/merge/detector/yaml_frontmatter_spec.rb:2467934365": [ - [3, 1, 6702, "Metrics/BlockLength: Block has too many lines. [213/25]", 3083039982], - [12, 3, 5056, "Metrics/BlockLength: Block has too many lines. [170/25]", 1889948780], - [13, 5, 1438, "Metrics/BlockLength: Block has too many lines. [38/25]", 1736912391], - [219, 3, 1396, "Metrics/BlockLength: Block has too many lines. [33/25]", 2446467851] - ], - "spec/ast/merge/diff_mapper_base_spec.rb:1771546518": [ - [5, 1, 8521, "Metrics/BlockLength: Block has too many lines. [248/25]", 1057580573], - [22, 9, 44, "Style/InverseMethods: Use `reject` instead of inverting `select`.", 3063843489], - [46, 3, 3878, "Metrics/BlockLength: Block has too many lines. [116/25]", 2874032080], - [47, 5, 1938, "Metrics/BlockLength: Block has too many lines. [48/25]", 1904497583], - [191, 3, 1488, "Metrics/BlockLength: Block has too many lines. [43/25]", 1632956840] - ], - "spec/ast/merge/emitter_base_spec.rb:4197360291": [ - [3, 1, 11215, "Metrics/BlockLength: Block has too many lines. [282/25]", 4254840781], - [30, 3, 4393, "Metrics/BlockLength: Block has too many lines. [102/25]", 3992142376], - [134, 58, 12, "Lint/UnusedMethodArgument: Unused method argument - `current_line`. You can also write as `inline_comment_region_target_column(*)` if you want the method to accept any arguments but don't care about them.", 2091263933], - [138, 44, 6, "Lint/UnusedMethodArgument: Unused method argument - `region`.", 2124512157], - [159, 3, 1815, "Metrics/BlockLength: Block has too many lines. [39/25]", 719023387], - [206, 3, 2233, "Metrics/BlockLength: Block has too many lines. [62/25]", 3754339775], - [312, 3, 1059, "Metrics/BlockLength: Block has too many lines. [26/25]", 375007123] - ], - "spec/ast/merge/fictive_language_harness_spec.rb:1179155480": [ - [6, 1, 6693, "Metrics/BlockLength: Block has too many lines. [143/25]", 245088433], - [7, 3, 1968, "Metrics/BlockLength: Block has too many lines. [36/25]", 4161580169], - [58, 3, 1230, "Metrics/BlockLength: Block has too many lines. [34/25]", 990452676], - [103, 3, 2668, "Metrics/BlockLength: Block has too many lines. [51/25]", 1755027956] - ], - "spec/ast/merge/file_aligner_base_spec.rb:610089304": [ - [5, 1, 7287, "Metrics/BlockLength: Block has too many lines. [164/25]", 597898988], - [6, 3, 1237, "Metrics/BlockLength: Block has too many lines. [37/25]", 1284505259], - [86, 3, 5087, "Metrics/BlockLength: Block has too many lines. [84/25]", 119873771], - [94, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3749416415] - ], - "spec/ast/merge/file_analyzable_spec.rb:3816965829": [ - [3, 1, 12458, "Metrics/BlockLength: Block has too many lines. [272/25]", 216138965], - [25, 3, 9603, "Metrics/BlockLength: Block has too many lines. [202/25]", 2508188172], - [297, 3, 1214, "Metrics/BlockLength: Block has too many lines. [30/25]", 777182624] - ], - "spec/ast/merge/freezable_spec.rb:559280324": [ - [5, 1, 5033, "Metrics/BlockLength: Block has too many lines. [123/25]", 3070666859], - [6, 3, 1199, "Metrics/BlockLength: Block has too many lines. [34/25]", 4058875636], - [66, 3, 1530, "Metrics/BlockLength: Block has too many lines. [31/25]", 1670675428] - ], - "spec/ast/merge/freeze_node_base_spec.rb:2962962931": [ - [3, 1, 21887, "Metrics/BlockLength: Block has too many lines. [560/25]", 567315021], - [48, 3, 1369, "Metrics/BlockLength: Block has too many lines. [38/25]", 3363160391], - [131, 3, 2739, "Metrics/BlockLength: Block has too many lines. [56/25]", 2008289622], - [205, 3, 1586, "Metrics/BlockLength: Block has too many lines. [35/25]", 4179606047], - [251, 3, 977, "Metrics/BlockLength: Block has too many lines. [26/25]", 1240612851], - [287, 3, 1130, "Metrics/BlockLength: Block has too many lines. [28/25]", 2511265379], - [322, 3, 5029, "Metrics/BlockLength: Block has too many lines. [126/25]", 739537566], - [598, 3, 3055, "Metrics/BlockLength: Block has too many lines. [81/25]", 145217296] - ], - "spec/ast/merge/healer_spec.rb:877829793": [ - [3, 1, 4896, "Metrics/BlockLength: Block has too many lines. [148/25]", 1074378773], - [19, 3, 1333, "Metrics/BlockLength: Block has too many lines. [38/25]", 2940878263], - [24, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193432399], - [61, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085379023], - [67, 3, 2985, "Metrics/BlockLength: Block has too many lines. [93/25]", 4032786576] - ], - "spec/ast/merge/jaccard_similarity_spec.rb:3984307047": [ - [3, 1, 2659, "Metrics/BlockLength: Block has too many lines. [71/25]", 1122516612], - [6, 3, 1484, "Metrics/BlockLength: Block has too many lines. [38/25]", 3367914637], - [55, 3, 1090, "Metrics/BlockLength: Block has too many lines. [28/25]", 2629339264] - ], - "spec/ast/merge/key_path_partial_template_merger_base_spec.rb:2189485360": [ - [5, 1, 5955, "Metrics/BlockLength: Block has too many lines. [138/25]", 91542958], - [35, 3, 1217, "Metrics/BlockLength: Block has too many lines. [33/25]", 2663081123], - [97, 3, 3019, "Metrics/BlockLength: Block has too many lines. [54/25]", 1411952192] - ], - "spec/ast/merge/layout/attachment_spec.rb:3814294426": [ - [3, 1, 1799, "Metrics/BlockLength: Block has too many lines. [34/25]", 1283153367] - ], - "spec/ast/merge/layout/augmenter_spec.rb:3633045915": [ - [3, 1, 4412, "Metrics/BlockLength: Block has too many lines. [92/25]", 2690553031], - [20, 3, 2725, "Metrics/BlockLength: Block has too many lines. [54/25]", 3645203819] - ], - "spec/ast/merge/layout/gap_spec.rb:4232058283": [ - [3, 1, 2758, "Metrics/BlockLength: Block has too many lines. [72/25]", 2052697931], - [9, 3, 1290, "Metrics/BlockLength: Block has too many lines. [28/25]", 3175967312] - ], - "spec/ast/merge/match_refiner_base_spec.rb:3961767223": [ - [3, 1, 10604, "Metrics/BlockLength: Block has too many lines. [301/25]", 4290485382], - [4, 3, 1146, "Metrics/BlockLength: Block has too many lines. [37/25]", 108051658], - [50, 3, 1005, "Metrics/BlockLength: Block has too many lines. [28/25]", 3807648246], - [125, 3, 1026, "Metrics/BlockLength: Block has too many lines. [27/25]", 2896086726], - [162, 3, 4464, "Metrics/BlockLength: Block has too many lines. [114/25]", 2878217135], - [218, 5, 1112, "Metrics/BlockLength: Block has too many lines. [30/25]", 1605825436], - [224, 11, 104, "Style/HashLikeCase: Consider replacing `case-when` with a hash lookup.", 4220899731], - [247, 11, 132, "Style/HashLikeCase: Consider replacing `case-when` with a hash lookup.", 3401820780], - [258, 5, 1642, "Metrics/BlockLength: Block has too many lines. [35/25]", 1288881729], - [337, 3, 1108, "Metrics/BlockLength: Block has too many lines. [33/25]", 2139263963] - ], - "spec/ast/merge/match_score_base_spec.rb:2340739872": [ - [3, 1, 15213, "Metrics/BlockLength: Block has too many lines. [372/25]", 1512747000], - [4, 3, 1553, "Metrics/BlockLength: Block has too many lines. [41/25]", 2789289940], - [43, 20, 2, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 5862747], - [43, 24, 2, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 5862744], - [56, 3, 1041, "Metrics/BlockLength: Block has too many lines. [29/25]", 3729310115], - [152, 3, 3259, "Metrics/BlockLength: Block has too many lines. [82/25]", 1438003770], - [258, 3, 2199, "Metrics/BlockLength: Block has too many lines. [43/25]", 3386602801], - [320, 3, 1684, "Metrics/BlockLength: Block has too many lines. [35/25]", 3807719546], - [365, 14, 16, "Lint/FloatComparison: Avoid equality comparisons of floats as they are unreliable.", 3787748956], - [369, 3, 1696, "Metrics/BlockLength: Block has too many lines. [36/25]", 3172214426], - [417, 3, 1792, "Metrics/BlockLength: Block has too many lines. [45/25]", 3557977606], - [438, 5, 1121, "Metrics/BlockLength: Block has too many lines. [26/25]", 4236927298] - ], - "spec/ast/merge/merge_result_base_spec.rb:2262708492": [ - [3, 1, 19471, "Metrics/BlockLength: Block has too many lines. [529/25]", 4106058751], - [38, 3, 2735, "Metrics/BlockLength: Block has too many lines. [80/25]", 1103243845], - [279, 3, 1611, "Metrics/BlockLength: Block has too many lines. [39/25]", 1928511417], - [280, 5, 1203, "Metrics/BlockLength: Block has too many lines. [26/25]", 857223227], - [326, 3, 2070, "Metrics/BlockLength: Block has too many lines. [48/25]", 2552826824], - [385, 3, 5769, "Metrics/BlockLength: Block has too many lines. [140/25]", 1457747735], - [511, 5, 1306, "Metrics/BlockLength: Block has too many lines. [29/25]", 2980786372], - [574, 3, 1308, "Metrics/BlockLength: Block has too many lines. [32/25]", 1342704008] - ], - "spec/ast/merge/merger_config_spec.rb:663896662": [ - [5, 1, 7314, "Metrics/BlockLength: Block has too many lines. [189/25]", 1279589310], - [11, 3, 1180, "Metrics/BlockLength: Block has too many lines. [26/25]", 1014009176], - [45, 3, 1151, "Metrics/BlockLength: Block has too many lines. [26/25]", 785276703], - [79, 3, 3574, "Metrics/BlockLength: Block has too many lines. [97/25]", 969726064], - [126, 5, 1158, "Metrics/BlockLength: Block has too many lines. [29/25]", 389808524] - ], - "spec/ast/merge/navigable/injection_point_finder_spec.rb:3693754765": [ - [3, 1, 5152, "Metrics/BlockLength: Block has too many lines. [123/25]", 3265221808], - [15, 3, 4026, "Metrics/BlockLength: Block has too many lines. [96/25]", 1482695302], - [63, 5, 2337, "Metrics/BlockLength: Block has too many lines. [54/25]", 2678200297] - ], - "spec/ast/merge/navigable/injection_point_spec.rb:3295717447": [ - [3, 1, 6032, "Metrics/BlockLength: Block has too many lines. [161/25]", 805025024], - [77, 3, 1083, "Metrics/BlockLength: Block has too many lines. [28/25]", 3091139104] - ], - "spec/ast/merge/navigable/statement_spec.rb:2965726260": [ - [3, 1, 18289, "Metrics/BlockLength: Block has too many lines. [510/25]", 4119203121], - [102, 3, 3570, "Metrics/BlockLength: Block has too many lines. [97/25]", 3287535168], - [156, 5, 2030, "Metrics/BlockLength: Block has too many lines. [51/25]", 3299963733], - [251, 3, 1338, "Metrics/BlockLength: Block has too many lines. [37/25]", 844559624], - [411, 3, 1550, "Metrics/BlockLength: Block has too many lines. [42/25]", 3851790429], - [465, 3, 1372, "Metrics/BlockLength: Block has too many lines. [41/25]", 3782869383] - ], - "spec/ast/merge/node_typing/frozen_wrapper_spec.rb:3823345520": [ - [3, 1, 4532, "Metrics/BlockLength: Block has too many lines. [117/25]", 3944573785] - ], - "spec/ast/merge/node_typing/normalizer_spec.rb:1976431423": [ - [4, 1, 8679, "Metrics/BlockLength: Block has too many lines. [219/25]", 938207310], - [65, 3, 1137, "Metrics/BlockLength: Block has too many lines. [26/25]", 3180807289], - [101, 3, 1404, "Metrics/BlockLength: Block has too many lines. [28/25]", 1094334251], - [216, 3, 875, "Metrics/BlockLength: Block has too many lines. [26/25]", 2755551247] - ], - "spec/ast/merge/node_typing/wrapper_spec.rb:3211588263": [ - [3, 1, 3469, "Metrics/BlockLength: Block has too many lines. [92/25]", 638644563] - ], - "spec/ast/merge/node_typing_spec.rb:4080661389": [ - [3, 1, 12728, "Metrics/BlockLength: Block has too many lines. [333/25]", 3927571381], - [132, 3, 3704, "Metrics/BlockLength: Block has too many lines. [98/25]", 2130243754], - [208, 5, 1267, "Metrics/BlockLength: Block has too many lines. [31/25]", 2816753725], - [265, 3, 1298, "Metrics/BlockLength: Block has too many lines. [33/25]", 3320876250], - [311, 3, 3803, "Metrics/BlockLength: Block has too many lines. [100/25]", 2743470911] - ], - "spec/ast/merge/node_wrapper_base_spec.rb:2252820285": [ - [3, 1, 11681, "Metrics/BlockLength: Block has too many lines. [307/25]", 1698593962], - [32, 3, 2341, "Metrics/BlockLength: Block has too many lines. [68/25]", 1594381363], - [179, 3, 2568, "Metrics/BlockLength: Block has too many lines. [51/25]", 1269052990], - [294, 3, 1252, "Metrics/BlockLength: Block has too many lines. [26/25]", 4220822180], - [329, 3, 1963, "Metrics/BlockLength: Block has too many lines. [39/25]", 1623030031] - ], - "spec/ast/merge/owner_selection_spec.rb:1894901093": [ - [3, 1, 1356, "Metrics/BlockLength: Block has too many lines. [35/25]", 1030003775] - ], - "spec/ast/merge/partial_template_merger_base_spec.rb:3412991027": [ - [3, 1, 7073, "Metrics/BlockLength: Block has too many lines. [145/25]", 3415302240], - [16, 9, 43, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3196404056], - [22, 9, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 4116824817], - [48, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [96, 3, 4220, "Metrics/BlockLength: Block has too many lines. [68/25]", 3464417459], - [97, 5, 2029, "Metrics/BlockLength: Block has too many lines. [27/25]", 3297854360], - [138, 5, 2122, "Metrics/BlockLength: Block has too many lines. [37/25]", 1592076374] - ], - "spec/ast/merge/recipe/config_spec.rb:3917288551": [ - [3, 1, 21041, "Metrics/BlockLength: Block has too many lines. [611/25]", 2431235923], - [72, 3, 1653, "Metrics/BlockLength: Block has too many lines. [36/25]", 2702780755], - [174, 3, 1465, "Metrics/BlockLength: Block has too many lines. [44/25]", 2326126933], - [226, 3, 3419, "Metrics/BlockLength: Block has too many lines. [89/25]", 798604841], - [327, 3, 1398, "Metrics/BlockLength: Block has too many lines. [34/25]", 3113267700], - [474, 3, 1184, "Metrics/BlockLength: Block has too many lines. [39/25]", 2599756030], - [519, 3, 4630, "Metrics/BlockLength: Block has too many lines. [147/25]", 1245526575] - ], - "spec/ast/merge/recipe/preset_spec.rb:818394232": [ - [3, 1, 6696, "Metrics/BlockLength: Block has too many lines. [173/25]", 3205615892] - ], - "spec/ast/merge/recipe/runner_spec.rb:3689194117": [ - [3, 1, 46798, "Metrics/BlockLength: Block has too many lines. [1104/25]", 3220015076], - [48, 3, 1128, "Metrics/BlockLength: Block has too many lines. [26/25]", 910457645], - [108, 3, 3036, "Metrics/BlockLength: Block has too many lines. [92/25]", 2112378918], - [132, 5, 881, "Metrics/BlockLength: Block has too many lines. [27/25]", 3842010356], - [177, 5, 918, "Metrics/BlockLength: Block has too many lines. [27/25]", 2152367239], - [295, 3, 1383, "Metrics/BlockLength: Block has too many lines. [41/25]", 2141027559], - [362, 3, 1653, "Metrics/BlockLength: Block has too many lines. [33/25]", 1536472295], - [449, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3960802027], - [497, 3, 7959, "Metrics/BlockLength: Block has too many lines. [200/25]", 3739116912], - [556, 5, 1225, "Metrics/BlockLength: Block has too many lines. [31/25]", 195497726], - [740, 3, 6977, "Metrics/BlockLength: Block has too many lines. [145/25]", 2805535296], - [748, 5, 2241, "Metrics/BlockLength: Block has too many lines. [49/25]", 2552233173], - [805, 5, 3007, "Metrics/BlockLength: Block has too many lines. [59/25]", 708771722], - [877, 5, 1444, "Metrics/BlockLength: Block has too many lines. [26/25]", 3274225022], - [911, 3, 3258, "Metrics/BlockLength: Block has too many lines. [85/25]", 2346849758], - [1012, 3, 2710, "Metrics/BlockLength: Block has too many lines. [71/25]", 3801821877], - [1029, 5, 1547, "Metrics/BlockLength: Block has too many lines. [42/25]", 2962020615], - [1109, 3, 2240, "Metrics/BlockLength: Block has too many lines. [35/25]", 1139957345], - [1115, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], - [1117, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], - [1119, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1801369636], - [1121, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2652710920], - [1123, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1375785821], - [1125, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 632755459], - [1160, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], - [1162, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], - [1164, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1375785821], - [1176, 3, 1472, "Metrics/BlockLength: Block has too many lines. [31/25]", 844153987], - [1181, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1239303812], - [1183, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1251336963], - [1216, 3, 2277, "Metrics/BlockLength: Block has too many lines. [43/25]", 4287127386], - [1221, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], - [1223, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2652710920], - [1225, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1375785821], - [1227, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 632755459], - [1274, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3420615328] - ], - "spec/ast/merge/recipe/script_loader_spec.rb:2136892097": [ - [3, 1, 8554, "Metrics/BlockLength: Block has too many lines. [237/25]", 2314425369], - [45, 3, 2842, "Metrics/BlockLength: Block has too many lines. [75/25]", 168902852], - [155, 3, 1400, "Metrics/BlockLength: Block has too many lines. [39/25]", 1611123964] - ], - "spec/ast/merge/rspec/shared_examples/feature_profile_spec.rb:2654837708": [ - [5, 1, 1140, "Metrics/BlockLength: Block has too many lines. [31/25]", 678325840] - ], - "spec/ast/merge/rspec/shared_examples/file_analyzable_spec.rb:1833922303": [ - [58, 3, 970, "Metrics/AbcSize: Assignment Branch Condition size for `detect_freeze_blocks` is too high. [<16, 9, 5> 19.03/17]", 1533823667], - [58, 3, 970, "Metrics/MethodLength: Method has too many lines. [31/10]", 1533823667], - [104, 1, 1216, "Metrics/BlockLength: Block has too many lines. [39/25]", 1009012120], - [105, 3, 1159, "Metrics/BlockLength: Block has too many lines. [38/25]", 1361521205] - ], - "spec/ast/merge/rspec/shared_examples/layout_attachment_spec.rb:714796658": [ - [8, 1, 957, "Metrics/BlockLength: Block has too many lines. [28/25]", 3738990548] - ], - "spec/ast/merge/rspec/shared_examples/recipe_preset_contract_spec.rb:669158728": [ - [6, 1, 1577, "Metrics/BlockLength: Block has too many lines. [41/25]", 2157464290], - [7, 3, 1512, "Metrics/BlockLength: Block has too many lines. [39/25]", 1968160370], - [44, 5, 401, "Metrics/AbcSize: Assignment Branch Condition size for `run_verify_loaded_preset` is too high. [<0, 26, 0> 26/17]", 2960760840] - ], - "spec/ast/merge/rspec/shared_examples/removal_mode_compliance_spec.rb:31388352": [ - [6, 22, 2, "Style/MutableConstant: Freeze mutable objects assigned to constants.", 5861859], - [44, 1, 2546, "Metrics/BlockLength: Block has too many lines. [77/25]", 3740028971], - [45, 3, 1350, "Metrics/BlockLength: Block has too many lines. [41/25]", 2793151667], - [94, 3, 1128, "Metrics/BlockLength: Block has too many lines. [32/25]", 2527000512], - [95, 5, 1081, "Metrics/BlockLength: Block has too many lines. [30/25]", 3825359844] - ], - "spec/ast/merge/rspec/shared_examples/reproducible_partial_merge_spec.rb:2862326360": [ - [19, 3, 600, "Metrics/MethodLength: Method has too many lines. [13/10]", 1542875905] - ], - "spec/ast/merge/ruleset/config_spec.rb:1860949041": [ - [3, 1, 9431, "Metrics/BlockLength: Block has too many lines. [236/25]", 4015119559], - [24, 3, 5341, "Metrics/BlockLength: Block has too many lines. [149/25]", 2361087446], - [25, 5, 1064, "Metrics/BlockLength: Block has too many lines. [26/25]", 603056104], - [226, 3, 2125, "Metrics/BlockLength: Block has too many lines. [36/25]", 1640873170] - ], - "spec/ast/merge/ruleset/declaration_objects_spec.rb:3827892270": [ - [3, 1, 1881, "Metrics/BlockLength: Block has too many lines. [47/25]", 1770376910] - ], - "spec/ast/merge/ruleset/feature_profile_spec.rb:2241111096": [ - [3, 1, 4189, "Metrics/BlockLength: Block has too many lines. [86/25]", 1116963550], - [4, 3, 4129, "Metrics/BlockLength: Block has too many lines. [84/25]", 117079811], - [5, 5, 2391, "Metrics/BlockLength: Block has too many lines. [45/25]", 1800077283] - ], - "spec/ast/merge/ruleset/parser_spec.rb:386407767": [ - [3, 1, 5670, "Metrics/BlockLength: Block has too many lines. [144/25]", 3425850453], - [4, 3, 5618, "Metrics/BlockLength: Block has too many lines. [143/25]", 246633759] - ], - "spec/ast/merge/ruleset/profile_vocabulary_spec.rb:2570869276": [ - [3, 1, 2095, "Metrics/BlockLength: Block has too many lines. [46/25]", 3214342662] - ], - "spec/ast/merge/ruleset/support_style_resolver_spec.rb:640167644": [ - [3, 1, 1625, "Metrics/BlockLength: Block has too many lines. [49/25]", 2066834885], - [4, 3, 1559, "Metrics/BlockLength: Block has too many lines. [47/25]", 1169495477] - ], - "spec/ast/merge/runtime_spec.rb:3962589694": [ - [5, 1, 24649, "Metrics/BlockLength: Block has too many lines. [664/25]", 2634021188], - [76, 3, 1459, "Metrics/BlockLength: Block has too many lines. [41/25]", 3744002593], - [125, 3, 1417, "Metrics/BlockLength: Block has too many lines. [33/25]", 4087615381], - [166, 3, 2549, "Metrics/BlockLength: Block has too many lines. [69/25]", 3150260095], - [175, 5, 1068, "Metrics/BlockLength: Block has too many lines. [26/25]", 2933114685], - [247, 3, 1668, "Metrics/BlockLength: Block has too many lines. [39/25]", 2386637993], - [259, 5, 1265, "Metrics/BlockLength: Block has too many lines. [27/25]", 3157806167], - [321, 3, 10884, "Metrics/BlockLength: Block has too many lines. [295/25]", 1889265918], - [322, 5, 1879, "Metrics/BlockLength: Block has too many lines. [46/25]", 2536583521], - [373, 5, 3938, "Metrics/BlockLength: Block has too many lines. [108/25]", 340276027], - [486, 5, 1270, "Metrics/BlockLength: Block has too many lines. [38/25]", 3844174392], - [528, 5, 3728, "Metrics/BlockLength: Block has too many lines. [95/25]", 3779381786], - [630, 3, 3240, "Metrics/BlockLength: Block has too many lines. [84/25]", 3856725067], - [656, 5, 1649, "Metrics/BlockLength: Block has too many lines. [40/25]", 3713662683] - ], - "spec/ast/merge/section_typing_spec.rb:2580971307": [ - [3, 1, 14786, "Metrics/BlockLength: Block has too many lines. [344/25]", 2925587076], - [4, 3, 1940, "Metrics/BlockLength: Block has too many lines. [50/25]", 3362429388], - [67, 3, 3684, "Metrics/BlockLength: Block has too many lines. [96/25]", 3864076664], - [120, 5, 1998, "Metrics/BlockLength: Block has too many lines. [50/25]", 411620722], - [183, 3, 1415, "Metrics/BlockLength: Block has too many lines. [37/25]", 3323012675], - [192, 5, 1124, "Metrics/BlockLength: Block has too many lines. [28/25]", 966216762], - [229, 3, 1610, "Metrics/BlockLength: Block has too many lines. [38/25]", 1499957007], - [229, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 1025596574], - [279, 3, 4437, "Metrics/BlockLength: Block has too many lines. [80/25]", 423587151], - [356, 36, 23, "Style/SymbolProc: Pass `&:unclassified?` as an argument to `find` instead of a block.", 563945984], - [369, 36, 23, "Style/SymbolProc: Pass `&:unclassified?` as an argument to `find` instead of a block.", 563945984], - [375, 3, 1630, "Metrics/BlockLength: Block has too many lines. [31/25]", 1675144727] - ], - "spec/ast/merge/smart_merger_base_spec.rb:1904727390": [ - [3, 1, 13253, "Metrics/BlockLength: Block has too many lines. [398/25]", 3611753358], - [30, 9, 10, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 1099697163], - [87, 3, 1851, "Metrics/BlockLength: Block has too many lines. [40/25]", 3729571903], - [210, 3, 925, "Metrics/BlockLength: Block has too many lines. [35/25]", 2001100899], - [344, 3, 709, "Metrics/BlockLength: Block has too many lines. [27/25]", 3041950416], - [415, 3, 1074, "Metrics/BlockLength: Block has too many lines. [35/25]", 956635689], - [416, 5, 1026, "Metrics/BlockLength: Block has too many lines. [33/25]", 1993879652], - [461, 3, 1031, "Metrics/BlockLength: Block has too many lines. [31/25]", 35315996] - ], - "spec/ast/merge/structural_edit/boundary_support_spec.rb:863387845": [ - [3, 1, 4226, "Metrics/BlockLength: Block has too many lines. [86/25]", 1889771490], - [16, 9, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1304492024], - [22, 9, 41, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3828424401], - [59, 3, 1294, "Metrics/BlockLength: Block has too many lines. [26/25]", 3038774774] - ], - "spec/ast/merge/structural_edit/plan_set_spec.rb:3633263362": [ - [3, 1, 5945, "Metrics/BlockLength: Block has too many lines. [180/25]", 3883285271], - [14, 3, 2139, "Metrics/BlockLength: Block has too many lines. [72/25]", 3558415255], - [128, 3, 1412, "Metrics/BlockLength: Block has too many lines. [39/25]", 1216754705] - ], - "spec/ast/merge/structural_edit/remove_plan_spec.rb:3569534665": [ - [3, 1, 6442, "Metrics/BlockLength: Block has too many lines. [134/25]", 3440814588], - [39, 3, 3768, "Metrics/BlockLength: Block has too many lines. [75/25]", 876721813], - [127, 3, 1439, "Metrics/BlockLength: Block has too many lines. [29/25]", 3378195351] - ], - "spec/ast/merge/structural_edit/remove_plan_support_spec.rb:800158061": [ - [3, 1, 2893, "Metrics/BlockLength: Block has too many lines. [62/25]", 3748446914], - [16, 9, 43, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3196404056], - [22, 9, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 4116824817], - [29, 3, 2091, "Metrics/BlockLength: Block has too many lines. [39/25]", 1684933040], - [30, 5, 1653, "Metrics/BlockLength: Block has too many lines. [27/25]", 2456404305] - ], - "spec/ast/merge/structural_edit/splice_plan_spec.rb:3331205681": [ - [3, 1, 3159, "Metrics/BlockLength: Block has too many lines. [83/25]", 2234926397], - [16, 3, 1837, "Metrics/BlockLength: Block has too many lines. [46/25]", 2935991482], - [42, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860750] - ], - "spec/ast/merge/text/conflict_resolver_spec.rb:3810004132": [ - [5, 1, 9102, "Metrics/BlockLength: Block has too many lines. [218/25]", 672115618], - [33, 3, 8206, "Metrics/BlockLength: Block has too many lines. [194/25]", 259803246], - [78, 5, 1920, "Metrics/BlockLength: Block has too many lines. [45/25]", 3965182334], - [139, 5, 1918, "Metrics/BlockLength: Block has too many lines. [44/25]", 3707046125] - ], - "spec/ast/merge/text/file_analysis_spec.rb:3430380445": [ - [5, 1, 8842, "Metrics/BlockLength: Block has too many lines. [205/25]", 4255187284], - [6, 3, 1323, "Metrics/BlockLength: Block has too many lines. [29/25]", 2518912953], - [47, 3, 1830, "Metrics/BlockLength: Block has too many lines. [43/25]", 3685770590], - [135, 3, 1620, "Metrics/BlockLength: Block has too many lines. [35/25]", 3089951119] - ], - "spec/ast/merge/text/line_node_spec.rb:1757790485": [ - [5, 1, 4739, "Metrics/BlockLength: Block has too many lines. [131/25]", 1487875238] - ], - "spec/ast/merge/text/merge_result_spec.rb:589380024": [ - [5, 1, 1541, "Metrics/BlockLength: Block has too many lines. [40/25]", 2828087992] - ], - "spec/ast/merge/text/section_splitter_spec.rb:804308722": [ - [4, 1, 5705, "Metrics/BlockLength: Block has too many lines. [209/25]", 4175363685], - [5, 3, 794, "Metrics/BlockLength: Block has too many lines. [28/25]", 2386862842], - [42, 3, 1126, "Metrics/BlockLength: Block has too many lines. [45/25]", 1507887296], - [95, 3, 746, "Metrics/BlockLength: Block has too many lines. [30/25]", 1759029412], - [131, 3, 1169, "Metrics/BlockLength: Block has too many lines. [45/25]", 1412318991], - [184, 3, 754, "Metrics/BlockLength: Block has too many lines. [30/25]", 2717556691], - [246, 1, 16648, "Metrics/BlockLength: Block has too many lines. [428/25]", 3166834694], - [370, 3, 1640, "Metrics/BlockLength: Block has too many lines. [46/25]", 2049342960], - [424, 3, 3237, "Metrics/BlockLength: Block has too many lines. [102/25]", 2357275144], - [540, 3, 3505, "Metrics/BlockLength: Block has too many lines. [67/25]", 2112469350], - [619, 3, 3586, "Metrics/BlockLength: Block has too many lines. [90/25]", 3866409298], - [620, 5, 1650, "Metrics/BlockLength: Block has too many lines. [48/25]", 289235626], - [622, 9, 1474, "Metrics/AbcSize: Assignment Branch Condition size for `split` is too high. [<8, 21, 7> 23.54/17]", 557655357], - [622, 9, 1474, "Metrics/MethodLength: Method has too many lines. [41/10]", 557655357], - [622, 9, 1474, "Metrics/PerceivedComplexity: Perceived complexity for `split` is too high. [9/8]", 557655357], - [628, 11, 1237, "Metrics/BlockLength: Block has too many lines. [33/25]", 1134667672], - [717, 29, 44, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 2169354946], - [723, 29, 44, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 2169354946], - [751, 1, 3128, "Metrics/BlockLength: Block has too many lines. [85/25]", 2082776744], - [769, 3, 1744, "Metrics/BlockLength: Block has too many lines. [46/25]", 223880162], - [770, 5, 1258, "Metrics/BlockLength: Block has too many lines. [31/25]", 2245422869] - ], - "spec/ast/merge/text/smart_merger_spec.rb:4128732567": [ - [3, 1, 8057, "Metrics/BlockLength: Block has too many lines. [210/25]", 1690443322], - [4, 3, 1135, "Metrics/BlockLength: Block has too many lines. [28/25]", 3788979655], - [58, 3, 4438, "Metrics/BlockLength: Block has too many lines. [106/25]", 2613192474], - [187, 3, 1053, "Metrics/BlockLength: Block has too many lines. [26/25]", 803567817], - [220, 3, 892, "Metrics/BlockLength: Block has too many lines. [28/25]", 2001100899] - ], - "spec/ast/merge/text/word_node_spec.rb:1457011521": [ - [5, 1, 3264, "Metrics/BlockLength: Block has too many lines. [74/25]", 677733430] - ], - "spec/ast/merge/token_match_refiner_spec.rb:3180314913": [ - [3, 1, 4000, "Metrics/BlockLength: Block has too many lines. [80/25]", 1630791278], - [8, 3, 2912, "Metrics/BlockLength: Block has too many lines. [60/25]", 529772148] - ], - "spec/ast/merge/trailing_groups/alignment_sort_spec.rb:1594915480": [ - [5, 1, 4710, "Metrics/BlockLength: Block has too many lines. [114/25]", 2499296583], - [14, 3, 2140, "Metrics/BlockLength: Block has too many lines. [47/25]", 3871799493], - [95, 3, 1482, "Metrics/BlockLength: Block has too many lines. [35/25]", 1088314263] - ], - "spec/ast/merge/trailing_groups/core_spec.rb:2651131504": [ - [5, 1, 9601, "Metrics/BlockLength: Block has too many lines. [242/25]", 598045669], - [22, 3, 3728, "Metrics/BlockLength: Block has too many lines. [87/25]", 1304580063], - [119, 3, 3931, "Metrics/BlockLength: Block has too many lines. [99/25]", 2464218479], - [186, 5, 1322, "Metrics/BlockLength: Block has too many lines. [30/25]", 427915501], - [187, 7, 1267, "Metrics/BlockLength: Block has too many lines. [28/25]", 861882691], - [245, 3, 1306, "Metrics/BlockLength: Block has too many lines. [34/25]", 86572459] - ], - "spec/ast/merge/trailing_groups/dest_iterate_spec.rb:3632880085": [ - [5, 1, 5523, "Metrics/BlockLength: Block has too many lines. [131/25]", 3077369183], - [19, 3, 3990, "Metrics/BlockLength: Block has too many lines. [91/25]", 593259616], - [39, 35, 12, "Style/SymbolProc: Pass `&:sig` as an argument to `lambda` instead of a block.", 3587754320], - [54, 33, 23, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 384283629], - [89, 35, 13, "Style/SymbolProc: Pass `&:name` as an argument to `lambda` instead of a block.", 3561384234], - [98, 35, 12, "Style/SymbolProc: Pass `&:sig` as an argument to `lambda` instead of a block.", 3587754320], - [113, 35, 12, "Style/SymbolProc: Pass `&:sig` as an argument to `lambda` instead of a block.", 3587754320] - ], - "spec/ast/merge/unresolved_policy_spec.rb:2561713656": [ - [3, 1, 1333, "Metrics/BlockLength: Block has too many lines. [33/25]", 4109547889] - ], - "spec/ast/merge/unresolved_review_state_spec.rb:3186871217": [ - [3, 1, 1038, "Metrics/BlockLength: Block has too many lines. [31/25]", 1325553035] - ], - "spec/ast/merge_spec.rb:664670069": [ - [3, 1, 3113, "Metrics/BlockLength: Block has too many lines. [74/25]", 4034649501], - [9, 3, 2227, "Metrics/BlockLength: Block has too many lines. [51/25]", 578300230], - [10, 5, 2182, "Metrics/BlockLength: Block has too many lines. [49/25]", 2758871265] - ], - "spec/base_substrate_spec.rb:2864492094": [ - [5, 1, 5800, "Metrics/BlockLength: Block has too many lines. [143/25]", 784801982], - [6, 3, 192, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 680981873], - [13, 3, 378, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1223797442], - [31, 3, 628, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 2123191050], - [53, 3, 429, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3536712197], - [69, 3, 24, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 2280792512], - [70, 3, 78, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 604224776], - [72, 3, 146, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3315091322] - ], - "spec/fixtures_integration_spec.rb:1145500459": [ - [595, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859109], - [758, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 576909008], - [881, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087900170], - [1806, 3, 816, "Metrics/MethodLength: Method has too many lines. [13/10]", 170960660], - [1806, 39, 213, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 635200700], - [1807, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3976306097], - [1831, 38, 80, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3297939075], - [1916, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1745553512], - [1917, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 118067488], - [1918, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 196190368], - [1919, 121, 41, "Layout/LineLength: Line is too long. [161/120]", 3371256193], - [2090, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3241114703], - [2428, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], - [2567, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], - [2991, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3697593604], - [2992, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], - [3113, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179435314], - [3122, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1182194285], - [3124, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 3886107031], - [3151, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1751849111], - [3152, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1519587684], - [3153, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 4086262880], - [3170, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3568081822], - [3171, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1776876782], - [3173, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [3174, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1751849111], - [3176, 121, 73, "Layout/LineLength: Line is too long. [193/120]", 3322243646], - [3178, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1715153206], - [3179, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [3180, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 504997180], - [3181, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 1146860021], - [3182, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 2312101607], - [3183, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1423779161], - [3184, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1900897138], - [3185, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 1689840383], - [3186, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 1589056236], - [3188, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 763176550], - [3194, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3957871310], - [3196, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 763176550], - [3198, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 919916608], - [3199, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 919916608], - [3200, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3957871310], - [3201, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 4073040612], - [3202, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 763176550], - [3203, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 667593075], - [3205, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1310972770], - [3206, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 311387795], - [3207, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 724840266], - [3208, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 2555878310], - [3209, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1781078972], - [3210, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [3213, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [3214, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1658060570], - [3215, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 3085728851], - [3216, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3129400559], - [3217, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3197516464], - [3218, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087771520], - [3219, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3837194228], - [3220, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1312323543], - [3221, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 2356847623], - [3222, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [3223, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3428073441], - [3224, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 2891080552], - [3225, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3080737172], - [3226, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 170445026], - [3227, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3240051869], - [3228, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 4266052680], - [3229, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3376297786], - [3230, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 398435913], - [3231, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 4134940256], - [3232, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 30370035], - [3233, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 2862546359], - [3234, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1901388514], - [3235, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 838864274], - [3236, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 3437460384], - [3237, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1567003152], - [3238, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2609066305], - [3239, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 4043187090], - [3240, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3866430009], - [3241, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 2182699083], - [3242, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 3958792129], - [3243, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3449926560], - [3244, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 399774089], - [3245, 121, 68, "Layout/LineLength: Line is too long. [188/120]", 2119246799], - [3247, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3592658842], - [3248, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2905723409], - [3249, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 3930305198], - [3250, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 4186230052], - [3251, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [3252, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2700200720], - [3253, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 1630526402], - [3254, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3669244926], - [3255, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2814234644], - [3256, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3109415933], - [3257, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3643275044], - [3258, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 3825290660], - [3259, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1751849111], - [3260, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 4112285398], - [3261, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 1684279672], - [3262, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 1616506266], - [3264, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [3265, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1330093223], - [3266, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 4084555566], - [3267, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 2466867154], - [3268, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 4088314613], - [3269, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 2416893689], - [3270, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 683312682], - [3271, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 2516517934], - [3272, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2414563355], - [3273, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 2232595211], - [3274, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 2940789369], - [3275, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 941259913], - [3276, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2133508098], - [3277, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1621975014], - [3278, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 35985461], - [3279, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 746016305], - [3280, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 435488100], - [3281, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 2581129172], - [3282, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 3495900774], - [3283, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1413120342], - [3284, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [3285, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2333800791], - [3286, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 2576906206], - [3287, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 2986659874], - [3288, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2811932564], - [3289, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 1970813291], - [3290, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 2904941246], - [3291, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3745922508], - [3292, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 735247237], - [3293, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3731320885], - [3294, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 3896022034], - [3295, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 2827048584], - [3296, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 2548596663], - [3297, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 3812352018], - [3298, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 1280243910], - [3299, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 1742643292], - [3300, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 3056442430], - [3301, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 3144363287], - [3302, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 477297993], - [3303, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 3657857971], - [3304, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3913984414], - [3305, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 336201058], - [3306, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 485418789], - [3307, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 453253839], - [3308, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3673833034], - [3309, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 1552836890], - [3310, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 2714635965], - [3311, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 9336999], - [3312, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 584857208], - [3313, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1394865213], - [3314, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 3973222761], - [3315, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 2020040051], - [3316, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 3060994335], - [3317, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 196286917], - [3318, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 4168514178], - [3319, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 810581246], - [3320, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 1473417372], - [3321, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 3008376885], - [3322, 121, 84, "Layout/LineLength: Line is too long. [204/120]", 454816400], - [3323, 121, 88, "Layout/LineLength: Line is too long. [208/120]", 1416223705], - [3324, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 2896813919], - [3325, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 957293983], - [3326, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 2118117430], - [3327, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 1367404612], - [3328, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 2459902188], - [3329, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 461483815], - [3330, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 2791596520], - [3331, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 203085787], - [3332, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 2942095139], - [3333, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 131861965], - [3334, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 3340827551], - [3335, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 102582610], - [3336, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 762789354], - [3337, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 3478337442], - [3338, 121, 112, "Layout/LineLength: Line is too long. [232/120]", 4010607435], - [3339, 121, 132, "Layout/LineLength: Line is too long. [252/120]", 3754747587], - [3340, 121, 136, "Layout/LineLength: Line is too long. [256/120]", 379336923], - [3341, 121, 108, "Layout/LineLength: Line is too long. [228/120]", 3366353902], - [3342, 121, 128, "Layout/LineLength: Line is too long. [248/120]", 1686898289], - [3343, 121, 132, "Layout/LineLength: Line is too long. [252/120]", 2005192241], - [3344, 121, 104, "Layout/LineLength: Line is too long. [224/120]", 1868634464], - [3345, 121, 124, "Layout/LineLength: Line is too long. [244/120]", 3939743614], - [3346, 121, 128, "Layout/LineLength: Line is too long. [248/120]", 2978506702], - [3347, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 3909866928], - [3348, 121, 118, "Layout/LineLength: Line is too long. [238/120]", 2853032177], - [3349, 121, 122, "Layout/LineLength: Line is too long. [242/120]", 2968366309], - [3350, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 1753663643], - [3351, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 3387619436], - [3352, 121, 106, "Layout/LineLength: Line is too long. [226/120]", 197895496], - [3353, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 576181861], - [3354, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 2809313444], - [3355, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 3963067112], - [3356, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 1121380327], - [3357, 121, 100, "Layout/LineLength: Line is too long. [220/120]", 31591211], - [3358, 121, 104, "Layout/LineLength: Line is too long. [224/120]", 1946129497], - [3359, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 767185096], - [3360, 121, 100, "Layout/LineLength: Line is too long. [220/120]", 1092646020], - [3361, 121, 104, "Layout/LineLength: Line is too long. [224/120]", 1328841270], - [3362, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 2663749624], - [3363, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 430318647], - [3364, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 1650234037], - [3365, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 1082269805], - [3366, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 316397809], - [3367, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 3145391348], - [3368, 121, 112, "Layout/LineLength: Line is too long. [232/120]", 2808088654], - [3369, 121, 116, "Layout/LineLength: Line is too long. [236/120]", 1035513748], - [3370, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 2552800539], - [3371, 121, 112, "Layout/LineLength: Line is too long. [232/120]", 1727699169], - [3372, 121, 116, "Layout/LineLength: Line is too long. [236/120]", 1171566267], - [3373, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 2994775049], - [3374, 121, 110, "Layout/LineLength: Line is too long. [230/120]", 3860489151], - [3375, 121, 114, "Layout/LineLength: Line is too long. [234/120]", 959496607], - [3376, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 1694222439], - [3377, 121, 114, "Layout/LineLength: Line is too long. [234/120]", 1501186331], - [3378, 121, 118, "Layout/LineLength: Line is too long. [238/120]", 4059659418], - [3379, 121, 110, "Layout/LineLength: Line is too long. [230/120]", 1899868779], - [3380, 121, 130, "Layout/LineLength: Line is too long. [250/120]", 323324279], - [3381, 121, 134, "Layout/LineLength: Line is too long. [254/120]", 3956414359], - [3382, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 3506644741], - [3383, 121, 116, "Layout/LineLength: Line is too long. [236/120]", 936139074], - [3384, 121, 136, "Layout/LineLength: Line is too long. [256/120]", 4153213512], - [3385, 121, 140, "Layout/LineLength: Line is too long. [260/120]", 1491976338], - [3386, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 4061753206], - [3387, 121, 106, "Layout/LineLength: Line is too long. [226/120]", 2410434304], - [3388, 121, 124, "Layout/LineLength: Line is too long. [244/120]", 3518300264], - [3389, 121, 144, "Layout/LineLength: Line is too long. [264/120]", 1040696046], - [3390, 121, 148, "Layout/LineLength: Line is too long. [268/120]", 139604188], - [3391, 121, 120, "Layout/LineLength: Line is too long. [240/120]", 231937793], - [3392, 121, 140, "Layout/LineLength: Line is too long. [260/120]", 1835509805], - [3393, 121, 144, "Layout/LineLength: Line is too long. [264/120]", 1629218396], - [3394, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 2312875700], - [3395, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 2933374083], - [3396, 121, 106, "Layout/LineLength: Line is too long. [226/120]", 1719349671], - [3397, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 2555579810], - [3398, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 2023551624], - [3399, 121, 114, "Layout/LineLength: Line is too long. [234/120]", 955231924], - [3400, 121, 118, "Layout/LineLength: Line is too long. [238/120]", 4232993781], - [3401, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 3472954835], - [3402, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 3211922285], - [3403, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 2874956332], - [3404, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 1360335840], - [3405, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2135379556], - [3406, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3242768475], - [3407, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 2789115918], - [3408, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3346448124], - [3409, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1538469817], - [3410, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1543041113], - [3411, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 3344741438], - [3412, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2188404009], - [3413, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1330398779], - [3414, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 332468826], - [3415, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 1905397598], - [3416, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 438831062], - [3417, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 3377667334], - [3418, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3232541734], - [3420, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2130930429], - [3421, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 3684939371], - [3423, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2361951097], - [3424, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 1211447462], - [3425, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3309872691], - [3426, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 360053761], - [3427, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 1310136493], - [3428, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1950686342], - [3429, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 1397845826], - [3430, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 4191304724], - [3431, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2354128498], - [3432, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 1865717453], - [3433, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 24220542], - [3434, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 2618612673], - [3437, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3422918867], - [3438, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3689431739], - [3482, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 4093564799], - [3488, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1662653970], - [3489, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3967501655], - [3490, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2178516622], - [3491, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 1345346561], - [3505, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193466072], - [3625, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 3612393276], - [3626, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 797303985], - [3629, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1606320605], - [3649, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1776876782], - [3653, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 828742791], - [3673, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3294617581], - [3683, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3519842846], - [3693, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1966440909], - [3694, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053864], - [3700, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1606320605], - [3723, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 1340744311], - [3742, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1741893077], - [3743, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053865], - [3747, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193405204], - [3761, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1401226501], - [3764, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085352569], - [3767, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 696523922], - [3782, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], - [3792, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2746826653], - [4208, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1138870161], - [4770, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], - [4781, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 2132299307], - [4828, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087775098], - [4839, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 757851079], - [4875, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], - [4886, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 441649198], - [4909, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087903295], - [4921, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 170442008], - [4930, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], - [4932, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1888875443], - [4969, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 398433651], - [4980, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3921367744], - [5003, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2422819473], - [5009, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 194583095], - [5015, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1901385496], - [5024, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 490810486], - [5026, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 586287746], - [5030, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1310969752], - [5050, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087389205], - [5062, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2609063547], - [5071, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], - [5073, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1370761696], - [5096, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 2208661169], - [5102, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1862604658], - [5108, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 3958789371], - [5117, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3449594464], - [5119, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 692050524], - [5123, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 802172558], - [5193, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2406691660], - [5228, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], - [5239, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1811982742], - [5266, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2562189319], - [5272, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193430346], - [5278, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2814237166], - [5287, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2189106693], - [5289, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 3874870868], - [5293, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179474914], - [5326, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1751845165], - [5337, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2617230371], - [5341, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], - [5382, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], - [5393, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3793790598], - [5428, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 4088312783], - [5439, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3220724736], - [5443, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087899888], - [5462, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2552888401], - [5468, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 194583095], - [5474, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2414559905], - [5483, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 626762179], - [5485, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3969284923], - [5489, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 1893261414], - [5521, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2133507320], - [5532, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 2101353476], - [5536, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087685705], - [5555, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2431380437], - [5561, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 194583095], - [5567, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 435489438], - [5576, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 1520878209], - [5578, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 2238995076], - [5582, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 2789405913], - [5615, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], - [5626, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3409328196], - [5649, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087858069], - [5661, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2811935086], - [5670, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], - [5672, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1113346693], - [5676, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3227128786], - [5696, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 48793812], - [5702, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 338440584], - [5708, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 735248703], - [5717, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 927473097], - [5719, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 1394536741], - [5723, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3134012967], - [5742, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 2967615316], - [5748, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 2810710931], - [5754, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 2548594701], - [5757, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860796], - [5759, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], - [5763, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3549194295], - [5765, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 1074004741], - [5769, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 2874423564], - [5772, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087576526], - [5774, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], - [5789, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 1696848307], - [5795, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 2883501659], - [5801, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 3056443076], - [5806, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193405204], - [5810, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 1487412605], - [5812, 121, 51, "Layout/LineLength: Line is too long. [171/120]", 2021571284], - [5816, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1975782995], - [5819, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860796], - [5821, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193405204], - [5826, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 183236849], - [5835, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 856018753], - [5838, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], - [5841, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 2146546324], - [5847, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3913983076], - [5850, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 3491931666], - [5852, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3536323546], - [5856, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 356581191], - [5858, 121, 63, "Layout/LineLength: Line is too long. [183/120]", 4144657639], - [5862, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 1478616653], - [5865, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1774852021], - [5867, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3536323546], - [5882, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3884289787], - [5888, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 1001503687], - [5894, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3673836976], - [5903, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 3164908550], - [5905, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 1134300778], - [5909, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1797165224], - [5928, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 2508143995], - [5934, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 3002532188], - [5940, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 584857986], - [5943, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860796], - [5945, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], - [5949, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 749691384], - [5951, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 3389354954], - [5955, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 3402045699], - [5958, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087576526], - [5960, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], - [5974, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 2447716612], - [5980, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3201685099], - [5986, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 3060990885], - [5995, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 29396315], - [5997, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 1228645365], - [6001, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1436742837], - [6020, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 716917214], - [6026, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 2175814211], - [6032, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 1473420390], - [6035, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193433391], - [6037, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1422839111], - [6041, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 1571170198], - [6043, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 2175059093], - [6047, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3886666417], - [6050, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 176753677], - [6052, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1422839111], - [6068, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 3471319495], - [6074, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 1274038477], - [6080, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 2896814693], - [6083, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087576526], - [6085, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114086530], - [6089, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 250433828], - [6091, 121, 59, "Layout/LineLength: Line is too long. [179/120]", 3910556848], - [6095, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4002014976], - [6098, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 3491931666], - [6100, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114086530], - [6194, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861664], - [6208, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087932582], - [6222, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861664], - [6238, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 876012844], - [6240, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1756764194], - [6241, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 4173216735], - [6244, 121, 75, "Layout/LineLength: Line is too long. [195/120]", 911964425], - [6245, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 173266907], - [6246, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1412705933], - [6249, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1756764194], - [6250, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 2605683750], - [6253, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 3182252139], - [6255, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1652557742], - [6259, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 2240437058], - [6260, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 173266907], - [6261, 121, 101, "Layout/LineLength: Line is too long. [221/120]", 3694598076], - [6263, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861152], - [6264, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179079542], - [6265, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 3528944411], - [6268, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3020159378], - [6270, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1652557742], - [6276, 121, 84, "Layout/LineLength: Line is too long. [204/120]", 420843234], - [6278, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1401226501], - [6279, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 442915368], - [6282, 121, 79, "Layout/LineLength: Line is too long. [199/120]", 4212444955], - [6283, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053864], - [6284, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1373660924], - [6287, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1401226501], - [6288, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 1539225758], - [6291, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3020159378], - [6293, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 4240691845], - [6297, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 674553335], - [6298, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053864], - [6299, 121, 105, "Layout/LineLength: Line is too long. [225/120]", 4163432287], - [6301, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2089555761], - [6302, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2034687276], - [6303, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 3710905302], - [6306, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 4204667212], - [6308, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 4240691845], - [6314, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 2071493433], - [6316, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085352569], - [6317, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 2853066942], - [6320, 121, 71, "Layout/LineLength: Line is too long. [191/120]", 2771467828], - [6321, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193425976], - [6322, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3025157142], - [6325, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085352569], - [6326, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 3340824101], - [6329, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 3999804761], - [6331, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1999310973], - [6335, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 835016333], - [6336, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193425976], - [6337, 121, 97, "Layout/LineLength: Line is too long. [217/120]", 3575893945], - [6340, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193405945], - [6341, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 1755858308], - [6344, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 3182252139], - [6346, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1999310973], - [6352, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 3033080032], - [6354, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177549], - [6355, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 2720985203], - [6358, 121, 65, "Layout/LineLength: Line is too long. [185/120]", 3233424320], - [6360, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873483], - [6363, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177549], - [6364, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 131859703], - [6367, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1943494546], - [6369, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 4016166830], - [6373, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 1350760977], - [6375, 121, 91, "Layout/LineLength: Line is too long. [211/120]", 4098706554], - [6379, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 4059724765], - [6382, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1651955548], - [6384, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 4016166830], - [6390, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 1057495720], - [6393, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1621971220], - [6396, 121, 49, "Layout/LineLength: Line is too long. [169/120]", 1585717593], - [6402, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 2942094233], - [6405, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2624667704], - [6407, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2317051977], - [6411, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 1321610634], - [6413, 121, 75, "Layout/LineLength: Line is too long. [195/120]", 2854688831], - [6417, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 4185465554], - [6420, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1169781875], - [6422, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2317051977], - [6428, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 1916545020], - [6431, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1422839111], - [6434, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 910134593], - [6440, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 203086561], - [6443, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2939363812], - [6445, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3155638331], - [6449, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 1955758062], - [6451, 121, 71, "Layout/LineLength: Line is too long. [191/120]", 3737424359], - [6455, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 3597620692], - [6458, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2624667704], - [6460, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3155638331], - [6466, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 1036052399], - [6469, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114086530], - [6472, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 1268266488], - [6478, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 2791598354], - [6481, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1302589368], - [6483, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3533902728], - [6487, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 3942276897], - [6489, 121, 73, "Layout/LineLength: Line is too long. [193/120]", 1175941460], - [6493, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 679697318], - [6496, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 28126263], - [6498, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3533902728], - [6499, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 181895237], - [6504, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 4057848448], - [6507, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114086530], - [6510, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 4067769399], - [6516, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 461482909], - [6519, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1302589368], - [6521, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3533902728], - [6525, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 3561204590], - [6527, 121, 73, "Layout/LineLength: Line is too long. [193/120]", 880160795], - [6531, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 1614719145], - [6534, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 28126263], - [6536, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3533902728], - [6537, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 181895237], - [6584, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193432306], - [6598, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 1645945966], - [6601, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3212740609], - [6604, 121, 59, "Layout/LineLength: Line is too long. [179/120]", 3982698123], - [6606, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193425997], - [6610, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 2663750402], - [6613, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2420297272], - [6615, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1164389943], - [6619, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 3483121581], - [6621, 121, 85, "Layout/LineLength: Line is too long. [205/120]", 2271668600], - [6625, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 804794365], - [6628, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3659367004], - [6630, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1164389943], - [6631, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 561395486], - [6636, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 1251661057], - [6639, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3212740609], - [6642, 121, 59, "Layout/LineLength: Line is too long. [179/120]", 3210109508], - [6644, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193425997], - [6648, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 430316685], - [6651, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2420297272], - [6653, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1164389943], - [6657, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 2428160226], - [6659, 121, 85, "Layout/LineLength: Line is too long. [205/120]", 2663295671], - [6663, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 2822109938], - [6666, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3659367004], - [6668, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1164389943], - [6669, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 561395486], - [6674, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 857639785], - [6677, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3669622788], - [6680, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 140453799], - [6682, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860765], - [6686, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 1650236431], - [6689, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 150699323], - [6691, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 50618962], - [6695, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 4205571164], - [6697, 121, 83, "Layout/LineLength: Line is too long. [203/120]", 1549528021], - [6701, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 1325488145], - [6704, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1510711065], - [6706, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 50618962], - [6712, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 3043205563], - [6715, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2381137493], - [6718, 121, 61, "Layout/LineLength: Line is too long. [181/120]", 2200345195], - [6720, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087926498], - [6724, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 1082269527], - [6727, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1510711065], - [6729, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1104064739], - [6733, 121, 68, "Layout/LineLength: Line is too long. [188/120]", 1652941658], - [6735, 121, 87, "Layout/LineLength: Line is too long. [207/120]", 1440323819], - [6739, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 802896260], - [6742, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1943494546], - [6744, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1104064739], - [6750, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 788730815], - [6752, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2034687276], - [6753, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 4226330106], - [6756, 121, 77, "Layout/LineLength: Line is too long. [197/120]", 2414796320], - [6757, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873470], - [6758, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3090817832], - [6761, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2034687276], - [6762, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 2839148677], - [6765, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 2393983240], - [6767, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 2581936864], - [6771, 121, 84, "Layout/LineLength: Line is too long. [204/120]", 3923254945], - [6772, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873470], - [6773, 121, 103, "Layout/LineLength: Line is too long. [223/120]", 580639726], - [6775, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193419246], - [6776, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1756764194], - [6777, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 3202758044], - [6780, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 912651721], - [6782, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 2581936864], - [6786, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1164293389], - [6799, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860840], - [6800, 121, 88, "Layout/LineLength: Line is too long. [208/120]", 574552570], - [6802, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3845073641], - [6803, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 543375177], - [6806, 121, 83, "Layout/LineLength: Line is too long. [203/120]", 222410330], - [6807, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3025157219], - [6808, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1904561434], - [6811, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 489872984], - [6812, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 97325617], - [6815, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 4204667212], - [6817, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 4062673070], - [6821, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 1451915960], - [6822, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3025157219], - [6823, 121, 109, "Layout/LineLength: Line is too long. [229/120]", 4200529758], - [6825, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1497831350], - [6826, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 4214367244], - [6827, 121, 84, "Layout/LineLength: Line is too long. [204/120]", 399603517], - [6830, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3423548875], - [6832, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 4062673070], - [6836, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3279830097], - [6848, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 659167322], - [6860, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087926423], - [6861, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 3300294193], - [6863, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3172850966], - [6864, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 2396187736], - [6867, 121, 87, "Layout/LineLength: Line is too long. [207/120]", 1991888901], - [6868, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1954380402], - [6869, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2589970962], - [6872, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 42340644], - [6873, 121, 67, "Layout/LineLength: Line is too long. [187/120]", 479235996], - [6876, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3423548875], - [6878, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1462541970], - [6882, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 1373978781], - [6883, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1954380402], - [6884, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 280641011], - [6886, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1664110553], - [6887, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1009650381], - [6888, 121, 88, "Layout/LineLength: Line is too long. [208/120]", 909329343], - [6891, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 2977589831], - [6893, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1462541970], - [6898, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873470], - [6899, 121, 61, "Layout/LineLength: Line is too long. [181/120]", 1904101094], - [6901, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2229256255], - [6902, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 1839090017], - [6905, 121, 91, "Layout/LineLength: Line is too long. [211/120]", 4260980907], - [6906, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 4253118453], - [6907, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1536690221], - [6909, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861152], - [6910, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 209824656], - [6911, 121, 71, "Layout/LineLength: Line is too long. [191/120]", 1530496074], - [6914, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 2977589831], - [6916, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3261436902], - [6920, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 3762694917], - [6921, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 4253118453], - [6922, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 3196230010], - [6924, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3165598659], - [6925, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 4264469493], - [6926, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 3140690958], - [6929, 121, 35, "Layout/LineLength: Line is too long. [155/120]", 2999583208], - [6931, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3261436902], - [6937, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 326070599], - [6940, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1621971220], - [6943, 121, 49, "Layout/LineLength: Line is too long. [169/120]", 1689000214], - [6949, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 2459904022], - [6952, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2624667704], - [6954, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2317051977], - [6958, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 2842872837], - [6960, 121, 75, "Layout/LineLength: Line is too long. [195/120]", 423884656], - [6964, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 2673769885], - [6967, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1169781875], - [6969, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2317051977], - [6970, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2126253911], - [6986, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 2388292564], - [6989, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2381137493], - [6992, 121, 61, "Layout/LineLength: Line is too long. [181/120]", 1136762660], - [6994, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087926498], - [6998, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 2555581016], - [7001, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1510711065], - [7003, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1104064739], - [7007, 121, 68, "Layout/LineLength: Line is too long. [188/120]", 1986812885], - [7009, 121, 87, "Layout/LineLength: Line is too long. [207/120]", 1864036132], - [7013, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 3590180043], - [7016, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1943494546], - [7018, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1104064739], - [7019, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2382712010], - [7029, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1791534645], - [7034, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 2403815412], - [7037, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1422839111], - [7040, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 4046048864], - [7046, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 3472955113], - [7049, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2939363812], - [7051, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3155638331], - [7055, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3911469720], - [7057, 121, 71, "Layout/LineLength: Line is too long. [191/120]", 272433263], - [7061, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 634420444], - [7064, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2624667704], - [7066, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3155638331], - [7067, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2088324682], - [7080, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087906711], - [7092, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2135380894], - [7101, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], - [7103, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 4280757685], - [7107, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 161599970], - [7141, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053789], - [7176, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2188407955], - [7187, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3692322233], - [7191, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087557694], - [7214, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3197512522], - [7223, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858840], - [7225, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 85298067], - [7282, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193418403], - [7288, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193418403], - [7311, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087432474], - [7323, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2361949763], - [7332, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], - [7334, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 581045160], - [7338, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 4235011647], - [7357, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1898147766], - [7363, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177560], - [7369, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 1310140439], - [7378, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 681770239], - [7380, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3821940657], - [7384, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], - [7404, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861292], - [7416, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2354124424], - [7425, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087922021], - [7427, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 3921370162], - [8020, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 4083054536], - [8048, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 4083054536], - [8077, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 4083054536], - [8135, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 632953222], - [8164, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 732995265], - [8214, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 1886249927], - [8376, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 578751979], - [8377, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3803540269], - [8386, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2238403955], - [8387, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1028441932], - [8388, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 1975950909], - [8443, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1244043798] - ], - "spec/integration/freeze_node_edge_cases_spec.rb:3416491031": [ - [6, 1, 28959, "Metrics/BlockLength: Block has too many lines. [663/25]", 3473768018], - [7, 3, 2985, "Metrics/BlockLength: Block has too many lines. [57/25]", 436154415], - [8, 5, 2934, "Metrics/BlockLength: Block has too many lines. [55/25]", 1963918102], - [78, 3, 6091, "Metrics/BlockLength: Block has too many lines. [136/25]", 232153494], - [98, 5, 3053, "Metrics/BlockLength: Block has too many lines. [69/25]", 1442974101], - [202, 5, 1691, "Metrics/BlockLength: Block has too many lines. [29/25]", 985654389], - [241, 3, 8515, "Metrics/BlockLength: Block has too many lines. [176/25]", 2776676526], - [473, 3, 2024, "Metrics/BlockLength: Block has too many lines. [55/25]", 1048101963], - [474, 5, 890, "Metrics/BlockLength: Block has too many lines. [26/25]", 753961540], - [543, 3, 4511, "Metrics/BlockLength: Block has too many lines. [116/25]", 1227615145], - [693, 3, 1660, "Metrics/BlockLength: Block has too many lines. [43/25]", 1881888061], - [694, 5, 1107, "Metrics/BlockLength: Block has too many lines. [26/25]", 368095693] - ], - "spec/integration/gem_family_section_merge_spec.rb:1744383089": [ - [164, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 93655697] - ], - "spec/integration/integration_spec.rb:2239247043": [ - [14, 1, 4488, "Metrics/BlockLength: Block has too many lines. [88/25]", 206207480], - [15, 3, 3267, "Metrics/BlockLength: Block has too many lines. [62/25]", 1323899085], - [40, 5, 2263, "Metrics/BlockLength: Block has too many lines. [48/25]", 3172595581] - ], - "spec/integration/link_reference_preservation_spec.rb:3764298162": [ - [6, 1, 2646, "Metrics/BlockLength: Block has too many lines. [48/25]", 3396410609], - [19, 3, 2058, "Metrics/BlockLength: Block has too many lines. [33/25]", 163363949] - ], - "spec/integration/markly_merge_spec.rb:3076950975": [ - [3, 1, 22886, "Metrics/BlockLength: Block has too many lines. [670/25]", 1408138744], - [62, 3, 7192, "Metrics/BlockLength: Block has too many lines. [189/25]", 1890889324], - [63, 5, 1678, "Metrics/BlockLength: Block has too many lines. [41/25]", 2587582896], - [115, 5, 1808, "Metrics/BlockLength: Block has too many lines. [48/25]", 3381172795], - [147, 46, 21, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 451071547], - [171, 5, 1134, "Metrics/BlockLength: Block has too many lines. [30/25]", 2526618199], - [220, 5, 1335, "Metrics/BlockLength: Block has too many lines. [32/25]", 2790596215], - [311, 3, 2008, "Metrics/BlockLength: Block has too many lines. [66/25]", 2640155627], - [394, 3, 1052, "Metrics/BlockLength: Block has too many lines. [27/25]", 3988836255], - [440, 3, 2950, "Metrics/BlockLength: Block has too many lines. [89/25]", 961031348], - [441, 5, 1352, "Metrics/BlockLength: Block has too many lines. [37/25]", 1952365669], - [495, 5, 1550, "Metrics/BlockLength: Block has too many lines. [48/25]", 2400197001], - [561, 3, 1665, "Metrics/BlockLength: Block has too many lines. [52/25]", 3884776329], - [650, 3, 1919, "Metrics/BlockLength: Block has too many lines. [57/25]", 2594646583], - [725, 3, 1644, "Metrics/BlockLength: Block has too many lines. [45/25]", 2348710811], - [791, 3, 1600, "Metrics/BlockLength: Block has too many lines. [46/25]", 3683503747] - ], - "spec/integration/partial_template_merger_table_merge_spec.rb:3504046892": [ - [7, 1, 7402, "Metrics/BlockLength: Block has too many lines. [164/25]", 3368892126], - [9, 3, 2986, "Metrics/BlockLength: Block has too many lines. [67/25]", 2267114449], - [65, 5, 1359, "Metrics/BlockLength: Block has too many lines. [28/25]", 3145143002], - [102, 3, 997, "Metrics/BlockLength: Block has too many lines. [26/25]", 3156068215], - [147, 3, 3009, "Metrics/BlockLength: Block has too many lines. [65/25]", 994160212], - [202, 5, 1401, "Metrics/BlockLength: Block has too many lines. [28/25]", 3038951618] - ], - "spec/integration/table_formatting_preservation_spec.rb:3943985446": [ - [6, 1, 3086, "Metrics/BlockLength: Block has too many lines. [56/25]", 2210897849], - [19, 3, 2374, "Metrics/BlockLength: Block has too many lines. [40/25]", 668961519], - [33, 5, 1847, "Metrics/BlockLength: Block has too many lines. [28/25]", 3433318963] - ], - "spec/integration/text_merge_spec.rb:884566200": [ - [6, 1, 7747, "Metrics/BlockLength: Block has too many lines. [204/25]", 2372984305], - [60, 3, 1113, "Metrics/BlockLength: Block has too many lines. [34/25]", 3399970957], - [67, 5, 860, "Metrics/BlockLength: Block has too many lines. [27/25]", 2337191560], - [103, 3, 916, "Metrics/BlockLength: Block has too many lines. [28/25]", 4082963348], - [149, 3, 3001, "Metrics/BlockLength: Block has too many lines. [74/25]", 7776854] - ], - "spec/support/fictive_language_harness.rb:1770581700": [ - [85, 7, 733, "Metrics/AbcSize: Assignment Branch Condition size for `extract_comments` is too high. [<5, 16, 5> 17.49/17]", 1127096515], - [85, 7, 733, "Metrics/MethodLength: Method has too many lines. [22/10]", 1127096515], - [117, 21, 129, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 681912759], - [182, 7, 1084, "Metrics/AbcSize: Assignment Branch Condition size for `parse_statements` is too high. [<9, 28, 7> 30.23/17]", 3123785685], - [182, 7, 1084, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_statements` is too high. [8/7]", 3123785685], - [182, 7, 1084, "Metrics/MethodLength: Method has too many lines. [24/10]", 3123785685], - [233, 5, 9879, "Metrics/ClassLength: Class has too many lines. [228/100]", 3231256134], - [236, 21, 208, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2970487173], - [257, 7, 1981, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_batch` is too high. [<16, 32, 4> 36/17]", 4125392918], - [257, 7, 1981, "Metrics/MethodLength: Method has too many lines. [42/10]", 4125392918], - [342, 7, 778, "Metrics/MethodLength: Method has too many lines. [18/10]", 4189873983], - [364, 7, 844, "Metrics/MethodLength: Method has too many lines. [19/10]", 526186683], - [449, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087956942], - [464, 7, 1065, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_template_preamble_prefix_region` is too high. [<6, 24, 11> 27.07/17]", 2332280467], - [464, 7, 1065, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collapse_template_preamble_prefix_region` is too high. [10/7]", 2332280467], - [464, 7, 1065, "Metrics/MethodLength: Method has too many lines. [20/10]", 2332280467], - [464, 7, 1065, "Metrics/PerceivedComplexity: Perceived complexity for `collapse_template_preamble_prefix_region` is too high. [10/8]", 2332280467] - ], - "spec/support/testable_node.rb:1110514732": [ - [10, 7, 573, "Metrics/MethodLength: Method has too many lines. [12/10]", 798847435], - [10, 22, 226, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 2319398994], - [40, 7, 642, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<11, 14, 6> 18.79/17]", 2249578474], - [40, 21, 131, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 1786967686] - ] -} diff --git a/gems/ast-merge/Gemfile.lock b/gems/ast-merge/Gemfile.lock index 7854c7383..97d3479b7 100644 --- a/gems/ast-merge/Gemfile.lock +++ b/gems/ast-merge/Gemfile.lock @@ -265,6 +265,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.0) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: @@ -307,7 +323,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -362,18 +377,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -537,22 +541,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -658,9 +658,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -738,7 +738,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -759,10 +758,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.0) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -837,13 +836,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/ast-merge/bin/yard b/gems/ast-merge/bin/yard index 5d516ad6f..a7e8b6eed 100755 --- a/gems/ast-merge/bin/yard +++ b/gems/ast-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec('bundle', 'exec', 'rake', 'yard') +exec("bundle", "exec", "rake", "yard") diff --git a/gems/markdown-merge/.gitattributes b/gems/markdown-merge/.gitattributes index 0ac65aaa7..35a3c7359 100644 --- a/gems/markdown-merge/.gitattributes +++ b/gems/markdown-merge/.gitattributes @@ -1,5 +1,5 @@ # <> do not edit below this line -*.rb diff=smorg-ruby +*.rb diff=smorg-rb *.go diff=smorg-go *.rs diff=smorg-rs # <> diff --git a/gems/markdown-merge/.kettle-drift.lock b/gems/markdown-merge/.kettle-drift.lock index 9295a3562..628aa923c 100644 --- a/gems/markdown-merge/.kettle-drift.lock +++ b/gems/markdown-merge/.kettle-drift.lock @@ -4,7 +4,8 @@ "file": "Gemfile", "lines": [ 80, - 120 + 120, + 160 ] } ], @@ -13,7 +14,8 @@ "file": "Gemfile", "lines": [ 91, - 131 + 131, + 171 ] } ], @@ -22,7 +24,8 @@ "file": "Gemfile", "lines": [ 81, - 121 + 121, + 161 ] } ], @@ -31,7 +34,8 @@ "file": "Gemfile", "lines": [ 93, - 133 + 133, + 173 ] } ], @@ -40,7 +44,8 @@ "file": "Gemfile", "lines": [ 96, - 136 + 136, + 176 ] } ], @@ -49,7 +54,8 @@ "file": "Gemfile", "lines": [ 82, - 122 + 122, + 162 ] } ], @@ -59,7 +65,8 @@ "lines": [ 60, 100, - 140 + 140, + 180 ] } ], @@ -68,7 +75,8 @@ "file": "Gemfile", "lines": [ 101, - 141 + 141, + 181 ] } ], @@ -78,7 +86,8 @@ "lines": [ 43, 87, - 127 + 127, + 167 ] } ], @@ -87,7 +96,8 @@ "file": "Gemfile", "lines": [ 110, - 150 + 150, + 190 ] } ], @@ -97,7 +107,8 @@ "lines": [ 35, 79, - 119 + 119, + 159 ] } ], @@ -107,7 +118,8 @@ "lines": [ 69, 109, - 149 + 149, + 189 ] } ], @@ -116,7 +128,8 @@ "file": "Gemfile", "lines": [ 85, - 125 + 125, + 165 ] } ], @@ -126,7 +139,8 @@ "lines": [ 48, 92, - 132 + 132, + 172 ] } ], @@ -136,7 +150,8 @@ "lines": [ 44, 88, - 128 + 128, + 168 ] } ], @@ -145,7 +160,8 @@ "file": "Gemfile", "lines": [ 86, - 126 + 126, + 166 ] } ], @@ -154,7 +170,8 @@ "file": "Gemfile", "lines": [ 103, - 143 + 143, + 183 ] } ], @@ -163,7 +180,8 @@ "file": "Gemfile", "lines": [ 102, - 142 + 142, + 182 ] } ], @@ -172,7 +190,8 @@ "file": "Gemfile", "lines": [ 97, - 137 + 137, + 177 ] } ], @@ -181,7 +200,8 @@ "file": "Gemfile", "lines": [ 106, - 146 + 146, + 186 ] } ], diff --git a/gems/markdown-merge/Gemfile b/gems/markdown-merge/Gemfile index db75aec3a..fc79d96e1 100644 --- a/gems/markdown-merge/Gemfile +++ b/gems/markdown-merge/Gemfile @@ -152,6 +152,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/markdown-merge/Gemfile.lock b/gems/markdown-merge/Gemfile.lock index c5162409f..3612d30be 100644 --- a/gems/markdown-merge/Gemfile.lock +++ b/gems/markdown-merge/Gemfile.lock @@ -16,246 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -293,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -357,13 +111,11 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - kettle-dev (2.3.6) + kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -392,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -532,8 +283,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -586,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -637,45 +381,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -684,54 +407,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -739,7 +440,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +452,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) - kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) + kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +480,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +491,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,12 +518,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -844,7 +529,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -858,19 +542,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -878,7 +557,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/markly-merge/.gitattributes b/gems/markly-merge/.gitattributes index 0ac65aaa7..35a3c7359 100644 --- a/gems/markly-merge/.gitattributes +++ b/gems/markly-merge/.gitattributes @@ -1,5 +1,5 @@ # <> do not edit below this line -*.rb diff=smorg-ruby +*.rb diff=smorg-rb *.go diff=smorg-go *.rs diff=smorg-rs # <> diff --git a/gems/markly-merge/.kettle-drift.lock b/gems/markly-merge/.kettle-drift.lock index 1dad17e1d..9878fb8f5 100644 --- a/gems/markly-merge/.kettle-drift.lock +++ b/gems/markly-merge/.kettle-drift.lock @@ -4,7 +4,8 @@ "file": "Gemfile", "lines": [ 79, - 119 + 119, + 159 ] } ], @@ -13,7 +14,8 @@ "file": "Gemfile", "lines": [ 90, - 130 + 130, + 170 ] } ], @@ -22,7 +24,8 @@ "file": "Gemfile", "lines": [ 80, - 120 + 120, + 160 ] } ], @@ -31,7 +34,8 @@ "file": "Gemfile", "lines": [ 92, - 132 + 132, + 172 ] } ], @@ -40,7 +44,8 @@ "file": "Gemfile", "lines": [ 95, - 135 + 135, + 175 ] } ], @@ -49,7 +54,8 @@ "file": "Gemfile", "lines": [ 81, - 121 + 121, + 161 ] } ], @@ -59,7 +65,8 @@ "lines": [ 59, 99, - 139 + 139, + 179 ] } ], @@ -68,7 +75,8 @@ "file": "Gemfile", "lines": [ 100, - 140 + 140, + 180 ] } ], @@ -78,7 +86,8 @@ "lines": [ 42, 86, - 126 + 126, + 166 ] } ], @@ -87,7 +96,8 @@ "file": "Gemfile", "lines": [ 109, - 149 + 149, + 189 ] } ], @@ -97,7 +107,8 @@ "lines": [ 34, 78, - 118 + 118, + 158 ] } ], @@ -107,7 +118,8 @@ "lines": [ 68, 108, - 148 + 148, + 188 ] } ], @@ -116,7 +128,8 @@ "file": "Gemfile", "lines": [ 84, - 124 + 124, + 164 ] } ], @@ -126,7 +139,8 @@ "lines": [ 47, 91, - 131 + 131, + 171 ] } ], @@ -136,7 +150,8 @@ "lines": [ 43, 87, - 127 + 127, + 167 ] } ], @@ -145,7 +160,8 @@ "file": "Gemfile", "lines": [ 85, - 125 + 125, + 165 ] } ], @@ -154,7 +170,8 @@ "file": "Gemfile", "lines": [ 102, - 142 + 142, + 182 ] } ], @@ -163,7 +180,8 @@ "file": "Gemfile", "lines": [ 101, - 141 + 141, + 181 ] } ], @@ -172,7 +190,8 @@ "file": "Gemfile", "lines": [ 96, - 136 + 136, + 176 ] } ], @@ -181,7 +200,8 @@ "file": "Gemfile", "lines": [ 105, - 145 + 145, + 185 ] } ], diff --git a/gems/markly-merge/.rubocop_gradual.lock b/gems/markly-merge/.rubocop_gradual.lock deleted file mode 100644 index 42ea6fd31..000000000 --- a/gems/markly-merge/.rubocop_gradual.lock +++ /dev/null @@ -1,126 +0,0 @@ -{ - ".simplecov:3376604078": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:1376789005": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/markly-merge.rb:2425755333": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`markly-merge.rb`) should use snake_case.", 5381] - ], - "lib/markly/merge.rb:2040353384": [ - [10, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Markly::Merge`.", 2866359175], - [10, 3, 22662, "Metrics/ModuleLength: Module has too many lines. [484/100]", 3039251951], - [11, 5, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631], - [56, 5, 1957, "Metrics/MethodLength: Method has too many lines. [42/10]", 2638032592], - [101, 5, 1815, "Metrics/MethodLength: Method has too many lines. [37/10]", 421864374], - [141, 5, 1063, "Metrics/MethodLength: Method has too many lines. [23/10]", 598358845], - [179, 5, 523, "Metrics/MethodLength: Method has too many lines. [11/10]", 3598278634], - [193, 5, 1855, "Metrics/MethodLength: Method has too many lines. [37/10]", 2215035372], - [194, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2184804663], - [233, 5, 7461, "Metrics/AbcSize: Assignment Branch Condition size for `markdown_structured_edit_batch_report_projection` is too high. [<1, 30, 0> 30.02/17]", 958979462], - [233, 5, 7461, "Metrics/MethodLength: Method has too many lines. [139/10]", 958979462], - [234, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2184804663], - [253, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 4247938618], - [291, 121, 69, "Layout/LineLength: Line is too long. [189/120]", 713082266], - [375, 5, 904, "Metrics/MethodLength: Method has too many lines. [24/10]", 2523239963], - [416, 5, 613, "Metrics/MethodLength: Method has too many lines. [11/10]", 2967276583], - [416, 52, 144, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3050457682] - ], - "lib/markly/merge/backend.rb:1783442402": [ - [115, 9, 517, "Metrics/MethodLength: Method has too many lines. [14/10]", 66093445], - [207, 9, 453, "Metrics/AbcSize: Assignment Branch Condition size for `text` is too high. [<1, 16, 7> 17.49/17]", 2420537429], - [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:1833318890": [ - [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ], - "spec/fixtures_integration_spec.rb:2168126107": [ - [3, 1, 14870, "Metrics/BlockLength: Block has too many lines. [337/25]", 605418848], - [16, 3, 1325, "Metrics/BlockLength: Block has too many lines. [28/25]", 928093310], - [224, 3, 1341, "Metrics/BlockLength: Block has too many lines. [26/25]", 2630958569], - [307, 3, 1352, "Metrics/BlockLength: Block has too many lines. [30/25]", 2376182886], - [342, 3, 1378, "Metrics/BlockLength: Block has too many lines. [29/25]", 3678391303] - ], - "spec/markly/merge/partial_template_merger_integration_spec.rb:2767758749": [ - [5, 1, 4127, "Metrics/BlockLength: Block has too many lines. [107/25]", 2704075138], - [25, 3, 1109, "Metrics/BlockLength: Block has too many lines. [30/25]", 2339832693], - [84, 3, 1236, "Metrics/BlockLength: Block has too many lines. [30/25]", 503179966], - [84, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 567791365] - ], - "spec/reproducible_merge_spec.rb:1557187402": [ - [6, 1, 1458, "Metrics/BlockLength: Block has too many lines. [35/25]", 100797552] - ] -} diff --git a/gems/markly-merge/Gemfile b/gems/markly-merge/Gemfile index 2149c951f..1335676a7 100644 --- a/gems/markly-merge/Gemfile +++ b/gems/markly-merge/Gemfile @@ -151,6 +151,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/markly-merge/Gemfile.lock b/gems/markly-merge/Gemfile.lock index 69fb7de90..12e713a27 100644 --- a/gems/markly-merge/Gemfile.lock +++ b/gems/markly-merge/Gemfile.lock @@ -16,6 +16,280 @@ PATH markly (~> 0.9) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.0) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +301,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +309,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -48,7 +323,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -104,15 +378,6 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -131,10 +396,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) @@ -275,25 +536,23 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -327,11 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -378,23 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-drift! + kettle-jem! + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -403,38 +684,61 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -447,15 +751,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae + kettle-drift (1.0.5) + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.0) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 @@ -477,10 +786,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -488,6 +801,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -515,17 +829,19 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -539,14 +855,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -554,6 +875,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/markly-merge/lib/markly/merge/version.rb b/gems/markly-merge/lib/markly/merge/version.rb index 3bfd8e9b0..b4ff2ffeb 100644 --- a/gems/markly-merge/lib/markly/merge/version.rb +++ b/gems/markly-merge/lib/markly/merge/version.rb @@ -3,7 +3,7 @@ module Markly module Merge module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/tree_haver/Gemfile.lock b/gems/tree_haver/Gemfile.lock index 313641ac1..6d82f6ffe 100644 --- a/gems/tree_haver/Gemfile.lock +++ b/gems/tree_haver/Gemfile.lock @@ -7,59 +7,287 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -GEM - remote: https://gem.coop/ +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - ansi (1.6.0) - appraisal2 (3.1.4) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - ast (2.4.3) - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) ast-crispr-markdown-markly (7.1.0) ast-crispr (= 7.1.0) markly-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) prism (>= 1.0) version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: ast-merge (7.1.0) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) - backports (3.25.3) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: bash-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +GEM + remote: https://gem.coop/ + specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + ansi (1.6.0) + appraisal2 (3.1.4) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + 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) citrus (3.0.2) - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) cmdparse (3.0.7) commonmarker (2.9.0-aarch64-linux) commonmarker (2.9.0-aarch64-linux-musl) commonmarker (2.9.0-arm64-darwin) commonmarker (2.9.0-x86_64-linux) commonmarker (2.9.0-x86_64-linux-musl) - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -69,10 +297,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docile (1.4.1) - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -122,10 +346,6 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) @@ -133,31 +353,6 @@ GEM ruby-progressbar (~> 1.13) kettle-drift (1.0.5) version_gem (~> 1.1, >= 1.1.13) - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -181,24 +376,12 @@ GEM turbo_tests2 (~> 3.1, >= 3.1.12) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) 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.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -224,18 +407,9 @@ GEM prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) psych (5.4.0) date stringio - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -244,11 +418,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) rdoc (6.17.0) erb psych (>= 4.0.0) @@ -344,10 +513,6 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -407,10 +572,6 @@ GEM version_gem (~> 1.1, >= 1.1.13) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) @@ -434,10 +595,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.13) - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) yard (0.9.45) yard-fence (0.9.6) rdoc (>= 6.11, < 8) @@ -470,24 +627,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem (>= 7.0) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -496,20 +674,27 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml (~> 0.3) + toml-merge! toml-rb (~> 4.1) tree_haver! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -520,10 +705,13 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) @@ -554,6 +742,7 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 @@ -587,6 +776,8 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 @@ -630,6 +821,7 @@ 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -639,6 +831,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -661,6 +854,7 @@ CHECKSUMS tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) sha256=ad6743a373eeac954c1b659b17af3aff1c82918b3ce9c9dc572a7c70ff843cdd tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -673,6 +867,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From be0adef06f2a2291bb5518455d8d4a6561eb8f44 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 16:36:00 -0600 Subject: [PATCH 005/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-crispr-markdown-markly/Gemfile.lock | 385 ++---------------- gems/markly-merge/.rubocop_gradual.lock | 126 ++++++ gems/markly-merge/lib/markly/merge/version.rb | 2 +- 3 files changed, 170 insertions(+), 343 deletions(-) create mode 100644 gems/markly-merge/.rubocop_gradual.lock diff --git a/gems/ast-crispr-markdown-markly/Gemfile.lock b/gems/ast-crispr-markdown-markly/Gemfile.lock index 6cb850069..e17d998e0 100644 --- a/gems/ast-crispr-markdown-markly/Gemfile.lock +++ b/gems/ast-crispr-markdown-markly/Gemfile.lock @@ -16,264 +16,6 @@ PATH markly-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.0) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: @@ -301,6 +43,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -309,12 +56,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -323,6 +64,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -372,12 +114,21 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - kettle-dev (2.3.6) + kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -396,6 +147,10 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) @@ -541,18 +296,22 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -586,11 +345,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -639,43 +398,23 @@ DEPENDENCIES appraisal2 (~> 3.0, >= 3.0.6) 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -684,26 +423,18 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -712,33 +443,20 @@ CHECKSUMS ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -751,20 +469,15 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) - kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae - kettle-drift (1.0.5) - kettle-jem (7.1.0) + kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.0) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 @@ -786,14 +499,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -801,7 +510,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -829,19 +537,18 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -855,19 +562,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -875,7 +577,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/markly-merge/.rubocop_gradual.lock b/gems/markly-merge/.rubocop_gradual.lock new file mode 100644 index 000000000..42ea6fd31 --- /dev/null +++ b/gems/markly-merge/.rubocop_gradual.lock @@ -0,0 +1,126 @@ +{ + ".simplecov:3376604078": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:1376789005": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/markly-merge.rb:2425755333": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`markly-merge.rb`) should use snake_case.", 5381] + ], + "lib/markly/merge.rb:2040353384": [ + [10, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Markly::Merge`.", 2866359175], + [10, 3, 22662, "Metrics/ModuleLength: Module has too many lines. [484/100]", 3039251951], + [11, 5, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631], + [56, 5, 1957, "Metrics/MethodLength: Method has too many lines. [42/10]", 2638032592], + [101, 5, 1815, "Metrics/MethodLength: Method has too many lines. [37/10]", 421864374], + [141, 5, 1063, "Metrics/MethodLength: Method has too many lines. [23/10]", 598358845], + [179, 5, 523, "Metrics/MethodLength: Method has too many lines. [11/10]", 3598278634], + [193, 5, 1855, "Metrics/MethodLength: Method has too many lines. [37/10]", 2215035372], + [194, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2184804663], + [233, 5, 7461, "Metrics/AbcSize: Assignment Branch Condition size for `markdown_structured_edit_batch_report_projection` is too high. [<1, 30, 0> 30.02/17]", 958979462], + [233, 5, 7461, "Metrics/MethodLength: Method has too many lines. [139/10]", 958979462], + [234, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2184804663], + [253, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 4247938618], + [291, 121, 69, "Layout/LineLength: Line is too long. [189/120]", 713082266], + [375, 5, 904, "Metrics/MethodLength: Method has too many lines. [24/10]", 2523239963], + [416, 5, 613, "Metrics/MethodLength: Method has too many lines. [11/10]", 2967276583], + [416, 52, 144, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3050457682] + ], + "lib/markly/merge/backend.rb:1783442402": [ + [115, 9, 517, "Metrics/MethodLength: Method has too many lines. [14/10]", 66093445], + [207, 9, 453, "Metrics/AbcSize: Assignment Branch Condition size for `text` is too high. [<1, 16, 7> 17.49/17]", 2420537429], + [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:1833318890": [ + [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ], + "spec/fixtures_integration_spec.rb:2168126107": [ + [3, 1, 14870, "Metrics/BlockLength: Block has too many lines. [337/25]", 605418848], + [16, 3, 1325, "Metrics/BlockLength: Block has too many lines. [28/25]", 928093310], + [224, 3, 1341, "Metrics/BlockLength: Block has too many lines. [26/25]", 2630958569], + [307, 3, 1352, "Metrics/BlockLength: Block has too many lines. [30/25]", 2376182886], + [342, 3, 1378, "Metrics/BlockLength: Block has too many lines. [29/25]", 3678391303] + ], + "spec/markly/merge/partial_template_merger_integration_spec.rb:2767758749": [ + [5, 1, 4127, "Metrics/BlockLength: Block has too many lines. [107/25]", 2704075138], + [25, 3, 1109, "Metrics/BlockLength: Block has too many lines. [30/25]", 2339832693], + [84, 3, 1236, "Metrics/BlockLength: Block has too many lines. [30/25]", 503179966], + [84, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 567791365] + ], + "spec/reproducible_merge_spec.rb:1557187402": [ + [6, 1, 1458, "Metrics/BlockLength: Block has too many lines. [35/25]", 100797552] + ] +} diff --git a/gems/markly-merge/lib/markly/merge/version.rb b/gems/markly-merge/lib/markly/merge/version.rb index b4ff2ffeb..3bfd8e9b0 100644 --- a/gems/markly-merge/lib/markly/merge/version.rb +++ b/gems/markly-merge/lib/markly/merge/version.rb @@ -3,7 +3,7 @@ module Markly module Merge module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end From 4853bb0157eba7635e121f1f99bbdd0ac6bae3ea Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 16:36:02 -0600 Subject: [PATCH 006/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-crispr-markdown-markly/Gemfile.lock | 330 +++++++++++++++- gems/markdown-merge/Gemfile.lock | 322 +++++++++++++++ gems/markly-merge/Gemfile.lock | 395 ++----------------- 3 files changed, 677 insertions(+), 370 deletions(-) diff --git a/gems/ast-crispr-markdown-markly/Gemfile.lock b/gems/ast-crispr-markdown-markly/Gemfile.lock index e17d998e0..5d9c84213 100644 --- a/gems/ast-crispr-markdown-markly/Gemfile.lock +++ b/gems/ast-crispr-markdown-markly/Gemfile.lock @@ -16,6 +16,248 @@ PATH markly-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: @@ -43,11 +285,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -56,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -119,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -147,10 +392,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) @@ -345,11 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -398,23 +639,43 @@ DEPENDENCIES appraisal2 (~> 3.0, >= 3.0.6) 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -423,18 +684,26 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -443,13 +712,26 @@ CHECKSUMS ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -457,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -469,15 +752,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 @@ -499,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -510,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -537,9 +830,11 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -549,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -562,14 +858,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -577,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/markdown-merge/Gemfile.lock b/gems/markdown-merge/Gemfile.lock index 3612d30be..5a9031f9a 100644 --- a/gems/markdown-merge/Gemfile.lock +++ b/gems/markdown-merge/Gemfile.lock @@ -16,6 +16,246 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -53,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -381,24 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -407,32 +684,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,20 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -480,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -491,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -518,9 +830,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -529,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -542,14 +858,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/markly-merge/Gemfile.lock b/gems/markly-merge/Gemfile.lock index 12e713a27..824705fd6 100644 --- a/gems/markly-merge/Gemfile.lock +++ b/gems/markly-merge/Gemfile.lock @@ -16,272 +16,6 @@ PATH markly (~> 0.9) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.0) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: @@ -301,6 +35,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -309,12 +48,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -323,6 +56,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -372,12 +106,21 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - kettle-dev (2.3.6) + kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -536,23 +279,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -586,11 +331,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -637,45 +382,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -684,61 +408,38 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -751,20 +452,15 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) - kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae - kettle-drift (1.0.5) - kettle-jem (7.1.0) + kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.0) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 @@ -786,14 +482,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -801,7 +493,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -829,19 +520,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -855,19 +544,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -875,7 +559,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From f166e1c6acad29f9494b5c94c06be681058328e6 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 16:36:35 -0600 Subject: [PATCH 007/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-merge-git/.gitattributes | 2 +- gems/ast-merge-git/.kettle-drift.lock | 60 ++-- gems/ast-merge-git/Gemfile | 40 +++ gems/ast-merge-git/Gemfile.lock | 19 +- gems/ast-merge/Gemfile | 68 ++-- gems/ast-merge/Rakefile | 18 +- gems/ast-merge/bin/yard | 2 +- gems/ast-merge/lib/ast/merge/version.rb | 2 +- gems/bash-merge/.kettle-drift.lock | 60 ++-- gems/bash-merge/Gemfile | 70 +++- gems/bash-merge/Gemfile.lock | 352 ++++++++++++++++++- gems/bash-merge/Rakefile | 18 +- gems/bash-merge/bash-merge.gemspec | 85 ++--- gems/bash-merge/lib/bash/merge/version.rb | 2 +- gems/markdown-merge/Gemfile.lock | 352 +------------------ gems/markly-merge/Gemfile.lock | 340 +++++++++++++++++- gems/plain-merge/.gitattributes | 2 +- gems/plain-merge/.kettle-drift.lock | 60 ++-- gems/plain-merge/Gemfile | 40 +++ gems/plain-merge/Gemfile.lock | 403 ++++++++++++++++++++-- gems/tree_haver/Gemfile.lock | 385 +++++---------------- 21 files changed, 1510 insertions(+), 870 deletions(-) diff --git a/gems/ast-merge-git/.gitattributes b/gems/ast-merge-git/.gitattributes index 0ac65aaa7..35a3c7359 100644 --- a/gems/ast-merge-git/.gitattributes +++ b/gems/ast-merge-git/.gitattributes @@ -1,5 +1,5 @@ # <> do not edit below this line -*.rb diff=smorg-ruby +*.rb diff=smorg-rb *.go diff=smorg-go *.rs diff=smorg-rs # <> diff --git a/gems/ast-merge-git/.kettle-drift.lock b/gems/ast-merge-git/.kettle-drift.lock index 1dad17e1d..9878fb8f5 100644 --- a/gems/ast-merge-git/.kettle-drift.lock +++ b/gems/ast-merge-git/.kettle-drift.lock @@ -4,7 +4,8 @@ "file": "Gemfile", "lines": [ 79, - 119 + 119, + 159 ] } ], @@ -13,7 +14,8 @@ "file": "Gemfile", "lines": [ 90, - 130 + 130, + 170 ] } ], @@ -22,7 +24,8 @@ "file": "Gemfile", "lines": [ 80, - 120 + 120, + 160 ] } ], @@ -31,7 +34,8 @@ "file": "Gemfile", "lines": [ 92, - 132 + 132, + 172 ] } ], @@ -40,7 +44,8 @@ "file": "Gemfile", "lines": [ 95, - 135 + 135, + 175 ] } ], @@ -49,7 +54,8 @@ "file": "Gemfile", "lines": [ 81, - 121 + 121, + 161 ] } ], @@ -59,7 +65,8 @@ "lines": [ 59, 99, - 139 + 139, + 179 ] } ], @@ -68,7 +75,8 @@ "file": "Gemfile", "lines": [ 100, - 140 + 140, + 180 ] } ], @@ -78,7 +86,8 @@ "lines": [ 42, 86, - 126 + 126, + 166 ] } ], @@ -87,7 +96,8 @@ "file": "Gemfile", "lines": [ 109, - 149 + 149, + 189 ] } ], @@ -97,7 +107,8 @@ "lines": [ 34, 78, - 118 + 118, + 158 ] } ], @@ -107,7 +118,8 @@ "lines": [ 68, 108, - 148 + 148, + 188 ] } ], @@ -116,7 +128,8 @@ "file": "Gemfile", "lines": [ 84, - 124 + 124, + 164 ] } ], @@ -126,7 +139,8 @@ "lines": [ 47, 91, - 131 + 131, + 171 ] } ], @@ -136,7 +150,8 @@ "lines": [ 43, 87, - 127 + 127, + 167 ] } ], @@ -145,7 +160,8 @@ "file": "Gemfile", "lines": [ 85, - 125 + 125, + 165 ] } ], @@ -154,7 +170,8 @@ "file": "Gemfile", "lines": [ 102, - 142 + 142, + 182 ] } ], @@ -163,7 +180,8 @@ "file": "Gemfile", "lines": [ 101, - 141 + 141, + 181 ] } ], @@ -172,7 +190,8 @@ "file": "Gemfile", "lines": [ 96, - 136 + 136, + 176 ] } ], @@ -181,7 +200,8 @@ "file": "Gemfile", "lines": [ 105, - 145 + 145, + 185 ] } ], diff --git a/gems/ast-merge-git/Gemfile b/gems/ast-merge-git/Gemfile index 47d5e04b4..c4bc34a73 100644 --- a/gems/ast-merge-git/Gemfile +++ b/gems/ast-merge-git/Gemfile @@ -151,6 +151,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/ast-merge-git/Gemfile.lock b/gems/ast-merge-git/Gemfile.lock index e46a16edd..27ca66e4f 100644 --- a/gems/ast-merge-git/Gemfile.lock +++ b/gems/ast-merge-git/Gemfile.lock @@ -15,6 +15,15 @@ PATH ast-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -26,11 +35,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -97,7 +101,7 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - kettle-dev (2.3.6) + kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) @@ -372,6 +376,7 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + ast-merge! ast-merge-git! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) @@ -446,7 +451,7 @@ CHECKSUMS io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae + kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 diff --git a/gems/ast-merge/Gemfile b/gems/ast-merge/Gemfile index 28d1c5ba4..bcea83511 100644 --- a/gems/ast-merge/Gemfile +++ b/gems/ast-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source "https://gem.coop" +source 'https://gem.coop' git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,57 +19,53 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ["~> 1.0", ">= 1.0.8"] -gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ['~> 1.0', '>= 1.0.8'] +gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ tree_haver ] -direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") +direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? if direct_sibling_gems.any? && - (direct_sibling_local || - ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) - direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") - direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) begin nomono_activation_requirements = nomono_requirements - nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) if File.file?(nomono_lockfile) nomono_locked_spec = Bundler::LockfileParser - .new(Bundler.read_file(nomono_lockfile)) - .specs - .find { |spec| spec.name == "nomono" } + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } nomono_locked = nomono_locked_spec && - Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) - if nomono_locked - nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] - end - end - Kernel.send(:gem, "nomono", *nomono_activation_requirements) - require "nomono/bundler" - if direct_sibling_templating && !direct_sibling_local - ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local eval_nomono_gems( gems: direct_sibling_gems, - prefix: "STRUCTUREDMERGE", - path_env: "STRUCTUREDMERGE_DEV", - root: ["src", "my", "structuredmerge"] + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] ) rescue LoadError - warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' ensure if direct_sibling_templating && !direct_sibling_local if direct_sibling_dev_was_set - ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original else - ENV.delete("STRUCTUREDMERGE_DEV") + ENV.delete('STRUCTUREDMERGE_DEV') end end end @@ -213,25 +209,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging -eval_gemfile "gemfiles/modular/debug.gemfile" +eval_gemfile 'gemfiles/modular/debug.gemfile' # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile "gemfiles/modular/coverage.gemfile" +eval_gemfile 'gemfiles/modular/coverage.gemfile' # Linting -eval_gemfile "gemfiles/modular/style.gemfile" +eval_gemfile 'gemfiles/modular/style.gemfile' # Documentation -eval_gemfile "gemfiles/modular/documentation.gemfile" +eval_gemfile 'gemfiles/modular/documentation.gemfile' # Optional -eval_gemfile "gemfiles/modular/optional.gemfile" +eval_gemfile 'gemfiles/modular/optional.gemfile' ### Std Lib Extracted Gems -eval_gemfile "gemfiles/modular/x_std_libs.gemfile" +eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' # See unlocked_deps appraisal for more details on irb inclusion -gem "irb", "~> 1.17" # ruby >= 2.7 +gem 'irb', '~> 1.17' # ruby >= 2.7 diff --git a/gems/ast-merge/Rakefile b/gems/ast-merge/Rakefile index 6b4e21dec..339c9a3cb 100644 --- a/gems/ast-merge/Rakefile +++ b/gems/ast-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require "kettle/drift" + require 'kettle/drift' Kettle::Drift.install_tasks rescue LoadError - desc("(stub) kettle:drift:check is unavailable") - task("kettle:drift:check") do + desc('(stub) kettle:drift:check is unavailable') + task('kettle:drift:check') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:update is unavailable") - task("kettle:drift:update") do + desc('(stub) kettle:drift:update is unavailable') + task('kettle:drift:update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:force_update is unavailable") - task("kettle:drift:force_update") do + desc('(stub) kettle:drift:force_update is unavailable') + task('kettle:drift:force_update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift is unavailable") - task("kettle:drift" => "kettle:drift:update") + desc('(stub) kettle:drift is unavailable') + task('kettle:drift' => 'kettle:drift:update') end ### TEMPLATING TASKS diff --git a/gems/ast-merge/bin/yard b/gems/ast-merge/bin/yard index a7e8b6eed..5d516ad6f 100755 --- a/gems/ast-merge/bin/yard +++ b/gems/ast-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec("bundle", "exec", "rake", "yard") +exec('bundle', 'exec', 'rake', 'yard') diff --git a/gems/ast-merge/lib/ast/merge/version.rb b/gems/ast-merge/lib/ast/merge/version.rb index 3ef823f4d..6e7dc90f7 100644 --- a/gems/ast-merge/lib/ast/merge/version.rb +++ b/gems/ast-merge/lib/ast/merge/version.rb @@ -3,7 +3,7 @@ module Ast module Merge module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/bash-merge/.kettle-drift.lock b/gems/bash-merge/.kettle-drift.lock index 9295a3562..628aa923c 100644 --- a/gems/bash-merge/.kettle-drift.lock +++ b/gems/bash-merge/.kettle-drift.lock @@ -4,7 +4,8 @@ "file": "Gemfile", "lines": [ 80, - 120 + 120, + 160 ] } ], @@ -13,7 +14,8 @@ "file": "Gemfile", "lines": [ 91, - 131 + 131, + 171 ] } ], @@ -22,7 +24,8 @@ "file": "Gemfile", "lines": [ 81, - 121 + 121, + 161 ] } ], @@ -31,7 +34,8 @@ "file": "Gemfile", "lines": [ 93, - 133 + 133, + 173 ] } ], @@ -40,7 +44,8 @@ "file": "Gemfile", "lines": [ 96, - 136 + 136, + 176 ] } ], @@ -49,7 +54,8 @@ "file": "Gemfile", "lines": [ 82, - 122 + 122, + 162 ] } ], @@ -59,7 +65,8 @@ "lines": [ 60, 100, - 140 + 140, + 180 ] } ], @@ -68,7 +75,8 @@ "file": "Gemfile", "lines": [ 101, - 141 + 141, + 181 ] } ], @@ -78,7 +86,8 @@ "lines": [ 43, 87, - 127 + 127, + 167 ] } ], @@ -87,7 +96,8 @@ "file": "Gemfile", "lines": [ 110, - 150 + 150, + 190 ] } ], @@ -97,7 +107,8 @@ "lines": [ 35, 79, - 119 + 119, + 159 ] } ], @@ -107,7 +118,8 @@ "lines": [ 69, 109, - 149 + 149, + 189 ] } ], @@ -116,7 +128,8 @@ "file": "Gemfile", "lines": [ 85, - 125 + 125, + 165 ] } ], @@ -126,7 +139,8 @@ "lines": [ 48, 92, - 132 + 132, + 172 ] } ], @@ -136,7 +150,8 @@ "lines": [ 44, 88, - 128 + 128, + 168 ] } ], @@ -145,7 +160,8 @@ "file": "Gemfile", "lines": [ 86, - 126 + 126, + 166 ] } ], @@ -154,7 +170,8 @@ "file": "Gemfile", "lines": [ 103, - 143 + 143, + 183 ] } ], @@ -163,7 +180,8 @@ "file": "Gemfile", "lines": [ 102, - 142 + 142, + 182 ] } ], @@ -172,7 +190,8 @@ "file": "Gemfile", "lines": [ 97, - 137 + 137, + 177 ] } ], @@ -181,7 +200,8 @@ "file": "Gemfile", "lines": [ 106, - 146 + 146, + 186 ] } ], diff --git a/gems/bash-merge/Gemfile b/gems/bash-merge/Gemfile index 9674a0f1f..703804533 100644 --- a/gems/bash-merge/Gemfile +++ b/gems/bash-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source 'https://gem.coop' +source "https://gem.coop" git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,18 +19,62 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ['~> 1.0', '>= 1.0.8'] -gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ["~> 1.0", ">= 1.0.8"] +gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ast-merge tree_haver ] -direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') +direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? + +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) + direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") + direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == "nomono" } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + if nomono_locked + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] + end + end + Kernel.send(:gem, "nomono", *nomono_activation_requirements) + require "nomono/bundler" + if direct_sibling_templating && !direct_sibling_local + ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + end + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: "STRUCTUREDMERGE", + path_env: "STRUCTUREDMERGE_DEV", + root: ["src", "my", "structuredmerge"] + ) + rescue LoadError + warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + else + ENV.delete("STRUCTUREDMERGE_DEV") + end + end + end +end if direct_sibling_gems.any? && (direct_sibling_local || @@ -170,25 +214,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? # Debugging -eval_gemfile 'gemfiles/modular/debug.gemfile' +eval_gemfile "gemfiles/modular/debug.gemfile" # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile 'gemfiles/modular/coverage.gemfile' +eval_gemfile "gemfiles/modular/coverage.gemfile" # Linting -eval_gemfile 'gemfiles/modular/style.gemfile' +eval_gemfile "gemfiles/modular/style.gemfile" # Documentation -eval_gemfile 'gemfiles/modular/documentation.gemfile' +eval_gemfile "gemfiles/modular/documentation.gemfile" # Optional -eval_gemfile 'gemfiles/modular/optional.gemfile' +eval_gemfile "gemfiles/modular/optional.gemfile" ### Std Lib Extracted Gems -eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' +eval_gemfile "gemfiles/modular/x_std_libs.gemfile" # See unlocked_deps appraisal for more details on irb inclusion -gem 'irb', '~> 1.17' # ruby >= 2.7 +gem "irb", "~> 1.17" # ruby >= 2.7 diff --git a/gems/bash-merge/Gemfile.lock b/gems/bash-merge/Gemfile.lock index ebf32b156..0a15fc32b 100644 --- a/gems/bash-merge/Gemfile.lock +++ b/gems/bash-merge/Gemfile.lock @@ -16,6 +16,264 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +285,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -103,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -131,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -322,11 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -373,23 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.1, >= 3.1.4) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.3, >= 2.3.6) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -398,33 +684,55 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.1, >= 3.1.14) + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -432,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -444,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -471,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -482,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -509,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -520,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -533,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -548,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/bash-merge/Rakefile b/gems/bash-merge/Rakefile index 056589299..3301f1a7e 100644 --- a/gems/bash-merge/Rakefile +++ b/gems/bash-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require 'kettle/drift' + require "kettle/drift" Kettle::Drift.install_tasks rescue LoadError - desc('(stub) kettle:drift:check is unavailable') - task('kettle:drift:check') do + desc("(stub) kettle:drift:check is unavailable") + task("kettle:drift:check") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:update is unavailable') - task('kettle:drift:update') do + desc("(stub) kettle:drift:update is unavailable") + task("kettle:drift:update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:force_update is unavailable') - task('kettle:drift:force_update') do + desc("(stub) kettle:drift:force_update is unavailable") + task("kettle:drift:force_update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift is unavailable') - task('kettle:drift' => 'kettle:drift:update') + desc("(stub) kettle:drift is unavailable") + task("kettle:drift" => "kettle:drift:update") end ### TEMPLATING TASKS diff --git a/gems/bash-merge/bash-merge.gemspec b/gems/bash-merge/bash-merge.gemspec index 5ab7f0009..b4ceba2fd 100644 --- a/gems/bash-merge/bash-merge.gemspec +++ b/gems/bash-merge/bash-merge.gemspec @@ -9,47 +9,47 @@ Gem::Specification.new do |spec| spec.name = 'bash-merge' spec.version = Module.new.tap { |mod| Kernel.load("#{__dir__}/lib/bash/merge/version.rb", mod) }::Bash::Merge::Version::VERSION - spec.authors = ['Peter H. Boling'] - spec.email = ['floss@galtzo.com'] + spec.authors = ["Peter H. Boling"] + spec.email = ["floss@galtzo.com"] spec.summary = '☯️ Structured Merge Bash analysis and merge for Ruby' spec.description = '☯️ Bash statement, comment, freeze-block, and template merge behavior for Structured Merge.' spec.homepage = 'https://github.com/structuredmerge/structuredmerge-ruby' - spec.licenses = ['AGPL-3.0-only', 'PolyForm-Small-Business-1.0.0'] - spec.required_ruby_version = '>= 4.0.0' + spec.licenses = ["AGPL-3.0-only", "PolyForm-Small-Business-1.0.0"] + spec.required_ruby_version = ">= 4.0.0" # 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') - user_cert = "certs/#{ENV.fetch('GEM_CERT_USER', ENV['USER'])}.pem" + unless ENV.include?("SKIP_GEM_SIGNING") + user_cert = "certs/#{ENV.fetch("GEM_CERT_USER", ENV["USER"])}.pem" cert_file_path = File.join(__dir__, user_cert) - cert_chain = cert_file_path.split(',') + cert_chain = cert_file_path.split(",") cert_chain.select! { |fp| File.exist?(fp) } if cert_file_path && cert_chain.any? spec.cert_chain = cert_chain - if $PROGRAM_NAME.end_with?('gem') && ARGV[0] == 'build' - spec.signing_key = File.join(Gem.user_home, '.ssh', 'gem-private_key.pem') + if $PROGRAM_NAME.end_with?("gem") && ARGV[0] == "build" + spec.signing_key = File.join(Gem.user_home, ".ssh", "gem-private_key.pem") end end end - spec.metadata['homepage_uri'] = 'https://structuredmerge.org' - spec.metadata['source_code_uri'] = "#{spec.homepage}/tree/v#{spec.version}" - spec.metadata['changelog_uri'] = "#{spec.homepage}/blob/v#{spec.version}/CHANGELOG.md" - spec.metadata['bug_tracker_uri'] = "#{spec.homepage}/issues" - spec.metadata['documentation_uri'] = "https://www.rubydoc.info/gems/#{spec.name}/#{spec.version}" - spec.metadata['funding_uri'] = 'https://github.com/sponsors/pboling' - spec.metadata['wiki_uri'] = "#{spec.homepage}/wiki" - spec.metadata['news_uri'] = "https://www.railsbling.com/tags/#{spec.name}" - spec.metadata['discord_uri'] = 'https://discord.gg/3qme4XHNKN' - spec.metadata['rubygems_mfa_required'] = 'true' + spec.metadata["homepage_uri"] = "https://structuredmerge.org" + spec.metadata["source_code_uri"] = "#{spec.homepage}/tree/v#{spec.version}" + spec.metadata["changelog_uri"] = "#{spec.homepage}/blob/v#{spec.version}/CHANGELOG.md" + spec.metadata["bug_tracker_uri"] = "#{spec.homepage}/issues" + spec.metadata["documentation_uri"] = "https://www.rubydoc.info/gems/#{spec.name}/#{spec.version}" + spec.metadata["funding_uri"] = "https://github.com/sponsors/pboling" + spec.metadata["wiki_uri"] = "#{spec.homepage}/wiki" + spec.metadata["news_uri"] = "https://www.railsbling.com/tags/#{spec.name}" + spec.metadata["discord_uri"] = "https://discord.gg/3qme4XHNKN" + spec.metadata["rubygems_mfa_required"] = "true" enumerate_package_files = lambda do |root| - Dir.glob(File.join(root, '**', '*'), File::FNM_DOTMATCH).select do |path| - File.file?(path) && !['.', '..'].include?(File.basename(path)) + Dir.glob(File.join(root, "**", "*"), File::FNM_DOTMATCH).select do |path| + File.file?(path) && ![".", ".."].include?(File.basename(path)) end end package_metadata_files = %w[ @@ -69,25 +69,25 @@ Gem::Specification.new do |spec| *enumerate_package_files.call('exe') ] spec.rdoc_options += [ - '--title', + "--title", "#{spec.name} - #{spec.summary}", - '--main', - 'README.md', - '--exclude', - '^sig/', - '--line-numbers', - '--inline-source', - '--quiet' + "--main", + "README.md", + "--exclude", + "^sig/", + "--line-numbers", + "--inline-source", + "--quiet" ] - spec.bindir = 'exe' + spec.bindir = "exe" # Listed files are the relative paths from bindir above. spec.executables = [] - spec.require_paths = ['lib'] + spec.require_paths = ["lib"] # Utilities spec.add_dependency 'ast-merge', "= #{spec.version}" spec.add_dependency 'tree_haver', "= #{spec.version}" - spec.add_dependency('version_gem', '~> 1.1', '>= 1.1.14') # ruby >= 2.2.0 + spec.add_dependency("version_gem", "~> 1.1", ">= 1.1.14") # ruby >= 2.2.0 # NOTE: It is preferable to list development dependencies in the gemspec due to increased # visibility and discoverability. @@ -103,26 +103,27 @@ Gem::Specification.new do |spec| # and preferably a modular one (see gemfiles/modular/*.gemfile). # Dev, Test, & Release Tasks - spec.add_development_dependency('kettle-dev', '~> 2.3', '>= 2.3.6') # ruby >= 4.0.0 + spec.add_development_dependency("kettle-dev", "~> 2.3", ">= 2.3.7") # ruby >= 4.0.0 # Security - spec.add_development_dependency('bundler-audit', '~> 0.9.3') # ruby >= 2.0.0 + spec.add_development_dependency("bundler-audit", "~> 0.9.3") # ruby >= 2.0.0 # Tasks - spec.add_development_dependency('rake', '~> 13.0') # ruby >= 2.2.0 + spec.add_development_dependency("rake", "~> 13.0") # ruby >= 2.2.0 # Debugging - spec.add_development_dependency('require_bench', '~> 1.0', '>= 1.0.4') # ruby >= 2.2.0 + spec.add_development_dependency("require_bench", "~> 1.0", ">= 1.0.4") # ruby >= 2.2.0 # Testing - spec.add_development_dependency('appraisal2', '~> 3.1', '>= 3.1.4') # ruby >= 1.8.7, for testing against multiple versions of dependencies - spec.add_development_dependency('kettle-test', '~> 2.0', '>= 2.0.11') # ruby >= 4.0.0 - spec.add_development_dependency('turbo_tests2', '~> 3.1', '>= 3.1.14') # ruby >= 2.4.0, default kettle-test runner + spec.add_development_dependency("appraisal2", "~> 3.1", ">= 3.1.4") # ruby >= 1.8.7, for testing against multiple versions of dependencies + spec.add_development_dependency("kettle-test", "~> 2.0", ">= 2.0.11") # ruby >= 4.0.0 + spec.add_development_dependency("turbo_tests2", "~> 3.1", ">= 3.1.14") # ruby >= 2.4.0, default kettle-test runner # Releasing - spec.add_development_dependency('ruby-progressbar', '~> 1.13') # ruby >= 0 - spec.add_development_dependency('stone_checksums', '~> 1.0', '>= 1.0.6') # ruby >= 2.2.0 + spec.add_development_dependency("ruby-progressbar", "~> 1.13") # ruby >= 0 + spec.add_development_dependency("stone_checksums", "~> 1.0", ">= 1.0.6") # ruby >= 2.2.0 # 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.4') # ruby >= 2.4 + spec.add_development_dependency("gitmoji-regex", "~> 2.0", ">= 2.0.4") # ruby >= 2.4 + end diff --git a/gems/bash-merge/lib/bash/merge/version.rb b/gems/bash-merge/lib/bash/merge/version.rb index 55b28eb7d..54229c5dd 100644 --- a/gems/bash-merge/lib/bash/merge/version.rb +++ b/gems/bash-merge/lib/bash/merge/version.rb @@ -3,7 +3,7 @@ module Bash module Merge module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/markdown-merge/Gemfile.lock b/gems/markdown-merge/Gemfile.lock index 5a9031f9a..7bf25040c 100644 --- a/gems/markdown-merge/Gemfile.lock +++ b/gems/markdown-merge/Gemfile.lock @@ -16,264 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -285,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -293,12 +40,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -362,8 +103,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -392,7 +131,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -532,8 +270,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -586,11 +322,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -637,45 +373,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -684,54 +398,31 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -739,7 +430,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +442,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +470,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +481,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,12 +508,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -844,7 +519,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -858,19 +532,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -878,7 +547,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/markly-merge/Gemfile.lock b/gems/markly-merge/Gemfile.lock index 824705fd6..97af045ed 100644 --- a/gems/markly-merge/Gemfile.lock +++ b/gems/markly-merge/Gemfile.lock @@ -16,6 +16,256 @@ PATH markly (~> 0.9) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: @@ -35,11 +285,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -48,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -111,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -279,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -331,11 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -382,24 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -408,31 +684,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,15 +752,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 @@ -482,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -493,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -520,9 +830,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -531,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -544,14 +858,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -559,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/plain-merge/.gitattributes b/gems/plain-merge/.gitattributes index 0ac65aaa7..35a3c7359 100644 --- a/gems/plain-merge/.gitattributes +++ b/gems/plain-merge/.gitattributes @@ -1,5 +1,5 @@ # <> do not edit below this line -*.rb diff=smorg-ruby +*.rb diff=smorg-rb *.go diff=smorg-go *.rs diff=smorg-rs # <> diff --git a/gems/plain-merge/.kettle-drift.lock b/gems/plain-merge/.kettle-drift.lock index 9295a3562..628aa923c 100644 --- a/gems/plain-merge/.kettle-drift.lock +++ b/gems/plain-merge/.kettle-drift.lock @@ -4,7 +4,8 @@ "file": "Gemfile", "lines": [ 80, - 120 + 120, + 160 ] } ], @@ -13,7 +14,8 @@ "file": "Gemfile", "lines": [ 91, - 131 + 131, + 171 ] } ], @@ -22,7 +24,8 @@ "file": "Gemfile", "lines": [ 81, - 121 + 121, + 161 ] } ], @@ -31,7 +34,8 @@ "file": "Gemfile", "lines": [ 93, - 133 + 133, + 173 ] } ], @@ -40,7 +44,8 @@ "file": "Gemfile", "lines": [ 96, - 136 + 136, + 176 ] } ], @@ -49,7 +54,8 @@ "file": "Gemfile", "lines": [ 82, - 122 + 122, + 162 ] } ], @@ -59,7 +65,8 @@ "lines": [ 60, 100, - 140 + 140, + 180 ] } ], @@ -68,7 +75,8 @@ "file": "Gemfile", "lines": [ 101, - 141 + 141, + 181 ] } ], @@ -78,7 +86,8 @@ "lines": [ 43, 87, - 127 + 127, + 167 ] } ], @@ -87,7 +96,8 @@ "file": "Gemfile", "lines": [ 110, - 150 + 150, + 190 ] } ], @@ -97,7 +107,8 @@ "lines": [ 35, 79, - 119 + 119, + 159 ] } ], @@ -107,7 +118,8 @@ "lines": [ 69, 109, - 149 + 149, + 189 ] } ], @@ -116,7 +128,8 @@ "file": "Gemfile", "lines": [ 85, - 125 + 125, + 165 ] } ], @@ -126,7 +139,8 @@ "lines": [ 48, 92, - 132 + 132, + 172 ] } ], @@ -136,7 +150,8 @@ "lines": [ 44, 88, - 128 + 128, + 168 ] } ], @@ -145,7 +160,8 @@ "file": "Gemfile", "lines": [ 86, - 126 + 126, + 166 ] } ], @@ -154,7 +170,8 @@ "file": "Gemfile", "lines": [ 103, - 143 + 143, + 183 ] } ], @@ -163,7 +180,8 @@ "file": "Gemfile", "lines": [ 102, - 142 + 142, + 182 ] } ], @@ -172,7 +190,8 @@ "file": "Gemfile", "lines": [ 97, - 137 + 137, + 177 ] } ], @@ -181,7 +200,8 @@ "file": "Gemfile", "lines": [ 106, - 146 + 146, + 186 ] } ], diff --git a/gems/plain-merge/Gemfile b/gems/plain-merge/Gemfile index 05dc5272f..ab6587618 100644 --- a/gems/plain-merge/Gemfile +++ b/gems/plain-merge/Gemfile @@ -152,6 +152,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/plain-merge/Gemfile.lock b/gems/plain-merge/Gemfile.lock index 398ae4cab..f88acd7e0 100644 --- a/gems/plain-merge/Gemfile.lock +++ b/gems/plain-merge/Gemfile.lock @@ -16,6 +16,280 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.0) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +301,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +309,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -48,7 +323,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -104,15 +378,6 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -131,6 +396,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,25 +536,23 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -322,11 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -373,23 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-drift! + kettle-jem! + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -398,38 +684,61 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -442,19 +751,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae + kettle-drift (1.0.5) + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.0) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -469,11 +786,14 @@ 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.0) plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -481,6 +801,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -508,17 +829,19 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -532,14 +855,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -547,6 +875,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/tree_haver/Gemfile.lock b/gems/tree_haver/Gemfile.lock index 6d82f6ffe..313641ac1 100644 --- a/gems/tree_haver/Gemfile.lock +++ b/gems/tree_haver/Gemfile.lock @@ -7,287 +7,59 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /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) + ansi (1.6.0) + appraisal2 (3.1.4) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + ast (2.4.3) + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) ast-crispr-markdown-markly (7.1.0) ast-crispr (= 7.1.0) markly-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) prism (>= 1.0) version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: ast-merge (7.1.0) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: + backports (3.25.3) bash-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -GEM - remote: https://gem.coop/ - specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - ansi (1.6.0) - appraisal2 (3.1.4) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - 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) citrus (3.0.2) + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) cmdparse (3.0.7) commonmarker (2.9.0-aarch64-linux) commonmarker (2.9.0-aarch64-linux-musl) commonmarker (2.9.0-arm64-darwin) commonmarker (2.9.0-x86_64-linux) commonmarker (2.9.0-x86_64-linux-musl) + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -297,6 +69,10 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docile (1.4.1) + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -346,6 +122,10 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) @@ -353,6 +133,31 @@ GEM ruby-progressbar (~> 1.13) kettle-drift (1.0.5) version_gem (~> 1.1, >= 1.1.13) + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -376,12 +181,24 @@ GEM turbo_tests2 (~> 3.1, >= 3.1.12) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) 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.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -407,9 +224,18 @@ GEM prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) psych (5.4.0) date stringio + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -418,6 +244,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) rdoc (6.17.0) erb psych (>= 4.0.0) @@ -513,6 +344,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -572,6 +407,10 @@ GEM version_gem (~> 1.1, >= 1.1.13) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) @@ -595,6 +434,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.13) + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) yard (0.9.45) yard-fence (0.9.6) rdoc (>= 6.11, < 8) @@ -627,45 +470,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! + kettle-jem (>= 7.0) kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -674,27 +496,20 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml (~> 0.3) - toml-merge! toml-rb (~> 4.1) tree_haver! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -705,13 +520,10 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) @@ -742,7 +554,6 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 @@ -776,8 +587,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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 @@ -821,7 +630,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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -831,7 +639,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -854,7 +661,6 @@ CHECKSUMS tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) sha256=ad6743a373eeac954c1b659b17af3aff1c82918b3ce9c9dc572a7c70ff843cdd tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -867,7 +673,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 7b8c9fbca683a5069cc14ca9be3ad22be718b32d Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 16:36:37 -0600 Subject: [PATCH 008/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/plain-merge/Gemfile.lock | 377 +++------------------------------- 1 file changed, 29 insertions(+), 348 deletions(-) diff --git a/gems/plain-merge/Gemfile.lock b/gems/plain-merge/Gemfile.lock index f88acd7e0..e18e177d6 100644 --- a/gems/plain-merge/Gemfile.lock +++ b/gems/plain-merge/Gemfile.lock @@ -16,262 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.0) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -309,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -323,6 +61,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -372,12 +111,21 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - kettle-dev (2.3.6) + kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -396,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -536,23 +283,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -586,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -637,45 +381,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -684,61 +407,39 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -751,27 +452,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) - kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae - kettle-drift (1.0.5) - kettle-jem (7.1.0) + kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.0) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -786,14 +479,11 @@ 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.0) plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -801,7 +491,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -829,19 +518,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -855,19 +542,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -875,7 +557,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 97f6c537a7b836cbfcc53f5f6ca9ed2805e4d255 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 16:36:48 -0600 Subject: [PATCH 009/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-merge-git/Gemfile.lock | 338 ++++++++++++++++++++- gems/bash-merge/.gitattributes | 2 +- gems/bash-merge/.rubocop_gradual.lock | 2 +- gems/bash-merge/Gemfile | 68 ++--- gems/bash-merge/Gemfile.lock | 328 +------------------- gems/bash-merge/Rakefile | 18 +- gems/bash-merge/bash-merge.gemspec | 85 +++--- gems/bash-merge/lib/bash/merge/version.rb | 2 +- gems/dotenv-merge/Gemfile.lock | 352 +++++++++++++++++++++- gems/plain-merge/Gemfile.lock | 322 ++++++++++++++++++++ gems/rbs-merge/Gemfile.lock | 351 ++++++++++++++++++++- 11 files changed, 1427 insertions(+), 441 deletions(-) diff --git a/gems/ast-merge-git/Gemfile.lock b/gems/ast-merge-git/Gemfile.lock index 27ca66e4f..b8b21c1ab 100644 --- a/gems/ast-merge-git/Gemfile.lock +++ b/gems/ast-merge-git/Gemfile.lock @@ -15,6 +15,256 @@ PATH ast-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -43,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -106,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -134,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -273,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -325,11 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -376,24 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -402,32 +684,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -435,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -447,19 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -474,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -485,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -512,9 +830,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -523,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -536,14 +858,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -551,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/bash-merge/.gitattributes b/gems/bash-merge/.gitattributes index 0ac65aaa7..35a3c7359 100644 --- a/gems/bash-merge/.gitattributes +++ b/gems/bash-merge/.gitattributes @@ -1,5 +1,5 @@ # <> do not edit below this line -*.rb diff=smorg-ruby +*.rb diff=smorg-rb *.go diff=smorg-go *.rs diff=smorg-rs # <> diff --git a/gems/bash-merge/.rubocop_gradual.lock b/gems/bash-merge/.rubocop_gradual.lock index 2a372fefe..4fcdee95e 100644 --- a/gems/bash-merge/.rubocop_gradual.lock +++ b/gems/bash-merge/.rubocop_gradual.lock @@ -8,7 +8,7 @@ [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] ], - "bash-merge.gemspec:1627975125": [ + "bash-merge.gemspec:2425862196": [ [118, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], [120, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2105564149], [126, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949] diff --git a/gems/bash-merge/Gemfile b/gems/bash-merge/Gemfile index 703804533..ede2878fe 100644 --- a/gems/bash-merge/Gemfile +++ b/gems/bash-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source "https://gem.coop" +source 'https://gem.coop' git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,58 +19,54 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ["~> 1.0", ">= 1.0.8"] -gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ['~> 1.0', '>= 1.0.8'] +gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ast-merge tree_haver ] -direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") +direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? if direct_sibling_gems.any? && - (direct_sibling_local || - ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) - direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") - direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) begin nomono_activation_requirements = nomono_requirements - nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) if File.file?(nomono_lockfile) nomono_locked_spec = Bundler::LockfileParser - .new(Bundler.read_file(nomono_lockfile)) - .specs - .find { |spec| spec.name == "nomono" } + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } nomono_locked = nomono_locked_spec && - Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) - if nomono_locked - nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] - end - end - Kernel.send(:gem, "nomono", *nomono_activation_requirements) - require "nomono/bundler" - if direct_sibling_templating && !direct_sibling_local - ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local eval_nomono_gems( gems: direct_sibling_gems, - prefix: "STRUCTUREDMERGE", - path_env: "STRUCTUREDMERGE_DEV", - root: ["src", "my", "structuredmerge"] + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] ) rescue LoadError - warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' ensure if direct_sibling_templating && !direct_sibling_local if direct_sibling_dev_was_set - ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original else - ENV.delete("STRUCTUREDMERGE_DEV") + ENV.delete('STRUCTUREDMERGE_DEV') end end end @@ -214,25 +210,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging -eval_gemfile "gemfiles/modular/debug.gemfile" +eval_gemfile 'gemfiles/modular/debug.gemfile' # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile "gemfiles/modular/coverage.gemfile" +eval_gemfile 'gemfiles/modular/coverage.gemfile' # Linting -eval_gemfile "gemfiles/modular/style.gemfile" +eval_gemfile 'gemfiles/modular/style.gemfile' # Documentation -eval_gemfile "gemfiles/modular/documentation.gemfile" +eval_gemfile 'gemfiles/modular/documentation.gemfile' # Optional -eval_gemfile "gemfiles/modular/optional.gemfile" +eval_gemfile 'gemfiles/modular/optional.gemfile' ### Std Lib Extracted Gems -eval_gemfile "gemfiles/modular/x_std_libs.gemfile" +eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' # See unlocked_deps appraisal for more details on irb inclusion -gem "irb", "~> 1.17" # ruby >= 2.7 +gem 'irb', '~> 1.17' # ruby >= 2.7 diff --git a/gems/bash-merge/Gemfile.lock b/gems/bash-merge/Gemfile.lock index 0a15fc32b..2629c326a 100644 --- a/gems/bash-merge/Gemfile.lock +++ b/gems/bash-merge/Gemfile.lock @@ -16,246 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -293,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -357,13 +111,11 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - kettle-dev (2.3.6) + kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -392,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -532,8 +283,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -586,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -637,45 +381,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.1, >= 3.1.4) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) - go-merge! irb (~> 1.17) - json-merge! - kettle-dev (~> 2.3, >= 2.3.6) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! + kettle-dev (~> 2.3, >= 2.3.7) kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -684,55 +407,34 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.1, >= 3.1.14) - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +442,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +454,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) - kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) + kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +481,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +492,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +519,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +530,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +543,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +558,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/bash-merge/Rakefile b/gems/bash-merge/Rakefile index 3301f1a7e..056589299 100644 --- a/gems/bash-merge/Rakefile +++ b/gems/bash-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require "kettle/drift" + require 'kettle/drift' Kettle::Drift.install_tasks rescue LoadError - desc("(stub) kettle:drift:check is unavailable") - task("kettle:drift:check") do + desc('(stub) kettle:drift:check is unavailable') + task('kettle:drift:check') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:update is unavailable") - task("kettle:drift:update") do + desc('(stub) kettle:drift:update is unavailable') + task('kettle:drift:update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:force_update is unavailable") - task("kettle:drift:force_update") do + desc('(stub) kettle:drift:force_update is unavailable') + task('kettle:drift:force_update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift is unavailable") - task("kettle:drift" => "kettle:drift:update") + desc('(stub) kettle:drift is unavailable') + task('kettle:drift' => 'kettle:drift:update') end ### TEMPLATING TASKS diff --git a/gems/bash-merge/bash-merge.gemspec b/gems/bash-merge/bash-merge.gemspec index b4ceba2fd..830d87cf7 100644 --- a/gems/bash-merge/bash-merge.gemspec +++ b/gems/bash-merge/bash-merge.gemspec @@ -9,47 +9,47 @@ Gem::Specification.new do |spec| spec.name = 'bash-merge' spec.version = Module.new.tap { |mod| Kernel.load("#{__dir__}/lib/bash/merge/version.rb", mod) }::Bash::Merge::Version::VERSION - spec.authors = ["Peter H. Boling"] - spec.email = ["floss@galtzo.com"] + spec.authors = ['Peter H. Boling'] + spec.email = ['floss@galtzo.com'] spec.summary = '☯️ Structured Merge Bash analysis and merge for Ruby' spec.description = '☯️ Bash statement, comment, freeze-block, and template merge behavior for Structured Merge.' spec.homepage = 'https://github.com/structuredmerge/structuredmerge-ruby' - spec.licenses = ["AGPL-3.0-only", "PolyForm-Small-Business-1.0.0"] - spec.required_ruby_version = ">= 4.0.0" + spec.licenses = ['AGPL-3.0-only', 'PolyForm-Small-Business-1.0.0'] + spec.required_ruby_version = '>= 4.0.0' # 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") - user_cert = "certs/#{ENV.fetch("GEM_CERT_USER", ENV["USER"])}.pem" + unless ENV.include?('SKIP_GEM_SIGNING') + user_cert = "certs/#{ENV.fetch('GEM_CERT_USER', ENV['USER'])}.pem" cert_file_path = File.join(__dir__, user_cert) - cert_chain = cert_file_path.split(",") + cert_chain = cert_file_path.split(',') cert_chain.select! { |fp| File.exist?(fp) } if cert_file_path && cert_chain.any? spec.cert_chain = cert_chain - if $PROGRAM_NAME.end_with?("gem") && ARGV[0] == "build" - spec.signing_key = File.join(Gem.user_home, ".ssh", "gem-private_key.pem") + if $PROGRAM_NAME.end_with?('gem') && ARGV[0] == 'build' + spec.signing_key = File.join(Gem.user_home, '.ssh', 'gem-private_key.pem') end end end - spec.metadata["homepage_uri"] = "https://structuredmerge.org" - spec.metadata["source_code_uri"] = "#{spec.homepage}/tree/v#{spec.version}" - spec.metadata["changelog_uri"] = "#{spec.homepage}/blob/v#{spec.version}/CHANGELOG.md" - spec.metadata["bug_tracker_uri"] = "#{spec.homepage}/issues" - spec.metadata["documentation_uri"] = "https://www.rubydoc.info/gems/#{spec.name}/#{spec.version}" - spec.metadata["funding_uri"] = "https://github.com/sponsors/pboling" - spec.metadata["wiki_uri"] = "#{spec.homepage}/wiki" - spec.metadata["news_uri"] = "https://www.railsbling.com/tags/#{spec.name}" - spec.metadata["discord_uri"] = "https://discord.gg/3qme4XHNKN" - spec.metadata["rubygems_mfa_required"] = "true" + spec.metadata['homepage_uri'] = 'https://structuredmerge.org' + spec.metadata['source_code_uri'] = "#{spec.homepage}/tree/v#{spec.version}" + spec.metadata['changelog_uri'] = "#{spec.homepage}/blob/v#{spec.version}/CHANGELOG.md" + spec.metadata['bug_tracker_uri'] = "#{spec.homepage}/issues" + spec.metadata['documentation_uri'] = "https://www.rubydoc.info/gems/#{spec.name}/#{spec.version}" + spec.metadata['funding_uri'] = 'https://github.com/sponsors/pboling' + spec.metadata['wiki_uri'] = "#{spec.homepage}/wiki" + spec.metadata['news_uri'] = "https://www.railsbling.com/tags/#{spec.name}" + spec.metadata['discord_uri'] = 'https://discord.gg/3qme4XHNKN' + spec.metadata['rubygems_mfa_required'] = 'true' enumerate_package_files = lambda do |root| - Dir.glob(File.join(root, "**", "*"), File::FNM_DOTMATCH).select do |path| - File.file?(path) && ![".", ".."].include?(File.basename(path)) + Dir.glob(File.join(root, '**', '*'), File::FNM_DOTMATCH).select do |path| + File.file?(path) && !['.', '..'].include?(File.basename(path)) end end package_metadata_files = %w[ @@ -69,25 +69,25 @@ Gem::Specification.new do |spec| *enumerate_package_files.call('exe') ] spec.rdoc_options += [ - "--title", + '--title', "#{spec.name} - #{spec.summary}", - "--main", - "README.md", - "--exclude", - "^sig/", - "--line-numbers", - "--inline-source", - "--quiet" + '--main', + 'README.md', + '--exclude', + '^sig/', + '--line-numbers', + '--inline-source', + '--quiet' ] - spec.bindir = "exe" + spec.bindir = 'exe' # Listed files are the relative paths from bindir above. spec.executables = [] - spec.require_paths = ["lib"] + spec.require_paths = ['lib'] # Utilities spec.add_dependency 'ast-merge', "= #{spec.version}" spec.add_dependency 'tree_haver', "= #{spec.version}" - spec.add_dependency("version_gem", "~> 1.1", ">= 1.1.14") # ruby >= 2.2.0 + spec.add_dependency('version_gem', '~> 1.1', '>= 1.1.14') # ruby >= 2.2.0 # NOTE: It is preferable to list development dependencies in the gemspec due to increased # visibility and discoverability. @@ -103,27 +103,26 @@ Gem::Specification.new do |spec| # and preferably a modular one (see gemfiles/modular/*.gemfile). # Dev, Test, & Release Tasks - spec.add_development_dependency("kettle-dev", "~> 2.3", ">= 2.3.7") # ruby >= 4.0.0 + spec.add_development_dependency('kettle-dev', '~> 2.3', '>= 2.3.7') # ruby >= 4.0.0 # Security - spec.add_development_dependency("bundler-audit", "~> 0.9.3") # ruby >= 2.0.0 + spec.add_development_dependency('bundler-audit', '~> 0.9.3') # ruby >= 2.0.0 # Tasks - spec.add_development_dependency("rake", "~> 13.0") # ruby >= 2.2.0 + spec.add_development_dependency('rake', '~> 13.0') # ruby >= 2.2.0 # Debugging - spec.add_development_dependency("require_bench", "~> 1.0", ">= 1.0.4") # ruby >= 2.2.0 + spec.add_development_dependency('require_bench', '~> 1.0', '>= 1.0.4') # ruby >= 2.2.0 # Testing - spec.add_development_dependency("appraisal2", "~> 3.1", ">= 3.1.4") # ruby >= 1.8.7, for testing against multiple versions of dependencies - spec.add_development_dependency("kettle-test", "~> 2.0", ">= 2.0.11") # ruby >= 4.0.0 - spec.add_development_dependency("turbo_tests2", "~> 3.1", ">= 3.1.14") # ruby >= 2.4.0, default kettle-test runner + spec.add_development_dependency('appraisal2', '~> 3.1', '>= 3.1.4') # ruby >= 1.8.7, for testing against multiple versions of dependencies + spec.add_development_dependency('kettle-test', '~> 2.0', '>= 2.0.11') # ruby >= 4.0.0 + spec.add_development_dependency('turbo_tests2', '~> 3.1', '>= 3.1.14') # ruby >= 2.4.0, default kettle-test runner # Releasing - spec.add_development_dependency("ruby-progressbar", "~> 1.13") # ruby >= 0 - spec.add_development_dependency("stone_checksums", "~> 1.0", ">= 1.0.6") # ruby >= 2.2.0 + spec.add_development_dependency('ruby-progressbar', '~> 1.13') # ruby >= 0 + spec.add_development_dependency('stone_checksums', '~> 1.0', '>= 1.0.6') # ruby >= 2.2.0 # 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.4") # ruby >= 2.4 - + spec.add_development_dependency('gitmoji-regex', '~> 2.0', '>= 2.0.4') # ruby >= 2.4 end diff --git a/gems/bash-merge/lib/bash/merge/version.rb b/gems/bash-merge/lib/bash/merge/version.rb index 54229c5dd..55b28eb7d 100644 --- a/gems/bash-merge/lib/bash/merge/version.rb +++ b/gems/bash-merge/lib/bash/merge/version.rb @@ -3,7 +3,7 @@ module Bash module Merge module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/dotenv-merge/Gemfile.lock b/gems/dotenv-merge/Gemfile.lock index dfe846e75..193a20e3f 100644 --- a/gems/dotenv-merge/Gemfile.lock +++ b/gems/dotenv-merge/Gemfile.lock @@ -16,6 +16,264 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +285,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -103,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -131,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -322,11 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -373,23 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.1, >= 3.1.4) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.3, >= 2.3.6) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -398,32 +684,55 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.1, >= 3.1.14) + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -444,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -471,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -482,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -509,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -520,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -533,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -548,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/plain-merge/Gemfile.lock b/gems/plain-merge/Gemfile.lock index e18e177d6..8a5af2ca5 100644 --- a/gems/plain-merge/Gemfile.lock +++ b/gems/plain-merge/Gemfile.lock @@ -16,6 +16,246 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -53,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -381,24 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -407,32 +684,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,19 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -479,11 +787,14 @@ 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.0) plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -491,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -518,9 +830,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -529,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -542,14 +858,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/rbs-merge/Gemfile.lock b/gems/rbs-merge/Gemfile.lock index b7bf218c2..1a3727264 100644 --- a/gems/rbs-merge/Gemfile.lock +++ b/gems/rbs-merge/Gemfile.lock @@ -17,6 +17,263 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -28,11 +285,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -41,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -104,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -132,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -271,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -323,11 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -374,20 +637,42 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.1, >= 3.1.4) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.3, >= 2.3.6) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) rbs-merge! @@ -399,32 +684,55 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.1, >= 3.1.14) + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -432,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -444,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -471,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -510,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -521,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -534,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -549,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 907fcf571cc90c060c9a44cbff17e4612937b78e Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 16:37:20 -0600 Subject: [PATCH 010/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/bash-merge/Gemfile.lock | 322 +++++++++++++++++ gems/dotenv-merge/.gitattributes | 2 +- gems/dotenv-merge/.kettle-drift.lock | 60 ++-- gems/dotenv-merge/.rubocop_gradual.lock | 2 +- gems/dotenv-merge/Gemfile | 40 +++ gems/dotenv-merge/Gemfile.lock | 328 +----------------- gems/dotenv-merge/dotenv-merge.gemspec | 2 +- gems/json-merge/.kettle-drift.lock | 60 ++-- gems/json-merge/Gemfile | 70 +++- gems/json-merge/Gemfile.lock | 352 ++++++++++++++++++- gems/json-merge/README.md | 1 + gems/json-merge/Rakefile | 18 +- gems/json-merge/lib/json/merge/version.rb | 2 +- gems/rbs-merge/.gitattributes | 2 +- gems/rbs-merge/.kettle-drift.lock | 60 ++-- gems/rbs-merge/.rubocop_gradual.lock | 402 ---------------------- gems/rbs-merge/Gemfile | 40 +++ gems/rbs-merge/Gemfile.lock | 65 ++-- gems/rbs-merge/lib/rbs/merge/version.rb | 2 +- gems/rbs-merge/rbs-merge.gemspec | 85 ++--- 20 files changed, 1014 insertions(+), 901 deletions(-) delete mode 100644 gems/rbs-merge/.rubocop_gradual.lock diff --git a/gems/bash-merge/Gemfile.lock b/gems/bash-merge/Gemfile.lock index 2629c326a..27c88fc3b 100644 --- a/gems/bash-merge/Gemfile.lock +++ b/gems/bash-merge/Gemfile.lock @@ -16,6 +16,246 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -53,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -381,24 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.1, >= 3.1.4) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.3, >= 2.3.7) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -407,34 +684,55 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.1, >= 3.1.14) + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -442,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -454,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -481,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -492,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -519,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -530,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -543,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -558,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/dotenv-merge/.gitattributes b/gems/dotenv-merge/.gitattributes index 0ac65aaa7..35a3c7359 100644 --- a/gems/dotenv-merge/.gitattributes +++ b/gems/dotenv-merge/.gitattributes @@ -1,5 +1,5 @@ # <> do not edit below this line -*.rb diff=smorg-ruby +*.rb diff=smorg-rb *.go diff=smorg-go *.rs diff=smorg-rs # <> diff --git a/gems/dotenv-merge/.kettle-drift.lock b/gems/dotenv-merge/.kettle-drift.lock index 9295a3562..628aa923c 100644 --- a/gems/dotenv-merge/.kettle-drift.lock +++ b/gems/dotenv-merge/.kettle-drift.lock @@ -4,7 +4,8 @@ "file": "Gemfile", "lines": [ 80, - 120 + 120, + 160 ] } ], @@ -13,7 +14,8 @@ "file": "Gemfile", "lines": [ 91, - 131 + 131, + 171 ] } ], @@ -22,7 +24,8 @@ "file": "Gemfile", "lines": [ 81, - 121 + 121, + 161 ] } ], @@ -31,7 +34,8 @@ "file": "Gemfile", "lines": [ 93, - 133 + 133, + 173 ] } ], @@ -40,7 +44,8 @@ "file": "Gemfile", "lines": [ 96, - 136 + 136, + 176 ] } ], @@ -49,7 +54,8 @@ "file": "Gemfile", "lines": [ 82, - 122 + 122, + 162 ] } ], @@ -59,7 +65,8 @@ "lines": [ 60, 100, - 140 + 140, + 180 ] } ], @@ -68,7 +75,8 @@ "file": "Gemfile", "lines": [ 101, - 141 + 141, + 181 ] } ], @@ -78,7 +86,8 @@ "lines": [ 43, 87, - 127 + 127, + 167 ] } ], @@ -87,7 +96,8 @@ "file": "Gemfile", "lines": [ 110, - 150 + 150, + 190 ] } ], @@ -97,7 +107,8 @@ "lines": [ 35, 79, - 119 + 119, + 159 ] } ], @@ -107,7 +118,8 @@ "lines": [ 69, 109, - 149 + 149, + 189 ] } ], @@ -116,7 +128,8 @@ "file": "Gemfile", "lines": [ 85, - 125 + 125, + 165 ] } ], @@ -126,7 +139,8 @@ "lines": [ 48, 92, - 132 + 132, + 172 ] } ], @@ -136,7 +150,8 @@ "lines": [ 44, 88, - 128 + 128, + 168 ] } ], @@ -145,7 +160,8 @@ "file": "Gemfile", "lines": [ 86, - 126 + 126, + 166 ] } ], @@ -154,7 +170,8 @@ "file": "Gemfile", "lines": [ 103, - 143 + 143, + 183 ] } ], @@ -163,7 +180,8 @@ "file": "Gemfile", "lines": [ 102, - 142 + 142, + 182 ] } ], @@ -172,7 +190,8 @@ "file": "Gemfile", "lines": [ 97, - 137 + 137, + 177 ] } ], @@ -181,7 +200,8 @@ "file": "Gemfile", "lines": [ 106, - 146 + 146, + 186 ] } ], diff --git a/gems/dotenv-merge/.rubocop_gradual.lock b/gems/dotenv-merge/.rubocop_gradual.lock index 514238322..a7735088e 100644 --- a/gems/dotenv-merge/.rubocop_gradual.lock +++ b/gems/dotenv-merge/.rubocop_gradual.lock @@ -8,7 +8,7 @@ [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] ], - "dotenv-merge.gemspec:2060422435": [ + "dotenv-merge.gemspec:2358764930": [ [125, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], [127, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2105564149], [133, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949] diff --git a/gems/dotenv-merge/Gemfile b/gems/dotenv-merge/Gemfile index f8ebc9fa0..84144b290 100644 --- a/gems/dotenv-merge/Gemfile +++ b/gems/dotenv-merge/Gemfile @@ -152,6 +152,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/dotenv-merge/Gemfile.lock b/gems/dotenv-merge/Gemfile.lock index 193a20e3f..468e5bf66 100644 --- a/gems/dotenv-merge/Gemfile.lock +++ b/gems/dotenv-merge/Gemfile.lock @@ -16,246 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -293,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -357,13 +111,11 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - kettle-dev (2.3.6) + kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -392,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -532,8 +283,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -586,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -637,45 +381,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.1, >= 3.1.4) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) - go-merge! irb (~> 1.17) - json-merge! - kettle-dev (~> 2.3, >= 2.3.6) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! + kettle-dev (~> 2.3, >= 2.3.7) kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -684,55 +407,33 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.1, >= 3.1.14) - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -753,27 +454,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) - kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) + kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +481,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +492,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +519,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +530,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +543,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +558,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/dotenv-merge/dotenv-merge.gemspec b/gems/dotenv-merge/dotenv-merge.gemspec index 038b9b7ff..3b97eb500 100644 --- a/gems/dotenv-merge/dotenv-merge.gemspec +++ b/gems/dotenv-merge/dotenv-merge.gemspec @@ -110,7 +110,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', '~> 2.3', '>= 2.3.6') # ruby >= 4.0.0 + spec.add_development_dependency('kettle-dev', '~> 2.3', '>= 2.3.7') # ruby >= 4.0.0 # Security spec.add_development_dependency('bundler-audit', '~> 0.9.3') # ruby >= 2.0.0 diff --git a/gems/json-merge/.kettle-drift.lock b/gems/json-merge/.kettle-drift.lock index 9295a3562..628aa923c 100644 --- a/gems/json-merge/.kettle-drift.lock +++ b/gems/json-merge/.kettle-drift.lock @@ -4,7 +4,8 @@ "file": "Gemfile", "lines": [ 80, - 120 + 120, + 160 ] } ], @@ -13,7 +14,8 @@ "file": "Gemfile", "lines": [ 91, - 131 + 131, + 171 ] } ], @@ -22,7 +24,8 @@ "file": "Gemfile", "lines": [ 81, - 121 + 121, + 161 ] } ], @@ -31,7 +34,8 @@ "file": "Gemfile", "lines": [ 93, - 133 + 133, + 173 ] } ], @@ -40,7 +44,8 @@ "file": "Gemfile", "lines": [ 96, - 136 + 136, + 176 ] } ], @@ -49,7 +54,8 @@ "file": "Gemfile", "lines": [ 82, - 122 + 122, + 162 ] } ], @@ -59,7 +65,8 @@ "lines": [ 60, 100, - 140 + 140, + 180 ] } ], @@ -68,7 +75,8 @@ "file": "Gemfile", "lines": [ 101, - 141 + 141, + 181 ] } ], @@ -78,7 +86,8 @@ "lines": [ 43, 87, - 127 + 127, + 167 ] } ], @@ -87,7 +96,8 @@ "file": "Gemfile", "lines": [ 110, - 150 + 150, + 190 ] } ], @@ -97,7 +107,8 @@ "lines": [ 35, 79, - 119 + 119, + 159 ] } ], @@ -107,7 +118,8 @@ "lines": [ 69, 109, - 149 + 149, + 189 ] } ], @@ -116,7 +128,8 @@ "file": "Gemfile", "lines": [ 85, - 125 + 125, + 165 ] } ], @@ -126,7 +139,8 @@ "lines": [ 48, 92, - 132 + 132, + 172 ] } ], @@ -136,7 +150,8 @@ "lines": [ 44, 88, - 128 + 128, + 168 ] } ], @@ -145,7 +160,8 @@ "file": "Gemfile", "lines": [ 86, - 126 + 126, + 166 ] } ], @@ -154,7 +170,8 @@ "file": "Gemfile", "lines": [ 103, - 143 + 143, + 183 ] } ], @@ -163,7 +180,8 @@ "file": "Gemfile", "lines": [ 102, - 142 + 142, + 182 ] } ], @@ -172,7 +190,8 @@ "file": "Gemfile", "lines": [ 97, - 137 + 137, + 177 ] } ], @@ -181,7 +200,8 @@ "file": "Gemfile", "lines": [ 106, - 146 + 146, + 186 ] } ], diff --git a/gems/json-merge/Gemfile b/gems/json-merge/Gemfile index 6f7bfe796..98677f1dd 100644 --- a/gems/json-merge/Gemfile +++ b/gems/json-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source 'https://gem.coop' +source "https://gem.coop" git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,18 +19,62 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ['~> 1.0', '>= 1.0.8'] -gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ["~> 1.0", ">= 1.0.8"] +gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ast-merge tree_haver ] -direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') +direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? + +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) + direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") + direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == "nomono" } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + if nomono_locked + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] + end + end + Kernel.send(:gem, "nomono", *nomono_activation_requirements) + require "nomono/bundler" + if direct_sibling_templating && !direct_sibling_local + ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + end + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: "STRUCTUREDMERGE", + path_env: "STRUCTUREDMERGE_DEV", + root: ["src", "my", "structuredmerge"] + ) + rescue LoadError + warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + else + ENV.delete("STRUCTUREDMERGE_DEV") + end + end + end +end if direct_sibling_gems.any? && (direct_sibling_local || @@ -170,25 +214,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? # Debugging -eval_gemfile 'gemfiles/modular/debug.gemfile' +eval_gemfile "gemfiles/modular/debug.gemfile" # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile 'gemfiles/modular/coverage.gemfile' +eval_gemfile "gemfiles/modular/coverage.gemfile" # Linting -eval_gemfile 'gemfiles/modular/style.gemfile' +eval_gemfile "gemfiles/modular/style.gemfile" # Documentation -eval_gemfile 'gemfiles/modular/documentation.gemfile' +eval_gemfile "gemfiles/modular/documentation.gemfile" # Optional -eval_gemfile 'gemfiles/modular/optional.gemfile' +eval_gemfile "gemfiles/modular/optional.gemfile" ### Std Lib Extracted Gems -eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' +eval_gemfile "gemfiles/modular/x_std_libs.gemfile" # See unlocked_deps appraisal for more details on irb inclusion -gem 'irb', '~> 1.17' # ruby >= 2.7 +gem "irb", "~> 1.17" # ruby >= 2.7 diff --git a/gems/json-merge/Gemfile.lock b/gems/json-merge/Gemfile.lock index 6e93045c0..dd85f99c5 100644 --- a/gems/json-merge/Gemfile.lock +++ b/gems/json-merge/Gemfile.lock @@ -16,6 +16,264 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +285,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -103,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -131,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -322,11 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -373,23 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -398,31 +684,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -430,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -442,20 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -470,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -481,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -508,9 +830,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -519,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -532,14 +858,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -547,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/json-merge/README.md b/gems/json-merge/README.md index b2f5382b8..c3f88415a 100644 --- a/gems/json-merge/README.md +++ b/gems/json-merge/README.md @@ -534,6 +534,7 @@ If none of the available licenses suit your use case, please [contact us](mailto [🖐contrib-rocks]: https://contrib.rocks [🖐contributors]: https://github.com/structuredmerge/structuredmerge-ruby/graphs/contributors [🖐contributors-img]: https://contrib.rocks/image?repo=structuredmerge/structuredmerge-ruby +[🚎contributors-gl]: https://gitlab.com/structuredmerge/structuredmerge-ruby/-/graphs/main [🪇conduct]: https://github.com/structuredmerge/structuredmerge-ruby/blob/main/CODE_OF_CONDUCT.md [🪇conduct-img]: https://img.shields.io/badge/Contributor_Covenant-2.1-259D6C.svg [📌pvc]: http://guides.rubygems.org/patterns/#pessimistic-version-constraint diff --git a/gems/json-merge/Rakefile b/gems/json-merge/Rakefile index cd3637459..eb14b860c 100644 --- a/gems/json-merge/Rakefile +++ b/gems/json-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require 'kettle/drift' + require "kettle/drift" Kettle::Drift.install_tasks rescue LoadError - desc('(stub) kettle:drift:check is unavailable') - task('kettle:drift:check') do + desc("(stub) kettle:drift:check is unavailable") + task("kettle:drift:check") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:update is unavailable') - task('kettle:drift:update') do + desc("(stub) kettle:drift:update is unavailable") + task("kettle:drift:update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:force_update is unavailable') - task('kettle:drift:force_update') do + desc("(stub) kettle:drift:force_update is unavailable") + task("kettle:drift:force_update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift is unavailable') - task('kettle:drift' => 'kettle:drift:update') + desc("(stub) kettle:drift is unavailable") + task("kettle:drift" => "kettle:drift:update") end ### TEMPLATING TASKS diff --git a/gems/json-merge/lib/json/merge/version.rb b/gems/json-merge/lib/json/merge/version.rb index 13f521eb3..d02d9f1a5 100644 --- a/gems/json-merge/lib/json/merge/version.rb +++ b/gems/json-merge/lib/json/merge/version.rb @@ -3,7 +3,7 @@ module Json module Merge module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/rbs-merge/.gitattributes b/gems/rbs-merge/.gitattributes index 0ac65aaa7..35a3c7359 100644 --- a/gems/rbs-merge/.gitattributes +++ b/gems/rbs-merge/.gitattributes @@ -1,5 +1,5 @@ # <> do not edit below this line -*.rb diff=smorg-ruby +*.rb diff=smorg-rb *.go diff=smorg-go *.rs diff=smorg-rs # <> diff --git a/gems/rbs-merge/.kettle-drift.lock b/gems/rbs-merge/.kettle-drift.lock index 9295a3562..628aa923c 100644 --- a/gems/rbs-merge/.kettle-drift.lock +++ b/gems/rbs-merge/.kettle-drift.lock @@ -4,7 +4,8 @@ "file": "Gemfile", "lines": [ 80, - 120 + 120, + 160 ] } ], @@ -13,7 +14,8 @@ "file": "Gemfile", "lines": [ 91, - 131 + 131, + 171 ] } ], @@ -22,7 +24,8 @@ "file": "Gemfile", "lines": [ 81, - 121 + 121, + 161 ] } ], @@ -31,7 +34,8 @@ "file": "Gemfile", "lines": [ 93, - 133 + 133, + 173 ] } ], @@ -40,7 +44,8 @@ "file": "Gemfile", "lines": [ 96, - 136 + 136, + 176 ] } ], @@ -49,7 +54,8 @@ "file": "Gemfile", "lines": [ 82, - 122 + 122, + 162 ] } ], @@ -59,7 +65,8 @@ "lines": [ 60, 100, - 140 + 140, + 180 ] } ], @@ -68,7 +75,8 @@ "file": "Gemfile", "lines": [ 101, - 141 + 141, + 181 ] } ], @@ -78,7 +86,8 @@ "lines": [ 43, 87, - 127 + 127, + 167 ] } ], @@ -87,7 +96,8 @@ "file": "Gemfile", "lines": [ 110, - 150 + 150, + 190 ] } ], @@ -97,7 +107,8 @@ "lines": [ 35, 79, - 119 + 119, + 159 ] } ], @@ -107,7 +118,8 @@ "lines": [ 69, 109, - 149 + 149, + 189 ] } ], @@ -116,7 +128,8 @@ "file": "Gemfile", "lines": [ 85, - 125 + 125, + 165 ] } ], @@ -126,7 +139,8 @@ "lines": [ 48, 92, - 132 + 132, + 172 ] } ], @@ -136,7 +150,8 @@ "lines": [ 44, 88, - 128 + 128, + 168 ] } ], @@ -145,7 +160,8 @@ "file": "Gemfile", "lines": [ 86, - 126 + 126, + 166 ] } ], @@ -154,7 +170,8 @@ "file": "Gemfile", "lines": [ 103, - 143 + 143, + 183 ] } ], @@ -163,7 +180,8 @@ "file": "Gemfile", "lines": [ 102, - 142 + 142, + 182 ] } ], @@ -172,7 +190,8 @@ "file": "Gemfile", "lines": [ 97, - 137 + 137, + 177 ] } ], @@ -181,7 +200,8 @@ "file": "Gemfile", "lines": [ 106, - 146 + 146, + 186 ] } ], diff --git a/gems/rbs-merge/.rubocop_gradual.lock b/gems/rbs-merge/.rubocop_gradual.lock deleted file mode 100644 index 243f2c79e..000000000 --- a/gems/rbs-merge/.rubocop_gradual.lock +++ /dev/null @@ -1,402 +0,0 @@ -{ - ".simplecov:2483172942": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:3295679373": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/rbs-merge.rb:334311121": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`rbs-merge.rb`) should use snake_case.", 5381], - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "lib/rbs/merge.rb:3499390300": [ - [17, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Rbs::Merge`.", 2866359175], - [103, 7, 1203, "Metrics/MethodLength: Method has too many lines. [25/10]", 564456261] - ], - "lib/rbs/merge/backends/rbs_backend.rb:1875248624": [ - [48, 11, 555, "Metrics/MethodLength: Method has too many lines. [13/10]", 2078142514], - [81, 11, 658, "Metrics/MethodLength: Method has too many lines. [11/10]", 324484142], - [172, 11, 527, "Metrics/MethodLength: Method has too many lines. [14/10]", 631898529], - [240, 15, 11, "Naming/PredicatePrefix: Rename `has_errors?` to `errors?`.", 1181419252], - [263, 9, 9332, "Metrics/ClassLength: Class has too many lines. [135/100]", 1906483935], - [290, 11, 1914, "Metrics/AbcSize: Assignment Branch Condition size for `type` is too high. [<0, 9, 23> 24.7/17]", 3636991776], - [290, 11, 1914, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `type` is too high. [24/7]", 3636991776], - [290, 11, 1914, "Metrics/MethodLength: Method has too many lines. [28/10]", 3636991776], - [363, 11, 489, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `end_point` is too high. [8/7]", 844861810], - [504, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] - ], - "lib/rbs/merge/comment_tracker.rb:1938176986": [ - [28, 7, 767, "Metrics/MethodLength: Method has too many lines. [15/10]", 752916075], - [60, 7, 416, "Metrics/MethodLength: Method has too many lines. [12/10]", 2715172162] - ], - "lib/rbs/merge/conflict_resolver.rb:1305396962": [ - [16, 5, 11045, "Metrics/ClassLength: Class has too many lines. [174/100]", 330576807], - [44, 7, 1614, "Metrics/MethodLength: Method has too many lines. [23/10]", 1004723330], - [44, 45, 14, "Lint/UnusedMethodArgument: Unused method argument - `template_index`.", 1809801172], - [44, 62, 10, "Lint/UnusedMethodArgument: Unused method argument - `dest_index`.", 2703999490], - [122, 7, 717, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `resolve_preference` is too high. [8/7]", 2783267415], - [122, 7, 717, "Metrics/MethodLength: Method has too many lines. [12/10]", 2783267415], - [156, 7, 949, "Metrics/AbcSize: Assignment Branch Condition size for `extract_declaration_text` is too high. [<9, 19, 14> 25.26/17]", 4132302840], - [156, 7, 949, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_declaration_text` is too high. [13/7]", 4132302840], - [156, 7, 949, "Metrics/MethodLength: Method has too many lines. [18/10]", 4132302840], - [156, 7, 949, "Metrics/PerceivedComplexity: Perceived complexity for `extract_declaration_text` is too high. [14/8]", 4132302840], - [181, 39, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [279, 7, 565, "Metrics/MethodLength: Method has too many lines. [13/10]", 375776463], - [279, 11, 12, "Naming/PredicatePrefix: Rename `has_members?` to `members?`.", 496913372] - ], - "lib/rbs/merge/file_aligner.rb:157117932": [ - [32, 7, 128, "Lint/UselessMethodDefinition: Useless method definition detected.", 4031328363] - ], - "lib/rbs/merge/file_analysis.rb:4205990536": [ - [23, 5, 20642, "Metrics/ClassLength: Class has too many lines. [403/100]", 3271819659], - [59, 7, 1146, "Metrics/MethodLength: Method has too many lines. [20/10]", 1625645012], - [191, 7, 398, "Metrics/MethodLength: Method has too many lines. [12/10]", 4157341657], - [211, 7, 719, "Metrics/MethodLength: Method has too many lines. [13/10]", 2571132513], - [235, 7, 965, "Metrics/AbcSize: Assignment Branch Condition size for `compute_tree_sitter_signature` is too high. [<3, 5, 21> 21.79/17]", 2963702282], - [235, 7, 965, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_tree_sitter_signature` is too high. [22/7]", 2963702282], - [235, 7, 965, "Metrics/MethodLength: Method has too many lines. [26/10]", 2963702282], - [235, 7, 965, "Metrics/PerceivedComplexity: Perceived complexity for `compute_tree_sitter_signature` is too high. [16/8]", 2963702282], - [269, 7, 996, "Metrics/AbcSize: Assignment Branch Condition size for `extract_tree_sitter_node_name` is too high. [<5, 16, 10> 19.52/17]", 300940102], - [269, 7, 996, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_tree_sitter_node_name` is too high. [11/7]", 300940102], - [269, 7, 996, "Metrics/MethodLength: Method has too many lines. [24/10]", 300940102], - [269, 7, 996, "Metrics/PerceivedComplexity: Perceived complexity for `extract_tree_sitter_node_name` is too high. [11/8]", 300940102], - [320, 7, 834, "Metrics/MethodLength: Method has too many lines. [16/10]", 658496547], - [380, 7, 1612, "Metrics/AbcSize: Assignment Branch Condition size for `extract_tree_sitter_declarations` is too high. [<8, 18, 11> 22.56/17]", 1899595676], - [380, 7, 1612, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_tree_sitter_declarations` is too high. [10/7]", 1899595676], - [380, 7, 1612, "Metrics/MethodLength: Method has too many lines. [23/10]", 1899595676], - [380, 7, 1612, "Metrics/PerceivedComplexity: Perceived complexity for `extract_tree_sitter_declarations` is too high. [11/8]", 1899595676], - [449, 7, 569, "Metrics/MethodLength: Method has too many lines. [13/10]", 210550095], - [471, 7, 1133, "Metrics/AbcSize: Assignment Branch Condition size for `build_freeze_blocks` is too high. [<7, 22, 6> 23.85/17]", 4016218974], - [471, 7, 1133, "Metrics/MethodLength: Method has too many lines. [29/10]", 4016218974], - [528, 7, 486, "Metrics/MethodLength: Method has too many lines. [12/10]", 618123864], - [528, 7, 486, "Metrics/PerceivedComplexity: Perceived complexity for `node_start_line` is too high. [9/8]", 618123864], - [545, 7, 472, "Metrics/MethodLength: Method has too many lines. [12/10]", 1339916888], - [545, 7, 472, "Metrics/PerceivedComplexity: Perceived complexity for `node_end_line` is too high. [9/8]", 1339916888], - [579, 7, 1868, "Metrics/AbcSize: Assignment Branch Condition size for `compute_rbs_gem_signature` is too high. [<0, 45, 23> 50.54/17]", 2652509672], - [579, 7, 1868, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_rbs_gem_signature` is too high. [23/7]", 2652509672], - [579, 7, 1868, "Metrics/MethodLength: Method has too many lines. [43/10]", 2652509672], - [579, 7, 1868, "Metrics/PerceivedComplexity: Perceived complexity for `compute_rbs_gem_signature` is too high. [9/8]", 2652509672] - ], - "lib/rbs/merge/freeze_node.rb:2942544870": [ - [34, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 201145846], - [39, 7, 577, "Metrics/MethodLength: Method has too many lines. [11/10]", 2189574632], - [39, 21, 186, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1006469938], - [78, 7, 1506, "Metrics/AbcSize: Assignment Branch Condition size for `validate_structure!` is too high. [<12, 12, 17> 24.02/17]", 1543687562], - [78, 7, 1506, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_structure!` is too high. [12/7]", 1543687562], - [78, 7, 1506, "Metrics/MethodLength: Method has too many lines. [25/10]", 1543687562], - [78, 7, 1506, "Metrics/PerceivedComplexity: Perceived complexity for `validate_structure!` is too high. [12/8]", 1543687562], - [150, 7, 891, "Metrics/AbcSize: Assignment Branch Condition size for `extract_node_name` is too high. [<4, 21, 12> 24.52/17]", 1223188123], - [150, 7, 891, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_node_name` is too high. [13/7]", 1223188123], - [150, 7, 891, "Metrics/MethodLength: Method has too many lines. [18/10]", 1223188123], - [150, 7, 891, "Metrics/PerceivedComplexity: Perceived complexity for `extract_node_name` is too high. [13/8]", 1223188123], - [162, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861336] - ], - "lib/rbs/merge/merge_result.rb:1707720872": [ - [18, 5, 15586, "Metrics/ClassLength: Class has too many lines. [276/100]", 817348545], - [89, 7, 966, "Metrics/MethodLength: Method has too many lines. [14/10]", 3349669346], - [176, 7, 1770, "Metrics/AbcSize: Assignment Branch Condition size for `extract_lines` is too high. [<15, 21, 16> 30.36/17]", 3951991352], - [176, 7, 1770, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_lines` is too high. [15/7]", 3951991352], - [176, 7, 1770, "Metrics/MethodLength: Method has too many lines. [29/10]", 3951991352], - [176, 7, 1770, "Metrics/PerceivedComplexity: Perceived complexity for `extract_lines` is too high. [16/8]", 3951991352], - [226, 44, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [232, 7, 606, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trailing_lines_for` is too high. [9/7]", 518209980], - [232, 7, 606, "Metrics/MethodLength: Method has too many lines. [13/10]", 518209980], - [232, 7, 606, "Metrics/PerceivedComplexity: Perceived complexity for `trailing_lines_for` is too high. [10/8]", 518209980], - [233, 47, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [266, 33, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [271, 7, 682, "Metrics/AbcSize: Assignment Branch Condition size for `deduplicate_leading_comment_overlap` is too high. [<4, 15, 9> 17.94/17]", 4227245480], - [271, 7, 682, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `deduplicate_leading_comment_overlap` is too high. [8/7]", 4227245480], - [271, 7, 682, "Metrics/MethodLength: Method has too many lines. [11/10]", 4227245480], - [335, 23, 24, "Style/SafeNavigation: Use safe navigation (`&.`) instead of checking if an object exists before calling the method.", 1487466207], - [371, 7, 893, "Metrics/MethodLength: Method has too many lines. [11/10]", 1066420963], - [371, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 2582953496] - ], - "lib/rbs/merge/node_type_normalizer.rb:2788764230": [ - [65, 5, 10747, "Metrics/ModuleLength: Module has too many lines. [199/100]", 63560324], - [250, 9, 693, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonical_type_for_node` is too high. [9/7]", 908800634], - [250, 9, 693, "Metrics/MethodLength: Method has too many lines. [16/10]", 908800634], - [250, 9, 693, "Metrics/PerceivedComplexity: Perceived complexity for `canonical_type_for_node` is too high. [9/8]", 908800634], - [323, 9, 689, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `refine_tree_sitter_attribute_type` is too high. [9/7]", 2340352499], - [323, 9, 689, "Metrics/MethodLength: Method has too many lines. [13/10]", 2340352499], - [323, 9, 689, "Metrics/PerceivedComplexity: Perceived complexity for `refine_tree_sitter_attribute_type` is too high. [9/8]", 2340352499], - [343, 9, 475, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `refine_tree_sitter_variable_type` is too high. [8/7]", 536330497], - [343, 9, 475, "Metrics/MethodLength: Method has too many lines. [14/10]", 536330497] - ], - "lib/rbs/merge/node_wrapper.rb:1434186839": [ - [26, 5, 14933, "Metrics/ClassLength: Class has too many lines. [344/100]", 4139761414], - [37, 17, 84, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 366036293], - [264, 7, 831, "Metrics/AbcSize: Assignment Branch Condition size for `text` is too high. [<3, 32, 20> 37.85/17]", 980238327], - [264, 7, 831, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `text` is too high. [18/7]", 980238327], - [264, 7, 831, "Metrics/MethodLength: Method has too many lines. [18/10]", 980238327], - [264, 7, 831, "Metrics/PerceivedComplexity: Perceived complexity for `text` is too high. [20/8]", 980238327], - [268, 47, 2, "Lint/SafeNavigationConsistency: Use `.` instead of unnecessary `&.`.", 5858765], - [280, 22, 14, "Style/NumericPredicate: Use `start_line.positive?` instead of `start_line > 0`.", 792111162], - [301, 7, 1209, "Metrics/AbcSize: Assignment Branch Condition size for `signature` is too high. [<1, 25, 20> 32.03/17]", 4281557215], - [301, 7, 1209, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `signature` is too high. [21/7]", 4281557215], - [301, 7, 1209, "Metrics/MethodLength: Method has too many lines. [45/10]", 4281557215], - [351, 7, 384, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `method_kind` is too high. [8/7]", 563626808], - [351, 7, 384, "Metrics/PerceivedComplexity: Perceived complexity for `method_kind` is too high. [9/8]", 563626808], - [423, 7, 935, "Metrics/MethodLength: Method has too many lines. [21/10]", 3557799127], - [469, 7, 667, "Metrics/AbcSize: Assignment Branch Condition size for `extract_child_texts` is too high. [<6, 16, 8> 18.87/17]", 1979652559], - [469, 7, 667, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_child_texts` is too high. [9/7]", 1979652559], - [469, 7, 667, "Metrics/MethodLength: Method has too many lines. [12/10]", 1979652559], - [469, 7, 667, "Metrics/PerceivedComplexity: Perceived complexity for `extract_child_texts` is too high. [9/8]", 1979652559], - [487, 7, 583, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_tree_sitter_visibility_kind` is too high. [9/7]", 2002684122], - [487, 7, 583, "Metrics/MethodLength: Method has too many lines. [13/10]", 2002684122], - [487, 7, 583, "Metrics/PerceivedComplexity: Perceived complexity for `extract_tree_sitter_visibility_kind` is too high. [9/8]", 2002684122], - [532, 7, 557, "Metrics/MethodLength: Method has too many lines. [14/10]", 1753294094] - ], - "lib/rbs/merge/smart_merger.rb:4114819804": [ - [43, 5, 38956, "Metrics/ClassLength: Class has too many lines. [785/100]", 3732361716], - [85, 7, 1188, "Metrics/MethodLength: Method has too many lines. [17/10]", 2908064588], - [85, 21, 447, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 1344979847], - [181, 7, 805, "Metrics/AbcSize: Assignment Branch Condition size for `perform_merge` is too high. [<6, 15, 8> 18.03/17]", 1638854701], - [181, 7, 805, "Metrics/MethodLength: Method has too many lines. [14/10]", 1638854701], - [207, 7, 572, "Metrics/MethodLength: Method has too many lines. [15/10]", 3471574631], - [290, 7, 621, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `root_boundary_lines_for` is too high. [9/7]", 354795708], - [290, 7, 621, "Metrics/PerceivedComplexity: Perceived complexity for `root_boundary_lines_for` is too high. [9/8]", 354795708], - [291, 34, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [323, 9, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 748374760], - [326, 7, 794, "Metrics/AbcSize: Assignment Branch Condition size for `root_boundary_range` is too high. [<4, 22, 11> 24.92/17]", 2546634651], - [326, 7, 794, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `root_boundary_range` is too high. [10/7]", 2546634651], - [326, 7, 794, "Metrics/MethodLength: Method has too many lines. [19/10]", 2546634651], - [326, 7, 794, "Metrics/PerceivedComplexity: Perceived complexity for `root_boundary_range` is too high. [11/8]", 2546634651], - [365, 7, 1030, "Metrics/AbcSize: Assignment Branch Condition size for `process_match` is too high. [<1, 22, 7> 23.11/17]", 333057092], - [365, 7, 1030, "Metrics/MethodLength: Method has too many lines. [27/10]", 333057092], - [428, 7, 1830, "Metrics/AbcSize: Assignment Branch Condition size for `removed_declaration_comment_lines` is too high. [<13, 31, 25> 41.89/17]", 276966259], - [428, 7, 1830, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `removed_declaration_comment_lines` is too high. [21/7]", 276966259], - [428, 7, 1830, "Metrics/MethodLength: Method has too many lines. [38/10]", 276966259], - [428, 7, 1830, "Metrics/PerceivedComplexity: Perceived complexity for `removed_declaration_comment_lines` is too high. [24/8]", 276966259], - [476, 7, 675, "Metrics/MethodLength: Method has too many lines. [13/10]", 1415352570], - [502, 7, 2604, "Metrics/AbcSize: Assignment Branch Condition size for `reconstruct_declaration_with_merged_members` is too high. [<19, 23, 22> 37.07/17]", 1250076424], - [502, 7, 2604, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `reconstruct_declaration_with_merged_members` is too high. [17/7]", 1250076424], - [502, 7, 2604, "Metrics/MethodLength: Method has too many lines. [49/10]", 1250076424], - [502, 7, 2604, "Metrics/PerceivedComplexity: Perceived complexity for `reconstruct_declaration_with_merged_members` is too high. [17/8]", 1250076424], - [540, 20, 46, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 1375387925], - [555, 9, 210, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 3589424565], - [565, 7, 1271, "Metrics/AbcSize: Assignment Branch Condition size for `recursive_body_lines_for_declaration` is too high. [<8, 23, 9> 25.96/17]", 2123349984], - [565, 7, 1271, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `recursive_body_lines_for_declaration` is too high. [10/7]", 2123349984], - [565, 7, 1271, "Metrics/MethodLength: Method has too many lines. [18/10]", 2123349984], - [565, 7, 1271, "Metrics/PerceivedComplexity: Perceived complexity for `recursive_body_lines_for_declaration` is too high. [10/8]", 2123349984], - [565, 47, 139, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 652517575], - [591, 7, 1910, "Metrics/AbcSize: Assignment Branch Condition size for `merge_member_lines` is too high. [<4, 35, 12> 37.22/17]", 1631109354], - [591, 7, 1910, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_member_lines` is too high. [11/7]", 1631109354], - [591, 7, 1910, "Metrics/MethodLength: Method has too many lines. [42/10]", 1631109354], - [592, 9, 1837, "Metrics/BlockLength: Block has too many lines. [40/25]", 3339652106], - [638, 7, 1779, "Metrics/AbcSize: Assignment Branch Condition size for `align_member_lists` is too high. [<14, 26, 14> 32.68/17]", 3585753868], - [638, 7, 1779, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `align_member_lists` is too high. [14/7]", 3585753868], - [638, 7, 1779, "Metrics/MethodLength: Method has too many lines. [49/10]", 3585753868], - [638, 7, 1779, "Metrics/PerceivedComplexity: Perceived complexity for `align_member_lists` is too high. [15/8]", 3585753868], - [745, 7, 605, "Metrics/AbcSize: Assignment Branch Condition size for `split_top_level_return_type` is too high. [<7, 14, 10> 18.57/17]", 1731525207], - [745, 7, 605, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split_top_level_return_type` is too high. [8/7]", 1731525207], - [745, 7, 605, "Metrics/MethodLength: Method has too many lines. [17/10]", 1731525207], - [782, 7, 1684, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_statement_lines_with_leading_comments` is too high. [8/7]", 3625004207], - [782, 7, 1684, "Metrics/MethodLength: Method has too many lines. [29/10]", 3625004207], - [782, 7, 1684, "Metrics/PerceivedComplexity: Perceived complexity for `extract_statement_lines_with_leading_comments` is too high. [10/8]", 3625004207], - [869, 33, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [874, 7, 840, "Metrics/MethodLength: Method has too many lines. [15/10]", 3400690599], - [895, 39, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [982, 23, 24, "Style/SafeNavigation: Use safe navigation (`&.`) instead of checking if an object exists before calling the method.", 1487466207], - [998, 7, 1788, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_cross_source_preamble_prefixes` is too high. [<14, 21, 9> 26.8/17]", 3130187278], - [998, 7, 1788, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collapse_cross_source_preamble_prefixes` is too high. [9/7]", 3130187278], - [998, 7, 1788, "Metrics/MethodLength: Method has too many lines. [31/10]", 3130187278], - [998, 7, 1788, "Metrics/PerceivedComplexity: Perceived complexity for `collapse_cross_source_preamble_prefixes` is too high. [9/8]", 3130187278], - [1038, 7, 533, "Metrics/MethodLength: Method has too many lines. [15/10]", 4188914818] - ], - "rbs-merge.gemspec:1193079856": [ - [126, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [128, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2105564149], - [134, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949] - ], - "spec/integration/reproducible_merge_spec.rb:4124333249": [ - [9, 1, 6937, "Metrics/BlockLength: Block has too many lines. [155/25]", 1482304086], - [14, 3, 4384, "Metrics/BlockLength: Block has too many lines. [85/25]", 628655161], - [15, 5, 3507, "Metrics/BlockLength: Block has too many lines. [65/25]", 2935184196], - [56, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858910], - [62, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 50415752], - [87, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1546684737] - ], - "spec/rbs/merge/comment_behavior_matrix_spec.rb:2666227529": [ - [14, 45, 6, "Lint/UnusedBlockArgument: Unused block argument - `inline`. If it's necessary, use `_` or `_inline` as an argument name to indicate that it won't be used.", 1605470060], - [18, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 253885993], - [19, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 1702591521] - ], - "spec/rbs/merge/comment_tracker_spec.rb:1831412931": [ - [5, 1, 14574, "Metrics/BlockLength: Block has too many lines. [306/25]", 1598998757], - [8, 3, 3272, "Metrics/BlockLength: Block has too many lines. [67/25]", 935176133], - [95, 3, 1130, "Metrics/BlockLength: Block has too many lines. [28/25]", 204252301], - [143, 3, 1704, "Metrics/BlockLength: Block has too many lines. [32/25]", 1579622084], - [209, 3, 5815, "Metrics/BlockLength: Block has too many lines. [112/25]", 433112678] - ], - "spec/rbs/merge/conflict_resolver_spec.rb:999961156": [ - [8, 1, 19854, "Metrics/BlockLength: Block has too many lines. [491/25]", 3942921818], - [9, 3, 1428, "Metrics/BlockLength: Block has too many lines. [36/25]", 529294185], - [56, 3, 1199, "Metrics/BlockLength: Block has too many lines. [28/25]", 73504201], - [93, 3, 1277, "Metrics/BlockLength: Block has too many lines. [29/25]", 595351018], - [190, 3, 7078, "Metrics/BlockLength: Block has too many lines. [149/25]", 3739681265], - [296, 5, 1646, "Metrics/BlockLength: Block has too many lines. [33/25]", 3128279135], - [302, 7, 1292, "Metrics/BlockLength: Block has too many lines. [27/25]", 729602127], - [404, 3, 4548, "Metrics/BlockLength: Block has too many lines. [114/25]", 2619563374], - [420, 5, 922, "Metrics/BlockLength: Block has too many lines. [26/25]", 3893264586], - [452, 5, 960, "Metrics/BlockLength: Block has too many lines. [26/25]", 3053707146] - ], - "spec/rbs/merge/file_aligner_spec.rb:2643720547": [ - [7, 1, 21476, "Metrics/BlockLength: Block has too many lines. [555/25]", 4145069110], - [65, 3, 1123, "Metrics/BlockLength: Block has too many lines. [28/25]", 1358831340], - [188, 3, 1226, "Metrics/BlockLength: Block has too many lines. [34/25]", 1337144492], - [246, 3, 4891, "Metrics/BlockLength: Block has too many lines. [152/25]", 125990895], - [436, 3, 1943, "Metrics/BlockLength: Block has too many lines. [34/25]", 4126970167], - [483, 3, 3944, "Metrics/BlockLength: Block has too many lines. [94/25]", 2604333848], - [565, 5, 1328, "Metrics/BlockLength: Block has too many lines. [27/25]", 1994971578] - ], - "spec/rbs/merge/file_analysis_spec.rb:952231308": [ - [15, 1, 54363, "Metrics/BlockLength: Block has too many lines. [1205/25]", 2485884639], - [16, 3, 1272, "Metrics/BlockLength: Block has too many lines. [38/25]", 1778989479], - [17, 5, 1210, "Metrics/BlockLength: Block has too many lines. [37/25]", 1755177515], - [67, 3, 1152, "Metrics/BlockLength: Block has too many lines. [33/25]", 2931980952], - [68, 5, 1083, "Metrics/BlockLength: Block has too many lines. [32/25]", 3589815947], - [136, 3, 982, "Metrics/BlockLength: Block has too many lines. [30/25]", 1355840781], - [137, 5, 929, "Metrics/BlockLength: Block has too many lines. [29/25]", 3738902933], - [200, 3, 1559, "Metrics/BlockLength: Block has too many lines. [30/25]", 3203356148], - [201, 5, 1493, "Metrics/BlockLength: Block has too many lines. [29/25]", 1389049628], - [860, 3, 2525, "Metrics/BlockLength: Block has too many lines. [42/25]", 2701315631], - [861, 5, 2455, "Metrics/BlockLength: Block has too many lines. [41/25]", 1293659790], - [884, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 193270906], - [919, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 115067835], - [948, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [954, 3, 3548, "Metrics/BlockLength: Block has too many lines. [59/25]", 2573657607], - [955, 5, 3497, "Metrics/BlockLength: Block has too many lines. [58/25]", 14776664], - [982, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085251945], - [1017, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2659900392], - [1038, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2659900392], - [1091, 3, 1750, "Metrics/BlockLength: Block has too many lines. [29/25]", 460836946], - [1092, 5, 1693, "Metrics/BlockLength: Block has too many lines. [28/25]", 1601111212], - [1135, 3, 1948, "Metrics/BlockLength: Block has too many lines. [41/25]", 4061538475], - [1136, 5, 1892, "Metrics/BlockLength: Block has too many lines. [40/25]", 4081702319], - [1195, 3, 2571, "Metrics/BlockLength: Block has too many lines. [55/25]", 3959149994], - [1265, 3, 2440, "Metrics/BlockLength: Block has too many lines. [52/25]", 2164819729], - [1332, 3, 2008, "Metrics/BlockLength: Block has too many lines. [39/25]", 609327574], - [1379, 3, 1938, "Metrics/BlockLength: Block has too many lines. [38/25]", 361672068], - [1425, 3, 1995, "Metrics/BlockLength: Block has too many lines. [39/25]", 4024875480], - [1472, 3, 1992, "Metrics/BlockLength: Block has too many lines. [39/25]", 1156260241] - ], - "spec/rbs/merge/freeze_node_spec.rb:2278400615": [ - [8, 1, 13268, "Metrics/BlockLength: Block has too many lines. [327/25]", 1590692835], - [9, 3, 2116, "Metrics/BlockLength: Block has too many lines. [43/25]", 4215218715], - [98, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3784984989], - [99, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1182436848], - [331, 3, 2919, "Metrics/BlockLength: Block has too many lines. [65/25]", 1415484725] - ], - "spec/rbs/merge/merge_result_spec.rb:2449518259": [ - [8, 1, 20574, "Metrics/BlockLength: Block has too many lines. [454/25]", 736738811], - [53, 3, 1244, "Metrics/BlockLength: Block has too many lines. [31/25]", 3686452170] - ], - "spec/rbs/merge/smart_merger_removal_mode_compliance_spec.rb:3475743041": [ - [7, 1, 1860, "Metrics/BlockLength: Block has too many lines. [66/25]", 3469987127], - [8, 3, 1798, "Metrics/BlockLength: Block has too many lines. [65/25]", 778477682] - ], - "spec/rbs/merge/smart_merger_spec.rb:3451189224": [ - [14, 1, 43498, "Metrics/BlockLength: Block has too many lines. [1190/25]", 1106962], - [149, 3, 10886, "Metrics/BlockLength: Block has too many lines. [286/25]", 1693926280], - [315, 5, 985, "Metrics/BlockLength: Block has too many lines. [26/25]", 3397066157], - [351, 5, 1063, "Metrics/BlockLength: Block has too many lines. [26/25]", 2718784043], - [461, 5, 1135, "Metrics/BlockLength: Block has too many lines. [26/25]", 3797285781], - [497, 5, 1213, "Metrics/BlockLength: Block has too many lines. [26/25]", 3686078390], - [536, 3, 2766, "Metrics/BlockLength: Block has too many lines. [84/25]", 3927490181], - [649, 3, 1714, "Metrics/BlockLength: Block has too many lines. [54/25]", 386494661], - [721, 3, 5393, "Metrics/BlockLength: Block has too many lines. [138/25]", 2457897034], - [925, 3, 4479, "Metrics/BlockLength: Block has too many lines. [134/25]", 3856958364], - [926, 5, 1327, "Metrics/BlockLength: Block has too many lines. [33/25]", 4009192695], - [970, 5, 953, "Metrics/BlockLength: Block has too many lines. [29/25]", 902715698], - [1008, 5, 1147, "Metrics/BlockLength: Block has too many lines. [37/25]", 3544491851], - [1058, 5, 955, "Metrics/BlockLength: Block has too many lines. [27/25]", 2688118410], - [1096, 3, 1031, "Metrics/BlockLength: Block has too many lines. [32/25]", 663517347], - [1097, 5, 970, "Metrics/BlockLength: Block has too many lines. [31/25]", 1575476639], - [1135, 3, 882, "Metrics/BlockLength: Block has too many lines. [27/25]", 3845382500], - [1136, 5, 813, "Metrics/BlockLength: Block has too many lines. [26/25]", 1755501948], - [1171, 3, 805, "Metrics/BlockLength: Block has too many lines. [26/25]", 3413285873], - [1204, 3, 2200, "Metrics/BlockLength: Block has too many lines. [70/25]", 3541894760], - [1205, 5, 1202, "Metrics/BlockLength: Block has too many lines. [38/25]", 3971143978], - [1235, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177610], - [1251, 5, 923, "Metrics/BlockLength: Block has too many lines. [28/25]", 3867507419], - [1288, 3, 1175, "Metrics/BlockLength: Block has too many lines. [36/25]", 1587654554], - [1289, 5, 1103, "Metrics/BlockLength: Block has too many lines. [35/25]", 3885176914], - [1368, 3, 1252, "Metrics/BlockLength: Block has too many lines. [28/25]", 4206068435], - [1407, 3, 1278, "Metrics/BlockLength: Block has too many lines. [28/25]", 1372687996], - [1446, 3, 1265, "Metrics/BlockLength: Block has too many lines. [28/25]", 3208600846], - [1485, 3, 1265, "Metrics/BlockLength: Block has too many lines. [28/25]", 212464082], - [1524, 3, 1262, "Metrics/BlockLength: Block has too many lines. [28/25]", 4277366491] - ], - "spec/rbs/merge_spec.rb:3352331478": [ - [5, 1, 1389, "Metrics/BlockLength: Block has too many lines. [37/25]", 373922011], - [10, 3, 1270, "Metrics/BlockLength: Block has too many lines. [32/25]", 2567886247] - ] -} diff --git a/gems/rbs-merge/Gemfile b/gems/rbs-merge/Gemfile index f9fa511cb..9118ccc6c 100644 --- a/gems/rbs-merge/Gemfile +++ b/gems/rbs-merge/Gemfile @@ -152,6 +152,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/rbs-merge/Gemfile.lock b/gems/rbs-merge/Gemfile.lock index 1a3727264..d13c1e68e 100644 --- a/gems/rbs-merge/Gemfile.lock +++ b/gems/rbs-merge/Gemfile.lock @@ -256,6 +256,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.0) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -307,7 +323,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -357,23 +372,12 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - kettle-dev (2.3.6) + kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -537,22 +541,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -657,10 +657,10 @@ DEPENDENCIES go-merge! irb (~> 1.17) json-merge! - kettle-dev (~> 2.3, >= 2.3.6) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-dev (~> 2.3, >= 2.3.7) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -739,7 +739,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -759,11 +758,11 @@ CHECKSUMS irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) - kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.0) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -838,13 +837,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/rbs-merge/lib/rbs/merge/version.rb b/gems/rbs-merge/lib/rbs/merge/version.rb index a96a21ddc..8e09fbec5 100644 --- a/gems/rbs-merge/lib/rbs/merge/version.rb +++ b/gems/rbs-merge/lib/rbs/merge/version.rb @@ -3,7 +3,7 @@ module Rbs module Merge module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/rbs-merge/rbs-merge.gemspec b/gems/rbs-merge/rbs-merge.gemspec index 335248d33..90f0b88ab 100644 --- a/gems/rbs-merge/rbs-merge.gemspec +++ b/gems/rbs-merge/rbs-merge.gemspec @@ -9,47 +9,47 @@ Gem::Specification.new do |spec| spec.name = 'rbs-merge' spec.version = Module.new.tap { |mod| Kernel.load("#{__dir__}/lib/rbs/merge/version.rb", mod) }::Rbs::Merge::Version::VERSION - spec.authors = ['Peter H. Boling'] - spec.email = ['floss@galtzo.com'] + spec.authors = ["Peter H. Boling"] + spec.email = ["floss@galtzo.com"] spec.summary = '☯️ Structured Merge RBS analysis and merge for Ruby' spec.description = '☯️ RBS declaration, comment, freeze-block, and template merge behavior for Structured Merge.' spec.homepage = 'https://github.com/structuredmerge/structuredmerge-ruby' - spec.licenses = ['AGPL-3.0-only', 'PolyForm-Small-Business-1.0.0'] - spec.required_ruby_version = '>= 4.0.0' + spec.licenses = ["AGPL-3.0-only", "PolyForm-Small-Business-1.0.0"] + spec.required_ruby_version = ">= 4.0.0" # 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') - user_cert = "certs/#{ENV.fetch('GEM_CERT_USER', ENV['USER'])}.pem" + unless ENV.include?("SKIP_GEM_SIGNING") + user_cert = "certs/#{ENV.fetch("GEM_CERT_USER", ENV["USER"])}.pem" cert_file_path = File.join(__dir__, user_cert) - cert_chain = cert_file_path.split(',') + cert_chain = cert_file_path.split(",") cert_chain.select! { |fp| File.exist?(fp) } if cert_file_path && cert_chain.any? spec.cert_chain = cert_chain - if $PROGRAM_NAME.end_with?('gem') && ARGV[0] == 'build' - spec.signing_key = File.join(Gem.user_home, '.ssh', 'gem-private_key.pem') + if $PROGRAM_NAME.end_with?("gem") && ARGV[0] == "build" + spec.signing_key = File.join(Gem.user_home, ".ssh", "gem-private_key.pem") end end end - spec.metadata['homepage_uri'] = 'https://structuredmerge.org' - spec.metadata['source_code_uri'] = "#{spec.homepage}/tree/v#{spec.version}" - spec.metadata['changelog_uri'] = "#{spec.homepage}/blob/v#{spec.version}/CHANGELOG.md" - spec.metadata['bug_tracker_uri'] = "#{spec.homepage}/issues" - spec.metadata['documentation_uri'] = "https://www.rubydoc.info/gems/#{spec.name}/#{spec.version}" - spec.metadata['funding_uri'] = 'https://github.com/sponsors/pboling' - spec.metadata['wiki_uri'] = "#{spec.homepage}/wiki" - spec.metadata['news_uri'] = "https://www.railsbling.com/tags/#{spec.name}" - spec.metadata['discord_uri'] = 'https://discord.gg/3qme4XHNKN' - spec.metadata['rubygems_mfa_required'] = 'true' + spec.metadata["homepage_uri"] = "https://structuredmerge.org" + spec.metadata["source_code_uri"] = "#{spec.homepage}/tree/v#{spec.version}" + spec.metadata["changelog_uri"] = "#{spec.homepage}/blob/v#{spec.version}/CHANGELOG.md" + spec.metadata["bug_tracker_uri"] = "#{spec.homepage}/issues" + spec.metadata["documentation_uri"] = "https://www.rubydoc.info/gems/#{spec.name}/#{spec.version}" + spec.metadata["funding_uri"] = "https://github.com/sponsors/pboling" + spec.metadata["wiki_uri"] = "#{spec.homepage}/wiki" + spec.metadata["news_uri"] = "https://www.railsbling.com/tags/#{spec.name}" + spec.metadata["discord_uri"] = "https://discord.gg/3qme4XHNKN" + spec.metadata["rubygems_mfa_required"] = "true" enumerate_package_files = lambda do |root| - Dir.glob(File.join(root, '**', '*'), File::FNM_DOTMATCH).select do |path| - File.file?(path) && !['.', '..'].include?(File.basename(path)) + Dir.glob(File.join(root, "**", "*"), File::FNM_DOTMATCH).select do |path| + File.file?(path) && ![".", ".."].include?(File.basename(path)) end end package_metadata_files = %w[ @@ -69,17 +69,17 @@ Gem::Specification.new do |spec| *enumerate_package_files.call('exe') ] spec.rdoc_options += [ - '--title', + "--title", "#{spec.name} - #{spec.summary}", - '--main', - 'README.md', - '--exclude', - '^sig/', - '--line-numbers', - '--inline-source', - '--quiet' + "--main", + "README.md", + "--exclude", + "^sig/", + "--line-numbers", + "--inline-source", + "--quiet" ] - spec.bindir = 'exe' + spec.bindir = "exe" # Listed files are the relative paths from bindir above. spec.executables = [] @@ -89,13 +89,13 @@ Gem::Specification.new do |spec| # rbs-merge will then preserve content between those markers across template runs. # kettle-jem:unfreeze - spec.require_paths = ['lib'] + spec.require_paths = ["lib"] # Utilities spec.add_dependency 'ast-merge', "= #{spec.version}" spec.add_dependency 'rbs', '>= 3.10' spec.add_dependency 'tree_haver', "= #{spec.version}" - spec.add_dependency('version_gem', '~> 1.1', '>= 1.1.14') # ruby >= 2.2.0 + spec.add_dependency("version_gem", "~> 1.1", ">= 1.1.14") # ruby >= 2.2.0 # NOTE: It is preferable to list development dependencies in the gemspec due to increased # visibility and discoverability. @@ -111,26 +111,27 @@ Gem::Specification.new do |spec| # and preferably a modular one (see gemfiles/modular/*.gemfile). # Dev, Test, & Release Tasks - spec.add_development_dependency('kettle-dev', '~> 2.3', '>= 2.3.6') # ruby >= 4.0.0 + spec.add_development_dependency("kettle-dev", "~> 2.3", ">= 2.3.7") # ruby >= 4.0.0 # Security - spec.add_development_dependency('bundler-audit', '~> 0.9.3') # ruby >= 2.0.0 + spec.add_development_dependency("bundler-audit", "~> 0.9.3") # ruby >= 2.0.0 # Tasks - spec.add_development_dependency('rake', '~> 13.0') # ruby >= 2.2.0 + spec.add_development_dependency("rake", "~> 13.0") # ruby >= 2.2.0 # Debugging - spec.add_development_dependency('require_bench', '~> 1.0', '>= 1.0.4') # ruby >= 2.2.0 + spec.add_development_dependency("require_bench", "~> 1.0", ">= 1.0.4") # ruby >= 2.2.0 # Testing - spec.add_development_dependency('appraisal2', '~> 3.1', '>= 3.1.4') # ruby >= 1.8.7, for testing against multiple versions of dependencies - spec.add_development_dependency('kettle-test', '~> 2.0', '>= 2.0.11') # ruby >= 4.0.0 - spec.add_development_dependency('turbo_tests2', '~> 3.1', '>= 3.1.14') # ruby >= 2.4.0, default kettle-test runner + spec.add_development_dependency("appraisal2", "~> 3.1", ">= 3.1.4") # ruby >= 1.8.7, for testing against multiple versions of dependencies + spec.add_development_dependency("kettle-test", "~> 2.0", ">= 2.0.11") # ruby >= 4.0.0 + spec.add_development_dependency("turbo_tests2", "~> 3.1", ">= 3.1.14") # ruby >= 2.4.0, default kettle-test runner # Releasing - spec.add_development_dependency('ruby-progressbar', '~> 1.13') # ruby >= 0 - spec.add_development_dependency('stone_checksums', '~> 1.0', '>= 1.0.6') # ruby >= 2.2.0 + spec.add_development_dependency("ruby-progressbar", "~> 1.13") # ruby >= 0 + spec.add_development_dependency("stone_checksums", "~> 1.0", ">= 1.0.6") # ruby >= 2.2.0 # 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.4') # ruby >= 2.4 + spec.add_development_dependency("gitmoji-regex", "~> 2.0", ">= 2.0.4") # ruby >= 2.4 + end From a77873800a53a3132cad57b4c54fa9398f1df466 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 16:37:25 -0600 Subject: [PATCH 011/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/dotenv-merge/Gemfile.lock | 322 +++++++++++++++++++ gems/json-merge/.gitattributes | 2 +- gems/json-merge/.rubocop_gradual.lock | 302 ------------------ gems/json-merge/Gemfile.lock | 59 ++-- gems/json-merge/README.md | 1 - gems/json-merge/bin/yard | 2 +- gems/rbs-merge/.rubocop_gradual.lock | 402 ++++++++++++++++++++++++ gems/rbs-merge/Gemfile.lock | 372 ++-------------------- gems/rbs-merge/lib/rbs/merge/version.rb | 2 +- gems/rbs-merge/rbs-merge.gemspec | 85 +++-- 10 files changed, 824 insertions(+), 725 deletions(-) delete mode 100644 gems/json-merge/.rubocop_gradual.lock create mode 100644 gems/rbs-merge/.rubocop_gradual.lock diff --git a/gems/dotenv-merge/Gemfile.lock b/gems/dotenv-merge/Gemfile.lock index 468e5bf66..e107353b3 100644 --- a/gems/dotenv-merge/Gemfile.lock +++ b/gems/dotenv-merge/Gemfile.lock @@ -16,6 +16,246 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -53,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -381,24 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.1, >= 3.1.4) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.3, >= 2.3.7) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -407,33 +684,55 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.1, >= 3.1.14) + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -454,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -481,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -492,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -519,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -530,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -543,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -558,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/json-merge/.gitattributes b/gems/json-merge/.gitattributes index 0ac65aaa7..35a3c7359 100644 --- a/gems/json-merge/.gitattributes +++ b/gems/json-merge/.gitattributes @@ -1,5 +1,5 @@ # <> do not edit below this line -*.rb diff=smorg-ruby +*.rb diff=smorg-rb *.go diff=smorg-go *.rs diff=smorg-rs # <> diff --git a/gems/json-merge/.rubocop_gradual.lock b/gems/json-merge/.rubocop_gradual.lock deleted file mode 100644 index 66c67ae3a..000000000 --- a/gems/json-merge/.rubocop_gradual.lock +++ /dev/null @@ -1,302 +0,0 @@ -{ - ".simplecov:3644224046": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:2931360525": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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:1457364349": [ - [16, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1168797721], - [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ], - "lib/json-merge.rb:4173905501": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`json-merge.rb`) should use snake_case.", 5381] - ], - "lib/json/merge.rb:984073198": [ - [11, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Json::Merge`.", 2866359175], - [11, 3, 12377, "Metrics/ModuleLength: Module has too many lines. [362/100]", 2468008325], - [25, 5, 16, "Style/Documentation: Missing top-level documentation comment for `class Json::Merge::ParseError`.", 362242086], - [83, 5, 787, "Metrics/MethodLength: Method has too many lines. [22/10]", 2499199177], - [113, 5, 1350, "Metrics/AbcSize: Assignment Branch Condition size for `merge_json` is too high. [<5, 15, 7> 17.29/17]", 1290833963], - [113, 5, 1350, "Metrics/MethodLength: Method has too many lines. [31/10]", 1290833963], - [202, 5, 550, "Metrics/MethodLength: Method has too many lines. [13/10]", 1442850587], - [219, 5, 567, "Metrics/MethodLength: Method has too many lines. [13/10]", 4162148585], - [241, 5, 528, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_trailing_comma` is too high. [8/7]", 4057979016], - [241, 5, 528, "Metrics/MethodLength: Method has too many lines. [13/10]", 4057979016], - [260, 5, 1404, "Metrics/AbcSize: Assignment Branch Condition size for `strip_json_comments` is too high. [<21, 22, 26> 40.01/17]", 1652324937], - [260, 5, 1404, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `strip_json_comments` is too high. [16/7]", 1652324937], - [260, 5, 1404, "Metrics/MethodLength: Method has too many lines. [55/10]", 1652324937], - [260, 5, 1404, "Metrics/PerceivedComplexity: Perceived complexity for `strip_json_comments` is too high. [17/8]", 1652324937], - [334, 5, 1439, "Metrics/AbcSize: Assignment Branch Condition size for `strip_trailing_commas` is too high. [<15, 30, 30> 45/17]", 4287439644], - [334, 5, 1439, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `strip_trailing_commas` is too high. [20/7]", 4287439644], - [334, 5, 1439, "Metrics/MethodLength: Method has too many lines. [51/10]", 4287439644], - [334, 5, 1439, "Metrics/PerceivedComplexity: Perceived complexity for `strip_trailing_commas` is too high. [21/8]", 4287439644], - [337, 7, 1331, "Metrics/BlockLength: Block has too many lines. [46/25]", 1267867017], - [407, 5, 787, "Metrics/AbcSize: Assignment Branch Condition size for `advance_scanner_state` is too high. [<8, 12, 24> 28/17]", 2437181548], - [407, 5, 787, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `advance_scanner_state` is too high. [15/7]", 2437181548], - [407, 5, 787, "Metrics/MethodLength: Method has too many lines. [25/10]", 2437181548], - [407, 5, 787, "Metrics/PerceivedComplexity: Perceived complexity for `advance_scanner_state` is too high. [17/8]", 2437181548] - ], - "lib/json/merge/comment_tracker.rb:3472563198": [ - [19, 48, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] - ], - "lib/json/merge/conflict_resolver.rb:301712181": [ - [11, 5, 55081, "Metrics/ClassLength: Class has too many lines. [1053/100]", 4044265605], - [33, 7, 998, "Metrics/MethodLength: Method has too many lines. [16/10]", 2622185411], - [33, 21, 308, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [12/5]", 958959236], - [34, 121, 95, "Layout/LineLength: Line is too long. [215/120]", 3448296820], - [58, 7, 1143, "Metrics/MethodLength: Method has too many lines. [21/10]", 2302471255], - [107, 7, 4969, "Metrics/AbcSize: Assignment Branch Condition size for `merge_node_lists_to_emitter` is too high. [<29, 62, 22> 71.9/17]", 3145241362], - [107, 7, 4969, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_node_lists_to_emitter` is too high. [20/7]", 3145241362], - [107, 7, 4969, "Metrics/MethodLength: Method has too many lines. [82/10]", 3145241362], - [107, 7, 4969, "Metrics/PerceivedComplexity: Perceived complexity for `merge_node_lists_to_emitter` is too high. [22/8]", 3145241362], - [146, 9, 2759, "Metrics/BlockLength: Block has too many lines. [50/25]", 385678694], - [239, 7, 5585, "Metrics/AbcSize: Assignment Branch Condition size for `merge_matched_nodes_to_emitter` is too high. [<15, 45, 20> 51.48/17]", 3947285535], - [239, 7, 5585, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_matched_nodes_to_emitter` is too high. [17/7]", 3947285535], - [239, 7, 5585, "Metrics/MethodLength: Method has too many lines. [102/10]", 3947285535], - [239, 7, 5585, "Metrics/PerceivedComplexity: Perceived complexity for `merge_matched_nodes_to_emitter` is too high. [21/8]", 3947285535], - [277, 13, 1934, "Metrics/BlockLength: Block has too many lines. [31/25]", 884303795], - [306, 17, 181, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 898629436], - [363, 7, 895, "Metrics/MethodLength: Method has too many lines. [23/10]", 2982353847], - [392, 7, 718, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preference_for_pair` is too high. [8/7]", 3339910669], - [392, 7, 718, "Metrics/MethodLength: Method has too many lines. [12/10]", 3339910669], - [418, 7, 1636, "Metrics/MethodLength: Method has too many lines. [37/10]", 514235298], - [473, 25, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [493, 7, 5501, "Metrics/AbcSize: Assignment Branch Condition size for `emit_node` is too high. [<18, 82, 31> 89.49/17]", 1826498333], - [493, 7, 5501, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_node` is too high. [29/7]", 1826498333], - [493, 7, 5501, "Metrics/MethodLength: Method has too many lines. [109/10]", 1826498333], - [493, 7, 5501, "Metrics/PerceivedComplexity: Perceived complexity for `emit_node` is too high. [36/8]", 1826498333], - [522, 15, 1572, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 3256756034], - [554, 15, 654, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 3730688879], - [569, 17, 287, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 3369588943], - [618, 7, 1424, "Metrics/AbcSize: Assignment Branch Condition size for `emit_atomic_node` is too high. [<7, 14, 7> 17.15/17]", 776263089], - [618, 7, 1424, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_atomic_node` is too high. [8/7]", 776263089], - [618, 7, 1424, "Metrics/MethodLength: Method has too many lines. [22/10]", 776263089], - [666, 7, 242, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `recursively_merge_pair_values?` is too high. [8/7]", 3319997574], - [682, 7, 1642, "Metrics/AbcSize: Assignment Branch Condition size for `preferred_available_inline_attachment` is too high. [<14, 14, 14> 24.25/17]", 1854381957], - [682, 7, 1642, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preferred_available_inline_attachment` is too high. [13/7]", 1854381957], - [682, 7, 1642, "Metrics/MethodLength: Method has too many lines. [27/10]", 1854381957], - [682, 7, 1642, "Metrics/PerceivedComplexity: Perceived complexity for `preferred_available_inline_attachment` is too high. [14/8]", 1854381957], - [682, 48, 154, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 358586640], - [687, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 4196003793], - [719, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], - [725, 33, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [730, 7, 1761, "Metrics/AbcSize: Assignment Branch Condition size for `emit_preferred_leading_comments_for` is too high. [<4, 39, 16> 42.34/17]", 1923098835], - [730, 7, 1761, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_preferred_leading_comments_for` is too high. [16/7]", 1923098835], - [730, 7, 1761, "Metrics/MethodLength: Method has too many lines. [26/10]", 1923098835], - [730, 7, 1761, "Metrics/PerceivedComplexity: Perceived complexity for `emit_preferred_leading_comments_for` is too high. [17/8]", 1923098835], - [764, 7, 1600, "Metrics/AbcSize: Assignment Branch Condition size for `emit_leading_comments_for` is too high. [<5, 37, 10> 38.65/17]", 2686936477], - [764, 7, 1600, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_leading_comments_for` is too high. [11/7]", 2686936477], - [764, 7, 1600, "Metrics/MethodLength: Method has too many lines. [26/10]", 2686936477], - [764, 7, 1600, "Metrics/PerceivedComplexity: Perceived complexity for `emit_leading_comments_for` is too high. [11/8]", 2686936477], - [765, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [799, 7, 1573, "Metrics/AbcSize: Assignment Branch Condition size for `canonical_leading_comment_region` is too high. [<8, 28, 14> 32.31/17]", 151098026], - [799, 7, 1573, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonical_leading_comment_region` is too high. [12/7]", 151098026], - [799, 7, 1573, "Metrics/MethodLength: Method has too many lines. [29/10]", 151098026], - [799, 7, 1573, "Metrics/PerceivedComplexity: Perceived complexity for `canonical_leading_comment_region` is too high. [12/8]", 151098026], - [837, 7, 1315, "Metrics/AbcSize: Assignment Branch Condition size for `canonical_tracked_leading_comments` is too high. [<8, 21, 12> 25.48/17]", 3806475230], - [837, 7, 1315, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonical_tracked_leading_comments` is too high. [11/7]", 3806475230], - [837, 7, 1315, "Metrics/MethodLength: Method has too many lines. [21/10]", 3806475230], - [837, 7, 1315, "Metrics/PerceivedComplexity: Perceived complexity for `canonical_tracked_leading_comments` is too high. [11/8]", 3806475230], - [867, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [872, 7, 574, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `dedup_warning_context` is too high. [9/7]", 840557709], - [872, 7, 574, "Metrics/PerceivedComplexity: Perceived complexity for `dedup_warning_context` is too high. [9/8]", 840557709], - [875, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [876, 48, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [877, 48, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [917, 7, 687, "Metrics/AbcSize: Assignment Branch Condition size for `equivalent_owner?` is too high. [<0, 17, 19> 25.5/17]", 1122406222], - [917, 7, 687, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `equivalent_owner?` is too high. [15/7]", 1122406222], - [917, 7, 687, "Metrics/MethodLength: Method has too many lines. [14/10]", 1122406222], - [917, 7, 687, "Metrics/PerceivedComplexity: Perceived complexity for `equivalent_owner?` is too high. [16/8]", 1122406222], - [957, 7, 762, "Metrics/MethodLength: Method has too many lines. [13/10]", 341822255], - [976, 7, 701, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `shared_line_comment_attachment_for` is too high. [9/7]", 2431043907], - [976, 7, 701, "Metrics/MethodLength: Method has too many lines. [13/10]", 2431043907], - [976, 7, 701, "Metrics/PerceivedComplexity: Perceived complexity for `shared_line_comment_attachment_for` is too high. [9/8]", 2431043907], - [1018, 7, 617, "Metrics/AbcSize: Assignment Branch Condition size for `emit_container_trailing_lines` is too high. [<2, 17, 3> 17.38/17]", 2119480325], - [1043, 7, 723, "Metrics/AbcSize: Assignment Branch Condition size for `trailing_container_line_range` is too high. [<4, 15, 11> 19.03/17]", 3162486186], - [1043, 7, 723, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trailing_container_line_range` is too high. [10/7]", 3162486186], - [1043, 7, 723, "Metrics/MethodLength: Method has too many lines. [13/10]", 3162486186], - [1043, 7, 723, "Metrics/PerceivedComplexity: Perceived complexity for `trailing_container_line_range` is too high. [11/8]", 3162486186], - [1061, 7, 503, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_comment_and_blank_lines_in_range` is too high. [9/7]", 2774366077], - [1061, 7, 503, "Metrics/MethodLength: Method has too many lines. [11/10]", 2774366077], - [1061, 7, 503, "Metrics/PerceivedComplexity: Perceived complexity for `emit_comment_and_blank_lines_in_range` is too high. [9/8]", 2774366077], - [1108, 7, 945, "Metrics/MethodLength: Method has too many lines. [14/10]", 1167897124], - [1155, 7, 832, "Metrics/AbcSize: Assignment Branch Condition size for `removed_inline_block_comment_at` is too high. [<6, 26, 7> 27.59/17]", 890096863], - [1155, 7, 832, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `removed_inline_block_comment_at` is too high. [8/7]", 890096863], - [1155, 7, 832, "Metrics/MethodLength: Method has too many lines. [19/10]", 890096863], - [1212, 7, 1587, "Metrics/AbcSize: Assignment Branch Condition size for `emit_document_prelude` is too high. [<12, 40, 22> 47.2/17]", 1354199117], - [1212, 7, 1587, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_document_prelude` is too high. [21/7]", 1354199117], - [1212, 7, 1587, "Metrics/MethodLength: Method has too many lines. [35/10]", 1354199117], - [1212, 7, 1587, "Metrics/PerceivedComplexity: Perceived complexity for `emit_document_prelude` is too high. [22/8]", 1354199117], - [1256, 7, 1281, "Metrics/AbcSize: Assignment Branch Condition size for `emit_document_postlude` is too high. [<9, 31, 21> 38.51/17]", 1869501446], - [1256, 7, 1281, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_document_postlude` is too high. [20/7]", 1869501446], - [1256, 7, 1281, "Metrics/MethodLength: Method has too many lines. [23/10]", 1869501446], - [1256, 7, 1281, "Metrics/PerceivedComplexity: Perceived complexity for `emit_document_postlude` is too high. [20/8]", 1869501446], - [1276, 121, 104, "Layout/LineLength: Line is too long. [224/120]", 1511565389], - [1288, 9, 48, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2339197345], - [1334, 7, 1002, "Metrics/AbcSize: Assignment Branch Condition size for `build_refined_matches` is too high. [<11, 16, 8> 21/17]", 2274245926], - [1334, 7, 1002, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_refined_matches` is too high. [9/7]", 2274245926], - [1334, 7, 1002, "Metrics/MethodLength: Method has too many lines. [18/10]", 2274245926], - [1334, 7, 1002, "Metrics/PerceivedComplexity: Perceived complexity for `build_refined_matches` is too high. [9/8]", 2274245926] - ], - "lib/json/merge/emitter.rb:3208422098": [ - [16, 5, 6329, "Metrics/ClassLength: Class has too many lines. [140/100]", 1868859478], - [183, 7, 586, "Metrics/MethodLength: Method has too many lines. [14/10]", 4015595961] - ], - "lib/json/merge/file_analysis.rb:2697782814": [ - [7, 5, 8991, "Metrics/ClassLength: Class has too many lines. [236/100]", 3226543082], - [20, 7, 928, "Metrics/MethodLength: Method has too many lines. [16/10]", 2945813957], - [83, 9, 6, "Naming/MemoizedInstanceVariableName: Memoized variable `@nodes` does not match method name `statements`. Use `@statements` instead.", 2756313398], - [182, 7, 530, "Metrics/MethodLength: Method has too many lines. [12/10]", 2217856870], - [227, 7, 603, "Metrics/AbcSize: Assignment Branch Condition size for `collect_parse_errors` is too high. [<1, 17, 9> 19.26/17]", 2603010736], - [227, 7, 603, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_parse_errors` is too high. [9/7]", 2603010736], - [227, 7, 603, "Metrics/MethodLength: Method has too many lines. [11/10]", 2603010736], - [227, 7, 603, "Metrics/PerceivedComplexity: Perceived complexity for `collect_parse_errors` is too high. [9/8]", 2603010736], - [242, 7, 1373, "Metrics/AbcSize: Assignment Branch Condition size for `extract_freeze_blocks` is too high. [<16, 23, 14> 31.32/17]", 2629976180], - [242, 7, 1373, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_freeze_blocks` is too high. [12/7]", 2629976180], - [242, 7, 1373, "Metrics/MethodLength: Method has too many lines. [33/10]", 2629976180], - [242, 7, 1373, "Metrics/PerceivedComplexity: Perceived complexity for `extract_freeze_blocks` is too high. [14/8]", 2629976180], - [286, 7, 575, "Metrics/AbcSize: Assignment Branch Condition size for `integrate_nodes_and_freeze_blocks` is too high. [<8, 19, 10> 22.91/17]", 1313409663], - [286, 7, 575, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `integrate_nodes_and_freeze_blocks` is too high. [11/7]", 1313409663], - [286, 7, 575, "Metrics/MethodLength: Method has too many lines. [13/10]", 1313409663], - [286, 7, 575, "Metrics/PerceivedComplexity: Perceived complexity for `integrate_nodes_and_freeze_blocks` is too high. [11/8]", 1313409663] - ], - "lib/json/merge/freeze_node.rb:340454761": [ - [11, 21, 97, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 4181995290] - ], - "lib/json/merge/merge_result.rb:1135594830": [ - [140, 7, 421, "Metrics/MethodLength: Method has too many lines. [11/10]", 2459390040] - ], - "lib/json/merge/node_wrapper.rb:691907272": [ - [7, 5, 5378, "Metrics/ClassLength: Class has too many lines. [181/100]", 4019681646], - [71, 7, 397, "Metrics/MethodLength: Method has too many lines. [11/10]", 3404369104], - [162, 7, 1322, "Metrics/AbcSize: Assignment Branch Condition size for `compute_signature` is too high. [<10, 26, 24> 36.77/17]", 2934899487], - [162, 7, 1322, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_signature` is too high. [22/7]", 2934899487], - [162, 7, 1322, "Metrics/MethodLength: Method has too many lines. [41/10]", 2934899487], - [162, 7, 1322, "Metrics/PerceivedComplexity: Perceived complexity for `compute_signature` is too high. [18/8]", 2934899487], - [209, 7, 831, "Metrics/AbcSize: Assignment Branch Condition size for `extract_object_keys` is too high. [<8, 13, 10> 18.25/17]", 4156563372], - [209, 7, 831, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_object_keys` is too high. [10/7]", 4156563372], - [209, 7, 831, "Metrics/MethodLength: Method has too many lines. [22/10]", 4156563372], - [209, 7, 831, "Metrics/PerceivedComplexity: Perceived complexity for `extract_object_keys` is too high. [10/8]", 4156563372] - ], - "lib/json/merge/object_match_refiner.rb:337747923": [ - [29, 5, 10245, "Metrics/ClassLength: Class has too many lines. [143/100]", 1652456083], - [148, 7, 652, "Metrics/AbcSize: Assignment Branch Condition size for `compute_object_similarity` is too high. [<6, 18, 4> 19.39/17]", 1704835547], - [172, 7, 382, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_fuzzy_key_matches` is too high. [8/7]", 1938411487], - [226, 7, 709, "Metrics/MethodLength: Method has too many lines. [13/10]", 1853541937], - [277, 23, 9, "Style/NumericPredicate: Use `len1.zero?` instead of `len1 == 0`.", 913205219], - [277, 36, 9, "Style/NumericPredicate: Use `len2.zero?` instead of `len2 == 0`.", 871697920], - [278, 23, 9, "Style/NumericPredicate: Use `len1.zero?` instead of `len1 == 0`.", 913205219], - [278, 36, 9, "Style/NumericPredicate: Use `len2.zero?` instead of `len2 == 0`.", 871697920], - [305, 7, 854, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<13, 29, 8> 32.77/17]", 2946547420], - [305, 7, 854, "Metrics/MethodLength: Method has too many lines. [20/10]", 2946547420] - ], - "lib/json/merge/smart_merger.rb:1431245415": [ - [24, 5, 8706, "Metrics/ClassLength: Class has too many lines. [183/100]", 745649819], - [44, 7, 1369, "Metrics/MethodLength: Method has too many lines. [20/10]", 1509468182], - [44, 21, 472, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [15/5]", 700498762], - [117, 7, 1318, "Metrics/AbcSize: Assignment Branch Condition size for `merge_with_debug` is too high. [<3, 24, 7> 25.18/17]", 1535809936], - [117, 7, 1318, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_with_debug` is too high. [8/7]", 1535809936], - [117, 7, 1318, "Metrics/MethodLength: Method has too many lines. [30/10]", 1535809936], - [188, 7, 574, "Metrics/MethodLength: Method has too many lines. [13/10]", 1857730257], - [221, 7, 1053, "Metrics/MethodLength: Method has too many lines. [24/10]", 3329630813] - ], - "lib/json/merge/synthetic_parser.rb:3124639485": [ - [5, 5, 21, "Style/Documentation: Missing top-level documentation comment for `class Json::Merge::SyntheticParser`.", 2779770543], - [5, 5, 5193, "Metrics/ClassLength: Class has too many lines. [136/100]", 3292004474], - [12, 7, 10, "Style/Documentation: Missing top-level documentation comment for `class Json::Merge::SyntheticParser::Tree`.", 3516465773], - [20, 7, 10, "Style/Documentation: Missing top-level documentation comment for `class Json::Merge::SyntheticParser::Node`.", 3515419275], - [24, 23, 65, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1496529946], - [62, 13, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183], - [89, 7, 387, "Metrics/MethodLength: Method has too many lines. [17/10]", 3659356164], - [109, 7, 348, "Metrics/MethodLength: Method has too many lines. [11/10]", 509572752], - [124, 7, 370, "Metrics/MethodLength: Method has too many lines. [13/10]", 3743579817], - [140, 7, 356, "Metrics/MethodLength: Method has too many lines. [11/10]", 1421409352], - [155, 7, 443, "Metrics/MethodLength: Method has too many lines. [15/10]", 676344296], - [185, 7, 547, "Metrics/AbcSize: Assignment Branch Condition size for `skip_ignored` is too high. [<5, 13, 20> 24.37/17]", 2602765621], - [185, 7, 547, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `skip_ignored` is too high. [11/7]", 2602765621], - [185, 7, 547, "Metrics/MethodLength: Method has too many lines. [15/10]", 2602765621], - [185, 7, 547, "Metrics/PerceivedComplexity: Perceived complexity for `skip_ignored` is too high. [11/8]", 2602765621] - ], - "spec/fixtures_integration_spec.rb:4034888844": [ - [3, 1, 7912, "Metrics/BlockLength: Block has too many lines. [163/25]", 4258553307], - [75, 60, 25, "Style/SymbolProc: Pass `&:compact` as an argument to `map` instead of a block.", 2107480170], - [83, 59, 25, "Style/SymbolProc: Pass `&:compact` as an argument to `map` instead of a block.", 2107480170], - [148, 3, 801, "Metrics/BlockLength: Block has too many lines. [27/25]", 716259872], - [189, 12, 1, "Layout/BlockAlignment: `}` at 189, 11 is not aligned with `test_case.dig(:expected, :diagnostics).map { |diagnostic|` at 187, 25 or `).to eq(json_ready(test_case.dig(:expected, :diagnostics).map { |diagnostic|` at 187, 6.", 177624] - ], - "spec/reproducible_merge_spec.rb:133932627": [ - [5, 1, 1854, "Metrics/BlockLength: Block has too many lines. [40/25]", 671932104] - ] -} diff --git a/gems/json-merge/Gemfile.lock b/gems/json-merge/Gemfile.lock index dd85f99c5..7515c0c23 100644 --- a/gems/json-merge/Gemfile.lock +++ b/gems/json-merge/Gemfile.lock @@ -256,6 +256,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.0) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -307,7 +323,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -362,18 +377,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -537,22 +541,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -658,9 +658,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -738,7 +738,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -759,10 +758,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.0) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -837,13 +836,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/json-merge/README.md b/gems/json-merge/README.md index c3f88415a..b2f5382b8 100644 --- a/gems/json-merge/README.md +++ b/gems/json-merge/README.md @@ -534,7 +534,6 @@ If none of the available licenses suit your use case, please [contact us](mailto [🖐contrib-rocks]: https://contrib.rocks [🖐contributors]: https://github.com/structuredmerge/structuredmerge-ruby/graphs/contributors [🖐contributors-img]: https://contrib.rocks/image?repo=structuredmerge/structuredmerge-ruby -[🚎contributors-gl]: https://gitlab.com/structuredmerge/structuredmerge-ruby/-/graphs/main [🪇conduct]: https://github.com/structuredmerge/structuredmerge-ruby/blob/main/CODE_OF_CONDUCT.md [🪇conduct-img]: https://img.shields.io/badge/Contributor_Covenant-2.1-259D6C.svg [📌pvc]: http://guides.rubygems.org/patterns/#pessimistic-version-constraint diff --git a/gems/json-merge/bin/yard b/gems/json-merge/bin/yard index 5d516ad6f..a7e8b6eed 100755 --- a/gems/json-merge/bin/yard +++ b/gems/json-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec('bundle', 'exec', 'rake', 'yard') +exec("bundle", "exec", "rake", "yard") diff --git a/gems/rbs-merge/.rubocop_gradual.lock b/gems/rbs-merge/.rubocop_gradual.lock new file mode 100644 index 000000000..2be38dd67 --- /dev/null +++ b/gems/rbs-merge/.rubocop_gradual.lock @@ -0,0 +1,402 @@ +{ + ".simplecov:2483172942": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:3295679373": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/rbs-merge.rb:334311121": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`rbs-merge.rb`) should use snake_case.", 5381], + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "lib/rbs/merge.rb:3499390300": [ + [17, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Rbs::Merge`.", 2866359175], + [103, 7, 1203, "Metrics/MethodLength: Method has too many lines. [25/10]", 564456261] + ], + "lib/rbs/merge/backends/rbs_backend.rb:1875248624": [ + [48, 11, 555, "Metrics/MethodLength: Method has too many lines. [13/10]", 2078142514], + [81, 11, 658, "Metrics/MethodLength: Method has too many lines. [11/10]", 324484142], + [172, 11, 527, "Metrics/MethodLength: Method has too many lines. [14/10]", 631898529], + [240, 15, 11, "Naming/PredicatePrefix: Rename `has_errors?` to `errors?`.", 1181419252], + [263, 9, 9332, "Metrics/ClassLength: Class has too many lines. [135/100]", 1906483935], + [290, 11, 1914, "Metrics/AbcSize: Assignment Branch Condition size for `type` is too high. [<0, 9, 23> 24.7/17]", 3636991776], + [290, 11, 1914, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `type` is too high. [24/7]", 3636991776], + [290, 11, 1914, "Metrics/MethodLength: Method has too many lines. [28/10]", 3636991776], + [363, 11, 489, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `end_point` is too high. [8/7]", 844861810], + [504, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] + ], + "lib/rbs/merge/comment_tracker.rb:1938176986": [ + [28, 7, 767, "Metrics/MethodLength: Method has too many lines. [15/10]", 752916075], + [60, 7, 416, "Metrics/MethodLength: Method has too many lines. [12/10]", 2715172162] + ], + "lib/rbs/merge/conflict_resolver.rb:1305396962": [ + [16, 5, 11045, "Metrics/ClassLength: Class has too many lines. [174/100]", 330576807], + [44, 7, 1614, "Metrics/MethodLength: Method has too many lines. [23/10]", 1004723330], + [44, 45, 14, "Lint/UnusedMethodArgument: Unused method argument - `template_index`.", 1809801172], + [44, 62, 10, "Lint/UnusedMethodArgument: Unused method argument - `dest_index`.", 2703999490], + [122, 7, 717, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `resolve_preference` is too high. [8/7]", 2783267415], + [122, 7, 717, "Metrics/MethodLength: Method has too many lines. [12/10]", 2783267415], + [156, 7, 949, "Metrics/AbcSize: Assignment Branch Condition size for `extract_declaration_text` is too high. [<9, 19, 14> 25.26/17]", 4132302840], + [156, 7, 949, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_declaration_text` is too high. [13/7]", 4132302840], + [156, 7, 949, "Metrics/MethodLength: Method has too many lines. [18/10]", 4132302840], + [156, 7, 949, "Metrics/PerceivedComplexity: Perceived complexity for `extract_declaration_text` is too high. [14/8]", 4132302840], + [181, 39, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [279, 7, 565, "Metrics/MethodLength: Method has too many lines. [13/10]", 375776463], + [279, 11, 12, "Naming/PredicatePrefix: Rename `has_members?` to `members?`.", 496913372] + ], + "lib/rbs/merge/file_aligner.rb:157117932": [ + [32, 7, 128, "Lint/UselessMethodDefinition: Useless method definition detected.", 4031328363] + ], + "lib/rbs/merge/file_analysis.rb:4205990536": [ + [23, 5, 20642, "Metrics/ClassLength: Class has too many lines. [403/100]", 3271819659], + [59, 7, 1146, "Metrics/MethodLength: Method has too many lines. [20/10]", 1625645012], + [191, 7, 398, "Metrics/MethodLength: Method has too many lines. [12/10]", 4157341657], + [211, 7, 719, "Metrics/MethodLength: Method has too many lines. [13/10]", 2571132513], + [235, 7, 965, "Metrics/AbcSize: Assignment Branch Condition size for `compute_tree_sitter_signature` is too high. [<3, 5, 21> 21.79/17]", 2963702282], + [235, 7, 965, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_tree_sitter_signature` is too high. [22/7]", 2963702282], + [235, 7, 965, "Metrics/MethodLength: Method has too many lines. [26/10]", 2963702282], + [235, 7, 965, "Metrics/PerceivedComplexity: Perceived complexity for `compute_tree_sitter_signature` is too high. [16/8]", 2963702282], + [269, 7, 996, "Metrics/AbcSize: Assignment Branch Condition size for `extract_tree_sitter_node_name` is too high. [<5, 16, 10> 19.52/17]", 300940102], + [269, 7, 996, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_tree_sitter_node_name` is too high. [11/7]", 300940102], + [269, 7, 996, "Metrics/MethodLength: Method has too many lines. [24/10]", 300940102], + [269, 7, 996, "Metrics/PerceivedComplexity: Perceived complexity for `extract_tree_sitter_node_name` is too high. [11/8]", 300940102], + [320, 7, 834, "Metrics/MethodLength: Method has too many lines. [16/10]", 658496547], + [380, 7, 1612, "Metrics/AbcSize: Assignment Branch Condition size for `extract_tree_sitter_declarations` is too high. [<8, 18, 11> 22.56/17]", 1899595676], + [380, 7, 1612, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_tree_sitter_declarations` is too high. [10/7]", 1899595676], + [380, 7, 1612, "Metrics/MethodLength: Method has too many lines. [23/10]", 1899595676], + [380, 7, 1612, "Metrics/PerceivedComplexity: Perceived complexity for `extract_tree_sitter_declarations` is too high. [11/8]", 1899595676], + [449, 7, 569, "Metrics/MethodLength: Method has too many lines. [13/10]", 210550095], + [471, 7, 1133, "Metrics/AbcSize: Assignment Branch Condition size for `build_freeze_blocks` is too high. [<7, 22, 6> 23.85/17]", 4016218974], + [471, 7, 1133, "Metrics/MethodLength: Method has too many lines. [29/10]", 4016218974], + [528, 7, 486, "Metrics/MethodLength: Method has too many lines. [12/10]", 618123864], + [528, 7, 486, "Metrics/PerceivedComplexity: Perceived complexity for `node_start_line` is too high. [9/8]", 618123864], + [545, 7, 472, "Metrics/MethodLength: Method has too many lines. [12/10]", 1339916888], + [545, 7, 472, "Metrics/PerceivedComplexity: Perceived complexity for `node_end_line` is too high. [9/8]", 1339916888], + [579, 7, 1868, "Metrics/AbcSize: Assignment Branch Condition size for `compute_rbs_gem_signature` is too high. [<0, 45, 23> 50.54/17]", 2652509672], + [579, 7, 1868, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_rbs_gem_signature` is too high. [23/7]", 2652509672], + [579, 7, 1868, "Metrics/MethodLength: Method has too many lines. [43/10]", 2652509672], + [579, 7, 1868, "Metrics/PerceivedComplexity: Perceived complexity for `compute_rbs_gem_signature` is too high. [9/8]", 2652509672] + ], + "lib/rbs/merge/freeze_node.rb:2942544870": [ + [34, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 201145846], + [39, 7, 577, "Metrics/MethodLength: Method has too many lines. [11/10]", 2189574632], + [39, 21, 186, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1006469938], + [78, 7, 1506, "Metrics/AbcSize: Assignment Branch Condition size for `validate_structure!` is too high. [<12, 12, 17> 24.02/17]", 1543687562], + [78, 7, 1506, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_structure!` is too high. [12/7]", 1543687562], + [78, 7, 1506, "Metrics/MethodLength: Method has too many lines. [25/10]", 1543687562], + [78, 7, 1506, "Metrics/PerceivedComplexity: Perceived complexity for `validate_structure!` is too high. [12/8]", 1543687562], + [150, 7, 891, "Metrics/AbcSize: Assignment Branch Condition size for `extract_node_name` is too high. [<4, 21, 12> 24.52/17]", 1223188123], + [150, 7, 891, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_node_name` is too high. [13/7]", 1223188123], + [150, 7, 891, "Metrics/MethodLength: Method has too many lines. [18/10]", 1223188123], + [150, 7, 891, "Metrics/PerceivedComplexity: Perceived complexity for `extract_node_name` is too high. [13/8]", 1223188123], + [162, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861336] + ], + "lib/rbs/merge/merge_result.rb:1707720872": [ + [18, 5, 15586, "Metrics/ClassLength: Class has too many lines. [276/100]", 817348545], + [89, 7, 966, "Metrics/MethodLength: Method has too many lines. [14/10]", 3349669346], + [176, 7, 1770, "Metrics/AbcSize: Assignment Branch Condition size for `extract_lines` is too high. [<15, 21, 16> 30.36/17]", 3951991352], + [176, 7, 1770, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_lines` is too high. [15/7]", 3951991352], + [176, 7, 1770, "Metrics/MethodLength: Method has too many lines. [29/10]", 3951991352], + [176, 7, 1770, "Metrics/PerceivedComplexity: Perceived complexity for `extract_lines` is too high. [16/8]", 3951991352], + [226, 44, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [232, 7, 606, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trailing_lines_for` is too high. [9/7]", 518209980], + [232, 7, 606, "Metrics/MethodLength: Method has too many lines. [13/10]", 518209980], + [232, 7, 606, "Metrics/PerceivedComplexity: Perceived complexity for `trailing_lines_for` is too high. [10/8]", 518209980], + [233, 47, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [266, 33, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [271, 7, 682, "Metrics/AbcSize: Assignment Branch Condition size for `deduplicate_leading_comment_overlap` is too high. [<4, 15, 9> 17.94/17]", 4227245480], + [271, 7, 682, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `deduplicate_leading_comment_overlap` is too high. [8/7]", 4227245480], + [271, 7, 682, "Metrics/MethodLength: Method has too many lines. [11/10]", 4227245480], + [335, 23, 24, "Style/SafeNavigation: Use safe navigation (`&.`) instead of checking if an object exists before calling the method.", 1487466207], + [371, 7, 893, "Metrics/MethodLength: Method has too many lines. [11/10]", 1066420963], + [371, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 2582953496] + ], + "lib/rbs/merge/node_type_normalizer.rb:2788764230": [ + [65, 5, 10747, "Metrics/ModuleLength: Module has too many lines. [199/100]", 63560324], + [250, 9, 693, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonical_type_for_node` is too high. [9/7]", 908800634], + [250, 9, 693, "Metrics/MethodLength: Method has too many lines. [16/10]", 908800634], + [250, 9, 693, "Metrics/PerceivedComplexity: Perceived complexity for `canonical_type_for_node` is too high. [9/8]", 908800634], + [323, 9, 689, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `refine_tree_sitter_attribute_type` is too high. [9/7]", 2340352499], + [323, 9, 689, "Metrics/MethodLength: Method has too many lines. [13/10]", 2340352499], + [323, 9, 689, "Metrics/PerceivedComplexity: Perceived complexity for `refine_tree_sitter_attribute_type` is too high. [9/8]", 2340352499], + [343, 9, 475, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `refine_tree_sitter_variable_type` is too high. [8/7]", 536330497], + [343, 9, 475, "Metrics/MethodLength: Method has too many lines. [14/10]", 536330497] + ], + "lib/rbs/merge/node_wrapper.rb:1434186839": [ + [26, 5, 14933, "Metrics/ClassLength: Class has too many lines. [344/100]", 4139761414], + [37, 17, 84, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 366036293], + [264, 7, 831, "Metrics/AbcSize: Assignment Branch Condition size for `text` is too high. [<3, 32, 20> 37.85/17]", 980238327], + [264, 7, 831, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `text` is too high. [18/7]", 980238327], + [264, 7, 831, "Metrics/MethodLength: Method has too many lines. [18/10]", 980238327], + [264, 7, 831, "Metrics/PerceivedComplexity: Perceived complexity for `text` is too high. [20/8]", 980238327], + [268, 47, 2, "Lint/SafeNavigationConsistency: Use `.` instead of unnecessary `&.`.", 5858765], + [280, 22, 14, "Style/NumericPredicate: Use `start_line.positive?` instead of `start_line > 0`.", 792111162], + [301, 7, 1209, "Metrics/AbcSize: Assignment Branch Condition size for `signature` is too high. [<1, 25, 20> 32.03/17]", 4281557215], + [301, 7, 1209, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `signature` is too high. [21/7]", 4281557215], + [301, 7, 1209, "Metrics/MethodLength: Method has too many lines. [45/10]", 4281557215], + [351, 7, 384, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `method_kind` is too high. [8/7]", 563626808], + [351, 7, 384, "Metrics/PerceivedComplexity: Perceived complexity for `method_kind` is too high. [9/8]", 563626808], + [423, 7, 935, "Metrics/MethodLength: Method has too many lines. [21/10]", 3557799127], + [469, 7, 667, "Metrics/AbcSize: Assignment Branch Condition size for `extract_child_texts` is too high. [<6, 16, 8> 18.87/17]", 1979652559], + [469, 7, 667, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_child_texts` is too high. [9/7]", 1979652559], + [469, 7, 667, "Metrics/MethodLength: Method has too many lines. [12/10]", 1979652559], + [469, 7, 667, "Metrics/PerceivedComplexity: Perceived complexity for `extract_child_texts` is too high. [9/8]", 1979652559], + [487, 7, 583, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_tree_sitter_visibility_kind` is too high. [9/7]", 2002684122], + [487, 7, 583, "Metrics/MethodLength: Method has too many lines. [13/10]", 2002684122], + [487, 7, 583, "Metrics/PerceivedComplexity: Perceived complexity for `extract_tree_sitter_visibility_kind` is too high. [9/8]", 2002684122], + [532, 7, 557, "Metrics/MethodLength: Method has too many lines. [14/10]", 1753294094] + ], + "lib/rbs/merge/smart_merger.rb:4114819804": [ + [43, 5, 38956, "Metrics/ClassLength: Class has too many lines. [785/100]", 3732361716], + [85, 7, 1188, "Metrics/MethodLength: Method has too many lines. [17/10]", 2908064588], + [85, 21, 447, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 1344979847], + [181, 7, 805, "Metrics/AbcSize: Assignment Branch Condition size for `perform_merge` is too high. [<6, 15, 8> 18.03/17]", 1638854701], + [181, 7, 805, "Metrics/MethodLength: Method has too many lines. [14/10]", 1638854701], + [207, 7, 572, "Metrics/MethodLength: Method has too many lines. [15/10]", 3471574631], + [290, 7, 621, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `root_boundary_lines_for` is too high. [9/7]", 354795708], + [290, 7, 621, "Metrics/PerceivedComplexity: Perceived complexity for `root_boundary_lines_for` is too high. [9/8]", 354795708], + [291, 34, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [323, 9, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 748374760], + [326, 7, 794, "Metrics/AbcSize: Assignment Branch Condition size for `root_boundary_range` is too high. [<4, 22, 11> 24.92/17]", 2546634651], + [326, 7, 794, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `root_boundary_range` is too high. [10/7]", 2546634651], + [326, 7, 794, "Metrics/MethodLength: Method has too many lines. [19/10]", 2546634651], + [326, 7, 794, "Metrics/PerceivedComplexity: Perceived complexity for `root_boundary_range` is too high. [11/8]", 2546634651], + [365, 7, 1030, "Metrics/AbcSize: Assignment Branch Condition size for `process_match` is too high. [<1, 22, 7> 23.11/17]", 333057092], + [365, 7, 1030, "Metrics/MethodLength: Method has too many lines. [27/10]", 333057092], + [428, 7, 1830, "Metrics/AbcSize: Assignment Branch Condition size for `removed_declaration_comment_lines` is too high. [<13, 31, 25> 41.89/17]", 276966259], + [428, 7, 1830, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `removed_declaration_comment_lines` is too high. [21/7]", 276966259], + [428, 7, 1830, "Metrics/MethodLength: Method has too many lines. [38/10]", 276966259], + [428, 7, 1830, "Metrics/PerceivedComplexity: Perceived complexity for `removed_declaration_comment_lines` is too high. [24/8]", 276966259], + [476, 7, 675, "Metrics/MethodLength: Method has too many lines. [13/10]", 1415352570], + [502, 7, 2604, "Metrics/AbcSize: Assignment Branch Condition size for `reconstruct_declaration_with_merged_members` is too high. [<19, 23, 22> 37.07/17]", 1250076424], + [502, 7, 2604, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `reconstruct_declaration_with_merged_members` is too high. [17/7]", 1250076424], + [502, 7, 2604, "Metrics/MethodLength: Method has too many lines. [49/10]", 1250076424], + [502, 7, 2604, "Metrics/PerceivedComplexity: Perceived complexity for `reconstruct_declaration_with_merged_members` is too high. [17/8]", 1250076424], + [540, 20, 46, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 1375387925], + [555, 9, 210, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 3589424565], + [565, 7, 1271, "Metrics/AbcSize: Assignment Branch Condition size for `recursive_body_lines_for_declaration` is too high. [<8, 23, 9> 25.96/17]", 2123349984], + [565, 7, 1271, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `recursive_body_lines_for_declaration` is too high. [10/7]", 2123349984], + [565, 7, 1271, "Metrics/MethodLength: Method has too many lines. [18/10]", 2123349984], + [565, 7, 1271, "Metrics/PerceivedComplexity: Perceived complexity for `recursive_body_lines_for_declaration` is too high. [10/8]", 2123349984], + [565, 47, 139, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 652517575], + [591, 7, 1910, "Metrics/AbcSize: Assignment Branch Condition size for `merge_member_lines` is too high. [<4, 35, 12> 37.22/17]", 1631109354], + [591, 7, 1910, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_member_lines` is too high. [11/7]", 1631109354], + [591, 7, 1910, "Metrics/MethodLength: Method has too many lines. [42/10]", 1631109354], + [592, 9, 1837, "Metrics/BlockLength: Block has too many lines. [40/25]", 3339652106], + [638, 7, 1779, "Metrics/AbcSize: Assignment Branch Condition size for `align_member_lists` is too high. [<14, 26, 14> 32.68/17]", 3585753868], + [638, 7, 1779, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `align_member_lists` is too high. [14/7]", 3585753868], + [638, 7, 1779, "Metrics/MethodLength: Method has too many lines. [49/10]", 3585753868], + [638, 7, 1779, "Metrics/PerceivedComplexity: Perceived complexity for `align_member_lists` is too high. [15/8]", 3585753868], + [745, 7, 605, "Metrics/AbcSize: Assignment Branch Condition size for `split_top_level_return_type` is too high. [<7, 14, 10> 18.57/17]", 1731525207], + [745, 7, 605, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split_top_level_return_type` is too high. [8/7]", 1731525207], + [745, 7, 605, "Metrics/MethodLength: Method has too many lines. [17/10]", 1731525207], + [782, 7, 1684, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_statement_lines_with_leading_comments` is too high. [8/7]", 3625004207], + [782, 7, 1684, "Metrics/MethodLength: Method has too many lines. [29/10]", 3625004207], + [782, 7, 1684, "Metrics/PerceivedComplexity: Perceived complexity for `extract_statement_lines_with_leading_comments` is too high. [10/8]", 3625004207], + [869, 33, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [874, 7, 840, "Metrics/MethodLength: Method has too many lines. [15/10]", 3400690599], + [895, 39, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [982, 23, 24, "Style/SafeNavigation: Use safe navigation (`&.`) instead of checking if an object exists before calling the method.", 1487466207], + [998, 7, 1788, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_cross_source_preamble_prefixes` is too high. [<14, 21, 9> 26.8/17]", 3130187278], + [998, 7, 1788, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collapse_cross_source_preamble_prefixes` is too high. [9/7]", 3130187278], + [998, 7, 1788, "Metrics/MethodLength: Method has too many lines. [31/10]", 3130187278], + [998, 7, 1788, "Metrics/PerceivedComplexity: Perceived complexity for `collapse_cross_source_preamble_prefixes` is too high. [9/8]", 3130187278], + [1038, 7, 533, "Metrics/MethodLength: Method has too many lines. [15/10]", 4188914818] + ], + "rbs-merge.gemspec:395192785": [ + [126, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [128, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2105564149], + [134, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949] + ], + "spec/integration/reproducible_merge_spec.rb:4124333249": [ + [9, 1, 6937, "Metrics/BlockLength: Block has too many lines. [155/25]", 1482304086], + [14, 3, 4384, "Metrics/BlockLength: Block has too many lines. [85/25]", 628655161], + [15, 5, 3507, "Metrics/BlockLength: Block has too many lines. [65/25]", 2935184196], + [56, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858910], + [62, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 50415752], + [87, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1546684737] + ], + "spec/rbs/merge/comment_behavior_matrix_spec.rb:2666227529": [ + [14, 45, 6, "Lint/UnusedBlockArgument: Unused block argument - `inline`. If it's necessary, use `_` or `_inline` as an argument name to indicate that it won't be used.", 1605470060], + [18, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 253885993], + [19, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 1702591521] + ], + "spec/rbs/merge/comment_tracker_spec.rb:1831412931": [ + [5, 1, 14574, "Metrics/BlockLength: Block has too many lines. [306/25]", 1598998757], + [8, 3, 3272, "Metrics/BlockLength: Block has too many lines. [67/25]", 935176133], + [95, 3, 1130, "Metrics/BlockLength: Block has too many lines. [28/25]", 204252301], + [143, 3, 1704, "Metrics/BlockLength: Block has too many lines. [32/25]", 1579622084], + [209, 3, 5815, "Metrics/BlockLength: Block has too many lines. [112/25]", 433112678] + ], + "spec/rbs/merge/conflict_resolver_spec.rb:999961156": [ + [8, 1, 19854, "Metrics/BlockLength: Block has too many lines. [491/25]", 3942921818], + [9, 3, 1428, "Metrics/BlockLength: Block has too many lines. [36/25]", 529294185], + [56, 3, 1199, "Metrics/BlockLength: Block has too many lines. [28/25]", 73504201], + [93, 3, 1277, "Metrics/BlockLength: Block has too many lines. [29/25]", 595351018], + [190, 3, 7078, "Metrics/BlockLength: Block has too many lines. [149/25]", 3739681265], + [296, 5, 1646, "Metrics/BlockLength: Block has too many lines. [33/25]", 3128279135], + [302, 7, 1292, "Metrics/BlockLength: Block has too many lines. [27/25]", 729602127], + [404, 3, 4548, "Metrics/BlockLength: Block has too many lines. [114/25]", 2619563374], + [420, 5, 922, "Metrics/BlockLength: Block has too many lines. [26/25]", 3893264586], + [452, 5, 960, "Metrics/BlockLength: Block has too many lines. [26/25]", 3053707146] + ], + "spec/rbs/merge/file_aligner_spec.rb:2643720547": [ + [7, 1, 21476, "Metrics/BlockLength: Block has too many lines. [555/25]", 4145069110], + [65, 3, 1123, "Metrics/BlockLength: Block has too many lines. [28/25]", 1358831340], + [188, 3, 1226, "Metrics/BlockLength: Block has too many lines. [34/25]", 1337144492], + [246, 3, 4891, "Metrics/BlockLength: Block has too many lines. [152/25]", 125990895], + [436, 3, 1943, "Metrics/BlockLength: Block has too many lines. [34/25]", 4126970167], + [483, 3, 3944, "Metrics/BlockLength: Block has too many lines. [94/25]", 2604333848], + [565, 5, 1328, "Metrics/BlockLength: Block has too many lines. [27/25]", 1994971578] + ], + "spec/rbs/merge/file_analysis_spec.rb:952231308": [ + [15, 1, 54363, "Metrics/BlockLength: Block has too many lines. [1205/25]", 2485884639], + [16, 3, 1272, "Metrics/BlockLength: Block has too many lines. [38/25]", 1778989479], + [17, 5, 1210, "Metrics/BlockLength: Block has too many lines. [37/25]", 1755177515], + [67, 3, 1152, "Metrics/BlockLength: Block has too many lines. [33/25]", 2931980952], + [68, 5, 1083, "Metrics/BlockLength: Block has too many lines. [32/25]", 3589815947], + [136, 3, 982, "Metrics/BlockLength: Block has too many lines. [30/25]", 1355840781], + [137, 5, 929, "Metrics/BlockLength: Block has too many lines. [29/25]", 3738902933], + [200, 3, 1559, "Metrics/BlockLength: Block has too many lines. [30/25]", 3203356148], + [201, 5, 1493, "Metrics/BlockLength: Block has too many lines. [29/25]", 1389049628], + [860, 3, 2525, "Metrics/BlockLength: Block has too many lines. [42/25]", 2701315631], + [861, 5, 2455, "Metrics/BlockLength: Block has too many lines. [41/25]", 1293659790], + [884, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 193270906], + [919, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 115067835], + [948, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [954, 3, 3548, "Metrics/BlockLength: Block has too many lines. [59/25]", 2573657607], + [955, 5, 3497, "Metrics/BlockLength: Block has too many lines. [58/25]", 14776664], + [982, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085251945], + [1017, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2659900392], + [1038, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2659900392], + [1091, 3, 1750, "Metrics/BlockLength: Block has too many lines. [29/25]", 460836946], + [1092, 5, 1693, "Metrics/BlockLength: Block has too many lines. [28/25]", 1601111212], + [1135, 3, 1948, "Metrics/BlockLength: Block has too many lines. [41/25]", 4061538475], + [1136, 5, 1892, "Metrics/BlockLength: Block has too many lines. [40/25]", 4081702319], + [1195, 3, 2571, "Metrics/BlockLength: Block has too many lines. [55/25]", 3959149994], + [1265, 3, 2440, "Metrics/BlockLength: Block has too many lines. [52/25]", 2164819729], + [1332, 3, 2008, "Metrics/BlockLength: Block has too many lines. [39/25]", 609327574], + [1379, 3, 1938, "Metrics/BlockLength: Block has too many lines. [38/25]", 361672068], + [1425, 3, 1995, "Metrics/BlockLength: Block has too many lines. [39/25]", 4024875480], + [1472, 3, 1992, "Metrics/BlockLength: Block has too many lines. [39/25]", 1156260241] + ], + "spec/rbs/merge/freeze_node_spec.rb:2278400615": [ + [8, 1, 13268, "Metrics/BlockLength: Block has too many lines. [327/25]", 1590692835], + [9, 3, 2116, "Metrics/BlockLength: Block has too many lines. [43/25]", 4215218715], + [98, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3784984989], + [99, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1182436848], + [331, 3, 2919, "Metrics/BlockLength: Block has too many lines. [65/25]", 1415484725] + ], + "spec/rbs/merge/merge_result_spec.rb:2449518259": [ + [8, 1, 20574, "Metrics/BlockLength: Block has too many lines. [454/25]", 736738811], + [53, 3, 1244, "Metrics/BlockLength: Block has too many lines. [31/25]", 3686452170] + ], + "spec/rbs/merge/smart_merger_removal_mode_compliance_spec.rb:3475743041": [ + [7, 1, 1860, "Metrics/BlockLength: Block has too many lines. [66/25]", 3469987127], + [8, 3, 1798, "Metrics/BlockLength: Block has too many lines. [65/25]", 778477682] + ], + "spec/rbs/merge/smart_merger_spec.rb:3451189224": [ + [14, 1, 43498, "Metrics/BlockLength: Block has too many lines. [1190/25]", 1106962], + [149, 3, 10886, "Metrics/BlockLength: Block has too many lines. [286/25]", 1693926280], + [315, 5, 985, "Metrics/BlockLength: Block has too many lines. [26/25]", 3397066157], + [351, 5, 1063, "Metrics/BlockLength: Block has too many lines. [26/25]", 2718784043], + [461, 5, 1135, "Metrics/BlockLength: Block has too many lines. [26/25]", 3797285781], + [497, 5, 1213, "Metrics/BlockLength: Block has too many lines. [26/25]", 3686078390], + [536, 3, 2766, "Metrics/BlockLength: Block has too many lines. [84/25]", 3927490181], + [649, 3, 1714, "Metrics/BlockLength: Block has too many lines. [54/25]", 386494661], + [721, 3, 5393, "Metrics/BlockLength: Block has too many lines. [138/25]", 2457897034], + [925, 3, 4479, "Metrics/BlockLength: Block has too many lines. [134/25]", 3856958364], + [926, 5, 1327, "Metrics/BlockLength: Block has too many lines. [33/25]", 4009192695], + [970, 5, 953, "Metrics/BlockLength: Block has too many lines. [29/25]", 902715698], + [1008, 5, 1147, "Metrics/BlockLength: Block has too many lines. [37/25]", 3544491851], + [1058, 5, 955, "Metrics/BlockLength: Block has too many lines. [27/25]", 2688118410], + [1096, 3, 1031, "Metrics/BlockLength: Block has too many lines. [32/25]", 663517347], + [1097, 5, 970, "Metrics/BlockLength: Block has too many lines. [31/25]", 1575476639], + [1135, 3, 882, "Metrics/BlockLength: Block has too many lines. [27/25]", 3845382500], + [1136, 5, 813, "Metrics/BlockLength: Block has too many lines. [26/25]", 1755501948], + [1171, 3, 805, "Metrics/BlockLength: Block has too many lines. [26/25]", 3413285873], + [1204, 3, 2200, "Metrics/BlockLength: Block has too many lines. [70/25]", 3541894760], + [1205, 5, 1202, "Metrics/BlockLength: Block has too many lines. [38/25]", 3971143978], + [1235, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177610], + [1251, 5, 923, "Metrics/BlockLength: Block has too many lines. [28/25]", 3867507419], + [1288, 3, 1175, "Metrics/BlockLength: Block has too many lines. [36/25]", 1587654554], + [1289, 5, 1103, "Metrics/BlockLength: Block has too many lines. [35/25]", 3885176914], + [1368, 3, 1252, "Metrics/BlockLength: Block has too many lines. [28/25]", 4206068435], + [1407, 3, 1278, "Metrics/BlockLength: Block has too many lines. [28/25]", 1372687996], + [1446, 3, 1265, "Metrics/BlockLength: Block has too many lines. [28/25]", 3208600846], + [1485, 3, 1265, "Metrics/BlockLength: Block has too many lines. [28/25]", 212464082], + [1524, 3, 1262, "Metrics/BlockLength: Block has too many lines. [28/25]", 4277366491] + ], + "spec/rbs/merge_spec.rb:3352331478": [ + [5, 1, 1389, "Metrics/BlockLength: Block has too many lines. [37/25]", 373922011], + [10, 3, 1270, "Metrics/BlockLength: Block has too many lines. [32/25]", 2567886247] + ] +} diff --git a/gems/rbs-merge/Gemfile.lock b/gems/rbs-merge/Gemfile.lock index d13c1e68e..40c3d8462 100644 --- a/gems/rbs-merge/Gemfile.lock +++ b/gems/rbs-merge/Gemfile.lock @@ -17,261 +17,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.0) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -309,12 +54,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -323,6 +62,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -378,6 +118,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -396,7 +145,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -536,23 +284,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -586,11 +336,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -637,42 +382,21 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.1, >= 3.1.4) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.3, >= 2.3.7) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) rbs-merge! @@ -684,62 +408,40 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.1, >= 3.1.14) - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +454,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.0) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +481,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -830,19 +520,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,19 +544,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +559,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/rbs-merge/lib/rbs/merge/version.rb b/gems/rbs-merge/lib/rbs/merge/version.rb index 8e09fbec5..a96a21ddc 100644 --- a/gems/rbs-merge/lib/rbs/merge/version.rb +++ b/gems/rbs-merge/lib/rbs/merge/version.rb @@ -3,7 +3,7 @@ module Rbs module Merge module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/rbs-merge/rbs-merge.gemspec b/gems/rbs-merge/rbs-merge.gemspec index 90f0b88ab..0f7a1c47f 100644 --- a/gems/rbs-merge/rbs-merge.gemspec +++ b/gems/rbs-merge/rbs-merge.gemspec @@ -9,47 +9,47 @@ Gem::Specification.new do |spec| spec.name = 'rbs-merge' spec.version = Module.new.tap { |mod| Kernel.load("#{__dir__}/lib/rbs/merge/version.rb", mod) }::Rbs::Merge::Version::VERSION - spec.authors = ["Peter H. Boling"] - spec.email = ["floss@galtzo.com"] + spec.authors = ['Peter H. Boling'] + spec.email = ['floss@galtzo.com'] spec.summary = '☯️ Structured Merge RBS analysis and merge for Ruby' spec.description = '☯️ RBS declaration, comment, freeze-block, and template merge behavior for Structured Merge.' spec.homepage = 'https://github.com/structuredmerge/structuredmerge-ruby' - spec.licenses = ["AGPL-3.0-only", "PolyForm-Small-Business-1.0.0"] - spec.required_ruby_version = ">= 4.0.0" + spec.licenses = ['AGPL-3.0-only', 'PolyForm-Small-Business-1.0.0'] + spec.required_ruby_version = '>= 4.0.0' # 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") - user_cert = "certs/#{ENV.fetch("GEM_CERT_USER", ENV["USER"])}.pem" + unless ENV.include?('SKIP_GEM_SIGNING') + user_cert = "certs/#{ENV.fetch('GEM_CERT_USER', ENV['USER'])}.pem" cert_file_path = File.join(__dir__, user_cert) - cert_chain = cert_file_path.split(",") + cert_chain = cert_file_path.split(',') cert_chain.select! { |fp| File.exist?(fp) } if cert_file_path && cert_chain.any? spec.cert_chain = cert_chain - if $PROGRAM_NAME.end_with?("gem") && ARGV[0] == "build" - spec.signing_key = File.join(Gem.user_home, ".ssh", "gem-private_key.pem") + if $PROGRAM_NAME.end_with?('gem') && ARGV[0] == 'build' + spec.signing_key = File.join(Gem.user_home, '.ssh', 'gem-private_key.pem') end end end - spec.metadata["homepage_uri"] = "https://structuredmerge.org" - spec.metadata["source_code_uri"] = "#{spec.homepage}/tree/v#{spec.version}" - spec.metadata["changelog_uri"] = "#{spec.homepage}/blob/v#{spec.version}/CHANGELOG.md" - spec.metadata["bug_tracker_uri"] = "#{spec.homepage}/issues" - spec.metadata["documentation_uri"] = "https://www.rubydoc.info/gems/#{spec.name}/#{spec.version}" - spec.metadata["funding_uri"] = "https://github.com/sponsors/pboling" - spec.metadata["wiki_uri"] = "#{spec.homepage}/wiki" - spec.metadata["news_uri"] = "https://www.railsbling.com/tags/#{spec.name}" - spec.metadata["discord_uri"] = "https://discord.gg/3qme4XHNKN" - spec.metadata["rubygems_mfa_required"] = "true" + spec.metadata['homepage_uri'] = 'https://structuredmerge.org' + spec.metadata['source_code_uri'] = "#{spec.homepage}/tree/v#{spec.version}" + spec.metadata['changelog_uri'] = "#{spec.homepage}/blob/v#{spec.version}/CHANGELOG.md" + spec.metadata['bug_tracker_uri'] = "#{spec.homepage}/issues" + spec.metadata['documentation_uri'] = "https://www.rubydoc.info/gems/#{spec.name}/#{spec.version}" + spec.metadata['funding_uri'] = 'https://github.com/sponsors/pboling' + spec.metadata['wiki_uri'] = "#{spec.homepage}/wiki" + spec.metadata['news_uri'] = "https://www.railsbling.com/tags/#{spec.name}" + spec.metadata['discord_uri'] = 'https://discord.gg/3qme4XHNKN' + spec.metadata['rubygems_mfa_required'] = 'true' enumerate_package_files = lambda do |root| - Dir.glob(File.join(root, "**", "*"), File::FNM_DOTMATCH).select do |path| - File.file?(path) && ![".", ".."].include?(File.basename(path)) + Dir.glob(File.join(root, '**', '*'), File::FNM_DOTMATCH).select do |path| + File.file?(path) && !['.', '..'].include?(File.basename(path)) end end package_metadata_files = %w[ @@ -69,17 +69,17 @@ Gem::Specification.new do |spec| *enumerate_package_files.call('exe') ] spec.rdoc_options += [ - "--title", + '--title', "#{spec.name} - #{spec.summary}", - "--main", - "README.md", - "--exclude", - "^sig/", - "--line-numbers", - "--inline-source", - "--quiet" + '--main', + 'README.md', + '--exclude', + '^sig/', + '--line-numbers', + '--inline-source', + '--quiet' ] - spec.bindir = "exe" + spec.bindir = 'exe' # Listed files are the relative paths from bindir above. spec.executables = [] @@ -89,13 +89,13 @@ Gem::Specification.new do |spec| # rbs-merge will then preserve content between those markers across template runs. # kettle-jem:unfreeze - spec.require_paths = ["lib"] + spec.require_paths = ['lib'] # Utilities spec.add_dependency 'ast-merge', "= #{spec.version}" spec.add_dependency 'rbs', '>= 3.10' spec.add_dependency 'tree_haver', "= #{spec.version}" - spec.add_dependency("version_gem", "~> 1.1", ">= 1.1.14") # ruby >= 2.2.0 + spec.add_dependency('version_gem', '~> 1.1', '>= 1.1.14') # ruby >= 2.2.0 # NOTE: It is preferable to list development dependencies in the gemspec due to increased # visibility and discoverability. @@ -111,27 +111,26 @@ Gem::Specification.new do |spec| # and preferably a modular one (see gemfiles/modular/*.gemfile). # Dev, Test, & Release Tasks - spec.add_development_dependency("kettle-dev", "~> 2.3", ">= 2.3.7") # ruby >= 4.0.0 + spec.add_development_dependency('kettle-dev', '~> 2.3', '>= 2.3.7') # ruby >= 4.0.0 # Security - spec.add_development_dependency("bundler-audit", "~> 0.9.3") # ruby >= 2.0.0 + spec.add_development_dependency('bundler-audit', '~> 0.9.3') # ruby >= 2.0.0 # Tasks - spec.add_development_dependency("rake", "~> 13.0") # ruby >= 2.2.0 + spec.add_development_dependency('rake', '~> 13.0') # ruby >= 2.2.0 # Debugging - spec.add_development_dependency("require_bench", "~> 1.0", ">= 1.0.4") # ruby >= 2.2.0 + spec.add_development_dependency('require_bench', '~> 1.0', '>= 1.0.4') # ruby >= 2.2.0 # Testing - spec.add_development_dependency("appraisal2", "~> 3.1", ">= 3.1.4") # ruby >= 1.8.7, for testing against multiple versions of dependencies - spec.add_development_dependency("kettle-test", "~> 2.0", ">= 2.0.11") # ruby >= 4.0.0 - spec.add_development_dependency("turbo_tests2", "~> 3.1", ">= 3.1.14") # ruby >= 2.4.0, default kettle-test runner + spec.add_development_dependency('appraisal2', '~> 3.1', '>= 3.1.4') # ruby >= 1.8.7, for testing against multiple versions of dependencies + spec.add_development_dependency('kettle-test', '~> 2.0', '>= 2.0.11') # ruby >= 4.0.0 + spec.add_development_dependency('turbo_tests2', '~> 3.1', '>= 3.1.14') # ruby >= 2.4.0, default kettle-test runner # Releasing - spec.add_development_dependency("ruby-progressbar", "~> 1.13") # ruby >= 0 - spec.add_development_dependency("stone_checksums", "~> 1.0", ">= 1.0.6") # ruby >= 2.2.0 + spec.add_development_dependency('ruby-progressbar', '~> 1.13') # ruby >= 0 + spec.add_development_dependency('stone_checksums', '~> 1.0', '>= 1.0.6') # ruby >= 2.2.0 # 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.4") # ruby >= 2.4 - + spec.add_development_dependency('gitmoji-regex', '~> 2.0', '>= 2.0.4') # ruby >= 2.4 end From bc724c077e74bb6f859942d666e60977a97b496d Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 16:37:33 -0600 Subject: [PATCH 012/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/dotenv-merge/Gemfile.lock | 352 +------------------- gems/json-merge/.rubocop_gradual.lock | 302 +++++++++++++++++ gems/json-merge/Gemfile | 68 ++-- gems/json-merge/Gemfile.lock | 377 ++-------------------- gems/json-merge/Rakefile | 18 +- gems/json-merge/bin/yard | 2 +- gems/json-merge/lib/json/merge/version.rb | 2 +- gems/rbs-merge/Gemfile.lock | 321 ++++++++++++++++++ gems/yaml-merge/Gemfile.lock | 352 +++++++++++++++++++- 9 files changed, 1047 insertions(+), 747 deletions(-) create mode 100644 gems/json-merge/.rubocop_gradual.lock diff --git a/gems/dotenv-merge/Gemfile.lock b/gems/dotenv-merge/Gemfile.lock index e107353b3..33f2465f3 100644 --- a/gems/dotenv-merge/Gemfile.lock +++ b/gems/dotenv-merge/Gemfile.lock @@ -16,264 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -285,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -293,12 +40,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -362,8 +103,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -392,7 +131,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -532,8 +270,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -586,11 +322,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -637,45 +373,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.1, >= 3.1.4) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.3, >= 2.3.7) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -684,55 +398,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.1, >= 3.1.14) - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -753,27 +444,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +471,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +482,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +509,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +520,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +533,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +548,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/json-merge/.rubocop_gradual.lock b/gems/json-merge/.rubocop_gradual.lock new file mode 100644 index 000000000..66c67ae3a --- /dev/null +++ b/gems/json-merge/.rubocop_gradual.lock @@ -0,0 +1,302 @@ +{ + ".simplecov:3644224046": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:2931360525": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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:1457364349": [ + [16, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1168797721], + [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ], + "lib/json-merge.rb:4173905501": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`json-merge.rb`) should use snake_case.", 5381] + ], + "lib/json/merge.rb:984073198": [ + [11, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Json::Merge`.", 2866359175], + [11, 3, 12377, "Metrics/ModuleLength: Module has too many lines. [362/100]", 2468008325], + [25, 5, 16, "Style/Documentation: Missing top-level documentation comment for `class Json::Merge::ParseError`.", 362242086], + [83, 5, 787, "Metrics/MethodLength: Method has too many lines. [22/10]", 2499199177], + [113, 5, 1350, "Metrics/AbcSize: Assignment Branch Condition size for `merge_json` is too high. [<5, 15, 7> 17.29/17]", 1290833963], + [113, 5, 1350, "Metrics/MethodLength: Method has too many lines. [31/10]", 1290833963], + [202, 5, 550, "Metrics/MethodLength: Method has too many lines. [13/10]", 1442850587], + [219, 5, 567, "Metrics/MethodLength: Method has too many lines. [13/10]", 4162148585], + [241, 5, 528, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_trailing_comma` is too high. [8/7]", 4057979016], + [241, 5, 528, "Metrics/MethodLength: Method has too many lines. [13/10]", 4057979016], + [260, 5, 1404, "Metrics/AbcSize: Assignment Branch Condition size for `strip_json_comments` is too high. [<21, 22, 26> 40.01/17]", 1652324937], + [260, 5, 1404, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `strip_json_comments` is too high. [16/7]", 1652324937], + [260, 5, 1404, "Metrics/MethodLength: Method has too many lines. [55/10]", 1652324937], + [260, 5, 1404, "Metrics/PerceivedComplexity: Perceived complexity for `strip_json_comments` is too high. [17/8]", 1652324937], + [334, 5, 1439, "Metrics/AbcSize: Assignment Branch Condition size for `strip_trailing_commas` is too high. [<15, 30, 30> 45/17]", 4287439644], + [334, 5, 1439, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `strip_trailing_commas` is too high. [20/7]", 4287439644], + [334, 5, 1439, "Metrics/MethodLength: Method has too many lines. [51/10]", 4287439644], + [334, 5, 1439, "Metrics/PerceivedComplexity: Perceived complexity for `strip_trailing_commas` is too high. [21/8]", 4287439644], + [337, 7, 1331, "Metrics/BlockLength: Block has too many lines. [46/25]", 1267867017], + [407, 5, 787, "Metrics/AbcSize: Assignment Branch Condition size for `advance_scanner_state` is too high. [<8, 12, 24> 28/17]", 2437181548], + [407, 5, 787, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `advance_scanner_state` is too high. [15/7]", 2437181548], + [407, 5, 787, "Metrics/MethodLength: Method has too many lines. [25/10]", 2437181548], + [407, 5, 787, "Metrics/PerceivedComplexity: Perceived complexity for `advance_scanner_state` is too high. [17/8]", 2437181548] + ], + "lib/json/merge/comment_tracker.rb:3472563198": [ + [19, 48, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] + ], + "lib/json/merge/conflict_resolver.rb:301712181": [ + [11, 5, 55081, "Metrics/ClassLength: Class has too many lines. [1053/100]", 4044265605], + [33, 7, 998, "Metrics/MethodLength: Method has too many lines. [16/10]", 2622185411], + [33, 21, 308, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [12/5]", 958959236], + [34, 121, 95, "Layout/LineLength: Line is too long. [215/120]", 3448296820], + [58, 7, 1143, "Metrics/MethodLength: Method has too many lines. [21/10]", 2302471255], + [107, 7, 4969, "Metrics/AbcSize: Assignment Branch Condition size for `merge_node_lists_to_emitter` is too high. [<29, 62, 22> 71.9/17]", 3145241362], + [107, 7, 4969, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_node_lists_to_emitter` is too high. [20/7]", 3145241362], + [107, 7, 4969, "Metrics/MethodLength: Method has too many lines. [82/10]", 3145241362], + [107, 7, 4969, "Metrics/PerceivedComplexity: Perceived complexity for `merge_node_lists_to_emitter` is too high. [22/8]", 3145241362], + [146, 9, 2759, "Metrics/BlockLength: Block has too many lines. [50/25]", 385678694], + [239, 7, 5585, "Metrics/AbcSize: Assignment Branch Condition size for `merge_matched_nodes_to_emitter` is too high. [<15, 45, 20> 51.48/17]", 3947285535], + [239, 7, 5585, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_matched_nodes_to_emitter` is too high. [17/7]", 3947285535], + [239, 7, 5585, "Metrics/MethodLength: Method has too many lines. [102/10]", 3947285535], + [239, 7, 5585, "Metrics/PerceivedComplexity: Perceived complexity for `merge_matched_nodes_to_emitter` is too high. [21/8]", 3947285535], + [277, 13, 1934, "Metrics/BlockLength: Block has too many lines. [31/25]", 884303795], + [306, 17, 181, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 898629436], + [363, 7, 895, "Metrics/MethodLength: Method has too many lines. [23/10]", 2982353847], + [392, 7, 718, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preference_for_pair` is too high. [8/7]", 3339910669], + [392, 7, 718, "Metrics/MethodLength: Method has too many lines. [12/10]", 3339910669], + [418, 7, 1636, "Metrics/MethodLength: Method has too many lines. [37/10]", 514235298], + [473, 25, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [493, 7, 5501, "Metrics/AbcSize: Assignment Branch Condition size for `emit_node` is too high. [<18, 82, 31> 89.49/17]", 1826498333], + [493, 7, 5501, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_node` is too high. [29/7]", 1826498333], + [493, 7, 5501, "Metrics/MethodLength: Method has too many lines. [109/10]", 1826498333], + [493, 7, 5501, "Metrics/PerceivedComplexity: Perceived complexity for `emit_node` is too high. [36/8]", 1826498333], + [522, 15, 1572, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 3256756034], + [554, 15, 654, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 3730688879], + [569, 17, 287, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 3369588943], + [618, 7, 1424, "Metrics/AbcSize: Assignment Branch Condition size for `emit_atomic_node` is too high. [<7, 14, 7> 17.15/17]", 776263089], + [618, 7, 1424, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_atomic_node` is too high. [8/7]", 776263089], + [618, 7, 1424, "Metrics/MethodLength: Method has too many lines. [22/10]", 776263089], + [666, 7, 242, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `recursively_merge_pair_values?` is too high. [8/7]", 3319997574], + [682, 7, 1642, "Metrics/AbcSize: Assignment Branch Condition size for `preferred_available_inline_attachment` is too high. [<14, 14, 14> 24.25/17]", 1854381957], + [682, 7, 1642, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preferred_available_inline_attachment` is too high. [13/7]", 1854381957], + [682, 7, 1642, "Metrics/MethodLength: Method has too many lines. [27/10]", 1854381957], + [682, 7, 1642, "Metrics/PerceivedComplexity: Perceived complexity for `preferred_available_inline_attachment` is too high. [14/8]", 1854381957], + [682, 48, 154, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 358586640], + [687, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 4196003793], + [719, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], + [725, 33, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [730, 7, 1761, "Metrics/AbcSize: Assignment Branch Condition size for `emit_preferred_leading_comments_for` is too high. [<4, 39, 16> 42.34/17]", 1923098835], + [730, 7, 1761, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_preferred_leading_comments_for` is too high. [16/7]", 1923098835], + [730, 7, 1761, "Metrics/MethodLength: Method has too many lines. [26/10]", 1923098835], + [730, 7, 1761, "Metrics/PerceivedComplexity: Perceived complexity for `emit_preferred_leading_comments_for` is too high. [17/8]", 1923098835], + [764, 7, 1600, "Metrics/AbcSize: Assignment Branch Condition size for `emit_leading_comments_for` is too high. [<5, 37, 10> 38.65/17]", 2686936477], + [764, 7, 1600, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_leading_comments_for` is too high. [11/7]", 2686936477], + [764, 7, 1600, "Metrics/MethodLength: Method has too many lines. [26/10]", 2686936477], + [764, 7, 1600, "Metrics/PerceivedComplexity: Perceived complexity for `emit_leading_comments_for` is too high. [11/8]", 2686936477], + [765, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [799, 7, 1573, "Metrics/AbcSize: Assignment Branch Condition size for `canonical_leading_comment_region` is too high. [<8, 28, 14> 32.31/17]", 151098026], + [799, 7, 1573, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonical_leading_comment_region` is too high. [12/7]", 151098026], + [799, 7, 1573, "Metrics/MethodLength: Method has too many lines. [29/10]", 151098026], + [799, 7, 1573, "Metrics/PerceivedComplexity: Perceived complexity for `canonical_leading_comment_region` is too high. [12/8]", 151098026], + [837, 7, 1315, "Metrics/AbcSize: Assignment Branch Condition size for `canonical_tracked_leading_comments` is too high. [<8, 21, 12> 25.48/17]", 3806475230], + [837, 7, 1315, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonical_tracked_leading_comments` is too high. [11/7]", 3806475230], + [837, 7, 1315, "Metrics/MethodLength: Method has too many lines. [21/10]", 3806475230], + [837, 7, 1315, "Metrics/PerceivedComplexity: Perceived complexity for `canonical_tracked_leading_comments` is too high. [11/8]", 3806475230], + [867, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [872, 7, 574, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `dedup_warning_context` is too high. [9/7]", 840557709], + [872, 7, 574, "Metrics/PerceivedComplexity: Perceived complexity for `dedup_warning_context` is too high. [9/8]", 840557709], + [875, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [876, 48, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [877, 48, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [917, 7, 687, "Metrics/AbcSize: Assignment Branch Condition size for `equivalent_owner?` is too high. [<0, 17, 19> 25.5/17]", 1122406222], + [917, 7, 687, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `equivalent_owner?` is too high. [15/7]", 1122406222], + [917, 7, 687, "Metrics/MethodLength: Method has too many lines. [14/10]", 1122406222], + [917, 7, 687, "Metrics/PerceivedComplexity: Perceived complexity for `equivalent_owner?` is too high. [16/8]", 1122406222], + [957, 7, 762, "Metrics/MethodLength: Method has too many lines. [13/10]", 341822255], + [976, 7, 701, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `shared_line_comment_attachment_for` is too high. [9/7]", 2431043907], + [976, 7, 701, "Metrics/MethodLength: Method has too many lines. [13/10]", 2431043907], + [976, 7, 701, "Metrics/PerceivedComplexity: Perceived complexity for `shared_line_comment_attachment_for` is too high. [9/8]", 2431043907], + [1018, 7, 617, "Metrics/AbcSize: Assignment Branch Condition size for `emit_container_trailing_lines` is too high. [<2, 17, 3> 17.38/17]", 2119480325], + [1043, 7, 723, "Metrics/AbcSize: Assignment Branch Condition size for `trailing_container_line_range` is too high. [<4, 15, 11> 19.03/17]", 3162486186], + [1043, 7, 723, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trailing_container_line_range` is too high. [10/7]", 3162486186], + [1043, 7, 723, "Metrics/MethodLength: Method has too many lines. [13/10]", 3162486186], + [1043, 7, 723, "Metrics/PerceivedComplexity: Perceived complexity for `trailing_container_line_range` is too high. [11/8]", 3162486186], + [1061, 7, 503, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_comment_and_blank_lines_in_range` is too high. [9/7]", 2774366077], + [1061, 7, 503, "Metrics/MethodLength: Method has too many lines. [11/10]", 2774366077], + [1061, 7, 503, "Metrics/PerceivedComplexity: Perceived complexity for `emit_comment_and_blank_lines_in_range` is too high. [9/8]", 2774366077], + [1108, 7, 945, "Metrics/MethodLength: Method has too many lines. [14/10]", 1167897124], + [1155, 7, 832, "Metrics/AbcSize: Assignment Branch Condition size for `removed_inline_block_comment_at` is too high. [<6, 26, 7> 27.59/17]", 890096863], + [1155, 7, 832, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `removed_inline_block_comment_at` is too high. [8/7]", 890096863], + [1155, 7, 832, "Metrics/MethodLength: Method has too many lines. [19/10]", 890096863], + [1212, 7, 1587, "Metrics/AbcSize: Assignment Branch Condition size for `emit_document_prelude` is too high. [<12, 40, 22> 47.2/17]", 1354199117], + [1212, 7, 1587, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_document_prelude` is too high. [21/7]", 1354199117], + [1212, 7, 1587, "Metrics/MethodLength: Method has too many lines. [35/10]", 1354199117], + [1212, 7, 1587, "Metrics/PerceivedComplexity: Perceived complexity for `emit_document_prelude` is too high. [22/8]", 1354199117], + [1256, 7, 1281, "Metrics/AbcSize: Assignment Branch Condition size for `emit_document_postlude` is too high. [<9, 31, 21> 38.51/17]", 1869501446], + [1256, 7, 1281, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_document_postlude` is too high. [20/7]", 1869501446], + [1256, 7, 1281, "Metrics/MethodLength: Method has too many lines. [23/10]", 1869501446], + [1256, 7, 1281, "Metrics/PerceivedComplexity: Perceived complexity for `emit_document_postlude` is too high. [20/8]", 1869501446], + [1276, 121, 104, "Layout/LineLength: Line is too long. [224/120]", 1511565389], + [1288, 9, 48, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2339197345], + [1334, 7, 1002, "Metrics/AbcSize: Assignment Branch Condition size for `build_refined_matches` is too high. [<11, 16, 8> 21/17]", 2274245926], + [1334, 7, 1002, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_refined_matches` is too high. [9/7]", 2274245926], + [1334, 7, 1002, "Metrics/MethodLength: Method has too many lines. [18/10]", 2274245926], + [1334, 7, 1002, "Metrics/PerceivedComplexity: Perceived complexity for `build_refined_matches` is too high. [9/8]", 2274245926] + ], + "lib/json/merge/emitter.rb:3208422098": [ + [16, 5, 6329, "Metrics/ClassLength: Class has too many lines. [140/100]", 1868859478], + [183, 7, 586, "Metrics/MethodLength: Method has too many lines. [14/10]", 4015595961] + ], + "lib/json/merge/file_analysis.rb:2697782814": [ + [7, 5, 8991, "Metrics/ClassLength: Class has too many lines. [236/100]", 3226543082], + [20, 7, 928, "Metrics/MethodLength: Method has too many lines. [16/10]", 2945813957], + [83, 9, 6, "Naming/MemoizedInstanceVariableName: Memoized variable `@nodes` does not match method name `statements`. Use `@statements` instead.", 2756313398], + [182, 7, 530, "Metrics/MethodLength: Method has too many lines. [12/10]", 2217856870], + [227, 7, 603, "Metrics/AbcSize: Assignment Branch Condition size for `collect_parse_errors` is too high. [<1, 17, 9> 19.26/17]", 2603010736], + [227, 7, 603, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_parse_errors` is too high. [9/7]", 2603010736], + [227, 7, 603, "Metrics/MethodLength: Method has too many lines. [11/10]", 2603010736], + [227, 7, 603, "Metrics/PerceivedComplexity: Perceived complexity for `collect_parse_errors` is too high. [9/8]", 2603010736], + [242, 7, 1373, "Metrics/AbcSize: Assignment Branch Condition size for `extract_freeze_blocks` is too high. [<16, 23, 14> 31.32/17]", 2629976180], + [242, 7, 1373, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_freeze_blocks` is too high. [12/7]", 2629976180], + [242, 7, 1373, "Metrics/MethodLength: Method has too many lines. [33/10]", 2629976180], + [242, 7, 1373, "Metrics/PerceivedComplexity: Perceived complexity for `extract_freeze_blocks` is too high. [14/8]", 2629976180], + [286, 7, 575, "Metrics/AbcSize: Assignment Branch Condition size for `integrate_nodes_and_freeze_blocks` is too high. [<8, 19, 10> 22.91/17]", 1313409663], + [286, 7, 575, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `integrate_nodes_and_freeze_blocks` is too high. [11/7]", 1313409663], + [286, 7, 575, "Metrics/MethodLength: Method has too many lines. [13/10]", 1313409663], + [286, 7, 575, "Metrics/PerceivedComplexity: Perceived complexity for `integrate_nodes_and_freeze_blocks` is too high. [11/8]", 1313409663] + ], + "lib/json/merge/freeze_node.rb:340454761": [ + [11, 21, 97, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 4181995290] + ], + "lib/json/merge/merge_result.rb:1135594830": [ + [140, 7, 421, "Metrics/MethodLength: Method has too many lines. [11/10]", 2459390040] + ], + "lib/json/merge/node_wrapper.rb:691907272": [ + [7, 5, 5378, "Metrics/ClassLength: Class has too many lines. [181/100]", 4019681646], + [71, 7, 397, "Metrics/MethodLength: Method has too many lines. [11/10]", 3404369104], + [162, 7, 1322, "Metrics/AbcSize: Assignment Branch Condition size for `compute_signature` is too high. [<10, 26, 24> 36.77/17]", 2934899487], + [162, 7, 1322, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_signature` is too high. [22/7]", 2934899487], + [162, 7, 1322, "Metrics/MethodLength: Method has too many lines. [41/10]", 2934899487], + [162, 7, 1322, "Metrics/PerceivedComplexity: Perceived complexity for `compute_signature` is too high. [18/8]", 2934899487], + [209, 7, 831, "Metrics/AbcSize: Assignment Branch Condition size for `extract_object_keys` is too high. [<8, 13, 10> 18.25/17]", 4156563372], + [209, 7, 831, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_object_keys` is too high. [10/7]", 4156563372], + [209, 7, 831, "Metrics/MethodLength: Method has too many lines. [22/10]", 4156563372], + [209, 7, 831, "Metrics/PerceivedComplexity: Perceived complexity for `extract_object_keys` is too high. [10/8]", 4156563372] + ], + "lib/json/merge/object_match_refiner.rb:337747923": [ + [29, 5, 10245, "Metrics/ClassLength: Class has too many lines. [143/100]", 1652456083], + [148, 7, 652, "Metrics/AbcSize: Assignment Branch Condition size for `compute_object_similarity` is too high. [<6, 18, 4> 19.39/17]", 1704835547], + [172, 7, 382, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_fuzzy_key_matches` is too high. [8/7]", 1938411487], + [226, 7, 709, "Metrics/MethodLength: Method has too many lines. [13/10]", 1853541937], + [277, 23, 9, "Style/NumericPredicate: Use `len1.zero?` instead of `len1 == 0`.", 913205219], + [277, 36, 9, "Style/NumericPredicate: Use `len2.zero?` instead of `len2 == 0`.", 871697920], + [278, 23, 9, "Style/NumericPredicate: Use `len1.zero?` instead of `len1 == 0`.", 913205219], + [278, 36, 9, "Style/NumericPredicate: Use `len2.zero?` instead of `len2 == 0`.", 871697920], + [305, 7, 854, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<13, 29, 8> 32.77/17]", 2946547420], + [305, 7, 854, "Metrics/MethodLength: Method has too many lines. [20/10]", 2946547420] + ], + "lib/json/merge/smart_merger.rb:1431245415": [ + [24, 5, 8706, "Metrics/ClassLength: Class has too many lines. [183/100]", 745649819], + [44, 7, 1369, "Metrics/MethodLength: Method has too many lines. [20/10]", 1509468182], + [44, 21, 472, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [15/5]", 700498762], + [117, 7, 1318, "Metrics/AbcSize: Assignment Branch Condition size for `merge_with_debug` is too high. [<3, 24, 7> 25.18/17]", 1535809936], + [117, 7, 1318, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_with_debug` is too high. [8/7]", 1535809936], + [117, 7, 1318, "Metrics/MethodLength: Method has too many lines. [30/10]", 1535809936], + [188, 7, 574, "Metrics/MethodLength: Method has too many lines. [13/10]", 1857730257], + [221, 7, 1053, "Metrics/MethodLength: Method has too many lines. [24/10]", 3329630813] + ], + "lib/json/merge/synthetic_parser.rb:3124639485": [ + [5, 5, 21, "Style/Documentation: Missing top-level documentation comment for `class Json::Merge::SyntheticParser`.", 2779770543], + [5, 5, 5193, "Metrics/ClassLength: Class has too many lines. [136/100]", 3292004474], + [12, 7, 10, "Style/Documentation: Missing top-level documentation comment for `class Json::Merge::SyntheticParser::Tree`.", 3516465773], + [20, 7, 10, "Style/Documentation: Missing top-level documentation comment for `class Json::Merge::SyntheticParser::Node`.", 3515419275], + [24, 23, 65, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1496529946], + [62, 13, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183], + [89, 7, 387, "Metrics/MethodLength: Method has too many lines. [17/10]", 3659356164], + [109, 7, 348, "Metrics/MethodLength: Method has too many lines. [11/10]", 509572752], + [124, 7, 370, "Metrics/MethodLength: Method has too many lines. [13/10]", 3743579817], + [140, 7, 356, "Metrics/MethodLength: Method has too many lines. [11/10]", 1421409352], + [155, 7, 443, "Metrics/MethodLength: Method has too many lines. [15/10]", 676344296], + [185, 7, 547, "Metrics/AbcSize: Assignment Branch Condition size for `skip_ignored` is too high. [<5, 13, 20> 24.37/17]", 2602765621], + [185, 7, 547, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `skip_ignored` is too high. [11/7]", 2602765621], + [185, 7, 547, "Metrics/MethodLength: Method has too many lines. [15/10]", 2602765621], + [185, 7, 547, "Metrics/PerceivedComplexity: Perceived complexity for `skip_ignored` is too high. [11/8]", 2602765621] + ], + "spec/fixtures_integration_spec.rb:4034888844": [ + [3, 1, 7912, "Metrics/BlockLength: Block has too many lines. [163/25]", 4258553307], + [75, 60, 25, "Style/SymbolProc: Pass `&:compact` as an argument to `map` instead of a block.", 2107480170], + [83, 59, 25, "Style/SymbolProc: Pass `&:compact` as an argument to `map` instead of a block.", 2107480170], + [148, 3, 801, "Metrics/BlockLength: Block has too many lines. [27/25]", 716259872], + [189, 12, 1, "Layout/BlockAlignment: `}` at 189, 11 is not aligned with `test_case.dig(:expected, :diagnostics).map { |diagnostic|` at 187, 25 or `).to eq(json_ready(test_case.dig(:expected, :diagnostics).map { |diagnostic|` at 187, 6.", 177624] + ], + "spec/reproducible_merge_spec.rb:133932627": [ + [5, 1, 1854, "Metrics/BlockLength: Block has too many lines. [40/25]", 671932104] + ] +} diff --git a/gems/json-merge/Gemfile b/gems/json-merge/Gemfile index 98677f1dd..7b2bf4a74 100644 --- a/gems/json-merge/Gemfile +++ b/gems/json-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source "https://gem.coop" +source 'https://gem.coop' git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,58 +19,54 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ["~> 1.0", ">= 1.0.8"] -gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ['~> 1.0', '>= 1.0.8'] +gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ast-merge tree_haver ] -direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") +direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? if direct_sibling_gems.any? && - (direct_sibling_local || - ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) - direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") - direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) begin nomono_activation_requirements = nomono_requirements - nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) if File.file?(nomono_lockfile) nomono_locked_spec = Bundler::LockfileParser - .new(Bundler.read_file(nomono_lockfile)) - .specs - .find { |spec| spec.name == "nomono" } + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } nomono_locked = nomono_locked_spec && - Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) - if nomono_locked - nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] - end - end - Kernel.send(:gem, "nomono", *nomono_activation_requirements) - require "nomono/bundler" - if direct_sibling_templating && !direct_sibling_local - ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local eval_nomono_gems( gems: direct_sibling_gems, - prefix: "STRUCTUREDMERGE", - path_env: "STRUCTUREDMERGE_DEV", - root: ["src", "my", "structuredmerge"] + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] ) rescue LoadError - warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' ensure if direct_sibling_templating && !direct_sibling_local if direct_sibling_dev_was_set - ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original else - ENV.delete("STRUCTUREDMERGE_DEV") + ENV.delete('STRUCTUREDMERGE_DEV') end end end @@ -214,25 +210,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging -eval_gemfile "gemfiles/modular/debug.gemfile" +eval_gemfile 'gemfiles/modular/debug.gemfile' # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile "gemfiles/modular/coverage.gemfile" +eval_gemfile 'gemfiles/modular/coverage.gemfile' # Linting -eval_gemfile "gemfiles/modular/style.gemfile" +eval_gemfile 'gemfiles/modular/style.gemfile' # Documentation -eval_gemfile "gemfiles/modular/documentation.gemfile" +eval_gemfile 'gemfiles/modular/documentation.gemfile' # Optional -eval_gemfile "gemfiles/modular/optional.gemfile" +eval_gemfile 'gemfiles/modular/optional.gemfile' ### Std Lib Extracted Gems -eval_gemfile "gemfiles/modular/x_std_libs.gemfile" +eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' # See unlocked_deps appraisal for more details on irb inclusion -gem "irb", "~> 1.17" # ruby >= 2.7 +gem 'irb', '~> 1.17' # ruby >= 2.7 diff --git a/gems/json-merge/Gemfile.lock b/gems/json-merge/Gemfile.lock index 7515c0c23..7ebad3c4c 100644 --- a/gems/json-merge/Gemfile.lock +++ b/gems/json-merge/Gemfile.lock @@ -16,262 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.0) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -309,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -323,6 +61,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -372,12 +111,21 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - kettle-dev (2.3.6) + kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -396,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -536,23 +283,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -586,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -637,45 +381,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -684,61 +407,39 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -751,27 +452,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) - kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae - kettle-drift (1.0.5) - kettle-jem (7.1.0) + kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.0) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -786,14 +480,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -801,7 +491,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -829,19 +518,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -855,19 +542,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -875,7 +557,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/json-merge/Rakefile b/gems/json-merge/Rakefile index eb14b860c..cd3637459 100644 --- a/gems/json-merge/Rakefile +++ b/gems/json-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require "kettle/drift" + require 'kettle/drift' Kettle::Drift.install_tasks rescue LoadError - desc("(stub) kettle:drift:check is unavailable") - task("kettle:drift:check") do + desc('(stub) kettle:drift:check is unavailable') + task('kettle:drift:check') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:update is unavailable") - task("kettle:drift:update") do + desc('(stub) kettle:drift:update is unavailable') + task('kettle:drift:update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:force_update is unavailable") - task("kettle:drift:force_update") do + desc('(stub) kettle:drift:force_update is unavailable') + task('kettle:drift:force_update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift is unavailable") - task("kettle:drift" => "kettle:drift:update") + desc('(stub) kettle:drift is unavailable') + task('kettle:drift' => 'kettle:drift:update') end ### TEMPLATING TASKS diff --git a/gems/json-merge/bin/yard b/gems/json-merge/bin/yard index a7e8b6eed..5d516ad6f 100755 --- a/gems/json-merge/bin/yard +++ b/gems/json-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec("bundle", "exec", "rake", "yard") +exec('bundle', 'exec', 'rake', 'yard') diff --git a/gems/json-merge/lib/json/merge/version.rb b/gems/json-merge/lib/json/merge/version.rb index d02d9f1a5..13f521eb3 100644 --- a/gems/json-merge/lib/json/merge/version.rb +++ b/gems/json-merge/lib/json/merge/version.rb @@ -3,7 +3,7 @@ module Json module Merge module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/rbs-merge/Gemfile.lock b/gems/rbs-merge/Gemfile.lock index 40c3d8462..6df7155cd 100644 --- a/gems/rbs-merge/Gemfile.lock +++ b/gems/rbs-merge/Gemfile.lock @@ -17,6 +17,245 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -54,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -117,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -145,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -284,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -336,6 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -382,21 +637,42 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.1, >= 3.1.4) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.3, >= 2.3.7) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) rbs-merge! @@ -408,33 +684,55 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.1, >= 3.1.14) + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -442,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -454,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -481,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -520,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -531,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -544,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -559,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/yaml-merge/Gemfile.lock b/gems/yaml-merge/Gemfile.lock index 8377ba74b..2450635e2 100644 --- a/gems/yaml-merge/Gemfile.lock +++ b/gems/yaml-merge/Gemfile.lock @@ -16,6 +16,264 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +285,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -103,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -131,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -322,11 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -373,22 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -397,11 +684,17 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) yaml-merge! yard (~> 0.9, >= 0.9.44) @@ -410,19 +703,35 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -430,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -442,19 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -469,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -480,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -507,9 +830,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -518,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -531,10 +858,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -547,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 15e8b3ac71af34c541f5d2189705e01e32341042 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 16:37:39 -0600 Subject: [PATCH 013/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-merge/.rubocop_gradual.lock | 2827 ++++++++++++++++++++++++++ gems/ast-merge/Gemfile.lock | 387 +--- gems/json-merge/Gemfile.lock | 322 +++ 3 files changed, 3178 insertions(+), 358 deletions(-) create mode 100644 gems/ast-merge/.rubocop_gradual.lock diff --git a/gems/ast-merge/.rubocop_gradual.lock b/gems/ast-merge/.rubocop_gradual.lock new file mode 100644 index 000000000..ca390a589 --- /dev/null +++ b/gems/ast-merge/.rubocop_gradual.lock @@ -0,0 +1,2827 @@ +{ + ".simplecov:3463276878": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:429706125": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "ast-merge.gemspec:1182320030": [ + [16, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1168797721], + [129, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [144, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [145, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [152, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/ast-merge.rb:3005639624": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`ast-merge.rb`) should use snake_case.", 5381] + ], + "lib/ast/merge.rb:3429747270": [ + [11, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge`.", 2866359175], + [11, 3, 270037, "Metrics/ModuleLength: Module has too many lines. [5702/100]", 2847709439], + [22, 5, 16, "Style/Documentation: Missing top-level documentation comment for `class Ast::Merge::ParseError`.", 362242086], + [33, 7, 362, "Metrics/AbcSize: Assignment Branch Condition size for `build_message` is too high. [<2, 16, 6> 17.2/17]", 3988736327], + [47, 5, 31, "Style/Documentation: Missing top-level documentation comment for `class Ast::Merge::PlaceholderCollisionError`.", 218924302], + [161, 7, 337, "Metrics/MethodLength: Method has too many lines. [11/10]", 2388996629], + [178, 7, 327, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [8/7]", 979795121], + [309, 7, 383, "Metrics/MethodLength: Method has too many lines. [11/10]", 634650261], + [473, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 3450568485], + [474, 7, 461, "Metrics/MethodLength: Method has too many lines. [12/10]", 43929779], + [491, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1299979089], + [492, 7, 377, "Metrics/MethodLength: Method has too many lines. [11/10]", 3704151253], + [508, 121, 39, "Layout/LineLength: Line is too long. [159/120]", 85503958], + [509, 7, 447, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [8/7]", 298553749], + [509, 7, 447, "Metrics/MethodLength: Method has too many lines. [12/10]", 298553749], + [538, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1441148616], + [539, 7, 453, "Metrics/MethodLength: Method has too many lines. [14/10]", 1899007021], + [558, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193342990], + [559, 7, 400, "Metrics/MethodLength: Method has too many lines. [11/10]", 298553749], + [588, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860750], + [589, 7, 411, "Metrics/MethodLength: Method has too many lines. [12/10]", 2893925621], + [606, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3137791633], + [607, 7, 454, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [8/7]", 298553749], + [607, 7, 454, "Metrics/MethodLength: Method has too many lines. [12/10]", 298553749], + [666, 7, 385, "Metrics/MethodLength: Method has too many lines. [11/10]", 794265461], + [703, 7, 419, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [10/7]", 3313546353], + [703, 7, 419, "Metrics/PerceivedComplexity: Perceived complexity for `to_h` is too high. [10/8]", 3313546353], + [753, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 398187770], + [765, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 2746783933], + [812, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860841], + [820, 121, 156, "Layout/LineLength: Line is too long. [276/120]", 1149525480], + [825, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 2538424426], + [837, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 2285382915], + [847, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3962419360], + [860, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 398187770], + [862, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3195178507], + [866, 121, 85, "Layout/LineLength: Line is too long. [205/120]", 4238980637], + [868, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 2678411233], + [870, 121, 39, "Layout/LineLength: Line is too long. [159/120]", 4028520110], + [881, 121, 110, "Layout/LineLength: Line is too long. [230/120]", 3837814921], + [895, 5, 2283, "Metrics/MethodLength: Method has too many lines. [57/10]", 2282416447], + [955, 5, 2654, "Metrics/MethodLength: Method has too many lines. [63/10]", 2491520565], + [1006, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1823519875], + [1015, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1874311968], + [1021, 5, 10660, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_downstream_merge_gem_feature_matrix` is too high. [<0, 21, 0> 21/17]", 2277322577], + [1021, 5, 10660, "Metrics/MethodLength: Method has too many lines. [248/10]", 2277322577], + [1272, 5, 1546, "Metrics/MethodLength: Method has too many lines. [37/10]", 208933754], + [1306, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 2658452668], + [1312, 5, 4206, "Metrics/MethodLength: Method has too many lines. [96/10]", 1997530776], + [1389, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 183246985], + [1405, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 3268438356], + [1411, 5, 1598, "Metrics/MethodLength: Method has too many lines. [46/10]", 849757258], + [1454, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1323237892], + [1460, 5, 1164, "Metrics/MethodLength: Method has too many lines. [36/10]", 1477831421], + [1493, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 931876829], + [1499, 5, 1699, "Metrics/MethodLength: Method has too many lines. [43/10]", 1125544678], + [1545, 5, 1016, "Metrics/MethodLength: Method has too many lines. [27/10]", 2194427985], + [1575, 5, 1058, "Metrics/MethodLength: Method has too many lines. [30/10]", 47860722], + [1608, 5, 1186, "Metrics/MethodLength: Method has too many lines. [31/10]", 676863486], + [1636, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 2689509078], + [1642, 5, 1517, "Metrics/MethodLength: Method has too many lines. [41/10]", 3855445172], + [1655, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 817380904], + [1680, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 409671963], + [1686, 5, 2116, "Metrics/MethodLength: Method has too many lines. [61/10]", 524104794], + [1750, 5, 820, "Metrics/MethodLength: Method has too many lines. [12/10]", 1888457180], + [1750, 37, 298, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 789483382], + [1751, 121, 100, "Layout/LineLength: Line is too long. [220/120]", 3288750271], + [1766, 5, 3595, "Metrics/AbcSize: Assignment Branch Condition size for `initial_profile_promotion_policy` is too high. [<9, 20, 0> 21.93/17]", 83685787], + [1766, 5, 3595, "Metrics/MethodLength: Method has too many lines. [77/10]", 83685787], + [1846, 5, 768, "Metrics/MethodLength: Method has too many lines. [17/10]", 314059802], + [1867, 5, 1493, "Metrics/AbcSize: Assignment Branch Condition size for `evaluate_profile_selection_requirement` is too high. [<7, 23, 9> 25.67/17]", 3177555163], + [1867, 5, 1493, "Metrics/MethodLength: Method has too many lines. [29/10]", 3177555163], + [1868, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2145168012], + [1875, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 683002336], + [1909, 5, 985, "Metrics/AbcSize: Assignment Branch Condition size for `profile_promotion_blocking_reasons` is too high. [<4, 25, 13> 28.46/17]", 1146627465], + [1909, 5, 985, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `profile_promotion_blocking_reasons` is too high. [10/7]", 1146627465], + [1909, 5, 985, "Metrics/MethodLength: Method has too many lines. [18/10]", 1146627465], + [1909, 5, 985, "Metrics/PerceivedComplexity: Perceived complexity for `profile_promotion_blocking_reasons` is too high. [10/8]", 1146627465], + [1930, 5, 3173, "Metrics/AbcSize: Assignment Branch Condition size for `validate_language_backend_profile` is too high. [<25, 68, 20> 75.16/17]", 2100389324], + [1930, 5, 3173, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_language_backend_profile` is too high. [21/7]", 2100389324], + [1930, 5, 3173, "Metrics/MethodLength: Method has too many lines. [60/10]", 2100389324], + [1930, 5, 3173, "Metrics/PerceivedComplexity: Perceived complexity for `validate_language_backend_profile` is too high. [23/8]", 2100389324], + [2002, 5, 1523, "Metrics/AbcSize: Assignment Branch Condition size for `validate_backend_inventory` is too high. [<13, 38, 13> 42.21/17]", 1899037537], + [2002, 5, 1523, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_backend_inventory` is too high. [13/7]", 1899037537], + [2002, 5, 1523, "Metrics/MethodLength: Method has too many lines. [25/10]", 1899037537], + [2002, 5, 1523, "Metrics/PerceivedComplexity: Perceived complexity for `validate_backend_inventory` is too high. [13/8]", 1899037537], + [2045, 5, 906, "Metrics/MethodLength: Method has too many lines. [20/10]", 3137959843], + [2068, 5, 2744, "Metrics/AbcSize: Assignment Branch Condition size for `detect_raw_merge_inconsistencies` is too high. [<8, 43, 21> 48.52/17]", 3717440692], + [2068, 5, 2744, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_raw_merge_inconsistencies` is too high. [17/7]", 3717440692], + [2068, 5, 2744, "Metrics/MethodLength: Method has too many lines. [53/10]", 3717440692], + [2068, 5, 2744, "Metrics/PerceivedComplexity: Perceived complexity for `detect_raw_merge_inconsistencies` is too high. [17/8]", 3717440692], + [2083, 7, 1894, "Metrics/BlockLength: Block has too many lines. [33/25]", 758887611], + [2129, 5, 762, "Metrics/MethodLength: Method has too many lines. [11/10]", 3021402342], + [2143, 5, 490, "Metrics/MethodLength: Method has too many lines. [11/10]", 578473475], + [2157, 5, 881, "Metrics/AbcSize: Assignment Branch Condition size for `execute_independent_commutative_insertions` is too high. [<6, 16, 7> 18.47/17]", 259417386], + [2157, 5, 881, "Metrics/MethodLength: Method has too many lines. [21/10]", 259417386], + [2184, 5, 1107, "Metrics/AbcSize: Assignment Branch Condition size for `execute_independent_keyed_member_edits` is too high. [<10, 31, 15> 35.86/17]", 4271501385], + [2184, 5, 1107, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `execute_independent_keyed_member_edits` is too high. [14/7]", 4271501385], + [2184, 5, 1107, "Metrics/MethodLength: Method has too many lines. [24/10]", 4271501385], + [2184, 5, 1107, "Metrics/PerceivedComplexity: Perceived complexity for `execute_independent_keyed_member_edits` is too high. [14/8]", 4271501385], + [2228, 5, 3149, "Metrics/AbcSize: Assignment Branch Condition size for `parse_compact_ruleset` is too high. [<16, 68, 24> 73.86/17]", 3149098803], + [2228, 5, 3149, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_compact_ruleset` is too high. [22/7]", 3149098803], + [2228, 5, 3149, "Metrics/MethodLength: Method has too many lines. [67/10]", 3149098803], + [2228, 5, 3149, "Metrics/PerceivedComplexity: Perceived complexity for `parse_compact_ruleset` is too high. [23/8]", 3149098803], + [2234, 7, 2544, "Metrics/BlockLength: Block has too many lines. [50/25]", 2484860466], + [2261, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193420054], + [2307, 5, 2658, "Metrics/AbcSize: Assignment Branch Condition size for `compact_ruleset_feature_profile` is too high. [<11, 67, 38> 77.81/17]", 4022599673], + [2307, 5, 2658, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compact_ruleset_feature_profile` is too high. [29/7]", 4022599673], + [2307, 5, 2658, "Metrics/MethodLength: Method has too many lines. [66/10]", 4022599673], + [2307, 5, 2658, "Metrics/PerceivedComplexity: Perceived complexity for `compact_ruleset_feature_profile` is too high. [16/8]", 4022599673], + [2325, 7, 2243, "Metrics/BlockLength: Block has too many lines. [47/25]", 965041772], + [2392, 5, 2733, "Metrics/AbcSize: Assignment Branch Condition size for `classify_template_target_path` is too high. [<4, 36, 23> 42.91/17]", 3661828596], + [2392, 5, 2733, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `classify_template_target_path` is too high. [21/7]", 3661828596], + [2392, 5, 2733, "Metrics/MethodLength: Method has too many lines. [39/10]", 3661828596], + [2392, 5, 2733, "Metrics/PerceivedComplexity: Perceived complexity for `classify_template_target_path` is too high. [17/8]", 3661828596], + [2424, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [2438, 5, 416, "Metrics/MethodLength: Method has too many lines. [12/10]", 1388641773], + [2481, 5, 388, "Metrics/MethodLength: Method has too many lines. [12/10]", 2360583514], + [2510, 5, 820, "Metrics/MethodLength: Method has too many lines. [13/10]", 354674808], + [2526, 5, 929, "Metrics/AbcSize: Assignment Branch Condition size for `enrich_template_plan_entries` is too high. [<9, 12, 10> 18.03/17]", 2666747528], + [2526, 5, 929, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `enrich_template_plan_entries` is too high. [9/7]", 2666747528], + [2526, 5, 929, "Metrics/MethodLength: Method has too many lines. [19/10]", 2666747528], + [2526, 5, 929, "Metrics/PerceivedComplexity: Perceived complexity for `enrich_template_plan_entries` is too high. [10/8]", 2666747528], + [2549, 5, 1245, "Metrics/AbcSize: Assignment Branch Condition size for `enrich_template_plan_entries_with_token_state` is too high. [<11, 23, 14> 29.09/17]", 1507113977], + [2549, 5, 1245, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `enrich_template_plan_entries_with_token_state` is too high. [13/7]", 1507113977], + [2549, 5, 1245, "Metrics/MethodLength: Method has too many lines. [19/10]", 1507113977], + [2549, 5, 1245, "Metrics/PerceivedComplexity: Perceived complexity for `enrich_template_plan_entries_with_token_state` is too high. [13/8]", 1507113977], + [2573, 5, 1353, "Metrics/AbcSize: Assignment Branch Condition size for `prepare_template_entries` is too high. [<6, 18, 11> 21.93/17]", 2774310942], + [2573, 5, 1353, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `prepare_template_entries` is too high. [11/7]", 2774310942], + [2573, 5, 1353, "Metrics/MethodLength: Method has too many lines. [24/10]", 2774310942], + [2573, 5, 1353, "Metrics/PerceivedComplexity: Perceived complexity for `prepare_template_entries` is too high. [12/8]", 2774310942], + [2603, 5, 1494, "Metrics/AbcSize: Assignment Branch Condition size for `plan_template_execution` is too high. [<8, 22, 17> 28.93/17]", 3876421385], + [2603, 5, 1494, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `plan_template_execution` is too high. [14/7]", 3876421385], + [2603, 5, 1494, "Metrics/MethodLength: Method has too many lines. [29/10]", 3876421385], + [2603, 5, 1494, "Metrics/PerceivedComplexity: Perceived complexity for `plan_template_execution` is too high. [15/8]", 3876421385], + [2604, 7, 1421, "Metrics/BlockLength: Block has too many lines. [27/25]", 2887810383], + [2637, 5, 822, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 2749235529], + [2637, 37, 220, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 447165880], + [2638, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 518382509], + [2652, 5, 2060, "Metrics/AbcSize: Assignment Branch Condition size for `preview_template_execution` is too high. [<11, 42, 26> 50.61/17]", 2270817206], + [2652, 5, 2060, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preview_template_execution` is too high. [25/7]", 2270817206], + [2652, 5, 2060, "Metrics/MethodLength: Method has too many lines. [39/10]", 2270817206], + [2652, 5, 2060, "Metrics/PerceivedComplexity: Perceived complexity for `preview_template_execution` is too high. [23/8]", 2270817206], + [2662, 7, 1809, "Metrics/BlockLength: Block has too many lines. [28/25]", 310337564], + [2700, 5, 2513, "Metrics/AbcSize: Assignment Branch Condition size for `apply_template_execution` is too high. [<14, 50, 25> 57.63/17]", 177708331], + [2700, 5, 2513, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_template_execution` is too high. [26/7]", 177708331], + [2700, 5, 2513, "Metrics/MethodLength: Method has too many lines. [50/10]", 177708331], + [2700, 5, 2513, "Metrics/PerceivedComplexity: Perceived complexity for `apply_template_execution` is too high. [23/8]", 177708331], + [2711, 7, 2239, "Metrics/BlockLength: Block has too many lines. [38/25]", 1651205014], + [2761, 5, 1696, "Metrics/AbcSize: Assignment Branch Condition size for `evaluate_template_tree_convergence` is too high. [<11, 29, 17> 35.37/17]", 2507998041], + [2761, 5, 1696, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `evaluate_template_tree_convergence` is too high. [17/7]", 2507998041], + [2761, 5, 1696, "Metrics/MethodLength: Method has too many lines. [35/10]", 2507998041], + [2761, 5, 1696, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 2507998041], + [2761, 5, 1696, "Metrics/PerceivedComplexity: Perceived complexity for `evaluate_template_tree_convergence` is too high. [17/8]", 2507998041], + [2761, 43, 198, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 4214374277], + [2762, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 2983874608], + [2804, 5, 688, "Metrics/MethodLength: Method has too many lines. [15/10]", 3064253784], + [2804, 5, 688, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 3064253784], + [2804, 36, 216, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 448029307], + [2805, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3840139076], + [2848, 5, 664, "Metrics/MethodLength: Method has too many lines. [13/10]", 995637868], + [2848, 5, 664, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 995637868], + [2848, 53, 202, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 4227116196], + [2849, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 418683952], + [2866, 5, 649, "Metrics/MethodLength: Method has too many lines. [13/10]", 1831524792], + [2866, 5, 649, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 1831524792], + [2866, 54, 178, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2962381850], + [2867, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 3690915627], + [2884, 5, 1280, "Metrics/AbcSize: Assignment Branch Condition size for `apply_template_tree_execution_to_directory` is too high. [<6, 16, 6> 18.11/17]", 305449363], + [2884, 5, 1280, "Metrics/MethodLength: Method has too many lines. [23/10]", 305449363], + [2884, 5, 1280, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 305449363], + [2884, 51, 200, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1352434212], + [2885, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 1139621482], + [2913, 5, 2199, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_tree_run` is too high. [<15, 42, 31> 54.31/17]", 975627723], + [2913, 5, 2199, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_tree_run` is too high. [25/7]", 975627723], + [2913, 5, 2199, "Metrics/MethodLength: Method has too many lines. [38/10]", 975627723], + [2913, 5, 2199, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_tree_run` is too high. [26/8]", 975627723], + [2957, 5, 1515, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_apply` is too high. [<13, 35, 21> 42.84/17]", 3710254295], + [2957, 5, 1515, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_directory_apply` is too high. [17/7]", 3710254295], + [2957, 5, 1515, "Metrics/MethodLength: Method has too many lines. [26/10]", 3710254295], + [2957, 5, 1515, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_directory_apply` is too high. [17/8]", 3710254295], + [2972, 20, 1, "Style/DoubleNegation: Avoid the use of double negation (`!!`).", 177540], + [2989, 5, 1656, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_plan` is too high. [<11, 24, 25> 36.36/17]", 2946319293], + [2989, 5, 1656, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_directory_plan` is too high. [18/7]", 2946319293], + [2989, 5, 1656, "Metrics/MethodLength: Method has too many lines. [36/10]", 2946319293], + [2989, 5, 1656, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_directory_plan` is too high. [16/8]", 2946319293], + [3061, 7, 9, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 3648222389], + [3082, 5, 410, "Metrics/MethodLength: Method has too many lines. [12/10]", 248324428], + [3088, 7, 11, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 848344986], + [3132, 5, 712, "Metrics/MethodLength: Method has too many lines. [12/10]", 2500743043], + [3132, 27, 178, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 873705194], + [3132, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3023611470], + [3158, 42, 167, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2002181571], + [3171, 5, 1097, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structured_edit_selection_profile` is too high. [8/7]", 1149325233], + [3171, 5, 1097, "Metrics/MethodLength: Method has too many lines. [14/10]", 1149325233], + [3171, 42, 311, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 3814063337], + [3172, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 198450264], + [3185, 34, 47, "Style/SafeNavigation: Use safe navigation (`&.`) instead of checking if an object exists before calling the method.", 3204815976], + [3190, 5, 869, "Metrics/MethodLength: Method has too many lines. [11/10]", 83957392], + [3190, 41, 250, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1486072775], + [3191, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1967186495], + [3201, 36, 47, "Style/SafeNavigation: Use safe navigation (`&.`) instead of checking if an object exists before calling the method.", 3204815976], + [3206, 5, 1156, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structured_edit_match_profile` is too high. [10/7]", 4112674787], + [3206, 5, 1156, "Metrics/MethodLength: Method has too many lines. [15/10]", 4112674787], + [3206, 5, 1156, "Metrics/PerceivedComplexity: Perceived complexity for `structured_edit_match_profile` is too high. [10/8]", 4112674787], + [3206, 38, 321, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [12/5]", 823565876], + [3207, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859667], + [3208, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3673982236], + [3226, 5, 933, "Metrics/MethodLength: Method has too many lines. [14/10]", 2099388915], + [3226, 37, 319, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [12/5]", 250907892], + [3227, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177545], + [3228, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 4154814685], + [3245, 5, 907, "Metrics/MethodLength: Method has too many lines. [12/10]", 2242846328], + [3245, 42, 275, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 246196330], + [3246, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1439117336], + [3262, 5, 1057, "Metrics/MethodLength: Method has too many lines. [14/10]", 2891607970], + [3262, 44, 323, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 1386547750], + [3263, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1676243675], + [3264, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 4154814685], + [3281, 5, 1375, "Metrics/AbcSize: Assignment Branch Condition size for `structured_edit_request` is too high. [<11, 25, 10> 29.09/17]", 4153786554], + [3281, 5, 1375, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structured_edit_request` is too high. [11/7]", 4153786554], + [3281, 5, 1375, "Metrics/MethodLength: Method has too many lines. [16/10]", 4153786554], + [3281, 5, 1375, "Metrics/PerceivedComplexity: Perceived complexity for `structured_edit_request` is too high. [11/8]", 4153786554], + [3281, 32, 370, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [13/5]", 2381882467], + [3282, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177545], + [3303, 5, 728, "Metrics/MethodLength: Method has too many lines. [11/10]", 4026157473], + [3303, 31, 175, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 773121544], + [3335, 5, 597, "Metrics/MethodLength: Method has too many lines. [11/10]", 4143495860], + [3374, 5, 577, "Metrics/MethodLength: Method has too many lines. [11/10]", 4169131743], + [3389, 5, 1011, "Metrics/AbcSize: Assignment Branch Condition size for `structured_edit_execution_report` is too high. [<7, 16, 7> 18.81/17]", 876221899], + [3389, 5, 1011, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structured_edit_execution_report` is too high. [8/7]", 876221899], + [3389, 5, 1011, "Metrics/MethodLength: Method has too many lines. [12/10]", 876221899], + [3389, 41, 245, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 2484440861], + [3390, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 4036992717], + [3415, 55, 170, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 668161765], + [3438, 5, 819, "Metrics/MethodLength: Method has too many lines. [12/10]", 2287133436], + [3438, 56, 217, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3198032135], + [3439, 121, 51, "Layout/LineLength: Line is too long. [171/120]", 3526181051], + [3472, 5, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 1853778635], + [3481, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], + [3513, 5, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 1132214891], + [3522, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], + [3544, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 556747511], + [3553, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1808630920], + [3575, 5, 708, "Metrics/MethodLength: Method has too many lines. [11/10]", 3590891170], + [3584, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1367166441], + [3607, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 689748855], + [3616, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1808630920], + [3638, 5, 708, "Metrics/MethodLength: Method has too many lines. [11/10]", 1478642210], + [3647, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1367166441], + [3671, 5, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 239506091], + [3680, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], + [3702, 5, 693, "Metrics/MethodLength: Method has too many lines. [11/10]", 3803476550], + [3711, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], + [3734, 5, 728, "Metrics/MethodLength: Method has too many lines. [11/10]", 748161230], + [3743, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 2807086497], + [3765, 5, 758, "Metrics/MethodLength: Method has too many lines. [11/10]", 3900524558], + [3774, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3463884836], + [3798, 5, 748, "Metrics/MethodLength: Method has too many lines. [11/10]", 2076716686], + [3807, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 609414023], + [3829, 5, 778, "Metrics/MethodLength: Method has too many lines. [11/10]", 867958318], + [3833, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193343749], + [3838, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 1202823007], + [3862, 5, 728, "Metrics/MethodLength: Method has too many lines. [11/10]", 2078323790], + [3871, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 2807086497], + [3893, 5, 758, "Metrics/MethodLength: Method has too many lines. [11/10]", 121025422], + [3902, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3463884836], + [3924, 5, 733, "Metrics/MethodLength: Method has too many lines. [11/10]", 1216456558], + [3933, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 145839927], + [3955, 5, 763, "Metrics/MethodLength: Method has too many lines. [11/10]", 2946525998], + [3964, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 275709226], + [3988, 5, 768, "Metrics/MethodLength: Method has too many lines. [11/10]", 3281402414], + [3992, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177656], + [3997, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 1427340581], + [4034, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3673982236], + [4091, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193417070], + [4102, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2768444], + [4109, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3833204035], + [4117, 5, 863, "Metrics/MethodLength: Method has too many lines. [11/10]", 3731153486], + [4121, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 4054494590], + [4126, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 2084326338], + [4132, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 4201858364], + [4136, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861122], + [4140, 5, 873, "Metrics/MethodLength: Method has too many lines. [11/10]", 1866057614], + [4144, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3893180930], + [4149, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 863421408], + [4155, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 3247130491], + [4159, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1171438608], + [4163, 5, 883, "Metrics/MethodLength: Method has too many lines. [11/10]", 2352924462], + [4163, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860841], + [4164, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861334], + [4167, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 465221046], + [4172, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 1922522532], + [4188, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 4067226670], + [4192, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2033573170], + [4196, 5, 893, "Metrics/MethodLength: Method has too many lines. [11/10]", 1633175534], + [4196, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087926422], + [4197, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087421565], + [4200, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 615151909], + [4205, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 884393597], + [4231, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 417844693], + [4235, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1233681340], + [4239, 5, 903, "Metrics/MethodLength: Method has too many lines. [11/10]", 3964877742], + [4239, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873471], + [4240, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1322899615], + [4243, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 3471008807], + [4248, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 627945471], + [4254, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 2960084092], + [4258, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2148514258], + [4262, 5, 913, "Metrics/MethodLength: Method has too many lines. [11/10]", 385546958], + [4262, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2970472935], + [4263, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3808956371], + [4266, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 3412499338], + [4271, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 3274208144], + [4277, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 4275923717], + [4285, 5, 848, "Metrics/MethodLength: Method has too many lines. [11/10]", 457851502], + [4289, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 413805135], + [4294, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 951908917], + [4300, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 1859200227], + [4308, 5, 808, "Metrics/MethodLength: Method has too many lines. [11/10]", 884695726], + [4312, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 2011807620], + [4317, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 384138219], + [4323, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1176320663], + [4331, 5, 798, "Metrics/MethodLength: Method has too many lines. [11/10]", 1422521838], + [4335, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3247420006], + [4340, 121, 35, "Layout/LineLength: Line is too long. [155/120]", 1408316702], + [4346, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 938465266], + [4354, 5, 803, "Metrics/MethodLength: Method has too many lines. [11/10]", 2370839950], + [4358, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 74128911], + [4363, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 1364659899], + [4369, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2059517661], + [4377, 5, 803, "Metrics/MethodLength: Method has too many lines. [11/10]", 3379336814], + [4381, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 74128911], + [4386, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 1364659899], + [4434, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 4281772560], + [4442, 5, 833, "Metrics/MethodLength: Method has too many lines. [11/10]", 3245498510], + [4446, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3542644754], + [4451, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1916814773], + [4457, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 859690879], + [4465, 5, 833, "Metrics/MethodLength: Method has too many lines. [11/10]", 4138830126], + [4469, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3542644754], + [4474, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1916814773], + [4480, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3880141603], + [4488, 5, 828, "Metrics/MethodLength: Method has too many lines. [11/10]", 3621010990], + [4492, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3917260126], + [4497, 121, 41, "Layout/LineLength: Line is too long. [161/120]", 1879260859], + [4503, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1776611011], + [4511, 5, 838, "Metrics/MethodLength: Method has too many lines. [11/10]", 514585454], + [4515, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1353518231], + [4520, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 1228459824], + [4526, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 3932349968], + [4530, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087903307], + [4534, 5, 878, "Metrics/MethodLength: Method has too many lines. [11/10]", 1525737454], + [4534, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], + [4535, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177538], + [4538, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 2895681070], + [4543, 121, 51, "Layout/LineLength: Line is too long. [171/120]", 4040662298], + [4549, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 66929045], + [4557, 5, 808, "Metrics/MethodLength: Method has too many lines. [11/10]", 1626746606], + [4561, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 2011807620], + [4566, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 384138219], + [4580, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 849230508], + [4588, 5, 838, "Metrics/MethodLength: Method has too many lines. [11/10]", 3531122670], + [4592, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1353518231], + [4597, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 1228459824], + [4612, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1176320663], + [4620, 5, 798, "Metrics/MethodLength: Method has too many lines. [11/10]", 1118421486], + [4624, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3247420006], + [4629, 121, 35, "Layout/LineLength: Line is too long. [155/120]", 1408316702], + [4651, 5, 693, "Metrics/MethodLength: Method has too many lines. [11/10]", 1668406662], + [4660, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], + [4674, 5, 648, "Metrics/MethodLength: Method has too many lines. [11/10]", 3479836893], + [4683, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193343749], + [4705, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 3147549879], + [4714, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1808630920], + [4749, 5, 677, "Metrics/MethodLength: Method has too many lines. [11/10]", 1206941784], + [4758, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3937819337], + [4781, 5, 672, "Metrics/MethodLength: Method has too many lines. [11/10]", 3634903061], + [4790, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], + [4812, 5, 683, "Metrics/MethodLength: Method has too many lines. [11/10]", 3417053461], + [4821, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], + [4845, 5, 668, "Metrics/MethodLength: Method has too many lines. [11/10]", 1540762726], + [4854, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1808630920], + [4876, 5, 698, "Metrics/MethodLength: Method has too many lines. [11/10]", 2804825893], + [4885, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1367166441], + [4908, 5, 683, "Metrics/MethodLength: Method has too many lines. [11/10]", 3165010613], + [4917, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], + [4939, 5, 713, "Metrics/MethodLength: Method has too many lines. [11/10]", 2795628035], + [4948, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 497133415], + [4954, 5, 864, "Metrics/MethodLength: Method has too many lines. [12/10]", 1086224878], + [4954, 50, 268, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 4022739767], + [4955, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1607400384], + [4979, 5, 658, "Metrics/MethodLength: Method has too many lines. [11/10]", 3999796489], + [4988, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 102058825], + [5002, 59, 179, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1569981428], + [5003, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 1515849732], + [5034, 5, 694, "Metrics/MethodLength: Method has too many lines. [11/10]", 3830236120], + [5043, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2250857971], + [5057, 5, 673, "Metrics/MethodLength: Method has too many lines. [11/10]", 2413908653], + [5066, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1225026887], + [5080, 5, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 3935895659], + [5089, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], + [5103, 5, 692, "Metrics/MethodLength: Method has too many lines. [11/10]", 3660669627], + [5112, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3558241761], + [5126, 5, 612, "Metrics/MethodLength: Method has too many lines. [11/10]", 100391811], + [5165, 5, 693, "Metrics/MethodLength: Method has too many lines. [11/10]", 3138587622], + [5174, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], + [5196, 5, 688, "Metrics/MethodLength: Method has too many lines. [11/10]", 2736088861], + [5205, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1992103013], + [5228, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 2275602867], + [5237, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3598350322], + [5260, 5, 602, "Metrics/MethodLength: Method has too many lines. [11/10]", 3023166371], + [5275, 36, 181, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1071580945], + [5288, 5, 787, "Metrics/AbcSize: Assignment Branch Condition size for `group_projected_child_review_cases` is too high. [<4, 17, 4> 17.92/17]", 3391527151], + [5288, 5, 787, "Metrics/MethodLength: Method has too many lines. [18/10]", 3391527151], + [5312, 5, 705, "Metrics/MethodLength: Method has too many lines. [13/10]", 2629923275], + [5339, 5, 547, "Metrics/MethodLength: Method has too many lines. [12/10]", 1911190850], + [5364, 5, 1516, "Metrics/AbcSize: Assignment Branch Condition size for `review_projected_child_groups` is too high. [<11, 21, 9> 25.36/17]", 3333110579], + [5364, 5, 1516, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `review_projected_child_groups` is too high. [8/7]", 3333110579], + [5364, 5, 1516, "Metrics/MethodLength: Method has too many lines. [39/10]", 3333110579], + [5364, 5, 1516, "Metrics/PerceivedComplexity: Perceived complexity for `review_projected_child_groups` is too high. [9/8]", 3333110579], + [5398, 7, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], + [5410, 5, 562, "Metrics/MethodLength: Method has too many lines. [14/10]", 3083915102], + [5429, 5, 1898, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_delegated_child_outputs` is too high. [<11, 21, 6> 24.45/17]", 2739722546], + [5429, 5, 1898, "Metrics/MethodLength: Method has too many lines. [49/10]", 2739722546], + [5484, 5, 942, "Metrics/AbcSize: Assignment Branch Condition size for `execute_nested_merge` is too high. [<3, 17, 6> 18.28/17]", 766157172], + [5484, 5, 942, "Metrics/MethodLength: Method has too many lines. [20/10]", 766157172], + [5484, 29, 144, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1404367793], + [5511, 5, 652, "Metrics/MethodLength: Method has too many lines. [13/10]", 2105803856], + [5530, 38, 140, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1682835820], + [5560, 5, 577, "Metrics/MethodLength: Method has too many lines. [12/10]", 2659610443], + [5629, 5, 569, "Metrics/MethodLength: Method has too many lines. [14/10]", 20616641], + [5657, 5, 772, "Metrics/AbcSize: Assignment Branch Condition size for `conformance_manifest_review_request_ids` is too high. [<7, 16, 8> 19.21/17]", 3577418475], + [5657, 5, 772, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `conformance_manifest_review_request_ids` is too high. [9/7]", 3577418475], + [5657, 5, 772, "Metrics/MethodLength: Method has too many lines. [14/10]", 3577418475], + [5657, 5, 772, "Metrics/PerceivedComplexity: Perceived complexity for `conformance_manifest_review_request_ids` is too high. [9/8]", 3577418475], + [5711, 5, 606, "Metrics/MethodLength: Method has too many lines. [11/10]", 2675086662], + [5726, 5, 562, "Metrics/MethodLength: Method has too many lines. [11/10]", 3811715870], + [5741, 5, 578, "Metrics/MethodLength: Method has too many lines. [11/10]", 1776197415], + [5756, 5, 1298, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_conformance_family_context` is too high. [<7, 28, 9> 30.23/17]", 4265202259], + [5756, 5, 1298, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `resolve_conformance_family_context` is too high. [10/7]", 4265202259], + [5756, 5, 1298, "Metrics/MethodLength: Method has too many lines. [23/10]", 4265202259], + [5756, 5, 1298, "Metrics/PerceivedComplexity: Perceived complexity for `resolve_conformance_family_context` is too high. [10/8]", 4265202259], + [5785, 5, 1994, "Metrics/AbcSize: Assignment Branch Condition size for `review_conformance_family_context` is too high. [<12, 24, 10> 28.64/17]", 2834851944], + [5785, 5, 1994, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `review_conformance_family_context` is too high. [10/7]", 2834851944], + [5785, 5, 1994, "Metrics/MethodLength: Method has too many lines. [41/10]", 2834851944], + [5785, 5, 1994, "Metrics/PerceivedComplexity: Perceived complexity for `review_conformance_family_context` is too high. [11/8]", 2834851944], + [5808, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 641612328], + [5845, 5, 1844, "Metrics/AbcSize: Assignment Branch Condition size for `select_conformance_case` is too high. [<2, 43, 14> 45.27/17]", 670673209], + [5845, 5, 1844, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `select_conformance_case` is too high. [14/7]", 670673209], + [5845, 5, 1844, "Metrics/MethodLength: Method has too many lines. [30/10]", 670673209], + [5845, 5, 1844, "Metrics/PerceivedComplexity: Perceived complexity for `select_conformance_case` is too high. [16/8]", 670673209], + [5850, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 2135503892], + [5852, 121, 41, "Layout/LineLength: Line is too long. [161/120]", 3932054828], + [5861, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 3169124957], + [5883, 5, 509, "Metrics/MethodLength: Method has too many lines. [11/10]", 3552283123], + [5972, 5, 4195, "Metrics/AbcSize: Assignment Branch Condition size for `review_conformance_manifest` is too high. [<37, 63, 16> 74.79/17]", 2166560528], + [5972, 5, 4195, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `review_conformance_manifest` is too high. [14/7]", 2166560528], + [5972, 5, 4195, "Metrics/MethodLength: Method has too many lines. [89/10]", 2166560528], + [5972, 5, 4195, "Metrics/PerceivedComplexity: Perceived complexity for `review_conformance_manifest` is too high. [17/8]", 2166560528], + [6037, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2746826653], + [6053, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 3035993839], + [6075, 5, 676, "Metrics/MethodLength: Method has too many lines. [15/10]", 3048335475], + [6098, 5, 1054, "Metrics/AbcSize: Assignment Branch Condition size for `plan_conformance_suite` is too high. [<11, 18, 8> 22.56/17]", 1855254788], + [6098, 5, 1054, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `plan_conformance_suite` is too high. [8/7]", 1855254788], + [6098, 5, 1054, "Metrics/MethodLength: Method has too many lines. [25/10]", 1855254788], + [6098, 31, 84, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 172854173], + [6163, 5, 1274, "Metrics/AbcSize: Assignment Branch Condition size for `plan_named_conformance_suites_with_diagnostics` is too high. [<11, 21, 7> 24.72/17]", 3991300730], + [6163, 5, 1274, "Metrics/MethodLength: Method has too many lines. [27/10]", 3991300730], + [6190, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 3035993839], + [6255, 5, 2071, "Metrics/AbcSize: Assignment Branch Condition size for `review_decision_for_family_context` is too high. [<7, 22, 16> 28.09/17]", 4245377184], + [6255, 5, 2071, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `review_decision_for_family_context` is too high. [12/7]", 4245377184], + [6255, 5, 2071, "Metrics/MethodLength: Method has too many lines. [46/10]", 4245377184], + [6255, 5, 2071, "Metrics/PerceivedComplexity: Perceived complexity for `review_decision_for_family_context` is too high. [12/8]", 4245377184], + [6260, 7, 1766, "Metrics/BlockLength: Block has too many lines. [40/25]", 65448241], + [6312, 5, 686, "Metrics/MethodLength: Method has too many lines. [13/10]", 4030291682] + ], + "lib/ast/merge/ast_node.rb:2037773320": [ + [44, 5, 7086, "Metrics/ClassLength: Class has too many lines. [114/100]", 201314721], + [220, 11, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183] + ], + "lib/ast/merge/comment/attachment.rb:2388154769": [ + [42, 23, 180, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3775370530], + [75, 24, 2, "Lint/SafeNavigationConsistency: Use `.` instead of unnecessary `&.`.", 5858765], + [81, 25, 2, "Lint/SafeNavigationConsistency: Use `.` instead of unnecessary `&.`.", 5858765], + [114, 9, 410, "Metrics/AbcSize: Assignment Branch Condition size for `inspect` is too high. [<1, 17, 4> 17.49/17]", 605978105], + [115, 32, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] + ], + "lib/ast/merge/comment/augmenter.rb:633395157": [ + [12, 7, 13967, "Metrics/ClassLength: Class has too many lines. [291/100]", 2806660144], + [33, 9, 721, "Metrics/MethodLength: Method has too many lines. [16/10]", 200402816], + [33, 23, 91, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2938734913], + [64, 9, 1335, "Metrics/AbcSize: Assignment Branch Condition size for `build!` is too high. [<12, 29, 6> 31.95/17]", 3904283188], + [64, 9, 1335, "Metrics/MethodLength: Method has too many lines. [22/10]", 3904283188], + [94, 9, 867, "Metrics/AbcSize: Assignment Branch Condition size for `infer_leading_comments` is too high. [<8, 19, 14> 24.92/17]", 1941464872], + [94, 9, 867, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_leading_comments` is too high. [11/7]", 1941464872], + [94, 9, 867, "Metrics/MethodLength: Method has too many lines. [20/10]", 1941464872], + [94, 9, 867, "Metrics/PerceivedComplexity: Perceived complexity for `infer_leading_comments` is too high. [12/8]", 1941464872], + [122, 9, 429, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_inline_comments` is too high. [8/7]", 2688935834], + [133, 9, 934, "Metrics/AbcSize: Assignment Branch Condition size for `infer_trailing_comments` is too high. [<8, 21, 18> 28.79/17]", 1551855281], + [133, 9, 934, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_trailing_comments` is too high. [15/7]", 1551855281], + [133, 9, 934, "Metrics/MethodLength: Method has too many lines. [20/10]", 1551855281], + [133, 9, 934, "Metrics/PerceivedComplexity: Perceived complexity for `infer_trailing_comments` is too high. [15/8]", 1551855281], + [160, 9, 488, "Metrics/AbcSize: Assignment Branch Condition size for `infer_postlude!` is too high. [<5, 17, 8> 19.44/17]", 2562637949], + [160, 9, 488, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_postlude!` is too high. [8/7]", 2562637949], + [173, 9, 1529, "Metrics/AbcSize: Assignment Branch Condition size for `infer_remaining_regions!` is too high. [<12, 27, 23> 37.44/17]", 3911657050], + [173, 9, 1529, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_remaining_regions!` is too high. [18/7]", 3911657050], + [173, 9, 1529, "Metrics/MethodLength: Method has too many lines. [28/10]", 3911657050], + [173, 9, 1529, "Metrics/PerceivedComplexity: Perceived complexity for `infer_remaining_regions!` is too high. [20/8]", 3911657050], + [216, 9, 507, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split_preamble_group` is too high. [8/7]", 336784898], + [231, 9, 588, "Metrics/MethodLength: Method has too many lines. [17/10]", 3445626532], + [274, 9, 965, "Metrics/AbcSize: Assignment Branch Condition size for `build_region` is too high. [<6, 17, 7> 19.34/17]", 344809006], + [274, 9, 965, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_region` is too high. [8/7]", 344809006], + [274, 9, 965, "Metrics/MethodLength: Method has too many lines. [24/10]", 344809006] + ], + "lib/ast/merge/comment/block.rb:3806757604": [ + [31, 7, 6754, "Metrics/ClassLength: Class has too many lines. [106/100]", 2308582303], + [57, 9, 1059, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<12, 13, 14> 22.56/17]", 2656171724], + [57, 9, 1059, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `initialize` is too high. [14/7]", 2656171724], + [57, 9, 1059, "Metrics/MethodLength: Method has too many lines. [21/10]", 2656171724], + [57, 9, 1059, "Metrics/PerceivedComplexity: Perceived complexity for `initialize` is too high. [15/8]", 2656171724], + [113, 9, 511, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `freeze_action` is too high. [9/7]", 55014877], + [113, 9, 511, "Metrics/MethodLength: Method has too many lines. [12/10]", 55014877], + [113, 9, 511, "Metrics/PerceivedComplexity: Perceived complexity for `freeze_action` is too high. [9/8]", 55014877], + [181, 9, 439, "Metrics/AbcSize: Assignment Branch Condition size for `first_meaningful_content` is too high. [<2, 16, 11> 19.52/17]", 680479883], + [181, 9, 439, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `first_meaningful_content` is too high. [11/7]", 680479883], + [181, 9, 439, "Metrics/PerceivedComplexity: Perceived complexity for `first_meaningful_content` is too high. [12/8]", 680479883], + [197, 9, 765, "Metrics/AbcSize: Assignment Branch Condition size for `extract_block_content` is too high. [<7, 24, 9> 26.57/17]", 621871624], + [197, 9, 765, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_block_content` is too high. [9/7]", 621871624], + [197, 9, 765, "Metrics/PerceivedComplexity: Perceived complexity for `extract_block_content` is too high. [9/8]", 621871624] + ], + "lib/ast/merge/comment/c_style_tracker_base.rb:1569556520": [ + [22, 7, 15053, "Metrics/ClassLength: Class has too many lines. [284/100]", 3599183270], + [83, 9, 509, "Metrics/MethodLength: Method has too many lines. [11/10]", 1639553915], + [102, 9, 492, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `leading_comments_before` is too high. [8/7]", 3127043491], + [102, 9, 492, "Metrics/MethodLength: Method has too many lines. [11/10]", 3127043491], + [124, 9, 487, "Metrics/MethodLength: Method has too many lines. [11/10]", 1869933531], + [176, 9, 713, "Metrics/AbcSize: Assignment Branch Condition size for `trailing_comments_after` is too high. [<6, 12, 13> 18.68/17]", 543703521], + [176, 9, 713, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trailing_comments_after` is too high. [11/7]", 543703521], + [176, 9, 713, "Metrics/MethodLength: Method has too many lines. [14/10]", 543703521], + [176, 9, 713, "Metrics/PerceivedComplexity: Perceived complexity for `trailing_comments_after` is too high. [11/8]", 543703521], + [184, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177549], + [202, 9, 598, "Metrics/MethodLength: Method has too many lines. [12/10]", 1628921093], + [222, 9, 1271, "Metrics/MethodLength: Method has too many lines. [21/10]", 612335469], + [222, 35, 137, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1823300034], + [329, 35, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [348, 9, 2271, "Metrics/AbcSize: Assignment Branch Condition size for `extract_comments` is too high. [<17, 32, 13> 38.5/17]", 2751274968], + [348, 9, 2271, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_comments` is too high. [14/7]", 2751274968], + [348, 9, 2271, "Metrics/MethodLength: Method has too many lines. [59/10]", 2751274968], + [348, 9, 2271, "Metrics/PerceivedComplexity: Perceived complexity for `extract_comments` is too high. [14/8]", 2751274968], + [353, 11, 2045, "Metrics/BlockLength: Block has too many lines. [52/25]", 575665179], + [418, 9, 659, "Metrics/MethodLength: Method has too many lines. [15/10]", 177254901], + [439, 71, 4, "Lint/UnusedMethodArgument: Unused method argument - `line`.", 2087656651], + [439, 78, 8, "Lint/UnusedMethodArgument: Unused method argument - `line_num`.", 622661090] + ], + "lib/ast/merge/comment/hash_tracker_base.rb:861186417": [ + [32, 7, 19362, "Metrics/ClassLength: Class has too many lines. [221/100]", 1031055222], + [118, 9, 444, "Metrics/MethodLength: Method has too many lines. [11/10]", 3347260807], + [142, 9, 921, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `leading_comments_before` is too high. [8/7]", 415734636], + [142, 9, 921, "Metrics/MethodLength: Method has too many lines. [11/10]", 415734636], + [172, 9, 440, "Metrics/MethodLength: Method has too many lines. [11/10]", 2464474004], + [225, 9, 623, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trailing_comments_after` is too high. [10/7]", 543703521], + [225, 9, 623, "Metrics/MethodLength: Method has too many lines. [12/10]", 543703521], + [225, 9, 623, "Metrics/PerceivedComplexity: Perceived complexity for `trailing_comments_after` is too high. [10/8]", 543703521], + [249, 9, 551, "Metrics/MethodLength: Method has too many lines. [12/10]", 2783654570], + [278, 9, 1271, "Metrics/MethodLength: Method has too many lines. [21/10]", 612335469], + [278, 35, 137, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1823300034], + [374, 35, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [439, 9, 826, "Metrics/MethodLength: Method has too many lines. [12/10]", 1706632542] + ], + "lib/ast/merge/comment/parser.rb:2674748021": [ + [34, 7, 8372, "Metrics/ClassLength: Class has too many lines. [141/100]", 2541983664], + [84, 9, 357, "Metrics/MethodLength: Method has too many lines. [12/10]", 2265493710], + [104, 9, 545, "Metrics/AbcSize: Assignment Branch Condition size for `auto_detect_style` is too high. [<5, 17, 7> 19.05/17]", 868366444], + [104, 9, 545, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `auto_detect_style` is too high. [8/7]", 868366444], + [125, 9, 1650, "Metrics/AbcSize: Assignment Branch Condition size for `parse_line_comments` is too high. [<8, 28, 7> 29.95/17]", 1511562163], + [125, 9, 1650, "Metrics/MethodLength: Method has too many lines. [31/10]", 1511562163], + [176, 9, 2670, "Metrics/AbcSize: Assignment Branch Condition size for `parse_with_block_comments` is too high. [<15, 47, 15> 51.57/17]", 2963765048], + [176, 9, 2670, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_with_block_comments` is too high. [15/7]", 2963765048], + [176, 9, 2670, "Metrics/MethodLength: Method has too many lines. [47/10]", 2963765048], + [176, 9, 2670, "Metrics/PerceivedComplexity: Perceived complexity for `parse_with_block_comments` is too high. [16/8]", 2963765048], + [181, 11, 2390, "Metrics/BlockLength: Block has too many lines. [40/25]", 3720582340] + ], + "lib/ast/merge/comment/quoted_hash_line_parser.rb:2878420841": [ + [74, 9, 458, "Metrics/MethodLength: Method has too many lines. [11/10]", 1526360697], + [91, 9, 620, "Metrics/AbcSize: Assignment Branch Condition size for `inline_result` is too high. [<3, 16, 6> 17.35/17]", 2706755447], + [91, 9, 620, "Metrics/MethodLength: Method has too many lines. [14/10]", 2706755447] + ], + "lib/ast/merge/comment/region_merge_policy.rb:176745155": [ + [23, 23, 98, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1029631546], + [55, 9, 423, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `freeze_sensitive?` is too high. [8/7]", 4102661282], + [61, 41, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [61, 85, 2, "Lint/SafeNavigationConsistency: Use `.` instead of unnecessary `&.`.", 5858765], + [96, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3491399903] + ], + "lib/ast/merge/comment/style.rb:3045051983": [ + [27, 7, 9109, "Metrics/ClassLength: Class has too many lines. [143/100]", 131723516], + [142, 11, 911, "Metrics/MethodLength: Method has too many lines. [17/10]", 355862493], + [142, 23, 164, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 668558018], + [203, 23, 164, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 668558018] + ], + "lib/ast/merge/comment/tracked_hash_adapter.rb:3235547929": [ + [99, 11, 553, "Metrics/AbcSize: Assignment Branch Condition size for `line_text_from` is too high. [<4, 20, 4> 20.78/17]", 2680273536], + [99, 11, 553, "Metrics/MethodLength: Method has too many lines. [13/10]", 2680273536] + ], + "lib/ast/merge/composite_match_refiner.rb:1718969703": [ + [58, 7, 668, "Metrics/MethodLength: Method has too many lines. [14/10]", 2649148714] + ], + "lib/ast/merge/conflict_resolver_base.rb:765343263": [ + [69, 5, 14959, "Metrics/ClassLength: Class has too many lines. [170/100]", 633092728], + [156, 7, 919, "Metrics/MethodLength: Method has too many lines. [13/10]", 1701319380], + [156, 21, 200, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3369976202], + [367, 7, 972, "Metrics/MethodLength: Method has too many lines. [22/10]", 2870739148], + [434, 47, 13, "Style/NumericPredicate: Use `recursive.positive?` instead of `recursive > 0`.", 462999281], + [436, 99, 14, "Style/NumericPredicate: Use `recursive.zero?` instead of `recursive == 0`.", 2394069519] + ], + "lib/ast/merge/content_match_refiner.rb:3628272158": [ + [47, 5, 7719, "Metrics/ClassLength: Class has too many lines. [108/100]", 651494487], + [87, 7, 750, "Metrics/MethodLength: Method has too many lines. [17/10]", 3624290009], + [165, 37, 48, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 953994744], + [232, 7, 846, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<13, 29, 8> 32.77/17]", 3597737347], + [232, 7, 846, "Metrics/MethodLength: Method has too many lines. [20/10]", 3597737347] + ], + "lib/ast/merge/debug_logger.rb:1783610128": [ + [72, 5, 7614, "Metrics/ModuleLength: Module has too many lines. [118/100]", 736598454], + [85, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 941621], + [206, 7, 584, "Metrics/AbcSize: Assignment Branch Condition size for `time` is too high. [<3, 17, 2> 17.38/17]", 3468868523], + [206, 7, 584, "Metrics/MethodLength: Method has too many lines. [14/10]", 3468868523], + [269, 7, 450, "Metrics/PerceivedComplexity: Perceived complexity for `extract_lines` is too high. [9/8]", 680738666], + [287, 7, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631] + ], + "lib/ast/merge/detector/base.rb:343830240": [ + [175, 25, 73, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2991095115] + ], + "lib/ast/merge/detector/fenced_code_block.rb:3555142063": [ + [36, 7, 6302, "Metrics/ClassLength: Class has too many lines. [116/100]", 852968953], + [71, 9, 2492, "Metrics/AbcSize: Assignment Branch Condition size for `detect_all` is too high. [<31, 28, 12> 43.46/17]", 3575218793], + [71, 9, 2492, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_all` is too high. [11/7]", 3575218793], + [71, 9, 2492, "Metrics/MethodLength: Method has too many lines. [54/10]", 3575218793], + [71, 9, 2492, "Metrics/PerceivedComplexity: Perceived complexity for `detect_all` is too high. [13/8]", 3575218793], + [84, 11, 2060, "Metrics/BlockLength: Block has too many lines. [41/25]", 1744553779] + ], + "lib/ast/merge/detector/mergeable.rb:354817747": [ + [54, 7, 11933, "Metrics/ModuleLength: Module has too many lines. [140/100]", 1453034870], + [162, 9, 601, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_region_configs` is too high. [8/7]", 1278024890], + [162, 9, 601, "Metrics/MethodLength: Method has too many lines. [16/10]", 1278024890], + [189, 9, 1054, "Metrics/AbcSize: Assignment Branch Condition size for `extract_regions` is too high. [<11, 16, 3> 19.65/17]", 663241096], + [189, 9, 1054, "Metrics/MethodLength: Method has too many lines. [20/10]", 663241096], + [285, 9, 1005, "Metrics/AbcSize: Assignment Branch Condition size for `merge_and_substitute_regions` is too high. [<16, 19, 4> 25.16/17]", 4123525156], + [285, 9, 1005, "Metrics/MethodLength: Method has too many lines. [16/10]", 4123525156], + [318, 9, 1369, "Metrics/AbcSize: Assignment Branch Condition size for `merge_region` is too high. [<11, 20, 14> 26.78/17]", 746321843], + [318, 9, 1369, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_region` is too high. [15/7]", 746321843], + [318, 9, 1369, "Metrics/MethodLength: Method has too many lines. [16/10]", 746321843], + [318, 9, 1369, "Metrics/PerceivedComplexity: Perceived complexity for `merge_region` is too high. [15/8]", 746321843] + ], + "lib/ast/merge/detector/toml_frontmatter.rb:3255696517": [ + [50, 9, 892, "Metrics/MethodLength: Method has too many lines. [20/10]", 3132005303] + ], + "lib/ast/merge/detector/yaml_frontmatter.rb:2551474823": [ + [49, 9, 958, "Metrics/MethodLength: Method has too many lines. [20/10]", 3132005303] + ], + "lib/ast/merge/diff_mapper_base.rb:3204989377": [ + [22, 5, 7793, "Metrics/ClassLength: Class has too many lines. [141/100]", 2217731166], + [80, 7, 2598, "Metrics/AbcSize: Assignment Branch Condition size for `parse_diff` is too high. [<21, 31, 15> 40.34/17]", 939898835], + [80, 7, 2598, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_diff` is too high. [16/7]", 939898835], + [80, 7, 2598, "Metrics/MethodLength: Method has too many lines. [65/10]", 939898835], + [80, 7, 2598, "Metrics/PerceivedComplexity: Perceived complexity for `parse_diff` is too high. [12/8]", 939898835], + [90, 9, 2162, "Metrics/BlockLength: Block has too many lines. [50/25]", 3403609416], + [169, 7, 394, "Metrics/MethodLength: Method has too many lines. [11/10]", 2028641628] + ], + "lib/ast/merge/emitter_base.rb:655463559": [ + [26, 5, 14449, "Metrics/ClassLength: Class has too many lines. [226/100]", 2015391034], + [95, 7, 653, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_comment_region` is too high. [9/7]", 24580929], + [95, 7, 653, "Metrics/MethodLength: Method has too many lines. [12/10]", 24580929], + [95, 7, 653, "Metrics/PerceivedComplexity: Perceived complexity for `emit_comment_region` is too high. [9/8]", 24580929], + [120, 7, 1311, "Metrics/AbcSize: Assignment Branch Condition size for `emit_comment_attachment` is too high. [<5, 25, 16> 30.1/17]", 964928813], + [120, 7, 1311, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_comment_attachment` is too high. [17/7]", 964928813], + [120, 7, 1311, "Metrics/MethodLength: Method has too many lines. [17/10]", 964928813], + [120, 7, 1311, "Metrics/PerceivedComplexity: Perceived complexity for `emit_comment_attachment` is too high. [17/8]", 964928813], + [120, 34, 127, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 628879795], + [152, 7, 984, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_layout_gap` is too high. [8/7]", 1954418889], + [152, 7, 984, "Metrics/MethodLength: Method has too many lines. [13/10]", 1954418889], + [152, 7, 984, "Metrics/PerceivedComplexity: Perceived complexity for `emit_layout_gap` is too high. [9/8]", 1954418889], + [152, 26, 136, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3839882587], + [183, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861198], + [184, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087656651], + [186, 7, 1307, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_layout_attachment` is too high. [9/7]", 708408665], + [186, 7, 1307, "Metrics/MethodLength: Method has too many lines. [26/10]", 708408665], + [186, 7, 1307, "Metrics/PerceivedComplexity: Perceived complexity for `emit_layout_attachment` is too high. [9/8]", 708408665], + [186, 33, 218, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1552587384], + [187, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 1763090185], + [189, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1371312610], + [256, 31, 17, "Style/NumericPredicate: Use `@indent_level.positive?` instead of `@indent_level > 0`.", 1892475678], + [302, 56, 12, "Lint/UnusedMethodArgument: Unused method argument - `current_line`. You can also write as `inline_comment_region_target_column(*)` if you want the method to accept any arguments but don't care about them.", 2091263933], + [306, 42, 6, "Lint/UnusedMethodArgument: Unused method argument - `region`.", 2124512157], + [306, 51, 13, "Lint/UnusedMethodArgument: Unused method argument - `target_column`.", 3246375805], + [321, 7, 1141, "Metrics/AbcSize: Assignment Branch Condition size for `inline_comment_node_text` is too high. [<6, 29, 8> 30.68/17]", 2583471562], + [321, 7, 1141, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `inline_comment_node_text` is too high. [9/7]", 2583471562], + [321, 7, 1141, "Metrics/MethodLength: Method has too many lines. [22/10]", 2583471562], + [321, 7, 1141, "Metrics/PerceivedComplexity: Perceived complexity for `inline_comment_node_text` is too high. [9/8]", 2583471562], + [339, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861626], + [350, 7, 510, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_region_gap_lines` is too high. [8/7]", 1999747697], + [350, 7, 510, "Metrics/PerceivedComplexity: Perceived complexity for `emit_region_gap_lines` is too high. [9/8]", 1999747697] + ], + "lib/ast/merge/emitter_line_metadata_support.rb:3153033769": [ + [5, 5, 33, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::EmitterLineMetadataSupport`.", 2926748997], + [23, 7, 541, "Metrics/MethodLength: Method has too many lines. [12/10]", 2407359355] + ], + "lib/ast/merge/file_aligner_base.rb:4032045257": [ + [13, 5, 7473, "Metrics/ClassLength: Class has too many lines. [187/100]", 1391880441], + [27, 7, 2244, "Metrics/AbcSize: Assignment Branch Condition size for `align` is too high. [<19, 37, 12> 43.29/17]", 1243937217], + [27, 7, 2244, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `align` is too high. [12/7]", 1243937217], + [27, 7, 2244, "Metrics/MethodLength: Method has too many lines. [55/10]", 1243937217], + [27, 7, 2244, "Metrics/PerceivedComplexity: Perceived complexity for `align` is too high. [12/8]", 1243937217], + [148, 7, 655, "Metrics/MethodLength: Method has too many lines. [14/10]", 2468821688], + [180, 7, 455, "Metrics/MethodLength: Method has too many lines. [13/10]", 2361153066], + [199, 7, 1557, "Metrics/AbcSize: Assignment Branch Condition size for `apply_match_refiner!` is too high. [<10, 28, 12> 32.06/17]", 2386945712], + [199, 7, 1557, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_match_refiner!` is too high. [13/7]", 2386945712], + [199, 7, 1557, "Metrics/MethodLength: Method has too many lines. [31/10]", 2386945712], + [199, 7, 1557, "Metrics/PerceivedComplexity: Perceived complexity for `apply_match_refiner!` is too high. [13/8]", 2386945712] + ], + "lib/ast/merge/file_analyzable.rb:607555963": [ + [36, 5, 31229, "Metrics/ModuleLength: Module has too many lines. [316/100]", 1247752256], + [99, 19, 9, "Style/NumericPredicate: Use `index.negative?` instead of `index < 0`.", 4215255415], + [148, 7, 793, "Metrics/MethodLength: Method has too many lines. [22/10]", 1467470910], + [202, 7, 771, "Metrics/MethodLength: Method has too many lines. [16/10]", 1412317163], + [344, 7, 844, "Metrics/MethodLength: Method has too many lines. [12/10]", 2335919661], + [369, 7, 730, "Metrics/MethodLength: Method has too many lines. [11/10]", 1047958652], + [431, 7, 863, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_layout_owned_comment_attachment` is too high. [<0, 20, 4> 20.4/17]", 3284843691], + [431, 7, 863, "Metrics/MethodLength: Method has too many lines. [17/10]", 3284843691], + [481, 7, 683, "Metrics/MethodLength: Method has too many lines. [15/10]", 241044926], + [520, 14, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [614, 7, 6095, "Metrics/AbcSize: Assignment Branch Condition size for `generate_signature` is too high. [<4, 21, 13> 25.02/17]", 2828809875], + [614, 7, 6095, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `generate_signature` is too high. [11/7]", 2828809875], + [614, 7, 6095, "Metrics/MethodLength: Method has too many lines. [30/10]", 2828809875], + [614, 7, 6095, "Metrics/PerceivedComplexity: Perceived complexity for `generate_signature` is too high. [14/8]", 2828809875], + [676, 24, 390, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 3279112483] + ], + "lib/ast/merge/freeze_node_base.rb:2110274026": [ + [59, 5, 14572, "Metrics/ClassLength: Class has too many lines. [171/100]", 3038607603], + [108, 25, 545, "Style/MutableConstant: Freeze mutable objects assigned to constants.", 2366014160], + [186, 9, 1100, "Metrics/MethodLength: Method has too many lines. [15/10]", 2506841532], + [288, 7, 758, "Metrics/MethodLength: Method has too many lines. [11/10]", 136868205], + [288, 21, 276, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 1720059801], + [335, 7, 660, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `reason` is too high. [8/7]", 3127566048], + [418, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] + ], + "lib/ast/merge/healer.rb:3642412735": [ + [18, 7, 588, "Metrics/MethodLength: Method has too many lines. [15/10]", 3172269921], + [18, 17, 84, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1781025196], + [41, 7, 687, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `filter_items` is too high. [8/7]", 1200842691], + [41, 7, 687, "Metrics/MethodLength: Method has too many lines. [17/10]", 1200842691], + [41, 7, 687, "Metrics/PerceivedComplexity: Perceived complexity for `filter_items` is too high. [9/8]", 1200842691], + [41, 23, 130, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 33939503] + ], + "lib/ast/merge/jaccard_similarity.rb:678558736": [ + [87, 19, 1, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 177604], + [87, 22, 1, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 177607] + ], + "lib/ast/merge/key_path_partial_template_merger_base.rb:1818613864": [ + [22, 5, 6114, "Metrics/ClassLength: Class has too many lines. [155/100]", 1269962119], + [43, 21, 214, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 3637591635], + [68, 7, 489, "Metrics/MethodLength: Method has too many lines. [12/10]", 3170411580], + [118, 7, 640, "Metrics/AbcSize: Assignment Branch Condition size for `find_key_path` is too high. [<8, 14, 10> 18.97/17]", 2613403604], + [118, 7, 640, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_key_path` is too high. [8/7]", 2613403604], + [118, 7, 640, "Metrics/MethodLength: Method has too many lines. [16/10]", 2613403604], + [118, 7, 640, "Metrics/PerceivedComplexity: Perceived complexity for `find_key_path` is too high. [9/8]", 2613403604], + [140, 7, 536, "Metrics/MethodLength: Method has too many lines. [17/10]", 3598062652], + [168, 7, 804, "Metrics/MethodLength: Method has too many lines. [19/10]", 2773364183] + ], + "lib/ast/merge/layout.rb:3670500101": [ + [23, 36, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] + ], + "lib/ast/merge/layout/augmenter.rb:2556116722": [ + [8, 7, 5498, "Metrics/ClassLength: Class has too many lines. [129/100]", 3693754698], + [21, 23, 125, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 3395039982], + [53, 9, 1795, "Metrics/AbcSize: Assignment Branch Condition size for `build!` is too high. [<20, 32, 17> 41.39/17]", 3542913254], + [53, 9, 1795, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build!` is too high. [15/7]", 3542913254], + [53, 9, 1795, "Metrics/MethodLength: Method has too many lines. [43/10]", 3542913254], + [53, 9, 1795, "Metrics/PerceivedComplexity: Perceived complexity for `build!` is too high. [15/8]", 3542913254], + [58, 11, 1227, "Metrics/BlockLength: Block has too many lines. [29/25]", 55360131], + [105, 9, 504, "Metrics/MethodLength: Method has too many lines. [16/10]", 1953725517] + ], + "lib/ast/merge/layout/gap.rb:1678106201": [ + [11, 7, 7558, "Metrics/ClassLength: Class has too many lines. [151/100]", 2254377349], + [23, 9, 655, "Metrics/MethodLength: Method has too many lines. [11/10]", 3584854768], + [23, 23, 146, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 361396001], + [157, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859545], + [162, 9, 303, "Metrics/MethodLength: Method has too many lines. [12/10]", 2236444774], + [203, 9, 688, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_adjacency!` is too high. [10/7]", 1112786311], + [203, 9, 688, "Metrics/MethodLength: Method has too many lines. [13/10]", 1112786311] + ], + "lib/ast/merge/match_refiner_base.rb:1760054866": [ + [248, 7, 503, "Metrics/MethodLength: Method has too many lines. [11/10]", 2844230268], + [275, 7, 1056, "Metrics/AbcSize: Assignment Branch Condition size for `greedy_match` is too high. [<9, 24, 8> 26.85/17]", 2497617815], + [275, 7, 1056, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `greedy_match` is too high. [8/7]", 2497617815], + [275, 7, 1056, "Metrics/MethodLength: Method has too many lines. [24/10]", 2497617815] + ], + "lib/ast/merge/merge_result_base.rb:764500297": [ + [17, 5, 18646, "Metrics/ClassLength: Class has too many lines. [335/100]", 314460772], + [88, 21, 187, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1067369198], + [187, 7, 843, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_blank_line_runs!` is too high. [<12, 12, 10> 19.7/17]", 2347011594], + [187, 7, 843, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_blank_line_runs!` is too high. [9/7]", 2347011594], + [187, 7, 843, "Metrics/MethodLength: Method has too many lines. [22/10]", 2347011594], + [187, 7, 843, "Metrics/PerceivedComplexity: Perceived complexity for `normalize_blank_line_runs!` is too high. [10/8]", 2347011594], + [227, 7, 1004, "Metrics/MethodLength: Method has too many lines. [21/10]", 59539336], + [227, 35, 211, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 709487711], + [266, 7, 602, "Metrics/MethodLength: Method has too many lines. [13/10]", 320027623], + [341, 7, 927, "Metrics/AbcSize: Assignment Branch Condition size for `validate_review_state_compatibility!` is too high. [<8, 15, 4> 17.46/17]", 1596840080], + [341, 7, 927, "Metrics/MethodLength: Method has too many lines. [16/10]", 1596840080], + [403, 7, 936, "Metrics/AbcSize: Assignment Branch Condition size for `review_state_metadata` is too high. [<7, 18, 4> 19.72/17]", 4128292066], + [403, 7, 936, "Metrics/MethodLength: Method has too many lines. [14/10]", 4128292066], + [413, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 20421901], + [438, 7, 1194, "Metrics/MethodLength: Method has too many lines. [21/10]", 4289697646], + [448, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3342583337] + ], + "lib/ast/merge/merger_config.rb:3582657829": [ + [46, 5, 10581, "Metrics/ClassLength: Class has too many lines. [148/100]", 1598770872], + [96, 21, 234, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 720509970] + ], + "lib/ast/merge/navigable/injection_point_finder.rb:4117743218": [ + [45, 9, 1707, "Metrics/AbcSize: Assignment Branch Condition size for `find` is too high. [<9, 18, 17> 26.34/17]", 1445381162], + [45, 9, 1707, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find` is too high. [15/7]", 1445381162], + [45, 9, 1707, "Metrics/MethodLength: Method has too many lines. [28/10]", 1445381162], + [45, 9, 1707, "Metrics/PerceivedComplexity: Perceived complexity for `find` is too high. [16/8]", 1445381162], + [45, 17, 156, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 3876813166] + ], + "lib/ast/merge/navigable/statement.rb:3050515622": [ + [42, 7, 11078, "Metrics/ClassLength: Class has too many lines. [179/100]", 2550894515], + [96, 11, 550, "Metrics/AbcSize: Assignment Branch Condition size for `find_matching` is too high. [<7, 16, 12> 21.19/17]", 3492534565], + [96, 11, 550, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_matching` is too high. [12/7]", 3492534565], + [96, 11, 550, "Metrics/PerceivedComplexity: Perceived complexity for `find_matching` is too high. [12/8]", 3492534565], + [222, 13, 20, "Naming/PredicatePrefix: Rename `has_tree_navigation?` to `tree_navigation?`.", 733442156] + ], + "lib/ast/merge/node_typing.rb:4008165135": [ + [175, 9, 694, "Metrics/MethodLength: Method has too many lines. [12/10]", 777909930], + [213, 9, 891, "Metrics/AbcSize: Assignment Branch Condition size for `find_typing_callable` is too high. [<3, 23, 13> 26.59/17]", 3835052858], + [213, 9, 891, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_typing_callable` is too high. [14/7]", 3835052858], + [213, 9, 891, "Metrics/PerceivedComplexity: Perceived complexity for `find_typing_callable` is too high. [14/8]", 3835052858] + ], + "lib/ast/merge/node_wrapper_base.rb:3796877358": [ + [62, 5, 10228, "Metrics/ClassLength: Class has too many lines. [135/100]", 3832956007], + [92, 21, 81, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 4261369704] + ], + "lib/ast/merge/owner_selection.rb:2568070127": [ + [9, 7, 757, "Metrics/MethodLength: Method has too many lines. [13/10]", 2069564552] + ], + "lib/ast/merge/partial_template_merger_base.rb:2252899061": [ + [27, 5, 16780, "Metrics/ClassLength: Class has too many lines. [266/100]", 2205844189], + [48, 23, 81, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2112244807], + [106, 7, 757, "Metrics/MethodLength: Method has too many lines. [11/10]", 571708764], + [106, 21, 293, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 871709580], + [135, 7, 788, "Metrics/AbcSize: Assignment Branch Condition size for `merge` is too high. [<4, 19, 5> 20.05/17]", 467674580], + [135, 7, 788, "Metrics/MethodLength: Method has too many lines. [13/10]", 467674580], + [213, 7, 533, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_matcher` is too high. [<7, 20, 6> 22.02/17]", 1798972396], + [238, 7, 922, "Metrics/MethodLength: Method has too many lines. [25/10]", 1846154069], + [242, 25, 37, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 939456830], + [251, 25, 31, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 1024894473], + [268, 7, 1905, "Metrics/AbcSize: Assignment Branch Condition size for `perform_section_merge` is too high. [<13, 15, 2> 19.95/17]", 2711014340], + [268, 7, 1905, "Metrics/MethodLength: Method has too many lines. [34/10]", 2711014340], + [316, 50, 15, "Lint/UnusedMethodArgument: Unused method argument - `section_context`.", 2872123372], + [334, 7, 690, "Metrics/MethodLength: Method has too many lines. [14/10]", 1807124523], + [367, 7, 1122, "Metrics/AbcSize: Assignment Branch Condition size for `build_merged_content` is too high. [<1, 29, 14> 32.22/17]", 3938410418], + [367, 7, 1122, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_merged_content` is too high. [15/7]", 3938410418], + [367, 7, 1122, "Metrics/MethodLength: Method has too many lines. [18/10]", 3938410418], + [367, 7, 1122, "Metrics/PerceivedComplexity: Perceived complexity for `build_merged_content` is too high. [15/8]", 3938410418], + [397, 7, 596, "Metrics/MethodLength: Method has too many lines. [12/10]", 2602121883], + [397, 32, 144, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1463491208], + [414, 7, 1589, "Metrics/AbcSize: Assignment Branch Condition size for `source_splice_plan_for` is too high. [<6, 18, 9> 21/17]", 2889667289], + [414, 7, 1589, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `source_splice_plan_for` is too high. [9/7]", 2889667289], + [414, 7, 1589, "Metrics/MethodLength: Method has too many lines. [30/10]", 2889667289], + [414, 7, 1589, "Metrics/PerceivedComplexity: Perceived complexity for `source_splice_plan_for` is too high. [9/8]", 2889667289] + ], + "lib/ast/merge/recipe/config.rb:3990762705": [ + [54, 7, 14970, "Metrics/ClassLength: Class has too many lines. [296/100]", 2492031021], + [142, 9, 673, "Metrics/MethodLength: Method has too many lines. [12/10]", 3011978845], + [170, 9, 484, "Metrics/MethodLength: Method has too many lines. [15/10]", 183356432], + [246, 9, 710, "Metrics/AbcSize: Assignment Branch Condition size for `parse_injection` is too high. [<8, 13, 8> 17.23/17]", 641239814], + [246, 9, 710, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_injection` is too high. [9/7]", 641239814], + [246, 9, 710, "Metrics/MethodLength: Method has too many lines. [16/10]", 641239814], + [246, 9, 710, "Metrics/PerceivedComplexity: Perceived complexity for `parse_injection` is too high. [9/8]", 641239814], + [278, 9, 871, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_step` is too high. [8/7]", 3989307721], + [278, 9, 871, "Metrics/MethodLength: Method has too many lines. [20/10]", 3989307721], + [338, 9, 1758, "Metrics/AbcSize: Assignment Branch Condition size for `parse_step_merge_overrides` is too high. [<11, 43, 25> 50.94/17]", 806370438], + [338, 9, 1758, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_step_merge_overrides` is too high. [22/7]", 806370438], + [338, 9, 1758, "Metrics/MethodLength: Method has too many lines. [30/10]", 806370438], + [338, 9, 1758, "Metrics/PerceivedComplexity: Perceived complexity for `parse_step_merge_overrides` is too high. [22/8]", 806370438], + [373, 9, 566, "Metrics/MethodLength: Method has too many lines. [14/10]", 3671206955], + [391, 9, 547, "Metrics/MethodLength: Method has too many lines. [16/10]", 3273587697], + [459, 9, 799, "Metrics/AbcSize: Assignment Branch Condition size for `validate_injection!` is too high. [<2, 15, 12> 19.31/17]", 1665903587], + [459, 9, 799, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_injection!` is too high. [13/7]", 1665903587], + [459, 9, 799, "Metrics/MethodLength: Method has too many lines. [11/10]", 1665903587], + [459, 9, 799, "Metrics/PerceivedComplexity: Perceived complexity for `validate_injection!` is too high. [13/8]", 1665903587] + ], + "lib/ast/merge/recipe/preset.rb:2311326866": [ + [195, 9, 662, "Metrics/MethodLength: Method has too many lines. [12/10]", 1640897447] + ], + "lib/ast/merge/recipe/runner.rb:2243867806": [ + [27, 7, 28612, "Metrics/ClassLength: Class has too many lines. [547/100]", 79000832], + [73, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1411864995], + [77, 23, 136, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1636278032], + [92, 9, 849, "Metrics/MethodLength: Method has too many lines. [14/10]", 3083064345], + [128, 24, 129, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2642826282], + [210, 9, 788, "Metrics/MethodLength: Method has too many lines. [23/10]", 743008161], + [241, 9, 3397, "Metrics/AbcSize: Assignment Branch Condition size for `create_partial_template_merger` is too high. [<3, 52, 16> 54.49/17]", 2086180075], + [241, 9, 3397, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `create_partial_template_merger` is too high. [14/7]", 2086180075], + [241, 9, 3397, "Metrics/MethodLength: Method has too many lines. [63/10]", 2086180075], + [241, 9, 3397, "Metrics/PerceivedComplexity: Perceived complexity for `create_partial_template_merger` is too high. [13/8]", 2086180075], + [250, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2857356312], + [274, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177538], + [312, 9, 2210, "Metrics/AbcSize: Assignment Branch Condition size for `create_smart_merger` is too high. [<1, 39, 7> 39.64/17]", 1694660188], + [312, 9, 2210, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `create_smart_merger` is too high. [8/7]", 1694660188], + [312, 9, 2210, "Metrics/MethodLength: Method has too many lines. [45/10]", 1694660188], + [357, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 195423462], + [370, 9, 1087, "Metrics/MethodLength: Method has too many lines. [24/10]", 3850049530], + [370, 31, 124, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3466458723], + [401, 9, 1008, "Metrics/MethodLength: Method has too many lines. [19/10]", 2010895303], + [401, 25, 143, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2360959504], + [424, 9, 1263, "Metrics/AbcSize: Assignment Branch Condition size for `execute_partial_merge_step` is too high. [<3, 22, 1> 22.23/17]", 2850918453], + [424, 9, 1263, "Metrics/MethodLength: Method has too many lines. [25/10]", 2850918453], + [453, 9, 835, "Metrics/MethodLength: Method has too many lines. [14/10]", 1478843287], + [471, 9, 808, "Metrics/MethodLength: Method has too many lines. [15/10]", 1127254660], + [471, 37, 155, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 838578768], + [491, 9, 1126, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_smart_merge_result` is too high. [<8, 17, 12> 22.29/17]", 1786697339], + [491, 9, 1126, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_smart_merge_result` is too high. [9/7]", 1786697339], + [491, 9, 1126, "Metrics/MethodLength: Method has too many lines. [23/10]", 1786697339], + [491, 9, 1126, "Metrics/PerceivedComplexity: Perceived complexity for `normalize_smart_merge_result` is too high. [11/8]", 1786697339], + [518, 9, 2523, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_script_step_result` is too high. [<5, 40, 32> 51.47/17]", 2162420067], + [518, 9, 2523, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_script_step_result` is too high. [26/7]", 2162420067], + [518, 9, 2523, "Metrics/MethodLength: Method has too many lines. [48/10]", 2162420067], + [518, 9, 2523, "Metrics/PerceivedComplexity: Perceived complexity for `normalize_script_step_result` is too high. [29/8]", 2162420067], + [547, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 93872446], + [556, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 1527250939], + [586, 11, 155, "Style/HashTransformKeys: Prefer `transform_keys` over `each_with_object`.", 837503672], + [591, 9, 698, "Metrics/MethodLength: Method has too many lines. [11/10]", 1116310304], + [635, 9, 2582, "Metrics/AbcSize: Assignment Branch Condition size for `create_result_from_steps` is too high. [<8, 30, 31> 43.87/17]", 2040042265], + [635, 9, 2582, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `create_result_from_steps` is too high. [23/7]", 2040042265], + [635, 9, 2582, "Metrics/MethodLength: Method has too many lines. [60/10]", 2040042265], + [635, 9, 2582, "Metrics/PerceivedComplexity: Perceived complexity for `create_result_from_steps` is too high. [27/8]", 2040042265], + [635, 37, 133, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 789257106], + [649, 42, 40, "Style/SymbolProc: Pass `&:has_anchor` as an argument to `any?` instead of a block.", 4233626321] + ], + "lib/ast/merge/recipe/script_loader.rb:1397873218": [ + [145, 9, 1126, "Metrics/AbcSize: Assignment Branch Condition size for `load_script_file` is too high. [<6, 19, 4> 20.32/17]", 3417625171], + [145, 9, 1126, "Metrics/MethodLength: Method has too many lines. [17/10]", 3417625171] + ], + "lib/ast/merge/rspec/comment_behavior_matrix_adapters.rb:3429217018": [ + [9, 46, 341, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 532439002], + [31, 9, 901, "Metrics/MethodLength: Method has too many lines. [11/10]", 584608092], + [31, 59, 308, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 883491898], + [54, 9, 1269, "Metrics/MethodLength: Method has too many lines. [20/10]", 1021031182], + [65, 51, 6, "Lint/UnusedBlockArgument: Unused block argument - `inline`. If it's necessary, use `_` or `_inline` as an argument name to indicate that it won't be used.", 1605470060], + [69, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 4226982364], + [70, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1440420861] + ], + "lib/ast/merge/rspec/dependency_tags_config.rb:3604516304": [ + [30, 1, 2102, "Metrics/BlockLength: Block has too many lines. [26/25]", 113766065] + ], + "lib/ast/merge/rspec/merge_gem_registry.rb:3009576030": [ + [58, 7, 12129, "Metrics/ModuleLength: Module has too many lines. [158/100]", 335549747], + [90, 9, 780, "Metrics/MethodLength: Method has too many lines. [14/10]", 978965737], + [90, 21, 99, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3580433546], + [118, 9, 650, "Metrics/MethodLength: Method has too many lines. [12/10]", 3143160805], + [118, 31, 130, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2575863904], + [143, 9, 823, "Metrics/MethodLength: Method has too many lines. [17/10]", 4033116153], + [200, 9, 765, "Metrics/AbcSize: Assignment Branch Condition size for `register_known_gems` is too high. [<3, 17, 3> 17.52/17]", 1367620151], + [200, 9, 765, "Metrics/MethodLength: Method has too many lines. [17/10]", 1367620151] + ], + "lib/ast/merge/rspec/shared_examples.rb:2878318351": [ + [29, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 330577472] + ], + "lib/ast/merge/rspec/shared_examples/comment_behavior_matrix.rb:3695671858": [ + [36, 1, 27847, "Metrics/BlockLength: Block has too many lines. [540/25]", 3796645407], + [38, 55, 15, "Style/SymbolProc: Pass `&:value` as an argument to `lambda` instead of a block.", 1808354951], + [42, 64, 23, "Style/SymbolProc: Pass `&:statements` as an argument to `lambda` instead of a block.", 277221641], + [69, 3, 4455, "Metrics/BlockLength: Block has too many lines. [82/25]", 3672334777], + [72, 5, 1763, "Metrics/BlockLength: Block has too many lines. [34/25]", 164750821], + [165, 3, 22093, "Metrics/BlockLength: Block has too many lines. [429/25]", 229312375], + [292, 5, 1918, "Metrics/BlockLength: Block has too many lines. [29/25]", 1312741055], + [323, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1902517440], + [325, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 173482512], + [328, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 167607404], + [476, 5, 1605, "Metrics/BlockLength: Block has too many lines. [35/25]", 1943633697], + [677, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1902517440] + ], + "lib/ast/merge/rspec/shared_examples/conflict_resolver_base.rb:624045197": [ + [30, 1, 7893, "Metrics/BlockLength: Block has too many lines. [197/25]", 3450672926], + [37, 3, 1372, "Metrics/BlockLength: Block has too many lines. [33/25]", 3389152504], + [83, 3, 1206, "Metrics/BlockLength: Block has too many lines. [35/25]", 1580202348], + [128, 3, 1177, "Metrics/BlockLength: Block has too many lines. [33/25]", 2178974049], + [215, 3, 2443, "Metrics/BlockLength: Block has too many lines. [51/25]", 2538475273], + [219, 5, 1909, "Metrics/BlockLength: Block has too many lines. [35/25]", 880175101], + [279, 1, 2518, "Metrics/BlockLength: Block has too many lines. [74/25]", 958151448], + [286, 3, 2235, "Metrics/BlockLength: Block has too many lines. [70/25]", 2123260684], + [391, 1, 1317, "Metrics/BlockLength: Block has too many lines. [37/25]", 2321517041], + [439, 1, 1639, "Metrics/BlockLength: Block has too many lines. [37/25]", 276150366] + ], + "lib/ast/merge/rspec/shared_examples/debug_logger.rb:2747003588": [ + [23, 1, 4741, "Metrics/BlockLength: Block has too many lines. [121/25]", 3341338388], + [47, 3, 976, "Metrics/BlockLength: Block has too many lines. [27/25]", 2640321404], + [85, 3, 1452, "Metrics/BlockLength: Block has too many lines. [34/25]", 554663062] + ], + "lib/ast/merge/rspec/shared_examples/feature_profile.rb:4172143324": [ + [30, 1, 4249, "Metrics/BlockLength: Block has too many lines. [53/25]", 3787230403] + ], + "lib/ast/merge/rspec/shared_examples/file_analyzable.rb:2391547213": [ + [44, 1, 6468, "Metrics/BlockLength: Block has too many lines. [145/25]", 3744642916] + ], + "lib/ast/merge/rspec/shared_examples/freeze_node_base.rb:1711126715": [ + [23, 1, 5952, "Metrics/BlockLength: Block has too many lines. [157/25]", 3152271039], + [29, 3, 2836, "Metrics/BlockLength: Block has too many lines. [69/25]", 2082270913], + [115, 3, 1552, "Metrics/BlockLength: Block has too many lines. [46/25]", 4180117745] + ], + "lib/ast/merge/rspec/shared_examples/layout_attachment.rb:4130619694": [ + [30, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 1263574869], + [31, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 4282300883] + ], + "lib/ast/merge/rspec/shared_examples/layout_augmenter.rb:1928277603": [ + [18, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1311107624], + [19, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1311107624] + ], + "lib/ast/merge/rspec/shared_examples/merge_result_base.rb:2962043558": [ + [18, 1, 2330, "Metrics/BlockLength: Block has too many lines. [67/25]", 3496673178], + [53, 3, 1271, "Metrics/BlockLength: Block has too many lines. [42/25]", 2278976858] + ], + "lib/ast/merge/rspec/shared_examples/merger_config.rb:2413785902": [ + [18, 1, 8240, "Metrics/BlockLength: Block has too many lines. [193/25]", 3665443345], + [57, 3, 1628, "Metrics/BlockLength: Block has too many lines. [32/25]", 7828299], + [98, 3, 1266, "Metrics/BlockLength: Block has too many lines. [28/25]", 317929439], + [159, 3, 1740, "Metrics/BlockLength: Block has too many lines. [42/25]", 1736487820], + [217, 3, 1373, "Metrics/BlockLength: Block has too many lines. [30/25]", 442933563] + ], + "lib/ast/merge/rspec/shared_examples/recipe_preset_contract.rb:1495545061": [ + [7, 1, 2558, "Metrics/BlockLength: Block has too many lines. [51/25]", 4091815632] + ], + "lib/ast/merge/rspec/shared_examples/removal_mode_compliance.rb:3645548199": [ + [24, 1, 1860, "Metrics/BlockLength: Block has too many lines. [33/25]", 1115825136] + ], + "lib/ast/merge/rspec/shared_examples/reproducible_merge.rb:2276592459": [ + [51, 1, 2030, "Metrics/BlockLength: Block has too many lines. [52/25]", 563553381] + ], + "lib/ast/merge/rspec/shared_examples/reproducible_partial_merge.rb:524436129": [ + [3, 1, 2321, "Metrics/BlockLength: Block has too many lines. [44/25]", 3206099540] + ], + "lib/ast/merge/rspec/shared_examples/runtime_debug_contract.rb:4244040583": [ + [8, 1, 2808, "Metrics/BlockLength: Block has too many lines. [48/25]", 3274492878] + ], + "lib/ast/merge/rspec/shared_examples/unresolved_helper_contract.rb:2916431464": [ + [9, 1, 5998, "Metrics/BlockLength: Block has too many lines. [126/25]", 4174562424], + [94, 3, 1515, "Metrics/BlockLength: Block has too many lines. [32/25]", 1928238376] + ], + "lib/ast/merge/rspec/shared_examples/unresolved_review_state_transport_contract.rb:3368966854": [ + [14, 1, 3386, "Metrics/BlockLength: Block has too many lines. [68/25]", 2910343214], + [65, 3, 317, "Metrics/MethodLength: Method has too many lines. [12/10]", 2653897690] + ], + "lib/ast/merge/rspec/shared_examples/unresolved_runtime_contract.rb:1424234700": [ + [10, 1, 2652, "Metrics/BlockLength: Block has too many lines. [42/25]", 960283638], + [31, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2892620242], + [46, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193437756] + ], + "lib/ast/merge/rspec/shared_examples/unresolved_runtime_debug_contract.rb:2897026147": [ + [25, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2418171787], + [26, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 235635831] + ], + "lib/ast/merge/ruleset/config.rb:4242726919": [ + [7, 7, 3664, "Metrics/ClassLength: Class has too many lines. [101/100]", 1968929597], + [36, 9, 933, "Metrics/MethodLength: Method has too many lines. [15/10]", 3334511209], + [36, 23, 319, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [15/5]", 1652945408], + [65, 9, 515, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 18, 3> 18.25/17]", 2614325513], + [65, 9, 515, "Metrics/MethodLength: Method has too many lines. [14/10]", 2614325513] + ], + "lib/ast/merge/ruleset/feature_profile.rb:3980745364": [ + [12, 7, 6054, "Metrics/ClassLength: Class has too many lines. [155/100]", 2818730231], + [29, 9, 1351, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<17, 18, 7> 25.73/17]", 2248702332], + [29, 9, 1351, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `initialize` is too high. [8/7]", 2248702332], + [29, 9, 1351, "Metrics/MethodLength: Method has too many lines. [17/10]", 2248702332], + [29, 23, 422, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 1415781648], + [138, 9, 1509, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 36, 6> 36.5/17]", 3793816437], + [138, 9, 1509, "Metrics/MethodLength: Method has too many lines. [31/10]", 3793816437] + ], + "lib/ast/merge/ruleset/parser.rb:698282871": [ + [7, 7, 9396, "Metrics/ClassLength: Class has too many lines. [199/100]", 1305123525], + [43, 9, 473, "Metrics/AbcSize: Assignment Branch Condition size for `parse` is too high. [<0, 17, 2> 17.12/17]", 1400394586], + [43, 9, 473, "Metrics/MethodLength: Method has too many lines. [12/10]", 1400394586], + [71, 9, 1053, "Metrics/MethodLength: Method has too many lines. [24/10]", 1569959910], + [101, 9, 1123, "Metrics/AbcSize: Assignment Branch Condition size for `parse_single_value_directive!` is too high. [<7, 13, 10> 17.83/17]", 706129883], + [101, 9, 1123, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_single_value_directive!` is too high. [8/7]", 706129883], + [101, 9, 1123, "Metrics/MethodLength: Method has too many lines. [24/10]", 706129883], + [170, 9, 605, "Metrics/MethodLength: Method has too many lines. [11/10]", 336127382], + [186, 9, 687, "Metrics/MethodLength: Method has too many lines. [11/10]", 2962844982] + ], + "lib/ast/merge/ruleset/profile_vocabulary.rb:2359837647": [ + [7, 7, 3956, "Metrics/ModuleLength: Module has too many lines. [107/100]", 1680256705] + ], + "lib/ast/merge/ruleset/runtime_declaration.rb:1016848190": [ + [18, 9, 819, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<11, 13, 5> 17.75/17]", 4043304883], + [18, 9, 819, "Metrics/MethodLength: Method has too many lines. [11/10]", 4043304883], + [18, 23, 240, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 3868000276], + [49, 9, 551, "Metrics/MethodLength: Method has too many lines. [13/10]", 448215861] + ], + "lib/ast/merge/ruleset/runtime_translator.rb:3255492631": [ + [9, 11, 816, "Metrics/MethodLength: Method has too many lines. [19/10]", 225301385], + [31, 11, 986, "Metrics/AbcSize: Assignment Branch Condition size for `feature_profile` is too high. [<1, 17, 0> 17.03/17]", 1395467476], + [31, 11, 986, "Metrics/MethodLength: Method has too many lines. [19/10]", 1395467476] + ], + "lib/ast/merge/ruleset/support_style_resolver.rb:508975884": [ + [9, 11, 864, "Metrics/MethodLength: Method has too many lines. [22/10]", 3902551296] + ], + "lib/ast/merge/runtime/child_result.rb:4083710804": [ + [16, 9, 698, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<7, 16, 2> 17.58/17]", 2208366179], + [16, 23, 227, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 3688358290], + [38, 9, 584, "Metrics/MethodLength: Method has too many lines. [11/10]", 3113479157], + [55, 11, 106, "Style/HashTransformKeys: Prefer `transform_keys` over `each_with_object`.", 4262612225] + ], + "lib/ast/merge/runtime/delegate.rb:3607371286": [ + [17, 23, 285, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 2793452069] + ], + "lib/ast/merge/runtime/diagnostic.rb:805162185": [ + [10, 23, 72, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1875462867] + ], + "lib/ast/merge/runtime/operation.rb:1030261783": [ + [20, 9, 767, "Metrics/MethodLength: Method has too many lines. [11/10]", 2728174753], + [20, 23, 278, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 694444911], + [100, 9, 617, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<2, 24, 6> 24.82/17]", 1175382849], + [100, 9, 617, "Metrics/MethodLength: Method has too many lines. [11/10]", 1175382849] + ], + "lib/ast/merge/runtime/resolution_case.rb:250040454": [ + [8, 9, 707, "Metrics/AbcSize: Assignment Branch Condition size for `from_h` is too high. [<1, 19, 6> 19.95/17]", 2592154170], + [29, 23, 189, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 818714714], + [81, 11, 111, "Style/HashTransformKeys: Prefer `transform_keys` over `each_with_object`.", 2712537644] + ], + "lib/ast/merge/runtime/root_session_support.rb:1917388966": [ + [10, 9, 2153, "Metrics/AbcSize: Assignment Branch Condition size for `start_runtime_root_session!` is too high. [<5, 20, 3> 20.83/17]", 1888056651], + [10, 9, 2153, "Metrics/MethodLength: Method has too many lines. [41/10]", 1888056651], + [10, 40, 421, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 2297301282], + [60, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2312419928], + [68, 9, 771, "Metrics/MethodLength: Method has too many lines. [13/10]", 1787620786], + [68, 43, 191, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3635875424] + ], + "lib/ast/merge/runtime/session.rb:628419040": [ + [66, 9, 1203, "Metrics/AbcSize: Assignment Branch Condition size for `summary` is too high. [<5, 43, 13> 45.2/17]", 550888870], + [66, 9, 1203, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `summary` is too high. [14/7]", 550888870], + [66, 9, 1203, "Metrics/MethodLength: Method has too many lines. [20/10]", 550888870], + [66, 9, 1203, "Metrics/PerceivedComplexity: Perceived complexity for `summary` is too high. [14/8]", 550888870] + ], + "lib/ast/merge/runtime/surface.rb:3684795905": [ + [17, 23, 230, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 469229117], + [44, 9, 418, "Metrics/MethodLength: Method has too many lines. [11/10]", 998969973] + ], + "lib/ast/merge/section_typing.rb:4261989256": [ + [112, 9, 710, "Metrics/MethodLength: Method has too many lines. [15/10]", 3600335459], + [176, 9, 67, "Lint/MissingSuper: Call `super` to initialize state of the parent class.", 4077537758], + [216, 9, 85, "Lint/MissingSuper: Call `super` to initialize state of the parent class.", 3648782014], + [245, 9, 1446, "Metrics/AbcSize: Assignment Branch Condition size for `merge_sections` is too high. [<13, 20, 12> 26.7/17]", 525095633], + [245, 9, 1446, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_sections` is too high. [12/7]", 525095633], + [245, 9, 1446, "Metrics/MethodLength: Method has too many lines. [28/10]", 525095633], + [245, 9, 1446, "Metrics/PerceivedComplexity: Perceived complexity for `merge_sections` is too high. [13/8]", 525095633] + ], + "lib/ast/merge/smart_merger_base.rb:4189972287": [ + [109, 5, 15324, "Metrics/ClassLength: Class has too many lines. [172/100]", 3547407870], + [214, 7, 1974, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<20, 14, 5> 24.92/17]", 2211610736], + [214, 7, 1974, "Metrics/MethodLength: Method has too many lines. [23/10]", 2211610736], + [214, 21, 443, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [15/5]", 1530523783], + [424, 7, 1312, "Metrics/AbcSize: Assignment Branch Condition size for `parse_and_analyze` is too high. [<7, 25, 11> 28.2/17]", 1640248187], + [424, 7, 1312, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_and_analyze` is too high. [10/7]", 1640248187], + [424, 7, 1312, "Metrics/MethodLength: Method has too many lines. [15/10]", 1640248187], + [424, 7, 1312, "Metrics/PerceivedComplexity: Perceived complexity for `parse_and_analyze` is too high. [10/8]", 1640248187], + [517, 12, 52, "Style/NumericPredicate: Use `result_class.instance_method(:initialize).arity.zero?` instead of `result_class.instance_method(:initialize).arity == 0`.", 1312375552] + ], + "lib/ast/merge/structural_edit/boundary.rb:2838060197": [ + [20, 23, 93, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3901214537], + [41, 38, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [51, 38, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [60, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087440865] + ], + "lib/ast/merge/structural_edit/boundary_support.rb:2036464761": [ + [31, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861061], + [32, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 97596930] + ], + "lib/ast/merge/structural_edit/plan_set.rb:538463647": [ + [116, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 2855200692] + ], + "lib/ast/merge/structural_edit/rehome_plan.rb:2152178780": [ + [23, 23, 123, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3433617242], + [100, 9, 519, "Metrics/MethodLength: Method has too many lines. [11/10]", 318006380], + [136, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 2367140872] + ], + "lib/ast/merge/structural_edit/remove_plan.rb:1189569486": [ + [11, 7, 9717, "Metrics/ClassLength: Class has too many lines. [160/100]", 3652701475], + [25, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861091], + [27, 9, 1409, "Metrics/MethodLength: Method has too many lines. [22/10]", 3344870777], + [27, 23, 255, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 3970946607], + [28, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 1637059282], + [36, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859104], + [196, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 1617827253], + [224, 9, 1032, "Metrics/MethodLength: Method has too many lines. [20/10]", 968444047] + ], + "lib/ast/merge/structural_edit/remove_plan_support.rb:877461974": [ + [9, 9, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631], + [19, 9, 1429, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_remove_plan` is too high. [8/7]", 4091314919], + [19, 9, 1429, "Metrics/MethodLength: Method has too many lines. [32/10]", 4091314919] + ], + "lib/ast/merge/structural_edit/splice_plan.rb:2675806114": [ + [39, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1683893295], + [42, 23, 203, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3653221702], + [113, 9, 517, "Metrics/MethodLength: Method has too many lines. [11/10]", 634912361] + ], + "lib/ast/merge/structured_emitter_provenance_support.rb:445323365": [ + [5, 5, 41, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::StructuredEmitterProvenanceSupport`.", 3548518830] + ], + "lib/ast/merge/structured_review_apply_support.rb:3649736380": [ + [5, 5, 35, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::StructuredReviewApplySupport`.", 1282380463], + [22, 7, 782, "Metrics/AbcSize: Assignment Branch Condition size for `current_output_span_for` is too high. [<6, 19, 11> 22.76/17]", 4137750179], + [22, 7, 782, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `current_output_span_for` is too high. [8/7]", 4137750179], + [22, 7, 782, "Metrics/MethodLength: Method has too many lines. [14/10]", 4137750179], + [42, 7, 595, "Metrics/MethodLength: Method has too many lines. [12/10]", 2080934521], + [60, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3151172498] + ], + "lib/ast/merge/text/conflict_resolver.rb:989169286": [ + [19, 7, 9182, "Metrics/ClassLength: Class has too many lines. [159/100]", 1070563745], + [28, 23, 211, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2639535499], + [53, 9, 2507, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_batch` is too high. [<15, 34, 5> 37.5/17]", 825130797], + [53, 9, 2507, "Metrics/MethodLength: Method has too many lines. [44/10]", 825130797], + [196, 9, 2458, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_matched_pair` is too high. [<2, 30, 11> 32.02/17]", 4037214978], + [196, 9, 2458, "Metrics/MethodLength: Method has too many lines. [46/10]", 4037214978] + ], + "lib/ast/merge/text/file_analysis.rb:1530312707": [ + [106, 9, 1484, "Metrics/AbcSize: Assignment Branch Condition size for `parse_statements` is too high. [<11, 15, 6> 19.54/17]", 1858083071], + [106, 9, 1484, "Metrics/MethodLength: Method has too many lines. [34/10]", 1858083071], + [160, 9, 449, "Metrics/MethodLength: Method has too many lines. [11/10]", 1902035813] + ], + "lib/ast/merge/text/line_node.rb:3385927013": [ + [145, 9, 699, "Metrics/MethodLength: Method has too many lines. [17/10]", 2201872249] + ], + "lib/ast/merge/text/section_splitter.rb:129704488": [ + [141, 9, 1442, "Metrics/AbcSize: Assignment Branch Condition size for `merge_section_lists` is too high. [<13, 20, 6> 24.6/17]", 3551729170], + [141, 9, 1442, "Metrics/MethodLength: Method has too many lines. [23/10]", 3551729170], + [322, 9, 1767, "Metrics/AbcSize: Assignment Branch Condition size for `split` is too high. [<11, 29, 10> 32.59/17]", 2207922758], + [322, 9, 1767, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split` is too high. [10/7]", 2207922758], + [322, 9, 1767, "Metrics/MethodLength: Method has too many lines. [46/10]", 2207922758], + [322, 9, 1767, "Metrics/PerceivedComplexity: Perceived complexity for `split` is too high. [13/8]", 2207922758], + [328, 11, 1019, "Metrics/BlockLength: Block has too many lines. [26/25]", 1561634792] + ], + "lib/ast/merge/text/smart_merger.rb:2405807903": [ + [67, 9, 831, "Metrics/MethodLength: Method has too many lines. [12/10]", 584426022], + [67, 23, 350, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 3074172637] + ], + "lib/ast/merge/trailing_groups/alignment_sort.rb:2593404330": [ + [40, 9, 513, "Metrics/MethodLength: Method has too many lines. [12/10]", 89360683] + ], + "lib/ast/merge/trailing_groups/core.rb:4231959665": [ + [61, 9, 812, "Metrics/MethodLength: Method has too many lines. [17/10]", 1777526069], + [101, 9, 998, "Metrics/AbcSize: Assignment Branch Condition size for `flush_ready_trailing_groups` is too high. [<8, 18, 15> 24.76/17]", 2397698441], + [101, 9, 998, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `flush_ready_trailing_groups` is too high. [13/7]", 2397698441], + [101, 9, 998, "Metrics/MethodLength: Method has too many lines. [17/10]", 2397698441], + [101, 9, 998, "Metrics/PerceivedComplexity: Perceived complexity for `flush_ready_trailing_groups` is too high. [13/8]", 2397698441] + ], + "lib/ast/merge/trailing_groups/dest_iterate.rb:3897205087": [ + [69, 9, 751, "Metrics/MethodLength: Method has too many lines. [12/10]", 3915657972], + [69, 47, 199, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2545849044] + ], + "lib/ast/merge/unresolved_support.rb:2881272494": [ + [7, 5, 24, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::UnresolvedSupport`.", 990281691], + [7, 5, 4392, "Metrics/ModuleLength: Module has too many lines. [116/100]", 3475162940], + [32, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [67, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [85, 7, 1038, "Metrics/MethodLength: Method has too many lines. [14/10]", 3139619197], + [85, 40, 338, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 71164914] + ], + "spec/ast/merge/ast_node_spec.rb:1362065144": [ + [3, 1, 8199, "Metrics/BlockLength: Block has too many lines. [254/25]", 1649868231], + [18, 3, 1030, "Metrics/BlockLength: Block has too many lines. [33/25]", 1409835577] + ], + "spec/ast/merge/block_directive_spec.rb:2305756581": [ + [3, 1, 5181, "Metrics/BlockLength: Block has too many lines. [138/25]", 1887900896], + [128, 3, 1391, "Metrics/BlockLength: Block has too many lines. [39/25]", 3626371694] + ], + "spec/ast/merge/comment/attachment_spec.rb:2571833836": [ + [3, 1, 5536, "Metrics/BlockLength: Block has too many lines. [150/25]", 1841571757], + [93, 3, 1639, "Metrics/BlockLength: Block has too many lines. [37/25]", 212730671] + ], + "spec/ast/merge/comment/augmenter_spec.rb:4266625483": [ + [3, 1, 9141, "Metrics/BlockLength: Block has too many lines. [212/25]", 530365996], + [16, 3, 6849, "Metrics/BlockLength: Block has too many lines. [154/25]", 503152628], + [200, 3, 1244, "Metrics/BlockLength: Block has too many lines. [33/25]", 3565041107] + ], + "spec/ast/merge/comment/block_spec.rb:4138473890": [ + [3, 1, 9021, "Metrics/BlockLength: Block has too many lines. [250/25]", 1617505173], + [8, 3, 1115, "Metrics/BlockLength: Block has too many lines. [27/25]", 2958989619], + [93, 3, 1127, "Metrics/BlockLength: Block has too many lines. [33/25]", 196340527], + [123, 45, 16, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 155572628], + [159, 3, 1432, "Metrics/BlockLength: Block has too many lines. [35/25]", 281400319] + ], + "spec/ast/merge/comment/c_style_tracker_base_spec.rb:3154319400": [ + [3, 1, 5816, "Metrics/BlockLength: Block has too many lines. [133/25]", 680831933], + [100, 3, 1450, "Metrics/BlockLength: Block has too many lines. [35/25]", 4153882185] + ], + "spec/ast/merge/comment/capability_spec.rb:2763521225": [ + [3, 1, 3522, "Metrics/BlockLength: Block has too many lines. [89/25]", 1487980773], + [4, 3, 1954, "Metrics/BlockLength: Block has too many lines. [41/25]", 160187362] + ], + "spec/ast/merge/comment/empty_spec.rb:1801324640": [ + [3, 1, 2584, "Metrics/BlockLength: Block has too many lines. [70/25]", 270179899], + [4, 3, 1047, "Metrics/BlockLength: Block has too many lines. [27/25]", 3056449816] + ], + "spec/ast/merge/comment/hash_tracker_base_spec.rb:3624528747": [ + [3, 1, 9653, "Metrics/BlockLength: Block has too many lines. [271/25]", 3748659406], + [8, 3, 1210, "Metrics/BlockLength: Block has too many lines. [37/25]", 2566766302], + [21, 7, 872, "Metrics/AbcSize: Assignment Branch Condition size for `extract_comments` is too high. [<7, 24, 5> 25.5/17]", 1213080161], + [21, 7, 872, "Metrics/MethodLength: Method has too many lines. [25/10]", 1213080161], + [275, 3, 1171, "Metrics/BlockLength: Block has too many lines. [29/25]", 1425466742] + ], + "spec/ast/merge/comment/line_spec.rb:1487829548": [ + [3, 1, 5291, "Metrics/BlockLength: Block has too many lines. [128/25]", 587604747], + [6, 3, 1573, "Metrics/BlockLength: Block has too many lines. [37/25]", 4105920006] + ], + "spec/ast/merge/comment/parser_spec.rb:2443973508": [ + [3, 1, 9855, "Metrics/BlockLength: Block has too many lines. [237/25]", 404174977], + [4, 3, 1013, "Metrics/BlockLength: Block has too many lines. [26/25]", 182655397], + [38, 3, 1282, "Metrics/BlockLength: Block has too many lines. [28/25]", 2303702609] + ], + "spec/ast/merge/comment/quoted_hash_line_parser_spec.rb:3795390831": [ + [3, 1, 1810, "Metrics/BlockLength: Block has too many lines. [44/25]", 2575838586], + [6, 3, 1700, "Metrics/BlockLength: Block has too many lines. [41/25]", 1553834548] + ], + "spec/ast/merge/comment/region_merge_policy_spec.rb:4175996936": [ + [3, 1, 3618, "Metrics/BlockLength: Block has too many lines. [75/25]", 4006378358], + [11, 3, 2752, "Metrics/BlockLength: Block has too many lines. [52/25]", 494211987] + ], + "spec/ast/merge/comment/region_spec.rb:2674736508": [ + [3, 1, 4033, "Metrics/BlockLength: Block has too many lines. [91/25]", 1828104331] + ], + "spec/ast/merge/comment/style_spec.rb:1875195890": [ + [3, 1, 4040, "Metrics/BlockLength: Block has too many lines. [101/25]", 2759361650] + ], + "spec/ast/merge/comment/support_style_spec.rb:1350169032": [ + [3, 1, 1577, "Metrics/BlockLength: Block has too many lines. [39/25]", 3414039011] + ], + "spec/ast/merge/comment/tracked_hash_adapter_spec.rb:1256807736": [ + [3, 1, 4482, "Metrics/BlockLength: Block has too many lines. [97/25]", 264417763], + [4, 3, 3101, "Metrics/BlockLength: Block has too many lines. [63/25]", 1050939978], + [81, 3, 1313, "Metrics/BlockLength: Block has too many lines. [30/25]", 515655104] + ], + "spec/ast/merge/comment_spec.rb:81945459": [ + [3, 1, 15888, "Metrics/BlockLength: Block has too many lines. [384/25]", 2229554982], + [4, 3, 3957, "Metrics/BlockLength: Block has too many lines. [84/25]", 660667217], + [5, 5, 1187, "Metrics/BlockLength: Block has too many lines. [26/25]", 241562105], + [105, 3, 1371, "Metrics/BlockLength: Block has too many lines. [30/25]", 1901983597], + [159, 3, 1296, "Metrics/BlockLength: Block has too many lines. [30/25]", 1749880380], + [239, 3, 1151, "Metrics/BlockLength: Block has too many lines. [28/25]", 183967322], + [272, 3, 2004, "Metrics/BlockLength: Block has too many lines. [45/25]", 2594323837], + [349, 3, 3220, "Metrics/BlockLength: Block has too many lines. [83/25]", 790417809], + [350, 5, 2347, "Metrics/BlockLength: Block has too many lines. [60/25]", 4016801881] + ], + "spec/ast/merge/composite_match_refiner_spec.rb:2888297870": [ + [3, 1, 6152, "Metrics/BlockLength: Block has too many lines. [143/25]", 3308692548], + [55, 3, 4118, "Metrics/BlockLength: Block has too many lines. [87/25]", 1405655464] + ], + "spec/ast/merge/conflict_resolver_base_spec.rb:3331938447": [ + [5, 1, 20643, "Metrics/BlockLength: Block has too many lines. [516/25]", 3129196558], + [14, 59, 14, "Lint/UnusedMethodArgument: Unused method argument - `template_index`.", 1809801172], + [14, 76, 10, "Lint/UnusedMethodArgument: Unused method argument - `dest_index`.", 2703999490], + [47, 61, 14, "Lint/UnusedMethodArgument: Unused method argument - `template_index`. You can also write as `resolve_node_pair(*)` if you want the method to accept any arguments but don't care about them.", 1809801172], + [47, 78, 10, "Lint/UnusedMethodArgument: Unused method argument - `dest_index`. You can also write as `resolve_node_pair(*)` if you want the method to accept any arguments but don't care about them.", 2703999490], + [105, 3, 17203, "Metrics/BlockLength: Block has too many lines. [425/25]", 1114912980], + [154, 5, 1797, "Metrics/BlockLength: Block has too many lines. [37/25]", 515146940], + [203, 5, 1373, "Metrics/BlockLength: Block has too many lines. [32/25]", 603210832], + [292, 5, 2874, "Metrics/BlockLength: Block has too many lines. [77/25]", 3918129775], + [341, 7, 1292, "Metrics/BlockLength: Block has too many lines. [34/25]", 1769555944], + [402, 5, 1857, "Metrics/BlockLength: Block has too many lines. [44/25]", 1516406612], + [456, 5, 1209, "Metrics/BlockLength: Block has too many lines. [31/25]", 430489898], + [514, 5, 2021, "Metrics/BlockLength: Block has too many lines. [37/25]", 144128170], + [515, 7, 1953, "Metrics/BlockLength: Block has too many lines. [35/25]", 1574966248], + [567, 5, 1500, "Metrics/BlockLength: Block has too many lines. [40/25]", 2509466150] + ], + "spec/ast/merge/content_match_refiner_spec.rb:4058001158": [ + [3, 1, 14348, "Metrics/BlockLength: Block has too many lines. [318/25]", 1171164704], + [25, 3, 1238, "Metrics/BlockLength: Block has too many lines. [29/25]", 2139810386], + [63, 3, 4077, "Metrics/BlockLength: Block has too many lines. [95/25]", 3471153375], + [325, 3, 2213, "Metrics/BlockLength: Block has too many lines. [37/25]", 3370370915] + ], + "spec/ast/merge/debug_logger_spec.rb:429510168": [ + [3, 1, 17306, "Metrics/BlockLength: Block has too many lines. [358/25]", 2287792973], + [251, 3, 1598, "Metrics/BlockLength: Block has too many lines. [27/25]", 3227542816], + [358, 3, 5118, "Metrics/BlockLength: Block has too many lines. [77/25]", 1759761803] + ], + "spec/ast/merge/detector/base_spec.rb:4157102211": [ + [3, 1, 3172, "Metrics/BlockLength: Block has too many lines. [100/25]", 3745104028], + [11, 7, 498, "Metrics/MethodLength: Method has too many lines. [13/10]", 3178368155], + [49, 3, 900, "Metrics/BlockLength: Block has too many lines. [28/25]", 2333048204] + ], + "spec/ast/merge/detector/fenced_code_block_spec.rb:495797689": [ + [3, 1, 11589, "Metrics/BlockLength: Block has too many lines. [363/25]", 3764545134], + [38, 3, 4467, "Metrics/BlockLength: Block has too many lines. [150/25]", 1597401000], + [41, 5, 1077, "Metrics/BlockLength: Block has too many lines. [31/25]", 2269642514], + [115, 5, 848, "Metrics/BlockLength: Block has too many lines. [27/25]", 1704866975], + [220, 3, 4815, "Metrics/BlockLength: Block has too many lines. [146/25]", 3797214474] + ], + "spec/ast/merge/detector/mergeable_spec.rb:1307688846": [ + [3, 1, 23175, "Metrics/BlockLength: Block has too many lines. [654/25]", 2932391114], + [77, 3, 2079, "Metrics/BlockLength: Block has too many lines. [53/25]", 1093085347], + [177, 3, 2217, "Metrics/BlockLength: Block has too many lines. [69/25]", 926985871], + [188, 5, 948, "Metrics/BlockLength: Block has too many lines. [26/25]", 4186135901], + [225, 5, 898, "Metrics/BlockLength: Block has too many lines. [31/25]", 513446836], + [266, 3, 1168, "Metrics/BlockLength: Block has too many lines. [29/25]", 774699411], + [304, 3, 1188, "Metrics/BlockLength: Block has too many lines. [27/25]", 4282853126], + [339, 3, 918, "Metrics/BlockLength: Block has too many lines. [28/25]", 1759590109], + [372, 3, 870, "Metrics/BlockLength: Block has too many lines. [28/25]", 131542026], + [410, 3, 3768, "Metrics/BlockLength: Block has too many lines. [111/25]", 181819560], + [483, 5, 1536, "Metrics/BlockLength: Block has too many lines. [47/25]", 385085357], + [540, 3, 1891, "Metrics/BlockLength: Block has too many lines. [52/25]", 602757329], + [664, 3, 1927, "Metrics/BlockLength: Block has too many lines. [56/25]", 48062261], + [691, 5, 1146, "Metrics/BlockLength: Block has too many lines. [31/25]", 1961728737], + [721, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3104497040], + [729, 3, 1625, "Metrics/BlockLength: Block has too many lines. [46/25]", 1570579215] + ], + "spec/ast/merge/detector/region_spec.rb:594725562": [ + [3, 1, 8128, "Metrics/BlockLength: Block has too many lines. [290/25]", 1984713692], + [4, 3, 806, "Metrics/BlockLength: Block has too many lines. [28/25]", 1515087192], + [58, 3, 1236, "Metrics/BlockLength: Block has too many lines. [45/25]", 2464968707], + [128, 3, 1063, "Metrics/BlockLength: Block has too many lines. [33/25]", 239148700], + [250, 3, 2010, "Metrics/BlockLength: Block has too many lines. [76/25]", 2595033382] + ], + "spec/ast/merge/detector/toml_frontmatter_spec.rb:1135160129": [ + [3, 1, 6717, "Metrics/BlockLength: Block has too many lines. [218/25]", 2273975625], + [12, 3, 5534, "Metrics/BlockLength: Block has too many lines. [187/25]", 538920673], + [13, 5, 1456, "Metrics/BlockLength: Block has too many lines. [38/25]", 3113759139] + ], + "spec/ast/merge/detector/yaml_frontmatter_spec.rb:2467934365": [ + [3, 1, 6702, "Metrics/BlockLength: Block has too many lines. [213/25]", 3083039982], + [12, 3, 5056, "Metrics/BlockLength: Block has too many lines. [170/25]", 1889948780], + [13, 5, 1438, "Metrics/BlockLength: Block has too many lines. [38/25]", 1736912391], + [219, 3, 1396, "Metrics/BlockLength: Block has too many lines. [33/25]", 2446467851] + ], + "spec/ast/merge/diff_mapper_base_spec.rb:1771546518": [ + [5, 1, 8521, "Metrics/BlockLength: Block has too many lines. [248/25]", 1057580573], + [22, 9, 44, "Style/InverseMethods: Use `reject` instead of inverting `select`.", 3063843489], + [46, 3, 3878, "Metrics/BlockLength: Block has too many lines. [116/25]", 2874032080], + [47, 5, 1938, "Metrics/BlockLength: Block has too many lines. [48/25]", 1904497583], + [191, 3, 1488, "Metrics/BlockLength: Block has too many lines. [43/25]", 1632956840] + ], + "spec/ast/merge/emitter_base_spec.rb:4197360291": [ + [3, 1, 11215, "Metrics/BlockLength: Block has too many lines. [282/25]", 4254840781], + [30, 3, 4393, "Metrics/BlockLength: Block has too many lines. [102/25]", 3992142376], + [134, 58, 12, "Lint/UnusedMethodArgument: Unused method argument - `current_line`. You can also write as `inline_comment_region_target_column(*)` if you want the method to accept any arguments but don't care about them.", 2091263933], + [138, 44, 6, "Lint/UnusedMethodArgument: Unused method argument - `region`.", 2124512157], + [159, 3, 1815, "Metrics/BlockLength: Block has too many lines. [39/25]", 719023387], + [206, 3, 2233, "Metrics/BlockLength: Block has too many lines. [62/25]", 3754339775], + [312, 3, 1059, "Metrics/BlockLength: Block has too many lines. [26/25]", 375007123] + ], + "spec/ast/merge/fictive_language_harness_spec.rb:1179155480": [ + [6, 1, 6693, "Metrics/BlockLength: Block has too many lines. [143/25]", 245088433], + [7, 3, 1968, "Metrics/BlockLength: Block has too many lines. [36/25]", 4161580169], + [58, 3, 1230, "Metrics/BlockLength: Block has too many lines. [34/25]", 990452676], + [103, 3, 2668, "Metrics/BlockLength: Block has too many lines. [51/25]", 1755027956] + ], + "spec/ast/merge/file_aligner_base_spec.rb:610089304": [ + [5, 1, 7287, "Metrics/BlockLength: Block has too many lines. [164/25]", 597898988], + [6, 3, 1237, "Metrics/BlockLength: Block has too many lines. [37/25]", 1284505259], + [86, 3, 5087, "Metrics/BlockLength: Block has too many lines. [84/25]", 119873771], + [94, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3749416415] + ], + "spec/ast/merge/file_analyzable_spec.rb:3816965829": [ + [3, 1, 12458, "Metrics/BlockLength: Block has too many lines. [272/25]", 216138965], + [25, 3, 9603, "Metrics/BlockLength: Block has too many lines. [202/25]", 2508188172], + [297, 3, 1214, "Metrics/BlockLength: Block has too many lines. [30/25]", 777182624] + ], + "spec/ast/merge/freezable_spec.rb:559280324": [ + [5, 1, 5033, "Metrics/BlockLength: Block has too many lines. [123/25]", 3070666859], + [6, 3, 1199, "Metrics/BlockLength: Block has too many lines. [34/25]", 4058875636], + [66, 3, 1530, "Metrics/BlockLength: Block has too many lines. [31/25]", 1670675428] + ], + "spec/ast/merge/freeze_node_base_spec.rb:2962962931": [ + [3, 1, 21887, "Metrics/BlockLength: Block has too many lines. [560/25]", 567315021], + [48, 3, 1369, "Metrics/BlockLength: Block has too many lines. [38/25]", 3363160391], + [131, 3, 2739, "Metrics/BlockLength: Block has too many lines. [56/25]", 2008289622], + [205, 3, 1586, "Metrics/BlockLength: Block has too many lines. [35/25]", 4179606047], + [251, 3, 977, "Metrics/BlockLength: Block has too many lines. [26/25]", 1240612851], + [287, 3, 1130, "Metrics/BlockLength: Block has too many lines. [28/25]", 2511265379], + [322, 3, 5029, "Metrics/BlockLength: Block has too many lines. [126/25]", 739537566], + [598, 3, 3055, "Metrics/BlockLength: Block has too many lines. [81/25]", 145217296] + ], + "spec/ast/merge/healer_spec.rb:877829793": [ + [3, 1, 4896, "Metrics/BlockLength: Block has too many lines. [148/25]", 1074378773], + [19, 3, 1333, "Metrics/BlockLength: Block has too many lines. [38/25]", 2940878263], + [24, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193432399], + [61, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085379023], + [67, 3, 2985, "Metrics/BlockLength: Block has too many lines. [93/25]", 4032786576] + ], + "spec/ast/merge/jaccard_similarity_spec.rb:3984307047": [ + [3, 1, 2659, "Metrics/BlockLength: Block has too many lines. [71/25]", 1122516612], + [6, 3, 1484, "Metrics/BlockLength: Block has too many lines. [38/25]", 3367914637], + [55, 3, 1090, "Metrics/BlockLength: Block has too many lines. [28/25]", 2629339264] + ], + "spec/ast/merge/key_path_partial_template_merger_base_spec.rb:2189485360": [ + [5, 1, 5955, "Metrics/BlockLength: Block has too many lines. [138/25]", 91542958], + [35, 3, 1217, "Metrics/BlockLength: Block has too many lines. [33/25]", 2663081123], + [97, 3, 3019, "Metrics/BlockLength: Block has too many lines. [54/25]", 1411952192] + ], + "spec/ast/merge/layout/attachment_spec.rb:3814294426": [ + [3, 1, 1799, "Metrics/BlockLength: Block has too many lines. [34/25]", 1283153367] + ], + "spec/ast/merge/layout/augmenter_spec.rb:3633045915": [ + [3, 1, 4412, "Metrics/BlockLength: Block has too many lines. [92/25]", 2690553031], + [20, 3, 2725, "Metrics/BlockLength: Block has too many lines. [54/25]", 3645203819] + ], + "spec/ast/merge/layout/gap_spec.rb:4232058283": [ + [3, 1, 2758, "Metrics/BlockLength: Block has too many lines. [72/25]", 2052697931], + [9, 3, 1290, "Metrics/BlockLength: Block has too many lines. [28/25]", 3175967312] + ], + "spec/ast/merge/match_refiner_base_spec.rb:3961767223": [ + [3, 1, 10604, "Metrics/BlockLength: Block has too many lines. [301/25]", 4290485382], + [4, 3, 1146, "Metrics/BlockLength: Block has too many lines. [37/25]", 108051658], + [50, 3, 1005, "Metrics/BlockLength: Block has too many lines. [28/25]", 3807648246], + [125, 3, 1026, "Metrics/BlockLength: Block has too many lines. [27/25]", 2896086726], + [162, 3, 4464, "Metrics/BlockLength: Block has too many lines. [114/25]", 2878217135], + [218, 5, 1112, "Metrics/BlockLength: Block has too many lines. [30/25]", 1605825436], + [224, 11, 104, "Style/HashLikeCase: Consider replacing `case-when` with a hash lookup.", 4220899731], + [247, 11, 132, "Style/HashLikeCase: Consider replacing `case-when` with a hash lookup.", 3401820780], + [258, 5, 1642, "Metrics/BlockLength: Block has too many lines. [35/25]", 1288881729], + [337, 3, 1108, "Metrics/BlockLength: Block has too many lines. [33/25]", 2139263963] + ], + "spec/ast/merge/match_score_base_spec.rb:2340739872": [ + [3, 1, 15213, "Metrics/BlockLength: Block has too many lines. [372/25]", 1512747000], + [4, 3, 1553, "Metrics/BlockLength: Block has too many lines. [41/25]", 2789289940], + [43, 20, 2, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 5862747], + [43, 24, 2, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 5862744], + [56, 3, 1041, "Metrics/BlockLength: Block has too many lines. [29/25]", 3729310115], + [152, 3, 3259, "Metrics/BlockLength: Block has too many lines. [82/25]", 1438003770], + [258, 3, 2199, "Metrics/BlockLength: Block has too many lines. [43/25]", 3386602801], + [320, 3, 1684, "Metrics/BlockLength: Block has too many lines. [35/25]", 3807719546], + [365, 14, 16, "Lint/FloatComparison: Avoid equality comparisons of floats as they are unreliable.", 3787748956], + [369, 3, 1696, "Metrics/BlockLength: Block has too many lines. [36/25]", 3172214426], + [417, 3, 1792, "Metrics/BlockLength: Block has too many lines. [45/25]", 3557977606], + [438, 5, 1121, "Metrics/BlockLength: Block has too many lines. [26/25]", 4236927298] + ], + "spec/ast/merge/merge_result_base_spec.rb:2262708492": [ + [3, 1, 19471, "Metrics/BlockLength: Block has too many lines. [529/25]", 4106058751], + [38, 3, 2735, "Metrics/BlockLength: Block has too many lines. [80/25]", 1103243845], + [279, 3, 1611, "Metrics/BlockLength: Block has too many lines. [39/25]", 1928511417], + [280, 5, 1203, "Metrics/BlockLength: Block has too many lines. [26/25]", 857223227], + [326, 3, 2070, "Metrics/BlockLength: Block has too many lines. [48/25]", 2552826824], + [385, 3, 5769, "Metrics/BlockLength: Block has too many lines. [140/25]", 1457747735], + [511, 5, 1306, "Metrics/BlockLength: Block has too many lines. [29/25]", 2980786372], + [574, 3, 1308, "Metrics/BlockLength: Block has too many lines. [32/25]", 1342704008] + ], + "spec/ast/merge/merger_config_spec.rb:663896662": [ + [5, 1, 7314, "Metrics/BlockLength: Block has too many lines. [189/25]", 1279589310], + [11, 3, 1180, "Metrics/BlockLength: Block has too many lines. [26/25]", 1014009176], + [45, 3, 1151, "Metrics/BlockLength: Block has too many lines. [26/25]", 785276703], + [79, 3, 3574, "Metrics/BlockLength: Block has too many lines. [97/25]", 969726064], + [126, 5, 1158, "Metrics/BlockLength: Block has too many lines. [29/25]", 389808524] + ], + "spec/ast/merge/navigable/injection_point_finder_spec.rb:3693754765": [ + [3, 1, 5152, "Metrics/BlockLength: Block has too many lines. [123/25]", 3265221808], + [15, 3, 4026, "Metrics/BlockLength: Block has too many lines. [96/25]", 1482695302], + [63, 5, 2337, "Metrics/BlockLength: Block has too many lines. [54/25]", 2678200297] + ], + "spec/ast/merge/navigable/injection_point_spec.rb:3295717447": [ + [3, 1, 6032, "Metrics/BlockLength: Block has too many lines. [161/25]", 805025024], + [77, 3, 1083, "Metrics/BlockLength: Block has too many lines. [28/25]", 3091139104] + ], + "spec/ast/merge/navigable/statement_spec.rb:2965726260": [ + [3, 1, 18289, "Metrics/BlockLength: Block has too many lines. [510/25]", 4119203121], + [102, 3, 3570, "Metrics/BlockLength: Block has too many lines. [97/25]", 3287535168], + [156, 5, 2030, "Metrics/BlockLength: Block has too many lines. [51/25]", 3299963733], + [251, 3, 1338, "Metrics/BlockLength: Block has too many lines. [37/25]", 844559624], + [411, 3, 1550, "Metrics/BlockLength: Block has too many lines. [42/25]", 3851790429], + [465, 3, 1372, "Metrics/BlockLength: Block has too many lines. [41/25]", 3782869383] + ], + "spec/ast/merge/node_typing/frozen_wrapper_spec.rb:3823345520": [ + [3, 1, 4532, "Metrics/BlockLength: Block has too many lines. [117/25]", 3944573785] + ], + "spec/ast/merge/node_typing/normalizer_spec.rb:1976431423": [ + [4, 1, 8679, "Metrics/BlockLength: Block has too many lines. [219/25]", 938207310], + [65, 3, 1137, "Metrics/BlockLength: Block has too many lines. [26/25]", 3180807289], + [101, 3, 1404, "Metrics/BlockLength: Block has too many lines. [28/25]", 1094334251], + [216, 3, 875, "Metrics/BlockLength: Block has too many lines. [26/25]", 2755551247] + ], + "spec/ast/merge/node_typing/wrapper_spec.rb:3211588263": [ + [3, 1, 3469, "Metrics/BlockLength: Block has too many lines. [92/25]", 638644563] + ], + "spec/ast/merge/node_typing_spec.rb:4080661389": [ + [3, 1, 12728, "Metrics/BlockLength: Block has too many lines. [333/25]", 3927571381], + [132, 3, 3704, "Metrics/BlockLength: Block has too many lines. [98/25]", 2130243754], + [208, 5, 1267, "Metrics/BlockLength: Block has too many lines. [31/25]", 2816753725], + [265, 3, 1298, "Metrics/BlockLength: Block has too many lines. [33/25]", 3320876250], + [311, 3, 3803, "Metrics/BlockLength: Block has too many lines. [100/25]", 2743470911] + ], + "spec/ast/merge/node_wrapper_base_spec.rb:2252820285": [ + [3, 1, 11681, "Metrics/BlockLength: Block has too many lines. [307/25]", 1698593962], + [32, 3, 2341, "Metrics/BlockLength: Block has too many lines. [68/25]", 1594381363], + [179, 3, 2568, "Metrics/BlockLength: Block has too many lines. [51/25]", 1269052990], + [294, 3, 1252, "Metrics/BlockLength: Block has too many lines. [26/25]", 4220822180], + [329, 3, 1963, "Metrics/BlockLength: Block has too many lines. [39/25]", 1623030031] + ], + "spec/ast/merge/owner_selection_spec.rb:1894901093": [ + [3, 1, 1356, "Metrics/BlockLength: Block has too many lines. [35/25]", 1030003775] + ], + "spec/ast/merge/partial_template_merger_base_spec.rb:3412991027": [ + [3, 1, 7073, "Metrics/BlockLength: Block has too many lines. [145/25]", 3415302240], + [16, 9, 43, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3196404056], + [22, 9, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 4116824817], + [48, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [96, 3, 4220, "Metrics/BlockLength: Block has too many lines. [68/25]", 3464417459], + [97, 5, 2029, "Metrics/BlockLength: Block has too many lines. [27/25]", 3297854360], + [138, 5, 2122, "Metrics/BlockLength: Block has too many lines. [37/25]", 1592076374] + ], + "spec/ast/merge/recipe/config_spec.rb:3917288551": [ + [3, 1, 21041, "Metrics/BlockLength: Block has too many lines. [611/25]", 2431235923], + [72, 3, 1653, "Metrics/BlockLength: Block has too many lines. [36/25]", 2702780755], + [174, 3, 1465, "Metrics/BlockLength: Block has too many lines. [44/25]", 2326126933], + [226, 3, 3419, "Metrics/BlockLength: Block has too many lines. [89/25]", 798604841], + [327, 3, 1398, "Metrics/BlockLength: Block has too many lines. [34/25]", 3113267700], + [474, 3, 1184, "Metrics/BlockLength: Block has too many lines. [39/25]", 2599756030], + [519, 3, 4630, "Metrics/BlockLength: Block has too many lines. [147/25]", 1245526575] + ], + "spec/ast/merge/recipe/preset_spec.rb:818394232": [ + [3, 1, 6696, "Metrics/BlockLength: Block has too many lines. [173/25]", 3205615892] + ], + "spec/ast/merge/recipe/runner_spec.rb:3689194117": [ + [3, 1, 46798, "Metrics/BlockLength: Block has too many lines. [1104/25]", 3220015076], + [48, 3, 1128, "Metrics/BlockLength: Block has too many lines. [26/25]", 910457645], + [108, 3, 3036, "Metrics/BlockLength: Block has too many lines. [92/25]", 2112378918], + [132, 5, 881, "Metrics/BlockLength: Block has too many lines. [27/25]", 3842010356], + [177, 5, 918, "Metrics/BlockLength: Block has too many lines. [27/25]", 2152367239], + [295, 3, 1383, "Metrics/BlockLength: Block has too many lines. [41/25]", 2141027559], + [362, 3, 1653, "Metrics/BlockLength: Block has too many lines. [33/25]", 1536472295], + [449, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3960802027], + [497, 3, 7959, "Metrics/BlockLength: Block has too many lines. [200/25]", 3739116912], + [556, 5, 1225, "Metrics/BlockLength: Block has too many lines. [31/25]", 195497726], + [740, 3, 6977, "Metrics/BlockLength: Block has too many lines. [145/25]", 2805535296], + [748, 5, 2241, "Metrics/BlockLength: Block has too many lines. [49/25]", 2552233173], + [805, 5, 3007, "Metrics/BlockLength: Block has too many lines. [59/25]", 708771722], + [877, 5, 1444, "Metrics/BlockLength: Block has too many lines. [26/25]", 3274225022], + [911, 3, 3258, "Metrics/BlockLength: Block has too many lines. [85/25]", 2346849758], + [1012, 3, 2710, "Metrics/BlockLength: Block has too many lines. [71/25]", 3801821877], + [1029, 5, 1547, "Metrics/BlockLength: Block has too many lines. [42/25]", 2962020615], + [1109, 3, 2240, "Metrics/BlockLength: Block has too many lines. [35/25]", 1139957345], + [1115, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], + [1117, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], + [1119, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1801369636], + [1121, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2652710920], + [1123, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1375785821], + [1125, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 632755459], + [1160, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], + [1162, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], + [1164, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1375785821], + [1176, 3, 1472, "Metrics/BlockLength: Block has too many lines. [31/25]", 844153987], + [1181, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1239303812], + [1183, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1251336963], + [1216, 3, 2277, "Metrics/BlockLength: Block has too many lines. [43/25]", 4287127386], + [1221, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], + [1223, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2652710920], + [1225, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1375785821], + [1227, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 632755459], + [1274, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3420615328] + ], + "spec/ast/merge/recipe/script_loader_spec.rb:2136892097": [ + [3, 1, 8554, "Metrics/BlockLength: Block has too many lines. [237/25]", 2314425369], + [45, 3, 2842, "Metrics/BlockLength: Block has too many lines. [75/25]", 168902852], + [155, 3, 1400, "Metrics/BlockLength: Block has too many lines. [39/25]", 1611123964] + ], + "spec/ast/merge/rspec/shared_examples/feature_profile_spec.rb:2654837708": [ + [5, 1, 1140, "Metrics/BlockLength: Block has too many lines. [31/25]", 678325840] + ], + "spec/ast/merge/rspec/shared_examples/file_analyzable_spec.rb:1833922303": [ + [58, 3, 970, "Metrics/AbcSize: Assignment Branch Condition size for `detect_freeze_blocks` is too high. [<16, 9, 5> 19.03/17]", 1533823667], + [58, 3, 970, "Metrics/MethodLength: Method has too many lines. [31/10]", 1533823667], + [104, 1, 1216, "Metrics/BlockLength: Block has too many lines. [39/25]", 1009012120], + [105, 3, 1159, "Metrics/BlockLength: Block has too many lines. [38/25]", 1361521205] + ], + "spec/ast/merge/rspec/shared_examples/layout_attachment_spec.rb:714796658": [ + [8, 1, 957, "Metrics/BlockLength: Block has too many lines. [28/25]", 3738990548] + ], + "spec/ast/merge/rspec/shared_examples/recipe_preset_contract_spec.rb:669158728": [ + [6, 1, 1577, "Metrics/BlockLength: Block has too many lines. [41/25]", 2157464290], + [7, 3, 1512, "Metrics/BlockLength: Block has too many lines. [39/25]", 1968160370], + [44, 5, 401, "Metrics/AbcSize: Assignment Branch Condition size for `run_verify_loaded_preset` is too high. [<0, 26, 0> 26/17]", 2960760840] + ], + "spec/ast/merge/rspec/shared_examples/removal_mode_compliance_spec.rb:31388352": [ + [6, 22, 2, "Style/MutableConstant: Freeze mutable objects assigned to constants.", 5861859], + [44, 1, 2546, "Metrics/BlockLength: Block has too many lines. [77/25]", 3740028971], + [45, 3, 1350, "Metrics/BlockLength: Block has too many lines. [41/25]", 2793151667], + [94, 3, 1128, "Metrics/BlockLength: Block has too many lines. [32/25]", 2527000512], + [95, 5, 1081, "Metrics/BlockLength: Block has too many lines. [30/25]", 3825359844] + ], + "spec/ast/merge/rspec/shared_examples/reproducible_partial_merge_spec.rb:2862326360": [ + [19, 3, 600, "Metrics/MethodLength: Method has too many lines. [13/10]", 1542875905] + ], + "spec/ast/merge/ruleset/config_spec.rb:1860949041": [ + [3, 1, 9431, "Metrics/BlockLength: Block has too many lines. [236/25]", 4015119559], + [24, 3, 5341, "Metrics/BlockLength: Block has too many lines. [149/25]", 2361087446], + [25, 5, 1064, "Metrics/BlockLength: Block has too many lines. [26/25]", 603056104], + [226, 3, 2125, "Metrics/BlockLength: Block has too many lines. [36/25]", 1640873170] + ], + "spec/ast/merge/ruleset/declaration_objects_spec.rb:3827892270": [ + [3, 1, 1881, "Metrics/BlockLength: Block has too many lines. [47/25]", 1770376910] + ], + "spec/ast/merge/ruleset/feature_profile_spec.rb:2241111096": [ + [3, 1, 4189, "Metrics/BlockLength: Block has too many lines. [86/25]", 1116963550], + [4, 3, 4129, "Metrics/BlockLength: Block has too many lines. [84/25]", 117079811], + [5, 5, 2391, "Metrics/BlockLength: Block has too many lines. [45/25]", 1800077283] + ], + "spec/ast/merge/ruleset/parser_spec.rb:386407767": [ + [3, 1, 5670, "Metrics/BlockLength: Block has too many lines. [144/25]", 3425850453], + [4, 3, 5618, "Metrics/BlockLength: Block has too many lines. [143/25]", 246633759] + ], + "spec/ast/merge/ruleset/profile_vocabulary_spec.rb:2570869276": [ + [3, 1, 2095, "Metrics/BlockLength: Block has too many lines. [46/25]", 3214342662] + ], + "spec/ast/merge/ruleset/support_style_resolver_spec.rb:640167644": [ + [3, 1, 1625, "Metrics/BlockLength: Block has too many lines. [49/25]", 2066834885], + [4, 3, 1559, "Metrics/BlockLength: Block has too many lines. [47/25]", 1169495477] + ], + "spec/ast/merge/runtime_spec.rb:3962589694": [ + [5, 1, 24649, "Metrics/BlockLength: Block has too many lines. [664/25]", 2634021188], + [76, 3, 1459, "Metrics/BlockLength: Block has too many lines. [41/25]", 3744002593], + [125, 3, 1417, "Metrics/BlockLength: Block has too many lines. [33/25]", 4087615381], + [166, 3, 2549, "Metrics/BlockLength: Block has too many lines. [69/25]", 3150260095], + [175, 5, 1068, "Metrics/BlockLength: Block has too many lines. [26/25]", 2933114685], + [247, 3, 1668, "Metrics/BlockLength: Block has too many lines. [39/25]", 2386637993], + [259, 5, 1265, "Metrics/BlockLength: Block has too many lines. [27/25]", 3157806167], + [321, 3, 10884, "Metrics/BlockLength: Block has too many lines. [295/25]", 1889265918], + [322, 5, 1879, "Metrics/BlockLength: Block has too many lines. [46/25]", 2536583521], + [373, 5, 3938, "Metrics/BlockLength: Block has too many lines. [108/25]", 340276027], + [486, 5, 1270, "Metrics/BlockLength: Block has too many lines. [38/25]", 3844174392], + [528, 5, 3728, "Metrics/BlockLength: Block has too many lines. [95/25]", 3779381786], + [630, 3, 3240, "Metrics/BlockLength: Block has too many lines. [84/25]", 3856725067], + [656, 5, 1649, "Metrics/BlockLength: Block has too many lines. [40/25]", 3713662683] + ], + "spec/ast/merge/section_typing_spec.rb:2580971307": [ + [3, 1, 14786, "Metrics/BlockLength: Block has too many lines. [344/25]", 2925587076], + [4, 3, 1940, "Metrics/BlockLength: Block has too many lines. [50/25]", 3362429388], + [67, 3, 3684, "Metrics/BlockLength: Block has too many lines. [96/25]", 3864076664], + [120, 5, 1998, "Metrics/BlockLength: Block has too many lines. [50/25]", 411620722], + [183, 3, 1415, "Metrics/BlockLength: Block has too many lines. [37/25]", 3323012675], + [192, 5, 1124, "Metrics/BlockLength: Block has too many lines. [28/25]", 966216762], + [229, 3, 1610, "Metrics/BlockLength: Block has too many lines. [38/25]", 1499957007], + [229, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 1025596574], + [279, 3, 4437, "Metrics/BlockLength: Block has too many lines. [80/25]", 423587151], + [356, 36, 23, "Style/SymbolProc: Pass `&:unclassified?` as an argument to `find` instead of a block.", 563945984], + [369, 36, 23, "Style/SymbolProc: Pass `&:unclassified?` as an argument to `find` instead of a block.", 563945984], + [375, 3, 1630, "Metrics/BlockLength: Block has too many lines. [31/25]", 1675144727] + ], + "spec/ast/merge/smart_merger_base_spec.rb:1904727390": [ + [3, 1, 13253, "Metrics/BlockLength: Block has too many lines. [398/25]", 3611753358], + [30, 9, 10, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 1099697163], + [87, 3, 1851, "Metrics/BlockLength: Block has too many lines. [40/25]", 3729571903], + [210, 3, 925, "Metrics/BlockLength: Block has too many lines. [35/25]", 2001100899], + [344, 3, 709, "Metrics/BlockLength: Block has too many lines. [27/25]", 3041950416], + [415, 3, 1074, "Metrics/BlockLength: Block has too many lines. [35/25]", 956635689], + [416, 5, 1026, "Metrics/BlockLength: Block has too many lines. [33/25]", 1993879652], + [461, 3, 1031, "Metrics/BlockLength: Block has too many lines. [31/25]", 35315996] + ], + "spec/ast/merge/structural_edit/boundary_support_spec.rb:863387845": [ + [3, 1, 4226, "Metrics/BlockLength: Block has too many lines. [86/25]", 1889771490], + [16, 9, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1304492024], + [22, 9, 41, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3828424401], + [59, 3, 1294, "Metrics/BlockLength: Block has too many lines. [26/25]", 3038774774] + ], + "spec/ast/merge/structural_edit/plan_set_spec.rb:3633263362": [ + [3, 1, 5945, "Metrics/BlockLength: Block has too many lines. [180/25]", 3883285271], + [14, 3, 2139, "Metrics/BlockLength: Block has too many lines. [72/25]", 3558415255], + [128, 3, 1412, "Metrics/BlockLength: Block has too many lines. [39/25]", 1216754705] + ], + "spec/ast/merge/structural_edit/remove_plan_spec.rb:3569534665": [ + [3, 1, 6442, "Metrics/BlockLength: Block has too many lines. [134/25]", 3440814588], + [39, 3, 3768, "Metrics/BlockLength: Block has too many lines. [75/25]", 876721813], + [127, 3, 1439, "Metrics/BlockLength: Block has too many lines. [29/25]", 3378195351] + ], + "spec/ast/merge/structural_edit/remove_plan_support_spec.rb:800158061": [ + [3, 1, 2893, "Metrics/BlockLength: Block has too many lines. [62/25]", 3748446914], + [16, 9, 43, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3196404056], + [22, 9, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 4116824817], + [29, 3, 2091, "Metrics/BlockLength: Block has too many lines. [39/25]", 1684933040], + [30, 5, 1653, "Metrics/BlockLength: Block has too many lines. [27/25]", 2456404305] + ], + "spec/ast/merge/structural_edit/splice_plan_spec.rb:3331205681": [ + [3, 1, 3159, "Metrics/BlockLength: Block has too many lines. [83/25]", 2234926397], + [16, 3, 1837, "Metrics/BlockLength: Block has too many lines. [46/25]", 2935991482], + [42, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860750] + ], + "spec/ast/merge/text/conflict_resolver_spec.rb:3810004132": [ + [5, 1, 9102, "Metrics/BlockLength: Block has too many lines. [218/25]", 672115618], + [33, 3, 8206, "Metrics/BlockLength: Block has too many lines. [194/25]", 259803246], + [78, 5, 1920, "Metrics/BlockLength: Block has too many lines. [45/25]", 3965182334], + [139, 5, 1918, "Metrics/BlockLength: Block has too many lines. [44/25]", 3707046125] + ], + "spec/ast/merge/text/file_analysis_spec.rb:3430380445": [ + [5, 1, 8842, "Metrics/BlockLength: Block has too many lines. [205/25]", 4255187284], + [6, 3, 1323, "Metrics/BlockLength: Block has too many lines. [29/25]", 2518912953], + [47, 3, 1830, "Metrics/BlockLength: Block has too many lines. [43/25]", 3685770590], + [135, 3, 1620, "Metrics/BlockLength: Block has too many lines. [35/25]", 3089951119] + ], + "spec/ast/merge/text/line_node_spec.rb:1757790485": [ + [5, 1, 4739, "Metrics/BlockLength: Block has too many lines. [131/25]", 1487875238] + ], + "spec/ast/merge/text/merge_result_spec.rb:589380024": [ + [5, 1, 1541, "Metrics/BlockLength: Block has too many lines. [40/25]", 2828087992] + ], + "spec/ast/merge/text/section_splitter_spec.rb:804308722": [ + [4, 1, 5705, "Metrics/BlockLength: Block has too many lines. [209/25]", 4175363685], + [5, 3, 794, "Metrics/BlockLength: Block has too many lines. [28/25]", 2386862842], + [42, 3, 1126, "Metrics/BlockLength: Block has too many lines. [45/25]", 1507887296], + [95, 3, 746, "Metrics/BlockLength: Block has too many lines. [30/25]", 1759029412], + [131, 3, 1169, "Metrics/BlockLength: Block has too many lines. [45/25]", 1412318991], + [184, 3, 754, "Metrics/BlockLength: Block has too many lines. [30/25]", 2717556691], + [246, 1, 16648, "Metrics/BlockLength: Block has too many lines. [428/25]", 3166834694], + [370, 3, 1640, "Metrics/BlockLength: Block has too many lines. [46/25]", 2049342960], + [424, 3, 3237, "Metrics/BlockLength: Block has too many lines. [102/25]", 2357275144], + [540, 3, 3505, "Metrics/BlockLength: Block has too many lines. [67/25]", 2112469350], + [619, 3, 3586, "Metrics/BlockLength: Block has too many lines. [90/25]", 3866409298], + [620, 5, 1650, "Metrics/BlockLength: Block has too many lines. [48/25]", 289235626], + [622, 9, 1474, "Metrics/AbcSize: Assignment Branch Condition size for `split` is too high. [<8, 21, 7> 23.54/17]", 557655357], + [622, 9, 1474, "Metrics/MethodLength: Method has too many lines. [41/10]", 557655357], + [622, 9, 1474, "Metrics/PerceivedComplexity: Perceived complexity for `split` is too high. [9/8]", 557655357], + [628, 11, 1237, "Metrics/BlockLength: Block has too many lines. [33/25]", 1134667672], + [717, 29, 44, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 2169354946], + [723, 29, 44, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 2169354946], + [751, 1, 3128, "Metrics/BlockLength: Block has too many lines. [85/25]", 2082776744], + [769, 3, 1744, "Metrics/BlockLength: Block has too many lines. [46/25]", 223880162], + [770, 5, 1258, "Metrics/BlockLength: Block has too many lines. [31/25]", 2245422869] + ], + "spec/ast/merge/text/smart_merger_spec.rb:4128732567": [ + [3, 1, 8057, "Metrics/BlockLength: Block has too many lines. [210/25]", 1690443322], + [4, 3, 1135, "Metrics/BlockLength: Block has too many lines. [28/25]", 3788979655], + [58, 3, 4438, "Metrics/BlockLength: Block has too many lines. [106/25]", 2613192474], + [187, 3, 1053, "Metrics/BlockLength: Block has too many lines. [26/25]", 803567817], + [220, 3, 892, "Metrics/BlockLength: Block has too many lines. [28/25]", 2001100899] + ], + "spec/ast/merge/text/word_node_spec.rb:1457011521": [ + [5, 1, 3264, "Metrics/BlockLength: Block has too many lines. [74/25]", 677733430] + ], + "spec/ast/merge/token_match_refiner_spec.rb:3180314913": [ + [3, 1, 4000, "Metrics/BlockLength: Block has too many lines. [80/25]", 1630791278], + [8, 3, 2912, "Metrics/BlockLength: Block has too many lines. [60/25]", 529772148] + ], + "spec/ast/merge/trailing_groups/alignment_sort_spec.rb:1594915480": [ + [5, 1, 4710, "Metrics/BlockLength: Block has too many lines. [114/25]", 2499296583], + [14, 3, 2140, "Metrics/BlockLength: Block has too many lines. [47/25]", 3871799493], + [95, 3, 1482, "Metrics/BlockLength: Block has too many lines. [35/25]", 1088314263] + ], + "spec/ast/merge/trailing_groups/core_spec.rb:2651131504": [ + [5, 1, 9601, "Metrics/BlockLength: Block has too many lines. [242/25]", 598045669], + [22, 3, 3728, "Metrics/BlockLength: Block has too many lines. [87/25]", 1304580063], + [119, 3, 3931, "Metrics/BlockLength: Block has too many lines. [99/25]", 2464218479], + [186, 5, 1322, "Metrics/BlockLength: Block has too many lines. [30/25]", 427915501], + [187, 7, 1267, "Metrics/BlockLength: Block has too many lines. [28/25]", 861882691], + [245, 3, 1306, "Metrics/BlockLength: Block has too many lines. [34/25]", 86572459] + ], + "spec/ast/merge/trailing_groups/dest_iterate_spec.rb:3632880085": [ + [5, 1, 5523, "Metrics/BlockLength: Block has too many lines. [131/25]", 3077369183], + [19, 3, 3990, "Metrics/BlockLength: Block has too many lines. [91/25]", 593259616], + [39, 35, 12, "Style/SymbolProc: Pass `&:sig` as an argument to `lambda` instead of a block.", 3587754320], + [54, 33, 23, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 384283629], + [89, 35, 13, "Style/SymbolProc: Pass `&:name` as an argument to `lambda` instead of a block.", 3561384234], + [98, 35, 12, "Style/SymbolProc: Pass `&:sig` as an argument to `lambda` instead of a block.", 3587754320], + [113, 35, 12, "Style/SymbolProc: Pass `&:sig` as an argument to `lambda` instead of a block.", 3587754320] + ], + "spec/ast/merge/unresolved_policy_spec.rb:2561713656": [ + [3, 1, 1333, "Metrics/BlockLength: Block has too many lines. [33/25]", 4109547889] + ], + "spec/ast/merge/unresolved_review_state_spec.rb:3186871217": [ + [3, 1, 1038, "Metrics/BlockLength: Block has too many lines. [31/25]", 1325553035] + ], + "spec/ast/merge_spec.rb:664670069": [ + [3, 1, 3113, "Metrics/BlockLength: Block has too many lines. [74/25]", 4034649501], + [9, 3, 2227, "Metrics/BlockLength: Block has too many lines. [51/25]", 578300230], + [10, 5, 2182, "Metrics/BlockLength: Block has too many lines. [49/25]", 2758871265] + ], + "spec/base_substrate_spec.rb:2864492094": [ + [5, 1, 5800, "Metrics/BlockLength: Block has too many lines. [143/25]", 784801982], + [6, 3, 192, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 680981873], + [13, 3, 378, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1223797442], + [31, 3, 628, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 2123191050], + [53, 3, 429, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3536712197], + [69, 3, 24, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 2280792512], + [70, 3, 78, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 604224776], + [72, 3, 146, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3315091322] + ], + "spec/fixtures_integration_spec.rb:1145500459": [ + [595, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859109], + [758, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 576909008], + [881, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087900170], + [1806, 3, 816, "Metrics/MethodLength: Method has too many lines. [13/10]", 170960660], + [1806, 39, 213, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 635200700], + [1807, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3976306097], + [1831, 38, 80, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3297939075], + [1916, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1745553512], + [1917, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 118067488], + [1918, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 196190368], + [1919, 121, 41, "Layout/LineLength: Line is too long. [161/120]", 3371256193], + [2090, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3241114703], + [2428, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], + [2567, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], + [2991, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3697593604], + [2992, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], + [3113, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179435314], + [3122, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1182194285], + [3124, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 3886107031], + [3151, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1751849111], + [3152, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1519587684], + [3153, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 4086262880], + [3170, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3568081822], + [3171, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1776876782], + [3173, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [3174, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1751849111], + [3176, 121, 73, "Layout/LineLength: Line is too long. [193/120]", 3322243646], + [3178, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1715153206], + [3179, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [3180, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 504997180], + [3181, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 1146860021], + [3182, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 2312101607], + [3183, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1423779161], + [3184, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1900897138], + [3185, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 1689840383], + [3186, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 1589056236], + [3188, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 763176550], + [3194, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3957871310], + [3196, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 763176550], + [3198, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 919916608], + [3199, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 919916608], + [3200, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3957871310], + [3201, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 4073040612], + [3202, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 763176550], + [3203, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 667593075], + [3205, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1310972770], + [3206, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 311387795], + [3207, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 724840266], + [3208, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 2555878310], + [3209, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1781078972], + [3210, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [3213, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [3214, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1658060570], + [3215, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 3085728851], + [3216, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3129400559], + [3217, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3197516464], + [3218, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087771520], + [3219, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3837194228], + [3220, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1312323543], + [3221, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 2356847623], + [3222, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [3223, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3428073441], + [3224, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 2891080552], + [3225, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3080737172], + [3226, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 170445026], + [3227, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3240051869], + [3228, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 4266052680], + [3229, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3376297786], + [3230, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 398435913], + [3231, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 4134940256], + [3232, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 30370035], + [3233, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 2862546359], + [3234, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1901388514], + [3235, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 838864274], + [3236, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 3437460384], + [3237, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1567003152], + [3238, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2609066305], + [3239, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 4043187090], + [3240, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3866430009], + [3241, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 2182699083], + [3242, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 3958792129], + [3243, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3449926560], + [3244, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 399774089], + [3245, 121, 68, "Layout/LineLength: Line is too long. [188/120]", 2119246799], + [3247, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3592658842], + [3248, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2905723409], + [3249, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 3930305198], + [3250, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 4186230052], + [3251, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [3252, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2700200720], + [3253, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 1630526402], + [3254, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3669244926], + [3255, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2814234644], + [3256, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3109415933], + [3257, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3643275044], + [3258, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 3825290660], + [3259, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1751849111], + [3260, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 4112285398], + [3261, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 1684279672], + [3262, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 1616506266], + [3264, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [3265, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1330093223], + [3266, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 4084555566], + [3267, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 2466867154], + [3268, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 4088314613], + [3269, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 2416893689], + [3270, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 683312682], + [3271, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 2516517934], + [3272, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2414563355], + [3273, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 2232595211], + [3274, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 2940789369], + [3275, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 941259913], + [3276, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2133508098], + [3277, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1621975014], + [3278, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 35985461], + [3279, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 746016305], + [3280, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 435488100], + [3281, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 2581129172], + [3282, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 3495900774], + [3283, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1413120342], + [3284, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [3285, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2333800791], + [3286, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 2576906206], + [3287, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 2986659874], + [3288, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2811932564], + [3289, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 1970813291], + [3290, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 2904941246], + [3291, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3745922508], + [3292, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 735247237], + [3293, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3731320885], + [3294, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 3896022034], + [3295, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 2827048584], + [3296, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 2548596663], + [3297, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 3812352018], + [3298, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 1280243910], + [3299, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 1742643292], + [3300, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 3056442430], + [3301, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 3144363287], + [3302, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 477297993], + [3303, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 3657857971], + [3304, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3913984414], + [3305, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 336201058], + [3306, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 485418789], + [3307, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 453253839], + [3308, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3673833034], + [3309, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 1552836890], + [3310, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 2714635965], + [3311, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 9336999], + [3312, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 584857208], + [3313, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1394865213], + [3314, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 3973222761], + [3315, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 2020040051], + [3316, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 3060994335], + [3317, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 196286917], + [3318, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 4168514178], + [3319, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 810581246], + [3320, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 1473417372], + [3321, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 3008376885], + [3322, 121, 84, "Layout/LineLength: Line is too long. [204/120]", 454816400], + [3323, 121, 88, "Layout/LineLength: Line is too long. [208/120]", 1416223705], + [3324, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 2896813919], + [3325, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 957293983], + [3326, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 2118117430], + [3327, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 1367404612], + [3328, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 2459902188], + [3329, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 461483815], + [3330, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 2791596520], + [3331, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 203085787], + [3332, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 2942095139], + [3333, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 131861965], + [3334, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 3340827551], + [3335, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 102582610], + [3336, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 762789354], + [3337, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 3478337442], + [3338, 121, 112, "Layout/LineLength: Line is too long. [232/120]", 4010607435], + [3339, 121, 132, "Layout/LineLength: Line is too long. [252/120]", 3754747587], + [3340, 121, 136, "Layout/LineLength: Line is too long. [256/120]", 379336923], + [3341, 121, 108, "Layout/LineLength: Line is too long. [228/120]", 3366353902], + [3342, 121, 128, "Layout/LineLength: Line is too long. [248/120]", 1686898289], + [3343, 121, 132, "Layout/LineLength: Line is too long. [252/120]", 2005192241], + [3344, 121, 104, "Layout/LineLength: Line is too long. [224/120]", 1868634464], + [3345, 121, 124, "Layout/LineLength: Line is too long. [244/120]", 3939743614], + [3346, 121, 128, "Layout/LineLength: Line is too long. [248/120]", 2978506702], + [3347, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 3909866928], + [3348, 121, 118, "Layout/LineLength: Line is too long. [238/120]", 2853032177], + [3349, 121, 122, "Layout/LineLength: Line is too long. [242/120]", 2968366309], + [3350, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 1753663643], + [3351, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 3387619436], + [3352, 121, 106, "Layout/LineLength: Line is too long. [226/120]", 197895496], + [3353, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 576181861], + [3354, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 2809313444], + [3355, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 3963067112], + [3356, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 1121380327], + [3357, 121, 100, "Layout/LineLength: Line is too long. [220/120]", 31591211], + [3358, 121, 104, "Layout/LineLength: Line is too long. [224/120]", 1946129497], + [3359, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 767185096], + [3360, 121, 100, "Layout/LineLength: Line is too long. [220/120]", 1092646020], + [3361, 121, 104, "Layout/LineLength: Line is too long. [224/120]", 1328841270], + [3362, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 2663749624], + [3363, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 430318647], + [3364, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 1650234037], + [3365, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 1082269805], + [3366, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 316397809], + [3367, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 3145391348], + [3368, 121, 112, "Layout/LineLength: Line is too long. [232/120]", 2808088654], + [3369, 121, 116, "Layout/LineLength: Line is too long. [236/120]", 1035513748], + [3370, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 2552800539], + [3371, 121, 112, "Layout/LineLength: Line is too long. [232/120]", 1727699169], + [3372, 121, 116, "Layout/LineLength: Line is too long. [236/120]", 1171566267], + [3373, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 2994775049], + [3374, 121, 110, "Layout/LineLength: Line is too long. [230/120]", 3860489151], + [3375, 121, 114, "Layout/LineLength: Line is too long. [234/120]", 959496607], + [3376, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 1694222439], + [3377, 121, 114, "Layout/LineLength: Line is too long. [234/120]", 1501186331], + [3378, 121, 118, "Layout/LineLength: Line is too long. [238/120]", 4059659418], + [3379, 121, 110, "Layout/LineLength: Line is too long. [230/120]", 1899868779], + [3380, 121, 130, "Layout/LineLength: Line is too long. [250/120]", 323324279], + [3381, 121, 134, "Layout/LineLength: Line is too long. [254/120]", 3956414359], + [3382, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 3506644741], + [3383, 121, 116, "Layout/LineLength: Line is too long. [236/120]", 936139074], + [3384, 121, 136, "Layout/LineLength: Line is too long. [256/120]", 4153213512], + [3385, 121, 140, "Layout/LineLength: Line is too long. [260/120]", 1491976338], + [3386, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 4061753206], + [3387, 121, 106, "Layout/LineLength: Line is too long. [226/120]", 2410434304], + [3388, 121, 124, "Layout/LineLength: Line is too long. [244/120]", 3518300264], + [3389, 121, 144, "Layout/LineLength: Line is too long. [264/120]", 1040696046], + [3390, 121, 148, "Layout/LineLength: Line is too long. [268/120]", 139604188], + [3391, 121, 120, "Layout/LineLength: Line is too long. [240/120]", 231937793], + [3392, 121, 140, "Layout/LineLength: Line is too long. [260/120]", 1835509805], + [3393, 121, 144, "Layout/LineLength: Line is too long. [264/120]", 1629218396], + [3394, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 2312875700], + [3395, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 2933374083], + [3396, 121, 106, "Layout/LineLength: Line is too long. [226/120]", 1719349671], + [3397, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 2555579810], + [3398, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 2023551624], + [3399, 121, 114, "Layout/LineLength: Line is too long. [234/120]", 955231924], + [3400, 121, 118, "Layout/LineLength: Line is too long. [238/120]", 4232993781], + [3401, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 3472954835], + [3402, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 3211922285], + [3403, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 2874956332], + [3404, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 1360335840], + [3405, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2135379556], + [3406, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3242768475], + [3407, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 2789115918], + [3408, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3346448124], + [3409, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1538469817], + [3410, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1543041113], + [3411, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 3344741438], + [3412, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2188404009], + [3413, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1330398779], + [3414, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 332468826], + [3415, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 1905397598], + [3416, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 438831062], + [3417, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 3377667334], + [3418, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3232541734], + [3420, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2130930429], + [3421, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 3684939371], + [3423, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2361951097], + [3424, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 1211447462], + [3425, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3309872691], + [3426, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 360053761], + [3427, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 1310136493], + [3428, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1950686342], + [3429, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 1397845826], + [3430, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 4191304724], + [3431, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2354128498], + [3432, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 1865717453], + [3433, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 24220542], + [3434, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 2618612673], + [3437, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3422918867], + [3438, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3689431739], + [3482, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 4093564799], + [3488, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1662653970], + [3489, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3967501655], + [3490, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2178516622], + [3491, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 1345346561], + [3505, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193466072], + [3625, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 3612393276], + [3626, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 797303985], + [3629, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1606320605], + [3649, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1776876782], + [3653, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 828742791], + [3673, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3294617581], + [3683, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3519842846], + [3693, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1966440909], + [3694, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053864], + [3700, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1606320605], + [3723, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 1340744311], + [3742, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1741893077], + [3743, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053865], + [3747, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193405204], + [3761, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1401226501], + [3764, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085352569], + [3767, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 696523922], + [3782, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], + [3792, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2746826653], + [4208, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1138870161], + [4770, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], + [4781, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 2132299307], + [4828, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087775098], + [4839, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 757851079], + [4875, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], + [4886, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 441649198], + [4909, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087903295], + [4921, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 170442008], + [4930, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], + [4932, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1888875443], + [4969, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 398433651], + [4980, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3921367744], + [5003, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2422819473], + [5009, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 194583095], + [5015, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1901385496], + [5024, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 490810486], + [5026, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 586287746], + [5030, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1310969752], + [5050, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087389205], + [5062, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2609063547], + [5071, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], + [5073, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1370761696], + [5096, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 2208661169], + [5102, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1862604658], + [5108, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 3958789371], + [5117, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3449594464], + [5119, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 692050524], + [5123, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 802172558], + [5193, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2406691660], + [5228, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], + [5239, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1811982742], + [5266, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2562189319], + [5272, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193430346], + [5278, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2814237166], + [5287, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2189106693], + [5289, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 3874870868], + [5293, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179474914], + [5326, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1751845165], + [5337, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2617230371], + [5341, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], + [5382, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], + [5393, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3793790598], + [5428, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 4088312783], + [5439, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3220724736], + [5443, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087899888], + [5462, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2552888401], + [5468, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 194583095], + [5474, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2414559905], + [5483, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 626762179], + [5485, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3969284923], + [5489, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 1893261414], + [5521, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2133507320], + [5532, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 2101353476], + [5536, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087685705], + [5555, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2431380437], + [5561, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 194583095], + [5567, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 435489438], + [5576, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 1520878209], + [5578, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 2238995076], + [5582, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 2789405913], + [5615, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], + [5626, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3409328196], + [5649, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087858069], + [5661, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2811935086], + [5670, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], + [5672, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1113346693], + [5676, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3227128786], + [5696, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 48793812], + [5702, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 338440584], + [5708, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 735248703], + [5717, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 927473097], + [5719, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 1394536741], + [5723, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3134012967], + [5742, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 2967615316], + [5748, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 2810710931], + [5754, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 2548594701], + [5757, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860796], + [5759, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], + [5763, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3549194295], + [5765, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 1074004741], + [5769, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 2874423564], + [5772, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087576526], + [5774, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], + [5789, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 1696848307], + [5795, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 2883501659], + [5801, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 3056443076], + [5806, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193405204], + [5810, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 1487412605], + [5812, 121, 51, "Layout/LineLength: Line is too long. [171/120]", 2021571284], + [5816, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1975782995], + [5819, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860796], + [5821, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193405204], + [5826, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 183236849], + [5835, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 856018753], + [5838, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], + [5841, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 2146546324], + [5847, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3913983076], + [5850, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 3491931666], + [5852, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3536323546], + [5856, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 356581191], + [5858, 121, 63, "Layout/LineLength: Line is too long. [183/120]", 4144657639], + [5862, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 1478616653], + [5865, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1774852021], + [5867, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3536323546], + [5882, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3884289787], + [5888, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 1001503687], + [5894, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3673836976], + [5903, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 3164908550], + [5905, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 1134300778], + [5909, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1797165224], + [5928, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 2508143995], + [5934, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 3002532188], + [5940, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 584857986], + [5943, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860796], + [5945, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], + [5949, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 749691384], + [5951, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 3389354954], + [5955, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 3402045699], + [5958, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087576526], + [5960, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], + [5974, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 2447716612], + [5980, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3201685099], + [5986, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 3060990885], + [5995, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 29396315], + [5997, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 1228645365], + [6001, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1436742837], + [6020, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 716917214], + [6026, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 2175814211], + [6032, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 1473420390], + [6035, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193433391], + [6037, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1422839111], + [6041, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 1571170198], + [6043, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 2175059093], + [6047, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3886666417], + [6050, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 176753677], + [6052, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1422839111], + [6068, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 3471319495], + [6074, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 1274038477], + [6080, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 2896814693], + [6083, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087576526], + [6085, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114086530], + [6089, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 250433828], + [6091, 121, 59, "Layout/LineLength: Line is too long. [179/120]", 3910556848], + [6095, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4002014976], + [6098, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 3491931666], + [6100, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114086530], + [6194, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861664], + [6208, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087932582], + [6222, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861664], + [6238, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 876012844], + [6240, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1756764194], + [6241, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 4173216735], + [6244, 121, 75, "Layout/LineLength: Line is too long. [195/120]", 911964425], + [6245, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 173266907], + [6246, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1412705933], + [6249, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1756764194], + [6250, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 2605683750], + [6253, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 3182252139], + [6255, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1652557742], + [6259, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 2240437058], + [6260, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 173266907], + [6261, 121, 101, "Layout/LineLength: Line is too long. [221/120]", 3694598076], + [6263, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861152], + [6264, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179079542], + [6265, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 3528944411], + [6268, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3020159378], + [6270, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1652557742], + [6276, 121, 84, "Layout/LineLength: Line is too long. [204/120]", 420843234], + [6278, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1401226501], + [6279, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 442915368], + [6282, 121, 79, "Layout/LineLength: Line is too long. [199/120]", 4212444955], + [6283, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053864], + [6284, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1373660924], + [6287, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1401226501], + [6288, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 1539225758], + [6291, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3020159378], + [6293, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 4240691845], + [6297, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 674553335], + [6298, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053864], + [6299, 121, 105, "Layout/LineLength: Line is too long. [225/120]", 4163432287], + [6301, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2089555761], + [6302, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2034687276], + [6303, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 3710905302], + [6306, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 4204667212], + [6308, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 4240691845], + [6314, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 2071493433], + [6316, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085352569], + [6317, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 2853066942], + [6320, 121, 71, "Layout/LineLength: Line is too long. [191/120]", 2771467828], + [6321, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193425976], + [6322, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3025157142], + [6325, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085352569], + [6326, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 3340824101], + [6329, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 3999804761], + [6331, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1999310973], + [6335, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 835016333], + [6336, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193425976], + [6337, 121, 97, "Layout/LineLength: Line is too long. [217/120]", 3575893945], + [6340, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193405945], + [6341, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 1755858308], + [6344, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 3182252139], + [6346, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1999310973], + [6352, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 3033080032], + [6354, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177549], + [6355, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 2720985203], + [6358, 121, 65, "Layout/LineLength: Line is too long. [185/120]", 3233424320], + [6360, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873483], + [6363, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177549], + [6364, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 131859703], + [6367, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1943494546], + [6369, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 4016166830], + [6373, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 1350760977], + [6375, 121, 91, "Layout/LineLength: Line is too long. [211/120]", 4098706554], + [6379, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 4059724765], + [6382, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1651955548], + [6384, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 4016166830], + [6390, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 1057495720], + [6393, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1621971220], + [6396, 121, 49, "Layout/LineLength: Line is too long. [169/120]", 1585717593], + [6402, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 2942094233], + [6405, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2624667704], + [6407, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2317051977], + [6411, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 1321610634], + [6413, 121, 75, "Layout/LineLength: Line is too long. [195/120]", 2854688831], + [6417, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 4185465554], + [6420, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1169781875], + [6422, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2317051977], + [6428, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 1916545020], + [6431, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1422839111], + [6434, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 910134593], + [6440, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 203086561], + [6443, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2939363812], + [6445, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3155638331], + [6449, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 1955758062], + [6451, 121, 71, "Layout/LineLength: Line is too long. [191/120]", 3737424359], + [6455, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 3597620692], + [6458, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2624667704], + [6460, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3155638331], + [6466, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 1036052399], + [6469, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114086530], + [6472, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 1268266488], + [6478, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 2791598354], + [6481, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1302589368], + [6483, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3533902728], + [6487, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 3942276897], + [6489, 121, 73, "Layout/LineLength: Line is too long. [193/120]", 1175941460], + [6493, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 679697318], + [6496, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 28126263], + [6498, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3533902728], + [6499, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 181895237], + [6504, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 4057848448], + [6507, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114086530], + [6510, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 4067769399], + [6516, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 461482909], + [6519, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1302589368], + [6521, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3533902728], + [6525, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 3561204590], + [6527, 121, 73, "Layout/LineLength: Line is too long. [193/120]", 880160795], + [6531, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 1614719145], + [6534, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 28126263], + [6536, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3533902728], + [6537, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 181895237], + [6584, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193432306], + [6598, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 1645945966], + [6601, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3212740609], + [6604, 121, 59, "Layout/LineLength: Line is too long. [179/120]", 3982698123], + [6606, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193425997], + [6610, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 2663750402], + [6613, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2420297272], + [6615, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1164389943], + [6619, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 3483121581], + [6621, 121, 85, "Layout/LineLength: Line is too long. [205/120]", 2271668600], + [6625, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 804794365], + [6628, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3659367004], + [6630, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1164389943], + [6631, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 561395486], + [6636, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 1251661057], + [6639, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3212740609], + [6642, 121, 59, "Layout/LineLength: Line is too long. [179/120]", 3210109508], + [6644, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193425997], + [6648, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 430316685], + [6651, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2420297272], + [6653, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1164389943], + [6657, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 2428160226], + [6659, 121, 85, "Layout/LineLength: Line is too long. [205/120]", 2663295671], + [6663, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 2822109938], + [6666, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3659367004], + [6668, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1164389943], + [6669, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 561395486], + [6674, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 857639785], + [6677, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3669622788], + [6680, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 140453799], + [6682, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860765], + [6686, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 1650236431], + [6689, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 150699323], + [6691, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 50618962], + [6695, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 4205571164], + [6697, 121, 83, "Layout/LineLength: Line is too long. [203/120]", 1549528021], + [6701, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 1325488145], + [6704, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1510711065], + [6706, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 50618962], + [6712, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 3043205563], + [6715, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2381137493], + [6718, 121, 61, "Layout/LineLength: Line is too long. [181/120]", 2200345195], + [6720, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087926498], + [6724, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 1082269527], + [6727, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1510711065], + [6729, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1104064739], + [6733, 121, 68, "Layout/LineLength: Line is too long. [188/120]", 1652941658], + [6735, 121, 87, "Layout/LineLength: Line is too long. [207/120]", 1440323819], + [6739, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 802896260], + [6742, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1943494546], + [6744, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1104064739], + [6750, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 788730815], + [6752, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2034687276], + [6753, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 4226330106], + [6756, 121, 77, "Layout/LineLength: Line is too long. [197/120]", 2414796320], + [6757, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873470], + [6758, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3090817832], + [6761, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2034687276], + [6762, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 2839148677], + [6765, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 2393983240], + [6767, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 2581936864], + [6771, 121, 84, "Layout/LineLength: Line is too long. [204/120]", 3923254945], + [6772, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873470], + [6773, 121, 103, "Layout/LineLength: Line is too long. [223/120]", 580639726], + [6775, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193419246], + [6776, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1756764194], + [6777, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 3202758044], + [6780, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 912651721], + [6782, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 2581936864], + [6786, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1164293389], + [6799, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860840], + [6800, 121, 88, "Layout/LineLength: Line is too long. [208/120]", 574552570], + [6802, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3845073641], + [6803, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 543375177], + [6806, 121, 83, "Layout/LineLength: Line is too long. [203/120]", 222410330], + [6807, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3025157219], + [6808, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1904561434], + [6811, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 489872984], + [6812, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 97325617], + [6815, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 4204667212], + [6817, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 4062673070], + [6821, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 1451915960], + [6822, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3025157219], + [6823, 121, 109, "Layout/LineLength: Line is too long. [229/120]", 4200529758], + [6825, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1497831350], + [6826, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 4214367244], + [6827, 121, 84, "Layout/LineLength: Line is too long. [204/120]", 399603517], + [6830, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3423548875], + [6832, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 4062673070], + [6836, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3279830097], + [6848, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 659167322], + [6860, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087926423], + [6861, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 3300294193], + [6863, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3172850966], + [6864, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 2396187736], + [6867, 121, 87, "Layout/LineLength: Line is too long. [207/120]", 1991888901], + [6868, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1954380402], + [6869, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2589970962], + [6872, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 42340644], + [6873, 121, 67, "Layout/LineLength: Line is too long. [187/120]", 479235996], + [6876, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3423548875], + [6878, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1462541970], + [6882, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 1373978781], + [6883, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1954380402], + [6884, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 280641011], + [6886, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1664110553], + [6887, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1009650381], + [6888, 121, 88, "Layout/LineLength: Line is too long. [208/120]", 909329343], + [6891, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 2977589831], + [6893, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1462541970], + [6898, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873470], + [6899, 121, 61, "Layout/LineLength: Line is too long. [181/120]", 1904101094], + [6901, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2229256255], + [6902, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 1839090017], + [6905, 121, 91, "Layout/LineLength: Line is too long. [211/120]", 4260980907], + [6906, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 4253118453], + [6907, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1536690221], + [6909, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861152], + [6910, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 209824656], + [6911, 121, 71, "Layout/LineLength: Line is too long. [191/120]", 1530496074], + [6914, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 2977589831], + [6916, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3261436902], + [6920, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 3762694917], + [6921, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 4253118453], + [6922, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 3196230010], + [6924, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3165598659], + [6925, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 4264469493], + [6926, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 3140690958], + [6929, 121, 35, "Layout/LineLength: Line is too long. [155/120]", 2999583208], + [6931, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3261436902], + [6937, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 326070599], + [6940, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1621971220], + [6943, 121, 49, "Layout/LineLength: Line is too long. [169/120]", 1689000214], + [6949, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 2459904022], + [6952, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2624667704], + [6954, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2317051977], + [6958, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 2842872837], + [6960, 121, 75, "Layout/LineLength: Line is too long. [195/120]", 423884656], + [6964, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 2673769885], + [6967, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1169781875], + [6969, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2317051977], + [6970, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2126253911], + [6986, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 2388292564], + [6989, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2381137493], + [6992, 121, 61, "Layout/LineLength: Line is too long. [181/120]", 1136762660], + [6994, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087926498], + [6998, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 2555581016], + [7001, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1510711065], + [7003, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1104064739], + [7007, 121, 68, "Layout/LineLength: Line is too long. [188/120]", 1986812885], + [7009, 121, 87, "Layout/LineLength: Line is too long. [207/120]", 1864036132], + [7013, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 3590180043], + [7016, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1943494546], + [7018, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1104064739], + [7019, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2382712010], + [7029, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1791534645], + [7034, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 2403815412], + [7037, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1422839111], + [7040, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 4046048864], + [7046, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 3472955113], + [7049, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2939363812], + [7051, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3155638331], + [7055, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3911469720], + [7057, 121, 71, "Layout/LineLength: Line is too long. [191/120]", 272433263], + [7061, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 634420444], + [7064, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2624667704], + [7066, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3155638331], + [7067, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2088324682], + [7080, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087906711], + [7092, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2135380894], + [7101, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], + [7103, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 4280757685], + [7107, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 161599970], + [7141, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053789], + [7176, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2188407955], + [7187, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3692322233], + [7191, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087557694], + [7214, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3197512522], + [7223, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858840], + [7225, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 85298067], + [7282, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193418403], + [7288, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193418403], + [7311, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087432474], + [7323, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2361949763], + [7332, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], + [7334, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 581045160], + [7338, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 4235011647], + [7357, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1898147766], + [7363, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177560], + [7369, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 1310140439], + [7378, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 681770239], + [7380, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3821940657], + [7384, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], + [7404, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861292], + [7416, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2354124424], + [7425, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087922021], + [7427, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 3921370162], + [8020, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 4083054536], + [8048, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 4083054536], + [8077, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 4083054536], + [8135, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 632953222], + [8164, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 732995265], + [8214, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 1886249927], + [8376, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 578751979], + [8377, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3803540269], + [8386, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2238403955], + [8387, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1028441932], + [8388, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 1975950909], + [8443, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1244043798] + ], + "spec/integration/freeze_node_edge_cases_spec.rb:3416491031": [ + [6, 1, 28959, "Metrics/BlockLength: Block has too many lines. [663/25]", 3473768018], + [7, 3, 2985, "Metrics/BlockLength: Block has too many lines. [57/25]", 436154415], + [8, 5, 2934, "Metrics/BlockLength: Block has too many lines. [55/25]", 1963918102], + [78, 3, 6091, "Metrics/BlockLength: Block has too many lines. [136/25]", 232153494], + [98, 5, 3053, "Metrics/BlockLength: Block has too many lines. [69/25]", 1442974101], + [202, 5, 1691, "Metrics/BlockLength: Block has too many lines. [29/25]", 985654389], + [241, 3, 8515, "Metrics/BlockLength: Block has too many lines. [176/25]", 2776676526], + [473, 3, 2024, "Metrics/BlockLength: Block has too many lines. [55/25]", 1048101963], + [474, 5, 890, "Metrics/BlockLength: Block has too many lines. [26/25]", 753961540], + [543, 3, 4511, "Metrics/BlockLength: Block has too many lines. [116/25]", 1227615145], + [693, 3, 1660, "Metrics/BlockLength: Block has too many lines. [43/25]", 1881888061], + [694, 5, 1107, "Metrics/BlockLength: Block has too many lines. [26/25]", 368095693] + ], + "spec/integration/gem_family_section_merge_spec.rb:1744383089": [ + [164, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 93655697] + ], + "spec/integration/integration_spec.rb:2239247043": [ + [14, 1, 4488, "Metrics/BlockLength: Block has too many lines. [88/25]", 206207480], + [15, 3, 3267, "Metrics/BlockLength: Block has too many lines. [62/25]", 1323899085], + [40, 5, 2263, "Metrics/BlockLength: Block has too many lines. [48/25]", 3172595581] + ], + "spec/integration/link_reference_preservation_spec.rb:3764298162": [ + [6, 1, 2646, "Metrics/BlockLength: Block has too many lines. [48/25]", 3396410609], + [19, 3, 2058, "Metrics/BlockLength: Block has too many lines. [33/25]", 163363949] + ], + "spec/integration/markly_merge_spec.rb:3076950975": [ + [3, 1, 22886, "Metrics/BlockLength: Block has too many lines. [670/25]", 1408138744], + [62, 3, 7192, "Metrics/BlockLength: Block has too many lines. [189/25]", 1890889324], + [63, 5, 1678, "Metrics/BlockLength: Block has too many lines. [41/25]", 2587582896], + [115, 5, 1808, "Metrics/BlockLength: Block has too many lines. [48/25]", 3381172795], + [147, 46, 21, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 451071547], + [171, 5, 1134, "Metrics/BlockLength: Block has too many lines. [30/25]", 2526618199], + [220, 5, 1335, "Metrics/BlockLength: Block has too many lines. [32/25]", 2790596215], + [311, 3, 2008, "Metrics/BlockLength: Block has too many lines. [66/25]", 2640155627], + [394, 3, 1052, "Metrics/BlockLength: Block has too many lines. [27/25]", 3988836255], + [440, 3, 2950, "Metrics/BlockLength: Block has too many lines. [89/25]", 961031348], + [441, 5, 1352, "Metrics/BlockLength: Block has too many lines. [37/25]", 1952365669], + [495, 5, 1550, "Metrics/BlockLength: Block has too many lines. [48/25]", 2400197001], + [561, 3, 1665, "Metrics/BlockLength: Block has too many lines. [52/25]", 3884776329], + [650, 3, 1919, "Metrics/BlockLength: Block has too many lines. [57/25]", 2594646583], + [725, 3, 1644, "Metrics/BlockLength: Block has too many lines. [45/25]", 2348710811], + [791, 3, 1600, "Metrics/BlockLength: Block has too many lines. [46/25]", 3683503747] + ], + "spec/integration/partial_template_merger_table_merge_spec.rb:3504046892": [ + [7, 1, 7402, "Metrics/BlockLength: Block has too many lines. [164/25]", 3368892126], + [9, 3, 2986, "Metrics/BlockLength: Block has too many lines. [67/25]", 2267114449], + [65, 5, 1359, "Metrics/BlockLength: Block has too many lines. [28/25]", 3145143002], + [102, 3, 997, "Metrics/BlockLength: Block has too many lines. [26/25]", 3156068215], + [147, 3, 3009, "Metrics/BlockLength: Block has too many lines. [65/25]", 994160212], + [202, 5, 1401, "Metrics/BlockLength: Block has too many lines. [28/25]", 3038951618] + ], + "spec/integration/table_formatting_preservation_spec.rb:3943985446": [ + [6, 1, 3086, "Metrics/BlockLength: Block has too many lines. [56/25]", 2210897849], + [19, 3, 2374, "Metrics/BlockLength: Block has too many lines. [40/25]", 668961519], + [33, 5, 1847, "Metrics/BlockLength: Block has too many lines. [28/25]", 3433318963] + ], + "spec/integration/text_merge_spec.rb:884566200": [ + [6, 1, 7747, "Metrics/BlockLength: Block has too many lines. [204/25]", 2372984305], + [60, 3, 1113, "Metrics/BlockLength: Block has too many lines. [34/25]", 3399970957], + [67, 5, 860, "Metrics/BlockLength: Block has too many lines. [27/25]", 2337191560], + [103, 3, 916, "Metrics/BlockLength: Block has too many lines. [28/25]", 4082963348], + [149, 3, 3001, "Metrics/BlockLength: Block has too many lines. [74/25]", 7776854] + ], + "spec/support/fictive_language_harness.rb:1770581700": [ + [85, 7, 733, "Metrics/AbcSize: Assignment Branch Condition size for `extract_comments` is too high. [<5, 16, 5> 17.49/17]", 1127096515], + [85, 7, 733, "Metrics/MethodLength: Method has too many lines. [22/10]", 1127096515], + [117, 21, 129, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 681912759], + [182, 7, 1084, "Metrics/AbcSize: Assignment Branch Condition size for `parse_statements` is too high. [<9, 28, 7> 30.23/17]", 3123785685], + [182, 7, 1084, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_statements` is too high. [8/7]", 3123785685], + [182, 7, 1084, "Metrics/MethodLength: Method has too many lines. [24/10]", 3123785685], + [233, 5, 9879, "Metrics/ClassLength: Class has too many lines. [228/100]", 3231256134], + [236, 21, 208, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2970487173], + [257, 7, 1981, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_batch` is too high. [<16, 32, 4> 36/17]", 4125392918], + [257, 7, 1981, "Metrics/MethodLength: Method has too many lines. [42/10]", 4125392918], + [342, 7, 778, "Metrics/MethodLength: Method has too many lines. [18/10]", 4189873983], + [364, 7, 844, "Metrics/MethodLength: Method has too many lines. [19/10]", 526186683], + [449, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087956942], + [464, 7, 1065, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_template_preamble_prefix_region` is too high. [<6, 24, 11> 27.07/17]", 2332280467], + [464, 7, 1065, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collapse_template_preamble_prefix_region` is too high. [10/7]", 2332280467], + [464, 7, 1065, "Metrics/MethodLength: Method has too many lines. [20/10]", 2332280467], + [464, 7, 1065, "Metrics/PerceivedComplexity: Perceived complexity for `collapse_template_preamble_prefix_region` is too high. [10/8]", 2332280467] + ], + "spec/support/testable_node.rb:1110514732": [ + [10, 7, 573, "Metrics/MethodLength: Method has too many lines. [12/10]", 798847435], + [10, 22, 226, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 2319398994], + [40, 7, 642, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<11, 14, 6> 18.79/17]", 2249578474], + [40, 21, 131, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 1786967686] + ] +} diff --git a/gems/ast-merge/Gemfile.lock b/gems/ast-merge/Gemfile.lock index 97d3479b7..37875e265 100644 --- a/gems/ast-merge/Gemfile.lock +++ b/gems/ast-merge/Gemfile.lock @@ -17,270 +17,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.0) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: @@ -309,12 +45,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -323,6 +53,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -372,12 +103,21 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - kettle-dev (2.3.6) + kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -396,7 +136,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -536,23 +275,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -586,11 +327,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -637,45 +373,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -684,61 +398,39 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -751,27 +443,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) - kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae - kettle-drift (1.0.5) - kettle-jem (7.1.0) + kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.0) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -786,14 +470,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -801,7 +481,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -829,19 +508,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -855,19 +532,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -875,7 +547,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/json-merge/Gemfile.lock b/gems/json-merge/Gemfile.lock index 7ebad3c4c..ed7c64d3b 100644 --- a/gems/json-merge/Gemfile.lock +++ b/gems/json-merge/Gemfile.lock @@ -16,6 +16,246 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -53,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -381,24 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -407,32 +684,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,20 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -480,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -491,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -518,9 +830,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -529,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -542,14 +858,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 6fa1cd2bcf25e0e8c0438f24e4fd1e72efee63c2 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 16:37:58 -0600 Subject: [PATCH 014/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-merge/Gemfile.lock | 332 ++++++++++++++++++ gems/go-merge/Gemfile.lock | 352 ++++++++++++++++++- gems/ruby-merge/Gemfile.lock | 352 ++++++++++++++++++- gems/toml-merge/.gitattributes | 2 +- gems/toml-merge/.kettle-drift.lock | 60 ++-- gems/toml-merge/.rubocop_gradual.lock | 278 --------------- gems/toml-merge/Gemfile | 70 +++- gems/toml-merge/Gemfile.lock | 403 ++++++++++++++++++++-- gems/toml-merge/Rakefile | 18 +- gems/toml-merge/bin/yard | 2 +- gems/toml-merge/lib/toml/merge/version.rb | 2 +- gems/yaml-merge/.gitattributes | 2 +- gems/yaml-merge/.kettle-drift.lock | 60 ++-- gems/yaml-merge/Gemfile | 40 +++ gems/yaml-merge/Gemfile.lock | 326 +---------------- 15 files changed, 1574 insertions(+), 725 deletions(-) delete mode 100644 gems/toml-merge/.rubocop_gradual.lock diff --git a/gems/ast-merge/Gemfile.lock b/gems/ast-merge/Gemfile.lock index 37875e265..8a2ab0c38 100644 --- a/gems/ast-merge/Gemfile.lock +++ b/gems/ast-merge/Gemfile.lock @@ -17,6 +17,254 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: @@ -45,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -108,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -136,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -275,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -327,6 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -373,23 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -398,32 +684,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -431,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -443,19 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -470,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -481,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -508,9 +830,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -519,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -532,14 +858,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -547,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/go-merge/Gemfile.lock b/gems/go-merge/Gemfile.lock index 05af3d9ae..52d5dec8d 100644 --- a/gems/go-merge/Gemfile.lock +++ b/gems/go-merge/Gemfile.lock @@ -16,6 +16,264 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +285,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -103,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -131,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -322,11 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -373,23 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -398,31 +684,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -430,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -447,15 +757,22 @@ CHECKSUMS io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -470,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -481,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -508,9 +830,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -519,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -532,14 +858,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -547,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ruby-merge/Gemfile.lock b/gems/ruby-merge/Gemfile.lock index 43b3357fd..ba8011f4a 100644 --- a/gems/ruby-merge/Gemfile.lock +++ b/gems/ruby-merge/Gemfile.lock @@ -16,6 +16,264 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +285,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -103,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -131,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -322,11 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -373,22 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -399,30 +686,52 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0.0) ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -430,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -442,19 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -469,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -480,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -511,6 +834,8 @@ 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -519,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -532,14 +858,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -547,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/toml-merge/.gitattributes b/gems/toml-merge/.gitattributes index 0ac65aaa7..35a3c7359 100644 --- a/gems/toml-merge/.gitattributes +++ b/gems/toml-merge/.gitattributes @@ -1,5 +1,5 @@ # <> do not edit below this line -*.rb diff=smorg-ruby +*.rb diff=smorg-rb *.go diff=smorg-go *.rs diff=smorg-rs # <> diff --git a/gems/toml-merge/.kettle-drift.lock b/gems/toml-merge/.kettle-drift.lock index 9295a3562..628aa923c 100644 --- a/gems/toml-merge/.kettle-drift.lock +++ b/gems/toml-merge/.kettle-drift.lock @@ -4,7 +4,8 @@ "file": "Gemfile", "lines": [ 80, - 120 + 120, + 160 ] } ], @@ -13,7 +14,8 @@ "file": "Gemfile", "lines": [ 91, - 131 + 131, + 171 ] } ], @@ -22,7 +24,8 @@ "file": "Gemfile", "lines": [ 81, - 121 + 121, + 161 ] } ], @@ -31,7 +34,8 @@ "file": "Gemfile", "lines": [ 93, - 133 + 133, + 173 ] } ], @@ -40,7 +44,8 @@ "file": "Gemfile", "lines": [ 96, - 136 + 136, + 176 ] } ], @@ -49,7 +54,8 @@ "file": "Gemfile", "lines": [ 82, - 122 + 122, + 162 ] } ], @@ -59,7 +65,8 @@ "lines": [ 60, 100, - 140 + 140, + 180 ] } ], @@ -68,7 +75,8 @@ "file": "Gemfile", "lines": [ 101, - 141 + 141, + 181 ] } ], @@ -78,7 +86,8 @@ "lines": [ 43, 87, - 127 + 127, + 167 ] } ], @@ -87,7 +96,8 @@ "file": "Gemfile", "lines": [ 110, - 150 + 150, + 190 ] } ], @@ -97,7 +107,8 @@ "lines": [ 35, 79, - 119 + 119, + 159 ] } ], @@ -107,7 +118,8 @@ "lines": [ 69, 109, - 149 + 149, + 189 ] } ], @@ -116,7 +128,8 @@ "file": "Gemfile", "lines": [ 85, - 125 + 125, + 165 ] } ], @@ -126,7 +139,8 @@ "lines": [ 48, 92, - 132 + 132, + 172 ] } ], @@ -136,7 +150,8 @@ "lines": [ 44, 88, - 128 + 128, + 168 ] } ], @@ -145,7 +160,8 @@ "file": "Gemfile", "lines": [ 86, - 126 + 126, + 166 ] } ], @@ -154,7 +170,8 @@ "file": "Gemfile", "lines": [ 103, - 143 + 143, + 183 ] } ], @@ -163,7 +180,8 @@ "file": "Gemfile", "lines": [ 102, - 142 + 142, + 182 ] } ], @@ -172,7 +190,8 @@ "file": "Gemfile", "lines": [ 97, - 137 + 137, + 177 ] } ], @@ -181,7 +200,8 @@ "file": "Gemfile", "lines": [ 106, - 146 + 146, + 186 ] } ], diff --git a/gems/toml-merge/.rubocop_gradual.lock b/gems/toml-merge/.rubocop_gradual.lock deleted file mode 100644 index 4b65819de..000000000 --- a/gems/toml-merge/.rubocop_gradual.lock +++ /dev/null @@ -1,278 +0,0 @@ -{ - ".simplecov:3682400110": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:133885645": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/toml-merge.rb:3814390984": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`toml-merge.rb`) should use snake_case.", 5381], - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "lib/toml/merge.rb:114483342": [ - [42, 3, 19743, "Metrics/ModuleLength: Module has too many lines. [449/100]", 3377734762], - [122, 5, 16553, "Metrics/ClassLength: Class has too many lines. [420/100]", 3607675918], - [164, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1773216188], - [173, 7, 594, "Metrics/MethodLength: Method has too many lines. [16/10]", 1049978805], - [197, 7, 1640, "Metrics/AbcSize: Assignment Branch Condition size for `merge_toml` is too high. [<7, 24, 9> 26.57/17]", 478063103], - [197, 7, 1640, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_toml` is too high. [8/7]", 478063103], - [197, 7, 1640, "Metrics/MethodLength: Method has too many lines. [32/10]", 478063103], - [201, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1773216188], - [236, 7, 1795, "Metrics/AbcSize: Assignment Branch Condition size for `merge_toml_with_parser` is too high. [<7, 24, 8> 26.25/17]", 4111497622], - [236, 7, 1795, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_toml_with_parser` is too high. [8/7]", 4111497622], - [236, 7, 1795, "Metrics/MethodLength: Method has too many lines. [33/10]", 4111497622], - [345, 7, 688, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `strip_toml_comment` is too high. [8/7]", 3909397399], - [345, 7, 688, "Metrics/MethodLength: Method has too many lines. [25/10]", 3909397399], - [345, 7, 688, "Metrics/PerceivedComplexity: Perceived complexity for `strip_toml_comment` is too high. [9/8]", 3909397399], - [379, 7, 1087, "Metrics/AbcSize: Assignment Branch Condition size for `split_outside_quotes` is too high. [<13, 16, 15> 25.5/17]", 609465929], - [379, 7, 1087, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split_outside_quotes` is too high. [12/7]", 609465929], - [379, 7, 1087, "Metrics/MethodLength: Method has too many lines. [39/10]", 609465929], - [379, 7, 1087, "Metrics/PerceivedComplexity: Perceived complexity for `split_outside_quotes` is too high. [13/8]", 609465929], - [386, 9, 762, "Metrics/BlockLength: Block has too many lines. [29/25]", 4212946145], - [437, 7, 462, "Metrics/MethodLength: Method has too many lines. [16/10]", 2527564697], - [456, 7, 1018, "Metrics/AbcSize: Assignment Branch Condition size for `parse_toml_value` is too high. [<7, 28, 11> 30.89/17]", 820781705], - [456, 7, 1018, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_toml_value` is too high. [10/7]", 820781705], - [456, 7, 1018, "Metrics/MethodLength: Method has too many lines. [20/10]", 820781705], - [456, 7, 1018, "Metrics/PerceivedComplexity: Perceived complexity for `parse_toml_value` is too high. [11/8]", 820781705], - [484, 7, 458, "Metrics/MethodLength: Method has too many lines. [13/10]", 3674341378], - [511, 7, 877, "Metrics/AbcSize: Assignment Branch Condition size for `parse_toml_document` is too high. [<9, 20, 6> 22.74/17]", 2959395577], - [511, 7, 877, "Metrics/MethodLength: Method has too many lines. [19/10]", 2959395577], - [560, 7, 581, "Metrics/AbcSize: Assignment Branch Condition size for `render_toml_table` is too high. [<8, 22, 6> 24.17/17]", 3078876750], - [560, 7, 581, "Metrics/MethodLength: Method has too many lines. [13/10]", 3078876750], - [581, 7, 619, "Metrics/MethodLength: Method has too many lines. [12/10]", 451848846], - [596, 7, 614, "Metrics/AbcSize: Assignment Branch Condition size for `merge_toml_tables` is too high. [<3, 20, 6> 21.1/17]", 1810526535], - [596, 7, 614, "Metrics/MethodLength: Method has too many lines. [11/10]", 1810526535] - ], - "lib/toml/merge/comment_tracker.rb:743656609": [ - [16, 5, 5242, "Metrics/ClassLength: Class has too many lines. [112/100]", 3014190138], - [28, 7, 990, "Metrics/MethodLength: Method has too many lines. [17/10]", 85804539], - [92, 7, 949, "Metrics/AbcSize: Assignment Branch Condition size for `build_toml_region` is too high. [<7, 21, 9> 23.9/17]", 552845000], - [92, 7, 949, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_toml_region` is too high. [9/7]", 552845000], - [92, 7, 949, "Metrics/MethodLength: Method has too many lines. [23/10]", 552845000], - [92, 7, 949, "Metrics/PerceivedComplexity: Perceived complexity for `build_toml_region` is too high. [9/8]", 552845000] - ], - "lib/toml/merge/conflict_resolver.rb:2699752146": [ - [11, 5, 42658, "Metrics/ClassLength: Class has too many lines. [791/100]", 2931993361], - [30, 7, 788, "Metrics/MethodLength: Method has too many lines. [13/10]", 2218400960], - [30, 21, 235, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 788504679], - [31, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3099130903], - [52, 7, 1676, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_batch` is too high. [<4, 24, 3> 24.52/17]", 623996510], - [52, 7, 1676, "Metrics/MethodLength: Method has too many lines. [29/10]", 623996510], - [53, 9, 1632, "Metrics/BlockLength: Block has too many lines. [27/25]", 3553849414], - [101, 7, 8464, "Metrics/AbcSize: Assignment Branch Condition size for `merge_node_lists_to_emitter` is too high. [<54, 88, 31> 107.8/17]", 3669765511], - [101, 7, 8464, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_node_lists_to_emitter` is too high. [27/7]", 3669765511], - [101, 7, 8464, "Metrics/MethodLength: Method has too many lines. [141/10]", 3669765511], - [101, 7, 8464, "Metrics/PerceivedComplexity: Perceived complexity for `merge_node_lists_to_emitter` is too high. [29/8]", 3669765511], - [146, 9, 5685, "Metrics/BlockLength: Block has too many lines. [102/25]", 464560406], - [286, 7, 2458, "Metrics/AbcSize: Assignment Branch Condition size for `merge_matched_nodes_to_emitter` is too high. [<6, 17, 10> 20.62/17]", 4036358483], - [286, 7, 2458, "Metrics/MethodLength: Method has too many lines. [49/10]", 4036358483], - [286, 7, 2458, "Metrics/PerceivedComplexity: Perceived complexity for `merge_matched_nodes_to_emitter` is too high. [9/8]", 4036358483], - [289, 11, 1647, "Metrics/BlockLength: Block has too many lines. [34/25]", 997955803], - [353, 7, 770, "Metrics/MethodLength: Method has too many lines. [21/10]", 543737609], - [387, 7, 1101, "Metrics/AbcSize: Assignment Branch Condition size for `build_refined_matches` is too high. [<11, 16, 8> 21/17]", 4236016583], - [387, 7, 1101, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_refined_matches` is too high. [9/7]", 4236016583], - [387, 7, 1101, "Metrics/MethodLength: Method has too many lines. [18/10]", 4236016583], - [387, 7, 1101, "Metrics/PerceivedComplexity: Perceived complexity for `build_refined_matches` is too high. [9/8]", 4236016583], - [427, 7, 642, "Metrics/AbcSize: Assignment Branch Condition size for `emit_removed_destination_node_inline_comments` is too high. [<4, 20, 5> 21/17]", 2624953678], - [427, 7, 642, "Metrics/MethodLength: Method has too many lines. [11/10]", 2624953678], - [462, 7, 720, "Metrics/MethodLength: Method has too many lines. [11/10]", 4270722493], - [499, 7, 1022, "Metrics/MethodLength: Method has too many lines. [17/10]", 3216685542], - [584, 7, 1854, "Metrics/AbcSize: Assignment Branch Condition size for `emit_leading_region` is too high. [<8, 28, 9> 30.48/17]", 377203837], - [584, 7, 1854, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_leading_region` is too high. [10/7]", 377203837], - [584, 7, 1854, "Metrics/MethodLength: Method has too many lines. [32/10]", 377203837], - [584, 7, 1854, "Metrics/PerceivedComplexity: Perceived complexity for `emit_leading_region` is too high. [10/8]", 377203837], - [685, 7, 1275, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_template_preamble_prefix_region` is too high. [<7, 24, 9> 26.57/17]", 1754222078], - [685, 7, 1275, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collapse_template_preamble_prefix_region` is too high. [8/7]", 1754222078], - [685, 7, 1275, "Metrics/MethodLength: Method has too many lines. [24/10]", 1754222078], - [716, 7, 662, "Metrics/AbcSize: Assignment Branch Condition size for `root_boundary_lines_for` is too high. [<4, 15, 10> 18.47/17]", 935744348], - [716, 7, 662, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `root_boundary_lines_for` is too high. [9/7]", 935744348], - [716, 7, 662, "Metrics/MethodLength: Method has too many lines. [14/10]", 935744348], - [736, 7, 343, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `region_lines_for` is too high. [8/7]", 399995706], - [753, 7, 614, "Metrics/AbcSize: Assignment Branch Condition size for `dedup_warning_context` is too high. [<0, 20, 10> 22.36/17]", 2011768288], - [753, 7, 614, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `dedup_warning_context` is too high. [11/7]", 2011768288], - [753, 7, 614, "Metrics/PerceivedComplexity: Perceived complexity for `dedup_warning_context` is too high. [11/8]", 2011768288], - [756, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [757, 41, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [757, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 3287405165], - [783, 7, 1426, "Metrics/MethodLength: Method has too many lines. [34/10]", 1351993853], - [849, 7, 955, "Metrics/MethodLength: Method has too many lines. [21/10]", 3080929417], - [877, 7, 1249, "Metrics/AbcSize: Assignment Branch Condition size for `emit_node_lines` is too high. [<6, 21, 6> 22.65/17]", 3195628693], - [877, 7, 1249, "Metrics/MethodLength: Method has too many lines. [21/10]", 3195628693], - [952, 7, 637, "Metrics/AbcSize: Assignment Branch Condition size for `inline_region_separator` is too high. [<5, 18, 7> 19.95/17]", 2029360360], - [952, 7, 637, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `inline_region_separator` is too high. [8/7]", 2029360360], - [952, 7, 637, "Metrics/MethodLength: Method has too many lines. [12/10]", 2029360360], - [969, 7, 465, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_interstitial_blank_lines` is too high. [9/7]", 1640065866], - [969, 7, 465, "Metrics/PerceivedComplexity: Perceived complexity for `emit_interstitial_blank_lines` is too high. [9/8]", 1640065866], - [981, 7, 620, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_gap_before_node` is too high. [12/7]", 2808239642], - [981, 7, 620, "Metrics/PerceivedComplexity: Perceived complexity for `emit_gap_before_node` is too high. [12/8]", 2808239642], - [983, 36, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [998, 7, 526, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_preceding_blank_lines` is too high. [8/7]", 3889743093], - [998, 7, 526, "Metrics/MethodLength: Method has too many lines. [11/10]", 3889743093] - ], - "lib/toml/merge/file_analysis.rb:2689095431": [ - [12, 5, 19523, "Metrics/ClassLength: Class has too many lines. [368/100]", 929433986], - [15, 7, 22, "Style/Documentation: Missing top-level documentation comment for `class Toml::Merge::FileAnalysis::CommentAugmenter`.", 2864244718], - [20, 9, 849, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<11, 13, 1> 17.06/17]", 1333266342], - [20, 9, 849, "Metrics/MethodLength: Method has too many lines. [16/10]", 1333266342], - [72, 7, 869, "Metrics/MethodLength: Method has too many lines. [13/10]", 1683071581], - [228, 7, 959, "Metrics/AbcSize: Assignment Branch Condition size for `root_pairs` is too high. [<10, 13, 16> 22.91/17]", 1481059821], - [228, 7, 959, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `root_pairs` is too high. [15/7]", 1481059821], - [228, 7, 959, "Metrics/MethodLength: Method has too many lines. [21/10]", 1481059821], - [228, 7, 959, "Metrics/PerceivedComplexity: Perceived complexity for `root_pairs` is too high. [15/8]", 1481059821], - [246, 9, 384, "Style/CombinableLoops: Combine this loop with the previous loop.", 2434692315], - [263, 7, 1729, "Metrics/AbcSize: Assignment Branch Condition size for `parse_toml` is too high. [<10, 12, 8> 17.55/17]", 2015178317], - [263, 7, 1729, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_toml` is too high. [9/7]", 2015178317], - [263, 7, 1729, "Metrics/MethodLength: Method has too many lines. [19/10]", 2015178317], - [331, 7, 596, "Metrics/MethodLength: Method has too many lines. [13/10]", 995924372], - [389, 7, 588, "Metrics/AbcSize: Assignment Branch Condition size for `comment_owner_end_line_for_augmenter` is too high. [<1, 20, 13> 23.87/17]", 1972553155], - [389, 7, 588, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `comment_owner_end_line_for_augmenter` is too high. [14/7]", 1972553155], - [389, 7, 588, "Metrics/PerceivedComplexity: Perceived complexity for `comment_owner_end_line_for_augmenter` is too high. [14/8]", 1972553155], - [448, 7, 1255, "Metrics/AbcSize: Assignment Branch Condition size for `scan_line_for_comment` is too high. [<16, 13, 17> 26.72/17]", 622981429], - [448, 7, 1255, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `scan_line_for_comment` is too high. [12/7]", 622981429], - [448, 7, 1255, "Metrics/MethodLength: Method has too many lines. [38/10]", 622981429], - [448, 7, 1255, "Metrics/PerceivedComplexity: Perceived complexity for `scan_line_for_comment` is too high. [13/8]", 622981429], - [496, 7, 319, "Metrics/MethodLength: Method has too many lines. [11/10]", 2890996257], - [535, 7, 416, "Metrics/MethodLength: Method has too many lines. [11/10]", 2416972242], - [576, 7, 464, "Metrics/AbcSize: Assignment Branch Condition size for `node_text` is too high. [<3, 16, 8> 18.14/17]", 2138809005], - [576, 7, 464, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `node_text` is too high. [8/7]", 2138809005] - ], - "lib/toml/merge/key_sorter.rb:829731466": [ - [59, 7, 1787, "Metrics/AbcSize: Assignment Branch Condition size for `partition_into_blocks` is too high. [<11, 23, 8> 26.72/17]", 3324132918], - [59, 7, 1787, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `partition_into_blocks` is too high. [8/7]", 3324132918], - [59, 7, 1787, "Metrics/MethodLength: Method has too many lines. [38/10]", 3324132918], - [59, 7, 1787, "Metrics/PerceivedComplexity: Perceived complexity for `partition_into_blocks` is too high. [9/8]", 3324132918] - ], - "lib/toml/merge/node_type_normalizer.rb:2171981470": [ - [67, 5, 7844, "Metrics/ModuleLength: Module has too many lines. [134/100]", 828548837], - [159, 11, 4, "Lint/BooleanSymbol: Symbol with a boolean name - you probably meant to use `true`.", 2087932467], - [160, 11, 5, "Lint/BooleanSymbol: Symbol with a boolean name - you probably meant to use `false`.", 170962968], - [215, 11, 4, "Lint/BooleanSymbol: Symbol with a boolean name - you probably meant to use `true`.", 2087932467], - [216, 11, 5, "Lint/BooleanSymbol: Symbol with a boolean name - you probably meant to use `false`.", 170962968] - ], - "lib/toml/merge/node_wrapper.rb:2123561241": [ - [26, 5, 23635, "Metrics/ClassLength: Class has too many lines. [417/100]", 111672250], - [37, 9, 517, "Metrics/MethodLength: Method has too many lines. [11/10]", 3513234297], - [37, 17, 154, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2431837951], - [54, 7, 503, "Metrics/MethodLength: Method has too many lines. [12/10]", 2647031658], - [54, 21, 82, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2652802373], - [229, 7, 1380, "Metrics/AbcSize: Assignment Branch Condition size for `value_node` is too high. [<5, 16, 10> 19.52/17]", 1398903082], - [229, 7, 1380, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `value_node` is too high. [9/7]", 1398903082], - [229, 7, 1380, "Metrics/MethodLength: Method has too many lines. [32/10]", 1398903082], - [229, 7, 1380, "Metrics/PerceivedComplexity: Perceived complexity for `value_node` is too high. [9/8]", 1398903082], - [232, 9, 1306, "Metrics/BlockLength: Block has too many lines. [28/25]", 3342818997], - [286, 7, 496, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `pairs` is too high. [9/7]", 2741436417], - [286, 7, 496, "Metrics/PerceivedComplexity: Perceived complexity for `pairs` is too high. [9/8]", 2741436417], - [319, 7, 706, "Metrics/MethodLength: Method has too many lines. [22/10]", 2032215880], - [390, 7, 553, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `effective_end_line` is too high. [8/7]", 2426868004], - [412, 7, 2225, "Metrics/AbcSize: Assignment Branch Condition size for `compute_signature` is too high. [<9, 32, 24> 41/17]", 1299303855], - [412, 7, 2225, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_signature` is too high. [25/7]", 1299303855], - [412, 7, 2225, "Metrics/MethodLength: Method has too many lines. [39/10]", 1299303855], - [412, 7, 2225, "Metrics/PerceivedComplexity: Perceived complexity for `compute_signature` is too high. [16/8]", 1299303855], - [511, 7, 487, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `raw_pair_value_text` is too high. [8/7]", 3177077098], - [535, 7, 1503, "Metrics/AbcSize: Assignment Branch Condition size for `collect_inline_table_keys_recursive` is too high. [<7, 25, 18> 31.59/17]", 3778857543], - [535, 7, 1503, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_inline_table_keys_recursive` is too high. [17/7]", 3778857543], - [535, 7, 1503, "Metrics/MethodLength: Method has too many lines. [24/10]", 3778857543], - [535, 7, 1503, "Metrics/PerceivedComplexity: Perceived complexity for `collect_inline_table_keys_recursive` is too high. [18/8]", 3778857543], - [593, 7, 855, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_sibling_pairs_for_table` is too high. [8/7]", 3160731503], - [593, 7, 855, "Metrics/MethodLength: Method has too many lines. [14/10]", 3160731503], - [624, 7, 655, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_next_table_start_line` is too high. [9/7]", 1465728116], - [624, 7, 655, "Metrics/MethodLength: Method has too many lines. [12/10]", 1465728116], - [624, 7, 655, "Metrics/PerceivedComplexity: Perceived complexity for `find_next_table_start_line` is too high. [9/8]", 1465728116], - [653, 7, 861, "Metrics/MethodLength: Method has too many lines. [12/10]", 4202205110] - ], - "lib/toml/merge/smart_merger.rb:3624815957": [ - [39, 5, 9573, "Metrics/ClassLength: Class has too many lines. [190/100]", 1615610584], - [72, 7, 1283, "Metrics/MethodLength: Method has too many lines. [18/10]", 2597249100], - [72, 21, 427, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 1661881927], - [144, 7, 1347, "Metrics/AbcSize: Assignment Branch Condition size for `merge_with_debug` is too high. [<3, 20, 7> 21.4/17]", 2015540458], - [144, 7, 1347, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_with_debug` is too high. [8/7]", 2015540458], - [144, 7, 1347, "Metrics/MethodLength: Method has too many lines. [31/10]", 2015540458], - [248, 7, 1161, "Metrics/MethodLength: Method has too many lines. [26/10]", 1453116447] - ], - "lib/toml/merge/table_match_refiner.rb:1590173808": [ - [32, 5, 7338, "Metrics/ClassLength: Class has too many lines. [108/100]", 3006106276], - [113, 35, 50, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1492696344], - [147, 7, 410, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_table_name` is too high. [8/7]", 2032455294], - [217, 7, 659, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<11, 38, 8> 40.36/17]", 2658150371], - [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:168123572": [ - [6, 1, 11947, "Metrics/BlockLength: Block has too many lines. [266/25]", 2102318823], - [228, 3, 1368, "Metrics/BlockLength: Block has too many lines. [34/25]", 3324165298] - ], - "toml-merge.gemspec:2519299257": [ - [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ] -} diff --git a/gems/toml-merge/Gemfile b/gems/toml-merge/Gemfile index c28cf331d..13f778d46 100644 --- a/gems/toml-merge/Gemfile +++ b/gems/toml-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source 'https://gem.coop' +source "https://gem.coop" git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,18 +19,62 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ['~> 1.0', '>= 1.0.8'] -gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ["~> 1.0", ">= 1.0.8"] +gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ast-merge tree_haver ] -direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') +direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? + +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) + direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") + direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == "nomono" } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + if nomono_locked + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] + end + end + Kernel.send(:gem, "nomono", *nomono_activation_requirements) + require "nomono/bundler" + if direct_sibling_templating && !direct_sibling_local + ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + end + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: "STRUCTUREDMERGE", + path_env: "STRUCTUREDMERGE_DEV", + root: ["src", "my", "structuredmerge"] + ) + rescue LoadError + warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + else + ENV.delete("STRUCTUREDMERGE_DEV") + end + end + end +end if direct_sibling_gems.any? && (direct_sibling_local || @@ -170,25 +214,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? # Debugging -eval_gemfile 'gemfiles/modular/debug.gemfile' +eval_gemfile "gemfiles/modular/debug.gemfile" # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile 'gemfiles/modular/coverage.gemfile' +eval_gemfile "gemfiles/modular/coverage.gemfile" # Linting -eval_gemfile 'gemfiles/modular/style.gemfile' +eval_gemfile "gemfiles/modular/style.gemfile" # Documentation -eval_gemfile 'gemfiles/modular/documentation.gemfile' +eval_gemfile "gemfiles/modular/documentation.gemfile" # Optional -eval_gemfile 'gemfiles/modular/optional.gemfile' +eval_gemfile "gemfiles/modular/optional.gemfile" ### Std Lib Extracted Gems -eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' +eval_gemfile "gemfiles/modular/x_std_libs.gemfile" # See unlocked_deps appraisal for more details on irb inclusion -gem 'irb', '~> 1.17' # ruby >= 2.7 +gem "irb", "~> 1.17" # ruby >= 2.7 diff --git a/gems/toml-merge/Gemfile.lock b/gems/toml-merge/Gemfile.lock index 9082e113e..88c97d842 100644 --- a/gems/toml-merge/Gemfile.lock +++ b/gems/toml-merge/Gemfile.lock @@ -16,6 +16,280 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.0) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +301,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +309,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -48,7 +323,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -104,15 +378,6 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -131,6 +396,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,25 +536,23 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -322,11 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -373,22 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-drift! + kettle-jem! + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -397,39 +684,61 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -442,19 +751,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae + kettle-drift (1.0.5) + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.0) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -469,10 +786,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -480,6 +801,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -507,17 +829,19 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -531,15 +855,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -547,6 +875,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/toml-merge/Rakefile b/gems/toml-merge/Rakefile index 1038ac780..4d0c02b16 100644 --- a/gems/toml-merge/Rakefile +++ b/gems/toml-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require 'kettle/drift' + require "kettle/drift" Kettle::Drift.install_tasks rescue LoadError - desc('(stub) kettle:drift:check is unavailable') - task('kettle:drift:check') do + desc("(stub) kettle:drift:check is unavailable") + task("kettle:drift:check") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:update is unavailable') - task('kettle:drift:update') do + desc("(stub) kettle:drift:update is unavailable") + task("kettle:drift:update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:force_update is unavailable') - task('kettle:drift:force_update') do + desc("(stub) kettle:drift:force_update is unavailable") + task("kettle:drift:force_update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift is unavailable') - task('kettle:drift' => 'kettle:drift:update') + desc("(stub) kettle:drift is unavailable") + task("kettle:drift" => "kettle:drift:update") end ### TEMPLATING TASKS diff --git a/gems/toml-merge/bin/yard b/gems/toml-merge/bin/yard index 5d516ad6f..a7e8b6eed 100755 --- a/gems/toml-merge/bin/yard +++ b/gems/toml-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec('bundle', 'exec', 'rake', 'yard') +exec("bundle", "exec", "rake", "yard") diff --git a/gems/toml-merge/lib/toml/merge/version.rb b/gems/toml-merge/lib/toml/merge/version.rb index d9074beaf..91c4e4d84 100644 --- a/gems/toml-merge/lib/toml/merge/version.rb +++ b/gems/toml-merge/lib/toml/merge/version.rb @@ -3,7 +3,7 @@ module Toml module Merge module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/yaml-merge/.gitattributes b/gems/yaml-merge/.gitattributes index 0ac65aaa7..35a3c7359 100644 --- a/gems/yaml-merge/.gitattributes +++ b/gems/yaml-merge/.gitattributes @@ -1,5 +1,5 @@ # <> do not edit below this line -*.rb diff=smorg-ruby +*.rb diff=smorg-rb *.go diff=smorg-go *.rs diff=smorg-rs # <> diff --git a/gems/yaml-merge/.kettle-drift.lock b/gems/yaml-merge/.kettle-drift.lock index 9295a3562..628aa923c 100644 --- a/gems/yaml-merge/.kettle-drift.lock +++ b/gems/yaml-merge/.kettle-drift.lock @@ -4,7 +4,8 @@ "file": "Gemfile", "lines": [ 80, - 120 + 120, + 160 ] } ], @@ -13,7 +14,8 @@ "file": "Gemfile", "lines": [ 91, - 131 + 131, + 171 ] } ], @@ -22,7 +24,8 @@ "file": "Gemfile", "lines": [ 81, - 121 + 121, + 161 ] } ], @@ -31,7 +34,8 @@ "file": "Gemfile", "lines": [ 93, - 133 + 133, + 173 ] } ], @@ -40,7 +44,8 @@ "file": "Gemfile", "lines": [ 96, - 136 + 136, + 176 ] } ], @@ -49,7 +54,8 @@ "file": "Gemfile", "lines": [ 82, - 122 + 122, + 162 ] } ], @@ -59,7 +65,8 @@ "lines": [ 60, 100, - 140 + 140, + 180 ] } ], @@ -68,7 +75,8 @@ "file": "Gemfile", "lines": [ 101, - 141 + 141, + 181 ] } ], @@ -78,7 +86,8 @@ "lines": [ 43, 87, - 127 + 127, + 167 ] } ], @@ -87,7 +96,8 @@ "file": "Gemfile", "lines": [ 110, - 150 + 150, + 190 ] } ], @@ -97,7 +107,8 @@ "lines": [ 35, 79, - 119 + 119, + 159 ] } ], @@ -107,7 +118,8 @@ "lines": [ 69, 109, - 149 + 149, + 189 ] } ], @@ -116,7 +128,8 @@ "file": "Gemfile", "lines": [ 85, - 125 + 125, + 165 ] } ], @@ -126,7 +139,8 @@ "lines": [ 48, 92, - 132 + 132, + 172 ] } ], @@ -136,7 +150,8 @@ "lines": [ 44, 88, - 128 + 128, + 168 ] } ], @@ -145,7 +160,8 @@ "file": "Gemfile", "lines": [ 86, - 126 + 126, + 166 ] } ], @@ -154,7 +170,8 @@ "file": "Gemfile", "lines": [ 103, - 143 + 143, + 183 ] } ], @@ -163,7 +180,8 @@ "file": "Gemfile", "lines": [ 102, - 142 + 142, + 182 ] } ], @@ -172,7 +190,8 @@ "file": "Gemfile", "lines": [ 97, - 137 + 137, + 177 ] } ], @@ -181,7 +200,8 @@ "file": "Gemfile", "lines": [ 106, - 146 + 146, + 186 ] } ], diff --git a/gems/yaml-merge/Gemfile b/gems/yaml-merge/Gemfile index 28cd3d1a0..f8a7769c0 100644 --- a/gems/yaml-merge/Gemfile +++ b/gems/yaml-merge/Gemfile @@ -152,6 +152,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/yaml-merge/Gemfile.lock b/gems/yaml-merge/Gemfile.lock index 2450635e2..affcf2de1 100644 --- a/gems/yaml-merge/Gemfile.lock +++ b/gems/yaml-merge/Gemfile.lock @@ -16,246 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -293,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -357,13 +111,11 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - kettle-dev (2.3.6) + kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -392,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -532,8 +283,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -586,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -637,45 +381,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -684,17 +406,12 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) yaml-merge! yard (~> 0.9, >= 0.9.44) @@ -703,35 +420,19 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -739,7 +440,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +452,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) - kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) + kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +479,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +490,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,12 +517,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -844,7 +528,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -858,14 +541,10 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -878,7 +557,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From a55328697d171dceff7f7b441325648ad3f9dcc6 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 16:38:06 -0600 Subject: [PATCH 015/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ruby-merge/.gitattributes | 2 +- gems/ruby-merge/.kettle-drift.lock | 60 ++-- gems/ruby-merge/.rubocop_gradual.lock | 316 ------------------ gems/ruby-merge/Gemfile | 70 +++- gems/ruby-merge/Gemfile.lock | 59 ++-- gems/ruby-merge/Rakefile | 18 +- gems/ruby-merge/bin/yard | 2 +- gems/ruby-merge/lib/ruby/merge/version.rb | 2 +- gems/rust-merge/Gemfile.lock | 352 +++++++++++++++++++- gems/toml-merge/.rubocop_gradual.lock | 278 ++++++++++++++++ gems/toml-merge/Gemfile | 68 ++-- gems/toml-merge/Gemfile.lock | 377 ++-------------------- gems/toml-merge/Rakefile | 18 +- gems/toml-merge/bin/yard | 2 +- gems/toml-merge/lib/toml/merge/version.rb | 2 +- gems/yaml-merge/Gemfile.lock | 322 ++++++++++++++++++ 16 files changed, 1151 insertions(+), 797 deletions(-) delete mode 100644 gems/ruby-merge/.rubocop_gradual.lock create mode 100644 gems/toml-merge/.rubocop_gradual.lock diff --git a/gems/ruby-merge/.gitattributes b/gems/ruby-merge/.gitattributes index 0ac65aaa7..35a3c7359 100644 --- a/gems/ruby-merge/.gitattributes +++ b/gems/ruby-merge/.gitattributes @@ -1,5 +1,5 @@ # <> do not edit below this line -*.rb diff=smorg-ruby +*.rb diff=smorg-rb *.go diff=smorg-go *.rs diff=smorg-rs # <> diff --git a/gems/ruby-merge/.kettle-drift.lock b/gems/ruby-merge/.kettle-drift.lock index 9295a3562..628aa923c 100644 --- a/gems/ruby-merge/.kettle-drift.lock +++ b/gems/ruby-merge/.kettle-drift.lock @@ -4,7 +4,8 @@ "file": "Gemfile", "lines": [ 80, - 120 + 120, + 160 ] } ], @@ -13,7 +14,8 @@ "file": "Gemfile", "lines": [ 91, - 131 + 131, + 171 ] } ], @@ -22,7 +24,8 @@ "file": "Gemfile", "lines": [ 81, - 121 + 121, + 161 ] } ], @@ -31,7 +34,8 @@ "file": "Gemfile", "lines": [ 93, - 133 + 133, + 173 ] } ], @@ -40,7 +44,8 @@ "file": "Gemfile", "lines": [ 96, - 136 + 136, + 176 ] } ], @@ -49,7 +54,8 @@ "file": "Gemfile", "lines": [ 82, - 122 + 122, + 162 ] } ], @@ -59,7 +65,8 @@ "lines": [ 60, 100, - 140 + 140, + 180 ] } ], @@ -68,7 +75,8 @@ "file": "Gemfile", "lines": [ 101, - 141 + 141, + 181 ] } ], @@ -78,7 +86,8 @@ "lines": [ 43, 87, - 127 + 127, + 167 ] } ], @@ -87,7 +96,8 @@ "file": "Gemfile", "lines": [ 110, - 150 + 150, + 190 ] } ], @@ -97,7 +107,8 @@ "lines": [ 35, 79, - 119 + 119, + 159 ] } ], @@ -107,7 +118,8 @@ "lines": [ 69, 109, - 149 + 149, + 189 ] } ], @@ -116,7 +128,8 @@ "file": "Gemfile", "lines": [ 85, - 125 + 125, + 165 ] } ], @@ -126,7 +139,8 @@ "lines": [ 48, 92, - 132 + 132, + 172 ] } ], @@ -136,7 +150,8 @@ "lines": [ 44, 88, - 128 + 128, + 168 ] } ], @@ -145,7 +160,8 @@ "file": "Gemfile", "lines": [ 86, - 126 + 126, + 166 ] } ], @@ -154,7 +170,8 @@ "file": "Gemfile", "lines": [ 103, - 143 + 143, + 183 ] } ], @@ -163,7 +180,8 @@ "file": "Gemfile", "lines": [ 102, - 142 + 142, + 182 ] } ], @@ -172,7 +190,8 @@ "file": "Gemfile", "lines": [ 97, - 137 + 137, + 177 ] } ], @@ -181,7 +200,8 @@ "file": "Gemfile", "lines": [ 106, - 146 + 146, + 186 ] } ], diff --git a/gems/ruby-merge/.rubocop_gradual.lock b/gems/ruby-merge/.rubocop_gradual.lock deleted file mode 100644 index fff670117..000000000 --- a/gems/ruby-merge/.rubocop_gradual.lock +++ /dev/null @@ -1,316 +0,0 @@ -{ - ".simplecov:3590623278": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:2768890125": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/ruby-merge.rb:2992445753": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`ruby-merge.rb`) should use snake_case.", 5381] - ], - "lib/ruby/merge.rb:1877719734": [ - [11, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Ruby::Merge`.", 2866359175], - [11, 3, 109110, "Metrics/ModuleLength: Module has too many lines. [2519/100]", 662788489], - [29, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3061257365], - [81, 5, 959, "Metrics/AbcSize: Assignment Branch Condition size for `parse_ruby` is too high. [<4, 16, 7> 17.92/17]", 1071201699], - [81, 5, 959, "Metrics/MethodLength: Method has too many lines. [16/10]", 1071201699], - [107, 5, 2656, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_method_move_detection` is too high. [<17, 40, 18> 47.04/17]", 3779436399], - [107, 5, 2656, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_method_move_detection` is too high. [16/7]", 3779436399], - [107, 5, 2656, "Metrics/MethodLength: Method has too many lines. [45/10]", 3779436399], - [107, 5, 2656, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_method_move_detection` is too high. [16/8]", 3779436399], - [119, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 727785047], - [132, 121, 51, "Layout/LineLength: Line is too long. [171/120]", 3259664538], - [151, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], - [154, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], - [155, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 1976354608], - [159, 5, 4395, "Metrics/AbcSize: Assignment Branch Condition size for `merge_ruby` is too high. [<31, 64, 24> 75.05/17]", 2749692967], - [159, 5, 4395, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_ruby` is too high. [21/7]", 2749692967], - [159, 5, 4395, "Metrics/MethodLength: Method has too many lines. [83/10]", 2749692967], - [159, 5, 4395, "Metrics/PerceivedComplexity: Perceived complexity for `merge_ruby` is too high. [22/8]", 2749692967], - [218, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], - [257, 5, 1312, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_delegated_child_operations` is too high. [<10, 15, 6> 19/17]", 2246428949], - [257, 5, 1312, "Metrics/MethodLength: Method has too many lines. [28/10]", 2246428949], - [303, 5, 861, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_source_owner_identity_profile` is too high. [<5, 17, 2> 17.83/17]", 4129925341], - [303, 5, 861, "Metrics/MethodLength: Method has too many lines. [20/10]", 4129925341], - [326, 5, 2064, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_source_owner_identity_matches` is too high. [<17, 31, 11> 37.03/17]", 2780319153], - [326, 5, 2064, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_source_owner_identity_matches` is too high. [11/7]", 2780319153], - [326, 5, 2064, "Metrics/MethodLength: Method has too many lines. [37/10]", 2780319153], - [326, 5, 2064, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_source_owner_identity_matches` is too high. [11/8]", 2780319153], - [355, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], - [358, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], - [363, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1001816794], - [369, 5, 1314, "Metrics/MethodLength: Method has too many lines. [28/10]", 4183124680], - [402, 5, 786, "Metrics/MethodLength: Method has too many lines. [24/10]", 3631640245], - [429, 5, 916, "Metrics/MethodLength: Method has too many lines. [18/10]", 631485532], - [450, 5, 662, "Metrics/MethodLength: Method has too many lines. [15/10]", 2231086183], - [469, 5, 777, "Metrics/MethodLength: Method has too many lines. [18/10]", 895030114], - [490, 5, 727, "Metrics/MethodLength: Method has too many lines. [19/10]", 776483642], - [512, 5, 861, "Metrics/MethodLength: Method has too many lines. [29/10]", 537340961], - [544, 5, 655, "Metrics/MethodLength: Method has too many lines. [16/10]", 3756601977], - [563, 5, 1592, "Metrics/MethodLength: Method has too many lines. [25/10]", 3521052904], - [587, 121, 106, "Layout/LineLength: Line is too long. [226/120]", 2104286058], - [593, 5, 777, "Metrics/MethodLength: Method has too many lines. [14/10]", 2821246515], - [610, 5, 1429, "Metrics/MethodLength: Method has too many lines. [26/10]", 244346226], - [633, 121, 124, "Layout/LineLength: Line is too long. [244/120]", 13261232], - [639, 5, 1367, "Metrics/MethodLength: Method has too many lines. [41/10]", 3883814121], - [683, 5, 750, "Metrics/MethodLength: Method has too many lines. [22/10]", 764028624], - [709, 5, 1315, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_silent_data_loss_validation_report` is too high. [<8, 14, 7> 17.58/17]", 2039399818], - [709, 5, 1315, "Metrics/MethodLength: Method has too many lines. [31/10]", 2039399818], - [744, 5, 724, "Metrics/MethodLength: Method has too many lines. [14/10]", 1741779676], - [755, 121, 67, "Layout/LineLength: Line is too long. [187/120]", 1996508131], - [761, 5, 752, "Metrics/MethodLength: Method has too many lines. [21/10]", 3870096101], - [785, 5, 1052, "Metrics/MethodLength: Method has too many lines. [32/10]", 119279638], - [820, 5, 1588, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_interstitial_comment_attachment_report` is too high. [<11, 34, 17> 39.57/17]", 4112280260], - [820, 5, 1588, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_interstitial_comment_attachment_report` is too high. [14/7]", 4112280260], - [820, 5, 1588, "Metrics/MethodLength: Method has too many lines. [30/10]", 4112280260], - [820, 5, 1588, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_interstitial_comment_attachment_report` is too high. [15/8]", 4112280260], - [834, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 180543822], - [862, 5, 536, "Metrics/MethodLength: Method has too many lines. [13/10]", 245509059], - [878, 5, 2252, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_rename_detection` is too high. [<14, 32, 11> 36.62/17]", 2574664763], - [878, 5, 2252, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_rename_detection` is too high. [10/7]", 2574664763], - [878, 5, 2252, "Metrics/MethodLength: Method has too many lines. [46/10]", 2574664763], - [878, 5, 2252, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_rename_detection` is too high. [11/8]", 2574664763], - [921, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 4074688513], - [927, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], - [931, 5, 2254, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_rename_plus_edit_conflicts` is too high. [<15, 30, 13> 35.97/17]", 3664513828], - [931, 5, 2254, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_rename_plus_edit_conflicts` is too high. [10/7]", 3664513828], - [931, 5, 2254, "Metrics/MethodLength: Method has too many lines. [45/10]", 3664513828], - [931, 5, 2254, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_rename_plus_edit_conflicts` is too high. [11/8]", 3664513828], - [983, 5, 1926, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_cross_container_method_move_detection` is too high. [<8, 18, 7> 20.9/17]", 1401333972], - [983, 5, 1926, "Metrics/MethodLength: Method has too many lines. [44/10]", 1401333972], - [1026, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3474944396], - [1033, 5, 1488, "Metrics/AbcSize: Assignment Branch Condition size for `apply_ruby_delegated_child_outputs` is too high. [<16, 39, 12> 43.83/17]", 842348215], - [1033, 5, 1488, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_ruby_delegated_child_outputs` is too high. [12/7]", 842348215], - [1033, 5, 1488, "Metrics/MethodLength: Method has too many lines. [27/10]", 842348215], - [1033, 5, 1488, "Metrics/PerceivedComplexity: Perceived complexity for `apply_ruby_delegated_child_outputs` is too high. [13/8]", 842348215], - [1067, 5, 980, "Metrics/MethodLength: Method has too many lines. [23/10]", 1425119613], - [1094, 5, 1025, "Metrics/MethodLength: Method has too many lines. [23/10]", 2179557432], - [1122, 5, 757, "Metrics/MethodLength: Method has too many lines. [12/10]", 3975431355], - [1127, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 1956194284], - [1139, 5, 745, "Metrics/MethodLength: Method has too many lines. [12/10]", 1051086033], - [1144, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1636990749], - [1156, 5, 670, "Metrics/MethodLength: Method has too many lines. [11/10]", 3552666292], - [1161, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 3013228499], - [1172, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 1356230953], - [1177, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 3013228499], - [1188, 5, 2093, "Metrics/AbcSize: Assignment Branch Condition size for `analyze_ruby_document` is too high. [<21, 31, 12> 39.32/17]", 3298966582], - [1188, 5, 2093, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `analyze_ruby_document` is too high. [13/7]", 3298966582], - [1188, 5, 2093, "Metrics/MethodLength: Method has too many lines. [53/10]", 3298966582], - [1188, 5, 2093, "Metrics/PerceivedComplexity: Perceived complexity for `analyze_ruby_document` is too high. [13/8]", 3298966582], - [1194, 7, 1035, "Metrics/BlockLength: Block has too many lines. [27/25]", 2081528636], - [1263, 5, 427, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_file_footer_text` is too high. [<5, 17, 8> 19.44/17]", 1703748308], - [1301, 5, 941, "Metrics/MethodLength: Method has too many lines. [15/10]", 1317835917], - [1307, 121, 173, "Layout/LineLength: Line is too long. [293/120]", 225499532], - [1333, 5, 518, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_tslp_claimed_line_indexes` is too high. [<6, 19, 5> 20.54/17]", 1455439838], - [1356, 5, 443, "Metrics/MethodLength: Method has too many lines. [12/10]", 4230588206], - [1373, 5, 363, "Metrics/MethodLength: Method has too many lines. [11/10]", 3068065572], - [1421, 5, 1849, "Metrics/AbcSize: Assignment Branch Condition size for `legacy_collect_ruby_declaration_entries` is too high. [<24, 26, 13> 37.7/17]", 3187770326], - [1421, 5, 1849, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `legacy_collect_ruby_declaration_entries` is too high. [11/7]", 3187770326], - [1421, 5, 1849, "Metrics/MethodLength: Method has too many lines. [54/10]", 3187770326], - [1421, 5, 1849, "Metrics/PerceivedComplexity: Perceived complexity for `legacy_collect_ruby_declaration_entries` is too high. [11/8]", 3187770326], - [1468, 13, 76, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 1356567820], - [1504, 5, 396, "Metrics/MethodLength: Method has too many lines. [11/10]", 1239008881], - [1519, 5, 681, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_process_declaration_entries` is too high. [<7, 17, 2> 18.49/17]", 2675999354], - [1519, 5, 681, "Metrics/MethodLength: Method has too many lines. [16/10]", 2675999354], - [1539, 5, 634, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_top_level_process_structure_items` is too high. [<5, 32, 14> 35.28/17]", 1120707166], - [1539, 5, 634, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_top_level_process_structure_items` is too high. [11/7]", 1120707166], - [1539, 5, 634, "Metrics/MethodLength: Method has too many lines. [11/10]", 1120707166], - [1539, 5, 634, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_top_level_process_structure_items` is too high. [11/8]", 1120707166], - [1551, 7, 11, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 848344986], - [1558, 7, 9, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 3648222389], - [1603, 5, 1284, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_intra_owner_merge_plan` is too high. [<8, 24, 9> 26.85/17]", 2388567699], - [1603, 5, 1284, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_intra_owner_merge_plan` is too high. [9/7]", 2388567699], - [1603, 5, 1284, "Metrics/MethodLength: Method has too many lines. [22/10]", 2388567699], - [1603, 5, 1284, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_intra_owner_merge_plan` is too high. [9/8]", 2388567699], - [1644, 5, 557, "Metrics/MethodLength: Method has too many lines. [11/10]", 3178341030], - [1702, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 895013151], - [1707, 5, 593, "Metrics/MethodLength: Method has too many lines. [13/10]", 2850316611], - [1708, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177625], - [1725, 5, 609, "Metrics/MethodLength: Method has too many lines. [12/10]", 784855730], - [1740, 5, 695, "Metrics/MethodLength: Method has too many lines. [14/10]", 3942458504], - [1777, 5, 1110, "Metrics/AbcSize: Assignment Branch Condition size for `merge_declaration_hash_constants` is too high. [<11, 22, 6> 25.32/17]", 3861922947], - [1777, 5, 1110, "Metrics/MethodLength: Method has too many lines. [17/10]", 3861922947], - [1799, 5, 794, "Metrics/AbcSize: Assignment Branch Condition size for `merge_declaration_body_constants` is too high. [<9, 14, 6> 17.69/17]", 1882117166], - [1829, 5, 1138, "Metrics/AbcSize: Assignment Branch Condition size for `merge_array_constant_text` is too high. [<9, 18, 7> 21.31/17]", 1448081799], - [1829, 5, 1138, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_array_constant_text` is too high. [8/7]", 1448081799], - [1829, 5, 1138, "Metrics/MethodLength: Method has too many lines. [15/10]", 1448081799], - [1835, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193434112], - [1842, 7, 8, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 359846632], - [1849, 5, 774, "Metrics/AbcSize: Assignment Branch Condition size for `merge_percent_array_constant_text` is too high. [<8, 16, 7> 19.21/17]", 625509828], - [1849, 5, 774, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_percent_array_constant_text` is too high. [8/7]", 625509828], - [1878, 5, 1060, "Metrics/AbcSize: Assignment Branch Condition size for `merge_multiline_array_constant_text` is too high. [<11, 23, 10> 27.39/17]", 2672751288], - [1878, 5, 1060, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_multiline_array_constant_text` is too high. [11/7]", 2672751288], - [1878, 5, 1060, "Metrics/MethodLength: Method has too many lines. [13/10]", 2672751288], - [1878, 5, 1060, "Metrics/PerceivedComplexity: Perceived complexity for `merge_multiline_array_constant_text` is too high. [11/8]", 2672751288], - [1887, 7, 8, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 359846632], - [1896, 5, 1605, "Metrics/AbcSize: Assignment Branch Condition size for `merge_declaration_body_methods` is too high. [<21, 28, 15> 38.08/17]", 2740924329], - [1896, 5, 1605, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_declaration_body_methods` is too high. [14/7]", 2740924329], - [1896, 5, 1605, "Metrics/MethodLength: Method has too many lines. [29/10]", 2740924329], - [1896, 5, 1605, "Metrics/PerceivedComplexity: Perceived complexity for `merge_declaration_body_methods` is too high. [15/8]", 2740924329], - [1903, 7, 8, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 359846632], - [1930, 5, 1076, "Metrics/AbcSize: Assignment Branch Condition size for `merge_nested_body_declarations` is too high. [<14, 24, 10> 29.53/17]", 1397199527], - [1930, 5, 1076, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_nested_body_declarations` is too high. [11/7]", 1397199527], - [1930, 5, 1076, "Metrics/MethodLength: Method has too many lines. [14/10]", 1397199527], - [1930, 5, 1076, "Metrics/PerceivedComplexity: Perceived complexity for `merge_nested_body_declarations` is too high. [11/8]", 1397199527], - [1969, 5, 2549, "Metrics/AbcSize: Assignment Branch Condition size for `top_level_source_region_owners` is too high. [<24, 33, 13> 42.83/17]", 1909271685], - [1969, 5, 2549, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `top_level_source_region_owners` is too high. [11/7]", 1909271685], - [1969, 5, 2549, "Metrics/MethodLength: Method has too many lines. [64/10]", 1909271685], - [1969, 5, 2549, "Metrics/PerceivedComplexity: Perceived complexity for `top_level_source_region_owners` is too high. [11/8]", 1909271685], - [2012, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861626], - [2027, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1695648499], - [2043, 5, 2126, "Metrics/AbcSize: Assignment Branch Condition size for `container_child_source_regions` is too high. [<23, 28, 11> 37.87/17]", 4031983731], - [2043, 5, 2126, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `container_child_source_regions` is too high. [10/7]", 4031983731], - [2043, 5, 2126, "Metrics/MethodLength: Method has too many lines. [56/10]", 4031983731], - [2043, 5, 2126, "Metrics/PerceivedComplexity: Perceived complexity for `container_child_source_regions` is too high. [10/8]", 4031983731], - [2109, 5, 996, "Metrics/AbcSize: Assignment Branch Condition size for `interleave_source_regions` is too high. [<8, 14, 6> 17.2/17]", 796443872], - [2109, 5, 996, "Metrics/MethodLength: Method has too many lines. [30/10]", 796443872], - [2147, 5, 1323, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `source_interstitial_region` is too high. [13/7]", 1970451685], - [2147, 5, 1323, "Metrics/MethodLength: Method has too many lines. [30/10]", 1970451685], - [2147, 5, 1323, "Metrics/PerceivedComplexity: Perceived complexity for `source_interstitial_region` is too high. [12/8]", 1970451685], - [2147, 35, 80, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2143999554], - [2182, 5, 396, "Metrics/MethodLength: Method has too many lines. [12/10]", 663734283], - [2198, 5, 890, "Metrics/AbcSize: Assignment Branch Condition size for `collect_blank_line_regions` is too high. [<4, 18, 7> 19.72/17]", 3362926457], - [2198, 5, 890, "Metrics/MethodLength: Method has too many lines. [20/10]", 3362926457], - [2257, 5, 27, "Style/Documentation: Missing top-level documentation comment for `class Ruby::Merge::RubyHashLiteralParser`.", 2589782793], - [2257, 5, 3304, "Metrics/ClassLength: Class has too many lines. [103/100]", 2782733473], - [2274, 7, 868, "Metrics/AbcSize: Assignment Branch Condition size for `parse_hash` is too high. [<6, 23, 6> 24.52/17]", 2331230410], - [2274, 7, 868, "Metrics/MethodLength: Method has too many lines. [28/10]", 2331230410], - [2314, 7, 911, "Metrics/AbcSize: Assignment Branch Condition size for `parse_hash_key` is too high. [<13, 26, 4> 29.34/17]", 2403379393], - [2314, 7, 911, "Metrics/MethodLength: Method has too many lines. [18/10]", 2403379393], - [2339, 7, 644, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_scalar_source` is too high. [8/7]", 2447980390], - [2339, 7, 644, "Metrics/MethodLength: Method has too many lines. [21/10]", 2447980390], - [2339, 7, 644, "Metrics/PerceivedComplexity: Perceived complexity for `parse_scalar_source` is too high. [9/8]", 2447980390], - [2384, 5, 1202, "Metrics/AbcSize: Assignment Branch Condition size for `constant_hash_blocks` is too high. [<19, 25, 6> 31.97/17]", 399214756], - [2384, 5, 1202, "Metrics/MethodLength: Method has too many lines. [36/10]", 399214756], - [2425, 5, 727, "Metrics/AbcSize: Assignment Branch Condition size for `hash_assignment_finish_line` is too high. [<11, 7, 12> 17.72/17]", 1215874404], - [2425, 5, 727, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `hash_assignment_finish_line` is too high. [9/7]", 1215874404], - [2425, 5, 727, "Metrics/MethodLength: Method has too many lines. [26/10]", 1215874404], - [2425, 5, 727, "Metrics/PerceivedComplexity: Perceived complexity for `hash_assignment_finish_line` is too high. [11/8]", 1215874404], - [2455, 5, 1970, "Metrics/AbcSize: Assignment Branch Condition size for `direct_body_method_entries` is too high. [<28, 32, 13> 44.46/17]", 2589282610], - [2455, 5, 1970, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `direct_body_method_entries` is too high. [12/7]", 2589282610], - [2455, 5, 1970, "Metrics/MethodLength: Method has too many lines. [56/10]", 2589282610], - [2455, 5, 1970, "Metrics/PerceivedComplexity: Perceived complexity for `direct_body_method_entries` is too high. [12/8]", 2589282610], - [2520, 5, 1221, "Metrics/AbcSize: Assignment Branch Condition size for `direct_body_constant_entries` is too high. [<16, 34, 10> 38.88/17]", 1588885504], - [2520, 5, 1221, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `direct_body_constant_entries` is too high. [9/7]", 1588885504], - [2520, 5, 1221, "Metrics/MethodLength: Method has too many lines. [35/10]", 1588885504], - [2520, 5, 1221, "Metrics/PerceivedComplexity: Perceived complexity for `direct_body_constant_entries` is too high. [9/8]", 1588885504], - [2563, 5, 708, "Metrics/AbcSize: Assignment Branch Condition size for `split_ruby_array_elements` is too high. [<11, 12, 11> 19.65/17]", 1344003748], - [2563, 5, 708, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split_ruby_array_elements` is too high. [9/7]", 1344003748], - [2563, 5, 708, "Metrics/MethodLength: Method has too many lines. [24/10]", 1344003748], - [2563, 5, 708, "Metrics/PerceivedComplexity: Perceived complexity for `split_ruby_array_elements` is too high. [11/8]", 1344003748], - [2607, 5, 977, "Metrics/AbcSize: Assignment Branch Condition size for `append_multiline_array_elements` is too high. [<12, 32, 9> 35.34/17]", 1316332112], - [2607, 5, 977, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `append_multiline_array_elements` is too high. [9/7]", 1316332112], - [2607, 5, 977, "Metrics/MethodLength: Method has too many lines. [16/10]", 1316332112], - [2607, 5, 977, "Metrics/PerceivedComplexity: Perceived complexity for `append_multiline_array_elements` is too high. [9/8]", 1316332112], - [2635, 5, 728, "Metrics/AbcSize: Assignment Branch Condition size for `array_assignment_finish_line` is too high. [<11, 7, 12> 17.72/17]", 1471354607], - [2635, 5, 728, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `array_assignment_finish_line` is too high. [9/7]", 1471354607], - [2635, 5, 728, "Metrics/MethodLength: Method has too many lines. [26/10]", 1471354607], - [2635, 5, 728, "Metrics/PerceivedComplexity: Perceived complexity for `array_assignment_finish_line` is too high. [11/8]", 1471354607], - [2671, 5, 1127, "Metrics/AbcSize: Assignment Branch Condition size for `direct_body_declaration_entries` is too high. [<14, 30, 7> 33.84/17]", 1223661118], - [2671, 5, 1127, "Metrics/MethodLength: Method has too many lines. [30/10]", 1223661118], - [2718, 5, 984, "Metrics/AbcSize: Assignment Branch Condition size for `insert_declaration_body_blocks` is too high. [<4, 23, 12> 26.25/17]", 159690081], - [2718, 5, 984, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `insert_declaration_body_blocks` is too high. [9/7]", 159690081], - [2718, 5, 984, "Metrics/MethodLength: Method has too many lines. [16/10]", 159690081], - [2718, 5, 984, "Metrics/PerceivedComplexity: Perceived complexity for `insert_declaration_body_blocks` is too high. [10/8]", 159690081], - [2763, 5, 1027, "Metrics/AbcSize: Assignment Branch Condition size for `merge_ruby_hash_literals` is too high. [<8, 30, 9> 32.33/17]", 2793745298], - [2763, 5, 1027, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_ruby_hash_literals` is too high. [9/7]", 2793745298], - [2763, 5, 1027, "Metrics/MethodLength: Method has too many lines. [19/10]", 2793745298], - [2763, 5, 1027, "Metrics/PerceivedComplexity: Perceived complexity for `merge_ruby_hash_literals` is too high. [10/8]", 2793745298], - [2785, 5, 636, "Metrics/AbcSize: Assignment Branch Condition size for `render_ruby_hash_literal` is too high. [<5, 19, 6> 20.54/17]", 1834383244], - [2825, 5, 491, "Metrics/MethodLength: Method has too many lines. [11/10]", 1799924605], - [2858, 5, 1125, "Metrics/AbcSize: Assignment Branch Condition size for `surfaces_for_owner` is too high. [<6, 19, 3> 20.15/17]", 4036098594], - [2858, 5, 1125, "Metrics/MethodLength: Method has too many lines. [20/10]", 4036098594], - [2883, 5, 1479, "Metrics/AbcSize: Assignment Branch Condition size for `example_surfaces_for` is too high. [<10, 28, 9> 31.06/17]", 1159322815], - [2883, 5, 1479, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `example_surfaces_for` is too high. [9/7]", 1159322815], - [2883, 5, 1479, "Metrics/MethodLength: Method has too many lines. [28/10]", 1159322815], - [2883, 5, 1479, "Metrics/PerceivedComplexity: Perceived complexity for `example_surfaces_for` is too high. [9/8]", 1159322815] - ], - "ruby-merge.gemspec:503862341": [ - [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ], - "spec/fixtures_integration_spec.rb:943607429": [ - [7, 1, 68962, "Metrics/BlockLength: Block has too many lines. [1586/25]", 1326132038], - [8, 3, 94, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 4224869601], - [9, 3, 80, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3493759864], - [10, 3, 72, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 218819604], - [11, 3, 83, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3957977039], - [56, 3, 1207, "Metrics/BlockLength: Block has too many lines. [27/25]", 2841005266], - [141, 3, 1550, "Metrics/BlockLength: Block has too many lines. [44/25]", 1381861178], - [192, 3, 1209, "Metrics/BlockLength: Block has too many lines. [33/25]", 1745132505], - [232, 3, 61330, "Metrics/BlockLength: Block has too many lines. [1387/25]", 3444780370], - [628, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859109], - [1712, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3355833611], - [1719, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 38619260] - ] -} diff --git a/gems/ruby-merge/Gemfile b/gems/ruby-merge/Gemfile index fd8817406..23eae269a 100644 --- a/gems/ruby-merge/Gemfile +++ b/gems/ruby-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source 'https://gem.coop' +source "https://gem.coop" git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,18 +19,62 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ['~> 1.0', '>= 1.0.8'] -gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ["~> 1.0", ">= 1.0.8"] +gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ast-merge tree_haver ] -direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') +direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? + +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) + direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") + direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == "nomono" } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + if nomono_locked + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] + end + end + Kernel.send(:gem, "nomono", *nomono_activation_requirements) + require "nomono/bundler" + if direct_sibling_templating && !direct_sibling_local + ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + end + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: "STRUCTUREDMERGE", + path_env: "STRUCTUREDMERGE_DEV", + root: ["src", "my", "structuredmerge"] + ) + rescue LoadError + warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + else + ENV.delete("STRUCTUREDMERGE_DEV") + end + end + end +end if direct_sibling_gems.any? && (direct_sibling_local || @@ -170,25 +214,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? # Debugging -eval_gemfile 'gemfiles/modular/debug.gemfile' +eval_gemfile "gemfiles/modular/debug.gemfile" # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile 'gemfiles/modular/coverage.gemfile' +eval_gemfile "gemfiles/modular/coverage.gemfile" # Linting -eval_gemfile 'gemfiles/modular/style.gemfile' +eval_gemfile "gemfiles/modular/style.gemfile" # Documentation -eval_gemfile 'gemfiles/modular/documentation.gemfile' +eval_gemfile "gemfiles/modular/documentation.gemfile" # Optional -eval_gemfile 'gemfiles/modular/optional.gemfile' +eval_gemfile "gemfiles/modular/optional.gemfile" ### Std Lib Extracted Gems -eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' +eval_gemfile "gemfiles/modular/x_std_libs.gemfile" # See unlocked_deps appraisal for more details on irb inclusion -gem 'irb', '~> 1.17' # ruby >= 2.7 +gem "irb", "~> 1.17" # ruby >= 2.7 diff --git a/gems/ruby-merge/Gemfile.lock b/gems/ruby-merge/Gemfile.lock index ba8011f4a..20e81b32e 100644 --- a/gems/ruby-merge/Gemfile.lock +++ b/gems/ruby-merge/Gemfile.lock @@ -256,6 +256,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.0) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -307,7 +323,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -362,18 +377,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -537,22 +541,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -658,9 +658,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -738,7 +738,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -759,10 +758,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.0) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -837,13 +836,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/ruby-merge/Rakefile b/gems/ruby-merge/Rakefile index c528d41ee..c7b8a4b9e 100644 --- a/gems/ruby-merge/Rakefile +++ b/gems/ruby-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require 'kettle/drift' + require "kettle/drift" Kettle::Drift.install_tasks rescue LoadError - desc('(stub) kettle:drift:check is unavailable') - task('kettle:drift:check') do + desc("(stub) kettle:drift:check is unavailable") + task("kettle:drift:check") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:update is unavailable') - task('kettle:drift:update') do + desc("(stub) kettle:drift:update is unavailable") + task("kettle:drift:update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:force_update is unavailable') - task('kettle:drift:force_update') do + desc("(stub) kettle:drift:force_update is unavailable") + task("kettle:drift:force_update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift is unavailable') - task('kettle:drift' => 'kettle:drift:update') + desc("(stub) kettle:drift is unavailable") + task("kettle:drift" => "kettle:drift:update") end ### TEMPLATING TASKS diff --git a/gems/ruby-merge/bin/yard b/gems/ruby-merge/bin/yard index 5d516ad6f..a7e8b6eed 100755 --- a/gems/ruby-merge/bin/yard +++ b/gems/ruby-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec('bundle', 'exec', 'rake', 'yard') +exec("bundle", "exec", "rake", "yard") diff --git a/gems/ruby-merge/lib/ruby/merge/version.rb b/gems/ruby-merge/lib/ruby/merge/version.rb index d88eae0c6..0dcd005a5 100644 --- a/gems/ruby-merge/lib/ruby/merge/version.rb +++ b/gems/ruby-merge/lib/ruby/merge/version.rb @@ -3,7 +3,7 @@ module Ruby module Merge module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/rust-merge/Gemfile.lock b/gems/rust-merge/Gemfile.lock index dfbcd5178..511fd8e47 100644 --- a/gems/rust-merge/Gemfile.lock +++ b/gems/rust-merge/Gemfile.lock @@ -16,6 +16,264 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +285,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -103,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -131,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -322,11 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -373,22 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -397,32 +684,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -430,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -442,19 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -469,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -480,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -507,10 +830,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -519,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -532,14 +858,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -547,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/toml-merge/.rubocop_gradual.lock b/gems/toml-merge/.rubocop_gradual.lock new file mode 100644 index 000000000..4b65819de --- /dev/null +++ b/gems/toml-merge/.rubocop_gradual.lock @@ -0,0 +1,278 @@ +{ + ".simplecov:3682400110": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:133885645": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/toml-merge.rb:3814390984": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`toml-merge.rb`) should use snake_case.", 5381], + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "lib/toml/merge.rb:114483342": [ + [42, 3, 19743, "Metrics/ModuleLength: Module has too many lines. [449/100]", 3377734762], + [122, 5, 16553, "Metrics/ClassLength: Class has too many lines. [420/100]", 3607675918], + [164, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1773216188], + [173, 7, 594, "Metrics/MethodLength: Method has too many lines. [16/10]", 1049978805], + [197, 7, 1640, "Metrics/AbcSize: Assignment Branch Condition size for `merge_toml` is too high. [<7, 24, 9> 26.57/17]", 478063103], + [197, 7, 1640, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_toml` is too high. [8/7]", 478063103], + [197, 7, 1640, "Metrics/MethodLength: Method has too many lines. [32/10]", 478063103], + [201, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1773216188], + [236, 7, 1795, "Metrics/AbcSize: Assignment Branch Condition size for `merge_toml_with_parser` is too high. [<7, 24, 8> 26.25/17]", 4111497622], + [236, 7, 1795, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_toml_with_parser` is too high. [8/7]", 4111497622], + [236, 7, 1795, "Metrics/MethodLength: Method has too many lines. [33/10]", 4111497622], + [345, 7, 688, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `strip_toml_comment` is too high. [8/7]", 3909397399], + [345, 7, 688, "Metrics/MethodLength: Method has too many lines. [25/10]", 3909397399], + [345, 7, 688, "Metrics/PerceivedComplexity: Perceived complexity for `strip_toml_comment` is too high. [9/8]", 3909397399], + [379, 7, 1087, "Metrics/AbcSize: Assignment Branch Condition size for `split_outside_quotes` is too high. [<13, 16, 15> 25.5/17]", 609465929], + [379, 7, 1087, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split_outside_quotes` is too high. [12/7]", 609465929], + [379, 7, 1087, "Metrics/MethodLength: Method has too many lines. [39/10]", 609465929], + [379, 7, 1087, "Metrics/PerceivedComplexity: Perceived complexity for `split_outside_quotes` is too high. [13/8]", 609465929], + [386, 9, 762, "Metrics/BlockLength: Block has too many lines. [29/25]", 4212946145], + [437, 7, 462, "Metrics/MethodLength: Method has too many lines. [16/10]", 2527564697], + [456, 7, 1018, "Metrics/AbcSize: Assignment Branch Condition size for `parse_toml_value` is too high. [<7, 28, 11> 30.89/17]", 820781705], + [456, 7, 1018, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_toml_value` is too high. [10/7]", 820781705], + [456, 7, 1018, "Metrics/MethodLength: Method has too many lines. [20/10]", 820781705], + [456, 7, 1018, "Metrics/PerceivedComplexity: Perceived complexity for `parse_toml_value` is too high. [11/8]", 820781705], + [484, 7, 458, "Metrics/MethodLength: Method has too many lines. [13/10]", 3674341378], + [511, 7, 877, "Metrics/AbcSize: Assignment Branch Condition size for `parse_toml_document` is too high. [<9, 20, 6> 22.74/17]", 2959395577], + [511, 7, 877, "Metrics/MethodLength: Method has too many lines. [19/10]", 2959395577], + [560, 7, 581, "Metrics/AbcSize: Assignment Branch Condition size for `render_toml_table` is too high. [<8, 22, 6> 24.17/17]", 3078876750], + [560, 7, 581, "Metrics/MethodLength: Method has too many lines. [13/10]", 3078876750], + [581, 7, 619, "Metrics/MethodLength: Method has too many lines. [12/10]", 451848846], + [596, 7, 614, "Metrics/AbcSize: Assignment Branch Condition size for `merge_toml_tables` is too high. [<3, 20, 6> 21.1/17]", 1810526535], + [596, 7, 614, "Metrics/MethodLength: Method has too many lines. [11/10]", 1810526535] + ], + "lib/toml/merge/comment_tracker.rb:743656609": [ + [16, 5, 5242, "Metrics/ClassLength: Class has too many lines. [112/100]", 3014190138], + [28, 7, 990, "Metrics/MethodLength: Method has too many lines. [17/10]", 85804539], + [92, 7, 949, "Metrics/AbcSize: Assignment Branch Condition size for `build_toml_region` is too high. [<7, 21, 9> 23.9/17]", 552845000], + [92, 7, 949, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_toml_region` is too high. [9/7]", 552845000], + [92, 7, 949, "Metrics/MethodLength: Method has too many lines. [23/10]", 552845000], + [92, 7, 949, "Metrics/PerceivedComplexity: Perceived complexity for `build_toml_region` is too high. [9/8]", 552845000] + ], + "lib/toml/merge/conflict_resolver.rb:2699752146": [ + [11, 5, 42658, "Metrics/ClassLength: Class has too many lines. [791/100]", 2931993361], + [30, 7, 788, "Metrics/MethodLength: Method has too many lines. [13/10]", 2218400960], + [30, 21, 235, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 788504679], + [31, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3099130903], + [52, 7, 1676, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_batch` is too high. [<4, 24, 3> 24.52/17]", 623996510], + [52, 7, 1676, "Metrics/MethodLength: Method has too many lines. [29/10]", 623996510], + [53, 9, 1632, "Metrics/BlockLength: Block has too many lines. [27/25]", 3553849414], + [101, 7, 8464, "Metrics/AbcSize: Assignment Branch Condition size for `merge_node_lists_to_emitter` is too high. [<54, 88, 31> 107.8/17]", 3669765511], + [101, 7, 8464, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_node_lists_to_emitter` is too high. [27/7]", 3669765511], + [101, 7, 8464, "Metrics/MethodLength: Method has too many lines. [141/10]", 3669765511], + [101, 7, 8464, "Metrics/PerceivedComplexity: Perceived complexity for `merge_node_lists_to_emitter` is too high. [29/8]", 3669765511], + [146, 9, 5685, "Metrics/BlockLength: Block has too many lines. [102/25]", 464560406], + [286, 7, 2458, "Metrics/AbcSize: Assignment Branch Condition size for `merge_matched_nodes_to_emitter` is too high. [<6, 17, 10> 20.62/17]", 4036358483], + [286, 7, 2458, "Metrics/MethodLength: Method has too many lines. [49/10]", 4036358483], + [286, 7, 2458, "Metrics/PerceivedComplexity: Perceived complexity for `merge_matched_nodes_to_emitter` is too high. [9/8]", 4036358483], + [289, 11, 1647, "Metrics/BlockLength: Block has too many lines. [34/25]", 997955803], + [353, 7, 770, "Metrics/MethodLength: Method has too many lines. [21/10]", 543737609], + [387, 7, 1101, "Metrics/AbcSize: Assignment Branch Condition size for `build_refined_matches` is too high. [<11, 16, 8> 21/17]", 4236016583], + [387, 7, 1101, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_refined_matches` is too high. [9/7]", 4236016583], + [387, 7, 1101, "Metrics/MethodLength: Method has too many lines. [18/10]", 4236016583], + [387, 7, 1101, "Metrics/PerceivedComplexity: Perceived complexity for `build_refined_matches` is too high. [9/8]", 4236016583], + [427, 7, 642, "Metrics/AbcSize: Assignment Branch Condition size for `emit_removed_destination_node_inline_comments` is too high. [<4, 20, 5> 21/17]", 2624953678], + [427, 7, 642, "Metrics/MethodLength: Method has too many lines. [11/10]", 2624953678], + [462, 7, 720, "Metrics/MethodLength: Method has too many lines. [11/10]", 4270722493], + [499, 7, 1022, "Metrics/MethodLength: Method has too many lines. [17/10]", 3216685542], + [584, 7, 1854, "Metrics/AbcSize: Assignment Branch Condition size for `emit_leading_region` is too high. [<8, 28, 9> 30.48/17]", 377203837], + [584, 7, 1854, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_leading_region` is too high. [10/7]", 377203837], + [584, 7, 1854, "Metrics/MethodLength: Method has too many lines. [32/10]", 377203837], + [584, 7, 1854, "Metrics/PerceivedComplexity: Perceived complexity for `emit_leading_region` is too high. [10/8]", 377203837], + [685, 7, 1275, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_template_preamble_prefix_region` is too high. [<7, 24, 9> 26.57/17]", 1754222078], + [685, 7, 1275, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collapse_template_preamble_prefix_region` is too high. [8/7]", 1754222078], + [685, 7, 1275, "Metrics/MethodLength: Method has too many lines. [24/10]", 1754222078], + [716, 7, 662, "Metrics/AbcSize: Assignment Branch Condition size for `root_boundary_lines_for` is too high. [<4, 15, 10> 18.47/17]", 935744348], + [716, 7, 662, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `root_boundary_lines_for` is too high. [9/7]", 935744348], + [716, 7, 662, "Metrics/MethodLength: Method has too many lines. [14/10]", 935744348], + [736, 7, 343, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `region_lines_for` is too high. [8/7]", 399995706], + [753, 7, 614, "Metrics/AbcSize: Assignment Branch Condition size for `dedup_warning_context` is too high. [<0, 20, 10> 22.36/17]", 2011768288], + [753, 7, 614, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `dedup_warning_context` is too high. [11/7]", 2011768288], + [753, 7, 614, "Metrics/PerceivedComplexity: Perceived complexity for `dedup_warning_context` is too high. [11/8]", 2011768288], + [756, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [757, 41, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [757, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 3287405165], + [783, 7, 1426, "Metrics/MethodLength: Method has too many lines. [34/10]", 1351993853], + [849, 7, 955, "Metrics/MethodLength: Method has too many lines. [21/10]", 3080929417], + [877, 7, 1249, "Metrics/AbcSize: Assignment Branch Condition size for `emit_node_lines` is too high. [<6, 21, 6> 22.65/17]", 3195628693], + [877, 7, 1249, "Metrics/MethodLength: Method has too many lines. [21/10]", 3195628693], + [952, 7, 637, "Metrics/AbcSize: Assignment Branch Condition size for `inline_region_separator` is too high. [<5, 18, 7> 19.95/17]", 2029360360], + [952, 7, 637, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `inline_region_separator` is too high. [8/7]", 2029360360], + [952, 7, 637, "Metrics/MethodLength: Method has too many lines. [12/10]", 2029360360], + [969, 7, 465, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_interstitial_blank_lines` is too high. [9/7]", 1640065866], + [969, 7, 465, "Metrics/PerceivedComplexity: Perceived complexity for `emit_interstitial_blank_lines` is too high. [9/8]", 1640065866], + [981, 7, 620, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_gap_before_node` is too high. [12/7]", 2808239642], + [981, 7, 620, "Metrics/PerceivedComplexity: Perceived complexity for `emit_gap_before_node` is too high. [12/8]", 2808239642], + [983, 36, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [998, 7, 526, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_preceding_blank_lines` is too high. [8/7]", 3889743093], + [998, 7, 526, "Metrics/MethodLength: Method has too many lines. [11/10]", 3889743093] + ], + "lib/toml/merge/file_analysis.rb:2689095431": [ + [12, 5, 19523, "Metrics/ClassLength: Class has too many lines. [368/100]", 929433986], + [15, 7, 22, "Style/Documentation: Missing top-level documentation comment for `class Toml::Merge::FileAnalysis::CommentAugmenter`.", 2864244718], + [20, 9, 849, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<11, 13, 1> 17.06/17]", 1333266342], + [20, 9, 849, "Metrics/MethodLength: Method has too many lines. [16/10]", 1333266342], + [72, 7, 869, "Metrics/MethodLength: Method has too many lines. [13/10]", 1683071581], + [228, 7, 959, "Metrics/AbcSize: Assignment Branch Condition size for `root_pairs` is too high. [<10, 13, 16> 22.91/17]", 1481059821], + [228, 7, 959, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `root_pairs` is too high. [15/7]", 1481059821], + [228, 7, 959, "Metrics/MethodLength: Method has too many lines. [21/10]", 1481059821], + [228, 7, 959, "Metrics/PerceivedComplexity: Perceived complexity for `root_pairs` is too high. [15/8]", 1481059821], + [246, 9, 384, "Style/CombinableLoops: Combine this loop with the previous loop.", 2434692315], + [263, 7, 1729, "Metrics/AbcSize: Assignment Branch Condition size for `parse_toml` is too high. [<10, 12, 8> 17.55/17]", 2015178317], + [263, 7, 1729, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_toml` is too high. [9/7]", 2015178317], + [263, 7, 1729, "Metrics/MethodLength: Method has too many lines. [19/10]", 2015178317], + [331, 7, 596, "Metrics/MethodLength: Method has too many lines. [13/10]", 995924372], + [389, 7, 588, "Metrics/AbcSize: Assignment Branch Condition size for `comment_owner_end_line_for_augmenter` is too high. [<1, 20, 13> 23.87/17]", 1972553155], + [389, 7, 588, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `comment_owner_end_line_for_augmenter` is too high. [14/7]", 1972553155], + [389, 7, 588, "Metrics/PerceivedComplexity: Perceived complexity for `comment_owner_end_line_for_augmenter` is too high. [14/8]", 1972553155], + [448, 7, 1255, "Metrics/AbcSize: Assignment Branch Condition size for `scan_line_for_comment` is too high. [<16, 13, 17> 26.72/17]", 622981429], + [448, 7, 1255, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `scan_line_for_comment` is too high. [12/7]", 622981429], + [448, 7, 1255, "Metrics/MethodLength: Method has too many lines. [38/10]", 622981429], + [448, 7, 1255, "Metrics/PerceivedComplexity: Perceived complexity for `scan_line_for_comment` is too high. [13/8]", 622981429], + [496, 7, 319, "Metrics/MethodLength: Method has too many lines. [11/10]", 2890996257], + [535, 7, 416, "Metrics/MethodLength: Method has too many lines. [11/10]", 2416972242], + [576, 7, 464, "Metrics/AbcSize: Assignment Branch Condition size for `node_text` is too high. [<3, 16, 8> 18.14/17]", 2138809005], + [576, 7, 464, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `node_text` is too high. [8/7]", 2138809005] + ], + "lib/toml/merge/key_sorter.rb:829731466": [ + [59, 7, 1787, "Metrics/AbcSize: Assignment Branch Condition size for `partition_into_blocks` is too high. [<11, 23, 8> 26.72/17]", 3324132918], + [59, 7, 1787, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `partition_into_blocks` is too high. [8/7]", 3324132918], + [59, 7, 1787, "Metrics/MethodLength: Method has too many lines. [38/10]", 3324132918], + [59, 7, 1787, "Metrics/PerceivedComplexity: Perceived complexity for `partition_into_blocks` is too high. [9/8]", 3324132918] + ], + "lib/toml/merge/node_type_normalizer.rb:2171981470": [ + [67, 5, 7844, "Metrics/ModuleLength: Module has too many lines. [134/100]", 828548837], + [159, 11, 4, "Lint/BooleanSymbol: Symbol with a boolean name - you probably meant to use `true`.", 2087932467], + [160, 11, 5, "Lint/BooleanSymbol: Symbol with a boolean name - you probably meant to use `false`.", 170962968], + [215, 11, 4, "Lint/BooleanSymbol: Symbol with a boolean name - you probably meant to use `true`.", 2087932467], + [216, 11, 5, "Lint/BooleanSymbol: Symbol with a boolean name - you probably meant to use `false`.", 170962968] + ], + "lib/toml/merge/node_wrapper.rb:2123561241": [ + [26, 5, 23635, "Metrics/ClassLength: Class has too many lines. [417/100]", 111672250], + [37, 9, 517, "Metrics/MethodLength: Method has too many lines. [11/10]", 3513234297], + [37, 17, 154, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2431837951], + [54, 7, 503, "Metrics/MethodLength: Method has too many lines. [12/10]", 2647031658], + [54, 21, 82, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2652802373], + [229, 7, 1380, "Metrics/AbcSize: Assignment Branch Condition size for `value_node` is too high. [<5, 16, 10> 19.52/17]", 1398903082], + [229, 7, 1380, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `value_node` is too high. [9/7]", 1398903082], + [229, 7, 1380, "Metrics/MethodLength: Method has too many lines. [32/10]", 1398903082], + [229, 7, 1380, "Metrics/PerceivedComplexity: Perceived complexity for `value_node` is too high. [9/8]", 1398903082], + [232, 9, 1306, "Metrics/BlockLength: Block has too many lines. [28/25]", 3342818997], + [286, 7, 496, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `pairs` is too high. [9/7]", 2741436417], + [286, 7, 496, "Metrics/PerceivedComplexity: Perceived complexity for `pairs` is too high. [9/8]", 2741436417], + [319, 7, 706, "Metrics/MethodLength: Method has too many lines. [22/10]", 2032215880], + [390, 7, 553, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `effective_end_line` is too high. [8/7]", 2426868004], + [412, 7, 2225, "Metrics/AbcSize: Assignment Branch Condition size for `compute_signature` is too high. [<9, 32, 24> 41/17]", 1299303855], + [412, 7, 2225, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_signature` is too high. [25/7]", 1299303855], + [412, 7, 2225, "Metrics/MethodLength: Method has too many lines. [39/10]", 1299303855], + [412, 7, 2225, "Metrics/PerceivedComplexity: Perceived complexity for `compute_signature` is too high. [16/8]", 1299303855], + [511, 7, 487, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `raw_pair_value_text` is too high. [8/7]", 3177077098], + [535, 7, 1503, "Metrics/AbcSize: Assignment Branch Condition size for `collect_inline_table_keys_recursive` is too high. [<7, 25, 18> 31.59/17]", 3778857543], + [535, 7, 1503, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_inline_table_keys_recursive` is too high. [17/7]", 3778857543], + [535, 7, 1503, "Metrics/MethodLength: Method has too many lines. [24/10]", 3778857543], + [535, 7, 1503, "Metrics/PerceivedComplexity: Perceived complexity for `collect_inline_table_keys_recursive` is too high. [18/8]", 3778857543], + [593, 7, 855, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_sibling_pairs_for_table` is too high. [8/7]", 3160731503], + [593, 7, 855, "Metrics/MethodLength: Method has too many lines. [14/10]", 3160731503], + [624, 7, 655, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_next_table_start_line` is too high. [9/7]", 1465728116], + [624, 7, 655, "Metrics/MethodLength: Method has too many lines. [12/10]", 1465728116], + [624, 7, 655, "Metrics/PerceivedComplexity: Perceived complexity for `find_next_table_start_line` is too high. [9/8]", 1465728116], + [653, 7, 861, "Metrics/MethodLength: Method has too many lines. [12/10]", 4202205110] + ], + "lib/toml/merge/smart_merger.rb:3624815957": [ + [39, 5, 9573, "Metrics/ClassLength: Class has too many lines. [190/100]", 1615610584], + [72, 7, 1283, "Metrics/MethodLength: Method has too many lines. [18/10]", 2597249100], + [72, 21, 427, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 1661881927], + [144, 7, 1347, "Metrics/AbcSize: Assignment Branch Condition size for `merge_with_debug` is too high. [<3, 20, 7> 21.4/17]", 2015540458], + [144, 7, 1347, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_with_debug` is too high. [8/7]", 2015540458], + [144, 7, 1347, "Metrics/MethodLength: Method has too many lines. [31/10]", 2015540458], + [248, 7, 1161, "Metrics/MethodLength: Method has too many lines. [26/10]", 1453116447] + ], + "lib/toml/merge/table_match_refiner.rb:1590173808": [ + [32, 5, 7338, "Metrics/ClassLength: Class has too many lines. [108/100]", 3006106276], + [113, 35, 50, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1492696344], + [147, 7, 410, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_table_name` is too high. [8/7]", 2032455294], + [217, 7, 659, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<11, 38, 8> 40.36/17]", 2658150371], + [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:168123572": [ + [6, 1, 11947, "Metrics/BlockLength: Block has too many lines. [266/25]", 2102318823], + [228, 3, 1368, "Metrics/BlockLength: Block has too many lines. [34/25]", 3324165298] + ], + "toml-merge.gemspec:2519299257": [ + [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ] +} diff --git a/gems/toml-merge/Gemfile b/gems/toml-merge/Gemfile index 13f778d46..7a1994926 100644 --- a/gems/toml-merge/Gemfile +++ b/gems/toml-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source "https://gem.coop" +source 'https://gem.coop' git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,58 +19,54 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ["~> 1.0", ">= 1.0.8"] -gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ['~> 1.0', '>= 1.0.8'] +gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ast-merge tree_haver ] -direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") +direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? if direct_sibling_gems.any? && - (direct_sibling_local || - ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) - direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") - direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) begin nomono_activation_requirements = nomono_requirements - nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) if File.file?(nomono_lockfile) nomono_locked_spec = Bundler::LockfileParser - .new(Bundler.read_file(nomono_lockfile)) - .specs - .find { |spec| spec.name == "nomono" } + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } nomono_locked = nomono_locked_spec && - Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) - if nomono_locked - nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] - end - end - Kernel.send(:gem, "nomono", *nomono_activation_requirements) - require "nomono/bundler" - if direct_sibling_templating && !direct_sibling_local - ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local eval_nomono_gems( gems: direct_sibling_gems, - prefix: "STRUCTUREDMERGE", - path_env: "STRUCTUREDMERGE_DEV", - root: ["src", "my", "structuredmerge"] + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] ) rescue LoadError - warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' ensure if direct_sibling_templating && !direct_sibling_local if direct_sibling_dev_was_set - ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original else - ENV.delete("STRUCTUREDMERGE_DEV") + ENV.delete('STRUCTUREDMERGE_DEV') end end end @@ -214,25 +210,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging -eval_gemfile "gemfiles/modular/debug.gemfile" +eval_gemfile 'gemfiles/modular/debug.gemfile' # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile "gemfiles/modular/coverage.gemfile" +eval_gemfile 'gemfiles/modular/coverage.gemfile' # Linting -eval_gemfile "gemfiles/modular/style.gemfile" +eval_gemfile 'gemfiles/modular/style.gemfile' # Documentation -eval_gemfile "gemfiles/modular/documentation.gemfile" +eval_gemfile 'gemfiles/modular/documentation.gemfile' # Optional -eval_gemfile "gemfiles/modular/optional.gemfile" +eval_gemfile 'gemfiles/modular/optional.gemfile' ### Std Lib Extracted Gems -eval_gemfile "gemfiles/modular/x_std_libs.gemfile" +eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' # See unlocked_deps appraisal for more details on irb inclusion -gem "irb", "~> 1.17" # ruby >= 2.7 +gem 'irb', '~> 1.17' # ruby >= 2.7 diff --git a/gems/toml-merge/Gemfile.lock b/gems/toml-merge/Gemfile.lock index 88c97d842..5f94594be 100644 --- a/gems/toml-merge/Gemfile.lock +++ b/gems/toml-merge/Gemfile.lock @@ -16,262 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.0) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -309,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -323,6 +61,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -372,12 +111,21 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - kettle-dev (2.3.6) + kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -396,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -536,23 +283,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -586,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -637,45 +381,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -684,61 +406,40 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -751,27 +452,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) - kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae - kettle-drift (1.0.5) - kettle-jem (7.1.0) + kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.0) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -786,14 +479,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -801,7 +490,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -829,19 +517,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -855,19 +541,15 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -875,7 +557,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/toml-merge/Rakefile b/gems/toml-merge/Rakefile index 4d0c02b16..1038ac780 100644 --- a/gems/toml-merge/Rakefile +++ b/gems/toml-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require "kettle/drift" + require 'kettle/drift' Kettle::Drift.install_tasks rescue LoadError - desc("(stub) kettle:drift:check is unavailable") - task("kettle:drift:check") do + desc('(stub) kettle:drift:check is unavailable') + task('kettle:drift:check') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:update is unavailable") - task("kettle:drift:update") do + desc('(stub) kettle:drift:update is unavailable') + task('kettle:drift:update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:force_update is unavailable") - task("kettle:drift:force_update") do + desc('(stub) kettle:drift:force_update is unavailable') + task('kettle:drift:force_update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift is unavailable") - task("kettle:drift" => "kettle:drift:update") + desc('(stub) kettle:drift is unavailable') + task('kettle:drift' => 'kettle:drift:update') end ### TEMPLATING TASKS diff --git a/gems/toml-merge/bin/yard b/gems/toml-merge/bin/yard index a7e8b6eed..5d516ad6f 100755 --- a/gems/toml-merge/bin/yard +++ b/gems/toml-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec("bundle", "exec", "rake", "yard") +exec('bundle', 'exec', 'rake', 'yard') diff --git a/gems/toml-merge/lib/toml/merge/version.rb b/gems/toml-merge/lib/toml/merge/version.rb index 91c4e4d84..d9074beaf 100644 --- a/gems/toml-merge/lib/toml/merge/version.rb +++ b/gems/toml-merge/lib/toml/merge/version.rb @@ -3,7 +3,7 @@ module Toml module Merge module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/yaml-merge/Gemfile.lock b/gems/yaml-merge/Gemfile.lock index affcf2de1..45a43c829 100644 --- a/gems/yaml-merge/Gemfile.lock +++ b/gems/yaml-merge/Gemfile.lock @@ -16,6 +16,246 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -53,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -381,23 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -406,12 +684,17 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) yaml-merge! yard (~> 0.9, >= 0.9.44) @@ -420,19 +703,35 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,19 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -479,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -490,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -517,9 +830,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -528,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -541,10 +858,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -557,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 2317e4f656bd85fedfe154ea91cf49f9377a1139 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 16:38:15 -0600 Subject: [PATCH 016/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/go-merge/.gitattributes | 2 +- gems/go-merge/.kettle-drift.lock | 60 ++-- gems/go-merge/Gemfile | 40 +++ gems/go-merge/Gemfile.lock | 59 ++-- gems/ruby-merge/.rubocop_gradual.lock | 316 ++++++++++++++++++ gems/ruby-merge/Gemfile | 68 ++-- gems/ruby-merge/Gemfile.lock | 377 ++-------------------- gems/ruby-merge/Rakefile | 18 +- gems/ruby-merge/bin/yard | 2 +- gems/ruby-merge/lib/ruby/merge/version.rb | 2 +- gems/toml-merge/Gemfile.lock | 322 ++++++++++++++++++ gems/typescript-merge/Gemfile.lock | 352 +++++++++++++++++++- 12 files changed, 1161 insertions(+), 457 deletions(-) create mode 100644 gems/ruby-merge/.rubocop_gradual.lock diff --git a/gems/go-merge/.gitattributes b/gems/go-merge/.gitattributes index 0ac65aaa7..35a3c7359 100644 --- a/gems/go-merge/.gitattributes +++ b/gems/go-merge/.gitattributes @@ -1,5 +1,5 @@ # <> do not edit below this line -*.rb diff=smorg-ruby +*.rb diff=smorg-rb *.go diff=smorg-go *.rs diff=smorg-rs # <> diff --git a/gems/go-merge/.kettle-drift.lock b/gems/go-merge/.kettle-drift.lock index 9295a3562..628aa923c 100644 --- a/gems/go-merge/.kettle-drift.lock +++ b/gems/go-merge/.kettle-drift.lock @@ -4,7 +4,8 @@ "file": "Gemfile", "lines": [ 80, - 120 + 120, + 160 ] } ], @@ -13,7 +14,8 @@ "file": "Gemfile", "lines": [ 91, - 131 + 131, + 171 ] } ], @@ -22,7 +24,8 @@ "file": "Gemfile", "lines": [ 81, - 121 + 121, + 161 ] } ], @@ -31,7 +34,8 @@ "file": "Gemfile", "lines": [ 93, - 133 + 133, + 173 ] } ], @@ -40,7 +44,8 @@ "file": "Gemfile", "lines": [ 96, - 136 + 136, + 176 ] } ], @@ -49,7 +54,8 @@ "file": "Gemfile", "lines": [ 82, - 122 + 122, + 162 ] } ], @@ -59,7 +65,8 @@ "lines": [ 60, 100, - 140 + 140, + 180 ] } ], @@ -68,7 +75,8 @@ "file": "Gemfile", "lines": [ 101, - 141 + 141, + 181 ] } ], @@ -78,7 +86,8 @@ "lines": [ 43, 87, - 127 + 127, + 167 ] } ], @@ -87,7 +96,8 @@ "file": "Gemfile", "lines": [ 110, - 150 + 150, + 190 ] } ], @@ -97,7 +107,8 @@ "lines": [ 35, 79, - 119 + 119, + 159 ] } ], @@ -107,7 +118,8 @@ "lines": [ 69, 109, - 149 + 149, + 189 ] } ], @@ -116,7 +128,8 @@ "file": "Gemfile", "lines": [ 85, - 125 + 125, + 165 ] } ], @@ -126,7 +139,8 @@ "lines": [ 48, 92, - 132 + 132, + 172 ] } ], @@ -136,7 +150,8 @@ "lines": [ 44, 88, - 128 + 128, + 168 ] } ], @@ -145,7 +160,8 @@ "file": "Gemfile", "lines": [ 86, - 126 + 126, + 166 ] } ], @@ -154,7 +170,8 @@ "file": "Gemfile", "lines": [ 103, - 143 + 143, + 183 ] } ], @@ -163,7 +180,8 @@ "file": "Gemfile", "lines": [ 102, - 142 + 142, + 182 ] } ], @@ -172,7 +190,8 @@ "file": "Gemfile", "lines": [ 97, - 137 + 137, + 177 ] } ], @@ -181,7 +200,8 @@ "file": "Gemfile", "lines": [ 106, - 146 + 146, + 186 ] } ], diff --git a/gems/go-merge/Gemfile b/gems/go-merge/Gemfile index 17b2665bb..3bb8b1a27 100644 --- a/gems/go-merge/Gemfile +++ b/gems/go-merge/Gemfile @@ -152,6 +152,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/go-merge/Gemfile.lock b/gems/go-merge/Gemfile.lock index 52d5dec8d..ede1d7ef4 100644 --- a/gems/go-merge/Gemfile.lock +++ b/gems/go-merge/Gemfile.lock @@ -256,6 +256,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.0) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -307,7 +323,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -362,18 +377,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -537,22 +541,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -658,9 +658,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -738,7 +738,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -759,10 +758,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.0) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -837,13 +836,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/ruby-merge/.rubocop_gradual.lock b/gems/ruby-merge/.rubocop_gradual.lock new file mode 100644 index 000000000..fff670117 --- /dev/null +++ b/gems/ruby-merge/.rubocop_gradual.lock @@ -0,0 +1,316 @@ +{ + ".simplecov:3590623278": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:2768890125": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/ruby-merge.rb:2992445753": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`ruby-merge.rb`) should use snake_case.", 5381] + ], + "lib/ruby/merge.rb:1877719734": [ + [11, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Ruby::Merge`.", 2866359175], + [11, 3, 109110, "Metrics/ModuleLength: Module has too many lines. [2519/100]", 662788489], + [29, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3061257365], + [81, 5, 959, "Metrics/AbcSize: Assignment Branch Condition size for `parse_ruby` is too high. [<4, 16, 7> 17.92/17]", 1071201699], + [81, 5, 959, "Metrics/MethodLength: Method has too many lines. [16/10]", 1071201699], + [107, 5, 2656, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_method_move_detection` is too high. [<17, 40, 18> 47.04/17]", 3779436399], + [107, 5, 2656, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_method_move_detection` is too high. [16/7]", 3779436399], + [107, 5, 2656, "Metrics/MethodLength: Method has too many lines. [45/10]", 3779436399], + [107, 5, 2656, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_method_move_detection` is too high. [16/8]", 3779436399], + [119, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 727785047], + [132, 121, 51, "Layout/LineLength: Line is too long. [171/120]", 3259664538], + [151, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], + [154, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], + [155, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 1976354608], + [159, 5, 4395, "Metrics/AbcSize: Assignment Branch Condition size for `merge_ruby` is too high. [<31, 64, 24> 75.05/17]", 2749692967], + [159, 5, 4395, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_ruby` is too high. [21/7]", 2749692967], + [159, 5, 4395, "Metrics/MethodLength: Method has too many lines. [83/10]", 2749692967], + [159, 5, 4395, "Metrics/PerceivedComplexity: Perceived complexity for `merge_ruby` is too high. [22/8]", 2749692967], + [218, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], + [257, 5, 1312, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_delegated_child_operations` is too high. [<10, 15, 6> 19/17]", 2246428949], + [257, 5, 1312, "Metrics/MethodLength: Method has too many lines. [28/10]", 2246428949], + [303, 5, 861, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_source_owner_identity_profile` is too high. [<5, 17, 2> 17.83/17]", 4129925341], + [303, 5, 861, "Metrics/MethodLength: Method has too many lines. [20/10]", 4129925341], + [326, 5, 2064, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_source_owner_identity_matches` is too high. [<17, 31, 11> 37.03/17]", 2780319153], + [326, 5, 2064, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_source_owner_identity_matches` is too high. [11/7]", 2780319153], + [326, 5, 2064, "Metrics/MethodLength: Method has too many lines. [37/10]", 2780319153], + [326, 5, 2064, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_source_owner_identity_matches` is too high. [11/8]", 2780319153], + [355, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], + [358, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], + [363, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1001816794], + [369, 5, 1314, "Metrics/MethodLength: Method has too many lines. [28/10]", 4183124680], + [402, 5, 786, "Metrics/MethodLength: Method has too many lines. [24/10]", 3631640245], + [429, 5, 916, "Metrics/MethodLength: Method has too many lines. [18/10]", 631485532], + [450, 5, 662, "Metrics/MethodLength: Method has too many lines. [15/10]", 2231086183], + [469, 5, 777, "Metrics/MethodLength: Method has too many lines. [18/10]", 895030114], + [490, 5, 727, "Metrics/MethodLength: Method has too many lines. [19/10]", 776483642], + [512, 5, 861, "Metrics/MethodLength: Method has too many lines. [29/10]", 537340961], + [544, 5, 655, "Metrics/MethodLength: Method has too many lines. [16/10]", 3756601977], + [563, 5, 1592, "Metrics/MethodLength: Method has too many lines. [25/10]", 3521052904], + [587, 121, 106, "Layout/LineLength: Line is too long. [226/120]", 2104286058], + [593, 5, 777, "Metrics/MethodLength: Method has too many lines. [14/10]", 2821246515], + [610, 5, 1429, "Metrics/MethodLength: Method has too many lines. [26/10]", 244346226], + [633, 121, 124, "Layout/LineLength: Line is too long. [244/120]", 13261232], + [639, 5, 1367, "Metrics/MethodLength: Method has too many lines. [41/10]", 3883814121], + [683, 5, 750, "Metrics/MethodLength: Method has too many lines. [22/10]", 764028624], + [709, 5, 1315, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_silent_data_loss_validation_report` is too high. [<8, 14, 7> 17.58/17]", 2039399818], + [709, 5, 1315, "Metrics/MethodLength: Method has too many lines. [31/10]", 2039399818], + [744, 5, 724, "Metrics/MethodLength: Method has too many lines. [14/10]", 1741779676], + [755, 121, 67, "Layout/LineLength: Line is too long. [187/120]", 1996508131], + [761, 5, 752, "Metrics/MethodLength: Method has too many lines. [21/10]", 3870096101], + [785, 5, 1052, "Metrics/MethodLength: Method has too many lines. [32/10]", 119279638], + [820, 5, 1588, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_interstitial_comment_attachment_report` is too high. [<11, 34, 17> 39.57/17]", 4112280260], + [820, 5, 1588, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_interstitial_comment_attachment_report` is too high. [14/7]", 4112280260], + [820, 5, 1588, "Metrics/MethodLength: Method has too many lines. [30/10]", 4112280260], + [820, 5, 1588, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_interstitial_comment_attachment_report` is too high. [15/8]", 4112280260], + [834, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 180543822], + [862, 5, 536, "Metrics/MethodLength: Method has too many lines. [13/10]", 245509059], + [878, 5, 2252, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_rename_detection` is too high. [<14, 32, 11> 36.62/17]", 2574664763], + [878, 5, 2252, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_rename_detection` is too high. [10/7]", 2574664763], + [878, 5, 2252, "Metrics/MethodLength: Method has too many lines. [46/10]", 2574664763], + [878, 5, 2252, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_rename_detection` is too high. [11/8]", 2574664763], + [921, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 4074688513], + [927, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], + [931, 5, 2254, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_rename_plus_edit_conflicts` is too high. [<15, 30, 13> 35.97/17]", 3664513828], + [931, 5, 2254, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_rename_plus_edit_conflicts` is too high. [10/7]", 3664513828], + [931, 5, 2254, "Metrics/MethodLength: Method has too many lines. [45/10]", 3664513828], + [931, 5, 2254, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_rename_plus_edit_conflicts` is too high. [11/8]", 3664513828], + [983, 5, 1926, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_cross_container_method_move_detection` is too high. [<8, 18, 7> 20.9/17]", 1401333972], + [983, 5, 1926, "Metrics/MethodLength: Method has too many lines. [44/10]", 1401333972], + [1026, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3474944396], + [1033, 5, 1488, "Metrics/AbcSize: Assignment Branch Condition size for `apply_ruby_delegated_child_outputs` is too high. [<16, 39, 12> 43.83/17]", 842348215], + [1033, 5, 1488, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_ruby_delegated_child_outputs` is too high. [12/7]", 842348215], + [1033, 5, 1488, "Metrics/MethodLength: Method has too many lines. [27/10]", 842348215], + [1033, 5, 1488, "Metrics/PerceivedComplexity: Perceived complexity for `apply_ruby_delegated_child_outputs` is too high. [13/8]", 842348215], + [1067, 5, 980, "Metrics/MethodLength: Method has too many lines. [23/10]", 1425119613], + [1094, 5, 1025, "Metrics/MethodLength: Method has too many lines. [23/10]", 2179557432], + [1122, 5, 757, "Metrics/MethodLength: Method has too many lines. [12/10]", 3975431355], + [1127, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 1956194284], + [1139, 5, 745, "Metrics/MethodLength: Method has too many lines. [12/10]", 1051086033], + [1144, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1636990749], + [1156, 5, 670, "Metrics/MethodLength: Method has too many lines. [11/10]", 3552666292], + [1161, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 3013228499], + [1172, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 1356230953], + [1177, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 3013228499], + [1188, 5, 2093, "Metrics/AbcSize: Assignment Branch Condition size for `analyze_ruby_document` is too high. [<21, 31, 12> 39.32/17]", 3298966582], + [1188, 5, 2093, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `analyze_ruby_document` is too high. [13/7]", 3298966582], + [1188, 5, 2093, "Metrics/MethodLength: Method has too many lines. [53/10]", 3298966582], + [1188, 5, 2093, "Metrics/PerceivedComplexity: Perceived complexity for `analyze_ruby_document` is too high. [13/8]", 3298966582], + [1194, 7, 1035, "Metrics/BlockLength: Block has too many lines. [27/25]", 2081528636], + [1263, 5, 427, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_file_footer_text` is too high. [<5, 17, 8> 19.44/17]", 1703748308], + [1301, 5, 941, "Metrics/MethodLength: Method has too many lines. [15/10]", 1317835917], + [1307, 121, 173, "Layout/LineLength: Line is too long. [293/120]", 225499532], + [1333, 5, 518, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_tslp_claimed_line_indexes` is too high. [<6, 19, 5> 20.54/17]", 1455439838], + [1356, 5, 443, "Metrics/MethodLength: Method has too many lines. [12/10]", 4230588206], + [1373, 5, 363, "Metrics/MethodLength: Method has too many lines. [11/10]", 3068065572], + [1421, 5, 1849, "Metrics/AbcSize: Assignment Branch Condition size for `legacy_collect_ruby_declaration_entries` is too high. [<24, 26, 13> 37.7/17]", 3187770326], + [1421, 5, 1849, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `legacy_collect_ruby_declaration_entries` is too high. [11/7]", 3187770326], + [1421, 5, 1849, "Metrics/MethodLength: Method has too many lines. [54/10]", 3187770326], + [1421, 5, 1849, "Metrics/PerceivedComplexity: Perceived complexity for `legacy_collect_ruby_declaration_entries` is too high. [11/8]", 3187770326], + [1468, 13, 76, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 1356567820], + [1504, 5, 396, "Metrics/MethodLength: Method has too many lines. [11/10]", 1239008881], + [1519, 5, 681, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_process_declaration_entries` is too high. [<7, 17, 2> 18.49/17]", 2675999354], + [1519, 5, 681, "Metrics/MethodLength: Method has too many lines. [16/10]", 2675999354], + [1539, 5, 634, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_top_level_process_structure_items` is too high. [<5, 32, 14> 35.28/17]", 1120707166], + [1539, 5, 634, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_top_level_process_structure_items` is too high. [11/7]", 1120707166], + [1539, 5, 634, "Metrics/MethodLength: Method has too many lines. [11/10]", 1120707166], + [1539, 5, 634, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_top_level_process_structure_items` is too high. [11/8]", 1120707166], + [1551, 7, 11, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 848344986], + [1558, 7, 9, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 3648222389], + [1603, 5, 1284, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_intra_owner_merge_plan` is too high. [<8, 24, 9> 26.85/17]", 2388567699], + [1603, 5, 1284, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_intra_owner_merge_plan` is too high. [9/7]", 2388567699], + [1603, 5, 1284, "Metrics/MethodLength: Method has too many lines. [22/10]", 2388567699], + [1603, 5, 1284, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_intra_owner_merge_plan` is too high. [9/8]", 2388567699], + [1644, 5, 557, "Metrics/MethodLength: Method has too many lines. [11/10]", 3178341030], + [1702, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 895013151], + [1707, 5, 593, "Metrics/MethodLength: Method has too many lines. [13/10]", 2850316611], + [1708, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177625], + [1725, 5, 609, "Metrics/MethodLength: Method has too many lines. [12/10]", 784855730], + [1740, 5, 695, "Metrics/MethodLength: Method has too many lines. [14/10]", 3942458504], + [1777, 5, 1110, "Metrics/AbcSize: Assignment Branch Condition size for `merge_declaration_hash_constants` is too high. [<11, 22, 6> 25.32/17]", 3861922947], + [1777, 5, 1110, "Metrics/MethodLength: Method has too many lines. [17/10]", 3861922947], + [1799, 5, 794, "Metrics/AbcSize: Assignment Branch Condition size for `merge_declaration_body_constants` is too high. [<9, 14, 6> 17.69/17]", 1882117166], + [1829, 5, 1138, "Metrics/AbcSize: Assignment Branch Condition size for `merge_array_constant_text` is too high. [<9, 18, 7> 21.31/17]", 1448081799], + [1829, 5, 1138, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_array_constant_text` is too high. [8/7]", 1448081799], + [1829, 5, 1138, "Metrics/MethodLength: Method has too many lines. [15/10]", 1448081799], + [1835, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193434112], + [1842, 7, 8, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 359846632], + [1849, 5, 774, "Metrics/AbcSize: Assignment Branch Condition size for `merge_percent_array_constant_text` is too high. [<8, 16, 7> 19.21/17]", 625509828], + [1849, 5, 774, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_percent_array_constant_text` is too high. [8/7]", 625509828], + [1878, 5, 1060, "Metrics/AbcSize: Assignment Branch Condition size for `merge_multiline_array_constant_text` is too high. [<11, 23, 10> 27.39/17]", 2672751288], + [1878, 5, 1060, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_multiline_array_constant_text` is too high. [11/7]", 2672751288], + [1878, 5, 1060, "Metrics/MethodLength: Method has too many lines. [13/10]", 2672751288], + [1878, 5, 1060, "Metrics/PerceivedComplexity: Perceived complexity for `merge_multiline_array_constant_text` is too high. [11/8]", 2672751288], + [1887, 7, 8, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 359846632], + [1896, 5, 1605, "Metrics/AbcSize: Assignment Branch Condition size for `merge_declaration_body_methods` is too high. [<21, 28, 15> 38.08/17]", 2740924329], + [1896, 5, 1605, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_declaration_body_methods` is too high. [14/7]", 2740924329], + [1896, 5, 1605, "Metrics/MethodLength: Method has too many lines. [29/10]", 2740924329], + [1896, 5, 1605, "Metrics/PerceivedComplexity: Perceived complexity for `merge_declaration_body_methods` is too high. [15/8]", 2740924329], + [1903, 7, 8, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 359846632], + [1930, 5, 1076, "Metrics/AbcSize: Assignment Branch Condition size for `merge_nested_body_declarations` is too high. [<14, 24, 10> 29.53/17]", 1397199527], + [1930, 5, 1076, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_nested_body_declarations` is too high. [11/7]", 1397199527], + [1930, 5, 1076, "Metrics/MethodLength: Method has too many lines. [14/10]", 1397199527], + [1930, 5, 1076, "Metrics/PerceivedComplexity: Perceived complexity for `merge_nested_body_declarations` is too high. [11/8]", 1397199527], + [1969, 5, 2549, "Metrics/AbcSize: Assignment Branch Condition size for `top_level_source_region_owners` is too high. [<24, 33, 13> 42.83/17]", 1909271685], + [1969, 5, 2549, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `top_level_source_region_owners` is too high. [11/7]", 1909271685], + [1969, 5, 2549, "Metrics/MethodLength: Method has too many lines. [64/10]", 1909271685], + [1969, 5, 2549, "Metrics/PerceivedComplexity: Perceived complexity for `top_level_source_region_owners` is too high. [11/8]", 1909271685], + [2012, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861626], + [2027, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1695648499], + [2043, 5, 2126, "Metrics/AbcSize: Assignment Branch Condition size for `container_child_source_regions` is too high. [<23, 28, 11> 37.87/17]", 4031983731], + [2043, 5, 2126, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `container_child_source_regions` is too high. [10/7]", 4031983731], + [2043, 5, 2126, "Metrics/MethodLength: Method has too many lines. [56/10]", 4031983731], + [2043, 5, 2126, "Metrics/PerceivedComplexity: Perceived complexity for `container_child_source_regions` is too high. [10/8]", 4031983731], + [2109, 5, 996, "Metrics/AbcSize: Assignment Branch Condition size for `interleave_source_regions` is too high. [<8, 14, 6> 17.2/17]", 796443872], + [2109, 5, 996, "Metrics/MethodLength: Method has too many lines. [30/10]", 796443872], + [2147, 5, 1323, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `source_interstitial_region` is too high. [13/7]", 1970451685], + [2147, 5, 1323, "Metrics/MethodLength: Method has too many lines. [30/10]", 1970451685], + [2147, 5, 1323, "Metrics/PerceivedComplexity: Perceived complexity for `source_interstitial_region` is too high. [12/8]", 1970451685], + [2147, 35, 80, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2143999554], + [2182, 5, 396, "Metrics/MethodLength: Method has too many lines. [12/10]", 663734283], + [2198, 5, 890, "Metrics/AbcSize: Assignment Branch Condition size for `collect_blank_line_regions` is too high. [<4, 18, 7> 19.72/17]", 3362926457], + [2198, 5, 890, "Metrics/MethodLength: Method has too many lines. [20/10]", 3362926457], + [2257, 5, 27, "Style/Documentation: Missing top-level documentation comment for `class Ruby::Merge::RubyHashLiteralParser`.", 2589782793], + [2257, 5, 3304, "Metrics/ClassLength: Class has too many lines. [103/100]", 2782733473], + [2274, 7, 868, "Metrics/AbcSize: Assignment Branch Condition size for `parse_hash` is too high. [<6, 23, 6> 24.52/17]", 2331230410], + [2274, 7, 868, "Metrics/MethodLength: Method has too many lines. [28/10]", 2331230410], + [2314, 7, 911, "Metrics/AbcSize: Assignment Branch Condition size for `parse_hash_key` is too high. [<13, 26, 4> 29.34/17]", 2403379393], + [2314, 7, 911, "Metrics/MethodLength: Method has too many lines. [18/10]", 2403379393], + [2339, 7, 644, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_scalar_source` is too high. [8/7]", 2447980390], + [2339, 7, 644, "Metrics/MethodLength: Method has too many lines. [21/10]", 2447980390], + [2339, 7, 644, "Metrics/PerceivedComplexity: Perceived complexity for `parse_scalar_source` is too high. [9/8]", 2447980390], + [2384, 5, 1202, "Metrics/AbcSize: Assignment Branch Condition size for `constant_hash_blocks` is too high. [<19, 25, 6> 31.97/17]", 399214756], + [2384, 5, 1202, "Metrics/MethodLength: Method has too many lines. [36/10]", 399214756], + [2425, 5, 727, "Metrics/AbcSize: Assignment Branch Condition size for `hash_assignment_finish_line` is too high. [<11, 7, 12> 17.72/17]", 1215874404], + [2425, 5, 727, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `hash_assignment_finish_line` is too high. [9/7]", 1215874404], + [2425, 5, 727, "Metrics/MethodLength: Method has too many lines. [26/10]", 1215874404], + [2425, 5, 727, "Metrics/PerceivedComplexity: Perceived complexity for `hash_assignment_finish_line` is too high. [11/8]", 1215874404], + [2455, 5, 1970, "Metrics/AbcSize: Assignment Branch Condition size for `direct_body_method_entries` is too high. [<28, 32, 13> 44.46/17]", 2589282610], + [2455, 5, 1970, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `direct_body_method_entries` is too high. [12/7]", 2589282610], + [2455, 5, 1970, "Metrics/MethodLength: Method has too many lines. [56/10]", 2589282610], + [2455, 5, 1970, "Metrics/PerceivedComplexity: Perceived complexity for `direct_body_method_entries` is too high. [12/8]", 2589282610], + [2520, 5, 1221, "Metrics/AbcSize: Assignment Branch Condition size for `direct_body_constant_entries` is too high. [<16, 34, 10> 38.88/17]", 1588885504], + [2520, 5, 1221, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `direct_body_constant_entries` is too high. [9/7]", 1588885504], + [2520, 5, 1221, "Metrics/MethodLength: Method has too many lines. [35/10]", 1588885504], + [2520, 5, 1221, "Metrics/PerceivedComplexity: Perceived complexity for `direct_body_constant_entries` is too high. [9/8]", 1588885504], + [2563, 5, 708, "Metrics/AbcSize: Assignment Branch Condition size for `split_ruby_array_elements` is too high. [<11, 12, 11> 19.65/17]", 1344003748], + [2563, 5, 708, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split_ruby_array_elements` is too high. [9/7]", 1344003748], + [2563, 5, 708, "Metrics/MethodLength: Method has too many lines. [24/10]", 1344003748], + [2563, 5, 708, "Metrics/PerceivedComplexity: Perceived complexity for `split_ruby_array_elements` is too high. [11/8]", 1344003748], + [2607, 5, 977, "Metrics/AbcSize: Assignment Branch Condition size for `append_multiline_array_elements` is too high. [<12, 32, 9> 35.34/17]", 1316332112], + [2607, 5, 977, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `append_multiline_array_elements` is too high. [9/7]", 1316332112], + [2607, 5, 977, "Metrics/MethodLength: Method has too many lines. [16/10]", 1316332112], + [2607, 5, 977, "Metrics/PerceivedComplexity: Perceived complexity for `append_multiline_array_elements` is too high. [9/8]", 1316332112], + [2635, 5, 728, "Metrics/AbcSize: Assignment Branch Condition size for `array_assignment_finish_line` is too high. [<11, 7, 12> 17.72/17]", 1471354607], + [2635, 5, 728, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `array_assignment_finish_line` is too high. [9/7]", 1471354607], + [2635, 5, 728, "Metrics/MethodLength: Method has too many lines. [26/10]", 1471354607], + [2635, 5, 728, "Metrics/PerceivedComplexity: Perceived complexity for `array_assignment_finish_line` is too high. [11/8]", 1471354607], + [2671, 5, 1127, "Metrics/AbcSize: Assignment Branch Condition size for `direct_body_declaration_entries` is too high. [<14, 30, 7> 33.84/17]", 1223661118], + [2671, 5, 1127, "Metrics/MethodLength: Method has too many lines. [30/10]", 1223661118], + [2718, 5, 984, "Metrics/AbcSize: Assignment Branch Condition size for `insert_declaration_body_blocks` is too high. [<4, 23, 12> 26.25/17]", 159690081], + [2718, 5, 984, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `insert_declaration_body_blocks` is too high. [9/7]", 159690081], + [2718, 5, 984, "Metrics/MethodLength: Method has too many lines. [16/10]", 159690081], + [2718, 5, 984, "Metrics/PerceivedComplexity: Perceived complexity for `insert_declaration_body_blocks` is too high. [10/8]", 159690081], + [2763, 5, 1027, "Metrics/AbcSize: Assignment Branch Condition size for `merge_ruby_hash_literals` is too high. [<8, 30, 9> 32.33/17]", 2793745298], + [2763, 5, 1027, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_ruby_hash_literals` is too high. [9/7]", 2793745298], + [2763, 5, 1027, "Metrics/MethodLength: Method has too many lines. [19/10]", 2793745298], + [2763, 5, 1027, "Metrics/PerceivedComplexity: Perceived complexity for `merge_ruby_hash_literals` is too high. [10/8]", 2793745298], + [2785, 5, 636, "Metrics/AbcSize: Assignment Branch Condition size for `render_ruby_hash_literal` is too high. [<5, 19, 6> 20.54/17]", 1834383244], + [2825, 5, 491, "Metrics/MethodLength: Method has too many lines. [11/10]", 1799924605], + [2858, 5, 1125, "Metrics/AbcSize: Assignment Branch Condition size for `surfaces_for_owner` is too high. [<6, 19, 3> 20.15/17]", 4036098594], + [2858, 5, 1125, "Metrics/MethodLength: Method has too many lines. [20/10]", 4036098594], + [2883, 5, 1479, "Metrics/AbcSize: Assignment Branch Condition size for `example_surfaces_for` is too high. [<10, 28, 9> 31.06/17]", 1159322815], + [2883, 5, 1479, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `example_surfaces_for` is too high. [9/7]", 1159322815], + [2883, 5, 1479, "Metrics/MethodLength: Method has too many lines. [28/10]", 1159322815], + [2883, 5, 1479, "Metrics/PerceivedComplexity: Perceived complexity for `example_surfaces_for` is too high. [9/8]", 1159322815] + ], + "ruby-merge.gemspec:503862341": [ + [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ], + "spec/fixtures_integration_spec.rb:943607429": [ + [7, 1, 68962, "Metrics/BlockLength: Block has too many lines. [1586/25]", 1326132038], + [8, 3, 94, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 4224869601], + [9, 3, 80, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3493759864], + [10, 3, 72, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 218819604], + [11, 3, 83, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3957977039], + [56, 3, 1207, "Metrics/BlockLength: Block has too many lines. [27/25]", 2841005266], + [141, 3, 1550, "Metrics/BlockLength: Block has too many lines. [44/25]", 1381861178], + [192, 3, 1209, "Metrics/BlockLength: Block has too many lines. [33/25]", 1745132505], + [232, 3, 61330, "Metrics/BlockLength: Block has too many lines. [1387/25]", 3444780370], + [628, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859109], + [1712, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3355833611], + [1719, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 38619260] + ] +} diff --git a/gems/ruby-merge/Gemfile b/gems/ruby-merge/Gemfile index 23eae269a..441fd3008 100644 --- a/gems/ruby-merge/Gemfile +++ b/gems/ruby-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source "https://gem.coop" +source 'https://gem.coop' git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,58 +19,54 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ["~> 1.0", ">= 1.0.8"] -gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ['~> 1.0', '>= 1.0.8'] +gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ast-merge tree_haver ] -direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") +direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? if direct_sibling_gems.any? && - (direct_sibling_local || - ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) - direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") - direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) begin nomono_activation_requirements = nomono_requirements - nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) if File.file?(nomono_lockfile) nomono_locked_spec = Bundler::LockfileParser - .new(Bundler.read_file(nomono_lockfile)) - .specs - .find { |spec| spec.name == "nomono" } + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } nomono_locked = nomono_locked_spec && - Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) - if nomono_locked - nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] - end - end - Kernel.send(:gem, "nomono", *nomono_activation_requirements) - require "nomono/bundler" - if direct_sibling_templating && !direct_sibling_local - ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local eval_nomono_gems( gems: direct_sibling_gems, - prefix: "STRUCTUREDMERGE", - path_env: "STRUCTUREDMERGE_DEV", - root: ["src", "my", "structuredmerge"] + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] ) rescue LoadError - warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' ensure if direct_sibling_templating && !direct_sibling_local if direct_sibling_dev_was_set - ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original else - ENV.delete("STRUCTUREDMERGE_DEV") + ENV.delete('STRUCTUREDMERGE_DEV') end end end @@ -214,25 +210,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging -eval_gemfile "gemfiles/modular/debug.gemfile" +eval_gemfile 'gemfiles/modular/debug.gemfile' # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile "gemfiles/modular/coverage.gemfile" +eval_gemfile 'gemfiles/modular/coverage.gemfile' # Linting -eval_gemfile "gemfiles/modular/style.gemfile" +eval_gemfile 'gemfiles/modular/style.gemfile' # Documentation -eval_gemfile "gemfiles/modular/documentation.gemfile" +eval_gemfile 'gemfiles/modular/documentation.gemfile' # Optional -eval_gemfile "gemfiles/modular/optional.gemfile" +eval_gemfile 'gemfiles/modular/optional.gemfile' ### Std Lib Extracted Gems -eval_gemfile "gemfiles/modular/x_std_libs.gemfile" +eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' # See unlocked_deps appraisal for more details on irb inclusion -gem "irb", "~> 1.17" # ruby >= 2.7 +gem 'irb', '~> 1.17' # ruby >= 2.7 diff --git a/gems/ruby-merge/Gemfile.lock b/gems/ruby-merge/Gemfile.lock index 20e81b32e..41ee3562d 100644 --- a/gems/ruby-merge/Gemfile.lock +++ b/gems/ruby-merge/Gemfile.lock @@ -16,262 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.0) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -309,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -323,6 +61,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -372,12 +111,21 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - kettle-dev (2.3.6) + kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -396,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -536,23 +283,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -586,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -637,45 +381,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -686,59 +408,38 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0.0) ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -751,27 +452,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) - kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae - kettle-drift (1.0.5) - kettle-jem (7.1.0) + kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.0) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -786,14 +479,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -801,7 +490,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -833,15 +521,14 @@ 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -855,19 +542,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -875,7 +557,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ruby-merge/Rakefile b/gems/ruby-merge/Rakefile index c7b8a4b9e..c528d41ee 100644 --- a/gems/ruby-merge/Rakefile +++ b/gems/ruby-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require "kettle/drift" + require 'kettle/drift' Kettle::Drift.install_tasks rescue LoadError - desc("(stub) kettle:drift:check is unavailable") - task("kettle:drift:check") do + desc('(stub) kettle:drift:check is unavailable') + task('kettle:drift:check') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:update is unavailable") - task("kettle:drift:update") do + desc('(stub) kettle:drift:update is unavailable') + task('kettle:drift:update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:force_update is unavailable") - task("kettle:drift:force_update") do + desc('(stub) kettle:drift:force_update is unavailable') + task('kettle:drift:force_update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift is unavailable") - task("kettle:drift" => "kettle:drift:update") + desc('(stub) kettle:drift is unavailable') + task('kettle:drift' => 'kettle:drift:update') end ### TEMPLATING TASKS diff --git a/gems/ruby-merge/bin/yard b/gems/ruby-merge/bin/yard index a7e8b6eed..5d516ad6f 100755 --- a/gems/ruby-merge/bin/yard +++ b/gems/ruby-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec("bundle", "exec", "rake", "yard") +exec('bundle', 'exec', 'rake', 'yard') diff --git a/gems/ruby-merge/lib/ruby/merge/version.rb b/gems/ruby-merge/lib/ruby/merge/version.rb index 0dcd005a5..d88eae0c6 100644 --- a/gems/ruby-merge/lib/ruby/merge/version.rb +++ b/gems/ruby-merge/lib/ruby/merge/version.rb @@ -3,7 +3,7 @@ module Ruby module Merge module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/toml-merge/Gemfile.lock b/gems/toml-merge/Gemfile.lock index 5f94594be..fb20412fa 100644 --- a/gems/toml-merge/Gemfile.lock +++ b/gems/toml-merge/Gemfile.lock @@ -16,6 +16,246 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -53,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -381,23 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -406,33 +684,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,19 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -479,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -490,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -517,9 +830,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -528,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -541,15 +858,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/typescript-merge/Gemfile.lock b/gems/typescript-merge/Gemfile.lock index f5a0a58a0..eac93e636 100644 --- a/gems/typescript-merge/Gemfile.lock +++ b/gems/typescript-merge/Gemfile.lock @@ -16,6 +16,264 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +285,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -103,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -131,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -322,11 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -373,22 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -397,32 +684,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -430,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -442,19 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -469,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -480,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -507,9 +830,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -518,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -531,6 +858,9 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f @@ -540,6 +870,7 @@ CHECKSUMS unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -547,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 2d088f94ebb2b16ccdcee17bdf36cba8f145bd7a Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 16:38:17 -0600 Subject: [PATCH 017/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/go-merge/Gemfile.lock | 377 +++---------------------------------- 1 file changed, 29 insertions(+), 348 deletions(-) diff --git a/gems/go-merge/Gemfile.lock b/gems/go-merge/Gemfile.lock index ede1d7ef4..2aef7021e 100644 --- a/gems/go-merge/Gemfile.lock +++ b/gems/go-merge/Gemfile.lock @@ -16,262 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.0) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -309,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -323,6 +61,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -372,12 +111,21 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - kettle-dev (2.3.6) + kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -396,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -536,23 +283,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -586,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -637,45 +381,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -684,61 +407,39 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -756,22 +457,15 @@ CHECKSUMS io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) - kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae - kettle-drift (1.0.5) - kettle-jem (7.1.0) + kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.0) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -786,14 +480,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -801,7 +491,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -829,19 +518,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -855,19 +542,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -875,7 +557,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 432172a36e9e838c20831050523b3757beaa1526 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 16:38:37 -0600 Subject: [PATCH 018/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-template/Gemfile.lock | 353 ++++++++++++++++++++++++++++- gems/binary-merge/Gemfile.lock | 351 +++++++++++++++++++++++++++- gems/go-merge/Gemfile.lock | 30 +-- gems/ruby-merge/Gemfile.lock | 322 ++++++++++++++++++++++++++ gems/rust-merge/.gitattributes | 2 +- gems/rust-merge/.kettle-drift.lock | 60 +++-- gems/rust-merge/Gemfile | 40 ++++ gems/rust-merge/Gemfile.lock | 326 +------------------------- gems/toml-merge/Gemfile.lock | 352 +--------------------------- 9 files changed, 1115 insertions(+), 721 deletions(-) diff --git a/gems/ast-template/Gemfile.lock b/gems/ast-template/Gemfile.lock index 40f3e46bb..16a8dbe07 100644 --- a/gems/ast-template/Gemfile.lock +++ b/gems/ast-template/Gemfile.lock @@ -15,6 +15,265 @@ PATH ast-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -26,11 +285,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -39,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -102,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -130,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -269,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -321,11 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -372,23 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -397,32 +684,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -430,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -442,19 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -469,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -480,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -507,9 +830,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -518,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -531,14 +858,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -546,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/binary-merge/Gemfile.lock b/gems/binary-merge/Gemfile.lock index 7d76fd19b..de0d55716 100644 --- a/gems/binary-merge/Gemfile.lock +++ b/gems/binary-merge/Gemfile.lock @@ -15,6 +15,265 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -34,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -97,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -125,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -264,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -313,11 +583,14 @@ GEM delegate (~> 0.1) rspec (~> 3.0) timecop (>= 0.7, < 1) - tree_haver (7.1.0) - citrus (~> 3.0) + token-resolver (2.0.4) parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -364,23 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -389,31 +684,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) + ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -421,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -433,19 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -460,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -471,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -498,9 +830,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -509,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -521,14 +857,20 @@ CHECKSUMS thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73 timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 + token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -536,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/go-merge/Gemfile.lock b/gems/go-merge/Gemfile.lock index 2aef7021e..06dc9202b 100644 --- a/gems/go-merge/Gemfile.lock +++ b/gems/go-merge/Gemfile.lock @@ -16,24 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -45,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -335,6 +322,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -381,7 +373,6 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - ast-merge! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) debug (>= 1.1) @@ -411,7 +402,6 @@ DEPENDENCIES standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - tree_haver! tree_sitter_language_pack! yaml-converter (~> 0.1) yard (~> 0.9, >= 0.9.44) diff --git a/gems/ruby-merge/Gemfile.lock b/gems/ruby-merge/Gemfile.lock index 41ee3562d..c0a5496d6 100644 --- a/gems/ruby-merge/Gemfile.lock +++ b/gems/ruby-merge/Gemfile.lock @@ -16,6 +16,246 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -53,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -381,23 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -408,31 +686,52 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0.0) ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,19 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -479,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -490,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -521,6 +834,8 @@ 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -529,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -542,14 +858,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/rust-merge/.gitattributes b/gems/rust-merge/.gitattributes index 0ac65aaa7..35a3c7359 100644 --- a/gems/rust-merge/.gitattributes +++ b/gems/rust-merge/.gitattributes @@ -1,5 +1,5 @@ # <> do not edit below this line -*.rb diff=smorg-ruby +*.rb diff=smorg-rb *.go diff=smorg-go *.rs diff=smorg-rs # <> diff --git a/gems/rust-merge/.kettle-drift.lock b/gems/rust-merge/.kettle-drift.lock index 9295a3562..628aa923c 100644 --- a/gems/rust-merge/.kettle-drift.lock +++ b/gems/rust-merge/.kettle-drift.lock @@ -4,7 +4,8 @@ "file": "Gemfile", "lines": [ 80, - 120 + 120, + 160 ] } ], @@ -13,7 +14,8 @@ "file": "Gemfile", "lines": [ 91, - 131 + 131, + 171 ] } ], @@ -22,7 +24,8 @@ "file": "Gemfile", "lines": [ 81, - 121 + 121, + 161 ] } ], @@ -31,7 +34,8 @@ "file": "Gemfile", "lines": [ 93, - 133 + 133, + 173 ] } ], @@ -40,7 +44,8 @@ "file": "Gemfile", "lines": [ 96, - 136 + 136, + 176 ] } ], @@ -49,7 +54,8 @@ "file": "Gemfile", "lines": [ 82, - 122 + 122, + 162 ] } ], @@ -59,7 +65,8 @@ "lines": [ 60, 100, - 140 + 140, + 180 ] } ], @@ -68,7 +75,8 @@ "file": "Gemfile", "lines": [ 101, - 141 + 141, + 181 ] } ], @@ -78,7 +86,8 @@ "lines": [ 43, 87, - 127 + 127, + 167 ] } ], @@ -87,7 +96,8 @@ "file": "Gemfile", "lines": [ 110, - 150 + 150, + 190 ] } ], @@ -97,7 +107,8 @@ "lines": [ 35, 79, - 119 + 119, + 159 ] } ], @@ -107,7 +118,8 @@ "lines": [ 69, 109, - 149 + 149, + 189 ] } ], @@ -116,7 +128,8 @@ "file": "Gemfile", "lines": [ 85, - 125 + 125, + 165 ] } ], @@ -126,7 +139,8 @@ "lines": [ 48, 92, - 132 + 132, + 172 ] } ], @@ -136,7 +150,8 @@ "lines": [ 44, 88, - 128 + 128, + 168 ] } ], @@ -145,7 +160,8 @@ "file": "Gemfile", "lines": [ 86, - 126 + 126, + 166 ] } ], @@ -154,7 +170,8 @@ "file": "Gemfile", "lines": [ 103, - 143 + 143, + 183 ] } ], @@ -163,7 +180,8 @@ "file": "Gemfile", "lines": [ 102, - 142 + 142, + 182 ] } ], @@ -172,7 +190,8 @@ "file": "Gemfile", "lines": [ 97, - 137 + 137, + 177 ] } ], @@ -181,7 +200,8 @@ "file": "Gemfile", "lines": [ 106, - 146 + 146, + 186 ] } ], diff --git a/gems/rust-merge/Gemfile b/gems/rust-merge/Gemfile index 7c986b6db..0dac6752c 100644 --- a/gems/rust-merge/Gemfile +++ b/gems/rust-merge/Gemfile @@ -152,6 +152,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/rust-merge/Gemfile.lock b/gems/rust-merge/Gemfile.lock index 511fd8e47..5226d608e 100644 --- a/gems/rust-merge/Gemfile.lock +++ b/gems/rust-merge/Gemfile.lock @@ -16,246 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -293,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -357,13 +111,11 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - kettle-dev (2.3.6) + kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -392,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -532,8 +283,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -586,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -637,45 +381,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -684,54 +406,33 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -739,7 +440,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +452,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) - kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) + kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +479,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +490,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,12 +517,10 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -844,7 +529,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -858,19 +542,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -878,7 +557,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/toml-merge/Gemfile.lock b/gems/toml-merge/Gemfile.lock index fb20412fa..ff9fbe5fb 100644 --- a/gems/toml-merge/Gemfile.lock +++ b/gems/toml-merge/Gemfile.lock @@ -16,264 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -285,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -293,12 +40,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -362,8 +103,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -392,7 +131,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -532,8 +270,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -586,11 +322,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -637,45 +373,22 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -684,54 +397,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -739,7 +430,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +442,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +469,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +480,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,12 +507,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -844,7 +518,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -858,19 +531,15 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -878,7 +547,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From dbecd4c45fc15bf848842b5e9d4db3cceeb4ad60 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 16:38:47 -0600 Subject: [PATCH 019/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-template/.kettle-drift.lock | 60 ++- gems/ast-template/Gemfile | 70 +++- gems/ast-template/Rakefile | 18 +- gems/ast-template/lib/ast/template/version.rb | 2 +- gems/binary-merge/.kettle-drift.lock | 60 ++- gems/binary-merge/Gemfile | 70 +++- gems/binary-merge/Rakefile | 18 +- gems/binary-merge/lib/binary/merge/version.rb | 2 +- gems/rust-merge/Gemfile.lock | 322 ++++++++++++++++ gems/typescript-merge/.gitattributes | 2 +- gems/typescript-merge/.kettle-drift.lock | 60 ++- gems/typescript-merge/Gemfile | 40 ++ gems/typescript-merge/Gemfile.lock | 326 +--------------- gems/zip-merge/Gemfile.lock | 351 +++++++++++++++++- 14 files changed, 966 insertions(+), 435 deletions(-) diff --git a/gems/ast-template/.kettle-drift.lock b/gems/ast-template/.kettle-drift.lock index 1dad17e1d..9878fb8f5 100644 --- a/gems/ast-template/.kettle-drift.lock +++ b/gems/ast-template/.kettle-drift.lock @@ -4,7 +4,8 @@ "file": "Gemfile", "lines": [ 79, - 119 + 119, + 159 ] } ], @@ -13,7 +14,8 @@ "file": "Gemfile", "lines": [ 90, - 130 + 130, + 170 ] } ], @@ -22,7 +24,8 @@ "file": "Gemfile", "lines": [ 80, - 120 + 120, + 160 ] } ], @@ -31,7 +34,8 @@ "file": "Gemfile", "lines": [ 92, - 132 + 132, + 172 ] } ], @@ -40,7 +44,8 @@ "file": "Gemfile", "lines": [ 95, - 135 + 135, + 175 ] } ], @@ -49,7 +54,8 @@ "file": "Gemfile", "lines": [ 81, - 121 + 121, + 161 ] } ], @@ -59,7 +65,8 @@ "lines": [ 59, 99, - 139 + 139, + 179 ] } ], @@ -68,7 +75,8 @@ "file": "Gemfile", "lines": [ 100, - 140 + 140, + 180 ] } ], @@ -78,7 +86,8 @@ "lines": [ 42, 86, - 126 + 126, + 166 ] } ], @@ -87,7 +96,8 @@ "file": "Gemfile", "lines": [ 109, - 149 + 149, + 189 ] } ], @@ -97,7 +107,8 @@ "lines": [ 34, 78, - 118 + 118, + 158 ] } ], @@ -107,7 +118,8 @@ "lines": [ 68, 108, - 148 + 148, + 188 ] } ], @@ -116,7 +128,8 @@ "file": "Gemfile", "lines": [ 84, - 124 + 124, + 164 ] } ], @@ -126,7 +139,8 @@ "lines": [ 47, 91, - 131 + 131, + 171 ] } ], @@ -136,7 +150,8 @@ "lines": [ 43, 87, - 127 + 127, + 167 ] } ], @@ -145,7 +160,8 @@ "file": "Gemfile", "lines": [ 85, - 125 + 125, + 165 ] } ], @@ -154,7 +170,8 @@ "file": "Gemfile", "lines": [ 102, - 142 + 142, + 182 ] } ], @@ -163,7 +180,8 @@ "file": "Gemfile", "lines": [ 101, - 141 + 141, + 181 ] } ], @@ -172,7 +190,8 @@ "file": "Gemfile", "lines": [ 96, - 136 + 136, + 176 ] } ], @@ -181,7 +200,8 @@ "file": "Gemfile", "lines": [ 105, - 145 + 145, + 185 ] } ], diff --git a/gems/ast-template/Gemfile b/gems/ast-template/Gemfile index e75f45831..7122a637a 100644 --- a/gems/ast-template/Gemfile +++ b/gems/ast-template/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source 'https://gem.coop' +source "https://gem.coop" git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,17 +19,61 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ['~> 1.0', '>= 1.0.8'] -gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ["~> 1.0", ">= 1.0.8"] +gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ast-merge ] -direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') +direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? + +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) + direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") + direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == "nomono" } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + if nomono_locked + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] + end + end + Kernel.send(:gem, "nomono", *nomono_activation_requirements) + require "nomono/bundler" + if direct_sibling_templating && !direct_sibling_local + ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + end + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: "STRUCTUREDMERGE", + path_env: "STRUCTUREDMERGE_DEV", + root: ["src", "my", "structuredmerge"] + ) + rescue LoadError + warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + else + ENV.delete("STRUCTUREDMERGE_DEV") + end + end + end +end if direct_sibling_gems.any? && (direct_sibling_local || @@ -169,25 +213,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? # Debugging -eval_gemfile 'gemfiles/modular/debug.gemfile' +eval_gemfile "gemfiles/modular/debug.gemfile" # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile 'gemfiles/modular/coverage.gemfile' +eval_gemfile "gemfiles/modular/coverage.gemfile" # Linting -eval_gemfile 'gemfiles/modular/style.gemfile' +eval_gemfile "gemfiles/modular/style.gemfile" # Documentation -eval_gemfile 'gemfiles/modular/documentation.gemfile' +eval_gemfile "gemfiles/modular/documentation.gemfile" # Optional -eval_gemfile 'gemfiles/modular/optional.gemfile' +eval_gemfile "gemfiles/modular/optional.gemfile" ### Std Lib Extracted Gems -eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' +eval_gemfile "gemfiles/modular/x_std_libs.gemfile" # See unlocked_deps appraisal for more details on irb inclusion -gem 'irb', '~> 1.17' # ruby >= 2.7 +gem "irb", "~> 1.17" # ruby >= 2.7 diff --git a/gems/ast-template/Rakefile b/gems/ast-template/Rakefile index 1da755b67..193fad244 100644 --- a/gems/ast-template/Rakefile +++ b/gems/ast-template/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require 'kettle/drift' + require "kettle/drift" Kettle::Drift.install_tasks rescue LoadError - desc('(stub) kettle:drift:check is unavailable') - task('kettle:drift:check') do + desc("(stub) kettle:drift:check is unavailable") + task("kettle:drift:check") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:update is unavailable') - task('kettle:drift:update') do + desc("(stub) kettle:drift:update is unavailable") + task("kettle:drift:update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:force_update is unavailable') - task('kettle:drift:force_update') do + desc("(stub) kettle:drift:force_update is unavailable") + task("kettle:drift:force_update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift is unavailable') - task('kettle:drift' => 'kettle:drift:update') + desc("(stub) kettle:drift is unavailable") + task("kettle:drift" => "kettle:drift:update") end ### TEMPLATING TASKS diff --git a/gems/ast-template/lib/ast/template/version.rb b/gems/ast-template/lib/ast/template/version.rb index 0e1e7cf5d..2cf6f7536 100644 --- a/gems/ast-template/lib/ast/template/version.rb +++ b/gems/ast-template/lib/ast/template/version.rb @@ -3,7 +3,7 @@ module Ast module Template module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/binary-merge/.kettle-drift.lock b/gems/binary-merge/.kettle-drift.lock index 9878fb8f5..508d631d8 100644 --- a/gems/binary-merge/.kettle-drift.lock +++ b/gems/binary-merge/.kettle-drift.lock @@ -5,7 +5,8 @@ "lines": [ 79, 119, - 159 + 159, + 199 ] } ], @@ -15,7 +16,8 @@ "lines": [ 90, 130, - 170 + 170, + 210 ] } ], @@ -25,7 +27,8 @@ "lines": [ 80, 120, - 160 + 160, + 200 ] } ], @@ -35,7 +38,8 @@ "lines": [ 92, 132, - 172 + 172, + 212 ] } ], @@ -45,7 +49,8 @@ "lines": [ 95, 135, - 175 + 175, + 215 ] } ], @@ -55,7 +60,8 @@ "lines": [ 81, 121, - 161 + 161, + 201 ] } ], @@ -66,7 +72,8 @@ 59, 99, 139, - 179 + 179, + 219 ] } ], @@ -76,7 +83,8 @@ "lines": [ 100, 140, - 180 + 180, + 220 ] } ], @@ -87,7 +95,8 @@ 42, 86, 126, - 166 + 166, + 206 ] } ], @@ -97,7 +106,8 @@ "lines": [ 109, 149, - 189 + 189, + 229 ] } ], @@ -108,7 +118,8 @@ 34, 78, 118, - 158 + 158, + 198 ] } ], @@ -119,7 +130,8 @@ 68, 108, 148, - 188 + 188, + 228 ] } ], @@ -129,7 +141,8 @@ "lines": [ 84, 124, - 164 + 164, + 204 ] } ], @@ -140,7 +153,8 @@ 47, 91, 131, - 171 + 171, + 211 ] } ], @@ -151,7 +165,8 @@ 43, 87, 127, - 167 + 167, + 207 ] } ], @@ -161,7 +176,8 @@ "lines": [ 85, 125, - 165 + 165, + 205 ] } ], @@ -171,7 +187,8 @@ "lines": [ 102, 142, - 182 + 182, + 222 ] } ], @@ -181,7 +198,8 @@ "lines": [ 101, 141, - 181 + 181, + 221 ] } ], @@ -191,7 +209,8 @@ "lines": [ 96, 136, - 176 + 176, + 216 ] } ], @@ -201,7 +220,8 @@ "lines": [ 105, 145, - 185 + 185, + 225 ] } ], diff --git a/gems/binary-merge/Gemfile b/gems/binary-merge/Gemfile index 156002edc..07044dfe9 100644 --- a/gems/binary-merge/Gemfile +++ b/gems/binary-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source 'https://gem.coop' +source "https://gem.coop" git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,17 +19,61 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ['~> 1.0', '>= 1.0.8'] -gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ["~> 1.0", ">= 1.0.8"] +gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ tree_haver ] -direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') +direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? + +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) + direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") + direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == "nomono" } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + if nomono_locked + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] + end + end + Kernel.send(:gem, "nomono", *nomono_activation_requirements) + require "nomono/bundler" + if direct_sibling_templating && !direct_sibling_local + ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + end + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: "STRUCTUREDMERGE", + path_env: "STRUCTUREDMERGE_DEV", + root: ["src", "my", "structuredmerge"] + ) + rescue LoadError + warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + else + ENV.delete("STRUCTUREDMERGE_DEV") + end + end + end +end if direct_sibling_gems.any? && (direct_sibling_local || @@ -209,25 +253,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? # Debugging -eval_gemfile 'gemfiles/modular/debug.gemfile' +eval_gemfile "gemfiles/modular/debug.gemfile" # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile 'gemfiles/modular/coverage.gemfile' +eval_gemfile "gemfiles/modular/coverage.gemfile" # Linting -eval_gemfile 'gemfiles/modular/style.gemfile' +eval_gemfile "gemfiles/modular/style.gemfile" # Documentation -eval_gemfile 'gemfiles/modular/documentation.gemfile' +eval_gemfile "gemfiles/modular/documentation.gemfile" # Optional -eval_gemfile 'gemfiles/modular/optional.gemfile' +eval_gemfile "gemfiles/modular/optional.gemfile" ### Std Lib Extracted Gems -eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' +eval_gemfile "gemfiles/modular/x_std_libs.gemfile" # See unlocked_deps appraisal for more details on irb inclusion -gem 'irb', '~> 1.17' # ruby >= 2.7 +gem "irb", "~> 1.17" # ruby >= 2.7 diff --git a/gems/binary-merge/Rakefile b/gems/binary-merge/Rakefile index b29d3a04b..ea4ce831d 100644 --- a/gems/binary-merge/Rakefile +++ b/gems/binary-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require 'kettle/drift' + require "kettle/drift" Kettle::Drift.install_tasks rescue LoadError - desc('(stub) kettle:drift:check is unavailable') - task('kettle:drift:check') do + desc("(stub) kettle:drift:check is unavailable") + task("kettle:drift:check") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:update is unavailable') - task('kettle:drift:update') do + desc("(stub) kettle:drift:update is unavailable") + task("kettle:drift:update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:force_update is unavailable') - task('kettle:drift:force_update') do + desc("(stub) kettle:drift:force_update is unavailable") + task("kettle:drift:force_update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift is unavailable') - task('kettle:drift' => 'kettle:drift:update') + desc("(stub) kettle:drift is unavailable") + task("kettle:drift" => "kettle:drift:update") end ### TEMPLATING TASKS diff --git a/gems/binary-merge/lib/binary/merge/version.rb b/gems/binary-merge/lib/binary/merge/version.rb index d8ae92dfa..bb78df888 100644 --- a/gems/binary-merge/lib/binary/merge/version.rb +++ b/gems/binary-merge/lib/binary/merge/version.rb @@ -3,7 +3,7 @@ module Binary module Merge module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/rust-merge/Gemfile.lock b/gems/rust-merge/Gemfile.lock index 5226d608e..59af6b662 100644 --- a/gems/rust-merge/Gemfile.lock +++ b/gems/rust-merge/Gemfile.lock @@ -16,6 +16,246 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -53,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -381,23 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -406,33 +684,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,19 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -479,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -490,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -517,10 +830,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -529,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -542,14 +858,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/typescript-merge/.gitattributes b/gems/typescript-merge/.gitattributes index 0ac65aaa7..35a3c7359 100644 --- a/gems/typescript-merge/.gitattributes +++ b/gems/typescript-merge/.gitattributes @@ -1,5 +1,5 @@ # <> do not edit below this line -*.rb diff=smorg-ruby +*.rb diff=smorg-rb *.go diff=smorg-go *.rs diff=smorg-rs # <> diff --git a/gems/typescript-merge/.kettle-drift.lock b/gems/typescript-merge/.kettle-drift.lock index 9295a3562..628aa923c 100644 --- a/gems/typescript-merge/.kettle-drift.lock +++ b/gems/typescript-merge/.kettle-drift.lock @@ -4,7 +4,8 @@ "file": "Gemfile", "lines": [ 80, - 120 + 120, + 160 ] } ], @@ -13,7 +14,8 @@ "file": "Gemfile", "lines": [ 91, - 131 + 131, + 171 ] } ], @@ -22,7 +24,8 @@ "file": "Gemfile", "lines": [ 81, - 121 + 121, + 161 ] } ], @@ -31,7 +34,8 @@ "file": "Gemfile", "lines": [ 93, - 133 + 133, + 173 ] } ], @@ -40,7 +44,8 @@ "file": "Gemfile", "lines": [ 96, - 136 + 136, + 176 ] } ], @@ -49,7 +54,8 @@ "file": "Gemfile", "lines": [ 82, - 122 + 122, + 162 ] } ], @@ -59,7 +65,8 @@ "lines": [ 60, 100, - 140 + 140, + 180 ] } ], @@ -68,7 +75,8 @@ "file": "Gemfile", "lines": [ 101, - 141 + 141, + 181 ] } ], @@ -78,7 +86,8 @@ "lines": [ 43, 87, - 127 + 127, + 167 ] } ], @@ -87,7 +96,8 @@ "file": "Gemfile", "lines": [ 110, - 150 + 150, + 190 ] } ], @@ -97,7 +107,8 @@ "lines": [ 35, 79, - 119 + 119, + 159 ] } ], @@ -107,7 +118,8 @@ "lines": [ 69, 109, - 149 + 149, + 189 ] } ], @@ -116,7 +128,8 @@ "file": "Gemfile", "lines": [ 85, - 125 + 125, + 165 ] } ], @@ -126,7 +139,8 @@ "lines": [ 48, 92, - 132 + 132, + 172 ] } ], @@ -136,7 +150,8 @@ "lines": [ 44, 88, - 128 + 128, + 168 ] } ], @@ -145,7 +160,8 @@ "file": "Gemfile", "lines": [ 86, - 126 + 126, + 166 ] } ], @@ -154,7 +170,8 @@ "file": "Gemfile", "lines": [ 103, - 143 + 143, + 183 ] } ], @@ -163,7 +180,8 @@ "file": "Gemfile", "lines": [ 102, - 142 + 142, + 182 ] } ], @@ -172,7 +190,8 @@ "file": "Gemfile", "lines": [ 97, - 137 + 137, + 177 ] } ], @@ -181,7 +200,8 @@ "file": "Gemfile", "lines": [ 106, - 146 + 146, + 186 ] } ], diff --git a/gems/typescript-merge/Gemfile b/gems/typescript-merge/Gemfile index 98fb6890e..069beba9a 100644 --- a/gems/typescript-merge/Gemfile +++ b/gems/typescript-merge/Gemfile @@ -152,6 +152,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/typescript-merge/Gemfile.lock b/gems/typescript-merge/Gemfile.lock index eac93e636..8ad22f238 100644 --- a/gems/typescript-merge/Gemfile.lock +++ b/gems/typescript-merge/Gemfile.lock @@ -16,246 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -293,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -357,13 +111,11 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - kettle-dev (2.3.6) + kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -392,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -532,8 +283,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -586,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -637,45 +381,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -684,54 +406,33 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -739,7 +440,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +452,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) - kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) + kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +479,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +490,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,12 +517,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -844,7 +528,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -858,9 +541,6 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f @@ -870,7 +550,6 @@ CHECKSUMS unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -878,7 +557,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/zip-merge/Gemfile.lock b/gems/zip-merge/Gemfile.lock index b8658f0b2..153732b30 100644 --- a/gems/zip-merge/Gemfile.lock +++ b/gems/zip-merge/Gemfile.lock @@ -15,6 +15,265 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -34,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -97,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -125,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -264,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -313,11 +583,14 @@ GEM delegate (~> 0.1) rspec (~> 3.0) timecop (>= 0.7, < 1) - tree_haver (7.1.0) - citrus (~> 3.0) + token-resolver (2.0.4) parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -364,22 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -388,12 +684,19 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) @@ -407,12 +710,28 @@ CHECKSUMS ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) + ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -420,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -432,19 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -459,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -470,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -497,9 +830,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -508,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -520,14 +857,20 @@ CHECKSUMS thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73 timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 + token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd From 929cd21b4f1a3fd26dac4f64f1ae822bcfce490c Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 16:38:58 -0600 Subject: [PATCH 020/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-template/.gitattributes | 2 +- gems/ast-template/.rubocop_gradual.lock | 315 ---------------- gems/ast-template/Gemfile | 68 ++-- gems/ast-template/Gemfile.lock | 59 ++- gems/ast-template/Rakefile | 18 +- gems/ast-template/lib/ast/template/version.rb | 2 +- gems/binary-merge/.gitattributes | 2 +- gems/binary-merge/Gemfile | 68 ++-- gems/binary-merge/Gemfile.lock | 342 +---------------- gems/binary-merge/Rakefile | 18 +- gems/binary-merge/lib/binary/merge/version.rb | 2 +- gems/psych-merge/Gemfile.lock | 354 +++++++++++++++++- gems/rust-merge/Gemfile.lock | 352 +---------------- gems/typescript-merge/Gemfile.lock | 322 ++++++++++++++++ 14 files changed, 788 insertions(+), 1136 deletions(-) delete mode 100644 gems/ast-template/.rubocop_gradual.lock diff --git a/gems/ast-template/.gitattributes b/gems/ast-template/.gitattributes index 0ac65aaa7..35a3c7359 100644 --- a/gems/ast-template/.gitattributes +++ b/gems/ast-template/.gitattributes @@ -1,5 +1,5 @@ # <> do not edit below this line -*.rb diff=smorg-ruby +*.rb diff=smorg-rb *.go diff=smorg-go *.rs diff=smorg-rs # <> diff --git a/gems/ast-template/.rubocop_gradual.lock b/gems/ast-template/.rubocop_gradual.lock deleted file mode 100644 index 032ac1f2a..000000000 --- a/gems/ast-template/.rubocop_gradual.lock +++ /dev/null @@ -1,315 +0,0 @@ -{ - ".simplecov:3875640430": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:2781279821": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "ast-template.gemspec:3753841817": [ - [127, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [142, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [143, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [150, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/ast-template.rb:1768837856": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`ast-template.rb`) should use snake_case.", 5381] - ], - "lib/ast/template.rb:2086842713": [ - [10, 3, 15, "Style/Documentation: Missing top-level documentation comment for `module Ast::Template`.", 1853069487], - [10, 3, 62364, "Metrics/ModuleLength: Module has too many lines. [1391/100]", 2978788318], - [31, 5, 61575, "Metrics/ClassLength: Class has too many lines. [1370/100]", 1675855509], - [32, 7, 656, "Metrics/MethodLength: Method has too many lines. [12/10]", 4176787264], - [47, 7, 1248, "Metrics/AbcSize: Assignment Branch Condition size for `readme_family_token_values` is too high. [<17, 31, 5> 35.71/17]", 2414018706], - [47, 7, 1248, "Metrics/MethodLength: Method has too many lines. [21/10]", 2414018706], - [78, 7, 915, "Metrics/MethodLength: Method has too many lines. [18/10]", 788116683], - [108, 7, 624, "Metrics/MethodLength: Method has too many lines. [14/10]", 3152255782], - [125, 7, 1499, "Metrics/AbcSize: Assignment Branch Condition size for `run_readme_family_sections_for_package_directories` is too high. [<10, 27, 6> 29.41/17]", 44972847], - [125, 7, 1499, "Metrics/MethodLength: Method has too many lines. [35/10]", 44972847], - [133, 9, 1138, "Metrics/BlockLength: Block has too many lines. [26/25]", 3835793651], - [164, 7, 540, "Metrics/MethodLength: Method has too many lines. [14/10]", 1455912513], - [198, 7, 2052, "Metrics/AbcSize: Assignment Branch Condition size for `default_family_merge_adapter_registry` is too high. [<14, 39, 10> 42.63/17]", 2278087573], - [198, 7, 2052, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `default_family_merge_adapter_registry` is too high. [11/7]", 2278087573], - [198, 7, 2052, "Metrics/MethodLength: Method has too many lines. [56/10]", 2278087573], - [198, 7, 2052, "Metrics/PerceivedComplexity: Perceived complexity for `default_family_merge_adapter_registry` is too high. [11/8]", 2278087573], - [224, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [226, 13, 16, "Lint/SuppressedException: Do not suppress exceptions.", 1026572812], - [236, 11, 16, "Lint/SuppressedException: Do not suppress exceptions.", 1026572812], - [251, 13, 16, "Lint/SuppressedException: Do not suppress exceptions.", 1026572812], - [269, 59, 158, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1840084196], - [270, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087867783], - [283, 7, 585, "Metrics/MethodLength: Method has too many lines. [11/10]", 3906693384], - [283, 56, 172, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 331060096], - [284, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1674317416], - [298, 7, 591, "Metrics/MethodLength: Method has too many lines. [11/10]", 3516005727], - [298, 58, 174, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1025179136], - [299, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 254853645], - [313, 7, 685, "Metrics/MethodLength: Method has too many lines. [12/10]", 3467399181], - [313, 70, 179, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2059101405], - [314, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 2061684677], - [329, 7, 618, "Metrics/MethodLength: Method has too many lines. [11/10]", 2401761450], - [329, 78, 201, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 4235690185], - [330, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 1064263543], - [364, 55, 164, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2487000221], - [365, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3119702098], - [378, 63, 186, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2803525897], - [379, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 2696213732], - [399, 7, 855, "Metrics/MethodLength: Method has too many lines. [21/10]", 1805387058], - [399, 68, 191, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2632809545], - [400, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 4190793949], - [424, 7, 942, "Metrics/MethodLength: Method has too many lines. [22/10]", 3830329170], - [424, 87, 210, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 3023644425], - [425, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 517767074], - [450, 7, 1847, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_session_status` is too high. [<14, 49, 27> 57.67/17]", 4110228676], - [450, 7, 1847, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_directory_session_status` is too high. [27/7]", 4110228676], - [450, 7, 1847, "Metrics/MethodLength: Method has too many lines. [26/10]", 4110228676], - [450, 7, 1847, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_directory_session_status` is too high. [27/8]", 4110228676], - [471, 18, 1, "Style/DoubleNegation: Avoid the use of double negation (`!!`).", 177540], - [488, 7, 639, "Metrics/MethodLength: Method has too many lines. [11/10]", 1159346913], - [503, 7, 2247, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_session_diagnostics` is too high. [<12, 46, 28> 55.17/17]", 42314578], - [503, 7, 2247, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_directory_session_diagnostics` is too high. [26/7]", 42314578], - [503, 7, 2247, "Metrics/MethodLength: Method has too many lines. [44/10]", 42314578], - [503, 7, 2247, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_directory_session_diagnostics` is too high. [26/8]", 42314578], - [515, 23, 1380, "Metrics/BlockLength: Block has too many lines. [27/25]", 2686192500], - [543, 9, 11, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 848344986], - [560, 7, 669, "Metrics/MethodLength: Method has too many lines. [11/10]", 948308474], - [569, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085362375], - [575, 7, 721, "Metrics/MethodLength: Method has too many lines. [14/10]", 3970823326], - [575, 71, 194, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 3917828873], - [576, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 1017287714], - [593, 7, 921, "Metrics/MethodLength: Method has too many lines. [18/10]", 3608196218], - [593, 90, 213, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1024049097], - [593, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861341], - [594, 121, 59, "Layout/LineLength: Line is too long. [179/120]", 2535099243], - [623, 7, 1232, "Metrics/MethodLength: Method has too many lines. [33/10]", 2772161373], - [623, 67, 190, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 767991305], - [624, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 4114753948], - [660, 7, 1317, "Metrics/MethodLength: Method has too many lines. [26/10]", 3490333035], - [660, 86, 209, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1111567049], - [661, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 3056305766], - [690, 7, 1325, "Metrics/MethodLength: Method has too many lines. [26/10]", 4238651548], - [690, 88, 211, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 4054918473], - [691, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 172214443], - [720, 7, 1370, "Metrics/MethodLength: Method has too many lines. [37/10]", 2622224263], - [720, 76, 205, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3505072102], - [721, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 4014499349], - [761, 7, 1142, "Metrics/AbcSize: Assignment Branch Condition size for `run_template_directory_session_with_options` is too high. [<2, 28, 13> 30.94/17]", 4142644019], - [761, 7, 1142, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `run_template_directory_session_with_options` is too high. [14/7]", 4142644019], - [761, 7, 1142, "Metrics/MethodLength: Method has too many lines. [19/10]", 4142644019], - [761, 7, 1142, "Metrics/PerceivedComplexity: Perceived complexity for `run_template_directory_session_with_options` is too high. [14/8]", 4142644019], - [783, 7, 1053, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_session_options_configuration` is too high. [<3, 19, 5> 19.87/17]", 4149687719], - [783, 7, 1053, "Metrics/MethodLength: Method has too many lines. [24/10]", 4149687719], - [822, 7, 1015, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_session_profile_configuration` is too high. [<6, 17, 6> 19/17]", 3439042821], - [822, 7, 1015, "Metrics/MethodLength: Method has too many lines. [21/10]", 3439042821], - [846, 7, 741, "Metrics/MethodLength: Method has too many lines. [13/10]", 26059598], - [862, 7, 431, "Metrics/MethodLength: Method has too many lines. [12/10]", 2701838518], - [885, 7, 645, "Metrics/MethodLength: Method has too many lines. [11/10]", 4194104448], - [900, 7, 619, "Metrics/MethodLength: Method has too many lines. [12/10]", 1636858424], - [924, 7, 645, "Metrics/MethodLength: Method has too many lines. [11/10]", 1685536251], - [939, 7, 762, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `run_template_directory_session_runner_request` is too high. [8/7]", 1296256230], - [939, 7, 762, "Metrics/MethodLength: Method has too many lines. [16/10]", 1296256230], - [967, 7, 680, "Metrics/MethodLength: Method has too many lines. [11/10]", 2612182881], - [976, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3937819337], - [982, 7, 2608, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_session_runner_input` is too high. [<14, 56, 37> 68.56/17]", 1118646956], - [982, 7, 2608, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_directory_session_runner_input` is too high. [36/7]", 1118646956], - [982, 7, 2608, "Metrics/MethodLength: Method has too many lines. [42/10]", 1118646956], - [982, 7, 2608, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_directory_session_runner_input` is too high. [36/8]", 1118646956], - [1015, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4185298420], - [1028, 7, 1841, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_session_runner_payload` is too high. [<6, 34, 26> 43.22/17]", 668498009], - [1028, 7, 1841, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_directory_session_runner_payload` is too high. [25/7]", 668498009], - [1028, 7, 1841, "Metrics/MethodLength: Method has too many lines. [29/10]", 668498009], - [1028, 7, 1841, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_directory_session_runner_payload` is too high. [27/8]", 668498009], - [1052, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 838260297], - [1078, 7, 680, "Metrics/MethodLength: Method has too many lines. [11/10]", 1786285601], - [1087, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3937819337], - [1093, 7, 727, "Metrics/MethodLength: Method has too many lines. [17/10]", 2883184841], - [1115, 7, 793, "Metrics/MethodLength: Method has too many lines. [21/10]", 3728759813], - [1153, 7, 2638, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_session_inspection` is too high. [<6, 37, 2> 37.54/17]", 2423723700], - [1153, 7, 2638, "Metrics/MethodLength: Method has too many lines. [66/10]", 2423723700], - [1233, 7, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 835919808], - [1242, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193343749], - [1248, 7, 639, "Metrics/MethodLength: Method has too many lines. [16/10]", 890869399], - [1279, 7, 1321, "Metrics/AbcSize: Assignment Branch Condition size for `run_template_directory_session_command_payload` is too high. [<1, 27, 12> 29.56/17]", 268857423], - [1279, 7, 1321, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `run_template_directory_session_command_payload` is too high. [13/7]", 268857423], - [1279, 7, 1321, "Metrics/MethodLength: Method has too many lines. [20/10]", 268857423], - [1279, 7, 1321, "Metrics/PerceivedComplexity: Perceived complexity for `run_template_directory_session_command_payload` is too high. [13/8]", 268857423], - [1295, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2272443568], - [1319, 7, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 3409839974], - [1328, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193343749], - [1342, 7, 645, "Metrics/MethodLength: Method has too many lines. [11/10]", 2481445197], - [1365, 7, 685, "Metrics/MethodLength: Method has too many lines. [11/10]", 807027808], - [1374, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1225026887], - [1388, 7, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 1570524606], - [1397, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193343749], - [1403, 7, 589, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_session_request_from_runner_request` is too high. [8/7]", 1923077466], - [1403, 7, 589, "Metrics/MethodLength: Method has too many lines. [11/10]", 1923077466], - [1418, 7, 1803, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_template_directory_session_options` is too high. [<3, 38, 28> 47.3/17]", 319878734], - [1418, 7, 1803, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `resolve_template_directory_session_options` is too high. [29/7]", 319878734], - [1418, 7, 1803, "Metrics/MethodLength: Method has too many lines. [22/10]", 319878734], - [1418, 7, 1803, "Metrics/PerceivedComplexity: Perceived complexity for `resolve_template_directory_session_options` is too high. [29/8]", 319878734], - [1458, 7, 1357, "Metrics/AbcSize: Assignment Branch Condition size for `replace_or_insert_markdown_heading_section` is too high. [<18, 33, 18> 41.68/17]", 812459935], - [1458, 7, 1357, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `replace_or_insert_markdown_heading_section` is too high. [12/7]", 812459935], - [1458, 7, 1357, "Metrics/MethodLength: Method has too many lines. [26/10]", 812459935], - [1458, 7, 1357, "Metrics/PerceivedComplexity: Perceived complexity for `replace_or_insert_markdown_heading_section` is too high. [12/8]", 812459935], - [1494, 7, 456, "Metrics/AbcSize: Assignment Branch Condition size for `readme_family_section_insert_index` is too high. [<5, 9, 14> 17.38/17]", 252997882], - [1494, 7, 456, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `readme_family_section_insert_index` is too high. [8/7]", 252997882], - [1494, 7, 456, "Metrics/MethodLength: Method has too many lines. [13/10]", 252997882] - ], - "spec/session_integration_spec.rb:1063469608": [ - [5, 1, 89793, "Metrics/BlockLength: Block has too many lines. [1761/25]", 3162725061], - [31, 3, 612, "Metrics/MethodLength: Method has too many lines. [16/10]", 1402311658], - [50, 3, 2970, "Metrics/BlockLength: Block has too many lines. [60/25]", 2848879838], - [118, 3, 1748, "Metrics/BlockLength: Block has too many lines. [40/25]", 3276283317], - [164, 3, 1582, "Metrics/BlockLength: Block has too many lines. [37/25]", 4190998336], - [237, 3, 2325, "Metrics/BlockLength: Block has too many lines. [51/25]", 3352569469], - [295, 3, 1789, "Metrics/BlockLength: Block has too many lines. [38/25]", 1947005133], - [339, 3, 1944, "Metrics/BlockLength: Block has too many lines. [41/25]", 3993685201], - [386, 3, 1807, "Metrics/BlockLength: Block has too many lines. [38/25]", 4257675897], - [452, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 561412382], - [457, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], - [472, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 561412382], - [477, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2088089918], - [485, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087412612], - [490, 3, 1758, "Metrics/BlockLength: Block has too many lines. [37/25]", 1520782676], - [548, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], - [554, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1246048068], - [560, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [573, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1246048068], - [578, 3, 1812, "Metrics/BlockLength: Block has too many lines. [39/25]", 1709538088], - [623, 3, 1428, "Metrics/BlockLength: Block has too many lines. [31/25]", 4067408447], - [660, 3, 1975, "Metrics/BlockLength: Block has too many lines. [49/25]", 432162268], - [716, 3, 1902, "Metrics/BlockLength: Block has too many lines. [45/25]", 2326466404], - [770, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 703289421], - [797, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 703289421], - [818, 3, 1462, "Metrics/BlockLength: Block has too many lines. [35/25]", 1648309772], - [860, 3, 1466, "Metrics/BlockLength: Block has too many lines. [31/25]", 3549227194], - [898, 3, 1656, "Metrics/BlockLength: Block has too many lines. [36/25]", 2643926725], - [956, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], - [963, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2382627530], - [968, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [985, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2382627530], - [990, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114085752], - [998, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3868965366], - [1004, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3135429041], - [1011, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 2121600243], - [1016, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3948574204], - [1034, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 2121600243], - [1038, 3, 1281, "Metrics/BlockLength: Block has too many lines. [31/25]", 1507281102], - [1076, 3, 1329, "Metrics/BlockLength: Block has too many lines. [31/25]", 3185120887], - [1114, 3, 1680, "Metrics/BlockLength: Block has too many lines. [36/25]", 2250099450], - [1115, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193424063], - [1158, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114085752], - [1166, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3868965366], - [1172, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3135429041], - [1179, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 2121600243], - [1184, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3948574204], - [1202, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 2121600243], - [1206, 3, 1628, "Metrics/BlockLength: Block has too many lines. [36/25]", 4066832477], - [1249, 3, 1267, "Metrics/BlockLength: Block has too many lines. [31/25]", 488100020], - [1287, 3, 1404, "Metrics/BlockLength: Block has too many lines. [36/25]", 2415041159], - [1330, 3, 1970, "Metrics/BlockLength: Block has too many lines. [38/25]", 1463232713], - [1376, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193407726], - [1384, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193406689], - [1390, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087900170], - [1397, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 414784060], - [1402, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179046083], - [1419, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 414784060], - [1540, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], - [1547, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2382627530], - [1552, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [1569, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2382627530], - [1574, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1621973742], - [1582, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1297498406], - [1588, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 2665434363], - [1595, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1334260795], - [1600, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193407726], - [1608, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193406689], - [1614, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087900170], - [1621, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 414784060], - [1626, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179046083], - [1644, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 414784060], - [1649, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3197516464], - [1667, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1334260795], - [1717, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193407726], - [1725, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193406689], - [1731, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087900170], - [1738, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 414784060], - [1743, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179046083], - [1760, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 414784060], - [1868, 3, 442, "Metrics/AbcSize: Assignment Branch Condition size for `options_with_resolved_fixture_paths` is too high. [<3, 18, 2> 18.36/17]", 13098503], - [1879, 3, 878, "Metrics/AbcSize: Assignment Branch Condition size for `runner_request_with_resolved_fixture_paths` is too high. [<7, 36, 6> 37.16/17]", 2279422631], - [1879, 3, 878, "Metrics/MethodLength: Method has too many lines. [20/10]", 2279422631], - [1902, 3, 449, "Metrics/AbcSize: Assignment Branch Condition size for `runner_payload_with_resolved_fixture_paths` is too high. [<3, 18, 2> 18.36/17]", 1041394699], - [1948, 3, 932, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_session_inspection_expected_paths` is too high. [<4, 24, 6> 25.06/17]", 616473516], - [1948, 3, 932, "Metrics/MethodLength: Method has too many lines. [17/10]", 616473516], - [2015, 3, 679, "Metrics/AbcSize: Assignment Branch Condition size for `invocation_with_resolved_fixture_paths` is too high. [<5, 20, 4> 21/17]", 2866326769], - [2015, 3, 679, "Metrics/MethodLength: Method has too many lines. [12/10]", 2866326769] - ] -} diff --git a/gems/ast-template/Gemfile b/gems/ast-template/Gemfile index 7122a637a..934d087ac 100644 --- a/gems/ast-template/Gemfile +++ b/gems/ast-template/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source "https://gem.coop" +source 'https://gem.coop' git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,57 +19,53 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ["~> 1.0", ">= 1.0.8"] -gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ['~> 1.0', '>= 1.0.8'] +gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ast-merge ] -direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") +direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? if direct_sibling_gems.any? && - (direct_sibling_local || - ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) - direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") - direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) begin nomono_activation_requirements = nomono_requirements - nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) if File.file?(nomono_lockfile) nomono_locked_spec = Bundler::LockfileParser - .new(Bundler.read_file(nomono_lockfile)) - .specs - .find { |spec| spec.name == "nomono" } + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } nomono_locked = nomono_locked_spec && - Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) - if nomono_locked - nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] - end - end - Kernel.send(:gem, "nomono", *nomono_activation_requirements) - require "nomono/bundler" - if direct_sibling_templating && !direct_sibling_local - ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local eval_nomono_gems( gems: direct_sibling_gems, - prefix: "STRUCTUREDMERGE", - path_env: "STRUCTUREDMERGE_DEV", - root: ["src", "my", "structuredmerge"] + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] ) rescue LoadError - warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' ensure if direct_sibling_templating && !direct_sibling_local if direct_sibling_dev_was_set - ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original else - ENV.delete("STRUCTUREDMERGE_DEV") + ENV.delete('STRUCTUREDMERGE_DEV') end end end @@ -213,25 +209,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging -eval_gemfile "gemfiles/modular/debug.gemfile" +eval_gemfile 'gemfiles/modular/debug.gemfile' # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile "gemfiles/modular/coverage.gemfile" +eval_gemfile 'gemfiles/modular/coverage.gemfile' # Linting -eval_gemfile "gemfiles/modular/style.gemfile" +eval_gemfile 'gemfiles/modular/style.gemfile' # Documentation -eval_gemfile "gemfiles/modular/documentation.gemfile" +eval_gemfile 'gemfiles/modular/documentation.gemfile' # Optional -eval_gemfile "gemfiles/modular/optional.gemfile" +eval_gemfile 'gemfiles/modular/optional.gemfile' ### Std Lib Extracted Gems -eval_gemfile "gemfiles/modular/x_std_libs.gemfile" +eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' # See unlocked_deps appraisal for more details on irb inclusion -gem "irb", "~> 1.17" # ruby >= 2.7 +gem 'irb', '~> 1.17' # ruby >= 2.7 diff --git a/gems/ast-template/Gemfile.lock b/gems/ast-template/Gemfile.lock index 16a8dbe07..5d204f70e 100644 --- a/gems/ast-template/Gemfile.lock +++ b/gems/ast-template/Gemfile.lock @@ -265,6 +265,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.0) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -307,7 +323,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -362,18 +377,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -537,22 +541,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -658,9 +658,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -738,7 +738,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -759,10 +758,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.0) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -837,13 +836,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/ast-template/Rakefile b/gems/ast-template/Rakefile index 193fad244..1da755b67 100644 --- a/gems/ast-template/Rakefile +++ b/gems/ast-template/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require "kettle/drift" + require 'kettle/drift' Kettle::Drift.install_tasks rescue LoadError - desc("(stub) kettle:drift:check is unavailable") - task("kettle:drift:check") do + desc('(stub) kettle:drift:check is unavailable') + task('kettle:drift:check') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:update is unavailable") - task("kettle:drift:update") do + desc('(stub) kettle:drift:update is unavailable') + task('kettle:drift:update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:force_update is unavailable") - task("kettle:drift:force_update") do + desc('(stub) kettle:drift:force_update is unavailable') + task('kettle:drift:force_update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift is unavailable") - task("kettle:drift" => "kettle:drift:update") + desc('(stub) kettle:drift is unavailable') + task('kettle:drift' => 'kettle:drift:update') end ### TEMPLATING TASKS diff --git a/gems/ast-template/lib/ast/template/version.rb b/gems/ast-template/lib/ast/template/version.rb index 2cf6f7536..0e1e7cf5d 100644 --- a/gems/ast-template/lib/ast/template/version.rb +++ b/gems/ast-template/lib/ast/template/version.rb @@ -3,7 +3,7 @@ module Ast module Template module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/binary-merge/.gitattributes b/gems/binary-merge/.gitattributes index 0ac65aaa7..35a3c7359 100644 --- a/gems/binary-merge/.gitattributes +++ b/gems/binary-merge/.gitattributes @@ -1,5 +1,5 @@ # <> do not edit below this line -*.rb diff=smorg-ruby +*.rb diff=smorg-rb *.go diff=smorg-go *.rs diff=smorg-rs # <> diff --git a/gems/binary-merge/Gemfile b/gems/binary-merge/Gemfile index 07044dfe9..525832435 100644 --- a/gems/binary-merge/Gemfile +++ b/gems/binary-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source "https://gem.coop" +source 'https://gem.coop' git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,57 +19,53 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ["~> 1.0", ">= 1.0.8"] -gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ['~> 1.0', '>= 1.0.8'] +gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ tree_haver ] -direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") +direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? if direct_sibling_gems.any? && - (direct_sibling_local || - ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) - direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") - direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) begin nomono_activation_requirements = nomono_requirements - nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) if File.file?(nomono_lockfile) nomono_locked_spec = Bundler::LockfileParser - .new(Bundler.read_file(nomono_lockfile)) - .specs - .find { |spec| spec.name == "nomono" } + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } nomono_locked = nomono_locked_spec && - Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) - if nomono_locked - nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] - end - end - Kernel.send(:gem, "nomono", *nomono_activation_requirements) - require "nomono/bundler" - if direct_sibling_templating && !direct_sibling_local - ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local eval_nomono_gems( gems: direct_sibling_gems, - prefix: "STRUCTUREDMERGE", - path_env: "STRUCTUREDMERGE_DEV", - root: ["src", "my", "structuredmerge"] + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] ) rescue LoadError - warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' ensure if direct_sibling_templating && !direct_sibling_local if direct_sibling_dev_was_set - ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original else - ENV.delete("STRUCTUREDMERGE_DEV") + ENV.delete('STRUCTUREDMERGE_DEV') end end end @@ -253,25 +249,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging -eval_gemfile "gemfiles/modular/debug.gemfile" +eval_gemfile 'gemfiles/modular/debug.gemfile' # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile "gemfiles/modular/coverage.gemfile" +eval_gemfile 'gemfiles/modular/coverage.gemfile' # Linting -eval_gemfile "gemfiles/modular/style.gemfile" +eval_gemfile 'gemfiles/modular/style.gemfile' # Documentation -eval_gemfile "gemfiles/modular/documentation.gemfile" +eval_gemfile 'gemfiles/modular/documentation.gemfile' # Optional -eval_gemfile "gemfiles/modular/optional.gemfile" +eval_gemfile 'gemfiles/modular/optional.gemfile' ### Std Lib Extracted Gems -eval_gemfile "gemfiles/modular/x_std_libs.gemfile" +eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' # See unlocked_deps appraisal for more details on irb inclusion -gem "irb", "~> 1.17" # ruby >= 2.7 +gem 'irb', '~> 1.17' # ruby >= 2.7 diff --git a/gems/binary-merge/Gemfile.lock b/gems/binary-merge/Gemfile.lock index de0d55716..04f9abf75 100644 --- a/gems/binary-merge/Gemfile.lock +++ b/gems/binary-merge/Gemfile.lock @@ -15,256 +15,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: @@ -293,12 +43,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -357,13 +101,11 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - kettle-dev (2.3.6) + kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -392,7 +134,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -532,8 +273,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -583,14 +322,6 @@ GEM delegate (~> 0.1) rspec (~> 3.0) timecop (>= 0.7, < 1) - token-resolver (2.0.4) - parslet (~> 2.0) - version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -637,45 +368,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -684,54 +393,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) - ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -739,7 +426,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +438,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) - kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) + kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +465,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +476,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,12 +503,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -844,7 +514,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -857,20 +526,14 @@ CHECKSUMS thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73 timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 - token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -878,7 +541,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/binary-merge/Rakefile b/gems/binary-merge/Rakefile index ea4ce831d..b29d3a04b 100644 --- a/gems/binary-merge/Rakefile +++ b/gems/binary-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require "kettle/drift" + require 'kettle/drift' Kettle::Drift.install_tasks rescue LoadError - desc("(stub) kettle:drift:check is unavailable") - task("kettle:drift:check") do + desc('(stub) kettle:drift:check is unavailable') + task('kettle:drift:check') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:update is unavailable") - task("kettle:drift:update") do + desc('(stub) kettle:drift:update is unavailable') + task('kettle:drift:update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:force_update is unavailable") - task("kettle:drift:force_update") do + desc('(stub) kettle:drift:force_update is unavailable') + task('kettle:drift:force_update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift is unavailable") - task("kettle:drift" => "kettle:drift:update") + desc('(stub) kettle:drift is unavailable') + task('kettle:drift' => 'kettle:drift:update') end ### TEMPLATING TASKS diff --git a/gems/binary-merge/lib/binary/merge/version.rb b/gems/binary-merge/lib/binary/merge/version.rb index bb78df888..d8ae92dfa 100644 --- a/gems/binary-merge/lib/binary/merge/version.rb +++ b/gems/binary-merge/lib/binary/merge/version.rb @@ -3,7 +3,7 @@ module Binary module Merge module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/psych-merge/Gemfile.lock b/gems/psych-merge/Gemfile.lock index b0427d0e4..8fb443eb0 100644 --- a/gems/psych-merge/Gemfile.lock +++ b/gems/psych-merge/Gemfile.lock @@ -17,6 +17,263 @@ PATH version_gem (~> 1.1, >= 1.1.9) yaml-merge (= 7.1.0) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -28,11 +285,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -41,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -104,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -132,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -271,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -323,11 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -342,10 +605,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.13) - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) yard (0.9.45) yard-fence (0.9.6) rdoc (>= 6.11, < 8) @@ -378,23 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -403,31 +684,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -435,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -447,19 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -474,9 +787,12 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 @@ -486,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -513,9 +830,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -524,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -537,10 +858,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -553,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/rust-merge/Gemfile.lock b/gems/rust-merge/Gemfile.lock index 59af6b662..5f9e3c073 100644 --- a/gems/rust-merge/Gemfile.lock +++ b/gems/rust-merge/Gemfile.lock @@ -16,264 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -285,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -293,12 +40,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -362,8 +103,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -392,7 +131,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -532,8 +270,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -586,11 +322,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -637,45 +373,22 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -684,54 +397,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -739,7 +430,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +442,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +469,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +480,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,12 +507,10 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -844,7 +519,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -858,19 +532,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -878,7 +547,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/typescript-merge/Gemfile.lock b/gems/typescript-merge/Gemfile.lock index 8ad22f238..131273f67 100644 --- a/gems/typescript-merge/Gemfile.lock +++ b/gems/typescript-merge/Gemfile.lock @@ -16,6 +16,246 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -53,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -381,23 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -406,33 +684,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,19 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -479,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -490,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -517,9 +830,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -528,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -541,6 +858,9 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f @@ -550,6 +870,7 @@ CHECKSUMS unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 1d8339ae33cd674055437d67526c73c121f479af Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 16:39:03 -0600 Subject: [PATCH 021/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-template/.rubocop_gradual.lock | 315 +++++++++++++++++++ gems/ast-template/Gemfile.lock | 393 ++---------------------- gems/binary-merge/Gemfile.lock | 338 ++++++++++++++++++++ 3 files changed, 687 insertions(+), 359 deletions(-) create mode 100644 gems/ast-template/.rubocop_gradual.lock diff --git a/gems/ast-template/.rubocop_gradual.lock b/gems/ast-template/.rubocop_gradual.lock new file mode 100644 index 000000000..032ac1f2a --- /dev/null +++ b/gems/ast-template/.rubocop_gradual.lock @@ -0,0 +1,315 @@ +{ + ".simplecov:3875640430": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:2781279821": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "ast-template.gemspec:3753841817": [ + [127, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [142, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [143, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [150, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/ast-template.rb:1768837856": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`ast-template.rb`) should use snake_case.", 5381] + ], + "lib/ast/template.rb:2086842713": [ + [10, 3, 15, "Style/Documentation: Missing top-level documentation comment for `module Ast::Template`.", 1853069487], + [10, 3, 62364, "Metrics/ModuleLength: Module has too many lines. [1391/100]", 2978788318], + [31, 5, 61575, "Metrics/ClassLength: Class has too many lines. [1370/100]", 1675855509], + [32, 7, 656, "Metrics/MethodLength: Method has too many lines. [12/10]", 4176787264], + [47, 7, 1248, "Metrics/AbcSize: Assignment Branch Condition size for `readme_family_token_values` is too high. [<17, 31, 5> 35.71/17]", 2414018706], + [47, 7, 1248, "Metrics/MethodLength: Method has too many lines. [21/10]", 2414018706], + [78, 7, 915, "Metrics/MethodLength: Method has too many lines. [18/10]", 788116683], + [108, 7, 624, "Metrics/MethodLength: Method has too many lines. [14/10]", 3152255782], + [125, 7, 1499, "Metrics/AbcSize: Assignment Branch Condition size for `run_readme_family_sections_for_package_directories` is too high. [<10, 27, 6> 29.41/17]", 44972847], + [125, 7, 1499, "Metrics/MethodLength: Method has too many lines. [35/10]", 44972847], + [133, 9, 1138, "Metrics/BlockLength: Block has too many lines. [26/25]", 3835793651], + [164, 7, 540, "Metrics/MethodLength: Method has too many lines. [14/10]", 1455912513], + [198, 7, 2052, "Metrics/AbcSize: Assignment Branch Condition size for `default_family_merge_adapter_registry` is too high. [<14, 39, 10> 42.63/17]", 2278087573], + [198, 7, 2052, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `default_family_merge_adapter_registry` is too high. [11/7]", 2278087573], + [198, 7, 2052, "Metrics/MethodLength: Method has too many lines. [56/10]", 2278087573], + [198, 7, 2052, "Metrics/PerceivedComplexity: Perceived complexity for `default_family_merge_adapter_registry` is too high. [11/8]", 2278087573], + [224, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [226, 13, 16, "Lint/SuppressedException: Do not suppress exceptions.", 1026572812], + [236, 11, 16, "Lint/SuppressedException: Do not suppress exceptions.", 1026572812], + [251, 13, 16, "Lint/SuppressedException: Do not suppress exceptions.", 1026572812], + [269, 59, 158, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1840084196], + [270, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087867783], + [283, 7, 585, "Metrics/MethodLength: Method has too many lines. [11/10]", 3906693384], + [283, 56, 172, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 331060096], + [284, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1674317416], + [298, 7, 591, "Metrics/MethodLength: Method has too many lines. [11/10]", 3516005727], + [298, 58, 174, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1025179136], + [299, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 254853645], + [313, 7, 685, "Metrics/MethodLength: Method has too many lines. [12/10]", 3467399181], + [313, 70, 179, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2059101405], + [314, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 2061684677], + [329, 7, 618, "Metrics/MethodLength: Method has too many lines. [11/10]", 2401761450], + [329, 78, 201, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 4235690185], + [330, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 1064263543], + [364, 55, 164, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2487000221], + [365, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3119702098], + [378, 63, 186, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2803525897], + [379, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 2696213732], + [399, 7, 855, "Metrics/MethodLength: Method has too many lines. [21/10]", 1805387058], + [399, 68, 191, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2632809545], + [400, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 4190793949], + [424, 7, 942, "Metrics/MethodLength: Method has too many lines. [22/10]", 3830329170], + [424, 87, 210, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 3023644425], + [425, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 517767074], + [450, 7, 1847, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_session_status` is too high. [<14, 49, 27> 57.67/17]", 4110228676], + [450, 7, 1847, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_directory_session_status` is too high. [27/7]", 4110228676], + [450, 7, 1847, "Metrics/MethodLength: Method has too many lines. [26/10]", 4110228676], + [450, 7, 1847, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_directory_session_status` is too high. [27/8]", 4110228676], + [471, 18, 1, "Style/DoubleNegation: Avoid the use of double negation (`!!`).", 177540], + [488, 7, 639, "Metrics/MethodLength: Method has too many lines. [11/10]", 1159346913], + [503, 7, 2247, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_session_diagnostics` is too high. [<12, 46, 28> 55.17/17]", 42314578], + [503, 7, 2247, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_directory_session_diagnostics` is too high. [26/7]", 42314578], + [503, 7, 2247, "Metrics/MethodLength: Method has too many lines. [44/10]", 42314578], + [503, 7, 2247, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_directory_session_diagnostics` is too high. [26/8]", 42314578], + [515, 23, 1380, "Metrics/BlockLength: Block has too many lines. [27/25]", 2686192500], + [543, 9, 11, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 848344986], + [560, 7, 669, "Metrics/MethodLength: Method has too many lines. [11/10]", 948308474], + [569, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085362375], + [575, 7, 721, "Metrics/MethodLength: Method has too many lines. [14/10]", 3970823326], + [575, 71, 194, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 3917828873], + [576, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 1017287714], + [593, 7, 921, "Metrics/MethodLength: Method has too many lines. [18/10]", 3608196218], + [593, 90, 213, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1024049097], + [593, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861341], + [594, 121, 59, "Layout/LineLength: Line is too long. [179/120]", 2535099243], + [623, 7, 1232, "Metrics/MethodLength: Method has too many lines. [33/10]", 2772161373], + [623, 67, 190, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 767991305], + [624, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 4114753948], + [660, 7, 1317, "Metrics/MethodLength: Method has too many lines. [26/10]", 3490333035], + [660, 86, 209, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1111567049], + [661, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 3056305766], + [690, 7, 1325, "Metrics/MethodLength: Method has too many lines. [26/10]", 4238651548], + [690, 88, 211, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 4054918473], + [691, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 172214443], + [720, 7, 1370, "Metrics/MethodLength: Method has too many lines. [37/10]", 2622224263], + [720, 76, 205, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3505072102], + [721, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 4014499349], + [761, 7, 1142, "Metrics/AbcSize: Assignment Branch Condition size for `run_template_directory_session_with_options` is too high. [<2, 28, 13> 30.94/17]", 4142644019], + [761, 7, 1142, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `run_template_directory_session_with_options` is too high. [14/7]", 4142644019], + [761, 7, 1142, "Metrics/MethodLength: Method has too many lines. [19/10]", 4142644019], + [761, 7, 1142, "Metrics/PerceivedComplexity: Perceived complexity for `run_template_directory_session_with_options` is too high. [14/8]", 4142644019], + [783, 7, 1053, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_session_options_configuration` is too high. [<3, 19, 5> 19.87/17]", 4149687719], + [783, 7, 1053, "Metrics/MethodLength: Method has too many lines. [24/10]", 4149687719], + [822, 7, 1015, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_session_profile_configuration` is too high. [<6, 17, 6> 19/17]", 3439042821], + [822, 7, 1015, "Metrics/MethodLength: Method has too many lines. [21/10]", 3439042821], + [846, 7, 741, "Metrics/MethodLength: Method has too many lines. [13/10]", 26059598], + [862, 7, 431, "Metrics/MethodLength: Method has too many lines. [12/10]", 2701838518], + [885, 7, 645, "Metrics/MethodLength: Method has too many lines. [11/10]", 4194104448], + [900, 7, 619, "Metrics/MethodLength: Method has too many lines. [12/10]", 1636858424], + [924, 7, 645, "Metrics/MethodLength: Method has too many lines. [11/10]", 1685536251], + [939, 7, 762, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `run_template_directory_session_runner_request` is too high. [8/7]", 1296256230], + [939, 7, 762, "Metrics/MethodLength: Method has too many lines. [16/10]", 1296256230], + [967, 7, 680, "Metrics/MethodLength: Method has too many lines. [11/10]", 2612182881], + [976, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3937819337], + [982, 7, 2608, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_session_runner_input` is too high. [<14, 56, 37> 68.56/17]", 1118646956], + [982, 7, 2608, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_directory_session_runner_input` is too high. [36/7]", 1118646956], + [982, 7, 2608, "Metrics/MethodLength: Method has too many lines. [42/10]", 1118646956], + [982, 7, 2608, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_directory_session_runner_input` is too high. [36/8]", 1118646956], + [1015, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4185298420], + [1028, 7, 1841, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_session_runner_payload` is too high. [<6, 34, 26> 43.22/17]", 668498009], + [1028, 7, 1841, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_directory_session_runner_payload` is too high. [25/7]", 668498009], + [1028, 7, 1841, "Metrics/MethodLength: Method has too many lines. [29/10]", 668498009], + [1028, 7, 1841, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_directory_session_runner_payload` is too high. [27/8]", 668498009], + [1052, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 838260297], + [1078, 7, 680, "Metrics/MethodLength: Method has too many lines. [11/10]", 1786285601], + [1087, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3937819337], + [1093, 7, 727, "Metrics/MethodLength: Method has too many lines. [17/10]", 2883184841], + [1115, 7, 793, "Metrics/MethodLength: Method has too many lines. [21/10]", 3728759813], + [1153, 7, 2638, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_session_inspection` is too high. [<6, 37, 2> 37.54/17]", 2423723700], + [1153, 7, 2638, "Metrics/MethodLength: Method has too many lines. [66/10]", 2423723700], + [1233, 7, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 835919808], + [1242, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193343749], + [1248, 7, 639, "Metrics/MethodLength: Method has too many lines. [16/10]", 890869399], + [1279, 7, 1321, "Metrics/AbcSize: Assignment Branch Condition size for `run_template_directory_session_command_payload` is too high. [<1, 27, 12> 29.56/17]", 268857423], + [1279, 7, 1321, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `run_template_directory_session_command_payload` is too high. [13/7]", 268857423], + [1279, 7, 1321, "Metrics/MethodLength: Method has too many lines. [20/10]", 268857423], + [1279, 7, 1321, "Metrics/PerceivedComplexity: Perceived complexity for `run_template_directory_session_command_payload` is too high. [13/8]", 268857423], + [1295, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2272443568], + [1319, 7, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 3409839974], + [1328, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193343749], + [1342, 7, 645, "Metrics/MethodLength: Method has too many lines. [11/10]", 2481445197], + [1365, 7, 685, "Metrics/MethodLength: Method has too many lines. [11/10]", 807027808], + [1374, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1225026887], + [1388, 7, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 1570524606], + [1397, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193343749], + [1403, 7, 589, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_session_request_from_runner_request` is too high. [8/7]", 1923077466], + [1403, 7, 589, "Metrics/MethodLength: Method has too many lines. [11/10]", 1923077466], + [1418, 7, 1803, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_template_directory_session_options` is too high. [<3, 38, 28> 47.3/17]", 319878734], + [1418, 7, 1803, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `resolve_template_directory_session_options` is too high. [29/7]", 319878734], + [1418, 7, 1803, "Metrics/MethodLength: Method has too many lines. [22/10]", 319878734], + [1418, 7, 1803, "Metrics/PerceivedComplexity: Perceived complexity for `resolve_template_directory_session_options` is too high. [29/8]", 319878734], + [1458, 7, 1357, "Metrics/AbcSize: Assignment Branch Condition size for `replace_or_insert_markdown_heading_section` is too high. [<18, 33, 18> 41.68/17]", 812459935], + [1458, 7, 1357, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `replace_or_insert_markdown_heading_section` is too high. [12/7]", 812459935], + [1458, 7, 1357, "Metrics/MethodLength: Method has too many lines. [26/10]", 812459935], + [1458, 7, 1357, "Metrics/PerceivedComplexity: Perceived complexity for `replace_or_insert_markdown_heading_section` is too high. [12/8]", 812459935], + [1494, 7, 456, "Metrics/AbcSize: Assignment Branch Condition size for `readme_family_section_insert_index` is too high. [<5, 9, 14> 17.38/17]", 252997882], + [1494, 7, 456, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `readme_family_section_insert_index` is too high. [8/7]", 252997882], + [1494, 7, 456, "Metrics/MethodLength: Method has too many lines. [13/10]", 252997882] + ], + "spec/session_integration_spec.rb:1063469608": [ + [5, 1, 89793, "Metrics/BlockLength: Block has too many lines. [1761/25]", 3162725061], + [31, 3, 612, "Metrics/MethodLength: Method has too many lines. [16/10]", 1402311658], + [50, 3, 2970, "Metrics/BlockLength: Block has too many lines. [60/25]", 2848879838], + [118, 3, 1748, "Metrics/BlockLength: Block has too many lines. [40/25]", 3276283317], + [164, 3, 1582, "Metrics/BlockLength: Block has too many lines. [37/25]", 4190998336], + [237, 3, 2325, "Metrics/BlockLength: Block has too many lines. [51/25]", 3352569469], + [295, 3, 1789, "Metrics/BlockLength: Block has too many lines. [38/25]", 1947005133], + [339, 3, 1944, "Metrics/BlockLength: Block has too many lines. [41/25]", 3993685201], + [386, 3, 1807, "Metrics/BlockLength: Block has too many lines. [38/25]", 4257675897], + [452, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 561412382], + [457, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], + [472, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 561412382], + [477, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2088089918], + [485, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087412612], + [490, 3, 1758, "Metrics/BlockLength: Block has too many lines. [37/25]", 1520782676], + [548, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], + [554, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1246048068], + [560, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [573, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1246048068], + [578, 3, 1812, "Metrics/BlockLength: Block has too many lines. [39/25]", 1709538088], + [623, 3, 1428, "Metrics/BlockLength: Block has too many lines. [31/25]", 4067408447], + [660, 3, 1975, "Metrics/BlockLength: Block has too many lines. [49/25]", 432162268], + [716, 3, 1902, "Metrics/BlockLength: Block has too many lines. [45/25]", 2326466404], + [770, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 703289421], + [797, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 703289421], + [818, 3, 1462, "Metrics/BlockLength: Block has too many lines. [35/25]", 1648309772], + [860, 3, 1466, "Metrics/BlockLength: Block has too many lines. [31/25]", 3549227194], + [898, 3, 1656, "Metrics/BlockLength: Block has too many lines. [36/25]", 2643926725], + [956, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], + [963, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2382627530], + [968, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [985, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2382627530], + [990, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114085752], + [998, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3868965366], + [1004, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3135429041], + [1011, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 2121600243], + [1016, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3948574204], + [1034, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 2121600243], + [1038, 3, 1281, "Metrics/BlockLength: Block has too many lines. [31/25]", 1507281102], + [1076, 3, 1329, "Metrics/BlockLength: Block has too many lines. [31/25]", 3185120887], + [1114, 3, 1680, "Metrics/BlockLength: Block has too many lines. [36/25]", 2250099450], + [1115, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193424063], + [1158, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114085752], + [1166, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3868965366], + [1172, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3135429041], + [1179, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 2121600243], + [1184, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3948574204], + [1202, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 2121600243], + [1206, 3, 1628, "Metrics/BlockLength: Block has too many lines. [36/25]", 4066832477], + [1249, 3, 1267, "Metrics/BlockLength: Block has too many lines. [31/25]", 488100020], + [1287, 3, 1404, "Metrics/BlockLength: Block has too many lines. [36/25]", 2415041159], + [1330, 3, 1970, "Metrics/BlockLength: Block has too many lines. [38/25]", 1463232713], + [1376, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193407726], + [1384, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193406689], + [1390, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087900170], + [1397, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 414784060], + [1402, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179046083], + [1419, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 414784060], + [1540, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], + [1547, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2382627530], + [1552, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [1569, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2382627530], + [1574, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1621973742], + [1582, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1297498406], + [1588, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 2665434363], + [1595, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1334260795], + [1600, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193407726], + [1608, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193406689], + [1614, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087900170], + [1621, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 414784060], + [1626, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179046083], + [1644, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 414784060], + [1649, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3197516464], + [1667, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1334260795], + [1717, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193407726], + [1725, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193406689], + [1731, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087900170], + [1738, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 414784060], + [1743, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179046083], + [1760, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 414784060], + [1868, 3, 442, "Metrics/AbcSize: Assignment Branch Condition size for `options_with_resolved_fixture_paths` is too high. [<3, 18, 2> 18.36/17]", 13098503], + [1879, 3, 878, "Metrics/AbcSize: Assignment Branch Condition size for `runner_request_with_resolved_fixture_paths` is too high. [<7, 36, 6> 37.16/17]", 2279422631], + [1879, 3, 878, "Metrics/MethodLength: Method has too many lines. [20/10]", 2279422631], + [1902, 3, 449, "Metrics/AbcSize: Assignment Branch Condition size for `runner_payload_with_resolved_fixture_paths` is too high. [<3, 18, 2> 18.36/17]", 1041394699], + [1948, 3, 932, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_session_inspection_expected_paths` is too high. [<4, 24, 6> 25.06/17]", 616473516], + [1948, 3, 932, "Metrics/MethodLength: Method has too many lines. [17/10]", 616473516], + [2015, 3, 679, "Metrics/AbcSize: Assignment Branch Condition size for `invocation_with_resolved_fixture_paths` is too high. [<5, 20, 4> 21/17]", 2866326769], + [2015, 3, 679, "Metrics/MethodLength: Method has too many lines. [12/10]", 2866326769] + ] +} diff --git a/gems/ast-template/Gemfile.lock b/gems/ast-template/Gemfile.lock index 5d204f70e..51a1a12b3 100644 --- a/gems/ast-template/Gemfile.lock +++ b/gems/ast-template/Gemfile.lock @@ -15,272 +15,6 @@ PATH ast-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.0) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -309,12 +43,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -323,6 +51,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -372,12 +101,21 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - kettle-dev (2.3.6) + kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -396,7 +134,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -536,23 +273,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -586,11 +325,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -637,45 +376,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -684,61 +402,39 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -751,27 +447,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) - kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae - kettle-drift (1.0.5) - kettle-jem (7.1.0) + kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.0) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -786,14 +474,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -801,7 +485,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -829,19 +512,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -855,19 +536,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -875,7 +551,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/binary-merge/Gemfile.lock b/gems/binary-merge/Gemfile.lock index 04f9abf75..50c4884ae 100644 --- a/gems/binary-merge/Gemfile.lock +++ b/gems/binary-merge/Gemfile.lock @@ -15,6 +15,256 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: @@ -43,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -106,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -134,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -273,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -322,6 +583,14 @@ GEM delegate (~> 0.1) rspec (~> 3.0) timecop (>= 0.7, < 1) + token-resolver (2.0.4) + parslet (~> 2.0) + version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -368,23 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -393,32 +684,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) + ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -426,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -438,19 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -465,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -476,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -503,9 +830,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -514,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -526,14 +857,20 @@ CHECKSUMS thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73 timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 + token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -541,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 75ef509157afe7c96765d36b53b7056eb189980d Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 16:39:16 -0600 Subject: [PATCH 022/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-template/Gemfile.lock | 338 ++++++++++++++++++++++++- gems/citrus-toml-merge/Gemfile.lock | 351 ++++++++++++++++++++++++-- gems/parslet-toml-merge/Gemfile.lock | 352 +++++++++++++++++++++++++-- gems/zip-merge/.gitattributes | 2 +- gems/zip-merge/.kettle-drift.lock | 60 +++-- gems/zip-merge/Gemfile | 40 +++ gems/zip-merge/Gemfile.lock | 342 +------------------------- 7 files changed, 1091 insertions(+), 394 deletions(-) diff --git a/gems/ast-template/Gemfile.lock b/gems/ast-template/Gemfile.lock index 51a1a12b3..619821ecf 100644 --- a/gems/ast-template/Gemfile.lock +++ b/gems/ast-template/Gemfile.lock @@ -15,6 +15,256 @@ PATH ast-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -43,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -106,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -134,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -273,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -325,11 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -376,24 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -402,32 +684,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -435,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -447,19 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -474,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -485,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -512,9 +830,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -523,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -536,14 +858,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -551,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) 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 3daa583e7..326854741 100644 --- a/gems/citrus-toml-merge/Gemfile.lock +++ b/gems/citrus-toml-merge/Gemfile.lock @@ -16,6 +16,264 @@ PATH toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +285,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -103,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -131,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -322,18 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -380,23 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -405,32 +684,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -438,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -450,19 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -477,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -488,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -515,9 +830,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -526,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -539,16 +858,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -556,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) 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 6abd20ac6..3e465f1fd 100644 --- a/gems/parslet-toml-merge/Gemfile.lock +++ b/gems/parslet-toml-merge/Gemfile.lock @@ -16,6 +16,264 @@ PATH toml-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +285,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -103,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -131,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -324,15 +588,9 @@ GEM version_gem (~> 1.1, >= 1.1.13) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -379,23 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -404,31 +684,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -436,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -448,19 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -476,10 +788,13 @@ CHECKSUMS parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 parslet-toml-merge (7.1.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -487,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -514,9 +830,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -525,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -540,14 +860,17 @@ CHECKSUMS token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -555,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/zip-merge/.gitattributes b/gems/zip-merge/.gitattributes index 0ac65aaa7..35a3c7359 100644 --- a/gems/zip-merge/.gitattributes +++ b/gems/zip-merge/.gitattributes @@ -1,5 +1,5 @@ # <> do not edit below this line -*.rb diff=smorg-ruby +*.rb diff=smorg-rb *.go diff=smorg-go *.rs diff=smorg-rs # <> diff --git a/gems/zip-merge/.kettle-drift.lock b/gems/zip-merge/.kettle-drift.lock index 9878fb8f5..508d631d8 100644 --- a/gems/zip-merge/.kettle-drift.lock +++ b/gems/zip-merge/.kettle-drift.lock @@ -5,7 +5,8 @@ "lines": [ 79, 119, - 159 + 159, + 199 ] } ], @@ -15,7 +16,8 @@ "lines": [ 90, 130, - 170 + 170, + 210 ] } ], @@ -25,7 +27,8 @@ "lines": [ 80, 120, - 160 + 160, + 200 ] } ], @@ -35,7 +38,8 @@ "lines": [ 92, 132, - 172 + 172, + 212 ] } ], @@ -45,7 +49,8 @@ "lines": [ 95, 135, - 175 + 175, + 215 ] } ], @@ -55,7 +60,8 @@ "lines": [ 81, 121, - 161 + 161, + 201 ] } ], @@ -66,7 +72,8 @@ 59, 99, 139, - 179 + 179, + 219 ] } ], @@ -76,7 +83,8 @@ "lines": [ 100, 140, - 180 + 180, + 220 ] } ], @@ -87,7 +95,8 @@ 42, 86, 126, - 166 + 166, + 206 ] } ], @@ -97,7 +106,8 @@ "lines": [ 109, 149, - 189 + 189, + 229 ] } ], @@ -108,7 +118,8 @@ 34, 78, 118, - 158 + 158, + 198 ] } ], @@ -119,7 +130,8 @@ 68, 108, 148, - 188 + 188, + 228 ] } ], @@ -129,7 +141,8 @@ "lines": [ 84, 124, - 164 + 164, + 204 ] } ], @@ -140,7 +153,8 @@ 47, 91, 131, - 171 + 171, + 211 ] } ], @@ -151,7 +165,8 @@ 43, 87, 127, - 167 + 167, + 207 ] } ], @@ -161,7 +176,8 @@ "lines": [ 85, 125, - 165 + 165, + 205 ] } ], @@ -171,7 +187,8 @@ "lines": [ 102, 142, - 182 + 182, + 222 ] } ], @@ -181,7 +198,8 @@ "lines": [ 101, 141, - 181 + 181, + 221 ] } ], @@ -191,7 +209,8 @@ "lines": [ 96, 136, - 176 + 176, + 216 ] } ], @@ -201,7 +220,8 @@ "lines": [ 105, 145, - 185 + 185, + 225 ] } ], diff --git a/gems/zip-merge/Gemfile b/gems/zip-merge/Gemfile index f735ba663..22cc72327 100644 --- a/gems/zip-merge/Gemfile +++ b/gems/zip-merge/Gemfile @@ -191,6 +191,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/zip-merge/Gemfile.lock b/gems/zip-merge/Gemfile.lock index 153732b30..6749dfe53 100644 --- a/gems/zip-merge/Gemfile.lock +++ b/gems/zip-merge/Gemfile.lock @@ -15,256 +15,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: @@ -293,12 +43,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -357,13 +101,11 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - kettle-dev (2.3.6) + kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -392,7 +134,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -532,8 +273,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -583,14 +322,6 @@ GEM delegate (~> 0.1) rspec (~> 3.0) timecop (>= 0.7, < 1) - token-resolver (2.0.4) - parslet (~> 2.0) - version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -637,45 +368,22 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -684,19 +392,13 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) @@ -710,28 +412,12 @@ CHECKSUMS ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) - ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -739,7 +425,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +437,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) - kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) + kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +464,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +475,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,12 +502,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -844,7 +513,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -857,20 +525,14 @@ CHECKSUMS thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73 timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 - token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd From d4f2ee00925ea8a53f51199ed36c17d3359cd110 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 16:39:35 -0600 Subject: [PATCH 023/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/citrus-toml-merge/.gitattributes | 2 +- gems/citrus-toml-merge/.kettle-drift.lock | 60 ++-- gems/citrus-toml-merge/Gemfile | 40 +++ gems/citrus-toml-merge/Gemfile.lock | 342 +------------------- gems/commonmarker-merge/Gemfile.lock | 343 ++++++++++++++++++++- gems/parslet-toml-merge/.gitattributes | 2 +- gems/parslet-toml-merge/.kettle-drift.lock | 60 ++-- gems/parslet-toml-merge/Gemfile | 40 +++ gems/parslet-toml-merge/Gemfile.lock | 59 ++-- gems/psych-merge/.gitattributes | 2 +- gems/psych-merge/.kettle-drift.lock | 60 ++-- gems/psych-merge/Gemfile | 40 +++ gems/psych-merge/Gemfile.lock | 59 ++-- gems/zip-merge/Gemfile.lock | 338 ++++++++++++++++++++ 14 files changed, 978 insertions(+), 469 deletions(-) diff --git a/gems/citrus-toml-merge/.gitattributes b/gems/citrus-toml-merge/.gitattributes index 0ac65aaa7..35a3c7359 100644 --- a/gems/citrus-toml-merge/.gitattributes +++ b/gems/citrus-toml-merge/.gitattributes @@ -1,5 +1,5 @@ # <> do not edit below this line -*.rb diff=smorg-ruby +*.rb diff=smorg-rb *.go diff=smorg-go *.rs diff=smorg-rs # <> diff --git a/gems/citrus-toml-merge/.kettle-drift.lock b/gems/citrus-toml-merge/.kettle-drift.lock index 1dad17e1d..9878fb8f5 100644 --- a/gems/citrus-toml-merge/.kettle-drift.lock +++ b/gems/citrus-toml-merge/.kettle-drift.lock @@ -4,7 +4,8 @@ "file": "Gemfile", "lines": [ 79, - 119 + 119, + 159 ] } ], @@ -13,7 +14,8 @@ "file": "Gemfile", "lines": [ 90, - 130 + 130, + 170 ] } ], @@ -22,7 +24,8 @@ "file": "Gemfile", "lines": [ 80, - 120 + 120, + 160 ] } ], @@ -31,7 +34,8 @@ "file": "Gemfile", "lines": [ 92, - 132 + 132, + 172 ] } ], @@ -40,7 +44,8 @@ "file": "Gemfile", "lines": [ 95, - 135 + 135, + 175 ] } ], @@ -49,7 +54,8 @@ "file": "Gemfile", "lines": [ 81, - 121 + 121, + 161 ] } ], @@ -59,7 +65,8 @@ "lines": [ 59, 99, - 139 + 139, + 179 ] } ], @@ -68,7 +75,8 @@ "file": "Gemfile", "lines": [ 100, - 140 + 140, + 180 ] } ], @@ -78,7 +86,8 @@ "lines": [ 42, 86, - 126 + 126, + 166 ] } ], @@ -87,7 +96,8 @@ "file": "Gemfile", "lines": [ 109, - 149 + 149, + 189 ] } ], @@ -97,7 +107,8 @@ "lines": [ 34, 78, - 118 + 118, + 158 ] } ], @@ -107,7 +118,8 @@ "lines": [ 68, 108, - 148 + 148, + 188 ] } ], @@ -116,7 +128,8 @@ "file": "Gemfile", "lines": [ 84, - 124 + 124, + 164 ] } ], @@ -126,7 +139,8 @@ "lines": [ 47, 91, - 131 + 131, + 171 ] } ], @@ -136,7 +150,8 @@ "lines": [ 43, 87, - 127 + 127, + 167 ] } ], @@ -145,7 +160,8 @@ "file": "Gemfile", "lines": [ 85, - 125 + 125, + 165 ] } ], @@ -154,7 +170,8 @@ "file": "Gemfile", "lines": [ 102, - 142 + 142, + 182 ] } ], @@ -163,7 +180,8 @@ "file": "Gemfile", "lines": [ 101, - 141 + 141, + 181 ] } ], @@ -172,7 +190,8 @@ "file": "Gemfile", "lines": [ 96, - 136 + 136, + 176 ] } ], @@ -181,7 +200,8 @@ "file": "Gemfile", "lines": [ 105, - 145 + 145, + 185 ] } ], diff --git a/gems/citrus-toml-merge/Gemfile b/gems/citrus-toml-merge/Gemfile index cf47e3d6b..b21448a3c 100644 --- a/gems/citrus-toml-merge/Gemfile +++ b/gems/citrus-toml-merge/Gemfile @@ -151,6 +151,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/citrus-toml-merge/Gemfile.lock b/gems/citrus-toml-merge/Gemfile.lock index 326854741..d9fc16086 100644 --- a/gems/citrus-toml-merge/Gemfile.lock +++ b/gems/citrus-toml-merge/Gemfile.lock @@ -16,256 +16,6 @@ PATH toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: @@ -285,6 +35,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -293,12 +48,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -357,13 +106,11 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - kettle-dev (2.3.6) + kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -392,7 +139,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -532,8 +278,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -586,11 +330,14 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -637,45 +384,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -684,54 +409,33 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -739,7 +443,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +455,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) - kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) + kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +482,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +493,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,12 +520,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -844,7 +531,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -858,19 +544,16 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -878,7 +561,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/commonmarker-merge/Gemfile.lock b/gems/commonmarker-merge/Gemfile.lock index 58c229f52..a99a6d94e 100644 --- a/gems/commonmarker-merge/Gemfile.lock +++ b/gems/commonmarker-merge/Gemfile.lock @@ -16,6 +16,264 @@ PATH markdown-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +285,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -109,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -137,10 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -280,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -332,11 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -383,23 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -408,30 +684,46 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca @@ -447,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -459,20 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -487,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -498,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -525,9 +830,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -536,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -549,14 +858,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -564,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/parslet-toml-merge/.gitattributes b/gems/parslet-toml-merge/.gitattributes index 0ac65aaa7..35a3c7359 100644 --- a/gems/parslet-toml-merge/.gitattributes +++ b/gems/parslet-toml-merge/.gitattributes @@ -1,5 +1,5 @@ # <> do not edit below this line -*.rb diff=smorg-ruby +*.rb diff=smorg-rb *.go diff=smorg-go *.rs diff=smorg-rs # <> diff --git a/gems/parslet-toml-merge/.kettle-drift.lock b/gems/parslet-toml-merge/.kettle-drift.lock index 1dad17e1d..9878fb8f5 100644 --- a/gems/parslet-toml-merge/.kettle-drift.lock +++ b/gems/parslet-toml-merge/.kettle-drift.lock @@ -4,7 +4,8 @@ "file": "Gemfile", "lines": [ 79, - 119 + 119, + 159 ] } ], @@ -13,7 +14,8 @@ "file": "Gemfile", "lines": [ 90, - 130 + 130, + 170 ] } ], @@ -22,7 +24,8 @@ "file": "Gemfile", "lines": [ 80, - 120 + 120, + 160 ] } ], @@ -31,7 +34,8 @@ "file": "Gemfile", "lines": [ 92, - 132 + 132, + 172 ] } ], @@ -40,7 +44,8 @@ "file": "Gemfile", "lines": [ 95, - 135 + 135, + 175 ] } ], @@ -49,7 +54,8 @@ "file": "Gemfile", "lines": [ 81, - 121 + 121, + 161 ] } ], @@ -59,7 +65,8 @@ "lines": [ 59, 99, - 139 + 139, + 179 ] } ], @@ -68,7 +75,8 @@ "file": "Gemfile", "lines": [ 100, - 140 + 140, + 180 ] } ], @@ -78,7 +86,8 @@ "lines": [ 42, 86, - 126 + 126, + 166 ] } ], @@ -87,7 +96,8 @@ "file": "Gemfile", "lines": [ 109, - 149 + 149, + 189 ] } ], @@ -97,7 +107,8 @@ "lines": [ 34, 78, - 118 + 118, + 158 ] } ], @@ -107,7 +118,8 @@ "lines": [ 68, 108, - 148 + 148, + 188 ] } ], @@ -116,7 +128,8 @@ "file": "Gemfile", "lines": [ 84, - 124 + 124, + 164 ] } ], @@ -126,7 +139,8 @@ "lines": [ 47, 91, - 131 + 131, + 171 ] } ], @@ -136,7 +150,8 @@ "lines": [ 43, 87, - 127 + 127, + 167 ] } ], @@ -145,7 +160,8 @@ "file": "Gemfile", "lines": [ 85, - 125 + 125, + 165 ] } ], @@ -154,7 +170,8 @@ "file": "Gemfile", "lines": [ 102, - 142 + 142, + 182 ] } ], @@ -163,7 +180,8 @@ "file": "Gemfile", "lines": [ 101, - 141 + 141, + 181 ] } ], @@ -172,7 +190,8 @@ "file": "Gemfile", "lines": [ 96, - 136 + 136, + 176 ] } ], @@ -181,7 +200,8 @@ "file": "Gemfile", "lines": [ 105, - 145 + 145, + 185 ] } ], diff --git a/gems/parslet-toml-merge/Gemfile b/gems/parslet-toml-merge/Gemfile index 152aa6855..700fb2815 100644 --- a/gems/parslet-toml-merge/Gemfile +++ b/gems/parslet-toml-merge/Gemfile @@ -151,6 +151,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/parslet-toml-merge/Gemfile.lock b/gems/parslet-toml-merge/Gemfile.lock index 3e465f1fd..a2578361d 100644 --- a/gems/parslet-toml-merge/Gemfile.lock +++ b/gems/parslet-toml-merge/Gemfile.lock @@ -266,6 +266,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.0) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: @@ -307,7 +323,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -362,18 +377,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -537,22 +541,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -658,9 +658,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -738,7 +738,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -759,10 +758,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.0) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -837,13 +836,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/psych-merge/.gitattributes b/gems/psych-merge/.gitattributes index 0ac65aaa7..35a3c7359 100644 --- a/gems/psych-merge/.gitattributes +++ b/gems/psych-merge/.gitattributes @@ -1,5 +1,5 @@ # <> do not edit below this line -*.rb diff=smorg-ruby +*.rb diff=smorg-rb *.go diff=smorg-go *.rs diff=smorg-rs # <> diff --git a/gems/psych-merge/.kettle-drift.lock b/gems/psych-merge/.kettle-drift.lock index 086be5de9..8d8e7d74f 100644 --- a/gems/psych-merge/.kettle-drift.lock +++ b/gems/psych-merge/.kettle-drift.lock @@ -5,7 +5,8 @@ "lines": [ 81, 121, - 161 + 161, + 201 ] } ], @@ -15,7 +16,8 @@ "lines": [ 92, 132, - 172 + 172, + 212 ] } ], @@ -25,7 +27,8 @@ "lines": [ 82, 122, - 162 + 162, + 202 ] } ], @@ -35,7 +38,8 @@ "lines": [ 94, 134, - 174 + 174, + 214 ] } ], @@ -45,7 +49,8 @@ "lines": [ 97, 137, - 177 + 177, + 217 ] } ], @@ -55,7 +60,8 @@ "lines": [ 83, 123, - 163 + 163, + 203 ] } ], @@ -66,7 +72,8 @@ 61, 101, 141, - 181 + 181, + 221 ] } ], @@ -76,7 +83,8 @@ "lines": [ 102, 142, - 182 + 182, + 222 ] } ], @@ -87,7 +95,8 @@ 44, 88, 128, - 168 + 168, + 208 ] } ], @@ -97,7 +106,8 @@ "lines": [ 111, 151, - 191 + 191, + 231 ] } ], @@ -108,7 +118,8 @@ 36, 80, 120, - 160 + 160, + 200 ] } ], @@ -119,7 +130,8 @@ 70, 110, 150, - 190 + 190, + 230 ] } ], @@ -129,7 +141,8 @@ "lines": [ 86, 126, - 166 + 166, + 206 ] } ], @@ -140,7 +153,8 @@ 49, 93, 133, - 173 + 173, + 213 ] } ], @@ -151,7 +165,8 @@ 45, 89, 129, - 169 + 169, + 209 ] } ], @@ -161,7 +176,8 @@ "lines": [ 87, 127, - 167 + 167, + 207 ] } ], @@ -171,7 +187,8 @@ "lines": [ 104, 144, - 184 + 184, + 224 ] } ], @@ -181,7 +198,8 @@ "lines": [ 103, 143, - 183 + 183, + 223 ] } ], @@ -191,7 +209,8 @@ "lines": [ 98, 138, - 178 + 178, + 218 ] } ], @@ -201,7 +220,8 @@ "lines": [ 107, 147, - 187 + 187, + 227 ] } ], diff --git a/gems/psych-merge/Gemfile b/gems/psych-merge/Gemfile index 84b3fc572..765097826 100644 --- a/gems/psych-merge/Gemfile +++ b/gems/psych-merge/Gemfile @@ -193,6 +193,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/psych-merge/Gemfile.lock b/gems/psych-merge/Gemfile.lock index 8fb443eb0..8df7f5f0b 100644 --- a/gems/psych-merge/Gemfile.lock +++ b/gems/psych-merge/Gemfile.lock @@ -248,6 +248,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.0) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -307,7 +323,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -362,18 +377,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -537,22 +541,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -658,9 +658,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -738,7 +738,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -759,10 +758,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.0) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -837,13 +836,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/zip-merge/Gemfile.lock b/gems/zip-merge/Gemfile.lock index 6749dfe53..fc10f254d 100644 --- a/gems/zip-merge/Gemfile.lock +++ b/gems/zip-merge/Gemfile.lock @@ -15,6 +15,256 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: @@ -43,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -106,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -134,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -273,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -322,6 +583,14 @@ GEM delegate (~> 0.1) rspec (~> 3.0) timecop (>= 0.7, < 1) + token-resolver (2.0.4) + parslet (~> 2.0) + version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -368,22 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -392,13 +684,19 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) @@ -412,12 +710,28 @@ CHECKSUMS ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) + ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -425,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -437,19 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -464,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -475,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -502,9 +830,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -513,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -525,14 +857,20 @@ CHECKSUMS thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73 timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 + token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd From 9d905389973b1852310da639918a772f44faaac5 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 16:39:37 -0600 Subject: [PATCH 024/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/psych-merge/Gemfile.lock | 366 +++------------------------------- 1 file changed, 29 insertions(+), 337 deletions(-) diff --git a/gems/psych-merge/Gemfile.lock b/gems/psych-merge/Gemfile.lock index 8df7f5f0b..9b710041d 100644 --- a/gems/psych-merge/Gemfile.lock +++ b/gems/psych-merge/Gemfile.lock @@ -17,253 +17,6 @@ PATH version_gem (~> 1.1, >= 1.1.9) yaml-merge (= 7.1.0) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.0) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -309,12 +62,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -323,6 +70,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -372,12 +120,21 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - kettle-dev (2.3.6) + kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -396,7 +153,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -536,23 +292,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -586,11 +344,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -637,45 +390,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -684,17 +416,12 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) yaml-merge! yard (~> 0.9, >= 0.9.44) @@ -703,42 +430,26 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -751,27 +462,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) - kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae - kettle-drift (1.0.5) - kettle-jem (7.1.0) + kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.0) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -786,12 +489,9 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 @@ -801,7 +501,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -829,19 +528,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -855,14 +552,10 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -875,7 +568,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 72fbbc548356787afed513820679ec9f3ac922c4 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 16:39:38 -0600 Subject: [PATCH 025/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/parslet-toml-merge/Gemfile.lock | 394 +++------------------------ 1 file changed, 39 insertions(+), 355 deletions(-) diff --git a/gems/parslet-toml-merge/Gemfile.lock b/gems/parslet-toml-merge/Gemfile.lock index a2578361d..a8d0a4af5 100644 --- a/gems/parslet-toml-merge/Gemfile.lock +++ b/gems/parslet-toml-merge/Gemfile.lock @@ -16,272 +16,6 @@ PATH toml-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.0) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: @@ -301,6 +35,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -309,12 +48,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -323,6 +56,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -372,12 +106,21 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - kettle-dev (2.3.6) + kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -396,7 +139,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -536,23 +278,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -588,9 +332,11 @@ GEM version_gem (~> 1.1, >= 1.1.13) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -637,45 +383,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -684,61 +408,39 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -751,27 +453,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) - kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae - kettle-drift (1.0.5) - kettle-jem (7.1.0) + kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.0) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,13 +481,10 @@ CHECKSUMS parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 parslet-toml-merge (7.1.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -801,7 +492,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -829,19 +519,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -857,17 +545,14 @@ CHECKSUMS token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -875,7 +560,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 424dc3d0a36b941f55ffa52c0e53fe7c5dbd8dd5 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 16:39:52 -0600 Subject: [PATCH 026/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/citrus-toml-merge/Gemfile.lock | 13 +- gems/commonmarker-merge/.gitattributes | 2 +- gems/commonmarker-merge/.kettle-drift.lock | 60 ++-- gems/commonmarker-merge/Gemfile | 40 +++ gems/commonmarker-merge/Gemfile.lock | 334 +------------------ gems/kettle-jem/Gemfile.lock | 117 ++++++- gems/kramdown-merge/Gemfile.lock | 355 ++++++++++++++++++++- gems/parslet-toml-merge/Gemfile.lock | 13 +- gems/prism-merge/Gemfile.lock | 355 ++++++++++++++++++++- gems/psych-merge/Gemfile.lock | 311 ++++++++++++++++++ 10 files changed, 1207 insertions(+), 393 deletions(-) diff --git a/gems/citrus-toml-merge/Gemfile.lock b/gems/citrus-toml-merge/Gemfile.lock index d9fc16086..f97a0ed37 100644 --- a/gems/citrus-toml-merge/Gemfile.lock +++ b/gems/citrus-toml-merge/Gemfile.lock @@ -16,14 +16,6 @@ PATH toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -330,6 +322,10 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) @@ -413,7 +409,6 @@ DEPENDENCIES standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_sitter_language_pack! yaml-converter (~> 0.1) yard (~> 0.9, >= 0.9.44) diff --git a/gems/commonmarker-merge/.gitattributes b/gems/commonmarker-merge/.gitattributes index 0ac65aaa7..35a3c7359 100644 --- a/gems/commonmarker-merge/.gitattributes +++ b/gems/commonmarker-merge/.gitattributes @@ -1,5 +1,5 @@ # <> do not edit below this line -*.rb diff=smorg-ruby +*.rb diff=smorg-rb *.go diff=smorg-go *.rs diff=smorg-rs # <> diff --git a/gems/commonmarker-merge/.kettle-drift.lock b/gems/commonmarker-merge/.kettle-drift.lock index 1dad17e1d..9878fb8f5 100644 --- a/gems/commonmarker-merge/.kettle-drift.lock +++ b/gems/commonmarker-merge/.kettle-drift.lock @@ -4,7 +4,8 @@ "file": "Gemfile", "lines": [ 79, - 119 + 119, + 159 ] } ], @@ -13,7 +14,8 @@ "file": "Gemfile", "lines": [ 90, - 130 + 130, + 170 ] } ], @@ -22,7 +24,8 @@ "file": "Gemfile", "lines": [ 80, - 120 + 120, + 160 ] } ], @@ -31,7 +34,8 @@ "file": "Gemfile", "lines": [ 92, - 132 + 132, + 172 ] } ], @@ -40,7 +44,8 @@ "file": "Gemfile", "lines": [ 95, - 135 + 135, + 175 ] } ], @@ -49,7 +54,8 @@ "file": "Gemfile", "lines": [ 81, - 121 + 121, + 161 ] } ], @@ -59,7 +65,8 @@ "lines": [ 59, 99, - 139 + 139, + 179 ] } ], @@ -68,7 +75,8 @@ "file": "Gemfile", "lines": [ 100, - 140 + 140, + 180 ] } ], @@ -78,7 +86,8 @@ "lines": [ 42, 86, - 126 + 126, + 166 ] } ], @@ -87,7 +96,8 @@ "file": "Gemfile", "lines": [ 109, - 149 + 149, + 189 ] } ], @@ -97,7 +107,8 @@ "lines": [ 34, 78, - 118 + 118, + 158 ] } ], @@ -107,7 +118,8 @@ "lines": [ 68, 108, - 148 + 148, + 188 ] } ], @@ -116,7 +128,8 @@ "file": "Gemfile", "lines": [ 84, - 124 + 124, + 164 ] } ], @@ -126,7 +139,8 @@ "lines": [ 47, 91, - 131 + 131, + 171 ] } ], @@ -136,7 +150,8 @@ "lines": [ 43, 87, - 127 + 127, + 167 ] } ], @@ -145,7 +160,8 @@ "file": "Gemfile", "lines": [ 85, - 125 + 125, + 165 ] } ], @@ -154,7 +170,8 @@ "file": "Gemfile", "lines": [ 102, - 142 + 142, + 182 ] } ], @@ -163,7 +180,8 @@ "file": "Gemfile", "lines": [ 101, - 141 + 141, + 181 ] } ], @@ -172,7 +190,8 @@ "file": "Gemfile", "lines": [ 96, - 136 + 136, + 176 ] } ], @@ -181,7 +200,8 @@ "file": "Gemfile", "lines": [ 105, - 145 + 145, + 185 ] } ], diff --git a/gems/commonmarker-merge/Gemfile b/gems/commonmarker-merge/Gemfile index 00650e779..ddcb4f1eb 100644 --- a/gems/commonmarker-merge/Gemfile +++ b/gems/commonmarker-merge/Gemfile @@ -151,6 +151,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/commonmarker-merge/Gemfile.lock b/gems/commonmarker-merge/Gemfile.lock index a99a6d94e..daf0cfd1b 100644 --- a/gems/commonmarker-merge/Gemfile.lock +++ b/gems/commonmarker-merge/Gemfile.lock @@ -16,256 +16,6 @@ PATH markdown-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: @@ -285,6 +35,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -357,13 +112,11 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - kettle-dev (2.3.6) + kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -392,7 +145,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -532,8 +284,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -586,11 +336,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -637,45 +387,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -684,46 +413,30 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca @@ -739,7 +452,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +464,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) - kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) + kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +492,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +503,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,12 +530,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -844,7 +541,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -858,19 +554,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -878,7 +569,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/kettle-jem/Gemfile.lock b/gems/kettle-jem/Gemfile.lock index 200a066cc..7624f5da1 100644 --- a/gems/kettle-jem/Gemfile.lock +++ b/gems/kettle-jem/Gemfile.lock @@ -27,6 +27,95 @@ PATH tree_haver (= 7.1.0) yaml-merge (= 7.1.0) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: @@ -190,10 +279,6 @@ GEM rubocop (>= 1.0) version_gem (~> 1.1, >= 1.1.13) ast (2.4.3) - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -504,6 +589,8 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) @@ -550,11 +637,15 @@ PLATFORMS DEPENDENCIES appraisal2 (~> 3.1, >= 3.1.4) appraisal2-rubocop (~> 0.2, >= 0.2.3) + 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! @@ -564,6 +655,7 @@ DEPENDENCIES erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) + go-merge! irb (~> 1.17) json-merge! kettle-drift (~> 1.0, >= 1.0.5) @@ -577,6 +669,8 @@ DEPENDENCIES markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! prism-merge! psych-merge! rake (~> 13.0) @@ -593,12 +687,15 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0, >= 3.0.6) ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (~> 1.54, >= 1.54.0) stone_checksums (~> 1.0, >= 1.0.6) stringio (>= 3.0) toml-merge! tree_haver! turbo_tests2 (~> 3.1, >= 3.1.14) + typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.3) yaml-merge! @@ -608,6 +705,7 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.3) yard-yaml (~> 0.2, >= 0.2.3) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -619,10 +717,13 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 @@ -649,6 +750,7 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 @@ -678,6 +780,8 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 @@ -728,6 +832,7 @@ 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.0.1) sha256=419d93c40484159d20b40e26e9a83cdd4c3afa2f3fd443bb8946c301cd658d75 @@ -735,6 +840,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.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -749,12 +855,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) sha256=ad6743a373eeac954c1b659b17af3aff1c82918b3ce9c9dc572a7c70ff843cdd tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -768,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/kramdown-merge/Gemfile.lock b/gems/kramdown-merge/Gemfile.lock index 637d35c66..225c975d8 100644 --- a/gems/kramdown-merge/Gemfile.lock +++ b/gems/kramdown-merge/Gemfile.lock @@ -16,6 +16,264 @@ PATH markdown-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +285,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -103,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -131,10 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -274,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -326,11 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -377,23 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -402,31 +684,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -434,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -446,11 +752,15 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 @@ -461,6 +771,8 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -475,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -486,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -513,9 +830,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -524,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -537,14 +858,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -552,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) 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 a8d0a4af5..84f64ba9a 100644 --- a/gems/parslet-toml-merge/Gemfile.lock +++ b/gems/parslet-toml-merge/Gemfile.lock @@ -16,14 +16,6 @@ PATH toml-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -332,6 +324,10 @@ GEM version_gem (~> 1.1, >= 1.1.13) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) tree_haver (7.1.0) citrus (~> 3.0) parslet (~> 2.0) @@ -412,7 +408,6 @@ DEPENDENCIES standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_sitter_language_pack! yaml-converter (~> 0.1) yard (~> 0.9, >= 0.9.44) diff --git a/gems/prism-merge/Gemfile.lock b/gems/prism-merge/Gemfile.lock index 41da0b771..db435792f 100644 --- a/gems/prism-merge/Gemfile.lock +++ b/gems/prism-merge/Gemfile.lock @@ -16,6 +16,264 @@ PATH ruby-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +285,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -103,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -131,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -267,13 +529,11 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -326,11 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -377,23 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -402,31 +684,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -434,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -446,19 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -473,11 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -485,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -516,6 +834,8 @@ 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -524,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -537,14 +858,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -552,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/psych-merge/Gemfile.lock b/gems/psych-merge/Gemfile.lock index 9b710041d..c1770d746 100644 --- a/gems/psych-merge/Gemfile.lock +++ b/gems/psych-merge/Gemfile.lock @@ -17,6 +17,237 @@ PATH version_gem (~> 1.1, >= 1.1.9) yaml-merge (= 7.1.0) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -62,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -125,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -153,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -292,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -344,6 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -390,24 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -416,12 +684,17 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) yaml-merge! yard (~> 0.9, >= 0.9.44) @@ -430,19 +703,35 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -450,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -462,19 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -489,9 +787,12 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 @@ -501,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -528,9 +830,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -539,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -552,10 +858,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -568,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 3e6afb8f66e367f9e8406e6e7d0afceb27e8a98c Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 16:40:15 -0600 Subject: [PATCH 027/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/commonmarker-merge/Gemfile.lock | 13 +- gems/kramdown-merge/.gitattributes | 2 +- gems/kramdown-merge/.kettle-drift.lock | 60 +- gems/kramdown-merge/Gemfile | 40 ++ gems/kramdown-merge/Gemfile.lock | 346 +-------- gems/prism-merge/.gitattributes | 2 +- gems/prism-merge/.kettle-drift.lock | 60 +- gems/prism-merge/.rubocop_gradual.lock | 736 -------------------- gems/prism-merge/Gemfile | 70 +- gems/prism-merge/Gemfile.lock | 59 +- gems/prism-merge/Rakefile | 18 +- gems/prism-merge/bin/yard | 2 +- gems/prism-merge/lib/prism/merge/version.rb | 2 +- gems/smorg-rb/Gemfile.lock | 399 ++++++++--- 14 files changed, 523 insertions(+), 1286 deletions(-) delete mode 100644 gems/prism-merge/.rubocop_gradual.lock diff --git a/gems/commonmarker-merge/Gemfile.lock b/gems/commonmarker-merge/Gemfile.lock index daf0cfd1b..46cd4b3fc 100644 --- a/gems/commonmarker-merge/Gemfile.lock +++ b/gems/commonmarker-merge/Gemfile.lock @@ -16,14 +16,6 @@ PATH markdown-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -145,6 +137,10 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -400,7 +396,6 @@ DEPENDENCIES kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-parser-gfm (~> 1.1) - markdown-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) rake (~> 13.0) diff --git a/gems/kramdown-merge/.gitattributes b/gems/kramdown-merge/.gitattributes index 0ac65aaa7..35a3c7359 100644 --- a/gems/kramdown-merge/.gitattributes +++ b/gems/kramdown-merge/.gitattributes @@ -1,5 +1,5 @@ # <> do not edit below this line -*.rb diff=smorg-ruby +*.rb diff=smorg-rb *.go diff=smorg-go *.rs diff=smorg-rs # <> diff --git a/gems/kramdown-merge/.kettle-drift.lock b/gems/kramdown-merge/.kettle-drift.lock index 1dad17e1d..9878fb8f5 100644 --- a/gems/kramdown-merge/.kettle-drift.lock +++ b/gems/kramdown-merge/.kettle-drift.lock @@ -4,7 +4,8 @@ "file": "Gemfile", "lines": [ 79, - 119 + 119, + 159 ] } ], @@ -13,7 +14,8 @@ "file": "Gemfile", "lines": [ 90, - 130 + 130, + 170 ] } ], @@ -22,7 +24,8 @@ "file": "Gemfile", "lines": [ 80, - 120 + 120, + 160 ] } ], @@ -31,7 +34,8 @@ "file": "Gemfile", "lines": [ 92, - 132 + 132, + 172 ] } ], @@ -40,7 +44,8 @@ "file": "Gemfile", "lines": [ 95, - 135 + 135, + 175 ] } ], @@ -49,7 +54,8 @@ "file": "Gemfile", "lines": [ 81, - 121 + 121, + 161 ] } ], @@ -59,7 +65,8 @@ "lines": [ 59, 99, - 139 + 139, + 179 ] } ], @@ -68,7 +75,8 @@ "file": "Gemfile", "lines": [ 100, - 140 + 140, + 180 ] } ], @@ -78,7 +86,8 @@ "lines": [ 42, 86, - 126 + 126, + 166 ] } ], @@ -87,7 +96,8 @@ "file": "Gemfile", "lines": [ 109, - 149 + 149, + 189 ] } ], @@ -97,7 +107,8 @@ "lines": [ 34, 78, - 118 + 118, + 158 ] } ], @@ -107,7 +118,8 @@ "lines": [ 68, 108, - 148 + 148, + 188 ] } ], @@ -116,7 +128,8 @@ "file": "Gemfile", "lines": [ 84, - 124 + 124, + 164 ] } ], @@ -126,7 +139,8 @@ "lines": [ 47, 91, - 131 + 131, + 171 ] } ], @@ -136,7 +150,8 @@ "lines": [ 43, 87, - 127 + 127, + 167 ] } ], @@ -145,7 +160,8 @@ "file": "Gemfile", "lines": [ 85, - 125 + 125, + 165 ] } ], @@ -154,7 +170,8 @@ "file": "Gemfile", "lines": [ 102, - 142 + 142, + 182 ] } ], @@ -163,7 +180,8 @@ "file": "Gemfile", "lines": [ 101, - 141 + 141, + 181 ] } ], @@ -172,7 +190,8 @@ "file": "Gemfile", "lines": [ 96, - 136 + 136, + 176 ] } ], @@ -181,7 +200,8 @@ "file": "Gemfile", "lines": [ 105, - 145 + 145, + 185 ] } ], diff --git a/gems/kramdown-merge/Gemfile b/gems/kramdown-merge/Gemfile index c70bf0eb5..dac95ecad 100644 --- a/gems/kramdown-merge/Gemfile +++ b/gems/kramdown-merge/Gemfile @@ -151,6 +151,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/kramdown-merge/Gemfile.lock b/gems/kramdown-merge/Gemfile.lock index 225c975d8..616ee1f23 100644 --- a/gems/kramdown-merge/Gemfile.lock +++ b/gems/kramdown-merge/Gemfile.lock @@ -16,256 +16,6 @@ PATH markdown-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: @@ -285,6 +35,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -293,12 +48,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -357,13 +106,11 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - kettle-dev (2.3.6) + kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -392,7 +139,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -532,8 +278,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -586,11 +330,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -637,45 +381,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -684,54 +407,31 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -739,7 +439,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,15 +451,11 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) - kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) + kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 @@ -771,8 +466,6 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +480,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +491,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,12 +518,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -844,7 +529,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -858,19 +542,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -878,7 +557,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/prism-merge/.gitattributes b/gems/prism-merge/.gitattributes index 0ac65aaa7..35a3c7359 100644 --- a/gems/prism-merge/.gitattributes +++ b/gems/prism-merge/.gitattributes @@ -1,5 +1,5 @@ # <> do not edit below this line -*.rb diff=smorg-ruby +*.rb diff=smorg-rb *.go diff=smorg-go *.rs diff=smorg-rs # <> diff --git a/gems/prism-merge/.kettle-drift.lock b/gems/prism-merge/.kettle-drift.lock index 1dad17e1d..9878fb8f5 100644 --- a/gems/prism-merge/.kettle-drift.lock +++ b/gems/prism-merge/.kettle-drift.lock @@ -4,7 +4,8 @@ "file": "Gemfile", "lines": [ 79, - 119 + 119, + 159 ] } ], @@ -13,7 +14,8 @@ "file": "Gemfile", "lines": [ 90, - 130 + 130, + 170 ] } ], @@ -22,7 +24,8 @@ "file": "Gemfile", "lines": [ 80, - 120 + 120, + 160 ] } ], @@ -31,7 +34,8 @@ "file": "Gemfile", "lines": [ 92, - 132 + 132, + 172 ] } ], @@ -40,7 +44,8 @@ "file": "Gemfile", "lines": [ 95, - 135 + 135, + 175 ] } ], @@ -49,7 +54,8 @@ "file": "Gemfile", "lines": [ 81, - 121 + 121, + 161 ] } ], @@ -59,7 +65,8 @@ "lines": [ 59, 99, - 139 + 139, + 179 ] } ], @@ -68,7 +75,8 @@ "file": "Gemfile", "lines": [ 100, - 140 + 140, + 180 ] } ], @@ -78,7 +86,8 @@ "lines": [ 42, 86, - 126 + 126, + 166 ] } ], @@ -87,7 +96,8 @@ "file": "Gemfile", "lines": [ 109, - 149 + 149, + 189 ] } ], @@ -97,7 +107,8 @@ "lines": [ 34, 78, - 118 + 118, + 158 ] } ], @@ -107,7 +118,8 @@ "lines": [ 68, 108, - 148 + 148, + 188 ] } ], @@ -116,7 +128,8 @@ "file": "Gemfile", "lines": [ 84, - 124 + 124, + 164 ] } ], @@ -126,7 +139,8 @@ "lines": [ 47, 91, - 131 + 131, + 171 ] } ], @@ -136,7 +150,8 @@ "lines": [ 43, 87, - 127 + 127, + 167 ] } ], @@ -145,7 +160,8 @@ "file": "Gemfile", "lines": [ 85, - 125 + 125, + 165 ] } ], @@ -154,7 +170,8 @@ "file": "Gemfile", "lines": [ 102, - 142 + 142, + 182 ] } ], @@ -163,7 +180,8 @@ "file": "Gemfile", "lines": [ 101, - 141 + 141, + 181 ] } ], @@ -172,7 +190,8 @@ "file": "Gemfile", "lines": [ 96, - 136 + 136, + 176 ] } ], @@ -181,7 +200,8 @@ "file": "Gemfile", "lines": [ 105, - 145 + 145, + 185 ] } ], diff --git a/gems/prism-merge/.rubocop_gradual.lock b/gems/prism-merge/.rubocop_gradual.lock deleted file mode 100644 index a0d47aef9..000000000 --- a/gems/prism-merge/.rubocop_gradual.lock +++ /dev/null @@ -1,736 +0,0 @@ -{ - ".simplecov:3138125134": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:22363789": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/prism-merge.rb:226590672": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`prism-merge.rb`) should use snake_case.", 5381] - ], - "lib/prism/merge.rb:3873409785": [ - [12, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Prism::Merge`.", 2866359175], - [12, 3, 53263, "Metrics/ModuleLength: Module has too many lines. [1222/100]", 1955834049], - [13, 5, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631], - [24, 5, 16, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::ParseError`.", 362242086], - [120, 5, 1996, "Metrics/MethodLength: Method has too many lines. [42/10]", 709892915], - [165, 5, 1804, "Metrics/MethodLength: Method has too many lines. [37/10]", 3641862107], - [205, 5, 1012, "Metrics/MethodLength: Method has too many lines. [23/10]", 3112984532], - [243, 5, 695, "Metrics/MethodLength: Method has too many lines. [17/10]", 321495946], - [263, 5, 1801, "Metrics/MethodLength: Method has too many lines. [37/10]", 3355654893], - [264, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 180584319], - [303, 5, 7357, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_structured_edit_batch_report_projection` is too high. [<1, 31, 0> 31.02/17]", 2583247591], - [303, 5, 7357, "Metrics/MethodLength: Method has too many lines. [139/10]", 2583247591], - [304, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 180584319], - [323, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 949635646], - [361, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1330685294], - [445, 5, 811, "Metrics/MethodLength: Method has too many lines. [21/10]", 2894794051], - [471, 5, 491, "Metrics/MethodLength: Method has too many lines. [12/10]", 3211170428], - [486, 5, 3212, "Metrics/AbcSize: Assignment Branch Condition size for `parse_ruby_normalized` is too high. [<20, 64, 28> 72.66/17]", 1170714005], - [486, 5, 3212, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_ruby_normalized` is too high. [23/7]", 1170714005], - [486, 5, 3212, "Metrics/MethodLength: Method has too many lines. [70/10]", 1170714005], - [486, 5, 3212, "Metrics/PerceivedComplexity: Perceived complexity for `parse_ruby_normalized` is too high. [23/8]", 1170714005], - [566, 5, 3671, "Metrics/AbcSize: Assignment Branch Condition size for `apply_edit_projection` is too high. [<14, 62, 19> 66.34/17]", 1859418783], - [566, 5, 3671, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_edit_projection` is too high. [12/7]", 1859418783], - [566, 5, 3671, "Metrics/MethodLength: Method has too many lines. [66/10]", 1859418783], - [566, 5, 3671, "Metrics/PerceivedComplexity: Perceived complexity for `apply_edit_projection` is too high. [13/8]", 1859418783], - [612, 18, 176, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 3247522762], - [645, 5, 1505, "Metrics/MethodLength: Method has too many lines. [33/10]", 2499202345], - [645, 19, 292, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 676979469], - [706, 5, 583, "Metrics/MethodLength: Method has too many lines. [13/10]", 1484312517], - [723, 5, 551, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_ruby_require_aliases` is too high. [<11, 15, 7> 19.87/17]", 2507514607], - [723, 5, 551, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_ruby_require_aliases` is too high. [8/7]", 2507514607], - [723, 5, 551, "Metrics/MethodLength: Method has too many lines. [17/10]", 2507514607], - [744, 5, 304, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_dsl_call_node` is too high. [8/7]", 2466841613], - [767, 5, 1305, "Metrics/AbcSize: Assignment Branch Condition size for `merge_ruby_with_reviewed_nested_outputs` is too high. [<7, 17, 5> 19.05/17]", 3657868136], - [767, 5, 1305, "Metrics/MethodLength: Method has too many lines. [27/10]", 3657868136], - [767, 48, 140, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 132256850], - [800, 5, 1015, "Metrics/MethodLength: Method has too many lines. [17/10]", 757789356], - [810, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 1956194284], - [823, 5, 928, "Metrics/MethodLength: Method has too many lines. [16/10]", 1039420596], - [833, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 3013228499], - [845, 5, 1003, "Metrics/MethodLength: Method has too many lines. [17/10]", 3313354796], - [855, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1636990749], - [868, 5, 936, "Metrics/MethodLength: Method has too many lines. [16/10]", 2825710110], - [878, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 3013228499], - [902, 5, 662, "Metrics/MethodLength: Method has too many lines. [19/10]", 772959042], - [923, 7, 11, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 848344986], - [926, 5, 849, "Metrics/AbcSize: Assignment Branch Condition size for `prism_ruby_discovered_surfaces` is too high. [<12, 16, 6> 20.88/17]", 2509812469], - [926, 5, 849, "Metrics/MethodLength: Method has too many lines. [23/10]", 2509812469], - [957, 5, 1195, "Metrics/AbcSize: Assignment Branch Condition size for `prism_ruby_surfaces_for_owner` is too high. [<6, 19, 3> 20.15/17]", 1713430182], - [957, 5, 1195, "Metrics/MethodLength: Method has too many lines. [20/10]", 1713430182], - [982, 5, 1563, "Metrics/AbcSize: Assignment Branch Condition size for `prism_ruby_example_surfaces` is too high. [<9, 26, 9> 28.95/17]", 2122389118], - [982, 5, 1563, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `prism_ruby_example_surfaces` is too high. [9/7]", 2122389118], - [982, 5, 1563, "Metrics/MethodLength: Method has too many lines. [28/10]", 2122389118], - [982, 5, 1563, "Metrics/PerceivedComplexity: Perceived complexity for `prism_ruby_example_surfaces` is too high. [9/8]", 2122389118], - [1042, 7, 3, "Layout/BlockAlignment: `end` at 1042, 6 is not aligned with `%w[coding encoding frozen_string_literal shareable_constant_value typed` at 1039, 22 or `warn_indent].any? do |prefix|` at 1040, 25.", 193405706], - [1088, 5, 421, "Metrics/MethodLength: Method has too many lines. [14/10]", 26440736], - [1119, 5, 827, "Metrics/MethodLength: Method has too many lines. [18/10]", 4288402374], - [1160, 5, 876, "Metrics/MethodLength: Method has too many lines. [23/10]", 3423854231], - [1198, 5, 1155, "Metrics/AbcSize: Assignment Branch Condition size for `prism_comment_node` is too high. [<1, 22, 0> 22.02/17]", 4287909739], - [1198, 5, 1155, "Metrics/MethodLength: Method has too many lines. [28/10]", 4287909739], - [1229, 5, 888, "Metrics/MethodLength: Method has too many lines. [27/10]", 3798554661], - [1282, 5, 920, "Metrics/MethodLength: Method has too many lines. [23/10]", 917985568] - ], - "lib/prism/merge/begin_node_clause_body_merger.rb:1042804537": [ - [5, 5, 31, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::BeginNodeClauseBodyMerger`.", 1242162299], - [19, 7, 1511, "Metrics/AbcSize: Assignment Branch Condition size for `merge` is too high. [<5, 37, 1> 37.35/17]", 3275719934], - [19, 7, 1511, "Metrics/MethodLength: Method has too many lines. [32/10]", 3275719934] - ], - "lib/prism/merge/begin_node_clause_body_support.rb:2935202369": [ - [5, 5, 32, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::BeginNodeClauseBodySupport`.", 3341069278], - [5, 5, 7532, "Metrics/ClassLength: Class has too many lines. [143/100]", 1403116805], - [8, 21, 100, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 4145084810], - [22, 7, 937, "Metrics/AbcSize: Assignment Branch Condition size for `clause_header_end_line` is too high. [<5, 29, 16> 33.5/17]", 2050282033], - [22, 7, 937, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `clause_header_end_line` is too high. [16/7]", 2050282033], - [22, 7, 937, "Metrics/MethodLength: Method has too many lines. [14/10]", 2050282033], - [22, 7, 937, "Metrics/PerceivedComplexity: Perceived complexity for `clause_header_end_line` is too high. [16/8]", 2050282033], - [35, 63, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [55, 9, 23, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 1178765246], - [58, 7, 419, "Metrics/MethodLength: Method has too many lines. [11/10]", 3825428834], - [81, 7, 2424, "Metrics/AbcSize: Assignment Branch Condition size for `clause_body_components` is too high. [<12, 35, 16> 40.31/17]", 199420029], - [81, 7, 2424, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `clause_body_components` is too high. [13/7]", 199420029], - [81, 7, 2424, "Metrics/MethodLength: Method has too many lines. [40/10]", 199420029], - [81, 7, 2424, "Metrics/PerceivedComplexity: Perceived complexity for `clause_body_components` is too high. [14/8]", 199420029], - [127, 30, 23, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 1178765246], - [165, 7, 862, "Metrics/AbcSize: Assignment Branch Condition size for `clause_bodies_have_matching_statements?` is too high. [<3, 19, 2> 19.34/17]", 4182083840], - [165, 7, 862, "Metrics/MethodLength: Method has too many lines. [15/10]", 4182083840] - ], - "lib/prism/merge/begin_node_clause_header_emitter.rb:2991300768": [ - [5, 5, 34, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::BeginNodeClauseHeaderEmitter`.", 217025096], - [14, 7, 1600, "Metrics/AbcSize: Assignment Branch Condition size for `emit` is too high. [<10, 22, 17> 29.55/17]", 4242535078], - [14, 7, 1600, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit` is too high. [11/7]", 4242535078], - [14, 7, 1600, "Metrics/MethodLength: Method has too many lines. [25/10]", 4242535078], - [14, 7, 1600, "Metrics/PerceivedComplexity: Perceived complexity for `emit` is too high. [11/8]", 4242535078], - [14, 15, 164, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2644486585] - ], - "lib/prism/merge/begin_node_merge_planner.rb:3840396716": [ - [5, 5, 27, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::BeginNodeMergePlanner`.", 3356052894], - [5, 5, 9876, "Metrics/ClassLength: Class has too many lines. [185/100]", 148070692], - [30, 7, 2144, "Metrics/AbcSize: Assignment Branch Condition size for `plan` is too high. [<15, 34, 11> 38.76/17]", 3596380485], - [30, 7, 2144, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `plan` is too high. [10/7]", 3596380485], - [30, 7, 2144, "Metrics/MethodLength: Method has too many lines. [39/10]", 3596380485], - [30, 7, 2144, "Metrics/PerceivedComplexity: Perceived complexity for `plan` is too high. [11/8]", 3596380485], - [84, 7, 4383, "Metrics/AbcSize: Assignment Branch Condition size for `build_shared_clause_step` is too high. [<19, 70, 24> 76.4/17]", 2837542267], - [84, 7, 4383, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_shared_clause_step` is too high. [16/7]", 2837542267], - [84, 7, 4383, "Metrics/MethodLength: Method has too many lines. [73/10]", 2837542267], - [84, 7, 4383, "Metrics/PerceivedComplexity: Perceived complexity for `build_shared_clause_step` is too high. [18/8]", 2837542267], - [103, 121, 59, "Layout/LineLength: Line is too long. [179/120]", 357928082], - [105, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 1163790852], - [142, 121, 35, "Layout/LineLength: Line is too long. [155/120]", 3447647282], - [143, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 1267386383], - [167, 7, 2428, "Metrics/AbcSize: Assignment Branch Condition size for `build_unmatched_clause_step` is too high. [<2, 28, 21> 35.06/17]", 2984621385], - [167, 7, 2428, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_unmatched_clause_step` is too high. [17/7]", 2984621385], - [167, 7, 2428, "Metrics/MethodLength: Method has too many lines. [38/10]", 2984621385], - [167, 7, 2428, "Metrics/PerceivedComplexity: Perceived complexity for `build_unmatched_clause_step` is too high. [19/8]", 2984621385], - [188, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 549521717], - [198, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 619697310] - ], - "lib/prism/merge/begin_node_plan_emitter.rb:372252499": [ - [5, 5, 26, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::BeginNodePlanEmitter`.", 926648201], - [14, 7, 740, "Metrics/MethodLength: Method has too many lines. [16/10]", 2040521865], - [14, 15, 105, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1812434716], - [36, 7, 1205, "Metrics/MethodLength: Method has too many lines. [24/10]", 4164487211], - [36, 20, 127, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 466430575], - [76, 7, 1308, "Metrics/AbcSize: Assignment Branch Condition size for `emit_copied_unmatched_clause` is too high. [<6, 30, 11> 32.51/17]", 1339054986], - [76, 7, 1308, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_copied_unmatched_clause` is too high. [10/7]", 1339054986], - [76, 7, 1308, "Metrics/MethodLength: Method has too many lines. [21/10]", 1339054986], - [76, 7, 1308, "Metrics/PerceivedComplexity: Perceived complexity for `emit_copied_unmatched_clause` is too high. [10/8]", 1339054986], - [76, 39, 146, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2474530127] - ], - "lib/prism/merge/begin_node_rescue_semantics.rb:2074892203": [ - [5, 5, 30, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::BeginNodeRescueSemantics`.", 4100560642], - [5, 5, 14314, "Metrics/ClassLength: Class has too many lines. [278/100]", 1353739428], - [13, 7, 1953, "Metrics/AbcSize: Assignment Branch Condition size for `normalized_clause_body_and_header_source` is too high. [<9, 13, 21> 26.29/17]", 1895019213], - [13, 7, 1953, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalized_clause_body_and_header_source` is too high. [15/7]", 1895019213], - [13, 7, 1953, "Metrics/MethodLength: Method has too many lines. [26/10]", 1895019213], - [13, 7, 1953, "Metrics/PerceivedComplexity: Perceived complexity for `normalized_clause_body_and_header_source` is too high. [17/8]", 1895019213], - [48, 7, 812, "Metrics/AbcSize: Assignment Branch Condition size for `merge_ordered_clause_types` is too high. [<9, 17, 8> 20.83/17]", 391537814], - [48, 7, 812, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_ordered_clause_types` is too high. [8/7]", 391537814], - [48, 7, 812, "Metrics/MethodLength: Method has too many lines. [16/10]", 391537814], - [48, 7, 812, "Metrics/PerceivedComplexity: Perceived complexity for `merge_ordered_clause_types` is too high. [9/8]", 391537814], - [71, 7, 1470, "Metrics/AbcSize: Assignment Branch Condition size for `canonicalize_rescue_clause_order` is too high. [<18, 28, 14> 36.11/17]", 570708009], - [71, 7, 1470, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonicalize_rescue_clause_order` is too high. [14/7]", 570708009], - [71, 7, 1470, "Metrics/MethodLength: Method has too many lines. [24/10]", 570708009], - [71, 7, 1470, "Metrics/PerceivedComplexity: Perceived complexity for `canonicalize_rescue_clause_order` is too high. [14/8]", 570708009], - [125, 7, 530, "Metrics/AbcSize: Assignment Branch Condition size for `local_variable_read_names_in` is too high. [<1, 16, 9> 18.38/17]", 2555890222], - [125, 7, 530, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `local_variable_read_names_in` is too high. [8/7]", 2555890222], - [125, 7, 530, "Metrics/MethodLength: Method has too many lines. [12/10]", 2555890222], - [125, 7, 530, "Metrics/PerceivedComplexity: Perceived complexity for `local_variable_read_names_in` is too high. [9/8]", 2555890222], - [177, 7, 618, "Metrics/AbcSize: Assignment Branch Condition size for `rewrite_local_reference_in_source` is too high. [<6, 16, 9> 19.31/17]", 1195871443], - [177, 7, 618, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `rewrite_local_reference_in_source` is too high. [9/7]", 1195871443], - [177, 7, 618, "Metrics/PerceivedComplexity: Perceived complexity for `rewrite_local_reference_in_source` is too high. [9/8]", 1195871443], - [230, 7, 1342, "Metrics/AbcSize: Assignment Branch Condition size for `source_defined_exception_hierarchy` is too high. [<10, 30, 14> 34.58/17]", 1939854289], - [230, 7, 1342, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `source_defined_exception_hierarchy` is too high. [14/7]", 1939854289], - [230, 7, 1342, "Metrics/MethodLength: Method has too many lines. [19/10]", 1939854289], - [230, 7, 1342, "Metrics/PerceivedComplexity: Perceived complexity for `source_defined_exception_hierarchy` is too high. [15/8]", 1939854289], - [234, 85, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [248, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1806710570], - [256, 7, 1233, "Metrics/AbcSize: Assignment Branch Condition size for `collect_source_defined_exception_definitions` is too high. [<4, 22, 9> 24.1/17]", 1970916346], - [256, 7, 1233, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_source_defined_exception_definitions` is too high. [10/7]", 1970916346], - [256, 7, 1233, "Metrics/MethodLength: Method has too many lines. [24/10]", 1970916346] - ], - "lib/prism/merge/begin_node_structure.rb:1595718070": [ - [5, 5, 24, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::BeginNodeStructure`.", 3506219929], - [5, 5, 4283, "Metrics/ClassLength: Class has too many lines. [106/100]", 1740419888], - [26, 7, 375, "Metrics/AbcSize: Assignment Branch Condition size for `boundary_lines` is too high. [<0, 28, 7> 28.86/17]", 3399008793], - [26, 7, 375, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `boundary_lines` is too high. [8/7]", 3399008793], - [38, 7, 251, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `clause_start_line` is too high. [8/7]", 1553904487], - [48, 7, 407, "Metrics/MethodLength: Method has too many lines. [12/10]", 3851339415], - [64, 7, 1089, "Metrics/AbcSize: Assignment Branch Condition size for `clause_regions` is too high. [<9, 38, 9> 40.07/17]", 1916795013], - [64, 7, 1089, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `clause_regions` is too high. [10/7]", 1916795013], - [64, 7, 1089, "Metrics/MethodLength: Method has too many lines. [22/10]", 1916795013], - [64, 7, 1089, "Metrics/PerceivedComplexity: Perceived complexity for `clause_regions` is too high. [10/8]", 1916795013], - [91, 7, 613, "Metrics/AbcSize: Assignment Branch Condition size for `clause_nodes_by_type` is too high. [<9, 19, 4> 21.4/17]", 1693909219], - [91, 7, 613, "Metrics/MethodLength: Method has too many lines. [12/10]", 1693909219], - [107, 11, 19, "Naming/PredicatePrefix: Rename `has_clause_or_body?` to `clause_or_body?`.", 2163996991], - [111, 7, 598, "Metrics/AbcSize: Assignment Branch Condition size for `line_map_for` is too high. [<13, 15, 6> 20.74/17]", 191778789] - ], - "lib/prism/merge/block_directive_detector.rb:14576901": [ - [21, 5, 12462, "Metrics/ClassLength: Class has too many lines. [242/100]", 638189870], - [65, 7, 2365, "Metrics/AbcSize: Assignment Branch Condition size for `promote_spans_to_nodes` is too high. [<24, 42, 32> 58/17]", 2022543448], - [65, 7, 2365, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `promote_spans_to_nodes` is too high. [24/7]", 2022543448], - [65, 7, 2365, "Metrics/MethodLength: Method has too many lines. [36/10]", 2022543448], - [65, 7, 2365, "Metrics/PerceivedComplexity: Perceived complexity for `promote_spans_to_nodes` is too high. [25/8]", 2022543448], - [92, 11, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], - [125, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087921317], - [139, 7, 1121, "Metrics/AbcSize: Assignment Branch Condition size for `detect_freeze_spans` is too high. [<10, 18, 7> 21.75/17]", 2014886705], - [139, 7, 1121, "Metrics/MethodLength: Method has too many lines. [28/10]", 2014886705], - [139, 7, 1121, "Metrics/PerceivedComplexity: Perceived complexity for `detect_freeze_spans` is too high. [9/8]", 2014886705], - [176, 7, 1496, "Metrics/AbcSize: Assignment Branch Condition size for `detect_nocov_spans` is too high. [<10, 25, 10> 28.72/17]", 284113190], - [176, 7, 1496, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_nocov_spans` is too high. [9/7]", 284113190], - [176, 7, 1496, "Metrics/MethodLength: Method has too many lines. [40/10]", 284113190], - [176, 7, 1496, "Metrics/PerceivedComplexity: Perceived complexity for `detect_nocov_spans` is too high. [12/8]", 284113190], - [184, 9, 1163, "Metrics/BlockLength: Block has too many lines. [30/25]", 4100741046], - [227, 7, 966, "Metrics/AbcSize: Assignment Branch Condition size for `validate_no_crossing` is too high. [<8, 27, 19> 33.97/17]", 3041442390], - [227, 7, 966, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_no_crossing` is too high. [13/7]", 3041442390], - [227, 7, 966, "Metrics/MethodLength: Method has too many lines. [20/10]", 3041442390], - [227, 7, 966, "Metrics/PerceivedComplexity: Perceived complexity for `validate_no_crossing` is too high. [13/8]", 3041442390], - [304, 7, 832, "Metrics/MethodLength: Method has too many lines. [23/10]", 3204610677], - [330, 7, 1136, "Metrics/AbcSize: Assignment Branch Condition size for `rebuild_statements` is too high. [<15, 17, 9> 24.39/17]", 1114825097], - [330, 7, 1136, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `rebuild_statements` is too high. [10/7]", 1114825097], - [330, 7, 1136, "Metrics/MethodLength: Method has too many lines. [15/10]", 1114825097], - [330, 7, 1136, "Metrics/PerceivedComplexity: Perceived complexity for `rebuild_statements` is too high. [10/8]", 1114825097] - ], - "lib/prism/merge/comment/block.rb:3606937725": [ - [65, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1573406415] - ], - "lib/prism/merge/comment/parser.rb:1277632686": [ - [31, 9, 1747, "Metrics/AbcSize: Assignment Branch Condition size for `parse` is too high. [<10, 28, 8> 30.79/17]", 2837146927], - [31, 9, 1747, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse` is too high. [8/7]", 2837146927], - [31, 9, 1747, "Metrics/MethodLength: Method has too many lines. [34/10]", 2837146927], - [31, 9, 1747, "Metrics/PerceivedComplexity: Perceived complexity for `parse` is too high. [9/8]", 2837146927], - [38, 11, 1390, "Metrics/BlockLength: Block has too many lines. [26/25]", 1396583578] - ], - "lib/prism/merge/comment_only_file_merger.rb:808070956": [ - [5, 5, 27, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::CommentOnlyFileMerger`.", 1927029952], - [5, 5, 11907, "Metrics/ClassLength: Class has too many lines. [256/100]", 2729825792], - [27, 7, 1628, "Metrics/AbcSize: Assignment Branch Condition size for `merge` is too high. [<15, 32, 8> 36.24/17]", 2481561114], - [27, 7, 1628, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge` is too high. [8/7]", 2481561114], - [27, 7, 1628, "Metrics/MethodLength: Method has too many lines. [34/10]", 2481561114], - [78, 7, 661, "Metrics/MethodLength: Method has too many lines. [18/10]", 1523408112], - [100, 7, 1781, "Metrics/AbcSize: Assignment Branch Condition size for `build_output_plan` is too high. [<10, 34, 20> 40.69/17]", 994360926], - [100, 7, 1781, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_output_plan` is too high. [17/7]", 994360926], - [100, 7, 1781, "Metrics/MethodLength: Method has too many lines. [30/10]", 994360926], - [100, 7, 1781, "Metrics/PerceivedComplexity: Perceived complexity for `build_output_plan` is too high. [19/8]", 994360926], - [123, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 530225423], - [149, 7, 1486, "Metrics/AbcSize: Assignment Branch Condition size for `add_comment_node_to_result` is too high. [<7, 34, 22> 41.1/17]", 1181795760], - [149, 7, 1486, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `add_comment_node_to_result` is too high. [16/7]", 1181795760], - [149, 7, 1486, "Metrics/MethodLength: Method has too many lines. [29/10]", 1181795760], - [149, 7, 1486, "Metrics/PerceivedComplexity: Perceived complexity for `add_comment_node_to_result` is too high. [20/8]", 1181795760], - [185, 7, 693, "Metrics/MethodLength: Method has too many lines. [16/10]", 3008008109], - [205, 7, 1035, "Metrics/AbcSize: Assignment Branch Condition size for `emit_layout_gap_to_result` is too high. [<6, 24, 11> 27.07/17]", 3441550295], - [205, 7, 1035, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_layout_gap_to_result` is too high. [9/7]", 3441550295], - [205, 7, 1035, "Metrics/MethodLength: Method has too many lines. [17/10]", 3441550295], - [205, 7, 1035, "Metrics/PerceivedComplexity: Perceived complexity for `emit_layout_gap_to_result` is too high. [10/8]", 3441550295], - [230, 7, 665, "Metrics/AbcSize: Assignment Branch Condition size for `emit_comment_only_prefix_lines` is too high. [<5, 21, 4> 21.95/17]", 1939505075], - [243, 7, 942, "Metrics/MethodLength: Method has too many lines. [19/10]", 2012616838] - ], - "lib/prism/merge/file_analysis.rb:738048557": [ - [16, 5, 55295, "Metrics/ClassLength: Class has too many lines. [623/100]", 2951008665], - [19, 7, 28, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::FileAnalysis::NativeCommentAugmenter`.", 2321467727], - [19, 7, 5712, "Metrics/ClassLength: Class has too many lines. [121/100]", 3225634005], - [22, 9, 605, "Metrics/MethodLength: Method has too many lines. [16/10]", 3935631704], - [47, 9, 2672, "Metrics/AbcSize: Assignment Branch Condition size for `build!` is too high. [<19, 55, 23> 62.57/17]", 3140666915], - [47, 9, 2672, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build!` is too high. [22/7]", 3140666915], - [47, 9, 2672, "Metrics/MethodLength: Method has too many lines. [47/10]", 3140666915], - [47, 9, 2672, "Metrics/PerceivedComplexity: Perceived complexity for `build!` is too high. [22/8]", 3140666915], - [120, 9, 779, "Metrics/AbcSize: Assignment Branch Condition size for `attach_orphan_region_to_nearest_owner` is too high. [<4, 18, 3> 18.68/17]", 714646861], - [120, 9, 779, "Metrics/MethodLength: Method has too many lines. [15/10]", 714646861], - [212, 7, 1593, "Metrics/MethodLength: Method has too many lines. [17/10]", 3233444968], - [345, 7, 1177, "Metrics/MethodLength: Method has too many lines. [23/10]", 853358252], - [387, 7, 587, "Metrics/MethodLength: Method has too many lines. [13/10]", 241044926], - [453, 7, 1099, "Metrics/AbcSize: Assignment Branch Condition size for `frozen_node?` is too high. [<3, 16, 7> 17.72/17]", 1886536218], - [453, 7, 1099, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `frozen_node?` is too high. [8/7]", 1886536218], - [587, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858904], - [588, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 442686854], - [659, 7, 779, "Metrics/AbcSize: Assignment Branch Condition size for `split_first_owner_preamble_entries` is too high. [<9, 20, 10> 24.1/17]", 2477766314], - [659, 7, 779, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split_first_owner_preamble_entries` is too high. [9/7]", 2477766314], - [659, 7, 779, "Metrics/MethodLength: Method has too many lines. [11/10]", 2477766314], - [659, 7, 779, "Metrics/PerceivedComplexity: Perceived complexity for `split_first_owner_preamble_entries` is too high. [9/8]", 2477766314], - [669, 9, 11, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 848344986], - [716, 7, 768, "Metrics/MethodLength: Method has too many lines. [15/10]", 3855207561], - [742, 7, 609, "Metrics/MethodLength: Method has too many lines. [15/10]", 3157294863], - [828, 7, 2509, "Metrics/AbcSize: Assignment Branch Condition size for `extract_and_integrate_all_nodes` is too high. [<11, 29, 16> 34.9/17]", 1138957888], - [828, 7, 2509, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_and_integrate_all_nodes` is too high. [14/7]", 1138957888], - [828, 7, 2509, "Metrics/MethodLength: Method has too many lines. [32/10]", 1138957888], - [828, 7, 2509, "Metrics/PerceivedComplexity: Perceived complexity for `extract_and_integrate_all_nodes` is too high. [16/8]", 1138957888], - [897, 7, 1325, "Metrics/AbcSize: Assignment Branch Condition size for `extract_nodes_with_comments` is too high. [<3, 25, 7> 26.13/17]", 1498557944], - [897, 7, 1325, "Metrics/MethodLength: Method has too many lines. [23/10]", 1498557944], - [1009, 7, 11719, "Metrics/AbcSize: Assignment Branch Condition size for `compute_node_signature` is too high. [<19, 139, 94> 168.9/17]", 2654183611], - [1009, 7, 11719, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_node_signature` is too high. [82/7]", 2654183611], - [1009, 7, 11719, "Metrics/MethodLength: Method has too many lines. [141/10]", 2654183611], - [1009, 7, 11719, "Metrics/PerceivedComplexity: Perceived complexity for `compute_node_signature` is too high. [70/8]", 2654183611], - [1070, 88, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [1074, 24, 300, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 2690302041], - [1074, 55, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [1299, 7, 680, "Metrics/AbcSize: Assignment Branch Condition size for `detect_gemspec_block_var` is too high. [<3, 22, 15> 26.8/17]", 3676370299], - [1299, 7, 680, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_gemspec_block_var` is too high. [14/7]", 3676370299], - [1299, 7, 680, "Metrics/MethodLength: Method has too many lines. [14/10]", 3676370299], - [1299, 7, 680, "Metrics/PerceivedComplexity: Perceived complexity for `detect_gemspec_block_var` is too high. [14/8]", 3676370299] - ], - "lib/prism/merge/freeze_node.rb:2471800311": [ - [67, 7, 577, "Metrics/MethodLength: Method has too many lines. [11/10]", 2189574632], - [67, 21, 186, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1006469938], - [124, 7, 2888, "Metrics/AbcSize: Assignment Branch Condition size for `validate_structure!` is too high. [<13, 32, 33> 47.77/17]", 3621186151], - [124, 7, 2888, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_structure!` is too high. [24/7]", 3621186151], - [124, 7, 2888, "Metrics/MethodLength: Method has too many lines. [38/10]", 3621186151], - [124, 7, 2888, "Metrics/PerceivedComplexity: Perceived complexity for `validate_structure!` is too high. [25/8]", 3621186151] - ], - "lib/prism/merge/magic_comment_support.rb:1214861451": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177608], - [3, 5, 26, "Style/Documentation: Missing top-level documentation comment for `module Prism::Merge::MagicCommentSupport`.", 1989707586], - [16, 7, 1484, "Metrics/AbcSize: Assignment Branch Condition size for `comment_only_prefix_info` is too high. [<9, 38, 8> 39.86/17]", 1098666313], - [16, 7, 1484, "Metrics/MethodLength: Method has too many lines. [33/10]", 1098666313], - [59, 7, 693, "Metrics/AbcSize: Assignment Branch Condition size for `header_magic_comment_types_for_lines` is too high. [<10, 13, 9> 18.71/17]", 3693768719], - [59, 7, 693, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `header_magic_comment_types_for_lines` is too high. [8/7]", 3693768719], - [59, 7, 693, "Metrics/MethodLength: Method has too many lines. [16/10]", 3693768719], - [83, 7, 748, "Metrics/AbcSize: Assignment Branch Condition size for `prefix_comment_line_numbers_for_comments` is too high. [<10, 12, 7> 17.12/17]", 335042389], - [83, 7, 748, "Metrics/MethodLength: Method has too many lines. [19/10]", 335042389] - ], - "lib/prism/merge/merge_result.rb:1970522956": [ - [9, 5, 12561, "Metrics/ClassLength: Class has too many lines. [238/100]", 3020348188], - [67, 7, 5058, "Metrics/AbcSize: Assignment Branch Condition size for `add_node` is too high. [<25, 54, 38> 70.6/17]", 2165268226], - [67, 7, 5058, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `add_node` is too high. [22/7]", 2165268226], - [67, 7, 5058, "Metrics/MethodLength: Method has too many lines. [94/10]", 2165268226], - [67, 7, 5058, "Metrics/PerceivedComplexity: Perceived complexity for `add_node` is too high. [31/8]", 2165268226], - [74, 9, 1617, "Metrics/BlockLength: Block has too many lines. [34/25]", 3544860826], - [175, 38, 40, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 3558364074], - [193, 9, 24, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 1750147806], - [219, 7, 901, "Metrics/AbcSize: Assignment Branch Condition size for `debug_output` is too high. [<5, 29, 5> 29.85/17]", 2776830125], - [219, 7, 901, "Metrics/MethodLength: Method has too many lines. [25/10]", 2776830125], - [296, 7, 903, "Metrics/MethodLength: Method has too many lines. [18/10]", 2752342414] - ], - "lib/prism/merge/method_match_refiner.rb:3086922470": [ - [98, 7, 678, "Metrics/AbcSize: Assignment Branch Condition size for `param_similarity` is too high. [<6, 21, 4> 22.2/17]", 2054244811], - [121, 7, 705, "Metrics/AbcSize: Assignment Branch Condition size for `extract_param_names` is too high. [<2, 37, 16> 40.36/17]", 3200522215], - [121, 7, 705, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_param_names` is too high. [17/7]", 3200522215], - [121, 7, 705, "Metrics/MethodLength: Method has too many lines. [11/10]", 3200522215], - [121, 7, 705, "Metrics/PerceivedComplexity: Perceived complexity for `extract_param_names` is too high. [17/8]", 3200522215], - [129, 49, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [132, 65, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [160, 7, 854, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<13, 29, 8> 32.77/17]", 2946547420], - [160, 7, 854, "Metrics/MethodLength: Method has too many lines. [20/10]", 2946547420] - ], - "lib/prism/merge/nested_statement_walker.rb:3826169704": [ - [24, 7, 695, "Metrics/MethodLength: Method has too many lines. [16/10]", 3744912119], - [45, 7, 518, "Metrics/MethodLength: Method has too many lines. [12/10]", 2978518157] - ], - "lib/prism/merge/nocov_node.rb:3116182832": [ - [59, 21, 84, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3439911158], - [90, 19, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [143, 7, 353, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `signature` is too high. [8/7]", 3442013923], - [143, 7, 353, "Metrics/PerceivedComplexity: Perceived complexity for `signature` is too high. [9/8]", 3442013923] - ], - "lib/prism/merge/node_body_layout.rb:1642074264": [ - [5, 5, 20, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::NodeBodyLayout`.", 1262407425], - [5, 5, 5858, "Metrics/ClassLength: Class has too many lines. [127/100]", 2663802475], - [14, 7, 413, "Metrics/AbcSize: Assignment Branch Condition size for `body_text` is too high. [<2, 17, 5> 17.83/17]", 1825622248], - [28, 9, 23, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 1178765246], - [31, 7, 241, "Metrics/AbcSize: Assignment Branch Condition size for `opening_line_text` is too high. [<0, 17, 1> 17.03/17]", 1468915915], - [37, 7, 237, "Metrics/AbcSize: Assignment Branch Condition size for `closing_line_text` is too high. [<0, 18, 1> 18.03/17]", 4077830027], - [73, 7, 1058, "Metrics/AbcSize: Assignment Branch Condition size for `statements_node` is too high. [<1, 30, 11> 31.97/17]", 4004813764], - [73, 7, 1058, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `statements_node` is too high. [12/7]", 4004813764], - [73, 7, 1058, "Metrics/MethodLength: Method has too many lines. [20/10]", 4004813764], - [73, 7, 1058, "Metrics/PerceivedComplexity: Perceived complexity for `statements_node` is too high. [10/8]", 4004813764], - [100, 7, 567, "Metrics/AbcSize: Assignment Branch Condition size for `body_start_line` is too high. [<1, 24, 4> 24.35/17]", 2388795687], - [103, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 503895268], - [111, 7, 863, "Metrics/AbcSize: Assignment Branch Condition size for `body_end_line` is too high. [<2, 38, 7> 38.69/17]", 60007760], - [111, 7, 863, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `body_end_line` is too high. [8/7]", 60007760], - [111, 7, 863, "Metrics/MethodLength: Method has too many lines. [11/10]", 60007760], - [114, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2068513341], - [116, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 270242779] - ], - "lib/prism/merge/node_emission_support.rb:388716709": [ - [5, 5, 25, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::NodeEmissionSupport`.", 1335077453], - [5, 5, 42322, "Metrics/ClassLength: Class has too many lines. [775/100]", 2081266710], - [14, 7, 2734, "Metrics/AbcSize: Assignment Branch Condition size for `emit_dest_prefix_lines` is too high. [<18, 54, 18> 59.7/17]", 4241256208], - [14, 7, 2734, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_dest_prefix_lines` is too high. [16/7]", 4241256208], - [14, 7, 2734, "Metrics/MethodLength: Method has too many lines. [54/10]", 4241256208], - [14, 7, 2734, "Metrics/PerceivedComplexity: Perceived complexity for `emit_dest_prefix_lines` is too high. [17/8]", 4241256208], - [19, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177656], - [20, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3503445075], - [81, 7, 2526, "Metrics/AbcSize: Assignment Branch Condition size for `emit_removed_destination_node_comments` is too high. [<15, 38, 6> 41.29/17]", 3275408633], - [81, 7, 2526, "Metrics/MethodLength: Method has too many lines. [63/10]", 3275408633], - [153, 7, 1430, "Metrics/AbcSize: Assignment Branch Condition size for `emit_dest_gap_lines` is too high. [<7, 19, 11> 23.04/17]", 2013951205], - [153, 7, 1430, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_dest_gap_lines` is too high. [9/7]", 2013951205], - [153, 7, 1430, "Metrics/MethodLength: Method has too many lines. [27/10]", 2013951205], - [153, 7, 1430, "Metrics/PerceivedComplexity: Perceived complexity for `emit_dest_gap_lines` is too high. [9/8]", 2013951205], - [154, 36, 21, "Style/NumericPredicate: Use `last_output_line.zero?` instead of `last_output_line == 0`.", 1942859694], - [160, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3276957001], - [187, 7, 9316, "Metrics/AbcSize: Assignment Branch Condition size for `emit_matched_template_node` is too high. [<52, 122, 45> 140.0/17]", 605812917], - [187, 7, 9316, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_matched_template_node` is too high. [43/7]", 605812917], - [187, 7, 9316, "Metrics/MethodLength: Method has too many lines. [151/10]", 605812917], - [187, 7, 9316, "Metrics/PerceivedComplexity: Perceived complexity for `emit_matched_template_node` is too high. [45/8]", 605812917], - [269, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 2775680224], - [301, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 249577804], - [331, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2267103911], - [361, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 988398654], - [373, 7, 6908, "Metrics/AbcSize: Assignment Branch Condition size for `emit_node` is too high. [<44, 90, 54> 113.8/17]", 2848614159], - [373, 7, 6908, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_node` is too high. [38/7]", 2848614159], - [373, 7, 6908, "Metrics/MethodLength: Method has too many lines. [135/10]", 2848614159], - [373, 7, 6908, "Metrics/PerceivedComplexity: Perceived complexity for `emit_node` is too high. [44/8]", 2848614159], - [388, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 3628174615], - [475, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 650150522], - [480, 15, 379, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 3006808047], - [519, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2020907649], - [536, 7, 1166, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `filter_previous_destination_owned_template_leading_comments` is too high. [8/7]", 2076094754], - [536, 7, 1166, "Metrics/MethodLength: Method has too many lines. [15/10]", 2076094754], - [536, 71, 13, "Lint/UnusedMethodArgument: Unused method argument - `template_node`.", 1616609802], - [587, 7, 973, "Metrics/MethodLength: Method has too many lines. [15/10]", 1892360110], - [587, 60, 172, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2784840176], - [588, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 169966263], - [614, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087656651], - [627, 7, 873, "Metrics/AbcSize: Assignment Branch Condition size for `previous_template_gap_already_precedes_leading_comments?` is too high. [<5, 19, 11> 22.52/17]", 268778340], - [627, 7, 873, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `previous_template_gap_already_precedes_leading_comments?` is too high. [9/7]", 268778340], - [627, 7, 873, "Metrics/MethodLength: Method has too many lines. [13/10]", 268778340], - [627, 7, 873, "Metrics/PerceivedComplexity: Perceived complexity for `previous_template_gap_already_precedes_leading_comments?` is too high. [9/8]", 268778340], - [636, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 618947799], - [696, 7, 457, "Metrics/MethodLength: Method has too many lines. [11/10]", 349820622], - [724, 7, 758, "Metrics/AbcSize: Assignment Branch Condition size for `partial_same_line_node?` is too high. [<8, 31, 5> 32.4/17]", 1768803955], - [775, 7, 597, "Metrics/MethodLength: Method has too many lines. [12/10]", 2742538822], - [775, 40, 67, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 725821220], - [792, 7, 552, "Metrics/MethodLength: Method has too many lines. [12/10]", 4255654885], - [815, 7, 845, "Metrics/MethodLength: Method has too many lines. [13/10]", 3468050888], - [846, 7, 1097, "Metrics/AbcSize: Assignment Branch Condition size for `filter_emitted_template_leading_comments` is too high. [<6, 18, 3> 19.21/17]", 2091395187], - [846, 7, 1097, "Metrics/MethodLength: Method has too many lines. [17/10]", 2091395187], - [882, 7, 822, "Metrics/MethodLength: Method has too many lines. [13/10]", 3499946440], - [899, 7, 1359, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_matched_template_leading_prefix` is too high. [<7, 22, 10> 25.16/17]", 3976364089], - [899, 7, 1359, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collapse_matched_template_leading_prefix` is too high. [9/7]", 3976364089], - [899, 7, 1359, "Metrics/MethodLength: Method has too many lines. [21/10]", 3976364089], - [899, 7, 1359, "Metrics/PerceivedComplexity: Perceived complexity for `collapse_matched_template_leading_prefix` is too high. [9/8]", 3976364089], - [943, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 3703011298], - [947, 7, 746, "Metrics/MethodLength: Method has too many lines. [17/10]", 3532927627] - ], - "lib/prism/merge/partial_template_merger.rb:2303997532": [ - [14, 7, 826, "Metrics/MethodLength: Method has too many lines. [14/10]", 713706122], - [14, 21, 329, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [12/5]", 2768355468], - [55, 7, 487, "Metrics/MethodLength: Method has too many lines. [11/10]", 447766477], - [75, 7, 520, "Metrics/AbcSize: Assignment Branch Condition size for `node_to_text` is too high. [<1, 19, 6> 19.95/17]", 1593952791], - [84, 46, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] - ], - "lib/prism/merge/recursive_merge_policy.rb:4204303290": [ - [5, 5, 26, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::RecursiveMergePolicy`.", 1329613257], - [12, 7, 1132, "Metrics/AbcSize: Assignment Branch Condition size for `should_merge?` is too high. [<4, 25, 15> 29.43/17]", 4123619949], - [12, 7, 1132, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `should_merge?` is too high. [14/7]", 4123619949], - [12, 7, 1132, "Metrics/MethodLength: Method has too many lines. [20/10]", 4123619949], - [12, 7, 1132, "Metrics/PerceivedComplexity: Perceived complexity for `should_merge?` is too high. [13/8]", 4123619949], - [47, 7, 398, "Metrics/MethodLength: Method has too many lines. [18/10]", 385694759] - ], - "lib/prism/merge/recursive_node_body_merger.rb:2523299035": [ - [5, 5, 29, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::RecursiveNodeBodyMerger`.", 3703318859], - [5, 5, 18406, "Metrics/ClassLength: Class has too many lines. [333/100]", 1740018190], - [12, 7, 12657, "Metrics/AbcSize: Assignment Branch Condition size for `merge` is too high. [<79, 259, 101> 289/17]", 1663029092], - [12, 7, 12657, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge` is too high. [78/7]", 1663029092], - [12, 7, 12657, "Metrics/MethodLength: Method has too many lines. [215/10]", 1663029092], - [12, 7, 12657, "Metrics/PerceivedComplexity: Perceived complexity for `merge` is too high. [83/8]", 1663029092], - [27, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 929875726], - [65, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 518709914], - [70, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 366676207], - [266, 7, 1221, "Metrics/AbcSize: Assignment Branch Condition size for `remap_inner_unresolved_review_state!` is too high. [<8, 22, 6> 24.17/17]", 3210674006], - [266, 7, 1221, "Metrics/MethodLength: Method has too many lines. [21/10]", 3210674006], - [293, 7, 1121, "Metrics/AbcSize: Assignment Branch Condition size for `remap_inner_unresolved_case` is too high. [<6, 24, 0> 24.74/17]", 3468635549], - [293, 7, 1121, "Metrics/MethodLength: Method has too many lines. [15/10]", 3468635549], - [376, 7, 826, "Metrics/AbcSize: Assignment Branch Condition size for `emit_trailing_layout_gap_lines` is too high. [<6, 18, 9> 21/17]", 2158299973], - [376, 7, 826, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_trailing_layout_gap_lines` is too high. [8/7]", 2158299973], - [376, 7, 826, "Metrics/MethodLength: Method has too many lines. [17/10]", 2158299973], - [376, 7, 826, "Metrics/PerceivedComplexity: Perceived complexity for `emit_trailing_layout_gap_lines` is too high. [9/8]", 2158299973] - ], - "lib/prism/merge/ruby_doc_surface_analyzer.rb:2647486851": [ - [7, 5, 8269, "Metrics/ClassLength: Class has too many lines. [192/100]", 2716524254], - [61, 7, 1408, "Metrics/AbcSize: Assignment Branch Condition size for `build_doc_comment_surface` is too high. [<10, 25, 5> 27.39/17]", 2414553577], - [61, 7, 1408, "Metrics/MethodLength: Method has too many lines. [28/10]", 2414553577], - [106, 7, 1513, "Metrics/AbcSize: Assignment Branch Condition size for `build_example_surface` is too high. [<6, 24, 6> 25.46/17]", 4167825853], - [106, 7, 1513, "Metrics/MethodLength: Method has too many lines. [29/10]", 4167825853], - [162, 7, 555, "Metrics/AbcSize: Assignment Branch Condition size for `doc_comment_entries` is too high. [<8, 18, 6> 20.59/17]", 358090808] - ], - "lib/prism/merge/scaffold_chunk_remover.rb:2190237849": [ - [15, 5, 5193, "Metrics/ClassLength: Class has too many lines. [123/100]", 3937701477], - [75, 7, 1856, "Metrics/AbcSize: Assignment Branch Condition size for `call` is too high. [<21, 60, 22> 67.27/17]", 1601329428], - [75, 7, 1856, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `call` is too high. [21/7]", 1601329428], - [75, 7, 1856, "Metrics/MethodLength: Method has too many lines. [37/10]", 1601329428], - [75, 7, 1856, "Metrics/PerceivedComplexity: Perceived complexity for `call` is too high. [21/8]", 1601329428] - ], - "lib/prism/merge/smart_merger.rb:3814529034": [ - [48, 5, 42561, "Metrics/ClassLength: Class has too many lines. [603/100]", 3828655257], - [96, 7, 2032, "Metrics/MethodLength: Method has too many lines. [24/10]", 4118525224], - [96, 21, 595, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [18/5]", 1562155096], - [171, 7, 1325, "Metrics/AbcSize: Assignment Branch Condition size for `merge_with_debug` is too high. [<3, 24, 19> 30.76/17]", 605983530], - [171, 7, 1325, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_with_debug` is too high. [20/7]", 605983530], - [171, 7, 1325, "Metrics/MethodLength: Method has too many lines. [27/10]", 605983530], - [171, 7, 1325, "Metrics/PerceivedComplexity: Perceived complexity for `merge_with_debug` is too high. [20/8]", 605983530], - [310, 7, 664, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `frozen_node?` is too high. [8/7]", 2577924190], - [352, 7, 508, "Metrics/MethodLength: Method has too many lines. [13/10]", 1368018500], - [442, 7, 1155, "Metrics/AbcSize: Assignment Branch Condition size for `build_signature_map` is too high. [<11, 16, 8> 21/17]", 3956321005], - [442, 7, 1155, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_signature_map` is too high. [8/7]", 3956321005], - [442, 7, 1155, "Metrics/MethodLength: Method has too many lines. [16/10]", 3956321005], - [483, 7, 2731, "Metrics/AbcSize: Assignment Branch Condition size for `preference_for_node` is too high. [<7, 22, 20> 30.55/17]", 1325207598], - [483, 7, 2731, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preference_for_node` is too high. [21/7]", 1325207598], - [483, 7, 2731, "Metrics/MethodLength: Method has too many lines. [25/10]", 1325207598], - [483, 7, 2731, "Metrics/PerceivedComplexity: Perceived complexity for `preference_for_node` is too high. [21/8]", 1325207598], - [659, 32, 73, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2261515417], - [670, 35, 79, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1350141395], - [681, 42, 63, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2615605084], - [852, 35, 213, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 720547751] - ], - "lib/prism/merge/source_line_lookup.rb:1098479933": [ - [5, 5, 23, "Style/Documentation: Missing top-level documentation comment for `module Prism::Merge::SourceLineLookup`.", 2168434862] - ], - "lib/prism/merge/top_level_merge_runner.rb:3009983916": [ - [38, 5, 59959, "Metrics/ClassLength: Class has too many lines. [1124/100]", 2689943302], - [66, 7, 5196, "Metrics/AbcSize: Assignment Branch Condition size for `merge` is too high. [<22, 68, 9> 72.03/17]", 176450457], - [66, 7, 5196, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge` is too high. [9/7]", 176450457], - [66, 7, 5196, "Metrics/MethodLength: Method has too many lines. [75/10]", 176450457], - [66, 7, 5196, "Metrics/PerceivedComplexity: Perceived complexity for `merge` is too high. [10/8]", 176450457], - [162, 7, 2023, "Metrics/AbcSize: Assignment Branch Condition size for `start_runtime_session!` is too high. [<5, 48, 1> 48.27/17]", 2943824289], - [162, 7, 2023, "Metrics/MethodLength: Method has too many lines. [44/10]", 2943824289], - [212, 7, 1765, "Metrics/AbcSize: Assignment Branch Condition size for `complete_runtime_session!` is too high. [<2, 21, 9> 22.93/17]", 2968004900], - [212, 7, 1765, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `complete_runtime_session!` is too high. [8/7]", 2968004900], - [212, 7, 1765, "Metrics/MethodLength: Method has too many lines. [36/10]", 2968004900], - [212, 7, 1765, "Metrics/PerceivedComplexity: Perceived complexity for `complete_runtime_session!` is too high. [10/8]", 2968004900], - [229, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3907470478], - [254, 7, 584, "Metrics/MethodLength: Method has too many lines. [14/10]", 1615217394], - [272, 7, 589, "Metrics/AbcSize: Assignment Branch Condition size for `runtime_document_surface` is too high. [<1, 19, 1> 19.05/17]", 1835005228], - [272, 7, 589, "Metrics/MethodLength: Method has too many lines. [12/10]", 1835005228], - [288, 7, 3192, "Metrics/AbcSize: Assignment Branch Condition size for `register_discovered_surface_operations!` is too high. [<12, 60, 9> 61.85/17]", 3059111269], - [288, 7, 3192, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `register_discovered_surface_operations!` is too high. [10/7]", 3059111269], - [288, 7, 3192, "Metrics/MethodLength: Method has too many lines. [65/10]", 3059111269], - [288, 7, 3192, "Metrics/PerceivedComplexity: Perceived complexity for `register_discovered_surface_operations!` is too high. [10/8]", 3059111269], - [297, 9, 2237, "Metrics/BlockLength: Block has too many lines. [44/25]", 809738986], - [399, 7, 1643, "Metrics/AbcSize: Assignment Branch Condition size for `execute_child_operations!` is too high. [<5, 33, 5> 33.75/17]", 1049305146], - [399, 7, 1643, "Metrics/MethodLength: Method has too many lines. [36/10]", 1049305146], - [400, 9, 1570, "Metrics/BlockLength: Block has too many lines. [29/25]", 1597985402], - [404, 9, 31, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 3553388257], - [448, 7, 631, "Metrics/MethodLength: Method has too many lines. [15/10]", 1652116821], - [466, 7, 1306, "Metrics/AbcSize: Assignment Branch Condition size for `merge_runtime_surface` is too high. [<2, 18, 4> 18.55/17]", 1347264970], - [466, 7, 1306, "Metrics/MethodLength: Method has too many lines. [29/10]", 1347264970], - [500, 7, 1393, "Metrics/AbcSize: Assignment Branch Condition size for `merge_runtime_doc_comment_surface` is too high. [<4, 23, 5> 23.87/17]", 3745645404], - [500, 7, 1393, "Metrics/MethodLength: Method has too many lines. [29/10]", 3745645404], - [534, 7, 826, "Metrics/AbcSize: Assignment Branch Condition size for `apply_runtime_doc_children` is too high. [<5, 24, 7> 25.5/17]", 1386022126], - [534, 7, 826, "Metrics/MethodLength: Method has too many lines. [15/10]", 1386022126], - [542, 16, 27, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 1443167664], - [546, 9, 24, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 644874689], - [554, 7, 1438, "Metrics/AbcSize: Assignment Branch Condition size for `apply_runtime_example_child` is too high. [<10, 44, 10> 46.22/17]", 2594444962], - [554, 7, 1438, "Metrics/MethodLength: Method has too many lines. [25/10]", 2594444962], - [556, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3651736697], - [599, 7, 518, "Metrics/MethodLength: Method has too many lines. [11/10]", 523939757], - [623, 7, 753, "Metrics/MethodLength: Method has too many lines. [15/10]", 3406860674], - [683, 7, 1514, "Metrics/AbcSize: Assignment Branch Condition size for `compute_similarity_pairs` is too high. [<17, 42, 11> 46.63/17]", 103276977], - [683, 7, 1514, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_similarity_pairs` is too high. [11/7]", 103276977], - [683, 7, 1514, "Metrics/MethodLength: Method has too many lines. [27/10]", 103276977], - [683, 7, 1514, "Metrics/PerceivedComplexity: Perceived complexity for `compute_similarity_pairs` is too high. [11/8]", 103276977], - [735, 7, 545, "Metrics/MethodLength: Method has too many lines. [12/10]", 398381329], - [763, 7, 586, "Metrics/MethodLength: Method has too many lines. [11/10]", 1559638959], - [843, 7, 640, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_nested_signatures` is too high. [10/7]", 3947424552], - [843, 7, 640, "Metrics/MethodLength: Method has too many lines. [13/10]", 3947424552], - [843, 7, 640, "Metrics/PerceivedComplexity: Perceived complexity for `collect_nested_signatures` is too high. [10/8]", 3947424552], - [845, 12, 9, "Style/NumericPredicate: Use `depth.positive?` instead of `depth > 0`.", 2180768870], - [869, 7, 1297, "Metrics/AbcSize: Assignment Branch Condition size for `nested_statement_children` is too high. [<2, 50, 17> 52.85/17]", 3818826989], - [869, 7, 1297, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `nested_statement_children` is too high. [17/7]", 3818826989], - [869, 7, 1297, "Metrics/MethodLength: Method has too many lines. [19/10]", 3818826989], - [869, 7, 1297, "Metrics/PerceivedComplexity: Perceived complexity for `nested_statement_children` is too high. [15/8]", 3818826989], - [877, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 3315454453], - [882, 93, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [883, 89, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [884, 93, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [899, 7, 754, "Metrics/AbcSize: Assignment Branch Condition size for `prepare_comment_augmenters!` is too high. [<1, 19, 0> 19.03/17]", 311364642], - [899, 7, 754, "Metrics/MethodLength: Method has too many lines. [12/10]", 311364642], - [1003, 7, 1707, "Metrics/AbcSize: Assignment Branch Condition size for `retained_owner_plan` is too high. [<16, 40, 12> 44.72/17]", 375532236], - [1003, 7, 1707, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `retained_owner_plan` is too high. [13/7]", 375532236], - [1003, 7, 1707, "Metrics/MethodLength: Method has too many lines. [33/10]", 375532236], - [1003, 7, 1707, "Metrics/PerceivedComplexity: Perceived complexity for `retained_owner_plan` is too high. [13/8]", 375532236], - [1003, 55, 17, "Lint/UnusedMethodArgument: Unused method argument - `dest_by_signature`.", 379778684], - [1024, 9, 250, "Style/CombinableLoops: Combine this loop with the previous loop.", 3315024098], - [1031, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 180543822], - [1048, 7, 4375, "Metrics/AbcSize: Assignment Branch Condition size for `process_dest_node` is too high. [<23, 66, 14> 71.28/17]", 329713352], - [1048, 7, 4375, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `process_dest_node` is too high. [11/7]", 329713352], - [1048, 7, 4375, "Metrics/MethodLength: Method has too many lines. [80/10]", 329713352], - [1048, 7, 4375, "Metrics/PerceivedComplexity: Perceived complexity for `process_dest_node` is too high. [15/8]", 329713352], - [1048, 28, 279, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 2321512478], - [1153, 7, 757, "Metrics/MethodLength: Method has too many lines. [19/10]", 3306507447], - [1191, 44, 189, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 215272527], - [1222, 7, 888, "Metrics/MethodLength: Method has too many lines. [17/10]", 2638200013], - [1222, 31, 189, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 50070642], - [1244, 7, 719, "Metrics/MethodLength: Method has too many lines. [13/10]", 530865591], - [1262, 7, 1393, "Metrics/AbcSize: Assignment Branch Condition size for `process_non_recursive_match` is too high. [<10, 23, 7> 26.04/17]", 324106576], - [1262, 7, 1393, "Metrics/MethodLength: Method has too many lines. [29/10]", 324106576], - [1296, 7, 1106, "Metrics/AbcSize: Assignment Branch Condition size for `process_unresolved_non_recursive_match` is too high. [<3, 19, 3> 19.47/17]", 1476652897], - [1296, 7, 1106, "Metrics/MethodLength: Method has too many lines. [26/10]", 1476652897], - [1337, 7, 1935, "Metrics/AbcSize: Assignment Branch Condition size for `record_unresolved_match_case!` is too high. [<4, 26, 3> 26.48/17]", 456739474], - [1337, 7, 1935, "Metrics/MethodLength: Method has too many lines. [37/10]", 456739474], - [1422, 7, 1067, "Metrics/AbcSize: Assignment Branch Condition size for `advance_last_output_dest_line` is too high. [<6, 19, 6> 20.81/17]", 331135500], - [1422, 7, 1067, "Metrics/MethodLength: Method has too many lines. [11/10]", 331135500], - [1422, 40, 181, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2038823112] - ], - "lib/prism/merge/wrapper_comment_support.rb:3046735928": [ - [5, 5, 27, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::WrapperCommentSupport`.", 2211657316], - [5, 5, 17765, "Metrics/ClassLength: Class has too many lines. [358/100]", 370100972], - [14, 7, 3072, "Metrics/AbcSize: Assignment Branch Condition size for `filtered_leading_comments_for` is too high. [<26, 58, 27> 69.06/17]", 934788024], - [14, 7, 3072, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `filtered_leading_comments_for` is too high. [24/7]", 934788024], - [14, 7, 3072, "Metrics/MethodLength: Method has too many lines. [48/10]", 934788024], - [14, 7, 3072, "Metrics/PerceivedComplexity: Perceived complexity for `filtered_leading_comments_for` is too high. [27/8]", 934788024], - [24, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 366676207], - [65, 11, 68, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 2360366291], - [74, 73, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [95, 7, 1446, "Metrics/AbcSize: Assignment Branch Condition size for `emit_leading_comments` is too high. [<8, 16, 13> 22.11/17]", 86315238], - [95, 7, 1446, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_leading_comments` is too high. [9/7]", 86315238], - [95, 7, 1446, "Metrics/MethodLength: Method has too many lines. [31/10]", 86315238], - [95, 7, 1446, "Metrics/PerceivedComplexity: Perceived complexity for `emit_leading_comments` is too high. [11/8]", 86315238], - [95, 32, 73, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2261515417], - [98, 9, 1234, "Metrics/BlockLength: Block has too many lines. [28/25]", 357181412], - [134, 7, 953, "Metrics/MethodLength: Method has too many lines. [19/10]", 3183807785], - [134, 35, 79, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1350141395], - [162, 7, 1228, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_comment_region` is too high. [10/7]", 2201645681], - [162, 7, 1228, "Metrics/MethodLength: Method has too many lines. [31/10]", 2201645681], - [162, 7, 1228, "Metrics/PerceivedComplexity: Perceived complexity for `emit_comment_region` is too high. [11/8]", 2201645681], - [162, 30, 67, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 191987245], - [163, 29, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [202, 7, 777, "Metrics/MethodLength: Method has too many lines. [18/10]", 4073303022], - [202, 30, 68, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3851519454], - [208, 9, 8, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 359222635], - [226, 7, 1080, "Metrics/MethodLength: Method has too many lines. [27/10]", 296167644], - [226, 42, 63, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2615605084], - [260, 7, 689, "Metrics/AbcSize: Assignment Branch Condition size for `append_inline_comment_entries` is too high. [<7, 19, 8> 21.77/17]", 1575903523], - [260, 7, 689, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `append_inline_comment_entries` is too high. [8/7]", 1575903523], - [260, 7, 689, "Metrics/MethodLength: Method has too many lines. [16/10]", 1575903523], - [260, 7, 689, "Metrics/PerceivedComplexity: Perceived complexity for `append_inline_comment_entries` is too high. [9/8]", 1575903523], - [288, 7, 607, "Metrics/AbcSize: Assignment Branch Condition size for `line_inline_comment_entries` is too high. [<3, 18, 7> 19.54/17]", 2131701672], - [288, 7, 607, "Metrics/MethodLength: Method has too many lines. [12/10]", 2131701672], - [338, 7, 1023, "Metrics/MethodLength: Method has too many lines. [19/10]", 2409125040], - [363, 7, 854, "Metrics/AbcSize: Assignment Branch Condition size for `runtime_doc_comment_operation_for` is too high. [<4, 24, 13> 27.59/17]", 1109173425], - [363, 7, 854, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `runtime_doc_comment_operation_for` is too high. [10/7]", 1109173425], - [363, 7, 854, "Metrics/MethodLength: Method has too many lines. [11/10]", 1109173425], - [363, 7, 854, "Metrics/PerceivedComplexity: Perceived complexity for `runtime_doc_comment_operation_for` is too high. [10/8]", 1109173425], - [373, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 1843406524], - [381, 7, 755, "Metrics/AbcSize: Assignment Branch Condition size for `build_runtime_leading_region` is too high. [<5, 18, 4> 19.1/17]", 3130034424], - [381, 7, 755, "Metrics/MethodLength: Method has too many lines. [14/10]", 3130034424], - [411, 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:2052428369": [ - [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ], - "spec/fixtures/reproducible/04_gemspec_duplication/destination.rb:971498360": [ - [25, 1, 8292, "Metrics/BlockLength: Block has too many lines. [110/25]", 1251580584], - [32, 121, 317, "Layout/LineLength: Line is too long. [437/120]", 1870252497], - [184, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4147388508], - [199, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [200, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [207, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ], - "spec/fixtures/reproducible/04_gemspec_duplication/template.rb:1741222365": [ - [19, 1, 4121, "Metrics/BlockLength: Block has too many lines. [71/25]", 547880907], - [26, 121, 317, "Layout/LineLength: Line is too long. [437/120]", 1870252497] - ], - "spec/fixtures/reproducible/05_gemspec_orphan_duplication/destination.rb:2573186797": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177634] - ], - "spec/fixtures/reproducible/05_gemspec_orphan_duplication/result.rb:2573186797": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177634] - ], - "spec/fixtures/reproducible/05_gemspec_orphan_duplication/template.rb:1825302441": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177634] - ], - "spec/fixtures_integration_spec.rb:4053275636": [ - [7, 1, 21570, "Metrics/BlockLength: Block has too many lines. [483/25]", 416378449], - [66, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1448895712], - [72, 3, 1302, "Metrics/BlockLength: Block has too many lines. [30/25]", 2973641144], - [106, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [113, 3, 1679, "Metrics/BlockLength: Block has too many lines. [38/25]", 2954972744], - [373, 3, 7512, "Metrics/BlockLength: Block has too many lines. [149/25]", 2278210376] - ], - "spec/reproducible_merge_spec.rb:2334824632": [ - [6, 1, 2420, "Metrics/BlockLength: Block has too many lines. [50/25]", 2207509489], - [39, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1416718429] - ] -} diff --git a/gems/prism-merge/Gemfile b/gems/prism-merge/Gemfile index 9516df867..414dabd10 100644 --- a/gems/prism-merge/Gemfile +++ b/gems/prism-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source 'https://gem.coop' +source "https://gem.coop" git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,17 +19,61 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ['~> 1.0', '>= 1.0.8'] -gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ["~> 1.0", ">= 1.0.8"] +gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ruby-merge ] -direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') +direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? + +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) + direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") + direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == "nomono" } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + if nomono_locked + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] + end + end + Kernel.send(:gem, "nomono", *nomono_activation_requirements) + require "nomono/bundler" + if direct_sibling_templating && !direct_sibling_local + ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + end + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: "STRUCTUREDMERGE", + path_env: "STRUCTUREDMERGE_DEV", + root: ["src", "my", "structuredmerge"] + ) + rescue LoadError + warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + else + ENV.delete("STRUCTUREDMERGE_DEV") + end + end + end +end if direct_sibling_gems.any? && (direct_sibling_local || @@ -169,25 +213,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? # Debugging -eval_gemfile 'gemfiles/modular/debug.gemfile' +eval_gemfile "gemfiles/modular/debug.gemfile" # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile 'gemfiles/modular/coverage.gemfile' +eval_gemfile "gemfiles/modular/coverage.gemfile" # Linting -eval_gemfile 'gemfiles/modular/style.gemfile' +eval_gemfile "gemfiles/modular/style.gemfile" # Documentation -eval_gemfile 'gemfiles/modular/documentation.gemfile' +eval_gemfile "gemfiles/modular/documentation.gemfile" # Optional -eval_gemfile 'gemfiles/modular/optional.gemfile' +eval_gemfile "gemfiles/modular/optional.gemfile" ### Std Lib Extracted Gems -eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' +eval_gemfile "gemfiles/modular/x_std_libs.gemfile" # See unlocked_deps appraisal for more details on irb inclusion -gem 'irb', '~> 1.17' # ruby >= 2.7 +gem "irb", "~> 1.17" # ruby >= 2.7 diff --git a/gems/prism-merge/Gemfile.lock b/gems/prism-merge/Gemfile.lock index db435792f..35caf8bce 100644 --- a/gems/prism-merge/Gemfile.lock +++ b/gems/prism-merge/Gemfile.lock @@ -266,6 +266,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.0) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: @@ -307,7 +323,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -362,18 +377,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -537,22 +541,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -658,9 +658,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -738,7 +738,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -759,10 +758,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.0) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -837,13 +836,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/prism-merge/Rakefile b/gems/prism-merge/Rakefile index 0413b973d..3ceda1211 100644 --- a/gems/prism-merge/Rakefile +++ b/gems/prism-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require 'kettle/drift' + require "kettle/drift" Kettle::Drift.install_tasks rescue LoadError - desc('(stub) kettle:drift:check is unavailable') - task('kettle:drift:check') do + desc("(stub) kettle:drift:check is unavailable") + task("kettle:drift:check") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:update is unavailable') - task('kettle:drift:update') do + desc("(stub) kettle:drift:update is unavailable") + task("kettle:drift:update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:force_update is unavailable') - task('kettle:drift:force_update') do + desc("(stub) kettle:drift:force_update is unavailable") + task("kettle:drift:force_update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift is unavailable') - task('kettle:drift' => 'kettle:drift:update') + desc("(stub) kettle:drift is unavailable") + task("kettle:drift" => "kettle:drift:update") end ### TEMPLATING TASKS diff --git a/gems/prism-merge/bin/yard b/gems/prism-merge/bin/yard index 5d516ad6f..a7e8b6eed 100755 --- a/gems/prism-merge/bin/yard +++ b/gems/prism-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec('bundle', 'exec', 'rake', 'yard') +exec("bundle", "exec", "rake", "yard") diff --git a/gems/prism-merge/lib/prism/merge/version.rb b/gems/prism-merge/lib/prism/merge/version.rb index 29398c390..c5d5bca42 100644 --- a/gems/prism-merge/lib/prism/merge/version.rb +++ b/gems/prism-merge/lib/prism/merge/version.rb @@ -3,7 +3,7 @@ module Prism module Merge module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/smorg-rb/Gemfile.lock b/gems/smorg-rb/Gemfile.lock index 7c39665b1..f48de7564 100644 --- a/gems/smorg-rb/Gemfile.lock +++ b/gems/smorg-rb/Gemfile.lock @@ -21,52 +21,277 @@ PATH plain-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -GEM - remote: https://gem.coop/ +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - ansi (1.6.0) - appraisal2 (3.1.4) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - ast (2.4.3) - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) ast-crispr-markdown-markly (7.1.0) ast-crispr (= 7.1.0) markly-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) prism (>= 1.0) version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: ast-merge (7.1.0) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) - ast-merge-git (7.1.0) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) ast-merge (= 7.1.0) + tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) - backports (3.25.3) - bash-merge (7.1.0) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +GEM + remote: https://gem.coop/ + specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + ansi (1.6.0) + appraisal2 (3.1.4) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + 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) citrus (3.0.2) - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) cmdparse (3.0.7) commonmarker (2.9.0-aarch64-linux) commonmarker (2.9.0-aarch64-linux-musl) @@ -74,10 +299,6 @@ GEM commonmarker (2.9.0-x86_64-darwin) commonmarker (2.9.0-x86_64-linux) commonmarker (2.9.0-x86_64-linux-musl) - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -87,10 +308,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docile (1.4.1) - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -128,10 +345,6 @@ GEM geom2d (0.4.1) gitmoji-regex (2.0.4) version_gem (~> 1.1, >= 1.1.13) - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) hexapdf (1.9.1) cmdparse (~> 3.0, >= 3.0.3) geom2d (~> 0.4, >= 0.4.1) @@ -144,40 +357,13 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) kettle-dev (2.3.6) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -201,24 +387,12 @@ GEM turbo_tests2 (~> 3.1, >= 3.1.12) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) 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.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -242,26 +416,13 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) pp (0.6.4) prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) psych (5.4.0) date stringio - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -273,11 +434,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) rdoc (6.17.0) erb psych (>= 4.0.0) @@ -373,10 +529,6 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -434,18 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -460,10 +605,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.13) - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) yard (0.9.45) yard-fence (0.9.6) rdoc (>= 6.11, < 8) @@ -496,22 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -520,19 +684,26 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -544,10 +715,12 @@ CHECKSUMS ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) @@ -586,6 +759,7 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad @@ -613,6 +787,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.0) plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -659,6 +834,7 @@ 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -682,12 +858,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -700,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From bfdfa3e030b84f114ff96f910735d93641d4807b Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 16:40:25 -0600 Subject: [PATCH 028/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/kramdown-merge/Gemfile.lock | 342 ++++++++- gems/prism-merge/.rubocop_gradual.lock | 736 ++++++++++++++++++++ gems/prism-merge/Gemfile | 68 +- gems/prism-merge/Gemfile.lock | 397 ++--------- gems/prism-merge/Rakefile | 18 +- gems/prism-merge/bin/yard | 2 +- gems/prism-merge/lib/prism/merge/version.rb | 2 +- gems/smorg-rb/.gitattributes | 2 +- gems/smorg-rb/.kettle-drift.lock | 60 +- gems/smorg-rb/.rubocop_gradual.lock | 167 ----- gems/smorg-rb/Gemfile | 70 +- gems/smorg-rb/Gemfile.lock | 59 +- gems/smorg-rb/Rakefile | 18 +- gems/smorg-rb/bin/yard | 2 +- gems/smorg-rb/lib/smorg/rb/version.rb | 2 +- 15 files changed, 1287 insertions(+), 658 deletions(-) create mode 100644 gems/prism-merge/.rubocop_gradual.lock delete mode 100644 gems/smorg-rb/.rubocop_gradual.lock diff --git a/gems/kramdown-merge/Gemfile.lock b/gems/kramdown-merge/Gemfile.lock index 616ee1f23..1aa7608db 100644 --- a/gems/kramdown-merge/Gemfile.lock +++ b/gems/kramdown-merge/Gemfile.lock @@ -16,6 +16,256 @@ PATH markdown-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: @@ -35,11 +285,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -48,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -111,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -139,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -278,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -330,11 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -381,24 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -407,31 +684,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -439,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -451,11 +752,15 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 @@ -466,6 +771,8 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -480,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -491,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -518,9 +830,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -529,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -542,14 +858,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/prism-merge/.rubocop_gradual.lock b/gems/prism-merge/.rubocop_gradual.lock new file mode 100644 index 000000000..a0d47aef9 --- /dev/null +++ b/gems/prism-merge/.rubocop_gradual.lock @@ -0,0 +1,736 @@ +{ + ".simplecov:3138125134": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:22363789": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/prism-merge.rb:226590672": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`prism-merge.rb`) should use snake_case.", 5381] + ], + "lib/prism/merge.rb:3873409785": [ + [12, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Prism::Merge`.", 2866359175], + [12, 3, 53263, "Metrics/ModuleLength: Module has too many lines. [1222/100]", 1955834049], + [13, 5, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631], + [24, 5, 16, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::ParseError`.", 362242086], + [120, 5, 1996, "Metrics/MethodLength: Method has too many lines. [42/10]", 709892915], + [165, 5, 1804, "Metrics/MethodLength: Method has too many lines. [37/10]", 3641862107], + [205, 5, 1012, "Metrics/MethodLength: Method has too many lines. [23/10]", 3112984532], + [243, 5, 695, "Metrics/MethodLength: Method has too many lines. [17/10]", 321495946], + [263, 5, 1801, "Metrics/MethodLength: Method has too many lines. [37/10]", 3355654893], + [264, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 180584319], + [303, 5, 7357, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_structured_edit_batch_report_projection` is too high. [<1, 31, 0> 31.02/17]", 2583247591], + [303, 5, 7357, "Metrics/MethodLength: Method has too many lines. [139/10]", 2583247591], + [304, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 180584319], + [323, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 949635646], + [361, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1330685294], + [445, 5, 811, "Metrics/MethodLength: Method has too many lines. [21/10]", 2894794051], + [471, 5, 491, "Metrics/MethodLength: Method has too many lines. [12/10]", 3211170428], + [486, 5, 3212, "Metrics/AbcSize: Assignment Branch Condition size for `parse_ruby_normalized` is too high. [<20, 64, 28> 72.66/17]", 1170714005], + [486, 5, 3212, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_ruby_normalized` is too high. [23/7]", 1170714005], + [486, 5, 3212, "Metrics/MethodLength: Method has too many lines. [70/10]", 1170714005], + [486, 5, 3212, "Metrics/PerceivedComplexity: Perceived complexity for `parse_ruby_normalized` is too high. [23/8]", 1170714005], + [566, 5, 3671, "Metrics/AbcSize: Assignment Branch Condition size for `apply_edit_projection` is too high. [<14, 62, 19> 66.34/17]", 1859418783], + [566, 5, 3671, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_edit_projection` is too high. [12/7]", 1859418783], + [566, 5, 3671, "Metrics/MethodLength: Method has too many lines. [66/10]", 1859418783], + [566, 5, 3671, "Metrics/PerceivedComplexity: Perceived complexity for `apply_edit_projection` is too high. [13/8]", 1859418783], + [612, 18, 176, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 3247522762], + [645, 5, 1505, "Metrics/MethodLength: Method has too many lines. [33/10]", 2499202345], + [645, 19, 292, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 676979469], + [706, 5, 583, "Metrics/MethodLength: Method has too many lines. [13/10]", 1484312517], + [723, 5, 551, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_ruby_require_aliases` is too high. [<11, 15, 7> 19.87/17]", 2507514607], + [723, 5, 551, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_ruby_require_aliases` is too high. [8/7]", 2507514607], + [723, 5, 551, "Metrics/MethodLength: Method has too many lines. [17/10]", 2507514607], + [744, 5, 304, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_dsl_call_node` is too high. [8/7]", 2466841613], + [767, 5, 1305, "Metrics/AbcSize: Assignment Branch Condition size for `merge_ruby_with_reviewed_nested_outputs` is too high. [<7, 17, 5> 19.05/17]", 3657868136], + [767, 5, 1305, "Metrics/MethodLength: Method has too many lines. [27/10]", 3657868136], + [767, 48, 140, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 132256850], + [800, 5, 1015, "Metrics/MethodLength: Method has too many lines. [17/10]", 757789356], + [810, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 1956194284], + [823, 5, 928, "Metrics/MethodLength: Method has too many lines. [16/10]", 1039420596], + [833, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 3013228499], + [845, 5, 1003, "Metrics/MethodLength: Method has too many lines. [17/10]", 3313354796], + [855, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1636990749], + [868, 5, 936, "Metrics/MethodLength: Method has too many lines. [16/10]", 2825710110], + [878, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 3013228499], + [902, 5, 662, "Metrics/MethodLength: Method has too many lines. [19/10]", 772959042], + [923, 7, 11, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 848344986], + [926, 5, 849, "Metrics/AbcSize: Assignment Branch Condition size for `prism_ruby_discovered_surfaces` is too high. [<12, 16, 6> 20.88/17]", 2509812469], + [926, 5, 849, "Metrics/MethodLength: Method has too many lines. [23/10]", 2509812469], + [957, 5, 1195, "Metrics/AbcSize: Assignment Branch Condition size for `prism_ruby_surfaces_for_owner` is too high. [<6, 19, 3> 20.15/17]", 1713430182], + [957, 5, 1195, "Metrics/MethodLength: Method has too many lines. [20/10]", 1713430182], + [982, 5, 1563, "Metrics/AbcSize: Assignment Branch Condition size for `prism_ruby_example_surfaces` is too high. [<9, 26, 9> 28.95/17]", 2122389118], + [982, 5, 1563, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `prism_ruby_example_surfaces` is too high. [9/7]", 2122389118], + [982, 5, 1563, "Metrics/MethodLength: Method has too many lines. [28/10]", 2122389118], + [982, 5, 1563, "Metrics/PerceivedComplexity: Perceived complexity for `prism_ruby_example_surfaces` is too high. [9/8]", 2122389118], + [1042, 7, 3, "Layout/BlockAlignment: `end` at 1042, 6 is not aligned with `%w[coding encoding frozen_string_literal shareable_constant_value typed` at 1039, 22 or `warn_indent].any? do |prefix|` at 1040, 25.", 193405706], + [1088, 5, 421, "Metrics/MethodLength: Method has too many lines. [14/10]", 26440736], + [1119, 5, 827, "Metrics/MethodLength: Method has too many lines. [18/10]", 4288402374], + [1160, 5, 876, "Metrics/MethodLength: Method has too many lines. [23/10]", 3423854231], + [1198, 5, 1155, "Metrics/AbcSize: Assignment Branch Condition size for `prism_comment_node` is too high. [<1, 22, 0> 22.02/17]", 4287909739], + [1198, 5, 1155, "Metrics/MethodLength: Method has too many lines. [28/10]", 4287909739], + [1229, 5, 888, "Metrics/MethodLength: Method has too many lines. [27/10]", 3798554661], + [1282, 5, 920, "Metrics/MethodLength: Method has too many lines. [23/10]", 917985568] + ], + "lib/prism/merge/begin_node_clause_body_merger.rb:1042804537": [ + [5, 5, 31, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::BeginNodeClauseBodyMerger`.", 1242162299], + [19, 7, 1511, "Metrics/AbcSize: Assignment Branch Condition size for `merge` is too high. [<5, 37, 1> 37.35/17]", 3275719934], + [19, 7, 1511, "Metrics/MethodLength: Method has too many lines. [32/10]", 3275719934] + ], + "lib/prism/merge/begin_node_clause_body_support.rb:2935202369": [ + [5, 5, 32, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::BeginNodeClauseBodySupport`.", 3341069278], + [5, 5, 7532, "Metrics/ClassLength: Class has too many lines. [143/100]", 1403116805], + [8, 21, 100, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 4145084810], + [22, 7, 937, "Metrics/AbcSize: Assignment Branch Condition size for `clause_header_end_line` is too high. [<5, 29, 16> 33.5/17]", 2050282033], + [22, 7, 937, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `clause_header_end_line` is too high. [16/7]", 2050282033], + [22, 7, 937, "Metrics/MethodLength: Method has too many lines. [14/10]", 2050282033], + [22, 7, 937, "Metrics/PerceivedComplexity: Perceived complexity for `clause_header_end_line` is too high. [16/8]", 2050282033], + [35, 63, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [55, 9, 23, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 1178765246], + [58, 7, 419, "Metrics/MethodLength: Method has too many lines. [11/10]", 3825428834], + [81, 7, 2424, "Metrics/AbcSize: Assignment Branch Condition size for `clause_body_components` is too high. [<12, 35, 16> 40.31/17]", 199420029], + [81, 7, 2424, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `clause_body_components` is too high. [13/7]", 199420029], + [81, 7, 2424, "Metrics/MethodLength: Method has too many lines. [40/10]", 199420029], + [81, 7, 2424, "Metrics/PerceivedComplexity: Perceived complexity for `clause_body_components` is too high. [14/8]", 199420029], + [127, 30, 23, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 1178765246], + [165, 7, 862, "Metrics/AbcSize: Assignment Branch Condition size for `clause_bodies_have_matching_statements?` is too high. [<3, 19, 2> 19.34/17]", 4182083840], + [165, 7, 862, "Metrics/MethodLength: Method has too many lines. [15/10]", 4182083840] + ], + "lib/prism/merge/begin_node_clause_header_emitter.rb:2991300768": [ + [5, 5, 34, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::BeginNodeClauseHeaderEmitter`.", 217025096], + [14, 7, 1600, "Metrics/AbcSize: Assignment Branch Condition size for `emit` is too high. [<10, 22, 17> 29.55/17]", 4242535078], + [14, 7, 1600, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit` is too high. [11/7]", 4242535078], + [14, 7, 1600, "Metrics/MethodLength: Method has too many lines. [25/10]", 4242535078], + [14, 7, 1600, "Metrics/PerceivedComplexity: Perceived complexity for `emit` is too high. [11/8]", 4242535078], + [14, 15, 164, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2644486585] + ], + "lib/prism/merge/begin_node_merge_planner.rb:3840396716": [ + [5, 5, 27, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::BeginNodeMergePlanner`.", 3356052894], + [5, 5, 9876, "Metrics/ClassLength: Class has too many lines. [185/100]", 148070692], + [30, 7, 2144, "Metrics/AbcSize: Assignment Branch Condition size for `plan` is too high. [<15, 34, 11> 38.76/17]", 3596380485], + [30, 7, 2144, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `plan` is too high. [10/7]", 3596380485], + [30, 7, 2144, "Metrics/MethodLength: Method has too many lines. [39/10]", 3596380485], + [30, 7, 2144, "Metrics/PerceivedComplexity: Perceived complexity for `plan` is too high. [11/8]", 3596380485], + [84, 7, 4383, "Metrics/AbcSize: Assignment Branch Condition size for `build_shared_clause_step` is too high. [<19, 70, 24> 76.4/17]", 2837542267], + [84, 7, 4383, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_shared_clause_step` is too high. [16/7]", 2837542267], + [84, 7, 4383, "Metrics/MethodLength: Method has too many lines. [73/10]", 2837542267], + [84, 7, 4383, "Metrics/PerceivedComplexity: Perceived complexity for `build_shared_clause_step` is too high. [18/8]", 2837542267], + [103, 121, 59, "Layout/LineLength: Line is too long. [179/120]", 357928082], + [105, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 1163790852], + [142, 121, 35, "Layout/LineLength: Line is too long. [155/120]", 3447647282], + [143, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 1267386383], + [167, 7, 2428, "Metrics/AbcSize: Assignment Branch Condition size for `build_unmatched_clause_step` is too high. [<2, 28, 21> 35.06/17]", 2984621385], + [167, 7, 2428, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_unmatched_clause_step` is too high. [17/7]", 2984621385], + [167, 7, 2428, "Metrics/MethodLength: Method has too many lines. [38/10]", 2984621385], + [167, 7, 2428, "Metrics/PerceivedComplexity: Perceived complexity for `build_unmatched_clause_step` is too high. [19/8]", 2984621385], + [188, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 549521717], + [198, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 619697310] + ], + "lib/prism/merge/begin_node_plan_emitter.rb:372252499": [ + [5, 5, 26, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::BeginNodePlanEmitter`.", 926648201], + [14, 7, 740, "Metrics/MethodLength: Method has too many lines. [16/10]", 2040521865], + [14, 15, 105, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1812434716], + [36, 7, 1205, "Metrics/MethodLength: Method has too many lines. [24/10]", 4164487211], + [36, 20, 127, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 466430575], + [76, 7, 1308, "Metrics/AbcSize: Assignment Branch Condition size for `emit_copied_unmatched_clause` is too high. [<6, 30, 11> 32.51/17]", 1339054986], + [76, 7, 1308, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_copied_unmatched_clause` is too high. [10/7]", 1339054986], + [76, 7, 1308, "Metrics/MethodLength: Method has too many lines. [21/10]", 1339054986], + [76, 7, 1308, "Metrics/PerceivedComplexity: Perceived complexity for `emit_copied_unmatched_clause` is too high. [10/8]", 1339054986], + [76, 39, 146, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2474530127] + ], + "lib/prism/merge/begin_node_rescue_semantics.rb:2074892203": [ + [5, 5, 30, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::BeginNodeRescueSemantics`.", 4100560642], + [5, 5, 14314, "Metrics/ClassLength: Class has too many lines. [278/100]", 1353739428], + [13, 7, 1953, "Metrics/AbcSize: Assignment Branch Condition size for `normalized_clause_body_and_header_source` is too high. [<9, 13, 21> 26.29/17]", 1895019213], + [13, 7, 1953, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalized_clause_body_and_header_source` is too high. [15/7]", 1895019213], + [13, 7, 1953, "Metrics/MethodLength: Method has too many lines. [26/10]", 1895019213], + [13, 7, 1953, "Metrics/PerceivedComplexity: Perceived complexity for `normalized_clause_body_and_header_source` is too high. [17/8]", 1895019213], + [48, 7, 812, "Metrics/AbcSize: Assignment Branch Condition size for `merge_ordered_clause_types` is too high. [<9, 17, 8> 20.83/17]", 391537814], + [48, 7, 812, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_ordered_clause_types` is too high. [8/7]", 391537814], + [48, 7, 812, "Metrics/MethodLength: Method has too many lines. [16/10]", 391537814], + [48, 7, 812, "Metrics/PerceivedComplexity: Perceived complexity for `merge_ordered_clause_types` is too high. [9/8]", 391537814], + [71, 7, 1470, "Metrics/AbcSize: Assignment Branch Condition size for `canonicalize_rescue_clause_order` is too high. [<18, 28, 14> 36.11/17]", 570708009], + [71, 7, 1470, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonicalize_rescue_clause_order` is too high. [14/7]", 570708009], + [71, 7, 1470, "Metrics/MethodLength: Method has too many lines. [24/10]", 570708009], + [71, 7, 1470, "Metrics/PerceivedComplexity: Perceived complexity for `canonicalize_rescue_clause_order` is too high. [14/8]", 570708009], + [125, 7, 530, "Metrics/AbcSize: Assignment Branch Condition size for `local_variable_read_names_in` is too high. [<1, 16, 9> 18.38/17]", 2555890222], + [125, 7, 530, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `local_variable_read_names_in` is too high. [8/7]", 2555890222], + [125, 7, 530, "Metrics/MethodLength: Method has too many lines. [12/10]", 2555890222], + [125, 7, 530, "Metrics/PerceivedComplexity: Perceived complexity for `local_variable_read_names_in` is too high. [9/8]", 2555890222], + [177, 7, 618, "Metrics/AbcSize: Assignment Branch Condition size for `rewrite_local_reference_in_source` is too high. [<6, 16, 9> 19.31/17]", 1195871443], + [177, 7, 618, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `rewrite_local_reference_in_source` is too high. [9/7]", 1195871443], + [177, 7, 618, "Metrics/PerceivedComplexity: Perceived complexity for `rewrite_local_reference_in_source` is too high. [9/8]", 1195871443], + [230, 7, 1342, "Metrics/AbcSize: Assignment Branch Condition size for `source_defined_exception_hierarchy` is too high. [<10, 30, 14> 34.58/17]", 1939854289], + [230, 7, 1342, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `source_defined_exception_hierarchy` is too high. [14/7]", 1939854289], + [230, 7, 1342, "Metrics/MethodLength: Method has too many lines. [19/10]", 1939854289], + [230, 7, 1342, "Metrics/PerceivedComplexity: Perceived complexity for `source_defined_exception_hierarchy` is too high. [15/8]", 1939854289], + [234, 85, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [248, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1806710570], + [256, 7, 1233, "Metrics/AbcSize: Assignment Branch Condition size for `collect_source_defined_exception_definitions` is too high. [<4, 22, 9> 24.1/17]", 1970916346], + [256, 7, 1233, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_source_defined_exception_definitions` is too high. [10/7]", 1970916346], + [256, 7, 1233, "Metrics/MethodLength: Method has too many lines. [24/10]", 1970916346] + ], + "lib/prism/merge/begin_node_structure.rb:1595718070": [ + [5, 5, 24, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::BeginNodeStructure`.", 3506219929], + [5, 5, 4283, "Metrics/ClassLength: Class has too many lines. [106/100]", 1740419888], + [26, 7, 375, "Metrics/AbcSize: Assignment Branch Condition size for `boundary_lines` is too high. [<0, 28, 7> 28.86/17]", 3399008793], + [26, 7, 375, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `boundary_lines` is too high. [8/7]", 3399008793], + [38, 7, 251, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `clause_start_line` is too high. [8/7]", 1553904487], + [48, 7, 407, "Metrics/MethodLength: Method has too many lines. [12/10]", 3851339415], + [64, 7, 1089, "Metrics/AbcSize: Assignment Branch Condition size for `clause_regions` is too high. [<9, 38, 9> 40.07/17]", 1916795013], + [64, 7, 1089, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `clause_regions` is too high. [10/7]", 1916795013], + [64, 7, 1089, "Metrics/MethodLength: Method has too many lines. [22/10]", 1916795013], + [64, 7, 1089, "Metrics/PerceivedComplexity: Perceived complexity for `clause_regions` is too high. [10/8]", 1916795013], + [91, 7, 613, "Metrics/AbcSize: Assignment Branch Condition size for `clause_nodes_by_type` is too high. [<9, 19, 4> 21.4/17]", 1693909219], + [91, 7, 613, "Metrics/MethodLength: Method has too many lines. [12/10]", 1693909219], + [107, 11, 19, "Naming/PredicatePrefix: Rename `has_clause_or_body?` to `clause_or_body?`.", 2163996991], + [111, 7, 598, "Metrics/AbcSize: Assignment Branch Condition size for `line_map_for` is too high. [<13, 15, 6> 20.74/17]", 191778789] + ], + "lib/prism/merge/block_directive_detector.rb:14576901": [ + [21, 5, 12462, "Metrics/ClassLength: Class has too many lines. [242/100]", 638189870], + [65, 7, 2365, "Metrics/AbcSize: Assignment Branch Condition size for `promote_spans_to_nodes` is too high. [<24, 42, 32> 58/17]", 2022543448], + [65, 7, 2365, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `promote_spans_to_nodes` is too high. [24/7]", 2022543448], + [65, 7, 2365, "Metrics/MethodLength: Method has too many lines. [36/10]", 2022543448], + [65, 7, 2365, "Metrics/PerceivedComplexity: Perceived complexity for `promote_spans_to_nodes` is too high. [25/8]", 2022543448], + [92, 11, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], + [125, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087921317], + [139, 7, 1121, "Metrics/AbcSize: Assignment Branch Condition size for `detect_freeze_spans` is too high. [<10, 18, 7> 21.75/17]", 2014886705], + [139, 7, 1121, "Metrics/MethodLength: Method has too many lines. [28/10]", 2014886705], + [139, 7, 1121, "Metrics/PerceivedComplexity: Perceived complexity for `detect_freeze_spans` is too high. [9/8]", 2014886705], + [176, 7, 1496, "Metrics/AbcSize: Assignment Branch Condition size for `detect_nocov_spans` is too high. [<10, 25, 10> 28.72/17]", 284113190], + [176, 7, 1496, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_nocov_spans` is too high. [9/7]", 284113190], + [176, 7, 1496, "Metrics/MethodLength: Method has too many lines. [40/10]", 284113190], + [176, 7, 1496, "Metrics/PerceivedComplexity: Perceived complexity for `detect_nocov_spans` is too high. [12/8]", 284113190], + [184, 9, 1163, "Metrics/BlockLength: Block has too many lines. [30/25]", 4100741046], + [227, 7, 966, "Metrics/AbcSize: Assignment Branch Condition size for `validate_no_crossing` is too high. [<8, 27, 19> 33.97/17]", 3041442390], + [227, 7, 966, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_no_crossing` is too high. [13/7]", 3041442390], + [227, 7, 966, "Metrics/MethodLength: Method has too many lines. [20/10]", 3041442390], + [227, 7, 966, "Metrics/PerceivedComplexity: Perceived complexity for `validate_no_crossing` is too high. [13/8]", 3041442390], + [304, 7, 832, "Metrics/MethodLength: Method has too many lines. [23/10]", 3204610677], + [330, 7, 1136, "Metrics/AbcSize: Assignment Branch Condition size for `rebuild_statements` is too high. [<15, 17, 9> 24.39/17]", 1114825097], + [330, 7, 1136, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `rebuild_statements` is too high. [10/7]", 1114825097], + [330, 7, 1136, "Metrics/MethodLength: Method has too many lines. [15/10]", 1114825097], + [330, 7, 1136, "Metrics/PerceivedComplexity: Perceived complexity for `rebuild_statements` is too high. [10/8]", 1114825097] + ], + "lib/prism/merge/comment/block.rb:3606937725": [ + [65, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1573406415] + ], + "lib/prism/merge/comment/parser.rb:1277632686": [ + [31, 9, 1747, "Metrics/AbcSize: Assignment Branch Condition size for `parse` is too high. [<10, 28, 8> 30.79/17]", 2837146927], + [31, 9, 1747, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse` is too high. [8/7]", 2837146927], + [31, 9, 1747, "Metrics/MethodLength: Method has too many lines. [34/10]", 2837146927], + [31, 9, 1747, "Metrics/PerceivedComplexity: Perceived complexity for `parse` is too high. [9/8]", 2837146927], + [38, 11, 1390, "Metrics/BlockLength: Block has too many lines. [26/25]", 1396583578] + ], + "lib/prism/merge/comment_only_file_merger.rb:808070956": [ + [5, 5, 27, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::CommentOnlyFileMerger`.", 1927029952], + [5, 5, 11907, "Metrics/ClassLength: Class has too many lines. [256/100]", 2729825792], + [27, 7, 1628, "Metrics/AbcSize: Assignment Branch Condition size for `merge` is too high. [<15, 32, 8> 36.24/17]", 2481561114], + [27, 7, 1628, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge` is too high. [8/7]", 2481561114], + [27, 7, 1628, "Metrics/MethodLength: Method has too many lines. [34/10]", 2481561114], + [78, 7, 661, "Metrics/MethodLength: Method has too many lines. [18/10]", 1523408112], + [100, 7, 1781, "Metrics/AbcSize: Assignment Branch Condition size for `build_output_plan` is too high. [<10, 34, 20> 40.69/17]", 994360926], + [100, 7, 1781, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_output_plan` is too high. [17/7]", 994360926], + [100, 7, 1781, "Metrics/MethodLength: Method has too many lines. [30/10]", 994360926], + [100, 7, 1781, "Metrics/PerceivedComplexity: Perceived complexity for `build_output_plan` is too high. [19/8]", 994360926], + [123, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 530225423], + [149, 7, 1486, "Metrics/AbcSize: Assignment Branch Condition size for `add_comment_node_to_result` is too high. [<7, 34, 22> 41.1/17]", 1181795760], + [149, 7, 1486, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `add_comment_node_to_result` is too high. [16/7]", 1181795760], + [149, 7, 1486, "Metrics/MethodLength: Method has too many lines. [29/10]", 1181795760], + [149, 7, 1486, "Metrics/PerceivedComplexity: Perceived complexity for `add_comment_node_to_result` is too high. [20/8]", 1181795760], + [185, 7, 693, "Metrics/MethodLength: Method has too many lines. [16/10]", 3008008109], + [205, 7, 1035, "Metrics/AbcSize: Assignment Branch Condition size for `emit_layout_gap_to_result` is too high. [<6, 24, 11> 27.07/17]", 3441550295], + [205, 7, 1035, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_layout_gap_to_result` is too high. [9/7]", 3441550295], + [205, 7, 1035, "Metrics/MethodLength: Method has too many lines. [17/10]", 3441550295], + [205, 7, 1035, "Metrics/PerceivedComplexity: Perceived complexity for `emit_layout_gap_to_result` is too high. [10/8]", 3441550295], + [230, 7, 665, "Metrics/AbcSize: Assignment Branch Condition size for `emit_comment_only_prefix_lines` is too high. [<5, 21, 4> 21.95/17]", 1939505075], + [243, 7, 942, "Metrics/MethodLength: Method has too many lines. [19/10]", 2012616838] + ], + "lib/prism/merge/file_analysis.rb:738048557": [ + [16, 5, 55295, "Metrics/ClassLength: Class has too many lines. [623/100]", 2951008665], + [19, 7, 28, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::FileAnalysis::NativeCommentAugmenter`.", 2321467727], + [19, 7, 5712, "Metrics/ClassLength: Class has too many lines. [121/100]", 3225634005], + [22, 9, 605, "Metrics/MethodLength: Method has too many lines. [16/10]", 3935631704], + [47, 9, 2672, "Metrics/AbcSize: Assignment Branch Condition size for `build!` is too high. [<19, 55, 23> 62.57/17]", 3140666915], + [47, 9, 2672, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build!` is too high. [22/7]", 3140666915], + [47, 9, 2672, "Metrics/MethodLength: Method has too many lines. [47/10]", 3140666915], + [47, 9, 2672, "Metrics/PerceivedComplexity: Perceived complexity for `build!` is too high. [22/8]", 3140666915], + [120, 9, 779, "Metrics/AbcSize: Assignment Branch Condition size for `attach_orphan_region_to_nearest_owner` is too high. [<4, 18, 3> 18.68/17]", 714646861], + [120, 9, 779, "Metrics/MethodLength: Method has too many lines. [15/10]", 714646861], + [212, 7, 1593, "Metrics/MethodLength: Method has too many lines. [17/10]", 3233444968], + [345, 7, 1177, "Metrics/MethodLength: Method has too many lines. [23/10]", 853358252], + [387, 7, 587, "Metrics/MethodLength: Method has too many lines. [13/10]", 241044926], + [453, 7, 1099, "Metrics/AbcSize: Assignment Branch Condition size for `frozen_node?` is too high. [<3, 16, 7> 17.72/17]", 1886536218], + [453, 7, 1099, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `frozen_node?` is too high. [8/7]", 1886536218], + [587, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858904], + [588, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 442686854], + [659, 7, 779, "Metrics/AbcSize: Assignment Branch Condition size for `split_first_owner_preamble_entries` is too high. [<9, 20, 10> 24.1/17]", 2477766314], + [659, 7, 779, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split_first_owner_preamble_entries` is too high. [9/7]", 2477766314], + [659, 7, 779, "Metrics/MethodLength: Method has too many lines. [11/10]", 2477766314], + [659, 7, 779, "Metrics/PerceivedComplexity: Perceived complexity for `split_first_owner_preamble_entries` is too high. [9/8]", 2477766314], + [669, 9, 11, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 848344986], + [716, 7, 768, "Metrics/MethodLength: Method has too many lines. [15/10]", 3855207561], + [742, 7, 609, "Metrics/MethodLength: Method has too many lines. [15/10]", 3157294863], + [828, 7, 2509, "Metrics/AbcSize: Assignment Branch Condition size for `extract_and_integrate_all_nodes` is too high. [<11, 29, 16> 34.9/17]", 1138957888], + [828, 7, 2509, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_and_integrate_all_nodes` is too high. [14/7]", 1138957888], + [828, 7, 2509, "Metrics/MethodLength: Method has too many lines. [32/10]", 1138957888], + [828, 7, 2509, "Metrics/PerceivedComplexity: Perceived complexity for `extract_and_integrate_all_nodes` is too high. [16/8]", 1138957888], + [897, 7, 1325, "Metrics/AbcSize: Assignment Branch Condition size for `extract_nodes_with_comments` is too high. [<3, 25, 7> 26.13/17]", 1498557944], + [897, 7, 1325, "Metrics/MethodLength: Method has too many lines. [23/10]", 1498557944], + [1009, 7, 11719, "Metrics/AbcSize: Assignment Branch Condition size for `compute_node_signature` is too high. [<19, 139, 94> 168.9/17]", 2654183611], + [1009, 7, 11719, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_node_signature` is too high. [82/7]", 2654183611], + [1009, 7, 11719, "Metrics/MethodLength: Method has too many lines. [141/10]", 2654183611], + [1009, 7, 11719, "Metrics/PerceivedComplexity: Perceived complexity for `compute_node_signature` is too high. [70/8]", 2654183611], + [1070, 88, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [1074, 24, 300, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 2690302041], + [1074, 55, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [1299, 7, 680, "Metrics/AbcSize: Assignment Branch Condition size for `detect_gemspec_block_var` is too high. [<3, 22, 15> 26.8/17]", 3676370299], + [1299, 7, 680, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_gemspec_block_var` is too high. [14/7]", 3676370299], + [1299, 7, 680, "Metrics/MethodLength: Method has too many lines. [14/10]", 3676370299], + [1299, 7, 680, "Metrics/PerceivedComplexity: Perceived complexity for `detect_gemspec_block_var` is too high. [14/8]", 3676370299] + ], + "lib/prism/merge/freeze_node.rb:2471800311": [ + [67, 7, 577, "Metrics/MethodLength: Method has too many lines. [11/10]", 2189574632], + [67, 21, 186, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1006469938], + [124, 7, 2888, "Metrics/AbcSize: Assignment Branch Condition size for `validate_structure!` is too high. [<13, 32, 33> 47.77/17]", 3621186151], + [124, 7, 2888, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_structure!` is too high. [24/7]", 3621186151], + [124, 7, 2888, "Metrics/MethodLength: Method has too many lines. [38/10]", 3621186151], + [124, 7, 2888, "Metrics/PerceivedComplexity: Perceived complexity for `validate_structure!` is too high. [25/8]", 3621186151] + ], + "lib/prism/merge/magic_comment_support.rb:1214861451": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177608], + [3, 5, 26, "Style/Documentation: Missing top-level documentation comment for `module Prism::Merge::MagicCommentSupport`.", 1989707586], + [16, 7, 1484, "Metrics/AbcSize: Assignment Branch Condition size for `comment_only_prefix_info` is too high. [<9, 38, 8> 39.86/17]", 1098666313], + [16, 7, 1484, "Metrics/MethodLength: Method has too many lines. [33/10]", 1098666313], + [59, 7, 693, "Metrics/AbcSize: Assignment Branch Condition size for `header_magic_comment_types_for_lines` is too high. [<10, 13, 9> 18.71/17]", 3693768719], + [59, 7, 693, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `header_magic_comment_types_for_lines` is too high. [8/7]", 3693768719], + [59, 7, 693, "Metrics/MethodLength: Method has too many lines. [16/10]", 3693768719], + [83, 7, 748, "Metrics/AbcSize: Assignment Branch Condition size for `prefix_comment_line_numbers_for_comments` is too high. [<10, 12, 7> 17.12/17]", 335042389], + [83, 7, 748, "Metrics/MethodLength: Method has too many lines. [19/10]", 335042389] + ], + "lib/prism/merge/merge_result.rb:1970522956": [ + [9, 5, 12561, "Metrics/ClassLength: Class has too many lines. [238/100]", 3020348188], + [67, 7, 5058, "Metrics/AbcSize: Assignment Branch Condition size for `add_node` is too high. [<25, 54, 38> 70.6/17]", 2165268226], + [67, 7, 5058, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `add_node` is too high. [22/7]", 2165268226], + [67, 7, 5058, "Metrics/MethodLength: Method has too many lines. [94/10]", 2165268226], + [67, 7, 5058, "Metrics/PerceivedComplexity: Perceived complexity for `add_node` is too high. [31/8]", 2165268226], + [74, 9, 1617, "Metrics/BlockLength: Block has too many lines. [34/25]", 3544860826], + [175, 38, 40, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 3558364074], + [193, 9, 24, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 1750147806], + [219, 7, 901, "Metrics/AbcSize: Assignment Branch Condition size for `debug_output` is too high. [<5, 29, 5> 29.85/17]", 2776830125], + [219, 7, 901, "Metrics/MethodLength: Method has too many lines. [25/10]", 2776830125], + [296, 7, 903, "Metrics/MethodLength: Method has too many lines. [18/10]", 2752342414] + ], + "lib/prism/merge/method_match_refiner.rb:3086922470": [ + [98, 7, 678, "Metrics/AbcSize: Assignment Branch Condition size for `param_similarity` is too high. [<6, 21, 4> 22.2/17]", 2054244811], + [121, 7, 705, "Metrics/AbcSize: Assignment Branch Condition size for `extract_param_names` is too high. [<2, 37, 16> 40.36/17]", 3200522215], + [121, 7, 705, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_param_names` is too high. [17/7]", 3200522215], + [121, 7, 705, "Metrics/MethodLength: Method has too many lines. [11/10]", 3200522215], + [121, 7, 705, "Metrics/PerceivedComplexity: Perceived complexity for `extract_param_names` is too high. [17/8]", 3200522215], + [129, 49, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [132, 65, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [160, 7, 854, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<13, 29, 8> 32.77/17]", 2946547420], + [160, 7, 854, "Metrics/MethodLength: Method has too many lines. [20/10]", 2946547420] + ], + "lib/prism/merge/nested_statement_walker.rb:3826169704": [ + [24, 7, 695, "Metrics/MethodLength: Method has too many lines. [16/10]", 3744912119], + [45, 7, 518, "Metrics/MethodLength: Method has too many lines. [12/10]", 2978518157] + ], + "lib/prism/merge/nocov_node.rb:3116182832": [ + [59, 21, 84, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3439911158], + [90, 19, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [143, 7, 353, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `signature` is too high. [8/7]", 3442013923], + [143, 7, 353, "Metrics/PerceivedComplexity: Perceived complexity for `signature` is too high. [9/8]", 3442013923] + ], + "lib/prism/merge/node_body_layout.rb:1642074264": [ + [5, 5, 20, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::NodeBodyLayout`.", 1262407425], + [5, 5, 5858, "Metrics/ClassLength: Class has too many lines. [127/100]", 2663802475], + [14, 7, 413, "Metrics/AbcSize: Assignment Branch Condition size for `body_text` is too high. [<2, 17, 5> 17.83/17]", 1825622248], + [28, 9, 23, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 1178765246], + [31, 7, 241, "Metrics/AbcSize: Assignment Branch Condition size for `opening_line_text` is too high. [<0, 17, 1> 17.03/17]", 1468915915], + [37, 7, 237, "Metrics/AbcSize: Assignment Branch Condition size for `closing_line_text` is too high. [<0, 18, 1> 18.03/17]", 4077830027], + [73, 7, 1058, "Metrics/AbcSize: Assignment Branch Condition size for `statements_node` is too high. [<1, 30, 11> 31.97/17]", 4004813764], + [73, 7, 1058, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `statements_node` is too high. [12/7]", 4004813764], + [73, 7, 1058, "Metrics/MethodLength: Method has too many lines. [20/10]", 4004813764], + [73, 7, 1058, "Metrics/PerceivedComplexity: Perceived complexity for `statements_node` is too high. [10/8]", 4004813764], + [100, 7, 567, "Metrics/AbcSize: Assignment Branch Condition size for `body_start_line` is too high. [<1, 24, 4> 24.35/17]", 2388795687], + [103, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 503895268], + [111, 7, 863, "Metrics/AbcSize: Assignment Branch Condition size for `body_end_line` is too high. [<2, 38, 7> 38.69/17]", 60007760], + [111, 7, 863, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `body_end_line` is too high. [8/7]", 60007760], + [111, 7, 863, "Metrics/MethodLength: Method has too many lines. [11/10]", 60007760], + [114, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2068513341], + [116, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 270242779] + ], + "lib/prism/merge/node_emission_support.rb:388716709": [ + [5, 5, 25, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::NodeEmissionSupport`.", 1335077453], + [5, 5, 42322, "Metrics/ClassLength: Class has too many lines. [775/100]", 2081266710], + [14, 7, 2734, "Metrics/AbcSize: Assignment Branch Condition size for `emit_dest_prefix_lines` is too high. [<18, 54, 18> 59.7/17]", 4241256208], + [14, 7, 2734, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_dest_prefix_lines` is too high. [16/7]", 4241256208], + [14, 7, 2734, "Metrics/MethodLength: Method has too many lines. [54/10]", 4241256208], + [14, 7, 2734, "Metrics/PerceivedComplexity: Perceived complexity for `emit_dest_prefix_lines` is too high. [17/8]", 4241256208], + [19, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177656], + [20, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3503445075], + [81, 7, 2526, "Metrics/AbcSize: Assignment Branch Condition size for `emit_removed_destination_node_comments` is too high. [<15, 38, 6> 41.29/17]", 3275408633], + [81, 7, 2526, "Metrics/MethodLength: Method has too many lines. [63/10]", 3275408633], + [153, 7, 1430, "Metrics/AbcSize: Assignment Branch Condition size for `emit_dest_gap_lines` is too high. [<7, 19, 11> 23.04/17]", 2013951205], + [153, 7, 1430, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_dest_gap_lines` is too high. [9/7]", 2013951205], + [153, 7, 1430, "Metrics/MethodLength: Method has too many lines. [27/10]", 2013951205], + [153, 7, 1430, "Metrics/PerceivedComplexity: Perceived complexity for `emit_dest_gap_lines` is too high. [9/8]", 2013951205], + [154, 36, 21, "Style/NumericPredicate: Use `last_output_line.zero?` instead of `last_output_line == 0`.", 1942859694], + [160, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3276957001], + [187, 7, 9316, "Metrics/AbcSize: Assignment Branch Condition size for `emit_matched_template_node` is too high. [<52, 122, 45> 140.0/17]", 605812917], + [187, 7, 9316, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_matched_template_node` is too high. [43/7]", 605812917], + [187, 7, 9316, "Metrics/MethodLength: Method has too many lines. [151/10]", 605812917], + [187, 7, 9316, "Metrics/PerceivedComplexity: Perceived complexity for `emit_matched_template_node` is too high. [45/8]", 605812917], + [269, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 2775680224], + [301, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 249577804], + [331, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2267103911], + [361, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 988398654], + [373, 7, 6908, "Metrics/AbcSize: Assignment Branch Condition size for `emit_node` is too high. [<44, 90, 54> 113.8/17]", 2848614159], + [373, 7, 6908, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_node` is too high. [38/7]", 2848614159], + [373, 7, 6908, "Metrics/MethodLength: Method has too many lines. [135/10]", 2848614159], + [373, 7, 6908, "Metrics/PerceivedComplexity: Perceived complexity for `emit_node` is too high. [44/8]", 2848614159], + [388, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 3628174615], + [475, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 650150522], + [480, 15, 379, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 3006808047], + [519, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2020907649], + [536, 7, 1166, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `filter_previous_destination_owned_template_leading_comments` is too high. [8/7]", 2076094754], + [536, 7, 1166, "Metrics/MethodLength: Method has too many lines. [15/10]", 2076094754], + [536, 71, 13, "Lint/UnusedMethodArgument: Unused method argument - `template_node`.", 1616609802], + [587, 7, 973, "Metrics/MethodLength: Method has too many lines. [15/10]", 1892360110], + [587, 60, 172, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2784840176], + [588, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 169966263], + [614, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087656651], + [627, 7, 873, "Metrics/AbcSize: Assignment Branch Condition size for `previous_template_gap_already_precedes_leading_comments?` is too high. [<5, 19, 11> 22.52/17]", 268778340], + [627, 7, 873, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `previous_template_gap_already_precedes_leading_comments?` is too high. [9/7]", 268778340], + [627, 7, 873, "Metrics/MethodLength: Method has too many lines. [13/10]", 268778340], + [627, 7, 873, "Metrics/PerceivedComplexity: Perceived complexity for `previous_template_gap_already_precedes_leading_comments?` is too high. [9/8]", 268778340], + [636, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 618947799], + [696, 7, 457, "Metrics/MethodLength: Method has too many lines. [11/10]", 349820622], + [724, 7, 758, "Metrics/AbcSize: Assignment Branch Condition size for `partial_same_line_node?` is too high. [<8, 31, 5> 32.4/17]", 1768803955], + [775, 7, 597, "Metrics/MethodLength: Method has too many lines. [12/10]", 2742538822], + [775, 40, 67, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 725821220], + [792, 7, 552, "Metrics/MethodLength: Method has too many lines. [12/10]", 4255654885], + [815, 7, 845, "Metrics/MethodLength: Method has too many lines. [13/10]", 3468050888], + [846, 7, 1097, "Metrics/AbcSize: Assignment Branch Condition size for `filter_emitted_template_leading_comments` is too high. [<6, 18, 3> 19.21/17]", 2091395187], + [846, 7, 1097, "Metrics/MethodLength: Method has too many lines. [17/10]", 2091395187], + [882, 7, 822, "Metrics/MethodLength: Method has too many lines. [13/10]", 3499946440], + [899, 7, 1359, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_matched_template_leading_prefix` is too high. [<7, 22, 10> 25.16/17]", 3976364089], + [899, 7, 1359, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collapse_matched_template_leading_prefix` is too high. [9/7]", 3976364089], + [899, 7, 1359, "Metrics/MethodLength: Method has too many lines. [21/10]", 3976364089], + [899, 7, 1359, "Metrics/PerceivedComplexity: Perceived complexity for `collapse_matched_template_leading_prefix` is too high. [9/8]", 3976364089], + [943, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 3703011298], + [947, 7, 746, "Metrics/MethodLength: Method has too many lines. [17/10]", 3532927627] + ], + "lib/prism/merge/partial_template_merger.rb:2303997532": [ + [14, 7, 826, "Metrics/MethodLength: Method has too many lines. [14/10]", 713706122], + [14, 21, 329, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [12/5]", 2768355468], + [55, 7, 487, "Metrics/MethodLength: Method has too many lines. [11/10]", 447766477], + [75, 7, 520, "Metrics/AbcSize: Assignment Branch Condition size for `node_to_text` is too high. [<1, 19, 6> 19.95/17]", 1593952791], + [84, 46, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] + ], + "lib/prism/merge/recursive_merge_policy.rb:4204303290": [ + [5, 5, 26, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::RecursiveMergePolicy`.", 1329613257], + [12, 7, 1132, "Metrics/AbcSize: Assignment Branch Condition size for `should_merge?` is too high. [<4, 25, 15> 29.43/17]", 4123619949], + [12, 7, 1132, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `should_merge?` is too high. [14/7]", 4123619949], + [12, 7, 1132, "Metrics/MethodLength: Method has too many lines. [20/10]", 4123619949], + [12, 7, 1132, "Metrics/PerceivedComplexity: Perceived complexity for `should_merge?` is too high. [13/8]", 4123619949], + [47, 7, 398, "Metrics/MethodLength: Method has too many lines. [18/10]", 385694759] + ], + "lib/prism/merge/recursive_node_body_merger.rb:2523299035": [ + [5, 5, 29, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::RecursiveNodeBodyMerger`.", 3703318859], + [5, 5, 18406, "Metrics/ClassLength: Class has too many lines. [333/100]", 1740018190], + [12, 7, 12657, "Metrics/AbcSize: Assignment Branch Condition size for `merge` is too high. [<79, 259, 101> 289/17]", 1663029092], + [12, 7, 12657, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge` is too high. [78/7]", 1663029092], + [12, 7, 12657, "Metrics/MethodLength: Method has too many lines. [215/10]", 1663029092], + [12, 7, 12657, "Metrics/PerceivedComplexity: Perceived complexity for `merge` is too high. [83/8]", 1663029092], + [27, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 929875726], + [65, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 518709914], + [70, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 366676207], + [266, 7, 1221, "Metrics/AbcSize: Assignment Branch Condition size for `remap_inner_unresolved_review_state!` is too high. [<8, 22, 6> 24.17/17]", 3210674006], + [266, 7, 1221, "Metrics/MethodLength: Method has too many lines. [21/10]", 3210674006], + [293, 7, 1121, "Metrics/AbcSize: Assignment Branch Condition size for `remap_inner_unresolved_case` is too high. [<6, 24, 0> 24.74/17]", 3468635549], + [293, 7, 1121, "Metrics/MethodLength: Method has too many lines. [15/10]", 3468635549], + [376, 7, 826, "Metrics/AbcSize: Assignment Branch Condition size for `emit_trailing_layout_gap_lines` is too high. [<6, 18, 9> 21/17]", 2158299973], + [376, 7, 826, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_trailing_layout_gap_lines` is too high. [8/7]", 2158299973], + [376, 7, 826, "Metrics/MethodLength: Method has too many lines. [17/10]", 2158299973], + [376, 7, 826, "Metrics/PerceivedComplexity: Perceived complexity for `emit_trailing_layout_gap_lines` is too high. [9/8]", 2158299973] + ], + "lib/prism/merge/ruby_doc_surface_analyzer.rb:2647486851": [ + [7, 5, 8269, "Metrics/ClassLength: Class has too many lines. [192/100]", 2716524254], + [61, 7, 1408, "Metrics/AbcSize: Assignment Branch Condition size for `build_doc_comment_surface` is too high. [<10, 25, 5> 27.39/17]", 2414553577], + [61, 7, 1408, "Metrics/MethodLength: Method has too many lines. [28/10]", 2414553577], + [106, 7, 1513, "Metrics/AbcSize: Assignment Branch Condition size for `build_example_surface` is too high. [<6, 24, 6> 25.46/17]", 4167825853], + [106, 7, 1513, "Metrics/MethodLength: Method has too many lines. [29/10]", 4167825853], + [162, 7, 555, "Metrics/AbcSize: Assignment Branch Condition size for `doc_comment_entries` is too high. [<8, 18, 6> 20.59/17]", 358090808] + ], + "lib/prism/merge/scaffold_chunk_remover.rb:2190237849": [ + [15, 5, 5193, "Metrics/ClassLength: Class has too many lines. [123/100]", 3937701477], + [75, 7, 1856, "Metrics/AbcSize: Assignment Branch Condition size for `call` is too high. [<21, 60, 22> 67.27/17]", 1601329428], + [75, 7, 1856, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `call` is too high. [21/7]", 1601329428], + [75, 7, 1856, "Metrics/MethodLength: Method has too many lines. [37/10]", 1601329428], + [75, 7, 1856, "Metrics/PerceivedComplexity: Perceived complexity for `call` is too high. [21/8]", 1601329428] + ], + "lib/prism/merge/smart_merger.rb:3814529034": [ + [48, 5, 42561, "Metrics/ClassLength: Class has too many lines. [603/100]", 3828655257], + [96, 7, 2032, "Metrics/MethodLength: Method has too many lines. [24/10]", 4118525224], + [96, 21, 595, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [18/5]", 1562155096], + [171, 7, 1325, "Metrics/AbcSize: Assignment Branch Condition size for `merge_with_debug` is too high. [<3, 24, 19> 30.76/17]", 605983530], + [171, 7, 1325, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_with_debug` is too high. [20/7]", 605983530], + [171, 7, 1325, "Metrics/MethodLength: Method has too many lines. [27/10]", 605983530], + [171, 7, 1325, "Metrics/PerceivedComplexity: Perceived complexity for `merge_with_debug` is too high. [20/8]", 605983530], + [310, 7, 664, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `frozen_node?` is too high. [8/7]", 2577924190], + [352, 7, 508, "Metrics/MethodLength: Method has too many lines. [13/10]", 1368018500], + [442, 7, 1155, "Metrics/AbcSize: Assignment Branch Condition size for `build_signature_map` is too high. [<11, 16, 8> 21/17]", 3956321005], + [442, 7, 1155, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_signature_map` is too high. [8/7]", 3956321005], + [442, 7, 1155, "Metrics/MethodLength: Method has too many lines. [16/10]", 3956321005], + [483, 7, 2731, "Metrics/AbcSize: Assignment Branch Condition size for `preference_for_node` is too high. [<7, 22, 20> 30.55/17]", 1325207598], + [483, 7, 2731, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preference_for_node` is too high. [21/7]", 1325207598], + [483, 7, 2731, "Metrics/MethodLength: Method has too many lines. [25/10]", 1325207598], + [483, 7, 2731, "Metrics/PerceivedComplexity: Perceived complexity for `preference_for_node` is too high. [21/8]", 1325207598], + [659, 32, 73, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2261515417], + [670, 35, 79, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1350141395], + [681, 42, 63, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2615605084], + [852, 35, 213, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 720547751] + ], + "lib/prism/merge/source_line_lookup.rb:1098479933": [ + [5, 5, 23, "Style/Documentation: Missing top-level documentation comment for `module Prism::Merge::SourceLineLookup`.", 2168434862] + ], + "lib/prism/merge/top_level_merge_runner.rb:3009983916": [ + [38, 5, 59959, "Metrics/ClassLength: Class has too many lines. [1124/100]", 2689943302], + [66, 7, 5196, "Metrics/AbcSize: Assignment Branch Condition size for `merge` is too high. [<22, 68, 9> 72.03/17]", 176450457], + [66, 7, 5196, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge` is too high. [9/7]", 176450457], + [66, 7, 5196, "Metrics/MethodLength: Method has too many lines. [75/10]", 176450457], + [66, 7, 5196, "Metrics/PerceivedComplexity: Perceived complexity for `merge` is too high. [10/8]", 176450457], + [162, 7, 2023, "Metrics/AbcSize: Assignment Branch Condition size for `start_runtime_session!` is too high. [<5, 48, 1> 48.27/17]", 2943824289], + [162, 7, 2023, "Metrics/MethodLength: Method has too many lines. [44/10]", 2943824289], + [212, 7, 1765, "Metrics/AbcSize: Assignment Branch Condition size for `complete_runtime_session!` is too high. [<2, 21, 9> 22.93/17]", 2968004900], + [212, 7, 1765, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `complete_runtime_session!` is too high. [8/7]", 2968004900], + [212, 7, 1765, "Metrics/MethodLength: Method has too many lines. [36/10]", 2968004900], + [212, 7, 1765, "Metrics/PerceivedComplexity: Perceived complexity for `complete_runtime_session!` is too high. [10/8]", 2968004900], + [229, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3907470478], + [254, 7, 584, "Metrics/MethodLength: Method has too many lines. [14/10]", 1615217394], + [272, 7, 589, "Metrics/AbcSize: Assignment Branch Condition size for `runtime_document_surface` is too high. [<1, 19, 1> 19.05/17]", 1835005228], + [272, 7, 589, "Metrics/MethodLength: Method has too many lines. [12/10]", 1835005228], + [288, 7, 3192, "Metrics/AbcSize: Assignment Branch Condition size for `register_discovered_surface_operations!` is too high. [<12, 60, 9> 61.85/17]", 3059111269], + [288, 7, 3192, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `register_discovered_surface_operations!` is too high. [10/7]", 3059111269], + [288, 7, 3192, "Metrics/MethodLength: Method has too many lines. [65/10]", 3059111269], + [288, 7, 3192, "Metrics/PerceivedComplexity: Perceived complexity for `register_discovered_surface_operations!` is too high. [10/8]", 3059111269], + [297, 9, 2237, "Metrics/BlockLength: Block has too many lines. [44/25]", 809738986], + [399, 7, 1643, "Metrics/AbcSize: Assignment Branch Condition size for `execute_child_operations!` is too high. [<5, 33, 5> 33.75/17]", 1049305146], + [399, 7, 1643, "Metrics/MethodLength: Method has too many lines. [36/10]", 1049305146], + [400, 9, 1570, "Metrics/BlockLength: Block has too many lines. [29/25]", 1597985402], + [404, 9, 31, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 3553388257], + [448, 7, 631, "Metrics/MethodLength: Method has too many lines. [15/10]", 1652116821], + [466, 7, 1306, "Metrics/AbcSize: Assignment Branch Condition size for `merge_runtime_surface` is too high. [<2, 18, 4> 18.55/17]", 1347264970], + [466, 7, 1306, "Metrics/MethodLength: Method has too many lines. [29/10]", 1347264970], + [500, 7, 1393, "Metrics/AbcSize: Assignment Branch Condition size for `merge_runtime_doc_comment_surface` is too high. [<4, 23, 5> 23.87/17]", 3745645404], + [500, 7, 1393, "Metrics/MethodLength: Method has too many lines. [29/10]", 3745645404], + [534, 7, 826, "Metrics/AbcSize: Assignment Branch Condition size for `apply_runtime_doc_children` is too high. [<5, 24, 7> 25.5/17]", 1386022126], + [534, 7, 826, "Metrics/MethodLength: Method has too many lines. [15/10]", 1386022126], + [542, 16, 27, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 1443167664], + [546, 9, 24, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 644874689], + [554, 7, 1438, "Metrics/AbcSize: Assignment Branch Condition size for `apply_runtime_example_child` is too high. [<10, 44, 10> 46.22/17]", 2594444962], + [554, 7, 1438, "Metrics/MethodLength: Method has too many lines. [25/10]", 2594444962], + [556, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3651736697], + [599, 7, 518, "Metrics/MethodLength: Method has too many lines. [11/10]", 523939757], + [623, 7, 753, "Metrics/MethodLength: Method has too many lines. [15/10]", 3406860674], + [683, 7, 1514, "Metrics/AbcSize: Assignment Branch Condition size for `compute_similarity_pairs` is too high. [<17, 42, 11> 46.63/17]", 103276977], + [683, 7, 1514, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_similarity_pairs` is too high. [11/7]", 103276977], + [683, 7, 1514, "Metrics/MethodLength: Method has too many lines. [27/10]", 103276977], + [683, 7, 1514, "Metrics/PerceivedComplexity: Perceived complexity for `compute_similarity_pairs` is too high. [11/8]", 103276977], + [735, 7, 545, "Metrics/MethodLength: Method has too many lines. [12/10]", 398381329], + [763, 7, 586, "Metrics/MethodLength: Method has too many lines. [11/10]", 1559638959], + [843, 7, 640, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_nested_signatures` is too high. [10/7]", 3947424552], + [843, 7, 640, "Metrics/MethodLength: Method has too many lines. [13/10]", 3947424552], + [843, 7, 640, "Metrics/PerceivedComplexity: Perceived complexity for `collect_nested_signatures` is too high. [10/8]", 3947424552], + [845, 12, 9, "Style/NumericPredicate: Use `depth.positive?` instead of `depth > 0`.", 2180768870], + [869, 7, 1297, "Metrics/AbcSize: Assignment Branch Condition size for `nested_statement_children` is too high. [<2, 50, 17> 52.85/17]", 3818826989], + [869, 7, 1297, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `nested_statement_children` is too high. [17/7]", 3818826989], + [869, 7, 1297, "Metrics/MethodLength: Method has too many lines. [19/10]", 3818826989], + [869, 7, 1297, "Metrics/PerceivedComplexity: Perceived complexity for `nested_statement_children` is too high. [15/8]", 3818826989], + [877, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 3315454453], + [882, 93, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [883, 89, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [884, 93, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [899, 7, 754, "Metrics/AbcSize: Assignment Branch Condition size for `prepare_comment_augmenters!` is too high. [<1, 19, 0> 19.03/17]", 311364642], + [899, 7, 754, "Metrics/MethodLength: Method has too many lines. [12/10]", 311364642], + [1003, 7, 1707, "Metrics/AbcSize: Assignment Branch Condition size for `retained_owner_plan` is too high. [<16, 40, 12> 44.72/17]", 375532236], + [1003, 7, 1707, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `retained_owner_plan` is too high. [13/7]", 375532236], + [1003, 7, 1707, "Metrics/MethodLength: Method has too many lines. [33/10]", 375532236], + [1003, 7, 1707, "Metrics/PerceivedComplexity: Perceived complexity for `retained_owner_plan` is too high. [13/8]", 375532236], + [1003, 55, 17, "Lint/UnusedMethodArgument: Unused method argument - `dest_by_signature`.", 379778684], + [1024, 9, 250, "Style/CombinableLoops: Combine this loop with the previous loop.", 3315024098], + [1031, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 180543822], + [1048, 7, 4375, "Metrics/AbcSize: Assignment Branch Condition size for `process_dest_node` is too high. [<23, 66, 14> 71.28/17]", 329713352], + [1048, 7, 4375, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `process_dest_node` is too high. [11/7]", 329713352], + [1048, 7, 4375, "Metrics/MethodLength: Method has too many lines. [80/10]", 329713352], + [1048, 7, 4375, "Metrics/PerceivedComplexity: Perceived complexity for `process_dest_node` is too high. [15/8]", 329713352], + [1048, 28, 279, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 2321512478], + [1153, 7, 757, "Metrics/MethodLength: Method has too many lines. [19/10]", 3306507447], + [1191, 44, 189, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 215272527], + [1222, 7, 888, "Metrics/MethodLength: Method has too many lines. [17/10]", 2638200013], + [1222, 31, 189, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 50070642], + [1244, 7, 719, "Metrics/MethodLength: Method has too many lines. [13/10]", 530865591], + [1262, 7, 1393, "Metrics/AbcSize: Assignment Branch Condition size for `process_non_recursive_match` is too high. [<10, 23, 7> 26.04/17]", 324106576], + [1262, 7, 1393, "Metrics/MethodLength: Method has too many lines. [29/10]", 324106576], + [1296, 7, 1106, "Metrics/AbcSize: Assignment Branch Condition size for `process_unresolved_non_recursive_match` is too high. [<3, 19, 3> 19.47/17]", 1476652897], + [1296, 7, 1106, "Metrics/MethodLength: Method has too many lines. [26/10]", 1476652897], + [1337, 7, 1935, "Metrics/AbcSize: Assignment Branch Condition size for `record_unresolved_match_case!` is too high. [<4, 26, 3> 26.48/17]", 456739474], + [1337, 7, 1935, "Metrics/MethodLength: Method has too many lines. [37/10]", 456739474], + [1422, 7, 1067, "Metrics/AbcSize: Assignment Branch Condition size for `advance_last_output_dest_line` is too high. [<6, 19, 6> 20.81/17]", 331135500], + [1422, 7, 1067, "Metrics/MethodLength: Method has too many lines. [11/10]", 331135500], + [1422, 40, 181, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2038823112] + ], + "lib/prism/merge/wrapper_comment_support.rb:3046735928": [ + [5, 5, 27, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::WrapperCommentSupport`.", 2211657316], + [5, 5, 17765, "Metrics/ClassLength: Class has too many lines. [358/100]", 370100972], + [14, 7, 3072, "Metrics/AbcSize: Assignment Branch Condition size for `filtered_leading_comments_for` is too high. [<26, 58, 27> 69.06/17]", 934788024], + [14, 7, 3072, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `filtered_leading_comments_for` is too high. [24/7]", 934788024], + [14, 7, 3072, "Metrics/MethodLength: Method has too many lines. [48/10]", 934788024], + [14, 7, 3072, "Metrics/PerceivedComplexity: Perceived complexity for `filtered_leading_comments_for` is too high. [27/8]", 934788024], + [24, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 366676207], + [65, 11, 68, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 2360366291], + [74, 73, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [95, 7, 1446, "Metrics/AbcSize: Assignment Branch Condition size for `emit_leading_comments` is too high. [<8, 16, 13> 22.11/17]", 86315238], + [95, 7, 1446, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_leading_comments` is too high. [9/7]", 86315238], + [95, 7, 1446, "Metrics/MethodLength: Method has too many lines. [31/10]", 86315238], + [95, 7, 1446, "Metrics/PerceivedComplexity: Perceived complexity for `emit_leading_comments` is too high. [11/8]", 86315238], + [95, 32, 73, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2261515417], + [98, 9, 1234, "Metrics/BlockLength: Block has too many lines. [28/25]", 357181412], + [134, 7, 953, "Metrics/MethodLength: Method has too many lines. [19/10]", 3183807785], + [134, 35, 79, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1350141395], + [162, 7, 1228, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_comment_region` is too high. [10/7]", 2201645681], + [162, 7, 1228, "Metrics/MethodLength: Method has too many lines. [31/10]", 2201645681], + [162, 7, 1228, "Metrics/PerceivedComplexity: Perceived complexity for `emit_comment_region` is too high. [11/8]", 2201645681], + [162, 30, 67, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 191987245], + [163, 29, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [202, 7, 777, "Metrics/MethodLength: Method has too many lines. [18/10]", 4073303022], + [202, 30, 68, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3851519454], + [208, 9, 8, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 359222635], + [226, 7, 1080, "Metrics/MethodLength: Method has too many lines. [27/10]", 296167644], + [226, 42, 63, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2615605084], + [260, 7, 689, "Metrics/AbcSize: Assignment Branch Condition size for `append_inline_comment_entries` is too high. [<7, 19, 8> 21.77/17]", 1575903523], + [260, 7, 689, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `append_inline_comment_entries` is too high. [8/7]", 1575903523], + [260, 7, 689, "Metrics/MethodLength: Method has too many lines. [16/10]", 1575903523], + [260, 7, 689, "Metrics/PerceivedComplexity: Perceived complexity for `append_inline_comment_entries` is too high. [9/8]", 1575903523], + [288, 7, 607, "Metrics/AbcSize: Assignment Branch Condition size for `line_inline_comment_entries` is too high. [<3, 18, 7> 19.54/17]", 2131701672], + [288, 7, 607, "Metrics/MethodLength: Method has too many lines. [12/10]", 2131701672], + [338, 7, 1023, "Metrics/MethodLength: Method has too many lines. [19/10]", 2409125040], + [363, 7, 854, "Metrics/AbcSize: Assignment Branch Condition size for `runtime_doc_comment_operation_for` is too high. [<4, 24, 13> 27.59/17]", 1109173425], + [363, 7, 854, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `runtime_doc_comment_operation_for` is too high. [10/7]", 1109173425], + [363, 7, 854, "Metrics/MethodLength: Method has too many lines. [11/10]", 1109173425], + [363, 7, 854, "Metrics/PerceivedComplexity: Perceived complexity for `runtime_doc_comment_operation_for` is too high. [10/8]", 1109173425], + [373, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 1843406524], + [381, 7, 755, "Metrics/AbcSize: Assignment Branch Condition size for `build_runtime_leading_region` is too high. [<5, 18, 4> 19.1/17]", 3130034424], + [381, 7, 755, "Metrics/MethodLength: Method has too many lines. [14/10]", 3130034424], + [411, 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:2052428369": [ + [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ], + "spec/fixtures/reproducible/04_gemspec_duplication/destination.rb:971498360": [ + [25, 1, 8292, "Metrics/BlockLength: Block has too many lines. [110/25]", 1251580584], + [32, 121, 317, "Layout/LineLength: Line is too long. [437/120]", 1870252497], + [184, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4147388508], + [199, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [200, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [207, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ], + "spec/fixtures/reproducible/04_gemspec_duplication/template.rb:1741222365": [ + [19, 1, 4121, "Metrics/BlockLength: Block has too many lines. [71/25]", 547880907], + [26, 121, 317, "Layout/LineLength: Line is too long. [437/120]", 1870252497] + ], + "spec/fixtures/reproducible/05_gemspec_orphan_duplication/destination.rb:2573186797": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177634] + ], + "spec/fixtures/reproducible/05_gemspec_orphan_duplication/result.rb:2573186797": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177634] + ], + "spec/fixtures/reproducible/05_gemspec_orphan_duplication/template.rb:1825302441": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177634] + ], + "spec/fixtures_integration_spec.rb:4053275636": [ + [7, 1, 21570, "Metrics/BlockLength: Block has too many lines. [483/25]", 416378449], + [66, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1448895712], + [72, 3, 1302, "Metrics/BlockLength: Block has too many lines. [30/25]", 2973641144], + [106, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [113, 3, 1679, "Metrics/BlockLength: Block has too many lines. [38/25]", 2954972744], + [373, 3, 7512, "Metrics/BlockLength: Block has too many lines. [149/25]", 2278210376] + ], + "spec/reproducible_merge_spec.rb:2334824632": [ + [6, 1, 2420, "Metrics/BlockLength: Block has too many lines. [50/25]", 2207509489], + [39, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1416718429] + ] +} diff --git a/gems/prism-merge/Gemfile b/gems/prism-merge/Gemfile index 414dabd10..3845c5869 100644 --- a/gems/prism-merge/Gemfile +++ b/gems/prism-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source "https://gem.coop" +source 'https://gem.coop' git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,57 +19,53 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ["~> 1.0", ">= 1.0.8"] -gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ['~> 1.0', '>= 1.0.8'] +gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ruby-merge ] -direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") +direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? if direct_sibling_gems.any? && - (direct_sibling_local || - ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) - direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") - direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) begin nomono_activation_requirements = nomono_requirements - nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) if File.file?(nomono_lockfile) nomono_locked_spec = Bundler::LockfileParser - .new(Bundler.read_file(nomono_lockfile)) - .specs - .find { |spec| spec.name == "nomono" } + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } nomono_locked = nomono_locked_spec && - Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) - if nomono_locked - nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] - end - end - Kernel.send(:gem, "nomono", *nomono_activation_requirements) - require "nomono/bundler" - if direct_sibling_templating && !direct_sibling_local - ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local eval_nomono_gems( gems: direct_sibling_gems, - prefix: "STRUCTUREDMERGE", - path_env: "STRUCTUREDMERGE_DEV", - root: ["src", "my", "structuredmerge"] + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] ) rescue LoadError - warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' ensure if direct_sibling_templating && !direct_sibling_local if direct_sibling_dev_was_set - ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original else - ENV.delete("STRUCTUREDMERGE_DEV") + ENV.delete('STRUCTUREDMERGE_DEV') end end end @@ -213,25 +209,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging -eval_gemfile "gemfiles/modular/debug.gemfile" +eval_gemfile 'gemfiles/modular/debug.gemfile' # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile "gemfiles/modular/coverage.gemfile" +eval_gemfile 'gemfiles/modular/coverage.gemfile' # Linting -eval_gemfile "gemfiles/modular/style.gemfile" +eval_gemfile 'gemfiles/modular/style.gemfile' # Documentation -eval_gemfile "gemfiles/modular/documentation.gemfile" +eval_gemfile 'gemfiles/modular/documentation.gemfile' # Optional -eval_gemfile "gemfiles/modular/optional.gemfile" +eval_gemfile 'gemfiles/modular/optional.gemfile' ### Std Lib Extracted Gems -eval_gemfile "gemfiles/modular/x_std_libs.gemfile" +eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' # See unlocked_deps appraisal for more details on irb inclusion -gem "irb", "~> 1.17" # ruby >= 2.7 +gem 'irb', '~> 1.17' # ruby >= 2.7 diff --git a/gems/prism-merge/Gemfile.lock b/gems/prism-merge/Gemfile.lock index 35caf8bce..02ebf0bb3 100644 --- a/gems/prism-merge/Gemfile.lock +++ b/gems/prism-merge/Gemfile.lock @@ -16,272 +16,6 @@ PATH ruby-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.0) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: @@ -301,6 +35,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -309,12 +48,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -323,6 +56,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -372,12 +106,21 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - kettle-dev (2.3.6) + kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -396,7 +139,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -536,23 +278,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -586,11 +330,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -637,45 +381,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -686,59 +408,37 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0.0) ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -751,27 +451,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) - kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae - kettle-drift (1.0.5) - kettle-jem (7.1.0) + kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.0) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -786,14 +478,11 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -801,7 +490,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -833,15 +521,14 @@ 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -855,19 +542,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -875,7 +557,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/prism-merge/Rakefile b/gems/prism-merge/Rakefile index 3ceda1211..0413b973d 100644 --- a/gems/prism-merge/Rakefile +++ b/gems/prism-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require "kettle/drift" + require 'kettle/drift' Kettle::Drift.install_tasks rescue LoadError - desc("(stub) kettle:drift:check is unavailable") - task("kettle:drift:check") do + desc('(stub) kettle:drift:check is unavailable') + task('kettle:drift:check') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:update is unavailable") - task("kettle:drift:update") do + desc('(stub) kettle:drift:update is unavailable') + task('kettle:drift:update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:force_update is unavailable") - task("kettle:drift:force_update") do + desc('(stub) kettle:drift:force_update is unavailable') + task('kettle:drift:force_update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift is unavailable") - task("kettle:drift" => "kettle:drift:update") + desc('(stub) kettle:drift is unavailable') + task('kettle:drift' => 'kettle:drift:update') end ### TEMPLATING TASKS diff --git a/gems/prism-merge/bin/yard b/gems/prism-merge/bin/yard index a7e8b6eed..5d516ad6f 100755 --- a/gems/prism-merge/bin/yard +++ b/gems/prism-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec("bundle", "exec", "rake", "yard") +exec('bundle', 'exec', 'rake', 'yard') diff --git a/gems/prism-merge/lib/prism/merge/version.rb b/gems/prism-merge/lib/prism/merge/version.rb index c5d5bca42..29398c390 100644 --- a/gems/prism-merge/lib/prism/merge/version.rb +++ b/gems/prism-merge/lib/prism/merge/version.rb @@ -3,7 +3,7 @@ module Prism module Merge module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/smorg-rb/.gitattributes b/gems/smorg-rb/.gitattributes index 0ac65aaa7..35a3c7359 100644 --- a/gems/smorg-rb/.gitattributes +++ b/gems/smorg-rb/.gitattributes @@ -1,5 +1,5 @@ # <> do not edit below this line -*.rb diff=smorg-ruby +*.rb diff=smorg-rb *.go diff=smorg-go *.rs diff=smorg-rs # <> diff --git a/gems/smorg-rb/.kettle-drift.lock b/gems/smorg-rb/.kettle-drift.lock index 1e71cffac..54656e141 100644 --- a/gems/smorg-rb/.kettle-drift.lock +++ b/gems/smorg-rb/.kettle-drift.lock @@ -4,7 +4,8 @@ "file": "Gemfile", "lines": [ 85, - 125 + 125, + 165 ] } ], @@ -13,7 +14,8 @@ "file": "Gemfile", "lines": [ 96, - 136 + 136, + 176 ] } ], @@ -22,7 +24,8 @@ "file": "Gemfile", "lines": [ 86, - 126 + 126, + 166 ] } ], @@ -31,7 +34,8 @@ "file": "Gemfile", "lines": [ 98, - 138 + 138, + 178 ] } ], @@ -40,7 +44,8 @@ "file": "Gemfile", "lines": [ 101, - 141 + 141, + 181 ] } ], @@ -49,7 +54,8 @@ "file": "Gemfile", "lines": [ 87, - 127 + 127, + 167 ] } ], @@ -59,7 +65,8 @@ "lines": [ 65, 105, - 145 + 145, + 185 ] } ], @@ -68,7 +75,8 @@ "file": "Gemfile", "lines": [ 106, - 146 + 146, + 186 ] } ], @@ -78,7 +86,8 @@ "lines": [ 48, 92, - 132 + 132, + 172 ] } ], @@ -87,7 +96,8 @@ "file": "Gemfile", "lines": [ 115, - 155 + 155, + 195 ] } ], @@ -97,7 +107,8 @@ "lines": [ 40, 84, - 124 + 124, + 164 ] } ], @@ -107,7 +118,8 @@ "lines": [ 74, 114, - 154 + 154, + 194 ] } ], @@ -116,7 +128,8 @@ "file": "Gemfile", "lines": [ 90, - 130 + 130, + 170 ] } ], @@ -126,7 +139,8 @@ "lines": [ 53, 97, - 137 + 137, + 177 ] } ], @@ -136,7 +150,8 @@ "lines": [ 49, 93, - 133 + 133, + 173 ] } ], @@ -145,7 +160,8 @@ "file": "Gemfile", "lines": [ 91, - 131 + 131, + 171 ] } ], @@ -154,7 +170,8 @@ "file": "Gemfile", "lines": [ 108, - 148 + 148, + 188 ] } ], @@ -163,7 +180,8 @@ "file": "Gemfile", "lines": [ 107, - 147 + 147, + 187 ] } ], @@ -172,7 +190,8 @@ "file": "Gemfile", "lines": [ 102, - 142 + 142, + 182 ] } ], @@ -181,7 +200,8 @@ "file": "Gemfile", "lines": [ 111, - 151 + 151, + 191 ] } ], diff --git a/gems/smorg-rb/.rubocop_gradual.lock b/gems/smorg-rb/.rubocop_gradual.lock deleted file mode 100644 index 2167b9b80..000000000 --- a/gems/smorg-rb/.rubocop_gradual.lock +++ /dev/null @@ -1,167 +0,0 @@ -{ - ".simplecov:2553617326": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:2481690509": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/smorg-rb.rb:3972809897": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`smorg-rb.rb`) should use snake_case.", 5381] - ], - "lib/smorg/rb.rb:1319799555": [ - [18, 3, 9, "Style/Documentation: Missing top-level documentation comment for `module Smorg::RB`.", 4021240623], - [18, 3, 32869, "Metrics/ModuleLength: Module has too many lines. [840/100]", 1685453755], - [26, 5, 660, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `run` is too high. [8/7]", 1065401429], - [26, 5, 660, "Metrics/MethodLength: Method has too many lines. [20/10]", 1065401429], - [50, 121, 41, "Layout/LineLength: Line is too long. [161/120]", 2633772911], - [53, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2488766433], - [56, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 1642922677], - [59, 5, 1450, "Metrics/AbcSize: Assignment Branch Condition size for `run_git` is too high. [<9, 30, 10> 32.88/17]", 2684567120], - [59, 5, 1450, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `run_git` is too high. [8/7]", 2684567120], - [59, 5, 1450, "Metrics/MethodLength: Method has too many lines. [33/10]", 2684567120], - [59, 5, 1450, "Metrics/PerceivedComplexity: Perceived complexity for `run_git` is too high. [9/8]", 2684567120], - [98, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 2215054003], - [102, 5, 712, "Metrics/AbcSize: Assignment Branch Condition size for `parse_git_install_options` is too high. [<8, 14, 7> 17.58/17]", 3152011724], - [102, 5, 712, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_git_install_options` is too high. [8/7]", 3152011724], - [102, 5, 712, "Metrics/MethodLength: Method has too many lines. [22/10]", 3152011724], - [127, 5, 640, "Metrics/MethodLength: Method has too many lines. [14/10]", 518795916], - [144, 5, 3491, "Metrics/AbcSize: Assignment Branch Condition size for `run_merge_driver` is too high. [<25, 60, 34> 73.36/17]", 4283927228], - [144, 5, 3491, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `run_merge_driver` is too high. [28/7]", 4283927228], - [144, 5, 3491, "Metrics/MethodLength: Method has too many lines. [69/10]", 4283927228], - [144, 5, 3491, "Metrics/PerceivedComplexity: Perceived complexity for `run_merge_driver` is too high. [28/8]", 4283927228], - [224, 5, 1285, "Metrics/MethodLength: Method has too many lines. [36/10]", 2754100815], - [224, 30, 84, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2091651017], - [283, 5, 1345, "Metrics/AbcSize: Assignment Branch Condition size for `merge_git_file_fallback` is too high. [<4, 23, 6> 24.1/17]", 3637986705], - [283, 5, 1345, "Metrics/MethodLength: Method has too many lines. [47/10]", 3637986705], - [311, 13, 2, "Style/SpecialGlobalVars: Prefer `$CHILD_STATUS` from the stdlib 'English' module (don't forget to require it) over `$?`.", 5858718], - [312, 25, 2, "Style/SpecialGlobalVars: Prefer `$CHILD_STATUS` from the stdlib 'English' module (don't forget to require it) over `$?`.", 5858718], - [346, 5, 434, "Metrics/MethodLength: Method has too many lines. [12/10]", 3073199759], - [361, 5, 2289, "Metrics/AbcSize: Assignment Branch Condition size for `parse_merge_driver_options` is too high. [<36, 48, 26> 65.39/17]", 3420252459], - [361, 5, 2289, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_merge_driver_options` is too high. [25/7]", 3420252459], - [361, 5, 2289, "Metrics/MethodLength: Method has too many lines. [66/10]", 3420252459], - [361, 5, 2289, "Metrics/PerceivedComplexity: Perceived complexity for `parse_merge_driver_options` is too high. [17/8]", 3420252459], - [432, 5, 1076, "Metrics/MethodLength: Method has too many lines. [22/10]", 1477555868], - [432, 42, 66, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1731953899], - [432, 67, 2, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 5861217], - [451, 31, 58, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 3099919314], - [465, 5, 1225, "Metrics/AbcSize: Assignment Branch Condition size for `report_and_enforce_profile` is too high. [<3, 20, 8> 21.75/17]", 58791261], - [465, 5, 1225, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_and_enforce_profile` is too high. [9/7]", 58791261], - [465, 5, 1225, "Metrics/MethodLength: Method has too many lines. [24/10]", 58791261], - [465, 5, 1225, "Metrics/PerceivedComplexity: Perceived complexity for `report_and_enforce_profile` is too high. [9/8]", 58791261], - [493, 5, 468, "Metrics/MethodLength: Method has too many lines. [12/10]", 1242862675], - [509, 5, 877, "Metrics/AbcSize: Assignment Branch Condition size for `parse_diff_driver_options` is too high. [<7, 18, 9> 21.31/17]", 2253944408], - [509, 5, 877, "Metrics/MethodLength: Method has too many lines. [26/10]", 2253944408], - [572, 5, 776, "Metrics/MethodLength: Method has too many lines. [25/10]", 1858237241], - [600, 5, 609, "Metrics/MethodLength: Method has too many lines. [12/10]", 2842480613], - [616, 5, 1154, "Metrics/MethodLength: Method has too many lines. [27/10]", 1412829863], - [616, 22, 129, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 7400119], - [647, 5, 1483, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_markdown` is too high. [8/7]", 27505255], - [647, 5, 1483, "Metrics/MethodLength: Method has too many lines. [37/10]", 27505255], - [688, 5, 1479, "Metrics/AbcSize: Assignment Branch Condition size for `markdown_theirs_changes_already_present?` is too high. [<16, 31, 12> 36.89/17]", 535500337], - [688, 5, 1479, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `markdown_theirs_changes_already_present?` is too high. [12/7]", 535500337], - [688, 5, 1479, "Metrics/MethodLength: Method has too many lines. [22/10]", 535500337], - [688, 5, 1479, "Metrics/PerceivedComplexity: Perceived complexity for `markdown_theirs_changes_already_present?` is too high. [12/8]", 535500337], - [762, 5, 355, "Metrics/MethodLength: Method has too many lines. [11/10]", 39262550], - [776, 5, 1562, "Metrics/AbcSize: Assignment Branch Condition size for `merge3_result` is too high. [<1, 24, 5> 24.54/17]", 1515385192], - [776, 5, 1562, "Metrics/MethodLength: Method has too many lines. [40/10]", 1515385192], - [819, 5, 450, "Metrics/MethodLength: Method has too many lines. [14/10]", 378355367], - [846, 5, 668, "Metrics/AbcSize: Assignment Branch Condition size for `attribute_files_for_path` is too high. [<5, 17, 8> 19.44/17]", 4267311100], - [846, 5, 668, "Metrics/MethodLength: Method has too many lines. [14/10]", 4267311100], - [864, 5, 885, "Metrics/AbcSize: Assignment Branch Condition size for `apply_attributes` is too high. [<12, 16, 11> 22.83/17]", 2340440569], - [864, 5, 885, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_attributes` is too high. [12/7]", 2340440569], - [864, 5, 885, "Metrics/MethodLength: Method has too many lines. [21/10]", 2340440569], - [864, 5, 885, "Metrics/PerceivedComplexity: Perceived complexity for `apply_attributes` is too high. [10/8]", 2340440569], - [901, 5, 772, "Metrics/AbcSize: Assignment Branch Condition size for `find_conflict_regions` is too high. [<12, 16, 7> 21.19/17]", 2134600144], - [901, 5, 772, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_conflict_regions` is too high. [8/7]", 2134600144], - [901, 5, 772, "Metrics/MethodLength: Method has too many lines. [18/10]", 2134600144], - [901, 5, 772, "Metrics/PerceivedComplexity: Perceived complexity for `find_conflict_regions` is too high. [9/8]", 2134600144], - [926, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1186836706] - ], - "smorg-rb.gemspec:3816851383": [ - [133, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [148, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [149, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [156, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ], - "spec/cli_spec.rb:1901524271": [ - [7, 1, 21116, "Metrics/BlockLength: Block has too many lines. [404/25]", 93750465], - [39, 15, 2, "Style/SpecialGlobalVars: Prefer `$CHILD_STATUS` from the stdlib 'English' module (don't forget to require it) over `$?`.", 5858718], - [103, 5, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], - [145, 3, 1104, "Metrics/BlockLength: Block has too many lines. [31/25]", 2261544718], - [252, 3, 2568, "Metrics/BlockLength: Block has too many lines. [42/25]", 534998881], - [253, 5, 2506, "Metrics/BlockLength: Block has too many lines. [40/25]", 125340559], - [254, 7, 2429, "Metrics/BlockLength: Block has too many lines. [38/25]", 2347531946], - [316, 3, 1439, "Metrics/BlockLength: Block has too many lines. [28/25]", 3153214813], - [349, 3, 1958, "Metrics/BlockLength: Block has too many lines. [34/25]", 955598497], - [350, 5, 1872, "Metrics/BlockLength: Block has too many lines. [32/25]", 1095476741], - [351, 7, 1799, "Metrics/BlockLength: Block has too many lines. [30/25]", 1248712702] - ] -} diff --git a/gems/smorg-rb/Gemfile b/gems/smorg-rb/Gemfile index cd9f0f6ce..86b04dc0b 100644 --- a/gems/smorg-rb/Gemfile +++ b/gems/smorg-rb/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source 'https://gem.coop' +source "https://gem.coop" git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,8 +19,8 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ['~> 1.0', '>= 1.0.8'] -gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ["~> 1.0", ">= 1.0.8"] +gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ @@ -32,10 +32,54 @@ direct_sibling_gems = %w[ markly-merge plain-merge ] -direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') +direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? + +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) + direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") + direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == "nomono" } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + if nomono_locked + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] + end + end + Kernel.send(:gem, "nomono", *nomono_activation_requirements) + require "nomono/bundler" + if direct_sibling_templating && !direct_sibling_local + ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + end + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: "STRUCTUREDMERGE", + path_env: "STRUCTUREDMERGE_DEV", + root: ["src", "my", "structuredmerge"] + ) + rescue LoadError + warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + else + ENV.delete("STRUCTUREDMERGE_DEV") + end + end + end +end if direct_sibling_gems.any? && (direct_sibling_local || @@ -175,25 +219,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? # Debugging -eval_gemfile 'gemfiles/modular/debug.gemfile' +eval_gemfile "gemfiles/modular/debug.gemfile" # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile 'gemfiles/modular/coverage.gemfile' +eval_gemfile "gemfiles/modular/coverage.gemfile" # Linting -eval_gemfile 'gemfiles/modular/style.gemfile' +eval_gemfile "gemfiles/modular/style.gemfile" # Documentation -eval_gemfile 'gemfiles/modular/documentation.gemfile' +eval_gemfile "gemfiles/modular/documentation.gemfile" # Optional -eval_gemfile 'gemfiles/modular/optional.gemfile' +eval_gemfile "gemfiles/modular/optional.gemfile" ### Std Lib Extracted Gems -eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' +eval_gemfile "gemfiles/modular/x_std_libs.gemfile" # See unlocked_deps appraisal for more details on irb inclusion -gem 'irb', '~> 1.17' # ruby >= 2.7 +gem "irb", "~> 1.17" # ruby >= 2.7 diff --git a/gems/smorg-rb/Gemfile.lock b/gems/smorg-rb/Gemfile.lock index f48de7564..163be1e1e 100644 --- a/gems/smorg-rb/Gemfile.lock +++ b/gems/smorg-rb/Gemfile.lock @@ -197,6 +197,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.0) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: @@ -307,7 +323,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -362,18 +377,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -537,22 +541,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -658,9 +658,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -738,7 +738,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -759,10 +758,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.0) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -837,13 +836,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/smorg-rb/Rakefile b/gems/smorg-rb/Rakefile index ba8baf8e9..5fec5aacc 100644 --- a/gems/smorg-rb/Rakefile +++ b/gems/smorg-rb/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require 'kettle/drift' + require "kettle/drift" Kettle::Drift.install_tasks rescue LoadError - desc('(stub) kettle:drift:check is unavailable') - task('kettle:drift:check') do + desc("(stub) kettle:drift:check is unavailable") + task("kettle:drift:check") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:update is unavailable') - task('kettle:drift:update') do + desc("(stub) kettle:drift:update is unavailable") + task("kettle:drift:update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:force_update is unavailable') - task('kettle:drift:force_update') do + desc("(stub) kettle:drift:force_update is unavailable") + task("kettle:drift:force_update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift is unavailable') - task('kettle:drift' => 'kettle:drift:update') + desc("(stub) kettle:drift is unavailable") + task("kettle:drift" => "kettle:drift:update") end ### TEMPLATING TASKS diff --git a/gems/smorg-rb/bin/yard b/gems/smorg-rb/bin/yard index 5d516ad6f..a7e8b6eed 100755 --- a/gems/smorg-rb/bin/yard +++ b/gems/smorg-rb/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec('bundle', 'exec', 'rake', 'yard') +exec("bundle", "exec", "rake", "yard") diff --git a/gems/smorg-rb/lib/smorg/rb/version.rb b/gems/smorg-rb/lib/smorg/rb/version.rb index 8e48f6d11..ef211ba06 100644 --- a/gems/smorg-rb/lib/smorg/rb/version.rb +++ b/gems/smorg-rb/lib/smorg/rb/version.rb @@ -3,7 +3,7 @@ module Smorg module RB module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end From 86252b1bec53d8f3c4592cea5a4e6c72d652efca Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 16:40:29 -0600 Subject: [PATCH 029/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/prism-merge/Gemfile.lock | 342 +++++++++++++++++++++++++- gems/smorg-rb/.rubocop_gradual.lock | 167 +++++++++++++ gems/smorg-rb/Gemfile | 68 +++-- gems/smorg-rb/Gemfile.lock | 333 ++++++++----------------- gems/smorg-rb/Rakefile | 18 +- gems/smorg-rb/bin/yard | 2 +- gems/smorg-rb/lib/smorg/rb/version.rb | 2 +- 7 files changed, 638 insertions(+), 294 deletions(-) create mode 100644 gems/smorg-rb/.rubocop_gradual.lock diff --git a/gems/prism-merge/Gemfile.lock b/gems/prism-merge/Gemfile.lock index 02ebf0bb3..c3d574bdf 100644 --- a/gems/prism-merge/Gemfile.lock +++ b/gems/prism-merge/Gemfile.lock @@ -16,6 +16,256 @@ PATH ruby-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: @@ -35,11 +285,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -48,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -111,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -139,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -278,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -330,11 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -381,23 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -408,30 +686,52 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0.0) ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -439,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -451,19 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -478,11 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -490,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -521,6 +834,8 @@ 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -529,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -542,14 +858,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/smorg-rb/.rubocop_gradual.lock b/gems/smorg-rb/.rubocop_gradual.lock new file mode 100644 index 000000000..2167b9b80 --- /dev/null +++ b/gems/smorg-rb/.rubocop_gradual.lock @@ -0,0 +1,167 @@ +{ + ".simplecov:2553617326": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:2481690509": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/smorg-rb.rb:3972809897": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`smorg-rb.rb`) should use snake_case.", 5381] + ], + "lib/smorg/rb.rb:1319799555": [ + [18, 3, 9, "Style/Documentation: Missing top-level documentation comment for `module Smorg::RB`.", 4021240623], + [18, 3, 32869, "Metrics/ModuleLength: Module has too many lines. [840/100]", 1685453755], + [26, 5, 660, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `run` is too high. [8/7]", 1065401429], + [26, 5, 660, "Metrics/MethodLength: Method has too many lines. [20/10]", 1065401429], + [50, 121, 41, "Layout/LineLength: Line is too long. [161/120]", 2633772911], + [53, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2488766433], + [56, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 1642922677], + [59, 5, 1450, "Metrics/AbcSize: Assignment Branch Condition size for `run_git` is too high. [<9, 30, 10> 32.88/17]", 2684567120], + [59, 5, 1450, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `run_git` is too high. [8/7]", 2684567120], + [59, 5, 1450, "Metrics/MethodLength: Method has too many lines. [33/10]", 2684567120], + [59, 5, 1450, "Metrics/PerceivedComplexity: Perceived complexity for `run_git` is too high. [9/8]", 2684567120], + [98, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 2215054003], + [102, 5, 712, "Metrics/AbcSize: Assignment Branch Condition size for `parse_git_install_options` is too high. [<8, 14, 7> 17.58/17]", 3152011724], + [102, 5, 712, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_git_install_options` is too high. [8/7]", 3152011724], + [102, 5, 712, "Metrics/MethodLength: Method has too many lines. [22/10]", 3152011724], + [127, 5, 640, "Metrics/MethodLength: Method has too many lines. [14/10]", 518795916], + [144, 5, 3491, "Metrics/AbcSize: Assignment Branch Condition size for `run_merge_driver` is too high. [<25, 60, 34> 73.36/17]", 4283927228], + [144, 5, 3491, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `run_merge_driver` is too high. [28/7]", 4283927228], + [144, 5, 3491, "Metrics/MethodLength: Method has too many lines. [69/10]", 4283927228], + [144, 5, 3491, "Metrics/PerceivedComplexity: Perceived complexity for `run_merge_driver` is too high. [28/8]", 4283927228], + [224, 5, 1285, "Metrics/MethodLength: Method has too many lines. [36/10]", 2754100815], + [224, 30, 84, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2091651017], + [283, 5, 1345, "Metrics/AbcSize: Assignment Branch Condition size for `merge_git_file_fallback` is too high. [<4, 23, 6> 24.1/17]", 3637986705], + [283, 5, 1345, "Metrics/MethodLength: Method has too many lines. [47/10]", 3637986705], + [311, 13, 2, "Style/SpecialGlobalVars: Prefer `$CHILD_STATUS` from the stdlib 'English' module (don't forget to require it) over `$?`.", 5858718], + [312, 25, 2, "Style/SpecialGlobalVars: Prefer `$CHILD_STATUS` from the stdlib 'English' module (don't forget to require it) over `$?`.", 5858718], + [346, 5, 434, "Metrics/MethodLength: Method has too many lines. [12/10]", 3073199759], + [361, 5, 2289, "Metrics/AbcSize: Assignment Branch Condition size for `parse_merge_driver_options` is too high. [<36, 48, 26> 65.39/17]", 3420252459], + [361, 5, 2289, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_merge_driver_options` is too high. [25/7]", 3420252459], + [361, 5, 2289, "Metrics/MethodLength: Method has too many lines. [66/10]", 3420252459], + [361, 5, 2289, "Metrics/PerceivedComplexity: Perceived complexity for `parse_merge_driver_options` is too high. [17/8]", 3420252459], + [432, 5, 1076, "Metrics/MethodLength: Method has too many lines. [22/10]", 1477555868], + [432, 42, 66, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1731953899], + [432, 67, 2, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 5861217], + [451, 31, 58, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 3099919314], + [465, 5, 1225, "Metrics/AbcSize: Assignment Branch Condition size for `report_and_enforce_profile` is too high. [<3, 20, 8> 21.75/17]", 58791261], + [465, 5, 1225, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_and_enforce_profile` is too high. [9/7]", 58791261], + [465, 5, 1225, "Metrics/MethodLength: Method has too many lines. [24/10]", 58791261], + [465, 5, 1225, "Metrics/PerceivedComplexity: Perceived complexity for `report_and_enforce_profile` is too high. [9/8]", 58791261], + [493, 5, 468, "Metrics/MethodLength: Method has too many lines. [12/10]", 1242862675], + [509, 5, 877, "Metrics/AbcSize: Assignment Branch Condition size for `parse_diff_driver_options` is too high. [<7, 18, 9> 21.31/17]", 2253944408], + [509, 5, 877, "Metrics/MethodLength: Method has too many lines. [26/10]", 2253944408], + [572, 5, 776, "Metrics/MethodLength: Method has too many lines. [25/10]", 1858237241], + [600, 5, 609, "Metrics/MethodLength: Method has too many lines. [12/10]", 2842480613], + [616, 5, 1154, "Metrics/MethodLength: Method has too many lines. [27/10]", 1412829863], + [616, 22, 129, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 7400119], + [647, 5, 1483, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_markdown` is too high. [8/7]", 27505255], + [647, 5, 1483, "Metrics/MethodLength: Method has too many lines. [37/10]", 27505255], + [688, 5, 1479, "Metrics/AbcSize: Assignment Branch Condition size for `markdown_theirs_changes_already_present?` is too high. [<16, 31, 12> 36.89/17]", 535500337], + [688, 5, 1479, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `markdown_theirs_changes_already_present?` is too high. [12/7]", 535500337], + [688, 5, 1479, "Metrics/MethodLength: Method has too many lines. [22/10]", 535500337], + [688, 5, 1479, "Metrics/PerceivedComplexity: Perceived complexity for `markdown_theirs_changes_already_present?` is too high. [12/8]", 535500337], + [762, 5, 355, "Metrics/MethodLength: Method has too many lines. [11/10]", 39262550], + [776, 5, 1562, "Metrics/AbcSize: Assignment Branch Condition size for `merge3_result` is too high. [<1, 24, 5> 24.54/17]", 1515385192], + [776, 5, 1562, "Metrics/MethodLength: Method has too many lines. [40/10]", 1515385192], + [819, 5, 450, "Metrics/MethodLength: Method has too many lines. [14/10]", 378355367], + [846, 5, 668, "Metrics/AbcSize: Assignment Branch Condition size for `attribute_files_for_path` is too high. [<5, 17, 8> 19.44/17]", 4267311100], + [846, 5, 668, "Metrics/MethodLength: Method has too many lines. [14/10]", 4267311100], + [864, 5, 885, "Metrics/AbcSize: Assignment Branch Condition size for `apply_attributes` is too high. [<12, 16, 11> 22.83/17]", 2340440569], + [864, 5, 885, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_attributes` is too high. [12/7]", 2340440569], + [864, 5, 885, "Metrics/MethodLength: Method has too many lines. [21/10]", 2340440569], + [864, 5, 885, "Metrics/PerceivedComplexity: Perceived complexity for `apply_attributes` is too high. [10/8]", 2340440569], + [901, 5, 772, "Metrics/AbcSize: Assignment Branch Condition size for `find_conflict_regions` is too high. [<12, 16, 7> 21.19/17]", 2134600144], + [901, 5, 772, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_conflict_regions` is too high. [8/7]", 2134600144], + [901, 5, 772, "Metrics/MethodLength: Method has too many lines. [18/10]", 2134600144], + [901, 5, 772, "Metrics/PerceivedComplexity: Perceived complexity for `find_conflict_regions` is too high. [9/8]", 2134600144], + [926, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1186836706] + ], + "smorg-rb.gemspec:3816851383": [ + [133, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [148, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [149, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [156, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ], + "spec/cli_spec.rb:1901524271": [ + [7, 1, 21116, "Metrics/BlockLength: Block has too many lines. [404/25]", 93750465], + [39, 15, 2, "Style/SpecialGlobalVars: Prefer `$CHILD_STATUS` from the stdlib 'English' module (don't forget to require it) over `$?`.", 5858718], + [103, 5, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], + [145, 3, 1104, "Metrics/BlockLength: Block has too many lines. [31/25]", 2261544718], + [252, 3, 2568, "Metrics/BlockLength: Block has too many lines. [42/25]", 534998881], + [253, 5, 2506, "Metrics/BlockLength: Block has too many lines. [40/25]", 125340559], + [254, 7, 2429, "Metrics/BlockLength: Block has too many lines. [38/25]", 2347531946], + [316, 3, 1439, "Metrics/BlockLength: Block has too many lines. [28/25]", 3153214813], + [349, 3, 1958, "Metrics/BlockLength: Block has too many lines. [34/25]", 955598497], + [350, 5, 1872, "Metrics/BlockLength: Block has too many lines. [32/25]", 1095476741], + [351, 7, 1799, "Metrics/BlockLength: Block has too many lines. [30/25]", 1248712702] + ] +} diff --git a/gems/smorg-rb/Gemfile b/gems/smorg-rb/Gemfile index 86b04dc0b..22cfa031e 100644 --- a/gems/smorg-rb/Gemfile +++ b/gems/smorg-rb/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source "https://gem.coop" +source 'https://gem.coop' git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,8 +19,8 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ["~> 1.0", ">= 1.0.8"] -gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ['~> 1.0', '>= 1.0.8'] +gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ @@ -32,50 +32,46 @@ direct_sibling_gems = %w[ markly-merge plain-merge ] -direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") +direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? if direct_sibling_gems.any? && - (direct_sibling_local || - ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) - direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") - direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) begin nomono_activation_requirements = nomono_requirements - nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) if File.file?(nomono_lockfile) nomono_locked_spec = Bundler::LockfileParser - .new(Bundler.read_file(nomono_lockfile)) - .specs - .find { |spec| spec.name == "nomono" } + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } nomono_locked = nomono_locked_spec && - Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) - if nomono_locked - nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] - end - end - Kernel.send(:gem, "nomono", *nomono_activation_requirements) - require "nomono/bundler" - if direct_sibling_templating && !direct_sibling_local - ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local eval_nomono_gems( gems: direct_sibling_gems, - prefix: "STRUCTUREDMERGE", - path_env: "STRUCTUREDMERGE_DEV", - root: ["src", "my", "structuredmerge"] + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] ) rescue LoadError - warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' ensure if direct_sibling_templating && !direct_sibling_local if direct_sibling_dev_was_set - ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original else - ENV.delete("STRUCTUREDMERGE_DEV") + ENV.delete('STRUCTUREDMERGE_DEV') end end end @@ -219,25 +215,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging -eval_gemfile "gemfiles/modular/debug.gemfile" +eval_gemfile 'gemfiles/modular/debug.gemfile' # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile "gemfiles/modular/coverage.gemfile" +eval_gemfile 'gemfiles/modular/coverage.gemfile' # Linting -eval_gemfile "gemfiles/modular/style.gemfile" +eval_gemfile 'gemfiles/modular/style.gemfile' # Documentation -eval_gemfile "gemfiles/modular/documentation.gemfile" +eval_gemfile 'gemfiles/modular/documentation.gemfile' # Optional -eval_gemfile "gemfiles/modular/optional.gemfile" +eval_gemfile 'gemfiles/modular/optional.gemfile' ### Std Lib Extracted Gems -eval_gemfile "gemfiles/modular/x_std_libs.gemfile" +eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' # See unlocked_deps appraisal for more details on irb inclusion -gem "irb", "~> 1.17" # ruby >= 2.7 +gem 'irb', '~> 1.17' # ruby >= 2.7 diff --git a/gems/smorg-rb/Gemfile.lock b/gems/smorg-rb/Gemfile.lock index 163be1e1e..655e4846b 100644 --- a/gems/smorg-rb/Gemfile.lock +++ b/gems/smorg-rb/Gemfile.lock @@ -21,198 +21,6 @@ PATH plain-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.0) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: @@ -301,13 +109,33 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) bundler (>= 1.2.0) thor (~> 1.0) citrus (3.0.2) + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) cmdparse (3.0.7) commonmarker (2.9.0-aarch64-linux) commonmarker (2.9.0-aarch64-linux-musl) @@ -315,6 +143,10 @@ GEM commonmarker (2.9.0-x86_64-darwin) commonmarker (2.9.0-x86_64-linux) commonmarker (2.9.0-x86_64-linux-musl) + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -323,6 +155,11 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -372,12 +209,21 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - kettle-dev (2.3.6) + kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -391,11 +237,19 @@ GEM turbo_tests2 (~> 3.1, >= 3.1.12) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) 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.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) @@ -424,9 +278,18 @@ GEM prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) psych (5.4.0) date stringio + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -438,6 +301,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) rdoc (6.17.0) erb psych (>= 4.0.0) @@ -533,6 +401,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -541,18 +413,22 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -586,11 +462,18 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -605,6 +488,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.13) + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) yard (0.9.45) yard-fence (0.9.6) rdoc (>= 6.11, < 8) @@ -637,20 +524,11 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) @@ -658,24 +536,17 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -684,26 +555,19 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -715,12 +579,10 @@ CHECKSUMS ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) @@ -738,6 +600,7 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -757,11 +620,10 @@ CHECKSUMS irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) - kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae - kettle-drift (1.0.5) + kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.0) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -786,7 +648,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.0) plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -833,14 +694,15 @@ 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 @@ -855,14 +717,12 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -875,7 +735,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/smorg-rb/Rakefile b/gems/smorg-rb/Rakefile index 5fec5aacc..ba8baf8e9 100644 --- a/gems/smorg-rb/Rakefile +++ b/gems/smorg-rb/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require "kettle/drift" + require 'kettle/drift' Kettle::Drift.install_tasks rescue LoadError - desc("(stub) kettle:drift:check is unavailable") - task("kettle:drift:check") do + desc('(stub) kettle:drift:check is unavailable') + task('kettle:drift:check') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:update is unavailable") - task("kettle:drift:update") do + desc('(stub) kettle:drift:update is unavailable') + task('kettle:drift:update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:force_update is unavailable") - task("kettle:drift:force_update") do + desc('(stub) kettle:drift:force_update is unavailable') + task('kettle:drift:force_update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift is unavailable") - task("kettle:drift" => "kettle:drift:update") + desc('(stub) kettle:drift is unavailable') + task('kettle:drift' => 'kettle:drift:update') end ### TEMPLATING TASKS diff --git a/gems/smorg-rb/bin/yard b/gems/smorg-rb/bin/yard index a7e8b6eed..5d516ad6f 100755 --- a/gems/smorg-rb/bin/yard +++ b/gems/smorg-rb/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec("bundle", "exec", "rake", "yard") +exec('bundle', 'exec', 'rake', 'yard') diff --git a/gems/smorg-rb/lib/smorg/rb/version.rb b/gems/smorg-rb/lib/smorg/rb/version.rb index ef211ba06..8e48f6d11 100644 --- a/gems/smorg-rb/lib/smorg/rb/version.rb +++ b/gems/smorg-rb/lib/smorg/rb/version.rb @@ -3,7 +3,7 @@ module Smorg module RB module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end From 4c6d17f914782babaecdc3beaa25624b660fd5e9 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 16:43:52 -0600 Subject: [PATCH 030/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/kettle-jem/lib/kettle/jem.rb | 50 ++++++++++++++++- gems/kettle-jem/spec/thin_slice_spec.rb | 73 +++++++++++++++++++++++++ gems/smorg-rb/.kettle-drift.lock | 60 +++++++++++++------- gems/smorg-rb/Gemfile | 40 ++++++++++++++ 4 files changed, 202 insertions(+), 21 deletions(-) diff --git a/gems/kettle-jem/lib/kettle/jem.rb b/gems/kettle-jem/lib/kettle/jem.rb index d9a0516f9..23e8c8e85 100644 --- a/gems/kettle-jem/lib/kettle/jem.rb +++ b/gems/kettle-jem/lib/kettle/jem.rb @@ -4857,6 +4857,50 @@ def replace_toml_string_scalar_line(content, key, value) content end + def merge_git_drivers_toml_template_source(template_content, destination_content) + require "toml-rb" + + template = TomlRB.parse(template_content.to_s) + destination = TomlRB.parse(destination_content.to_s) + merged = merge_template_toml_defaults(template, destination) + { + ok: true, + diagnostics: [], + output: ensure_trailing_newline(TomlRB.dump(merged)), + policies: [{name: "kettle-jem-git-drivers-destination-wins"}] + } + rescue StandardError => error + { + ok: false, + diagnostics: [ + { + severity: "error", + code: "merge_error", + message: error.message + } + ], + policies: [] + } + end + + def merge_template_toml_defaults(template, destination) + template.each_with_object({}) do |(key, template_value), merged| + destination_has_key = destination.key?(key) + destination_value = destination[key] + merged[key] = if destination_has_key && template_value.is_a?(Hash) && destination_value.is_a?(Hash) + merge_template_toml_defaults(template_value, destination_value) + elsif destination_has_key + destination_value + else + template_value + end + end.tap do |merged| + destination.each do |key, destination_value| + merged[key] = destination_value unless merged.key?(key) + end + end + end + def prepare_github_workflow_template(content, recipe, facts) return content unless recipe.fetch(:target_path).to_s == ".github/workflows/framework-ci.yml" return content if facts.to_h.dig(:ci, :framework_matrix).to_h.empty? @@ -5316,7 +5360,11 @@ def merge_config_template_source(recipe, template_content, destination_content, **yaml_merge_options(recipe) ) when :toml - merge_result = Toml::Merge.merge_toml(template_content, destination_content, "toml") + merge_result = if recipe.fetch(:target_path).to_s == ".structuredmerge/git-drivers.toml" + merge_git_drivers_toml_template_source(template_content, destination_content) + else + Toml::Merge.merge_toml(template_content, destination_content, "toml") + end when :json, :jsonc merge_result = merge_json_template_source(template_content, destination_content, recipe, file_type) when :markdown diff --git a/gems/kettle-jem/spec/thin_slice_spec.rb b/gems/kettle-jem/spec/thin_slice_spec.rb index 115d158a9..c2e7eb2dd 100644 --- a/gems/kettle-jem/spec/thin_slice_spec.rb +++ b/gems/kettle-jem/spec/thin_slice_spec.rb @@ -7373,6 +7373,79 @@ module Example end end + it "merges Git driver TOML manifests with destination driver values" do + tmp_root = File.join(__dir__, "tmp") + FileUtils.mkdir_p(tmp_root) + Dir.mktmpdir("kettle-jem-git-driver-toml-merge", tmp_root) do |root| + write_tree(root, { + "example.gemspec" => <<~RUBY, + Gem::Specification.new do |spec| + spec.name = "example" + spec.summary = "Example gem" + end + RUBY + ".kettle-jem.yml" => <<~YAML, + templates: + root: template + apply: true + entries: + - .structuredmerge/git-drivers.toml + YAML + ".structuredmerge/git-drivers.toml" => <<~TOML, + version = 1 + driver_namespace = "smorg" + + [profiles.semantic-diff] + description = "Destination driver" + + [[profiles.semantic-diff.attributes]] + pattern = "*.rb" + diff = "smorg-rb" + + [[profiles.semantic-diff.git_config]] + scope = "global" + key = "diff.smorg-rb.command" + value = "smorg-rb diff-driver" + TOML + "template/.structuredmerge/git-drivers.toml.example" => <<~TOML + version = 1 + driver_namespace = "smorg" + + [profiles.semantic-diff] + description = "Template driver" + + [[profiles.semantic-diff.attributes]] + pattern = "*.rb" + diff = "smorg-ruby" + + [[profiles.semantic-diff.git_config]] + scope = "global" + key = "diff.smorg-ruby.command" + value = "smorg-ruby diff-driver" + + [profiles.textconv-normalized] + description = "Template-only profile" + + [[profiles.textconv-normalized.attributes]] + pattern = "*.json" + diff = "smorg-json-textconv" + TOML + }) + + apply = described_class.apply_project(root, env: {}) + report = apply.fetch(:recipe_reports).find do |candidate| + candidate.fetch(:relative_path) == ".structuredmerge/git-drivers.toml" + end + content = report.fetch(:final_content) + + expect(content).to include('diff = "smorg-rb"') + expect(content).to include('key = "diff.smorg-rb.command"') + expect(content).to include('value = "smorg-rb diff-driver"') + expect(content).to include("[profiles.textconv-normalized]") + expect(content).not_to include("smorg-ruby") + end + end + it "restores documentation comments from YAML templates when destination config stripped them" do tmp_root = File.join(__dir__, "tmp") FileUtils.mkdir_p(tmp_root) diff --git a/gems/smorg-rb/.kettle-drift.lock b/gems/smorg-rb/.kettle-drift.lock index 54656e141..f073e34ec 100644 --- a/gems/smorg-rb/.kettle-drift.lock +++ b/gems/smorg-rb/.kettle-drift.lock @@ -5,7 +5,8 @@ "lines": [ 85, 125, - 165 + 165, + 205 ] } ], @@ -15,7 +16,8 @@ "lines": [ 96, 136, - 176 + 176, + 216 ] } ], @@ -25,7 +27,8 @@ "lines": [ 86, 126, - 166 + 166, + 206 ] } ], @@ -35,7 +38,8 @@ "lines": [ 98, 138, - 178 + 178, + 218 ] } ], @@ -45,7 +49,8 @@ "lines": [ 101, 141, - 181 + 181, + 221 ] } ], @@ -55,7 +60,8 @@ "lines": [ 87, 127, - 167 + 167, + 207 ] } ], @@ -66,7 +72,8 @@ 65, 105, 145, - 185 + 185, + 225 ] } ], @@ -76,7 +83,8 @@ "lines": [ 106, 146, - 186 + 186, + 226 ] } ], @@ -87,7 +95,8 @@ 48, 92, 132, - 172 + 172, + 212 ] } ], @@ -97,7 +106,8 @@ "lines": [ 115, 155, - 195 + 195, + 235 ] } ], @@ -108,7 +118,8 @@ 40, 84, 124, - 164 + 164, + 204 ] } ], @@ -119,7 +130,8 @@ 74, 114, 154, - 194 + 194, + 234 ] } ], @@ -129,7 +141,8 @@ "lines": [ 90, 130, - 170 + 170, + 210 ] } ], @@ -140,7 +153,8 @@ 53, 97, 137, - 177 + 177, + 217 ] } ], @@ -151,7 +165,8 @@ 49, 93, 133, - 173 + 173, + 213 ] } ], @@ -161,7 +176,8 @@ "lines": [ 91, 131, - 171 + 171, + 211 ] } ], @@ -171,7 +187,8 @@ "lines": [ 108, 148, - 188 + 188, + 228 ] } ], @@ -181,7 +198,8 @@ "lines": [ 107, 147, - 187 + 187, + 227 ] } ], @@ -191,7 +209,8 @@ "lines": [ 102, 142, - 182 + 182, + 222 ] } ], @@ -201,7 +220,8 @@ "lines": [ 111, 151, - 191 + 191, + 231 ] } ], diff --git a/gems/smorg-rb/Gemfile b/gems/smorg-rb/Gemfile index 22cfa031e..de58bc589 100644 --- a/gems/smorg-rb/Gemfile +++ b/gems/smorg-rb/Gemfile @@ -197,6 +197,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = From 86fb8d1aa34932427726c40ea1c0331cfcdedfe2 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 16:45:42 -0600 Subject: [PATCH 031/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kettle-jem/.github/workflows/coverage.yml | 10 ++ gems/kettle-jem/.github/workflows/current.yml | 10 ++ .../.github/workflows/dep-heads.yml | 30 ++++ gems/kettle-jem/.github/workflows/heads.yml | 30 ++++ gems/kettle-jem/.github/workflows/jruby.yml | 12 +- gems/kettle-jem/.github/workflows/truffle.yml | 12 +- gems/kettle-jem/.kettle-drift.lock | 60 ++++++-- .../.structuredmerge/git-drivers.toml | 56 +++---- gems/kettle-jem/CONTRIBUTING.md | 14 ++ gems/kettle-jem/Gemfile.lock | 137 ++---------------- gems/kettle-jem/Rakefile | 2 +- .../kettle-jem/gemfiles/modular/style.gemfile | 2 +- gems/kettle-jem/lib/kettle/jem.rb | 22 +-- gems/smorg-rb/Gemfile.lock | 133 +++++++---------- 14 files changed, 253 insertions(+), 277 deletions(-) diff --git a/gems/kettle-jem/.github/workflows/coverage.yml b/gems/kettle-jem/.github/workflows/coverage.yml index 18002d709..e974040b9 100644 --- a/gems/kettle-jem/.github/workflows/coverage.yml +++ b/gems/kettle-jem/.github/workflows/coverage.yml @@ -79,6 +79,16 @@ jobs: if: ${{ steps.bundleAppraisalAttempt1.outcome == 'failure' }} run: bundle exec appraisal ${{ matrix.appraisal }} install + - name: Restore RSpec status log + if: "${{!env.ACT}}" + uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 + with: + path: .rspec_status + key: rspec-status-coverage-${{matrix.ruby}}-${{matrix.appraisal}}-${{hashFiles('**/Gemfile.lock','Appraisal.root.gemfile','gemfiles/**/*.gemfile')}}-${{github.run_id}}-${{github.run_attempt}} + restore-keys: | + rspec-status-coverage-${{matrix.ruby}}-${{matrix.appraisal}}-${{hashFiles('**/Gemfile.lock','Appraisal.root.gemfile','gemfiles/**/*.gemfile')}}- + rspec-status-coverage-${{matrix.ruby}}-${{matrix.appraisal}}- + - name: Tests for ${{ matrix.ruby }}@current via ${{ matrix.exec_cmd }} run: bundle exec appraisal ${{ matrix.appraisal }} bundle exec ${{ matrix.exec_cmd }} diff --git a/gems/kettle-jem/.github/workflows/current.yml b/gems/kettle-jem/.github/workflows/current.yml index bfb959ac7..ff24160f1 100644 --- a/gems/kettle-jem/.github/workflows/current.yml +++ b/gems/kettle-jem/.github/workflows/current.yml @@ -70,5 +70,15 @@ jobs: if: ${{ steps.bundleAppraisalAttempt1.outcome == 'failure' }} run: bundle exec appraisal ${{ matrix.appraisal }} install + - name: Restore RSpec status log + if: "${{!env.ACT}}" + uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 + with: + path: .rspec_status + key: rspec-status-current-${{matrix.ruby}}-${{matrix.appraisal}}-${{hashFiles('**/Gemfile.lock','Appraisal.root.gemfile','gemfiles/**/*.gemfile')}}-${{github.run_id}}-${{github.run_attempt}} + restore-keys: | + rspec-status-current-${{matrix.ruby}}-${{matrix.appraisal}}-${{hashFiles('**/Gemfile.lock','Appraisal.root.gemfile','gemfiles/**/*.gemfile')}}- + rspec-status-current-${{matrix.ruby}}-${{matrix.appraisal}}- + - name: Tests for ${{ matrix.ruby }} via ${{ matrix.exec_cmd }} run: bundle exec appraisal ${{ matrix.appraisal }} bundle exec ${{ matrix.exec_cmd }} diff --git a/gems/kettle-jem/.github/workflows/dep-heads.yml b/gems/kettle-jem/.github/workflows/dep-heads.yml index 7f5dc90d1..d632a147a 100644 --- a/gems/kettle-jem/.github/workflows/dep-heads.yml +++ b/gems/kettle-jem/.github/workflows/dep-heads.yml @@ -76,6 +76,16 @@ jobs: if: ${{ !env.ACT && steps.bundleAppraisalAttempt1.outcome == 'failure' }} run: bundle exec appraisal ${{ matrix.appraisal }} install + - name: Restore RSpec status log + if: "${{!env.ACT}}" + uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 + with: + path: .rspec_status + key: rspec-status-dep-heads-${{matrix.ruby}}-${{matrix.appraisal}}-${{hashFiles('**/Gemfile.lock','Appraisal.root.gemfile','gemfiles/**/*.gemfile')}}-${{github.run_id}}-${{github.run_attempt}} + restore-keys: | + rspec-status-dep-heads-${{matrix.ruby}}-${{matrix.appraisal}}-${{hashFiles('**/Gemfile.lock','Appraisal.root.gemfile','gemfiles/**/*.gemfile')}}- + rspec-status-dep-heads-${{matrix.ruby}}-${{matrix.appraisal}}- + - name: Tests for ${{ matrix.ruby }} via Appraisal and ${{ matrix.exec_cmd }} if: ${{ !env.ACT }} run: bundle exec appraisal ${{ matrix.appraisal }} bundle exec ${{ matrix.exec_cmd }} @@ -115,6 +125,16 @@ jobs: bundler: ${{ matrix.bundler }} bundler-cache: true + - name: Restore RSpec status log + if: "${{!env.ACT}}" + uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 + with: + path: .rspec_status + key: rspec-status-dep-heads-${{matrix.ruby}}-${{matrix.appraisal}}-${{hashFiles('**/Gemfile.lock','Appraisal.root.gemfile','gemfiles/**/*.gemfile')}}-${{github.run_id}}-${{github.run_attempt}} + restore-keys: | + rspec-status-dep-heads-${{matrix.ruby}}-${{matrix.appraisal}}-${{hashFiles('**/Gemfile.lock','Appraisal.root.gemfile','gemfiles/**/*.gemfile')}}- + rspec-status-dep-heads-${{matrix.ruby}}-${{matrix.appraisal}}- + - name: Tests for ${{ matrix.ruby }} via ${{ matrix.exec_cmd }} if: ${{ !env.ACT }} run: bundle exec ${{ matrix.exec_cmd }} @@ -164,6 +184,16 @@ jobs: if: ${{ !env.ACT && steps.bundleAppraisalAttempt1.outcome == 'failure' }} run: bundle exec appraisal ${{ matrix.appraisal }} install + - name: Restore RSpec status log + if: "${{!env.ACT}}" + uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 + with: + path: .rspec_status + key: rspec-status-dep-heads-${{matrix.ruby}}-${{matrix.appraisal}}-${{hashFiles('**/Gemfile.lock','Appraisal.root.gemfile','gemfiles/**/*.gemfile')}}-${{github.run_id}}-${{github.run_attempt}} + restore-keys: | + rspec-status-dep-heads-${{matrix.ruby}}-${{matrix.appraisal}}-${{hashFiles('**/Gemfile.lock','Appraisal.root.gemfile','gemfiles/**/*.gemfile')}}- + rspec-status-dep-heads-${{matrix.ruby}}-${{matrix.appraisal}}- + - name: Tests for ${{ matrix.ruby }} via Appraisal and ${{ matrix.exec_cmd }} if: ${{ !env.ACT }} run: bundle exec appraisal ${{ matrix.appraisal }} bundle exec ${{ matrix.exec_cmd }} diff --git a/gems/kettle-jem/.github/workflows/heads.yml b/gems/kettle-jem/.github/workflows/heads.yml index 1deb50f66..95b0f24a4 100644 --- a/gems/kettle-jem/.github/workflows/heads.yml +++ b/gems/kettle-jem/.github/workflows/heads.yml @@ -75,6 +75,16 @@ jobs: if: ${{ !env.ACT && steps.bundleAppraisalAttempt1.outcome == 'failure' }} run: bundle exec appraisal ${{ matrix.appraisal }} install + - name: Restore RSpec status log + if: "${{!env.ACT}}" + uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 + with: + path: .rspec_status + key: rspec-status-heads-${{matrix.ruby}}-${{matrix.appraisal}}-${{hashFiles('**/Gemfile.lock','Appraisal.root.gemfile','gemfiles/**/*.gemfile')}}-${{github.run_id}}-${{github.run_attempt}} + restore-keys: | + rspec-status-heads-${{matrix.ruby}}-${{matrix.appraisal}}-${{hashFiles('**/Gemfile.lock','Appraisal.root.gemfile','gemfiles/**/*.gemfile')}}- + rspec-status-heads-${{matrix.ruby}}-${{matrix.appraisal}}- + - name: Tests for ${{ matrix.ruby }} via ${{ matrix.exec_cmd }} if: ${{ !env.ACT }} run: bundle exec appraisal ${{ matrix.appraisal }} bundle exec ${{ matrix.exec_cmd }} @@ -123,6 +133,16 @@ jobs: if: ${{ !env.ACT && steps.bundleAppraisalAttempt1.outcome == 'failure' }} run: bundle exec appraisal ${{ matrix.appraisal }} install + - name: Restore RSpec status log + if: "${{!env.ACT}}" + uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 + with: + path: .rspec_status + key: rspec-status-heads-${{matrix.ruby}}-${{matrix.appraisal}}-${{hashFiles('**/Gemfile.lock','Appraisal.root.gemfile','gemfiles/**/*.gemfile')}}-${{github.run_id}}-${{github.run_attempt}} + restore-keys: | + rspec-status-heads-${{matrix.ruby}}-${{matrix.appraisal}}-${{hashFiles('**/Gemfile.lock','Appraisal.root.gemfile','gemfiles/**/*.gemfile')}}- + rspec-status-heads-${{matrix.ruby}}-${{matrix.appraisal}}- + - name: Tests for ${{ matrix.ruby }} via ${{ matrix.exec_cmd }} if: ${{ !env.ACT }} run: bundle exec appraisal ${{ matrix.appraisal }} bundle exec ${{ matrix.exec_cmd }} @@ -171,6 +191,16 @@ jobs: if: ${{ !env.ACT && steps.bundleAppraisalAttempt1.outcome == 'failure' }} run: bundle exec appraisal ${{ matrix.appraisal }} install + - name: Restore RSpec status log + if: "${{!env.ACT}}" + uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 + with: + path: .rspec_status + key: rspec-status-heads-${{matrix.ruby}}-${{matrix.appraisal}}-${{hashFiles('**/Gemfile.lock','Appraisal.root.gemfile','gemfiles/**/*.gemfile')}}-${{github.run_id}}-${{github.run_attempt}} + restore-keys: | + rspec-status-heads-${{matrix.ruby}}-${{matrix.appraisal}}-${{hashFiles('**/Gemfile.lock','Appraisal.root.gemfile','gemfiles/**/*.gemfile')}}- + rspec-status-heads-${{matrix.ruby}}-${{matrix.appraisal}}- + - name: Tests for ${{ matrix.ruby }} via ${{ matrix.exec_cmd }} if: ${{ !env.ACT }} run: bundle exec appraisal ${{ matrix.appraisal }} bundle exec ${{ matrix.exec_cmd }} diff --git a/gems/kettle-jem/.github/workflows/jruby.yml b/gems/kettle-jem/.github/workflows/jruby.yml index 0accd9f85..c92a3d1d7 100644 --- a/gems/kettle-jem/.github/workflows/jruby.yml +++ b/gems/kettle-jem/.github/workflows/jruby.yml @@ -27,7 +27,7 @@ concurrency: jobs: test: - if: "github.event_name != 'push' || (!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')) && (github.event_name != 'pull_request' || startsWith(github.head_ref, 'engines/') || startsWith(github.head_ref, 'jruby/'))" + if: "(github.event_name != 'push' || (!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]'))) && (github.event_name != 'pull_request' || startsWith(github.head_ref, 'engines/') || startsWith(github.head_ref, 'jruby/'))" name: Specs ${{ matrix.ruby }}@${{ matrix.appraisal }} runs-on: ubuntu-latest continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }} @@ -74,6 +74,16 @@ jobs: if: ${{ steps.bundleAppraisalAttempt1.outcome == 'failure' && !env.ACT }} run: bundle exec appraisal ${{ matrix.appraisal }} install + - name: Restore RSpec status log + if: "${{!env.ACT}}" + uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 + with: + path: .rspec_status + key: rspec-status-jruby-${{matrix.ruby}}-${{matrix.appraisal}}-${{hashFiles('**/Gemfile.lock','Appraisal.root.gemfile','gemfiles/**/*.gemfile')}}-${{github.run_id}}-${{github.run_attempt}} + restore-keys: | + rspec-status-jruby-${{matrix.ruby}}-${{matrix.appraisal}}-${{hashFiles('**/Gemfile.lock','Appraisal.root.gemfile','gemfiles/**/*.gemfile')}}- + rspec-status-jruby-${{matrix.ruby}}-${{matrix.appraisal}}- + - name: Tests for ${{ matrix.ruby }} via ${{ matrix.exec_cmd }} if: ${{ !env.ACT }} run: bundle exec appraisal ${{ matrix.appraisal }} bundle exec ${{ matrix.exec_cmd }} diff --git a/gems/kettle-jem/.github/workflows/truffle.yml b/gems/kettle-jem/.github/workflows/truffle.yml index 99e175c5f..b41ba5a5b 100644 --- a/gems/kettle-jem/.github/workflows/truffle.yml +++ b/gems/kettle-jem/.github/workflows/truffle.yml @@ -27,7 +27,7 @@ concurrency: jobs: test: - if: "github.event_name != 'push' || (!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')) && (github.event_name != 'pull_request' || startsWith(github.head_ref, 'engines/') || startsWith(github.head_ref, 'truffleruby/'))" + if: "(github.event_name != 'push' || (!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]'))) && (github.event_name != 'pull_request' || startsWith(github.head_ref, 'engines/') || startsWith(github.head_ref, 'truffleruby/'))" name: Specs ${{ matrix.ruby }}@${{ matrix.appraisal }} runs-on: ubuntu-latest continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }} @@ -74,6 +74,16 @@ jobs: if: ${{ steps.bundleAppraisalAttempt1.outcome == 'failure' && !env.ACT }} run: bundle exec appraisal ${{ matrix.appraisal }} install + - name: Restore RSpec status log + if: "${{!env.ACT}}" + uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 + with: + path: .rspec_status + key: rspec-status-truffle-${{matrix.ruby}}-${{matrix.appraisal}}-${{hashFiles('**/Gemfile.lock','Appraisal.root.gemfile','gemfiles/**/*.gemfile')}}-${{github.run_id}}-${{github.run_attempt}} + restore-keys: | + rspec-status-truffle-${{matrix.ruby}}-${{matrix.appraisal}}-${{hashFiles('**/Gemfile.lock','Appraisal.root.gemfile','gemfiles/**/*.gemfile')}}- + rspec-status-truffle-${{matrix.ruby}}-${{matrix.appraisal}}- + - name: Tests for ${{ matrix.ruby }} via ${{ matrix.exec_cmd }} if: ${{ !env.ACT }} run: bundle exec appraisal ${{ matrix.appraisal }} bundle exec ${{ matrix.exec_cmd }} diff --git a/gems/kettle-jem/.kettle-drift.lock b/gems/kettle-jem/.kettle-drift.lock index ac6ca38b0..bc1265c3c 100644 --- a/gems/kettle-jem/.kettle-drift.lock +++ b/gems/kettle-jem/.kettle-drift.lock @@ -1,11 +1,40 @@ { + "[[profiles.textconv-normalized.attributes]]\ndiff = \"smorg-json-textconv\"": [ + { + "file": ".structuredmerge/git-drivers.toml", + "lines": [ + 19, + 22, + 34, + 37 + ] + } + ], + "[[profiles.textconv-normalized.attributes]]\ndiff = \"smorg-toml-textconv\"": [ + { + "file": ".structuredmerge/git-drivers.toml", + "lines": [ + 31, + 40 + ] + } + ], + "[[profiles.textconv-normalized.attributes]]\ndiff = \"smorg-yaml-textconv\"": [ + { + "file": ".structuredmerge/git-drivers.toml", + "lines": [ + 25, + 28 + ] + } + ], "appraisal: \"dep-heads\"\nexec_cmd: \"kettle-test\"": [ { "file": ".github/workflows/dep-heads.yml", "lines": [ 44, - 95, - 134 + 105, + 154 ] } ], @@ -14,8 +43,8 @@ "file": ".github/workflows/heads.yml", "lines": [ 43, - 94, - 142 + 104, + 162 ] } ], @@ -24,26 +53,27 @@ "file": ".github/workflows/heads.yml", "lines": [ 44, - 95, - 143 + 105, + 163 ] } ], - "if: ${{ !env.ACT }}\nuses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0": [ + "scope = \"global\"\nvalue = \"true\"": [ { - "file": ".github/workflows/dep-heads.yml", + "file": ".structuredmerge/git-drivers.toml", "lines": [ - 51, - 104, - 142 + 49, + 57, + 65 ] - }, + } + ], + "value = \"true\"\n[[profiles.textconv-normalized.git_config]]": [ { - "file": ".github/workflows/heads.yml", + "file": ".structuredmerge/git-drivers.toml", "lines": [ 50, - 101, - 149 + 58 ] } ] diff --git a/gems/kettle-jem/.structuredmerge/git-drivers.toml b/gems/kettle-jem/.structuredmerge/git-drivers.toml index 07ef3a40f..5eabc7c79 100644 --- a/gems/kettle-jem/.structuredmerge/git-drivers.toml +++ b/gems/kettle-jem/.structuredmerge/git-drivers.toml @@ -1,86 +1,66 @@ -version = 1 driver_namespace = "smorg" - +version = 1 [profiles.builtin-diff] description = "Use Git built-in hunk and word-diff drivers where available." - [[profiles.builtin-diff.attributes]] -pattern = "*.rb" diff = "ruby" - +pattern = "*.rb" [profiles.semantic-diff] description = "Use StructuredMerge external diff drivers for local CLI diffs." - [[profiles.semantic-diff.attributes]] -pattern = "*.rb" diff = "smorg-rb" - +pattern = "*.rb" [[profiles.semantic-diff.git_config]] -scope = "global" key = "diff.smorg-rb.command" +scope = "global" value = "smorg-rb diff-driver" - [profiles.textconv-normalized] description = "Use one-way normalized text projections for package/config review." - [[profiles.textconv-normalized.attributes]] -pattern = "*.json" diff = "smorg-json-textconv" - +pattern = "*.json" [[profiles.textconv-normalized.attributes]] -pattern = "*.jsonc" diff = "smorg-json-textconv" - +pattern = "*.jsonc" [[profiles.textconv-normalized.attributes]] -pattern = "*.yml" diff = "smorg-yaml-textconv" - +pattern = "*.yml" [[profiles.textconv-normalized.attributes]] -pattern = "*.yaml" diff = "smorg-yaml-textconv" - +pattern = "*.yaml" [[profiles.textconv-normalized.attributes]] -pattern = "*.toml" diff = "smorg-toml-textconv" - +pattern = "*.toml" [[profiles.textconv-normalized.attributes]] -pattern = "package.json" diff = "smorg-json-textconv" - +pattern = "package.json" [[profiles.textconv-normalized.attributes]] -pattern = "package-lock.json" diff = "smorg-json-textconv" - +pattern = "package-lock.json" [[profiles.textconv-normalized.attributes]] -pattern = "Cargo.toml" diff = "smorg-toml-textconv" - +pattern = "Cargo.toml" [[profiles.textconv-normalized.git_config]] -scope = "global" key = "diff.smorg-json-textconv.textconv" +scope = "global" value = "smorg-rb textconv --format json" - [[profiles.textconv-normalized.git_config]] -scope = "global" key = "diff.smorg-json-textconv.cachetextconv" +scope = "global" value = "true" - [[profiles.textconv-normalized.git_config]] -scope = "global" key = "diff.smorg-yaml-textconv.textconv" +scope = "global" value = "smorg-rb textconv --format yaml" - [[profiles.textconv-normalized.git_config]] -scope = "global" key = "diff.smorg-yaml-textconv.cachetextconv" +scope = "global" value = "true" - [[profiles.textconv-normalized.git_config]] -scope = "global" key = "diff.smorg-toml-textconv.textconv" +scope = "global" value = "smorg-rb textconv --format toml" - [[profiles.textconv-normalized.git_config]] -scope = "global" key = "diff.smorg-toml-textconv.cachetextconv" +scope = "global" value = "true" diff --git a/gems/kettle-jem/CONTRIBUTING.md b/gems/kettle-jem/CONTRIBUTING.md index 3267ae435..6ce65e81f 100644 --- a/gems/kettle-jem/CONTRIBUTING.md +++ b/gems/kettle-jem/CONTRIBUTING.md @@ -30,6 +30,20 @@ Follow these instructions: 8. Create new Pull Request. 9. Announce it in the channel for this org in the [Discord][✉️discord-invite]! +## Ruby engine CI branches + +Pull requests run MRI workflows by default. JRuby and TruffleRuby workflows are +available by branch naming convention so ordinary PRs do not spend CI time on +alternate Ruby engines. + +- Use a branch named `jruby/*` to run JRuby workflows for a pull request. +- Use a branch named `truffleruby/*` to run TruffleRuby workflows for a pull + request. +- Use a branch named `engines/*` to run both JRuby and TruffleRuby workflows for + a pull request. + +Pushes to the default branch continue to run the configured engine workflows. + ## Executables vs Rake tasks Executables shipped by dependencies, such as kettle-dev, and stone_checksums, are available diff --git a/gems/kettle-jem/Gemfile.lock b/gems/kettle-jem/Gemfile.lock index 7624f5da1..d0a9aa299 100644 --- a/gems/kettle-jem/Gemfile.lock +++ b/gems/kettle-jem/Gemfile.lock @@ -27,95 +27,6 @@ PATH tree_haver (= 7.1.0) yaml-merge (= 7.1.0) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: @@ -274,11 +185,15 @@ GEM bundler (>= 1.17.3) rake (>= 10) thor (>= 0.14) - appraisal2-rubocop (0.2.3) + appraisal2-rubocop (1.0.0) appraisal2 (>= 3.1.4) rubocop (>= 1.0) - version_gem (~> 1.1, >= 1.1.13) + version_gem (~> 1.1, >= 1.1.14) ast (2.4.3) + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -346,13 +261,11 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - kettle-dev (2.3.6) + kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (3.0.0) simplecov (>= 1.0) @@ -538,7 +451,7 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.1) + simplecov (1.0.2) simplecov-cobertura (4.0.0) rexml simplecov (~> 1.0) @@ -589,8 +502,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) @@ -636,16 +547,12 @@ PLATFORMS DEPENDENCIES appraisal2 (~> 3.1, >= 3.1.4) - appraisal2-rubocop (~> 0.2, >= 0.2.3) - ast-crispr! + appraisal2-rubocop (~> 1.0, >= 1.0.0) 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! @@ -655,10 +562,8 @@ DEPENDENCIES erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) - go-merge! irb (~> 1.17) json-merge! - kettle-drift (~> 1.0, >= 1.0.5) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.0) kettle-test (~> 2.0, >= 2.0.11) @@ -669,8 +574,6 @@ DEPENDENCIES markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! prism-merge! psych-merge! rake (~> 13.0) @@ -687,15 +590,12 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0, >= 3.0.6) ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (~> 1.54, >= 1.54.0) stone_checksums (~> 1.0, >= 1.0.6) stringio (>= 3.0) toml-merge! tree_haver! turbo_tests2 (~> 3.1, >= 3.1.14) - typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.3) yaml-merge! @@ -705,25 +605,21 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.3) yard-yaml (~> 0.2, >= 0.2.3) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 - appraisal2-rubocop (0.2.3) sha256=06fd36e7d4e88742193e38d48c196b8d96cff37168bf789405c08a7d771abc2c + appraisal2-rubocop (1.0.0) sha256=b71410fbb014befda5340605a605b7f6f3f012739baf0acc5b4351b592c3258d ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 @@ -750,14 +646,12 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) - kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (3.0.0) sha256=4d3ed6c714cb88cf148f65934c6a96c976b2281abb3ae443ad0ddf6ac0da875b @@ -780,8 +674,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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 @@ -832,15 +724,13 @@ 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.1) sha256=419d93c40484159d20b40e26e9a83cdd4c3afa2f3fd443bb8946c301cd658d75 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea 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.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -855,14 +745,12 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) sha256=ad6743a373eeac954c1b659b17af3aff1c82918b3ce9c9dc572a7c70ff843cdd tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -876,7 +764,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/kettle-jem/Rakefile b/gems/kettle-jem/Rakefile index 721ea8c9d..38324131a 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.0 - 2026-07-17 +# kettle-jem Rakefile v7.1.0 - 2026-07-18 # Ruby 2.3 (Safe Navigation) or higher required # # See LICENSE.md for license information. diff --git a/gems/kettle-jem/gemfiles/modular/style.gemfile b/gems/kettle-jem/gemfiles/modular/style.gemfile index 510069166..ea67969bd 100644 --- a/gems/kettle-jem/gemfiles/modular/style.gemfile +++ b/gems/kettle-jem/gemfiles/modular/style.gemfile @@ -12,7 +12,7 @@ gem "reek", "~> 6.5", ">= 6.5.0" platform :mri do - gem "appraisal2-rubocop", "~> 0.2", ">= 0.2.3", require: false + gem "appraisal2-rubocop", "~> 1.0", ">= 1.0.0", require: false gem "rubocop-gradual", "~> 0.4", ">= 0.4.0" gem "rubocop-minitest", "~> 0.38", ">= 0.38.1" gem "rubocop-on-rbs", "~> 2.0", ">= 2.0.0" # ruby >= 3.2.0 diff --git a/gems/kettle-jem/lib/kettle/jem.rb b/gems/kettle-jem/lib/kettle/jem.rb index 23e8c8e85..f9f9754c7 100644 --- a/gems/kettle-jem/lib/kettle/jem.rb +++ b/gems/kettle-jem/lib/kettle/jem.rb @@ -4869,7 +4869,7 @@ def merge_git_drivers_toml_template_source(template_content, destination_content output: ensure_trailing_newline(TomlRB.dump(merged)), policies: [{name: "kettle-jem-git-drivers-destination-wins"}] } - rescue StandardError => error + rescue => error { ok: false, diagnostics: [ @@ -4888,12 +4888,12 @@ def merge_template_toml_defaults(template, destination) destination_has_key = destination.key?(key) destination_value = destination[key] merged[key] = if destination_has_key && template_value.is_a?(Hash) && destination_value.is_a?(Hash) - merge_template_toml_defaults(template_value, destination_value) - elsif destination_has_key - destination_value - else - template_value - end + merge_template_toml_defaults(template_value, destination_value) + elsif destination_has_key + destination_value + else + template_value + end end.tap do |merged| destination.each do |key, destination_value| merged[key] = destination_value unless merged.key?(key) @@ -5361,10 +5361,10 @@ def merge_config_template_source(recipe, template_content, destination_content, ) when :toml merge_result = if recipe.fetch(:target_path).to_s == ".structuredmerge/git-drivers.toml" - merge_git_drivers_toml_template_source(template_content, destination_content) - else - Toml::Merge.merge_toml(template_content, destination_content, "toml") - end + merge_git_drivers_toml_template_source(template_content, destination_content) + else + Toml::Merge.merge_toml(template_content, destination_content, "toml") + end when :json, :jsonc merge_result = merge_json_template_source(template_content, destination_content, recipe, file_type) when :markdown diff --git a/gems/smorg-rb/Gemfile.lock b/gems/smorg-rb/Gemfile.lock index 655e4846b..ff77760d6 100644 --- a/gems/smorg-rb/Gemfile.lock +++ b/gems/smorg-rb/Gemfile.lock @@ -21,83 +21,6 @@ PATH plain-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -121,6 +44,14 @@ GEM ast-crispr (= 7.1.0) prism (>= 1.0) version_gem (~> 1.1, >= 1.1.9) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) bash-merge (7.1.0) ast-merge (= 7.1.0) @@ -197,6 +128,10 @@ GEM geom2d (0.4.1) gitmoji-regex (2.0.4) version_gem (~> 1.1, >= 1.1.13) + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) hexapdf (1.9.1) cmdparse (~> 3.0, >= 3.0.3) geom2d (~> 0.4, >= 0.4.1) @@ -209,11 +144,40 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -251,6 +215,10 @@ GEM tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -274,6 +242,10 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) pp (0.6.4) prettyprint prettyprint (0.2.0) @@ -524,27 +496,20 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - ast-merge! - ast-merge-git! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) debug (>= 1.1) erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-parser-gfm (~> 1.1) - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - plain-merge! rake (~> 13.0) rbs (>= 3.0) rdoc (~> 6.11) From 6206c8ff0250f3cbc2d3fd388092c306321d231b Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 17:09:56 -0600 Subject: [PATCH 032/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile.lock | 4 +- gems/citrus-toml-merge/Gemfile.lock | 13 +- .../lib/citrus/toml/merge.rb | 42 ++- .../results/test_results.html | 294 +++++++++++++++ .../results/test_results.xml | 7 + .../spec/fixtures_integration_spec.rb | 38 ++ gems/kettle-jem/Gemfile.lock | 121 +++++- gems/kettle-jem/lib/kettle/jem.rb | 50 +-- gems/parslet-toml-merge/Gemfile.lock | 13 +- .../lib/parslet/toml/merge.rb | 42 ++- .../results/test_results.html | 294 +++++++++++++++ .../results/test_results.xml | 7 + .../spec/fixtures_integration_spec.rb | 38 ++ gems/smorg-rb/.kettle-drift.lock | 60 ++- gems/smorg-rb/Gemfile | 40 ++ gems/smorg-rb/Gemfile.lock | 133 ++++--- gems/toml-merge/Gemfile.lock | 30 +- gems/toml-merge/lib/toml/merge.rb | 354 ++++-------------- .../toml-merge/lib/toml/merge/node_wrapper.rb | 12 +- gems/toml-merge/results/test_results.html | 289 ++++++++++++++ gems/toml-merge/results/test_results.xml | 6 + .../spec/fixtures_integration_spec.rb | 84 ++++- 22 files changed, 1526 insertions(+), 445 deletions(-) create mode 100644 gems/citrus-toml-merge/results/test_results.html create mode 100644 gems/citrus-toml-merge/results/test_results.xml create mode 100644 gems/parslet-toml-merge/results/test_results.html create mode 100644 gems/parslet-toml-merge/results/test_results.xml create mode 100644 gems/toml-merge/results/test_results.html create mode 100644 gems/toml-merge/results/test_results.xml diff --git a/Gemfile.lock b/Gemfile.lock index 15a0a7ce1..e3a334e43 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -298,7 +298,7 @@ GEM gitmoji-regex (2.0.4) version_gem (~> 1.1, >= 1.1.13) io-console (0.8.2) - kettle-dev (2.3.6) + kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) @@ -489,7 +489,7 @@ CHECKSUMS go-merge (7.1.0) io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc json-merge (7.1.0) - kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae + kettle-dev (2.3.7) kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 kettle-family (1.0.0) sha256=4c1c158fede8c4e369b6e5576cb540ad38891011cfc7721aea0ade813b13e3c1 kettle-jem (7.1.0) diff --git a/gems/citrus-toml-merge/Gemfile.lock b/gems/citrus-toml-merge/Gemfile.lock index f97a0ed37..d9fc16086 100644 --- a/gems/citrus-toml-merge/Gemfile.lock +++ b/gems/citrus-toml-merge/Gemfile.lock @@ -16,6 +16,14 @@ PATH toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -322,10 +330,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) @@ -409,6 +413,7 @@ DEPENDENCIES standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_sitter_language_pack! yaml-converter (~> 0.1) yard (~> 0.9, >= 0.9.44) diff --git a/gems/citrus-toml-merge/lib/citrus/toml/merge.rb b/gems/citrus-toml-merge/lib/citrus/toml/merge.rb index fd356d516..9a53a9686 100644 --- a/gems/citrus-toml-merge/lib/citrus/toml/merge.rb +++ b/gems/citrus-toml-merge/lib/citrus/toml/merge.rb @@ -54,7 +54,7 @@ def parse_toml(source, dialect, backend: nil) syntax_result = TreeHaver.parse_with_citrus(source, grammar_module: TomlRB::Document) return { ok: false, diagnostics: syntax_result[:diagnostics], policies: [] } unless syntax_result[:ok] - ::Toml::Merge.analyze_toml_source(source, dialect) + TreeHaver.with_backend(BACKEND.id) { ::Toml::Merge.analyze_toml_source(source, dialect) } end def match_toml_owners(template, destination) @@ -65,9 +65,33 @@ def merge_toml(template_source, destination_source, dialect, backend: nil) requested = backend.to_s.empty? ? BACKEND.id : backend.to_s return unsupported_feature_result("Unsupported TOML backend #{requested}.") unless requested == BACKEND.id - ::Toml::Merge.merge_toml_with_parser(template_source, destination_source, dialect) do |source, parse_dialect| - parse_toml(source, parse_dialect, backend: BACKEND.id) - end + return unsupported_feature_result("Unsupported TOML dialect #{dialect}.") unless dialect == 'toml' + + template_parse = parse_toml(template_source, dialect, backend: BACKEND.id) + return provider_parse_failure(:template_parse_error, template_parse) unless template_parse[:ok] + + destination_parse = parse_toml(destination_source, dialect, backend: BACKEND.id) + return provider_parse_failure(:destination_parse_error, destination_parse) unless destination_parse[:ok] + + output = SmartMerger.new( + template_source, + destination_source, + preference: :destination, + add_template_only_nodes: true + ).merge_result.to_toml + + { + ok: true, + diagnostics: [], + output: output, + policies: [::Toml::Merge::DESTINATION_WINS_ARRAY_POLICY] + } + rescue ::Toml::Merge::TemplateParseError => e + { ok: false, diagnostics: [{ severity: 'error', category: 'template_parse_error', message: e.message }], policies: [] } + rescue ::Toml::Merge::DestinationParseError => e + { ok: false, diagnostics: [{ severity: 'error', category: 'destination_parse_error', message: e.message }], policies: [] } + rescue StandardError => e + { ok: false, diagnostics: [{ severity: 'error', category: 'merge_error', message: e.message }], policies: [] } end def unsupported_feature_result(message) @@ -78,6 +102,13 @@ def unsupported_feature_result(message) } end + def provider_parse_failure(category, parse_result) + diagnostics = Array(parse_result[:diagnostics]) + message = diagnostics.map { |diagnostic| diagnostic[:message] || diagnostic['message'] }.compact.join('; ') + message = 'provider parse failed' if message.empty? + { ok: false, diagnostics: [{ severity: 'error', category: category.to_s, message: message }], policies: [] } + end + module_function( :toml_feature_profile, :available_toml_backends, @@ -86,7 +117,8 @@ def unsupported_feature_result(message) :parse_toml, :match_toml_owners, :merge_toml, - :unsupported_feature_result + :unsupported_feature_result, + :provider_parse_failure ) class SmartMerger < ::Toml::Merge::SmartMerger diff --git a/gems/citrus-toml-merge/results/test_results.html b/gems/citrus-toml-merge/results/test_results.html new file mode 100644 index 000000000..e1be3f02e --- /dev/null +++ b/gems/citrus-toml-merge/results/test_results.html @@ -0,0 +1,294 @@ + + + + RSpec results + + + + + + + + +
+ +
+
+

RSpec Code Examples

+
+ +
+ + + +
+ +
+

 

+

 

+
+
+ + +
+
+
+
Citrus::Toml::Merge
+ +
merges comment-free arrays of tables through the Citrus parser provider0.09518s
+
+
+ + +
+
+ + diff --git a/gems/citrus-toml-merge/results/test_results.xml b/gems/citrus-toml-merge/results/test_results.xml new file mode 100644 index 000000000..cc051209f --- /dev/null +++ b/gems/citrus-toml-merge/results/test_results.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/gems/citrus-toml-merge/spec/fixtures_integration_spec.rb b/gems/citrus-toml-merge/spec/fixtures_integration_spec.rb index 5844e1392..3180c25f8 100644 --- a/gems/citrus-toml-merge/spec/fixtures_integration_spec.rb +++ b/gems/citrus-toml-merge/spec/fixtures_integration_spec.rb @@ -103,6 +103,44 @@ def json_ready(value) ) end + it 'merges comment-free arrays of tables through the Citrus parser provider' do + template = <<~TOML + version = 1 + + [profiles.semantic-diff] + description = "Template driver" + + [[profiles.semantic-diff.attributes]] + pattern = "*.rb" + diff = "smorg-ruby" + + [profiles.textconv-normalized] + description = "Template-only profile" + + [[profiles.textconv-normalized.attributes]] + pattern = "*.json" + diff = "smorg-json-textconv" + TOML + destination = <<~TOML + version = 1 + + [profiles.semantic-diff] + description = "Destination driver" + + [[profiles.semantic-diff.attributes]] + pattern = "*.rb" + diff = "smorg-rb" + TOML + + result = described_class.merge_toml(template, destination, 'toml') + + expect(result.fetch(:ok)).to be(true) + expect(result.fetch(:output)).to include('diff = "smorg-rb"') + expect(result.fetch(:output)).to include('description = "Destination driver"') + expect(result.fetch(:output)).to include('[[profiles.textconv-normalized.attributes]]') + expect(result.fetch(:output)).not_to include('smorg-ruby') + end + it 'conforms to the provider named-suite plan and manifest-report fixtures' do plans_fixture = read_json( fixtures_root.join( diff --git a/gems/kettle-jem/Gemfile.lock b/gems/kettle-jem/Gemfile.lock index d0a9aa299..e92a7c652 100644 --- a/gems/kettle-jem/Gemfile.lock +++ b/gems/kettle-jem/Gemfile.lock @@ -27,6 +27,95 @@ PATH tree_haver (= 7.1.0) yaml-merge (= 7.1.0) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: @@ -190,10 +279,6 @@ GEM rubocop (>= 1.0) version_gem (~> 1.1, >= 1.1.14) ast (2.4.3) - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -266,6 +351,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (3.0.0) simplecov (>= 1.0) @@ -502,6 +589,8 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) @@ -548,11 +637,15 @@ PLATFORMS DEPENDENCIES appraisal2 (~> 3.1, >= 3.1.4) appraisal2-rubocop (~> 1.0, >= 1.0.0) + 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! @@ -562,8 +655,10 @@ DEPENDENCIES erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) + go-merge! irb (~> 1.17) json-merge! + kettle-drift (~> 1.0, >= 1.0.5) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.0) kettle-test (~> 2.0, >= 2.0.11) @@ -574,6 +669,8 @@ DEPENDENCIES markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! prism-merge! psych-merge! rake (~> 13.0) @@ -590,12 +687,15 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0, >= 3.0.6) ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (~> 1.54, >= 1.54.0) stone_checksums (~> 1.0, >= 1.0.6) stringio (>= 3.0) toml-merge! tree_haver! turbo_tests2 (~> 3.1, >= 3.1.14) + typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.3) yaml-merge! @@ -605,6 +705,7 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.3) yard-yaml (~> 0.2, >= 0.2.3) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -616,10 +717,13 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 @@ -646,12 +750,14 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (3.0.0) sha256=4d3ed6c714cb88cf148f65934c6a96c976b2281abb3ae443ad0ddf6ac0da875b @@ -674,6 +780,8 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 @@ -724,6 +832,7 @@ 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 @@ -731,6 +840,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.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -745,12 +855,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) sha256=ad6743a373eeac954c1b659b17af3aff1c82918b3ce9c9dc572a7c70ff843cdd tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -764,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/kettle-jem/lib/kettle/jem.rb b/gems/kettle-jem/lib/kettle/jem.rb index f9f9754c7..970f22cf9 100644 --- a/gems/kettle-jem/lib/kettle/jem.rb +++ b/gems/kettle-jem/lib/kettle/jem.rb @@ -4857,50 +4857,6 @@ def replace_toml_string_scalar_line(content, key, value) content end - def merge_git_drivers_toml_template_source(template_content, destination_content) - require "toml-rb" - - template = TomlRB.parse(template_content.to_s) - destination = TomlRB.parse(destination_content.to_s) - merged = merge_template_toml_defaults(template, destination) - { - ok: true, - diagnostics: [], - output: ensure_trailing_newline(TomlRB.dump(merged)), - policies: [{name: "kettle-jem-git-drivers-destination-wins"}] - } - rescue => error - { - ok: false, - diagnostics: [ - { - severity: "error", - code: "merge_error", - message: error.message - } - ], - policies: [] - } - end - - def merge_template_toml_defaults(template, destination) - template.each_with_object({}) do |(key, template_value), merged| - destination_has_key = destination.key?(key) - destination_value = destination[key] - merged[key] = if destination_has_key && template_value.is_a?(Hash) && destination_value.is_a?(Hash) - merge_template_toml_defaults(template_value, destination_value) - elsif destination_has_key - destination_value - else - template_value - end - end.tap do |merged| - destination.each do |key, destination_value| - merged[key] = destination_value unless merged.key?(key) - end - end - end - def prepare_github_workflow_template(content, recipe, facts) return content unless recipe.fetch(:target_path).to_s == ".github/workflows/framework-ci.yml" return content if facts.to_h.dig(:ci, :framework_matrix).to_h.empty? @@ -5360,11 +5316,7 @@ def merge_config_template_source(recipe, template_content, destination_content, **yaml_merge_options(recipe) ) when :toml - merge_result = if recipe.fetch(:target_path).to_s == ".structuredmerge/git-drivers.toml" - merge_git_drivers_toml_template_source(template_content, destination_content) - else - Toml::Merge.merge_toml(template_content, destination_content, "toml") - end + merge_result = Citrus::Toml::Merge.merge_toml(template_content, destination_content, "toml") when :json, :jsonc merge_result = merge_json_template_source(template_content, destination_content, recipe, file_type) when :markdown diff --git a/gems/parslet-toml-merge/Gemfile.lock b/gems/parslet-toml-merge/Gemfile.lock index 84f64ba9a..a8d0a4af5 100644 --- a/gems/parslet-toml-merge/Gemfile.lock +++ b/gems/parslet-toml-merge/Gemfile.lock @@ -16,6 +16,14 @@ PATH toml-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -324,10 +332,6 @@ GEM version_gem (~> 1.1, >= 1.1.13) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) tree_haver (7.1.0) citrus (~> 3.0) parslet (~> 2.0) @@ -408,6 +412,7 @@ DEPENDENCIES standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_sitter_language_pack! yaml-converter (~> 0.1) yard (~> 0.9, >= 0.9.44) diff --git a/gems/parslet-toml-merge/lib/parslet/toml/merge.rb b/gems/parslet-toml-merge/lib/parslet/toml/merge.rb index 15bd81754..ed23f3f1e 100644 --- a/gems/parslet-toml-merge/lib/parslet/toml/merge.rb +++ b/gems/parslet-toml-merge/lib/parslet/toml/merge.rb @@ -54,7 +54,7 @@ def parse_toml(source, dialect, backend: nil) syntax_result = TreeHaver.parse_with_parslet(source, grammar_class: TOML::Parslet) return { ok: false, diagnostics: syntax_result[:diagnostics], policies: [] } unless syntax_result[:ok] - ::Toml::Merge.analyze_toml_source(source, dialect) + TreeHaver.with_backend(BACKEND.id) { ::Toml::Merge.analyze_toml_source(source, dialect) } end def match_toml_owners(template, destination) @@ -65,9 +65,33 @@ def merge_toml(template_source, destination_source, dialect, backend: nil) requested = backend.to_s.empty? ? BACKEND.id : backend.to_s return unsupported_feature_result("Unsupported TOML backend #{requested}.") unless requested == BACKEND.id - ::Toml::Merge.merge_toml_with_parser(template_source, destination_source, dialect) do |source, parse_dialect| - parse_toml(source, parse_dialect, backend: BACKEND.id) - end + return unsupported_feature_result("Unsupported TOML dialect #{dialect}.") unless dialect == 'toml' + + template_parse = parse_toml(template_source, dialect, backend: BACKEND.id) + return provider_parse_failure(:template_parse_error, template_parse) unless template_parse[:ok] + + destination_parse = parse_toml(destination_source, dialect, backend: BACKEND.id) + return provider_parse_failure(:destination_parse_error, destination_parse) unless destination_parse[:ok] + + output = SmartMerger.new( + template_source, + destination_source, + preference: :destination, + add_template_only_nodes: true + ).merge_result.to_toml + + { + ok: true, + diagnostics: [], + output: output, + policies: [::Toml::Merge::DESTINATION_WINS_ARRAY_POLICY] + } + rescue ::Toml::Merge::TemplateParseError => e + { ok: false, diagnostics: [{ severity: 'error', category: 'template_parse_error', message: e.message }], policies: [] } + rescue ::Toml::Merge::DestinationParseError => e + { ok: false, diagnostics: [{ severity: 'error', category: 'destination_parse_error', message: e.message }], policies: [] } + rescue StandardError => e + { ok: false, diagnostics: [{ severity: 'error', category: 'merge_error', message: e.message }], policies: [] } end def unsupported_feature_result(message) @@ -78,6 +102,13 @@ def unsupported_feature_result(message) } end + def provider_parse_failure(category, parse_result) + diagnostics = Array(parse_result[:diagnostics]) + message = diagnostics.map { |diagnostic| diagnostic[:message] || diagnostic['message'] }.compact.join('; ') + message = 'provider parse failed' if message.empty? + { ok: false, diagnostics: [{ severity: 'error', category: category.to_s, message: message }], policies: [] } + end + module_function( :toml_feature_profile, :available_toml_backends, @@ -86,7 +117,8 @@ def unsupported_feature_result(message) :parse_toml, :match_toml_owners, :merge_toml, - :unsupported_feature_result + :unsupported_feature_result, + :provider_parse_failure ) class SmartMerger < ::Toml::Merge::SmartMerger diff --git a/gems/parslet-toml-merge/results/test_results.html b/gems/parslet-toml-merge/results/test_results.html new file mode 100644 index 000000000..f5122db92 --- /dev/null +++ b/gems/parslet-toml-merge/results/test_results.html @@ -0,0 +1,294 @@ + + + + RSpec results + + + + + + + + +
+ +
+
+

RSpec Code Examples

+
+ +
+ + + +
+ +
+

 

+

 

+
+
+ + +
+
+
+
Parslet::Toml::Merge
+ +
merges comment-free arrays of tables through the Parslet parser provider0.08028s
+
+
+ + +
+
+ + diff --git a/gems/parslet-toml-merge/results/test_results.xml b/gems/parslet-toml-merge/results/test_results.xml new file mode 100644 index 000000000..1d020e673 --- /dev/null +++ b/gems/parslet-toml-merge/results/test_results.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/gems/parslet-toml-merge/spec/fixtures_integration_spec.rb b/gems/parslet-toml-merge/spec/fixtures_integration_spec.rb index f1b8ed398..1e6abc81b 100644 --- a/gems/parslet-toml-merge/spec/fixtures_integration_spec.rb +++ b/gems/parslet-toml-merge/spec/fixtures_integration_spec.rb @@ -103,6 +103,44 @@ def json_ready(value) ) end + it 'merges comment-free arrays of tables through the Parslet parser provider' do + template = <<~TOML + version = 1 + + [profiles.semantic-diff] + description = "Template driver" + + [[profiles.semantic-diff.attributes]] + pattern = "*.rb" + diff = "smorg-ruby" + + [profiles.textconv-normalized] + description = "Template-only profile" + + [[profiles.textconv-normalized.attributes]] + pattern = "*.json" + diff = "smorg-json-textconv" + TOML + destination = <<~TOML + version = 1 + + [profiles.semantic-diff] + description = "Destination driver" + + [[profiles.semantic-diff.attributes]] + pattern = "*.rb" + diff = "smorg-rb" + TOML + + result = described_class.merge_toml(template, destination, 'toml') + + expect(result.fetch(:ok)).to be(true) + expect(result.fetch(:output)).to include('diff = "smorg-rb"') + expect(result.fetch(:output)).to include('description = "Destination driver"') + expect(result.fetch(:output)).to include('[[profiles.textconv-normalized.attributes]]') + expect(result.fetch(:output)).not_to include('smorg-ruby') + end + it 'conforms to the provider named-suite plan and manifest-report fixtures' do plans_fixture = read_json( fixtures_root.join( diff --git a/gems/smorg-rb/.kettle-drift.lock b/gems/smorg-rb/.kettle-drift.lock index f073e34ec..bc451f275 100644 --- a/gems/smorg-rb/.kettle-drift.lock +++ b/gems/smorg-rb/.kettle-drift.lock @@ -6,7 +6,8 @@ 85, 125, 165, - 205 + 205, + 245 ] } ], @@ -17,7 +18,8 @@ 96, 136, 176, - 216 + 216, + 256 ] } ], @@ -28,7 +30,8 @@ 86, 126, 166, - 206 + 206, + 246 ] } ], @@ -39,7 +42,8 @@ 98, 138, 178, - 218 + 218, + 258 ] } ], @@ -50,7 +54,8 @@ 101, 141, 181, - 221 + 221, + 261 ] } ], @@ -61,7 +66,8 @@ 87, 127, 167, - 207 + 207, + 247 ] } ], @@ -73,7 +79,8 @@ 105, 145, 185, - 225 + 225, + 265 ] } ], @@ -84,7 +91,8 @@ 106, 146, 186, - 226 + 226, + 266 ] } ], @@ -96,7 +104,8 @@ 92, 132, 172, - 212 + 212, + 252 ] } ], @@ -107,7 +116,8 @@ 115, 155, 195, - 235 + 235, + 275 ] } ], @@ -119,7 +129,8 @@ 84, 124, 164, - 204 + 204, + 244 ] } ], @@ -131,7 +142,8 @@ 114, 154, 194, - 234 + 234, + 274 ] } ], @@ -142,7 +154,8 @@ 90, 130, 170, - 210 + 210, + 250 ] } ], @@ -154,7 +167,8 @@ 97, 137, 177, - 217 + 217, + 257 ] } ], @@ -166,7 +180,8 @@ 93, 133, 173, - 213 + 213, + 253 ] } ], @@ -177,7 +192,8 @@ 91, 131, 171, - 211 + 211, + 251 ] } ], @@ -188,7 +204,8 @@ 108, 148, 188, - 228 + 228, + 268 ] } ], @@ -199,7 +216,8 @@ 107, 147, 187, - 227 + 227, + 267 ] } ], @@ -210,7 +228,8 @@ 102, 142, 182, - 222 + 222, + 262 ] } ], @@ -221,7 +240,8 @@ 111, 151, 191, - 231 + 231, + 271 ] } ], diff --git a/gems/smorg-rb/Gemfile b/gems/smorg-rb/Gemfile index de58bc589..0da51be33 100644 --- a/gems/smorg-rb/Gemfile +++ b/gems/smorg-rb/Gemfile @@ -237,6 +237,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/smorg-rb/Gemfile.lock b/gems/smorg-rb/Gemfile.lock index ff77760d6..655e4846b 100644 --- a/gems/smorg-rb/Gemfile.lock +++ b/gems/smorg-rb/Gemfile.lock @@ -21,6 +21,83 @@ PATH plain-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -44,14 +121,6 @@ GEM ast-crispr (= 7.1.0) prism (>= 1.0) version_gem (~> 1.1, >= 1.1.9) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) bash-merge (7.1.0) ast-merge (= 7.1.0) @@ -128,10 +197,6 @@ GEM geom2d (0.4.1) gitmoji-regex (2.0.4) version_gem (~> 1.1, >= 1.1.13) - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) hexapdf (1.9.1) cmdparse (~> 3.0, >= 3.0.3) geom2d (~> 0.4, >= 0.4.1) @@ -144,40 +209,11 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -215,10 +251,6 @@ GEM tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -242,10 +274,6 @@ GEM ast (~> 2.4.1) racc parslet (2.0.0) - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) pp (0.6.4) prettyprint prettyprint (0.2.0) @@ -496,20 +524,27 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + ast-merge! + ast-merge-git! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) debug (>= 1.1) erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-parser-gfm (~> 1.1) + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + plain-merge! rake (~> 13.0) rbs (>= 3.0) rdoc (~> 6.11) diff --git a/gems/toml-merge/Gemfile.lock b/gems/toml-merge/Gemfile.lock index ff9fbe5fb..5f94594be 100644 --- a/gems/toml-merge/Gemfile.lock +++ b/gems/toml-merge/Gemfile.lock @@ -16,6 +16,24 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +45,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -322,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -373,6 +381,7 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + ast-merge! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) debug (>= 1.1) @@ -402,6 +411,7 @@ DEPENDENCIES stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! + tree_haver! tree_sitter_language_pack! yaml-converter (~> 0.1) yard (~> 0.9, >= 0.9.44) diff --git a/gems/toml-merge/lib/toml/merge.rb b/gems/toml-merge/lib/toml/merge.rb index 8c71baad4..8921c209c 100644 --- a/gems/toml-merge/lib/toml/merge.rb +++ b/gems/toml-merge/lib/toml/merge.rb @@ -1,8 +1,5 @@ # frozen_string_literal: true -# std libs -require 'json' - # External gems # TreeHaver provides a unified cross-Ruby interface to tree-sitter. # Toml::Merge registers TOML-specific backends with TreeHaver when loaded so @@ -51,9 +48,6 @@ module Merge PARSLET_BACKEND_REFERENCE = TreeHaver::BackendReference.new(id: 'parslet', family: 'peg').freeze BACKEND_REGISTRY = Struct.new(:registered, :mutex).new(false, Mutex.new) - class InlineTable < Hash - end - # Base error class for Toml::Merge # Inherits from Ast::Merge::Error for consistency across merge gems. class Error < Ast::Merge::Error; end @@ -133,7 +127,7 @@ def available_toml_backends end def toml_backend_feature_profile(backend: nil) - requested = backend.to_s.empty? ? TREE_SITTER_BACKEND_REFERENCE.id : backend.to_s + requested = requested_toml_backend_id(backend) backend_ref = available_toml_backends.find { |candidate| candidate.id == requested } return unsupported_feature_result("Unsupported TOML backend #{requested}.") unless backend_ref @@ -160,12 +154,12 @@ def toml_plan_context(backend: nil) def parse_toml(source, dialect, backend: nil) return unsupported_feature_parse_result("Unsupported TOML dialect #{dialect}.") unless dialect == 'toml' - requested = backend.to_s.empty? ? TREE_SITTER_BACKEND_REFERENCE.id : backend.to_s + requested = requested_toml_backend_id(backend) return unsupported_feature_parse_result("Unsupported TOML backend #{requested}.") unless available_toml_backends.any? do |candidate| candidate.id == requested end - analyze_toml_source(source, dialect) + TreeHaver.with_backend(requested) { analyze_toml_source(source, dialect) } rescue StandardError => e parse_error_result(e.message) end @@ -173,16 +167,18 @@ def parse_toml(source, dialect, backend: nil) def analyze_toml_source(source, dialect) return unsupported_feature_parse_result("Unsupported TOML dialect #{dialect}.") unless dialect == 'toml' - parsed = parse_toml_document(source) + analysis = FileAnalysis.new(source) + return parse_error_result(analysis.errors.map(&:to_s).join('; ')) unless analysis.valid? + { ok: true, diagnostics: [], analysis: { kind: 'toml', dialect: 'toml', - normalized_source: canonical_toml(parsed), + normalized_source: normalize_toml_source(source), root_kind: 'table', - owners: collect_toml_owners(parsed) + owners: collect_file_analysis_owners(analysis) }, policies: [] } @@ -197,28 +193,20 @@ def match_toml_owners(template, destination) def merge_toml(template_source, destination_source, dialect, backend: nil) return unsupported_feature_merge_result("Unsupported TOML dialect #{dialect}.") unless dialect == 'toml' - requested = backend.to_s.empty? ? TREE_SITTER_BACKEND_REFERENCE.id : backend.to_s + requested = requested_toml_backend_id(backend) return unsupported_feature_merge_result("Unsupported TOML backend #{requested}.") unless available_toml_backends.any? do |candidate| candidate.id == requested end - unless template_source.match?(/^\s*#/) || destination_source.match?(/^\s*#/) - merged = merge_toml_tables(parse_toml_document(template_source), parse_toml_document(destination_source)) - return { - ok: true, - diagnostics: [], - output: canonical_toml(merged), - policies: [DESTINATION_WINS_ARRAY_POLICY] - } + output = TreeHaver.with_backend(requested) do + SmartMerger.new( + template_source, + destination_source, + preference: :destination, + add_template_only_nodes: true + ).merge_result.to_toml end - output = SmartMerger.new( - template_source, - destination_source, - preference: :destination, - add_template_only_nodes: true - ).merge_result.to_toml - { ok: true, diagnostics: [], @@ -243,16 +231,6 @@ def merge_toml_with_parser(template_source, destination_source, dialect) destination_parse = yield(destination_source, dialect) return provider_parse_failure(:destination_parse_error, destination_parse) unless destination_parse[:ok] - unless template_source.match?(/^\s*#/) || destination_source.match?(/^\s*#/) - merged = merge_toml_tables(parse_toml_document(template_source), parse_toml_document(destination_source)) - return { - ok: true, - diagnostics: [], - output: canonical_toml(merged), - policies: [DESTINATION_WINS_ARRAY_POLICY] - } - end - output = SmartMerger.new( template_source, destination_source, @@ -323,6 +301,17 @@ def register_parslet_backend! nil end + def requested_toml_backend_id(backend) + return backend.to_s unless backend.to_s.empty? + + current = TreeHaver.current_backend_id + return current if toml_backend_available_for_analysis?(current) + + available_toml_backends.find do |backend_ref| + toml_backend_available_for_analysis?(backend_ref.id) + end&.id || TREE_SITTER_BACKEND_REFERENCE.id + end + def diagnostic(severity, category, message) { severity: severity, category: category, message: message } end @@ -342,273 +331,58 @@ def normalize_toml_source(source) source.gsub(/\r\n?/, "\n") end - def strip_toml_comment(line) - result = +'' - in_string = false - escaped = false - - line.each_char do |char| - if in_string - result << char - if escaped - escaped = false - elsif char == '\\' - escaped = true - elsif char == '"' - in_string = false - end - next - end - - if char == '"' - in_string = true - result << char - next - end - - break if char == '#' - - result << char - end - - raise ParseError, 'Unterminated TOML string.' if in_string - - result.strip - end - - def split_outside_quotes(value, separator) - parts = [] - current = +'' - in_string = false - escaped = false - depth = 0 - - value.each_char do |char| - if in_string - current << char - if escaped - escaped = false - elsif char == '\\' - escaped = true - elsif char == '"' - in_string = false - end - next - end - - case char - when '"' - in_string = true - current << char - when '[', '{' - depth += 1 - current << char - when ']', '}' - depth -= 1 - current << char - else - if char == separator && depth.zero? - parts << current.strip - current = +'' - else - current << char - end - end - end - - raise ParseError, 'Unterminated TOML string, array, or inline table.' if in_string || !depth.zero? - - parts << current.strip - parts - end - - def parse_toml_key_path(value) - trimmed = value.strip - raise ParseError, 'Missing TOML key path.' if trimmed.empty? - - parts = trimmed.split('.').map(&:strip) - raise ParseError, "Unsupported TOML key path #{trimmed}." unless parts.all? do |part| - part.match?(/\A[A-Za-z0-9_-]+\z/) - end - - parts - end - - def parse_toml_scalar_value(value) - case value - when /\A".*"\z/m - JSON.parse(value) - when 'true' - true - when 'false' - false - when /\A-?\d+\z/ - value.to_i - when /\A-?\d+\.\d+\z/ - value.to_f + def toml_backend_available_for_analysis?(backend_id) + registrations = TreeHaver.registered_languages(:toml) + case backend_id.to_s + when 'citrus' + registrations.key?(:citrus) + when 'parslet' + registrations.key?(:parslet) + when TREE_SITTER_BACKEND_REFERENCE.id + registrations.key?(:tree_sitter) else - raise ParseError, "Unsupported TOML value #{value}." - end - rescue JSON::ParserError - raise ParseError, "Invalid TOML string #{value}." - end - - def parse_toml_value(value) - stripped = value.strip - if stripped.start_with?('[') - raise ParseError, "Invalid TOML array #{value}." unless stripped.end_with?(']') - - inner = stripped[1..-2].strip - return [] if inner.empty? - - split_outside_quotes(inner, ',').map { |entry| parse_toml_scalar_value(entry) } - elsif stripped.start_with?('{') - raise ParseError, "Invalid TOML inline table #{value}." unless stripped.end_with?('}') - - inner = stripped[1..-2].strip - table = InlineTable.new - return table if inner.empty? - - split_outside_quotes(inner, ',').each do |entry| - pair = split_outside_quotes(entry, '=') - raise ParseError, "Invalid TOML inline table entry #{entry}." unless pair.length == 2 - - assign_toml_value(table, parse_toml_key_path(pair[0]), parse_toml_value(pair[1])) - end - table - else - parse_toml_scalar_value(stripped) + false end end - def ensure_toml_table(root, path) - current = root - path.each do |segment| - existing = current[segment] - if existing.nil? - current[segment] = {} - current = current[segment] - elsif toml_table_value?(existing) - current = existing + def collect_file_analysis_owners(analysis) + analysis.statements.flat_map do |statement| + if statement.table? || statement.array_of_tables? + collect_table_statement_owners(statement) + elsif statement.pair? + collect_pair_statement_owners(statement, []) else - raise ParseError, "TOML table path /#{path.join('/')} conflicts with a value." + [] end - end - current + end.sort_by { |owner| owner.fetch(:path) } end - def assign_toml_value(root, path, value) - raise ParseError, 'Missing TOML assignment path.' if path.empty? - - table = ensure_toml_table(root, path[0..-2]) - key = path[-1] - existing = table[key] - raise ParseError, "TOML key /#{path.join('/')} conflicts with a table." if toml_table_value?(existing) - - table[key] = value + def collect_table_statement_owners(statement) + table_path = toml_owner_path_parts(statement.table_name) + owner_kind = statement.array_of_tables? ? 'table_array' : 'table' + [ + { path: toml_owner_path(table_path), owner_kind: owner_kind, match_key: table_path.last } + ] + statement.pairs.flat_map { |pair| collect_pair_statement_owners(pair, table_path) } end - def parse_toml_document(source) - lines = normalize_toml_source(source).split("\n") - root = {} - current_table_path = [] - - lines.each do |raw_line| - line = strip_toml_comment(raw_line) - next if line.empty? - - if line.start_with?('[') - raise ParseError, "Invalid TOML table header #{line}." unless line.end_with?(']') - - current_table_path = parse_toml_key_path(line[1..-2]) - ensure_toml_table(root, current_table_path) - next - end - - parts = split_outside_quotes(line, '=') - raise ParseError, "Invalid TOML assignment #{line}." unless parts.length == 2 - - key_path = parse_toml_key_path(parts[0]) - value = parse_toml_value(parts[1]) - assign_toml_value(root, current_table_path + key_path, value) + def collect_pair_statement_owners(pair, parent_path) + key_path = parent_path + toml_owner_path_parts(pair.key_name) + owners = [{ path: toml_owner_path(key_path), owner_kind: 'key_value', match_key: key_path.last }] + value = pair.value_node + if value&.array? + owners.concat(value.elements.each_with_index.map do |_element, index| + { path: toml_owner_path(key_path + [index.to_s]), owner_kind: 'array_item' } + end) end - - root + owners end - def render_toml_scalar(value) - if value.is_a?(String) - JSON.generate(value) - elsif [true, false].include?(value) - value ? 'true' : 'false' - else - value.to_s - end - end - - def render_toml_value(value) - return "[#{value.map { |item| render_toml_scalar(item) }.join(', ')}]" if value.is_a?(Array) - - if value.is_a?(InlineTable) - pairs = value.keys.sort.map { |key| "#{key} = #{render_toml_value(value[key])}" } - return "{ #{pairs.join(', ')} }" - end - - render_toml_scalar(value) - end - - def render_toml_table(table, path = []) - lines = [] - keys = table.keys.sort - value_keys = keys.reject { |key| toml_table_value?(table[key]) } - table_keys = keys.select { |key| toml_table_value?(table[key]) } - - lines << "[#{path.join('.')}]" unless path.empty? - value_keys.each do |key| - lines << "#{key} = #{render_toml_value(table[key])}" - end - table_keys.each do |key| - lines << '' unless lines.empty? - lines.concat(render_toml_table(table[key], path + [key])) - end - lines - end - - def canonical_toml(table) - "#{render_toml_table(table).join("\n")}\n" - end - - def collect_toml_owners(table, prefix = '') - table.keys.sort.flat_map do |key| - path = "#{prefix}/#{key}" - value = table[key] - if value.is_a?(Array) - [{ path: path, owner_kind: 'key_value', match_key: key }] + - value.each_index.map { |index| { path: "#{path}/#{index}", owner_kind: 'array_item' } } - elsif toml_table_value?(value) - [{ path: path, owner_kind: 'table', match_key: key }] + collect_toml_owners(value, path) - else - [{ path: path, owner_kind: 'key_value', match_key: key }] - end - end - end - - def merge_toml_tables(template, destination) - (template.keys | destination.keys).sort.each_with_object({}) do |key, merged| - merged[key] = if !template.key?(key) - destination[key] - elsif !destination.key?(key) - template[key] - elsif toml_table_value?(template[key]) && toml_table_value?(destination[key]) - merge_toml_tables(template[key], destination[key]) - else - destination[key] - end - end + def toml_owner_path_parts(value) + value.to_s.split('.').map(&:strip).reject(&:empty?) end - def toml_table_value?(value) - value.is_a?(Hash) && !value.is_a?(InlineTable) + def toml_owner_path(parts) + "/#{parts.join('/')}" end def unsupported_feature_parse_result(message) diff --git a/gems/toml-merge/lib/toml/merge/node_wrapper.rb b/gems/toml-merge/lib/toml/merge/node_wrapper.rb index 6dbeb058a..c90c15af1 100644 --- a/gems/toml-merge/lib/toml/merge/node_wrapper.rb +++ b/gems/toml-merge/lib/toml/merge/node_wrapper.rb @@ -203,7 +203,7 @@ def table_name return node_text(child)&.strip end end - nil + parslet_element_table_name end # Get the key name if this is a pair node @@ -496,6 +496,16 @@ def parslet_element_canonical_type :element end + def parslet_element_table_name + return unless parslet_element_node? + + name = node_text(@node)&.strip + return if name.nil? || name.empty? + return if name.include?('=') + + name + end + def each_child(node) children = [] node.each { |child| children << child } diff --git a/gems/toml-merge/results/test_results.html b/gems/toml-merge/results/test_results.html new file mode 100644 index 000000000..8417a132c --- /dev/null +++ b/gems/toml-merge/results/test_results.html @@ -0,0 +1,289 @@ + + + + RSpec results + + + + + + + + +
+ +
+
+

RSpec Code Examples

+
+ +
+ + + +
+ +
+

 

+

 

+
+
+ + +
+ +
+ + +
+ + + diff --git a/gems/toml-merge/results/test_results.xml b/gems/toml-merge/results/test_results.xml new file mode 100644 index 000000000..7ad52561c --- /dev/null +++ b/gems/toml-merge/results/test_results.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/gems/toml-merge/spec/fixtures_integration_spec.rb b/gems/toml-merge/spec/fixtures_integration_spec.rb index 3a2273c4a..a92b41f5f 100644 --- a/gems/toml-merge/spec/fixtures_integration_spec.rb +++ b/gems/toml-merge/spec/fixtures_integration_spec.rb @@ -82,7 +82,7 @@ def json_ready(value) ) ) - expect(json_ready(described_class.toml_backend_feature_profile)).to include( + expect(json_ready(described_class.toml_backend_feature_profile(backend: 'kreuzberg-language-pack'))).to include( json_ready(fixture[:tree_sitter]) ) end @@ -96,7 +96,9 @@ def json_ready(value) ) ) - expect(json_ready(described_class.toml_plan_context)).to eq(json_ready(fixture[:tree_sitter])) + expect(json_ready(described_class.toml_plan_context(backend: 'kreuzberg-language-pack'))).to eq( + json_ready(fixture[:tree_sitter]) + ) end it 'conforms to the slice-137 TOML family manifest fixture' do @@ -225,6 +227,84 @@ def json_ready(value) expect(owners.values.uniq).to eq([owners.fetch(:core)]) end + it 'projects arrays of tables across active TOML provider surfaces' do + source = <<~TOML + version = 1 + + [profiles.semantic-diff] + description = "Semantic diff" + + [[profiles.semantic-diff.attributes]] + pattern = "*.rb" + diff = "smorg-rb" + + [[profiles.semantic-diff.git_config]] + scope = "global" + key = "diff.smorg-rb.command" + value = "smorg-rb diff-driver" + TOML + + results = { + core: described_class.parse_toml(source, 'toml'), + citrus: Citrus::Toml::Merge.parse_toml(source, 'toml'), + parslet: Parslet::Toml::Merge.parse_toml(source, 'toml') + } + + expect(results.transform_values { |result| result.fetch(:ok) }).to eq( + core: true, + citrus: true, + parslet: true + ) + normalized = results.transform_values { |result| result.dig(:analysis, :normalized_source) } + owners = results.transform_values { |result| json_ready(result.dig(:analysis, :owners)) } + expect(normalized.values.uniq).to eq([normalized.fetch(:core)]) + expect(normalized.fetch(:core)).to include('[[profiles.semantic-diff.attributes]]') + expect(normalized.fetch(:core)).to include('[[profiles.semantic-diff.git_config]]') + expect(owners.values.uniq).to eq([owners.fetch(:core)]) + expect(owners.fetch(:core)).to include( + include(path: '/profiles/semantic-diff/attributes', owner_kind: 'table_array', match_key: 'attributes'), + include(path: '/profiles/semantic-diff/git_config', owner_kind: 'table_array', match_key: 'git_config') + ) + end + + it 'merges comment-free TOML arrays of tables with destination preference' do + template = <<~TOML + version = 1 + + [profiles.semantic-diff] + description = "Template driver" + + [[profiles.semantic-diff.attributes]] + pattern = "*.rb" + diff = "smorg-ruby" + + [profiles.textconv-normalized] + description = "Template-only profile" + + [[profiles.textconv-normalized.attributes]] + pattern = "*.json" + diff = "smorg-json-textconv" + TOML + destination = <<~TOML + version = 1 + + [profiles.semantic-diff] + description = "Destination driver" + + [[profiles.semantic-diff.attributes]] + pattern = "*.rb" + diff = "smorg-rb" + TOML + + result = described_class.merge_toml(template, destination, 'toml') + + expect(result.fetch(:ok)).to be(true) + expect(result.fetch(:output)).to include('diff = "smorg-rb"') + expect(result.fetch(:output)).to include('description = "Destination driver"') + expect(result.fetch(:output)).to include('[[profiles.textconv-normalized.attributes]]') + expect(result.fetch(:output)).not_to include('smorg-ruby') + end + it 'exposes non-overlapping effective table ranges and source fragments across TOML providers' do source = <<~TOML title = "example" From e2dd5508690ee71b0c6bf9364e793bbcbbdce5e4 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 17:11:19 -0600 Subject: [PATCH 033/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/kettle-jem/Gemfile.lock | 121 +-------------- gems/smorg-rb/Gemfile.lock | 278 ++++++++++++++++++++++++++--------- 2 files changed, 215 insertions(+), 184 deletions(-) diff --git a/gems/kettle-jem/Gemfile.lock b/gems/kettle-jem/Gemfile.lock index e92a7c652..d0a9aa299 100644 --- a/gems/kettle-jem/Gemfile.lock +++ b/gems/kettle-jem/Gemfile.lock @@ -27,95 +27,6 @@ PATH tree_haver (= 7.1.0) yaml-merge (= 7.1.0) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: @@ -279,6 +190,10 @@ GEM rubocop (>= 1.0) version_gem (~> 1.1, >= 1.1.14) ast (2.4.3) + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -351,8 +266,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (3.0.0) simplecov (>= 1.0) @@ -589,8 +502,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) @@ -637,15 +548,11 @@ PLATFORMS DEPENDENCIES appraisal2 (~> 3.1, >= 3.1.4) appraisal2-rubocop (~> 1.0, >= 1.0.0) - 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! @@ -655,10 +562,8 @@ DEPENDENCIES erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) - go-merge! irb (~> 1.17) json-merge! - kettle-drift (~> 1.0, >= 1.0.5) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.0) kettle-test (~> 2.0, >= 2.0.11) @@ -669,8 +574,6 @@ DEPENDENCIES markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! prism-merge! psych-merge! rake (~> 13.0) @@ -687,15 +590,12 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0, >= 3.0.6) ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (~> 1.54, >= 1.54.0) stone_checksums (~> 1.0, >= 1.0.6) stringio (>= 3.0) toml-merge! tree_haver! turbo_tests2 (~> 3.1, >= 3.1.14) - typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.3) yaml-merge! @@ -705,7 +605,6 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.3) yard-yaml (~> 0.2, >= 0.2.3) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -717,13 +616,10 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 @@ -750,14 +646,12 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (3.0.0) sha256=4d3ed6c714cb88cf148f65934c6a96c976b2281abb3ae443ad0ddf6ac0da875b @@ -780,8 +674,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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 @@ -832,7 +724,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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 @@ -840,7 +731,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.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -855,14 +745,12 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) sha256=ad6743a373eeac954c1b659b17af3aff1c82918b3ce9c9dc572a7c70ff843cdd tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -876,7 +764,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/smorg-rb/Gemfile.lock b/gems/smorg-rb/Gemfile.lock index 655e4846b..09eba198c 100644 --- a/gems/smorg-rb/Gemfile.lock +++ b/gems/smorg-rb/Gemfile.lock @@ -21,6 +21,182 @@ PATH plain-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: @@ -109,33 +285,13 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) bundler (>= 1.2.0) thor (~> 1.0) citrus (3.0.2) - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) cmdparse (3.0.7) commonmarker (2.9.0-aarch64-linux) commonmarker (2.9.0-aarch64-linux-musl) @@ -143,10 +299,6 @@ GEM commonmarker (2.9.0-x86_64-darwin) commonmarker (2.9.0-x86_64-linux) commonmarker (2.9.0-x86_64-linux-musl) - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -156,10 +308,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docile (1.4.1) - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -214,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -237,19 +387,11 @@ GEM turbo_tests2 (~> 3.1, >= 3.1.12) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) 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.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) @@ -278,18 +420,9 @@ GEM prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) psych (5.4.0) date stringio - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -301,11 +434,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) rdoc (6.17.0) erb psych (>= 4.0.0) @@ -401,10 +529,6 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -462,18 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -488,10 +605,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.13) - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) yard (0.9.45) yard-fence (0.9.6) rdoc (>= 6.11, < 8) @@ -524,11 +637,20 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) @@ -536,17 +658,24 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -555,19 +684,26 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -579,10 +715,12 @@ CHECKSUMS ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) @@ -621,6 +759,7 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad @@ -648,6 +787,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.0) plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -694,6 +834,7 @@ 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -717,12 +858,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -735,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From de4d64b83677afb5324b79eac1981ef9b9e997ff Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 17:12:28 -0600 Subject: [PATCH 034/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/kettle-jem/Gemfile.lock | 121 +++++++++++++- gems/smorg-rb/.kettle-drift.lock | 60 ++++--- gems/smorg-rb/Gemfile | 40 +++++ gems/smorg-rb/Gemfile.lock | 278 ++++++++----------------------- 4 files changed, 264 insertions(+), 235 deletions(-) diff --git a/gems/kettle-jem/Gemfile.lock b/gems/kettle-jem/Gemfile.lock index d0a9aa299..e92a7c652 100644 --- a/gems/kettle-jem/Gemfile.lock +++ b/gems/kettle-jem/Gemfile.lock @@ -27,6 +27,95 @@ PATH tree_haver (= 7.1.0) yaml-merge (= 7.1.0) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: @@ -190,10 +279,6 @@ GEM rubocop (>= 1.0) version_gem (~> 1.1, >= 1.1.14) ast (2.4.3) - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -266,6 +351,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (3.0.0) simplecov (>= 1.0) @@ -502,6 +589,8 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) @@ -548,11 +637,15 @@ PLATFORMS DEPENDENCIES appraisal2 (~> 3.1, >= 3.1.4) appraisal2-rubocop (~> 1.0, >= 1.0.0) + 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! @@ -562,8 +655,10 @@ DEPENDENCIES erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) + go-merge! irb (~> 1.17) json-merge! + kettle-drift (~> 1.0, >= 1.0.5) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.0) kettle-test (~> 2.0, >= 2.0.11) @@ -574,6 +669,8 @@ DEPENDENCIES markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! prism-merge! psych-merge! rake (~> 13.0) @@ -590,12 +687,15 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0, >= 3.0.6) ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (~> 1.54, >= 1.54.0) stone_checksums (~> 1.0, >= 1.0.6) stringio (>= 3.0) toml-merge! tree_haver! turbo_tests2 (~> 3.1, >= 3.1.14) + typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.3) yaml-merge! @@ -605,6 +705,7 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.3) yard-yaml (~> 0.2, >= 0.2.3) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -616,10 +717,13 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 @@ -646,12 +750,14 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (3.0.0) sha256=4d3ed6c714cb88cf148f65934c6a96c976b2281abb3ae443ad0ddf6ac0da875b @@ -674,6 +780,8 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 @@ -724,6 +832,7 @@ 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 @@ -731,6 +840,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.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -745,12 +855,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) sha256=ad6743a373eeac954c1b659b17af3aff1c82918b3ce9c9dc572a7c70ff843cdd tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -764,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/smorg-rb/.kettle-drift.lock b/gems/smorg-rb/.kettle-drift.lock index bc451f275..991f5a042 100644 --- a/gems/smorg-rb/.kettle-drift.lock +++ b/gems/smorg-rb/.kettle-drift.lock @@ -7,7 +7,8 @@ 125, 165, 205, - 245 + 245, + 285 ] } ], @@ -19,7 +20,8 @@ 136, 176, 216, - 256 + 256, + 296 ] } ], @@ -31,7 +33,8 @@ 126, 166, 206, - 246 + 246, + 286 ] } ], @@ -43,7 +46,8 @@ 138, 178, 218, - 258 + 258, + 298 ] } ], @@ -55,7 +59,8 @@ 141, 181, 221, - 261 + 261, + 301 ] } ], @@ -67,7 +72,8 @@ 127, 167, 207, - 247 + 247, + 287 ] } ], @@ -80,7 +86,8 @@ 145, 185, 225, - 265 + 265, + 305 ] } ], @@ -92,7 +99,8 @@ 146, 186, 226, - 266 + 266, + 306 ] } ], @@ -105,7 +113,8 @@ 132, 172, 212, - 252 + 252, + 292 ] } ], @@ -117,7 +126,8 @@ 155, 195, 235, - 275 + 275, + 315 ] } ], @@ -130,7 +140,8 @@ 124, 164, 204, - 244 + 244, + 284 ] } ], @@ -143,7 +154,8 @@ 154, 194, 234, - 274 + 274, + 314 ] } ], @@ -155,7 +167,8 @@ 130, 170, 210, - 250 + 250, + 290 ] } ], @@ -168,7 +181,8 @@ 137, 177, 217, - 257 + 257, + 297 ] } ], @@ -181,7 +195,8 @@ 133, 173, 213, - 253 + 253, + 293 ] } ], @@ -193,7 +208,8 @@ 131, 171, 211, - 251 + 251, + 291 ] } ], @@ -205,7 +221,8 @@ 148, 188, 228, - 268 + 268, + 308 ] } ], @@ -217,7 +234,8 @@ 147, 187, 227, - 267 + 267, + 307 ] } ], @@ -229,7 +247,8 @@ 142, 182, 222, - 262 + 262, + 302 ] } ], @@ -241,7 +260,8 @@ 151, 191, 231, - 271 + 271, + 311 ] } ], diff --git a/gems/smorg-rb/Gemfile b/gems/smorg-rb/Gemfile index 0da51be33..4a188907e 100644 --- a/gems/smorg-rb/Gemfile +++ b/gems/smorg-rb/Gemfile @@ -277,6 +277,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/smorg-rb/Gemfile.lock b/gems/smorg-rb/Gemfile.lock index 09eba198c..655e4846b 100644 --- a/gems/smorg-rb/Gemfile.lock +++ b/gems/smorg-rb/Gemfile.lock @@ -21,182 +21,6 @@ PATH plain-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: @@ -285,13 +109,33 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) bundler (>= 1.2.0) thor (~> 1.0) citrus (3.0.2) + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) cmdparse (3.0.7) commonmarker (2.9.0-aarch64-linux) commonmarker (2.9.0-aarch64-linux-musl) @@ -299,6 +143,10 @@ GEM commonmarker (2.9.0-x86_64-darwin) commonmarker (2.9.0-x86_64-linux) commonmarker (2.9.0-x86_64-linux-musl) + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -308,6 +156,10 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docile (1.4.1) + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -362,8 +214,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -387,11 +237,19 @@ GEM turbo_tests2 (~> 3.1, >= 3.1.12) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) 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.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) @@ -420,9 +278,18 @@ GEM prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) psych (5.4.0) date stringio + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -434,6 +301,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) rdoc (6.17.0) erb psych (>= 4.0.0) @@ -529,6 +401,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -586,11 +462,18 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -605,6 +488,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.13) + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) yard (0.9.45) yard-fence (0.9.6) rdoc (>= 6.11, < 8) @@ -637,20 +524,11 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) @@ -658,24 +536,17 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -684,26 +555,19 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -715,12 +579,10 @@ CHECKSUMS ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) @@ -759,7 +621,6 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad @@ -787,7 +648,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.0) plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -834,7 +694,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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -858,14 +717,12 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -878,7 +735,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 17c6ef644e5eb882aa6fda295ead2d9a0b25a143 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 17:13:33 -0600 Subject: [PATCH 035/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/kettle-jem/Gemfile.lock | 121 +-------------- gems/smorg-rb/Gemfile.lock | 278 ++++++++++++++++++++++++++--------- 2 files changed, 215 insertions(+), 184 deletions(-) diff --git a/gems/kettle-jem/Gemfile.lock b/gems/kettle-jem/Gemfile.lock index e92a7c652..d0a9aa299 100644 --- a/gems/kettle-jem/Gemfile.lock +++ b/gems/kettle-jem/Gemfile.lock @@ -27,95 +27,6 @@ PATH tree_haver (= 7.1.0) yaml-merge (= 7.1.0) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: @@ -279,6 +190,10 @@ GEM rubocop (>= 1.0) version_gem (~> 1.1, >= 1.1.14) ast (2.4.3) + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -351,8 +266,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (3.0.0) simplecov (>= 1.0) @@ -589,8 +502,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) @@ -637,15 +548,11 @@ PLATFORMS DEPENDENCIES appraisal2 (~> 3.1, >= 3.1.4) appraisal2-rubocop (~> 1.0, >= 1.0.0) - 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! @@ -655,10 +562,8 @@ DEPENDENCIES erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) - go-merge! irb (~> 1.17) json-merge! - kettle-drift (~> 1.0, >= 1.0.5) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.0) kettle-test (~> 2.0, >= 2.0.11) @@ -669,8 +574,6 @@ DEPENDENCIES markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! prism-merge! psych-merge! rake (~> 13.0) @@ -687,15 +590,12 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0, >= 3.0.6) ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (~> 1.54, >= 1.54.0) stone_checksums (~> 1.0, >= 1.0.6) stringio (>= 3.0) toml-merge! tree_haver! turbo_tests2 (~> 3.1, >= 3.1.14) - typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.3) yaml-merge! @@ -705,7 +605,6 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.3) yard-yaml (~> 0.2, >= 0.2.3) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -717,13 +616,10 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 @@ -750,14 +646,12 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (3.0.0) sha256=4d3ed6c714cb88cf148f65934c6a96c976b2281abb3ae443ad0ddf6ac0da875b @@ -780,8 +674,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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 @@ -832,7 +724,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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 @@ -840,7 +731,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.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -855,14 +745,12 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) sha256=ad6743a373eeac954c1b659b17af3aff1c82918b3ce9c9dc572a7c70ff843cdd tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -876,7 +764,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/smorg-rb/Gemfile.lock b/gems/smorg-rb/Gemfile.lock index 655e4846b..09eba198c 100644 --- a/gems/smorg-rb/Gemfile.lock +++ b/gems/smorg-rb/Gemfile.lock @@ -21,6 +21,182 @@ PATH plain-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: @@ -109,33 +285,13 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) bundler (>= 1.2.0) thor (~> 1.0) citrus (3.0.2) - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) cmdparse (3.0.7) commonmarker (2.9.0-aarch64-linux) commonmarker (2.9.0-aarch64-linux-musl) @@ -143,10 +299,6 @@ GEM commonmarker (2.9.0-x86_64-darwin) commonmarker (2.9.0-x86_64-linux) commonmarker (2.9.0-x86_64-linux-musl) - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -156,10 +308,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docile (1.4.1) - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -214,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -237,19 +387,11 @@ GEM turbo_tests2 (~> 3.1, >= 3.1.12) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) 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.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) @@ -278,18 +420,9 @@ GEM prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) psych (5.4.0) date stringio - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -301,11 +434,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) rdoc (6.17.0) erb psych (>= 4.0.0) @@ -401,10 +529,6 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -462,18 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -488,10 +605,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.13) - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) yard (0.9.45) yard-fence (0.9.6) rdoc (>= 6.11, < 8) @@ -524,11 +637,20 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) @@ -536,17 +658,24 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -555,19 +684,26 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -579,10 +715,12 @@ CHECKSUMS ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) @@ -621,6 +759,7 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad @@ -648,6 +787,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.0) plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -694,6 +834,7 @@ 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -717,12 +858,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -735,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From a5923806a38c10e74fb604b881f0211f7b908797 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 17:16:28 -0600 Subject: [PATCH 036/347] =?UTF-8?q?=F0=9F=94=92=20Normalize=20kettle-jem?= =?UTF-8?q?=20lockfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/kettle-jem/Gemfile.lock | 121 +++++++++++++++++++++++++++++++++-- 1 file changed, 117 insertions(+), 4 deletions(-) diff --git a/gems/kettle-jem/Gemfile.lock b/gems/kettle-jem/Gemfile.lock index d0a9aa299..e92a7c652 100644 --- a/gems/kettle-jem/Gemfile.lock +++ b/gems/kettle-jem/Gemfile.lock @@ -27,6 +27,95 @@ PATH tree_haver (= 7.1.0) yaml-merge (= 7.1.0) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: @@ -190,10 +279,6 @@ GEM rubocop (>= 1.0) version_gem (~> 1.1, >= 1.1.14) ast (2.4.3) - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -266,6 +351,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (3.0.0) simplecov (>= 1.0) @@ -502,6 +589,8 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) @@ -548,11 +637,15 @@ PLATFORMS DEPENDENCIES appraisal2 (~> 3.1, >= 3.1.4) appraisal2-rubocop (~> 1.0, >= 1.0.0) + 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! @@ -562,8 +655,10 @@ DEPENDENCIES erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) + go-merge! irb (~> 1.17) json-merge! + kettle-drift (~> 1.0, >= 1.0.5) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.0) kettle-test (~> 2.0, >= 2.0.11) @@ -574,6 +669,8 @@ DEPENDENCIES markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! prism-merge! psych-merge! rake (~> 13.0) @@ -590,12 +687,15 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0, >= 3.0.6) ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (~> 1.54, >= 1.54.0) stone_checksums (~> 1.0, >= 1.0.6) stringio (>= 3.0) toml-merge! tree_haver! turbo_tests2 (~> 3.1, >= 3.1.14) + typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.3) yaml-merge! @@ -605,6 +705,7 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.3) yard-yaml (~> 0.2, >= 0.2.3) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -616,10 +717,13 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 @@ -646,12 +750,14 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (3.0.0) sha256=4d3ed6c714cb88cf148f65934c6a96c976b2281abb3ae443ad0ddf6ac0da875b @@ -674,6 +780,8 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 @@ -724,6 +832,7 @@ 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 @@ -731,6 +840,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.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -745,12 +855,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) sha256=ad6743a373eeac954c1b659b17af3aff1c82918b3ce9c9dc572a7c70ff843cdd tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -764,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 364b9ea4cf93b88b234f1e94c15a97230702a4c5 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 17:41:58 -0600 Subject: [PATCH 037/347] =?UTF-8?q?=F0=9F=99=88=20Ignore=20local=20TreeHav?= =?UTF-8?q?er=20migration=20plan?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 86fa757a6..1fedf56a6 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ *.rbc *.rspec_status /.DS_Store +TREE_HAVER_PLAN.md From 9e4a755608a7655aed467d14fc9c3f481a5604e9 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 17:50:41 -0600 Subject: [PATCH 038/347] =?UTF-8?q?=F0=9F=A7=AD=20Guard=20TreeHaver=20pars?= =?UTF-8?q?er=20bypass=20debt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- spec/architecture/tree_haver_only_spec.rb | 78 +++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 spec/architecture/tree_haver_only_spec.rb diff --git a/spec/architecture/tree_haver_only_spec.rb b/spec/architecture/tree_haver_only_spec.rb new file mode 100644 index 000000000..769f76c48 --- /dev/null +++ b/spec/architecture/tree_haver_only_spec.rb @@ -0,0 +1,78 @@ +# frozen_string_literal: true + +require 'pathname' +require 'set' + +RSpec.describe 'TreeHaver-only merge architecture' do + ROOT = Pathname.new(__dir__).join('..', '..').expand_path + + PARSER_BYPASS_PATTERN = / + TreeHaver\.(?:parse_with_language_pack|process_with_language_pack|parse_with_citrus|parse_with_parslet) | + Json::Merge::SyntheticParser | + (? Date: Sat, 18 Jul 2026 17:56:17 -0600 Subject: [PATCH 039/347] =?UTF-8?q?=F0=9F=8C=B3=20Add=20TreeHaver=20TSLP?= =?UTF-8?q?=20backend=20scaffold?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/tree_haver/lib/tree_haver.rb | 3 + .../lib/tree_haver/backends/tslp.rb | 150 ++++++++++++++++++ .../lib/tree_haver/language_pack.rb | 2 +- gems/tree_haver/spec/backends/tslp_spec.rb | 64 ++++++++ 4 files changed, 218 insertions(+), 1 deletion(-) create mode 100644 gems/tree_haver/lib/tree_haver/backends/tslp.rb create mode 100644 gems/tree_haver/spec/backends/tslp_spec.rb diff --git a/gems/tree_haver/lib/tree_haver.rb b/gems/tree_haver/lib/tree_haver.rb index 8844e09ea..17cb26c39 100644 --- a/gems/tree_haver/lib/tree_haver.rb +++ b/gems/tree_haver/lib/tree_haver.rb @@ -32,6 +32,7 @@ class BackendConflict < Error; end require_relative 'tree_haver/backends/ffi' require_relative 'tree_haver/backends/rust' require_relative 'tree_haver/backends/java' +require_relative 'tree_haver/backends/tslp' require_relative 'tree_haver/grammar_finder' require_relative 'tree_haver/citrus_grammar_finder' require_relative 'tree_haver/parslet_grammar_finder' @@ -477,6 +478,8 @@ def backend_module_for(backend_name) Backends::FFI when :java Backends::Java + when :tslp, :"kreuzberg-language-pack" + Backends::Tslp when :citrus Backends::Citrus when :parslet diff --git a/gems/tree_haver/lib/tree_haver/backends/tslp.rb b/gems/tree_haver/lib/tree_haver/backends/tslp.rb new file mode 100644 index 000000000..e8b0eadd6 --- /dev/null +++ b/gems/tree_haver/lib/tree_haver/backends/tslp.rb @@ -0,0 +1,150 @@ +# frozen_string_literal: true + +module TreeHaver + module Backends + # TSLP backend using tree_sitter_language_pack's parser API. + # + # This backend intentionally requires the real parser API. The language-pack + # process API is not a TreeHaver parser backend and must not be used as a + # merge-gem integration surface. + module Tslp + @load_attempted = false + @loaded = false + @unavailable_reason = nil + + class << self + attr_reader :unavailable_reason + + def available? + return @loaded if @load_attempted + + @load_attempted = true + begin + require 'tree_sitter_language_pack' + @loaded = parser_api_available? + @unavailable_reason = 'tree_sitter_language_pack parser API is not exposed' unless @loaded + rescue LoadError => e + @loaded = false + @unavailable_reason = e.message + rescue StandardError => e + @loaded = false + @unavailable_reason = e.message + end + @loaded + end + + def reset! + @load_attempted = false + @loaded = false + @unavailable_reason = nil + end + + def capabilities + return {} unless available? + + { + backend: :tslp, + query: false, + bytes_field: true, + incremental: false, + comment_support: :nodes_only, + language_pack: true + } + end + + private + + def parser_api_available? + return false unless defined?(::TreeSitterLanguagePack::Parser) + + parser = ::TreeSitterLanguagePack::Parser.new + parser.respond_to?(:set_language) && parser.respond_to?(:parse) + rescue StandardError => e + @unavailable_reason = e.message + false + end + end + + class Language < TreeHaver::Base::Language + def initialize(name) + super(name.to_sym, backend: :tslp, options: {}) + end + + class << self + def from_library(_path = nil, symbol: nil, name: nil) # rubocop:disable Lint/UnusedMethodArgument + new(name || :unknown) + end + end + end + + class Parser < TreeHaver::Base::Parser + def parse(source) + raise TreeHaver::NotAvailable, unavailable_message unless Tslp.available? + raise TreeHaver::NotAvailable, 'TSLP language is not set' unless language + + parser = ::TreeSitterLanguagePack::Parser.new + parser.set_language(language.name.to_s) + raw_tree = parser.parse(source) + raise TreeHaver::NotAvailable, "TSLP did not return a parse tree for #{language.name}" unless raw_tree + + Tree.new(raw_tree, source: source) + end + + private + + def unavailable_message + reason = Tslp.unavailable_reason + detail = reason.to_s.empty? ? 'unknown reason' : reason + "tree_sitter_language_pack parser API is unavailable: #{detail}" + end + end + + class Tree < TreeHaver::Base::Tree + def root_node + Node.new(inner_tree.root_node, source: source, lines: lines) + end + end + + class Node < TreeHaver::Base::Node + def type + inner_node.kind + end + + def start_byte + inner_node.start_byte + end + + def end_byte + inner_node.end_byte + end + + def children + Array.new(inner_node.child_count) do |index| + child = inner_node.child(index) + child && self.class.new(child, source: source, lines: lines) + end.compact + end + + def named? + inner_node.is_named + end + + def has_error? + inner_node.has_error + end + + def error? + inner_node.is_error + end + + def missing? + inner_node.is_missing + end + + def extra? + inner_node.is_extra + end + end + end + end +end diff --git a/gems/tree_haver/lib/tree_haver/language_pack.rb b/gems/tree_haver/lib/tree_haver/language_pack.rb index 45b4657e2..b26b879e9 100644 --- a/gems/tree_haver/lib/tree_haver/language_pack.rb +++ b/gems/tree_haver/lib/tree_haver/language_pack.rb @@ -18,7 +18,7 @@ module TreeHaver BackendRegistry.register(TSLP_BACKEND) BackendRegistry.register(KREUZBERG_LANGUAGE_PACK_BACKEND) BackendRegistry.register_availability_checker(:tslp) do - defined?(TreeSitterLanguagePack) && TreeSitterLanguagePack.respond_to?(:process) + Backends::Tslp.available? end BackendRegistry.register_availability_checker(:"kreuzberg-language-pack") do BackendRegistry.available?(:tslp) diff --git a/gems/tree_haver/spec/backends/tslp_spec.rb b/gems/tree_haver/spec/backends/tslp_spec.rb new file mode 100644 index 000000000..484369571 --- /dev/null +++ b/gems/tree_haver/spec/backends/tslp_spec.rb @@ -0,0 +1,64 @@ +# frozen_string_literal: true + +require_relative '../spec_helper' + +RSpec.describe TreeHaver::Backends::Tslp do + before do + described_class.reset! + end + + it 'reports availability only when tree_sitter_language_pack exposes a parser API' do + stub_const('TreeSitterLanguagePack', Module.new) + parser_class = Class.new do + def set_language(_name); end + + def parse(_source) + :tree + end + end + TreeSitterLanguagePack.const_set(:Parser, parser_class) + + expect(described_class.available?).to be(true) + end + + it 'fails closed when the installed language pack does not expose parser methods' do + stub_const('TreeSitterLanguagePack', Module.new) + parser_class = Class.new + TreeSitterLanguagePack.const_set(:Parser, parser_class) + + expect(described_class.available?).to be(false) + expect(described_class.unavailable_reason).to eq('tree_sitter_language_pack parser API is not exposed') + end + + it 'parses through the language-pack parser API when available' do + raw_node = instance_double( + 'TreeSitterLanguagePack::Node', + kind: 'document', + start_byte: 0, + end_byte: 9, + child_count: 0, + is_named: true, + has_error: false, + is_error: false, + is_missing: false, + is_extra: false + ) + raw_tree = instance_double('TreeSitterLanguagePack::Tree', root_node: raw_node) + parser = double( + 'TreeSitterLanguagePack::Parser', + set_language: nil, + parse: raw_tree + ) + parser_class = double('TreeSitterLanguagePack::Parser', new: parser) + stub_const('TreeSitterLanguagePack', Module.new) + TreeSitterLanguagePack.const_set(:Parser, parser_class) + + tree_haver_parser = described_class::Parser.new + tree_haver_parser.language = described_class::Language.new(:toml) + tree = tree_haver_parser.parse("title = 1\n") + + expect(parser).to have_received(:set_language).with('toml') + expect(parser).to have_received(:parse).with("title = 1\n") + expect(tree.root_node.type).to eq('document') + end +end From 8c508f9993b695dc30d3191e587d3cb6f2c88940 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 17:57:26 -0600 Subject: [PATCH 040/347] =?UTF-8?q?=F0=9F=A7=8A=20Register=20TSLP=20gramma?= =?UTF-8?q?rs=20without=20cache=20paths?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lib/tree_haver/grammar_finder.rb | 28 +++++++++++++++ gems/tree_haver/spec/grammar_finder_spec.rb | 35 +++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 gems/tree_haver/spec/grammar_finder_spec.rb diff --git a/gems/tree_haver/lib/tree_haver/grammar_finder.rb b/gems/tree_haver/lib/tree_haver/grammar_finder.rb index 7c716e154..6c474c4c2 100644 --- a/gems/tree_haver/lib/tree_haver/grammar_finder.rb +++ b/gems/tree_haver/lib/tree_haver/grammar_finder.rb @@ -245,6 +245,8 @@ def find_library_path_safe # # @return [Boolean] true if the library can be found AND tree-sitter runtime works def available? + return true if tree_sitter_language_pack_parser_available? + path = find_library_path return false if path.nil? @@ -316,6 +318,16 @@ def available_safe? # @return [Boolean] true if registration succeeded # @raise [NotAvailable] if library not found and raise_on_missing is true def register!(raise_on_missing: false) + if tree_sitter_language_pack_parser_available? + TreeHaver.register_language( + @language_name, + backend_module: TreeHaver::Backends::Tslp, + backend_type: :tslp, + gem_name: 'tree_sitter_language_pack' + ) + return true + end + path = find_library_path unless path raise NotAvailable, not_found_message if raise_on_missing @@ -413,6 +425,22 @@ def tree_sitter_language_pack_path end end + def tree_sitter_language_pack_parser_available? + return @tree_sitter_language_pack_parser_available if defined?(@tree_sitter_language_pack_parser_available) + + @tree_sitter_language_pack_parser_available = begin + require 'tree_sitter_language_pack' + TreeHaver::Backends::Tslp.available? && + TreeSitterLanguagePack.respond_to?(:has_language) && + TreeSitterLanguagePack.has_language(@language_name.to_s) + rescue LoadError + false + rescue StandardError => e + @tree_sitter_language_pack_rejection_reason = e.message + false + end + end + def tree_sitter_language_pack_cache_dir return @tree_sitter_language_pack_cache_dir if defined?(@tree_sitter_language_pack_cache_dir) diff --git a/gems/tree_haver/spec/grammar_finder_spec.rb b/gems/tree_haver/spec/grammar_finder_spec.rb new file mode 100644 index 000000000..61ac4345f --- /dev/null +++ b/gems/tree_haver/spec/grammar_finder_spec.rb @@ -0,0 +1,35 @@ +# frozen_string_literal: true + +require_relative 'spec_helper' + +RSpec.describe TreeHaver::GrammarFinder do + describe '#available?' do + it 'uses the TSLP parser backend without requiring a cached shared library' do + stub_const('TreeSitterLanguagePack', Module.new) + allow(TreeSitterLanguagePack).to receive(:has_language).with('cold_cache_toml').and_return(true) + allow(TreeHaver::Backends::Tslp).to receive(:available?).and_return(true) + + finder = described_class.new(:cold_cache_toml) + + expect(finder).to be_available + end + end + + describe '#register!' do + it 'registers a TSLP backend module when the language pack parser is available' do + stub_const('TreeSitterLanguagePack', Module.new) + allow(TreeSitterLanguagePack).to receive(:has_language).with('cold_cache_json').and_return(true) + allow(TreeHaver::Backends::Tslp).to receive(:available?).and_return(true) + + finder = described_class.new(:cold_cache_json) + + expect(finder.register!).to be(true) + expect(TreeHaver.registered_languages(:cold_cache_json)).to include( + tslp: include( + backend_module: TreeHaver::Backends::Tslp, + gem_name: 'tree_sitter_language_pack' + ) + ) + end + end +end From 26ca7959caaa39842bdc5ce257d31eec47698bbd Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 17:58:54 -0600 Subject: [PATCH 041/347] =?UTF-8?q?=F0=9F=A7=B9=20Remove=20JSON=20syntheti?= =?UTF-8?q?c=20parser=20fallback?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/json-merge/lib/json/merge.rb | 1 - .../lib/json/merge/file_analysis.rb | 23 +- .../lib/json/merge/synthetic_parser.rb | 223 ------------------ .../spec/fixtures_integration_spec.rb | 7 +- spec/architecture/tree_haver_only_spec.rb | 3 - 5 files changed, 13 insertions(+), 244 deletions(-) delete mode 100644 gems/json-merge/lib/json/merge/synthetic_parser.rb diff --git a/gems/json-merge/lib/json/merge.rb b/gems/json-merge/lib/json/merge.rb index 2151c8871..bbb1a18fb 100644 --- a/gems/json-merge/lib/json/merge.rb +++ b/gems/json-merge/lib/json/merge.rb @@ -41,7 +41,6 @@ class CorruptionDetectedError < Error; end autoload :NodeWrapper, 'json/merge/node_wrapper' autoload :ConflictResolver, 'json/merge/conflict_resolver' autoload :SmartMerger, 'json/merge/smart_merger' - autoload :SyntheticParser, 'json/merge/synthetic_parser' autoload :ObjectMatchRefiner, 'json/merge/object_match_refiner' class << self diff --git a/gems/json-merge/lib/json/merge/file_analysis.rb b/gems/json-merge/lib/json/merge/file_analysis.rb index 2f0a07a14..602851804 100644 --- a/gems/json-merge/lib/json/merge/file_analysis.rb +++ b/gems/json-merge/lib/json/merge/file_analysis.rb @@ -22,7 +22,7 @@ def initialize(source, freeze_token: DEFAULT_FREEZE_TOKEN, signature_generator: @lines = source.lines.map(&:chomp) @freeze_token = freeze_token @signature_generator = signature_generator - @parser_path = parser_path || self.class.find_parser_path + @parser_path = parser_path @errors = [] @comment_tracker = CommentTracker.new(source) @@ -202,25 +202,20 @@ def root_merge_node def parse_json # TreeHaver handles backend selection against the grammar Json::Merge # has already registered during bootstrap. - parser = TreeHaver.parser_for(:json, library_path: @parser_path) + parser = if @parser_path + TreeHaver.parser_for(:json, library_path: @parser_path) + else + TreeHaver.parser_for(:json) + end @ast = parser.parse(@source) collect_parse_errors(@ast.root_node) if @ast&.root_node - parse_synthetic_json(@errors.dup) unless @errors.empty? rescue TreeHaver::Error => e - parse_synthetic_json(e) + @errors << e + @ast = nil rescue StandardError => e - parse_synthetic_json(e) - end - - def parse_synthetic_json(original_error) - normalized = Json::Merge.send(:strip_json_comments, @source) - JSON.parse(Json::Merge.send(:strip_trailing_commas, normalized)) - @errors = [] - @ast = SyntheticParser.new(@source).parse - rescue StandardError - @errors.concat(Array(original_error)) + @errors << e @ast = nil end diff --git a/gems/json-merge/lib/json/merge/synthetic_parser.rb b/gems/json-merge/lib/json/merge/synthetic_parser.rb deleted file mode 100644 index 7f7c35d07..000000000 --- a/gems/json-merge/lib/json/merge/synthetic_parser.rb +++ /dev/null @@ -1,223 +0,0 @@ -# frozen_string_literal: true - -module Json - module Merge - class SyntheticParser - Point = Struct.new(:row, :column, keyword_init: true) do - def [](key) - public_send(key) - end - end - - class Tree - attr_reader :root_node - - def initialize(root_node) - @root_node = root_node - end - end - - class Node - attr_reader :type, :start_byte, :end_byte, :source - attr_accessor :parent - - def initialize(type, start_byte:, end_byte:, source:, children: [], fields: {}) - @type = type.to_s - @start_byte = start_byte - @end_byte = end_byte - @source = source - @children = children - @fields = fields - @children.each { |child| child.parent = self } - @fields.each_value { |child| child.parent = self } - end - - def each(&block) - return @children.each unless block - - @children.each(&block) - end - - def child_by_field_name(name) - @fields[name.to_s] - end - - def text - @source.byteslice(@start_byte...@end_byte).to_s - end - alias to_s text - - def start_point - point_for(@start_byte) - end - - def end_point - point_for(@end_byte) - end - - def missing? - false - end - - def has_error? - false - end - - private - - def point_for(byte) - prefix = @source.byteslice(0...byte).to_s - lines = prefix.split("\n", -1) - Point.new(row: lines.length - 1, column: lines.last.to_s.bytesize) - end - end - - def initialize(source) - @source = source - @index = 0 - end - - def parse - skip_ignored - value = parse_value - skip_ignored - Tree.new(Node.new('document', start_byte: 0, end_byte: @source.bytesize, source: @source, children: [value])) - end - - private - - def parse_value - skip_ignored - case current_char - when '{' - parse_object - when '[' - parse_array - when '"' - parse_string - when 't' - parse_literal('true') - when 'f' - parse_literal('false') - when 'n' - parse_literal('null') - else - parse_number - end - end - - def parse_object - start = @index - @index += 1 - pairs = [] - loop do - skip_ignored - break if consume?('}') - - pairs << parse_pair - skip_ignored - consume?(',') - end - Node.new('object', start_byte: start, end_byte: @index, source: @source, children: pairs) - end - - def parse_pair - start = @index - key = parse_string - skip_ignored - consume?(':') - value = parse_value - Node.new( - 'pair', - start_byte: start, - end_byte: value.end_byte, - source: @source, - children: [key, value], - fields: { 'key' => key, 'value' => value } - ) - end - - def parse_array - start = @index - @index += 1 - elements = [] - loop do - skip_ignored - break if consume?(']') - - elements << parse_value - skip_ignored - consume?(',') - end - Node.new('array', start_byte: start, end_byte: @index, source: @source, children: elements) - end - - def parse_string - start = @index - @index += 1 - escaped = false - while @index < @source.bytesize - char = current_char - @index += 1 - if escaped - escaped = false - elsif char == '\\' - escaped = true - elsif char == '"' - break - end - end - Node.new('string', start_byte: start, end_byte: @index, source: @source) - end - - def parse_number - start = @index - @index += 1 while @index < @source.bytesize && current_char.match?(/[0-9eE+\-.]/) - Node.new('number', start_byte: start, end_byte: @index, source: @source) - end - - def parse_literal(literal) - start = @index - @index += literal.bytesize - Node.new(literal, start_byte: start, end_byte: @index, source: @source) - end - - def skip_ignored - loop do - skip_whitespace - if current_char == '/' && peek_char == '/' - @index += 2 - @index += 1 while @index < @source.bytesize && current_char != "\n" - next - end - if current_char == '/' && peek_char == '*' - @index += 2 - @index += 1 while @index < @source.bytesize && !(current_char == '*' && peek_char == '/') - @index += 2 if @index < @source.bytesize - next - end - break - end - end - - def skip_whitespace - @index += 1 while @index < @source.bytesize && current_char.match?(/\s/) - end - - def consume?(char) - return false unless current_char == char - - @index += 1 - true - end - - def current_char - @source.byteslice(@index, 1) - end - - def peek_char - @source.byteslice(@index + 1, 1) - end - end - end -end diff --git a/gems/json-merge/spec/fixtures_integration_spec.rb b/gems/json-merge/spec/fixtures_integration_spec.rb index 8196ce0bd..89e14b835 100644 --- a/gems/json-merge/spec/fixtures_integration_spec.rb +++ b/gems/json-merge/spec/fixtures_integration_spec.rb @@ -47,7 +47,7 @@ def json_ready(value) expect(json_ready(result[:diagnostics])).to eq(json_ready(fixture.dig(:expected, :diagnostics))) end - it 'analyzes devcontainer-style JSONC with comments and trailing commas through the synthetic fallback' do + it 'fails closed for JSONC analysis when no TreeHaver JSON backend is available' do source = <<~JSON { // devcontainer files commonly use JSONC comments. @@ -62,8 +62,9 @@ def json_ready(value) analysis = described_class::FileAnalysis.new(source) - expect(analysis).to be_valid - expect(analysis.root_object).not_to be_nil + expect(analysis).not_to be_valid + expect(analysis.root_object).to be_nil + expect(analysis.errors).not_to be_empty end it 'conforms to the structure fixtures' do diff --git a/spec/architecture/tree_haver_only_spec.rb b/spec/architecture/tree_haver_only_spec.rb index 769f76c48..2e904b502 100644 --- a/spec/architecture/tree_haver_only_spec.rb +++ b/spec/architecture/tree_haver_only_spec.rb @@ -24,9 +24,6 @@ "gems/go-merge/lib/go/merge.rb:processed = TreeHaver.process_with_language_pack(TreeHaver::ProcessRequest.new(source: source, language: 'go'))", "gems/json-merge/lib/json/merge.rb:backend_result = TreeHaver.parse_with_language_pack(json_parse_request(source, dialect))", "gems/json-merge/lib/json/merge.rb:parsed = JSON.parse(normalized_source)", - "gems/json-merge/lib/json/merge/file_analysis.rb:JSON.parse(Json::Merge.send(:strip_trailing_commas, normalized))", - "gems/json-merge/lib/json/merge/file_analysis.rb:@ast = SyntheticParser.new(@source).parse", - "gems/json-merge/lib/json/merge/synthetic_parser.rb:class SyntheticParser", "gems/markdown-merge/lib/markdown/merge.rb:syntax = TreeHaver.parse_with_language_pack(", "gems/parslet-toml-merge/lib/parslet/toml/merge.rb:syntax_result = TreeHaver.parse_with_parslet(source, grammar_class: TOML::Parslet)", "gems/psych-merge/lib/psych/merge.rb:parsed = YAML.safe_load(source, permitted_classes: [], aliases: false)", From 500335f30017d982127bb548b99018d67fd272f3 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 17:59:57 -0600 Subject: [PATCH 042/347] =?UTF-8?q?=F0=9F=9A=AB=20Remove=20JSON=20language?= =?UTF-8?q?-pack=20parse=20helper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/json-merge/lib/json/merge.rb | 13 ------------- gems/json-merge/spec/fixtures_integration_spec.rb | 13 +------------ spec/architecture/tree_haver_only_spec.rb | 1 - 3 files changed, 1 insertion(+), 26 deletions(-) diff --git a/gems/json-merge/lib/json/merge.rb b/gems/json-merge/lib/json/merge.rb index bbb1a18fb..c3748e18a 100644 --- a/gems/json-merge/lib/json/merge.rb +++ b/gems/json-merge/lib/json/merge.rb @@ -66,19 +66,6 @@ def json_feature_profile } end - def json_parse_request(source, dialect) - TreeHaver::ParserRequest.new(source: source, language: 'json', dialect: dialect) - end - - def parse_json_with_language_pack(source, dialect) - return unsupported_jsonc_language_pack_result if dialect != 'json' - - backend_result = TreeHaver.parse_with_language_pack(json_parse_request(source, dialect)) - return { ok: false, diagnostics: backend_result[:diagnostics] } unless backend_result[:ok] - - parse_json(source, dialect) - end - def parse_json(source, dialect) normalized_source = dialect == 'jsonc' ? strip_json_comments(source) : source allows_comments = dialect == 'jsonc' diff --git a/gems/json-merge/spec/fixtures_integration_spec.rb b/gems/json-merge/spec/fixtures_integration_spec.rb index 89e14b835..bc739d09d 100644 --- a/gems/json-merge/spec/fixtures_integration_spec.rb +++ b/gems/json-merge/spec/fixtures_integration_spec.rb @@ -178,18 +178,7 @@ def json_ready(value) JSON end - it 'conforms to the language-pack adapter fixture and shared family feature profile fixture' do - adapter_fixture = json_fixture('tree_sitter_adapter') - adapter_fixture[:cases].each do |test_case| - result = described_class.parse_json_with_language_pack(test_case[:source], test_case[:dialect]) - expect(result[:ok]).to eq(test_case.dig(:expected, :ok)) - expect( - json_ready(Array(result[:diagnostics]).map { |diagnostic| diagnostic.slice(:severity, :category) }) - ).to eq(json_ready(test_case.dig(:expected, :diagnostics).map { |diagnostic| - diagnostic.slice(:severity, :category) - })) - end - + it 'conforms to the shared family feature profile fixture' do expect(json_ready(described_class.json_feature_profile)).to eq(json_ready(family_profile_fixture[:feature_profile])) end end diff --git a/spec/architecture/tree_haver_only_spec.rb b/spec/architecture/tree_haver_only_spec.rb index 2e904b502..6f63009c8 100644 --- a/spec/architecture/tree_haver_only_spec.rb +++ b/spec/architecture/tree_haver_only_spec.rb @@ -22,7 +22,6 @@ "gems/citrus-toml-merge/lib/citrus/toml/merge.rb:syntax_result = TreeHaver.parse_with_citrus(source, grammar_module: TomlRB::Document)", "gems/go-merge/lib/go/merge.rb:parsed = TreeHaver.parse_with_language_pack(TreeHaver::ParserRequest.new(source: source, language: 'go',", "gems/go-merge/lib/go/merge.rb:processed = TreeHaver.process_with_language_pack(TreeHaver::ProcessRequest.new(source: source, language: 'go'))", - "gems/json-merge/lib/json/merge.rb:backend_result = TreeHaver.parse_with_language_pack(json_parse_request(source, dialect))", "gems/json-merge/lib/json/merge.rb:parsed = JSON.parse(normalized_source)", "gems/markdown-merge/lib/markdown/merge.rb:syntax = TreeHaver.parse_with_language_pack(", "gems/parslet-toml-merge/lib/parslet/toml/merge.rb:syntax_result = TreeHaver.parse_with_parslet(source, grammar_class: TOML::Parslet)", From 022a2f607b76280a9c58a17c5cce7b690e0f9b54 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 18:19:32 -0600 Subject: [PATCH 043/347] =?UTF-8?q?=F0=9F=9A=A7=20Route=20source-family=20?= =?UTF-8?q?parsing=20through=20TreeHaver?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/go-merge/lib/go/merge.rb | 69 +++++++++---------- gems/rust-merge/lib/rust/merge.rb | 63 ++++++++--------- gems/typescript-merge/lib/typescript/merge.rb | 63 ++++++++--------- .../source_family_tree_haver_spec.rb | 43 ++++++++++++ spec/architecture/tree_haver_only_spec.rb | 6 -- 5 files changed, 140 insertions(+), 104 deletions(-) create mode 100644 spec/architecture/source_family_tree_haver_spec.rb diff --git a/gems/go-merge/lib/go/merge.rb b/gems/go-merge/lib/go/merge.rb index 7f7079660..e28b0b766 100644 --- a/gems/go-merge/lib/go/merge.rb +++ b/gems/go-merge/lib/go/merge.rb @@ -13,6 +13,18 @@ module Merge PACKAGE_NAME = 'go-merge' TREE_SITTER_BACKEND = TreeHaver::KREUZBERG_LANGUAGE_PACK_BACKEND DESTINATION_WINS_ARRAY_POLICY = { surface: 'array', name: 'destination_wins_array' }.freeze + BACKEND_REGISTRY = Struct.new(:registered, :mutex).new(false, Mutex.new) + + def register_backend! + BACKEND_REGISTRY.mutex.synchronize do + return if BACKEND_REGISTRY.registered + + grammar_finder = TreeHaver::GrammarFinder.new(:go) + grammar_finder.register! if grammar_finder.available? + + BACKEND_REGISTRY.registered = true + end + end def go_feature_profile { family: 'go', supported_dialects: ['go'], supported_policies: [DESTINATION_WINS_ARRAY_POLICY] } @@ -92,46 +104,29 @@ def merge_go(template_source, destination_source, dialect) end def analyze_go_module(source) - parsed = TreeHaver.parse_with_language_pack(TreeHaver::ParserRequest.new(source: source, language: 'go', - dialect: 'go')) - return { ok: false, diagnostics: parsed[:diagnostics], policies: [] } unless parsed[:ok] - - processed = TreeHaver.process_with_language_pack(TreeHaver::ProcessRequest.new(source: source, language: 'go')) - return { ok: false, diagnostics: processed[:diagnostics], policies: [] } unless processed[:ok] - - deduped_imports = {} - processed[:analysis].imports.each do |item| - match_key = normalize_go_import_path(item.source) - candidate = { path: nil, match_key: match_key, text: import_text(source, item.span) } - current = deduped_imports[match_key] - deduped_imports[match_key] = candidate if current.nil? || candidate[:text].length > current[:text].length - end - imports = deduped_imports.values.each_with_index.map { |item, index| item.merge(path: "/imports/#{index}") } - declarations = processed[:analysis].structure - .select { |item| item.name } - .map do |item| - { path: "/declarations/#{item.name}", match_key: item.name, - text: declaration_text(source, item.span) } - end - .sort_by { |item| item[:path] } + parser = TreeHaver.parser_for(:go) + tree = parser.parse(source) + collect_parse_errors(tree.root_node) - { - ok: true, - diagnostics: [], - analysis: { - kind: 'go', - dialect: 'go', - source: source, - owners: imports.map { |item| { path: item[:path], owner_kind: 'import', match_key: item[:match_key] } } + - declarations.map { |item| { path: item[:path], owner_kind: 'declaration', match_key: item[:match_key] } }, - imports: imports, - declarations: declarations - }, - policies: [] - } + unsupported_feature_result('Go owner extraction must be rebuilt from TreeHaver AST nodes.') + rescue TreeHaver::Error, StandardError => e + parse_failure_result(e) end private_class_method :analyze_go_module + def collect_parse_errors(node) + raise TreeHaver::NotAvailable, 'Go parse returned no root node' unless node + raise TreeHaver::NotAvailable, 'Go parse contains syntax errors' if node.respond_to?(:has_error?) && node.has_error? + end + private_class_method :collect_parse_errors + + def parse_failure_result(error) + { ok: false, + diagnostics: [{ severity: 'error', category: 'parse_error', message: error.message }], + policies: [] } + end + private_class_method :parse_failure_result + def normalize_go_import_path(import_source) match = import_source.match(/"([^"]+)"/) match ? match[1] : import_source.sub(/\Aimport\s+/, '').strip @@ -156,6 +151,8 @@ def unsupported_feature_result(message) end end +Go::Merge.register_backend! + Go::Merge::Version.class_eval do extend VersionGem::Basic end diff --git a/gems/rust-merge/lib/rust/merge.rb b/gems/rust-merge/lib/rust/merge.rb index 35ca75e9b..b8d536f1f 100644 --- a/gems/rust-merge/lib/rust/merge.rb +++ b/gems/rust-merge/lib/rust/merge.rb @@ -11,9 +11,21 @@ module Merge PACKAGE_NAME = 'rust-merge' TREE_SITTER_BACKEND = TreeHaver::KREUZBERG_LANGUAGE_PACK_BACKEND DESTINATION_WINS_ARRAY_POLICY = { surface: 'array', name: 'destination_wins_array' }.freeze + BACKEND_REGISTRY = Struct.new(:registered, :mutex).new(false, Mutex.new) module_function + def register_backend! + BACKEND_REGISTRY.mutex.synchronize do + return if BACKEND_REGISTRY.registered + + grammar_finder = TreeHaver::GrammarFinder.new(:rust) + grammar_finder.register! if grammar_finder.available? + + BACKEND_REGISTRY.registered = true + end + end + def rust_feature_profile { family: 'rust', supported_dialects: ['rust'], supported_policies: [DESTINATION_WINS_ARRAY_POLICY] } end @@ -88,41 +100,28 @@ def merge_rust(template_source, destination_source, dialect) end def analyze_rust_module(source) - parsed = TreeHaver.parse_with_language_pack(TreeHaver::ParserRequest.new(source: source, language: 'rust', - dialect: 'rust')) - return { ok: false, diagnostics: parsed[:diagnostics], policies: [] } unless parsed[:ok] + parser = TreeHaver.parser_for(:rust) + tree = parser.parse(source) + collect_parse_errors(tree.root_node) - processed = TreeHaver.process_with_language_pack(TreeHaver::ProcessRequest.new(source: source, language: 'rust')) - return { ok: false, diagnostics: processed[:diagnostics], policies: [] } unless processed[:ok] + unsupported_feature_result('Rust owner extraction must be rebuilt from TreeHaver AST nodes.') + rescue TreeHaver::Error, StandardError => e + parse_failure_result(e) + end + private_class_method :analyze_rust_module - imports = processed[:analysis].imports.each_with_index.map do |item, index| - { path: "/imports/#{index}", match_key: normalize_rust_import_path(item.source), - text: import_text(source, item.span) } - end - declarations = processed[:analysis].structure - .select { |item| item.name } - .map do |item| - { path: "/declarations/#{item.name}", match_key: item.name, - text: declaration_text(source, item.span) } - end - .sort_by { |item| item[:path] } + def collect_parse_errors(node) + raise TreeHaver::NotAvailable, 'Rust parse returned no root node' unless node + raise TreeHaver::NotAvailable, 'Rust parse contains syntax errors' if node.respond_to?(:has_error?) && node.has_error? + end + private_class_method :collect_parse_errors - { - ok: true, - diagnostics: [], - analysis: { - kind: 'rust', - dialect: 'rust', - source: source, - owners: imports.map { |item| { path: item[:path], owner_kind: 'import', match_key: item[:match_key] } } + - declarations.map { |item| { path: item[:path], owner_kind: 'declaration', match_key: item[:match_key] } }, - imports: imports, - declarations: declarations - }, - policies: [] - } + def parse_failure_result(error) + { ok: false, + diagnostics: [{ severity: 'error', category: 'parse_error', message: error.message }], + policies: [] } end - private_class_method :analyze_rust_module + private_class_method :parse_failure_result def normalize_rust_import_path(import_source) import_source.sub(/\Ause\s+/, '').sub(/;\z/, '').strip @@ -142,6 +141,8 @@ def line_anchored_slice(source, span) end end +Rust::Merge.register_backend! + Rust::Merge::Version.class_eval do extend VersionGem::Basic end diff --git a/gems/typescript-merge/lib/typescript/merge.rb b/gems/typescript-merge/lib/typescript/merge.rb index afc2711ef..bdbb2ff0c 100644 --- a/gems/typescript-merge/lib/typescript/merge.rb +++ b/gems/typescript-merge/lib/typescript/merge.rb @@ -13,6 +13,18 @@ module Merge PACKAGE_NAME = 'typescript-merge' TREE_SITTER_BACKEND = TreeHaver::KREUZBERG_LANGUAGE_PACK_BACKEND DESTINATION_WINS_ARRAY_POLICY = { surface: 'array', name: 'destination_wins_array' }.freeze + BACKEND_REGISTRY = Struct.new(:registered, :mutex).new(false, Mutex.new) + + def register_backend! + BACKEND_REGISTRY.mutex.synchronize do + return if BACKEND_REGISTRY.registered + + grammar_finder = TreeHaver::GrammarFinder.new(:typescript) + grammar_finder.register! if grammar_finder.available? + + BACKEND_REGISTRY.registered = true + end + end def type_script_feature_profile { family: 'typescript', supported_dialects: ['typescript'], supported_policies: [DESTINATION_WINS_ARRAY_POLICY] } @@ -93,41 +105,28 @@ def merge_type_script(template_source, destination_source, dialect) end def analyze_type_script_module(source) - parsed = TreeHaver.parse_with_language_pack(TreeHaver::ParserRequest.new(source: source, language: 'typescript', - dialect: 'typescript')) - return { ok: false, diagnostics: parsed[:diagnostics], policies: [] } unless parsed[:ok] + parser = TreeHaver.parser_for(:typescript) + tree = parser.parse(source) + collect_parse_errors(tree.root_node) - processed = TreeHaver.process_with_language_pack(TreeHaver::ProcessRequest.new(source: source, - language: 'typescript')) - return { ok: false, diagnostics: processed[:diagnostics], policies: [] } unless processed[:ok] + unsupported_feature_result('TypeScript owner extraction must be rebuilt from TreeHaver AST nodes.') + rescue TreeHaver::Error, StandardError => e + parse_failure_result(e) + end + private_class_method :analyze_type_script_module - imports = processed[:analysis].imports.each_with_index.map do |item, index| - { path: "/imports/#{index}", match_key: item.source, text: import_text(source, item.span) } - end - declarations = processed[:analysis].structure - .select { |item| item.name } - .map do |item| - { path: "/declarations/#{item.name}", match_key: item.name, - text: declaration_text(source, item.span) } - end - .sort_by { |item| item[:path] } + def collect_parse_errors(node) + raise TreeHaver::NotAvailable, 'TypeScript parse returned no root node' unless node + raise TreeHaver::NotAvailable, 'TypeScript parse contains syntax errors' if node.respond_to?(:has_error?) && node.has_error? + end + private_class_method :collect_parse_errors - { - ok: true, - diagnostics: [], - analysis: { - kind: 'typescript', - dialect: 'typescript', - source: source, - owners: imports.map { |item| { path: item[:path], owner_kind: 'import', match_key: item[:match_key] } } + - declarations.map { |item| { path: item[:path], owner_kind: 'declaration', match_key: item[:match_key] } }, - imports: imports, - declarations: declarations - }, - policies: [] - } + def parse_failure_result(error) + { ok: false, + diagnostics: [{ severity: 'error', category: 'parse_error', message: error.message }], + policies: [] } end - private_class_method :analyze_type_script_module + private_class_method :parse_failure_result def import_text(source, span) "#{slice_span(source, span)}\n" @@ -158,6 +157,8 @@ def unsupported_feature_result(message) end end +TypeScript::Merge.register_backend! + TypeScript::Merge::Version.class_eval do extend VersionGem::Basic end diff --git a/spec/architecture/source_family_tree_haver_spec.rb b/spec/architecture/source_family_tree_haver_spec.rb new file mode 100644 index 000000000..2d82e0fc9 --- /dev/null +++ b/spec/architecture/source_family_tree_haver_spec.rb @@ -0,0 +1,43 @@ +# frozen_string_literal: true + +require_relative '../../gems/go-merge/lib/go/merge' +require_relative '../../gems/rust-merge/lib/rust/merge' +require_relative '../../gems/typescript-merge/lib/typescript/merge' + +RSpec.describe 'source-family TreeHaver parsing' do + before do + allow(TreeHaver).to receive(:parser_for) do |language_name| + raise TreeHaver::NotAvailable, "No parser registered for #{language_name}" + end + end + + it 'fails closed through TreeHaver when Go has no registered parser' do + result = Go::Merge.parse_go("package main\n", 'go') + + expect(TreeHaver).to have_received(:parser_for).with(:go) + expect(result[:ok]).to be(false) + expect(result[:diagnostics]).to include( + include(severity: 'error', category: 'parse_error', message: include('No parser registered for go')) + ) + end + + it 'fails closed through TreeHaver when Rust has no registered parser' do + result = Rust::Merge.parse_rust("fn main() {}\n", 'rust') + + expect(TreeHaver).to have_received(:parser_for).with(:rust) + expect(result[:ok]).to be(false) + expect(result[:diagnostics]).to include( + include(severity: 'error', category: 'parse_error', message: include('No parser registered for rust')) + ) + end + + it 'fails closed through TreeHaver when TypeScript has no registered parser' do + result = TypeScript::Merge.parse_type_script("export const x = 1;\n", 'typescript') + + expect(TreeHaver).to have_received(:parser_for).with(:typescript) + expect(result[:ok]).to be(false) + expect(result[:diagnostics]).to include( + include(severity: 'error', category: 'parse_error', message: include('No parser registered for typescript')) + ) + end +end diff --git a/spec/architecture/tree_haver_only_spec.rb b/spec/architecture/tree_haver_only_spec.rb index 6f63009c8..a158f30da 100644 --- a/spec/architecture/tree_haver_only_spec.rb +++ b/spec/architecture/tree_haver_only_spec.rb @@ -20,22 +20,16 @@ [ "gems/bash-merge/lib/bash/merge.rb:result = TreeHaver.process_with_language_pack(", "gems/citrus-toml-merge/lib/citrus/toml/merge.rb:syntax_result = TreeHaver.parse_with_citrus(source, grammar_module: TomlRB::Document)", - "gems/go-merge/lib/go/merge.rb:parsed = TreeHaver.parse_with_language_pack(TreeHaver::ParserRequest.new(source: source, language: 'go',", - "gems/go-merge/lib/go/merge.rb:processed = TreeHaver.process_with_language_pack(TreeHaver::ProcessRequest.new(source: source, language: 'go'))", "gems/json-merge/lib/json/merge.rb:parsed = JSON.parse(normalized_source)", "gems/markdown-merge/lib/markdown/merge.rb:syntax = TreeHaver.parse_with_language_pack(", "gems/parslet-toml-merge/lib/parslet/toml/merge.rb:syntax_result = TreeHaver.parse_with_parslet(source, grammar_class: TOML::Parslet)", "gems/psych-merge/lib/psych/merge.rb:parsed = YAML.safe_load(source, permitted_classes: [], aliases: false)", "gems/ruby-merge/lib/ruby/merge.rb:process = TreeHaver.process_with_language_pack(request)", "gems/ruby-merge/lib/ruby/merge.rb:syntax = TreeHaver.parse_with_language_pack(request)", - "gems/rust-merge/lib/rust/merge.rb:parsed = TreeHaver.parse_with_language_pack(TreeHaver::ParserRequest.new(source: source, language: 'rust',", - "gems/rust-merge/lib/rust/merge.rb:processed = TreeHaver.process_with_language_pack(TreeHaver::ProcessRequest.new(source: source, language: 'rust'))", "gems/toml-merge/lib/toml/merge.rb:grammar_class: TOML::Parslet,", "gems/toml-merge/lib/toml/merge.rb:grammar_module: TomlRB::Document,", "gems/toml-merge/lib/toml/merge.rb:return unless defined?(TOML::Parslet)", "gems/toml-merge/lib/toml/merge.rb:return unless defined?(TomlRB::Document)", - "gems/typescript-merge/lib/typescript/merge.rb:parsed = TreeHaver.parse_with_language_pack(TreeHaver::ParserRequest.new(source: source, language: 'typescript',", - "gems/typescript-merge/lib/typescript/merge.rb:processed = TreeHaver.process_with_language_pack(TreeHaver::ProcessRequest.new(source: source,", "gems/yaml-merge/lib/yaml/merge.rb:destination_document = YAML.safe_load(destination.dig(:analysis, :normalized_source), permitted_classes: [],", "gems/yaml-merge/lib/yaml/merge.rb:parsed = YAML.safe_load(source, permitted_classes: [], aliases: false)", "gems/yaml-merge/lib/yaml/merge.rb:syntax_result = TreeHaver.parse_with_language_pack(", From 2d9e2325554b383811930be5020a6dc45f4d2f7e Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 18:21:08 -0600 Subject: [PATCH 044/347] =?UTF-8?q?=F0=9F=A7=AD=20Route=20Bash=20availabil?= =?UTF-8?q?ity=20through=20TreeHaver=20parser?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/bash-merge/lib/bash/merge.rb | 24 +++++------------------ gems/bash-merge/spec/bash/merge_spec.rb | 3 +-- spec/architecture/tree_haver_only_spec.rb | 1 - 3 files changed, 6 insertions(+), 22 deletions(-) diff --git a/gems/bash-merge/lib/bash/merge.rb b/gems/bash-merge/lib/bash/merge.rb index 5162a23d1..9838b71b3 100644 --- a/gems/bash-merge/lib/bash/merge.rb +++ b/gems/bash-merge/lib/bash/merge.rb @@ -51,7 +51,6 @@ module Merge BACKEND_REGISTRY = Struct.new(:registered, :mutex).new(false, Mutex.new) Availability = Struct.new( :grammar_path, - :language_pack_process, :node_parser, :diagnostics, keyword_init: true @@ -139,16 +138,11 @@ def available?(source: "#!/usr/bin/env bash\necho hello\n") availability(source: source).available? end - def language_pack_process_available?(source: "#!/usr/bin/env bash\necho hello\n") - availability(source: source).language_pack_process == true - end - def availability(source: "#!/usr/bin/env bash\necho hello\n") diagnostics = [] grammar_path = bash_grammar_path(diagnostics) Availability.new( grammar_path: grammar_path, - language_pack_process: language_pack_process_available_for?(source, diagnostics), node_parser: node_parser_available_for?(source, grammar_path, diagnostics), diagnostics: diagnostics ) @@ -163,20 +157,12 @@ def bash_grammar_path(diagnostics) nil end - def language_pack_process_available_for?(source, diagnostics) - result = TreeHaver.process_with_language_pack( - TreeHaver::ProcessRequest.new(source: source, language: 'bash') - ) - ok = result[:ok] == true - diagnostics.concat(Array(result[:diagnostics])) unless ok - ok - rescue StandardError => e - diagnostics << { kind: 'bash_language_pack_unavailable', message: e.message } - false - end - def node_parser_available_for?(source, grammar_path, diagnostics) - parser = TreeHaver.parser_for(:bash, library_path: grammar_path) + parser = if grammar_path + TreeHaver.parser_for(:bash, library_path: grammar_path) + else + TreeHaver.parser_for(:bash) + end tree = parser.parse(source) !tree.nil? && !tree.root_node.nil? rescue TreeHaver::Error => e diff --git a/gems/bash-merge/spec/bash/merge_spec.rb b/gems/bash-merge/spec/bash/merge_spec.rb index 1807f3d59..e4fa190d1 100644 --- a/gems/bash-merge/spec/bash/merge_spec.rb +++ b/gems/bash-merge/spec/bash/merge_spec.rb @@ -74,10 +74,9 @@ end describe '.availability' do - it 'reports language-pack processing separately from node parser availability' do + it 'reports TreeHaver node parser availability' do availability = described_class.availability - expect(availability.language_pack_process).to eq(described_class.language_pack_process_available?) expect(availability.node_parser).to eq(described_class.available?) expect(availability.diagnostics).to be_an(Array) end diff --git a/spec/architecture/tree_haver_only_spec.rb b/spec/architecture/tree_haver_only_spec.rb index a158f30da..2a79e154d 100644 --- a/spec/architecture/tree_haver_only_spec.rb +++ b/spec/architecture/tree_haver_only_spec.rb @@ -18,7 +18,6 @@ KNOWN_PARSER_BYPASS_REFERENCES = Set.new( [ - "gems/bash-merge/lib/bash/merge.rb:result = TreeHaver.process_with_language_pack(", "gems/citrus-toml-merge/lib/citrus/toml/merge.rb:syntax_result = TreeHaver.parse_with_citrus(source, grammar_module: TomlRB::Document)", "gems/json-merge/lib/json/merge.rb:parsed = JSON.parse(normalized_source)", "gems/markdown-merge/lib/markdown/merge.rb:syntax = TreeHaver.parse_with_language_pack(", From 905de7b2feefd4e4402d689dec8174bcfa5e99df Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 18:22:38 -0600 Subject: [PATCH 045/347] =?UTF-8?q?=F0=9F=A7=AD=20Route=20ruby-merge=20par?= =?UTF-8?q?sing=20through=20TreeHaver?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ruby-merge/lib/ruby/merge.rb | 33 ++++++++++++------- .../source_family_tree_haver_spec.rb | 11 +++++++ spec/architecture/tree_haver_only_spec.rb | 2 -- 3 files changed, 32 insertions(+), 14 deletions(-) diff --git a/gems/ruby-merge/lib/ruby/merge.rb b/gems/ruby-merge/lib/ruby/merge.rb index 3ec79d73f..70741cdc1 100644 --- a/gems/ruby-merge/lib/ruby/merge.rb +++ b/gems/ruby-merge/lib/ruby/merge.rb @@ -85,19 +85,15 @@ def parse_ruby(source, dialect, backend: nil) return unsupported_feature_result("Unsupported Ruby backend #{requested}.") end - request = TreeHaver::ParserRequest.new(source: source, language: 'ruby', dialect: dialect) - syntax = TreeHaver.parse_with_language_pack(request) - return { ok: false, diagnostics: syntax[:diagnostics], policies: [] } unless syntax[:ok] + parser = TreeHaver.parser_for(:ruby) + tree = parser.parse(source) + collect_parse_errors(tree.root_node) - process = TreeHaver.process_with_language_pack(request) - return { ok: false, diagnostics: process[:diagnostics], policies: [] } unless process[:ok] - - { - ok: true, - diagnostics: [], - analysis: analyze_ruby_document(source, process_analysis: process[:analysis]), - policies: [] - } + unsupported_feature_result( + 'ruby-merge owner extraction must be rebuilt from TreeHaver AST nodes. Use prism-merge for native Ruby merging.' + ) + rescue TreeHaver::Error, StandardError => e + parse_failure_result(e) end def match_ruby_owners(template, destination) @@ -1271,6 +1267,19 @@ def ruby_file_footer_text(source) content.lines.any? { |line| !line.strip.empty? && !comment_line?(line) } ? '' : content end + def collect_parse_errors(node) + raise TreeHaver::NotAvailable, 'Ruby parse returned no root node' unless node + raise TreeHaver::NotAvailable, 'Ruby parse contains syntax errors' if node.respond_to?(:has_error?) && node.has_error? + end + + def parse_failure_result(error) + { + ok: false, + diagnostics: [{ severity: 'error', category: 'parse_error', message: error.message }], + policies: [] + } + end + def ruby_fallback_scope_rank(scope) ruby_fallback_policy_profile.fetch(:scopes).index(scope.to_s) || Float::INFINITY end diff --git a/spec/architecture/source_family_tree_haver_spec.rb b/spec/architecture/source_family_tree_haver_spec.rb index 2d82e0fc9..3a64e6160 100644 --- a/spec/architecture/source_family_tree_haver_spec.rb +++ b/spec/architecture/source_family_tree_haver_spec.rb @@ -3,6 +3,7 @@ require_relative '../../gems/go-merge/lib/go/merge' require_relative '../../gems/rust-merge/lib/rust/merge' require_relative '../../gems/typescript-merge/lib/typescript/merge' +require_relative '../../gems/ruby-merge/lib/ruby/merge' RSpec.describe 'source-family TreeHaver parsing' do before do @@ -40,4 +41,14 @@ include(severity: 'error', category: 'parse_error', message: include('No parser registered for typescript')) ) end + + it 'fails closed through TreeHaver when Ruby has no registered parser' do + result = Ruby::Merge.parse_ruby("class Example\nend\n", 'ruby') + + expect(TreeHaver).to have_received(:parser_for).with(:ruby) + expect(result[:ok]).to be(false) + expect(result[:diagnostics]).to include( + include(severity: 'error', category: 'parse_error', message: include('No parser registered for ruby')) + ) + end end diff --git a/spec/architecture/tree_haver_only_spec.rb b/spec/architecture/tree_haver_only_spec.rb index 2a79e154d..0c97389d7 100644 --- a/spec/architecture/tree_haver_only_spec.rb +++ b/spec/architecture/tree_haver_only_spec.rb @@ -23,8 +23,6 @@ "gems/markdown-merge/lib/markdown/merge.rb:syntax = TreeHaver.parse_with_language_pack(", "gems/parslet-toml-merge/lib/parslet/toml/merge.rb:syntax_result = TreeHaver.parse_with_parslet(source, grammar_class: TOML::Parslet)", "gems/psych-merge/lib/psych/merge.rb:parsed = YAML.safe_load(source, permitted_classes: [], aliases: false)", - "gems/ruby-merge/lib/ruby/merge.rb:process = TreeHaver.process_with_language_pack(request)", - "gems/ruby-merge/lib/ruby/merge.rb:syntax = TreeHaver.parse_with_language_pack(request)", "gems/toml-merge/lib/toml/merge.rb:grammar_class: TOML::Parslet,", "gems/toml-merge/lib/toml/merge.rb:grammar_module: TomlRB::Document,", "gems/toml-merge/lib/toml/merge.rb:return unless defined?(TOML::Parslet)", From 9c4f3b0ef4b209eafaa5f905ad6667757af2cda1 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 18:24:08 -0600 Subject: [PATCH 046/347] =?UTF-8?q?=F0=9F=A7=AD=20Route=20markdown=20subst?= =?UTF-8?q?rate=20parsing=20through=20TreeHaver?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/markdown-merge/lib/markdown/merge.rb | 30 ++++++++++++------- .../source_family_tree_haver_spec.rb | 11 +++++++ spec/architecture/tree_haver_only_spec.rb | 1 - 3 files changed, 31 insertions(+), 11 deletions(-) diff --git a/gems/markdown-merge/lib/markdown/merge.rb b/gems/markdown-merge/lib/markdown/merge.rb index 29a65345e..144cac10f 100644 --- a/gems/markdown-merge/lib/markdown/merge.rb +++ b/gems/markdown-merge/lib/markdown/merge.rb @@ -106,10 +106,9 @@ def parse_markdown(source, dialect, backend: nil) return unsupported_feature_result("Unsupported Markdown backend #{resolved_backend}.") end - syntax = TreeHaver.parse_with_language_pack( - TreeHaver::ParserRequest.new(source: source, language: 'markdown', dialect: dialect) - ) - return { ok: false, diagnostics: syntax[:diagnostics], policies: [] } unless syntax[:ok] + parser = TreeHaver.parser_for(:markdown) + tree = parser.parse(source) + collect_parse_errors(tree.root_node) normalized_source = normalize_source(source) { @@ -124,12 +123,8 @@ def parse_markdown(source, dialect, backend: nil) }, policies: [] } - rescue StandardError => e - { - ok: false, - diagnostics: [{ severity: 'error', category: 'parse_error', message: e.message }], - policies: [] - } + rescue TreeHaver::Error, StandardError => e + parse_failure_result(e) end def match_markdown_owners(template, destination) @@ -582,6 +577,19 @@ def resolve_backend(backend) backend.to_s.empty? ? 'kreuzberg-language-pack' : backend.to_s end + def collect_parse_errors(node) + raise TreeHaver::NotAvailable, 'Markdown parse returned no root node' unless node + raise TreeHaver::NotAvailable, 'Markdown parse contains syntax errors' if node.respond_to?(:has_error?) && node.has_error? + end + + def parse_failure_result(error) + { + ok: false, + diagnostics: [{ severity: 'error', category: 'parse_error', message: error.message }], + policies: [] + } + end + def unsupported_feature_result(message) { ok: false, @@ -617,6 +625,8 @@ def unsupported_feature_result(message) :code_fence_family, :code_fence_dialect, :resolve_backend, + :collect_parse_errors, + :parse_failure_result, :unsupported_feature_result ) end diff --git a/spec/architecture/source_family_tree_haver_spec.rb b/spec/architecture/source_family_tree_haver_spec.rb index 3a64e6160..f7a8b8f85 100644 --- a/spec/architecture/source_family_tree_haver_spec.rb +++ b/spec/architecture/source_family_tree_haver_spec.rb @@ -4,6 +4,7 @@ require_relative '../../gems/rust-merge/lib/rust/merge' require_relative '../../gems/typescript-merge/lib/typescript/merge' require_relative '../../gems/ruby-merge/lib/ruby/merge' +require_relative '../../gems/markdown-merge/lib/markdown/merge' RSpec.describe 'source-family TreeHaver parsing' do before do @@ -51,4 +52,14 @@ include(severity: 'error', category: 'parse_error', message: include('No parser registered for ruby')) ) end + + it 'fails closed through TreeHaver when Markdown has no registered parser' do + result = Markdown::Merge.parse_markdown("# Example\n", 'markdown') + + expect(TreeHaver).to have_received(:parser_for).with(:markdown) + expect(result[:ok]).to be(false) + expect(result[:diagnostics]).to include( + include(severity: 'error', category: 'parse_error', message: include('No parser registered for markdown')) + ) + end end diff --git a/spec/architecture/tree_haver_only_spec.rb b/spec/architecture/tree_haver_only_spec.rb index 0c97389d7..0af3acc98 100644 --- a/spec/architecture/tree_haver_only_spec.rb +++ b/spec/architecture/tree_haver_only_spec.rb @@ -20,7 +20,6 @@ [ "gems/citrus-toml-merge/lib/citrus/toml/merge.rb:syntax_result = TreeHaver.parse_with_citrus(source, grammar_module: TomlRB::Document)", "gems/json-merge/lib/json/merge.rb:parsed = JSON.parse(normalized_source)", - "gems/markdown-merge/lib/markdown/merge.rb:syntax = TreeHaver.parse_with_language_pack(", "gems/parslet-toml-merge/lib/parslet/toml/merge.rb:syntax_result = TreeHaver.parse_with_parslet(source, grammar_class: TOML::Parslet)", "gems/psych-merge/lib/psych/merge.rb:parsed = YAML.safe_load(source, permitted_classes: [], aliases: false)", "gems/toml-merge/lib/toml/merge.rb:grammar_class: TOML::Parslet,", From 05c8604079319a0d677762296826e317c4a89a4a Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 18:25:24 -0600 Subject: [PATCH 047/347] =?UTF-8?q?=F0=9F=A7=AD=20Route=20yaml=20substrate?= =?UTF-8?q?=20parsing=20through=20TreeHaver?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/yaml-merge/lib/yaml/merge.rb | 27 +++++++++++-------- .../source_family_tree_haver_spec.rb | 11 ++++++++ spec/architecture/tree_haver_only_spec.rb | 4 --- 3 files changed, 27 insertions(+), 15 deletions(-) diff --git a/gems/yaml-merge/lib/yaml/merge.rb b/gems/yaml-merge/lib/yaml/merge.rb index 600624752..682fee256 100644 --- a/gems/yaml-merge/lib/yaml/merge.rb +++ b/gems/yaml-merge/lib/yaml/merge.rb @@ -64,14 +64,14 @@ def parse_yaml(source, dialect, backend: nil) return unsupported_feature_parse_result("Unsupported YAML backend #{resolved_backend}.") end - syntax_result = TreeHaver.parse_with_language_pack( - TreeHaver::ParserRequest.new(source: source, language: 'yaml') - ) - return { ok: false, diagnostics: syntax_result[:diagnostics], policies: [] } unless syntax_result[:ok] + parser = TreeHaver.parser_for(:yaml) + tree = parser.parse(source) + collect_parse_errors(tree.root_node) - parsed = YAML.safe_load(source, permitted_classes: [], aliases: false) - analyze_yaml_document(parsed, dialect) - rescue StandardError => e + unsupported_feature_parse_result( + 'yaml-merge document analysis must be rebuilt from TreeHaver AST nodes. Use psych-merge for the Psych TreeHaver backend.' + ) + rescue TreeHaver::Error, StandardError => e parse_error_result(e.message) end @@ -89,6 +89,7 @@ def analyze_yaml_document(parsed, dialect) kind: 'yaml', dialect: 'yaml', normalized_source: canonical_yaml(validated[:value]), + document: validated[:value], root_kind: 'mapping', owners: collect_yaml_owners(validated[:value]) }, @@ -135,10 +136,8 @@ def merge_yaml_with_parser(template_source, destination_source, dialect) } end - template_document = YAML.safe_load(template.dig(:analysis, :normalized_source), permitted_classes: [], - aliases: false) - destination_document = YAML.safe_load(destination.dig(:analysis, :normalized_source), permitted_classes: [], - aliases: false) + template_document = template.dig(:analysis, :document) + destination_document = destination.dig(:analysis, :document) unless template_document.is_a?(Hash) && destination_document.is_a?(Hash) return parse_error_merge_result('YAML documents must parse to a mapping root.') end @@ -162,6 +161,12 @@ def resolve_backend(backend) end private_class_method :resolve_backend + def collect_parse_errors(node) + raise TreeHaver::NotAvailable, 'YAML parse returned no root node' unless node + raise TreeHaver::NotAvailable, 'YAML parse contains syntax errors' if node.respond_to?(:has_error?) && node.has_error? + end + private_class_method :collect_parse_errors + def validate_yaml_node(value, path) if scalar?(value) { ok: true, value: value } diff --git a/spec/architecture/source_family_tree_haver_spec.rb b/spec/architecture/source_family_tree_haver_spec.rb index f7a8b8f85..621b5e5b3 100644 --- a/spec/architecture/source_family_tree_haver_spec.rb +++ b/spec/architecture/source_family_tree_haver_spec.rb @@ -5,6 +5,7 @@ require_relative '../../gems/typescript-merge/lib/typescript/merge' require_relative '../../gems/ruby-merge/lib/ruby/merge' require_relative '../../gems/markdown-merge/lib/markdown/merge' +require_relative '../../gems/yaml-merge/lib/yaml/merge' RSpec.describe 'source-family TreeHaver parsing' do before do @@ -62,4 +63,14 @@ include(severity: 'error', category: 'parse_error', message: include('No parser registered for markdown')) ) end + + it 'fails closed through TreeHaver when YAML has no registered parser' do + result = Yaml::Merge.parse_yaml("key: value\n", 'yaml') + + expect(TreeHaver).to have_received(:parser_for).with(:yaml) + expect(result[:ok]).to be(false) + expect(result[:diagnostics]).to include( + include(severity: 'error', category: 'parse_error', message: include('No parser registered for yaml')) + ) + end end diff --git a/spec/architecture/tree_haver_only_spec.rb b/spec/architecture/tree_haver_only_spec.rb index 0af3acc98..6fa201c18 100644 --- a/spec/architecture/tree_haver_only_spec.rb +++ b/spec/architecture/tree_haver_only_spec.rb @@ -26,10 +26,6 @@ "gems/toml-merge/lib/toml/merge.rb:grammar_module: TomlRB::Document,", "gems/toml-merge/lib/toml/merge.rb:return unless defined?(TOML::Parslet)", "gems/toml-merge/lib/toml/merge.rb:return unless defined?(TomlRB::Document)", - "gems/yaml-merge/lib/yaml/merge.rb:destination_document = YAML.safe_load(destination.dig(:analysis, :normalized_source), permitted_classes: [],", - "gems/yaml-merge/lib/yaml/merge.rb:parsed = YAML.safe_load(source, permitted_classes: [], aliases: false)", - "gems/yaml-merge/lib/yaml/merge.rb:syntax_result = TreeHaver.parse_with_language_pack(", - "gems/yaml-merge/lib/yaml/merge.rb:template_document = YAML.safe_load(template.dig(:analysis, :normalized_source), permitted_classes: []," ] ).freeze From 965afc690bc1174f0380ce8b543097c26a824a72 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 18:26:55 -0600 Subject: [PATCH 048/347] =?UTF-8?q?=F0=9F=A7=AD=20Route=20json=20parse=20f?= =?UTF-8?q?acade=20through=20TreeHaver?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/json-merge/lib/json/merge.rb | 39 +++++-------------- .../source_family_tree_haver_spec.rb | 11 ++++++ spec/architecture/tree_haver_only_spec.rb | 1 - 3 files changed, 20 insertions(+), 31 deletions(-) diff --git a/gems/json-merge/lib/json/merge.rb b/gems/json-merge/lib/json/merge.rb index c3748e18a..8d83f9df3 100644 --- a/gems/json-merge/lib/json/merge.rb +++ b/gems/json-merge/lib/json/merge.rb @@ -68,27 +68,21 @@ def json_feature_profile def parse_json(source, dialect) normalized_source = dialect == 'jsonc' ? strip_json_comments(source) : source - allows_comments = dialect == 'jsonc' if detect_trailing_comma(normalized_source) return parse_failure("Trailing commas are not supported for #{dialect}.") end - parsed = JSON.parse(normalized_source) - canonical = JSON.generate(parsed) - analysis = { - kind: 'json', - dialect: dialect, - allows_comments: allows_comments, - normalized_source: canonical, - root_kind: json_root_kind(parsed), - owners: collect_json_owners(parsed) - } + analysis = FileAnalysis.new(normalized_source) + unless analysis.valid? + return parse_failure(analysis.errors.map { |error| error.respond_to?(:message) ? error.message : error.inspect }.join(', ')) + end + { - ok: true, - diagnostics: [], - analysis: analysis + ok: false, + diagnostics: [unsupported_feature('json-merge owner extraction must be rebuilt from TreeHaver AST nodes.')], + policies: [] } - rescue JSON::ParserError => e + rescue TreeHaver::Error, StandardError => e parse_failure(e.message) end @@ -110,21 +104,6 @@ def merge_json(template_source, destination_source, dialect) } end - fallback_source = try_destination_trailing_comma_fallback(destination_source) - if fallback_source - retried = parse_json(fallback_source, dialect) - if retried[:ok] - return { - ok: true, - diagnostics: [ - fallback_applied('stripped trailing commas from destination before retrying json merge.') - ], - output: merge_json_sources(template_source, fallback_source), - policies: [DESTINATION_WINS_ARRAY_POLICY, TRAILING_COMMA_FALLBACK_POLICY] - } - end - end - { ok: false, diagnostics: destination_result[:diagnostics].map do |diagnostic| diff --git a/spec/architecture/source_family_tree_haver_spec.rb b/spec/architecture/source_family_tree_haver_spec.rb index 621b5e5b3..ee6319641 100644 --- a/spec/architecture/source_family_tree_haver_spec.rb +++ b/spec/architecture/source_family_tree_haver_spec.rb @@ -6,6 +6,7 @@ require_relative '../../gems/ruby-merge/lib/ruby/merge' require_relative '../../gems/markdown-merge/lib/markdown/merge' require_relative '../../gems/yaml-merge/lib/yaml/merge' +require_relative '../../gems/json-merge/lib/json/merge' RSpec.describe 'source-family TreeHaver parsing' do before do @@ -73,4 +74,14 @@ include(severity: 'error', category: 'parse_error', message: include('No parser registered for yaml')) ) end + + it 'fails closed through TreeHaver when JSON has no registered parser' do + result = Json::Merge.parse_json("{\"key\":\"value\"}\n", 'json') + + expect(TreeHaver).to have_received(:parser_for).with(:json) + expect(result[:ok]).to be(false) + expect(result[:diagnostics]).to include( + include(severity: 'error', category: 'parse_error', message: include('No parser registered for json')) + ) + end end diff --git a/spec/architecture/tree_haver_only_spec.rb b/spec/architecture/tree_haver_only_spec.rb index 6fa201c18..f1c456e47 100644 --- a/spec/architecture/tree_haver_only_spec.rb +++ b/spec/architecture/tree_haver_only_spec.rb @@ -19,7 +19,6 @@ KNOWN_PARSER_BYPASS_REFERENCES = Set.new( [ "gems/citrus-toml-merge/lib/citrus/toml/merge.rb:syntax_result = TreeHaver.parse_with_citrus(source, grammar_module: TomlRB::Document)", - "gems/json-merge/lib/json/merge.rb:parsed = JSON.parse(normalized_source)", "gems/parslet-toml-merge/lib/parslet/toml/merge.rb:syntax_result = TreeHaver.parse_with_parslet(source, grammar_class: TOML::Parslet)", "gems/psych-merge/lib/psych/merge.rb:parsed = YAML.safe_load(source, permitted_classes: [], aliases: false)", "gems/toml-merge/lib/toml/merge.rb:grammar_class: TOML::Parslet,", From 4a37d87adea5ecf2490a3580fd9084c7f455d595 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 18:28:19 -0600 Subject: [PATCH 049/347] =?UTF-8?q?=F0=9F=A7=AD=20Route=20psych=20parse=20?= =?UTF-8?q?facade=20through=20TreeHaver?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/psych-merge/lib/psych/merge.rb | 54 ++++++++++++++++++- .../source_family_tree_haver_spec.rb | 11 ++++ spec/architecture/tree_haver_only_spec.rb | 1 - 3 files changed, 63 insertions(+), 3 deletions(-) diff --git a/gems/psych-merge/lib/psych/merge.rb b/gems/psych-merge/lib/psych/merge.rb index 63c32d38b..25055b6f4 100644 --- a/gems/psych-merge/lib/psych/merge.rb +++ b/gems/psych-merge/lib/psych/merge.rb @@ -158,9 +158,10 @@ def parse_yaml(source, dialect, backend: nil) end return unsupported_feature_parse_result("Unsupported YAML dialect #{dialect}.") unless dialect == 'yaml' - parsed = YAML.safe_load(source, permitted_classes: [], aliases: false) + tree = TreeHaver.parser_for(:yaml).parse(source) + parsed = yaml_document_value_from_tree(tree) Yaml::Merge.analyze_yaml_document(parsed, dialect) - rescue StandardError => e + rescue TreeHaver::Error, StandardError => e parse_error_result(e.message) end @@ -236,6 +237,55 @@ def parse_error_result(message) { ok: false, diagnostics: [diagnostic('error', 'parse_error', message)], policies: [] } end + def yaml_document_value_from_tree(tree) + root = tree.root_node + raise TreeHaver::NotAvailable, 'YAML parse returned no root node' unless root + + document = root.children.find { |child| child.type.to_s == 'document' } + yaml_value_from_node(document&.children&.first) + end + + def yaml_value_from_node(node) + return nil unless node + + case node.type.to_s + when 'mapping' + yaml_mapping_from_node(node) + when 'sequence' + node.children.map { |child| yaml_value_from_node(child) } + when 'scalar' + yaml_scalar_from_node(node) + else + raise TreeHaver::NotAvailable, "Unsupported YAML node #{node.type}" + end + end + + def yaml_mapping_from_node(node) + children = node.children + children.each_slice(2).each_with_object({}) do |(key_node, value_node), mapping| + key = yaml_value_from_node(key_node) + mapping[key] = yaml_value_from_node(value_node) + end + end + + def yaml_scalar_from_node(node) + value = node.value.to_s + case node.tag.to_s + when 'tag:yaml.org,2002:null' + nil + when 'tag:yaml.org,2002:bool' + value.downcase == 'true' + when 'tag:yaml.org,2002:int' + Integer(value.delete('_'), 0) + when 'tag:yaml.org,2002:float' + Float(value.delete('_')) + else + value + end + rescue ArgumentError + value + end + def unsupported_feature_parse_result(message) { ok: false, diagnostics: [diagnostic('error', 'unsupported_feature', message)], policies: [] } end diff --git a/spec/architecture/source_family_tree_haver_spec.rb b/spec/architecture/source_family_tree_haver_spec.rb index ee6319641..28829cdcf 100644 --- a/spec/architecture/source_family_tree_haver_spec.rb +++ b/spec/architecture/source_family_tree_haver_spec.rb @@ -7,6 +7,7 @@ require_relative '../../gems/markdown-merge/lib/markdown/merge' require_relative '../../gems/yaml-merge/lib/yaml/merge' require_relative '../../gems/json-merge/lib/json/merge' +require_relative '../../gems/psych-merge/lib/psych/merge' RSpec.describe 'source-family TreeHaver parsing' do before do @@ -84,4 +85,14 @@ include(severity: 'error', category: 'parse_error', message: include('No parser registered for json')) ) end + + it 'fails closed through TreeHaver when the Psych YAML provider has no registered parser' do + result = Psych::Merge.parse_yaml("key: value\n", 'yaml') + + expect(TreeHaver).to have_received(:parser_for).with(:yaml) + expect(result[:ok]).to be(false) + expect(result[:diagnostics]).to include( + include(severity: 'error', category: 'parse_error', message: include('No parser registered for yaml')) + ) + end end diff --git a/spec/architecture/tree_haver_only_spec.rb b/spec/architecture/tree_haver_only_spec.rb index f1c456e47..7942f0042 100644 --- a/spec/architecture/tree_haver_only_spec.rb +++ b/spec/architecture/tree_haver_only_spec.rb @@ -20,7 +20,6 @@ [ "gems/citrus-toml-merge/lib/citrus/toml/merge.rb:syntax_result = TreeHaver.parse_with_citrus(source, grammar_module: TomlRB::Document)", "gems/parslet-toml-merge/lib/parslet/toml/merge.rb:syntax_result = TreeHaver.parse_with_parslet(source, grammar_class: TOML::Parslet)", - "gems/psych-merge/lib/psych/merge.rb:parsed = YAML.safe_load(source, permitted_classes: [], aliases: false)", "gems/toml-merge/lib/toml/merge.rb:grammar_class: TOML::Parslet,", "gems/toml-merge/lib/toml/merge.rb:grammar_module: TomlRB::Document,", "gems/toml-merge/lib/toml/merge.rb:return unless defined?(TOML::Parslet)", From d93135d13acb26702d273d7438d95e5cbcd8267b Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 18:30:40 -0600 Subject: [PATCH 050/347] =?UTF-8?q?=F0=9F=A7=AD=20Move=20TOML=20provider?= =?UTF-8?q?=20parsing=20onto=20TreeHaver?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lib/citrus/toml/merge.rb | 21 ++++++++-- .../lib/parslet/toml/merge.rb | 21 ++++++++-- gems/toml-merge/lib/toml/merge.rb | 38 +------------------ .../source_family_tree_haver_spec.rb | 11 ++++++ spec/architecture/tree_haver_only_spec.rb | 10 +---- 5 files changed, 49 insertions(+), 52 deletions(-) diff --git a/gems/citrus-toml-merge/lib/citrus/toml/merge.rb b/gems/citrus-toml-merge/lib/citrus/toml/merge.rb index 9a53a9686..c95f1c772 100644 --- a/gems/citrus-toml-merge/lib/citrus/toml/merge.rb +++ b/gems/citrus-toml-merge/lib/citrus/toml/merge.rb @@ -13,6 +13,21 @@ module Merge PACKAGE_NAME = 'citrus-toml-merge' BACKEND = TreeHaver::CITRUS_BACKEND + BACKEND_REGISTRY = Struct.new(:registered, :mutex).new(false, Mutex.new) + + def register_backend! + BACKEND_REGISTRY.mutex.synchronize do + return if BACKEND_REGISTRY.registered + + TreeHaver.register_language( + :toml, + grammar_module: TomlRB::Document, + gem_name: 'toml-rb' + ) + + BACKEND_REGISTRY.registered = true + end + end def toml_feature_profile ::Toml::Merge.toml_feature_profile @@ -51,9 +66,6 @@ def parse_toml(source, dialect, backend: nil) return unsupported_feature_result("Unsupported TOML backend #{requested}.") unless requested == BACKEND.id return unsupported_feature_result("Unsupported TOML dialect #{dialect}.") unless dialect == 'toml' - syntax_result = TreeHaver.parse_with_citrus(source, grammar_module: TomlRB::Document) - return { ok: false, diagnostics: syntax_result[:diagnostics], policies: [] } unless syntax_result[:ok] - TreeHaver.with_backend(BACKEND.id) { ::Toml::Merge.analyze_toml_source(source, dialect) } end @@ -111,6 +123,7 @@ def provider_parse_failure(category, parse_result) module_function( :toml_feature_profile, + :register_backend!, :available_toml_backends, :toml_backend_feature_profile, :toml_plan_context, @@ -134,6 +147,8 @@ def merge_result end end +Citrus::Toml::Merge.register_backend! + Citrus::Toml::Merge::Version.class_eval do extend VersionGem::Basic end diff --git a/gems/parslet-toml-merge/lib/parslet/toml/merge.rb b/gems/parslet-toml-merge/lib/parslet/toml/merge.rb index ed23f3f1e..d49ebc44f 100644 --- a/gems/parslet-toml-merge/lib/parslet/toml/merge.rb +++ b/gems/parslet-toml-merge/lib/parslet/toml/merge.rb @@ -13,6 +13,21 @@ module Merge PACKAGE_NAME = 'parslet-toml-merge' BACKEND = TreeHaver::PARSLET_BACKEND + BACKEND_REGISTRY = Struct.new(:registered, :mutex).new(false, Mutex.new) + + def register_backend! + BACKEND_REGISTRY.mutex.synchronize do + return if BACKEND_REGISTRY.registered + + TreeHaver.register_language( + :toml, + grammar_class: TOML::Parslet, + gem_name: 'toml' + ) + + BACKEND_REGISTRY.registered = true + end + end def toml_feature_profile ::Toml::Merge.toml_feature_profile @@ -51,9 +66,6 @@ def parse_toml(source, dialect, backend: nil) return unsupported_feature_result("Unsupported TOML backend #{requested}.") unless requested == BACKEND.id return unsupported_feature_result("Unsupported TOML dialect #{dialect}.") unless dialect == 'toml' - syntax_result = TreeHaver.parse_with_parslet(source, grammar_class: TOML::Parslet) - return { ok: false, diagnostics: syntax_result[:diagnostics], policies: [] } unless syntax_result[:ok] - TreeHaver.with_backend(BACKEND.id) { ::Toml::Merge.analyze_toml_source(source, dialect) } end @@ -111,6 +123,7 @@ def provider_parse_failure(category, parse_result) module_function( :toml_feature_profile, + :register_backend!, :available_toml_backends, :toml_backend_feature_profile, :toml_plan_context, @@ -134,6 +147,8 @@ def merge_result end end +Parslet::Toml::Merge.register_backend! + Parslet::Toml::Merge::Version.class_eval do extend VersionGem::Basic end diff --git a/gems/toml-merge/lib/toml/merge.rb b/gems/toml-merge/lib/toml/merge.rb index 8921c209c..699187d75 100644 --- a/gems/toml-merge/lib/toml/merge.rb +++ b/gems/toml-merge/lib/toml/merge.rb @@ -44,8 +44,6 @@ module Merge }.freeze TREE_SITTER_BACKEND_REFERENCE = TreeHaver::BackendReference.new(id: 'kreuzberg-language-pack', family: 'tree-sitter').freeze - CITRUS_BACKEND_REFERENCE = TreeHaver::BackendReference.new(id: 'citrus', family: 'peg').freeze - PARSLET_BACKEND_REFERENCE = TreeHaver::BackendReference.new(id: 'parslet', family: 'peg').freeze BACKEND_REGISTRY = Struct.new(:registered, :mutex).new(false, Mutex.new) # Base error class for Toml::Merge @@ -123,7 +121,7 @@ def toml_feature_profile end def available_toml_backends - [TREE_SITTER_BACKEND_REFERENCE, CITRUS_BACKEND_REFERENCE, PARSLET_BACKEND_REFERENCE] + [TREE_SITTER_BACKEND_REFERENCE] end def toml_backend_feature_profile(backend: nil) @@ -257,12 +255,8 @@ def register_backend! return if BACKEND_REGISTRY.registered TreeHaver::BackendRegistry.register(TREE_SITTER_BACKEND_REFERENCE) - TreeHaver::BackendRegistry.register(CITRUS_BACKEND_REFERENCE) - TreeHaver::BackendRegistry.register(PARSLET_BACKEND_REFERENCE) register_tree_sitter_backend! - register_citrus_backend! - register_parslet_backend! BACKEND_REGISTRY.registered = true end @@ -275,32 +269,6 @@ def register_tree_sitter_backend! grammar_finder.register! if grammar_finder.available? end - def register_citrus_backend! - require 'toml-rb' - return unless defined?(TomlRB::Document) - - TreeHaver.register_language( - :toml, - grammar_module: TomlRB::Document, - gem_name: 'toml-rb' - ) - rescue LoadError, NameError - nil - end - - def register_parslet_backend! - require 'toml' - return unless defined?(TOML::Parslet) - - TreeHaver.register_language( - :toml, - grammar_class: TOML::Parslet, - gem_name: 'toml' - ) - rescue LoadError, NameError - nil - end - def requested_toml_backend_id(backend) return backend.to_s unless backend.to_s.empty? @@ -334,10 +302,6 @@ def normalize_toml_source(source) def toml_backend_available_for_analysis?(backend_id) registrations = TreeHaver.registered_languages(:toml) case backend_id.to_s - when 'citrus' - registrations.key?(:citrus) - when 'parslet' - registrations.key?(:parslet) when TREE_SITTER_BACKEND_REFERENCE.id registrations.key?(:tree_sitter) else diff --git a/spec/architecture/source_family_tree_haver_spec.rb b/spec/architecture/source_family_tree_haver_spec.rb index 28829cdcf..fd43d586b 100644 --- a/spec/architecture/source_family_tree_haver_spec.rb +++ b/spec/architecture/source_family_tree_haver_spec.rb @@ -8,6 +8,7 @@ require_relative '../../gems/yaml-merge/lib/yaml/merge' require_relative '../../gems/json-merge/lib/json/merge' require_relative '../../gems/psych-merge/lib/psych/merge' +require_relative '../../gems/toml-merge/lib/toml/merge' RSpec.describe 'source-family TreeHaver parsing' do before do @@ -95,4 +96,14 @@ include(severity: 'error', category: 'parse_error', message: include('No parser registered for yaml')) ) end + + it 'fails closed through TreeHaver when TOML has no registered parser' do + result = Toml::Merge.parse_toml("key = \"value\"\n", 'toml') + + expect(TreeHaver).to have_received(:parser_for).with(:toml) + expect(result[:ok]).to be(false) + expect(result[:diagnostics]).to include( + include(severity: 'error', category: 'parse_error', message: include('No parser registered for toml')) + ) + end end diff --git a/spec/architecture/tree_haver_only_spec.rb b/spec/architecture/tree_haver_only_spec.rb index 7942f0042..e9ea7acd1 100644 --- a/spec/architecture/tree_haver_only_spec.rb +++ b/spec/architecture/tree_haver_only_spec.rb @@ -11,19 +11,11 @@ Json::Merge::SyntheticParser | (? Date: Sat, 18 Jul 2026 18:32:23 -0600 Subject: [PATCH 051/347] =?UTF-8?q?=F0=9F=8C=B3=20Auto-select=20registered?= =?UTF-8?q?=20TreeHaver=20backends?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/tree_haver/lib/tree_haver.rb | 19 +++++++ .../spec/fixtures_integration_spec.rb | 52 +++++++++++++++++++ 2 files changed, 71 insertions(+) diff --git a/gems/tree_haver/lib/tree_haver.rb b/gems/tree_haver/lib/tree_haver.rb index 17cb26c39..db1abe91e 100644 --- a/gems/tree_haver/lib/tree_haver.rb +++ b/gems/tree_haver/lib/tree_haver.rb @@ -315,6 +315,10 @@ def parser_for(language_name, library_path: nil, symbol: nil, citrus_config: nil return parser_for_tree_sitter(name, config[:path], config[:symbol]) end + if (backend_type = first_available_registered_backend_type(registrations)) + return parser_for_registered_backend(name, backend_type, registrations) + end + raise NotAvailable, "No parser registered for #{name}" end @@ -410,6 +414,21 @@ def parser_for_registered_backend(name, backend_type, registrations) end private_class_method :parser_for_registered_backend + def first_available_registered_backend_type(registrations) + registrations.each do |backend_type, config| + next unless config[:backend_module] + next unless backend_allowed?(backend_type) + + backend_module = config.fetch(:backend_module) + next if backend_module.respond_to?(:available?) && !backend_module.available? + + return backend_type + end + + nil + end + private_class_method :first_available_registered_backend_type + def parser_for_backend_module(backend_module, name) parser = backend_module::Parser.new language_factory = backend_module::Language diff --git a/gems/tree_haver/spec/fixtures_integration_spec.rb b/gems/tree_haver/spec/fixtures_integration_spec.rb index ed2371bd0..1bc5c7557 100644 --- a/gems/tree_haver/spec/fixtures_integration_spec.rb +++ b/gems/tree_haver/spec/fixtures_integration_spec.rb @@ -1127,6 +1127,58 @@ class self::Parser expect(parser.language).to eq(:rbs_language) end + it 'auto-selects an available registered backend module without explicit backend selection' do + unavailable_backend = Module.new do + def self.available? + false + end + + class self::Language + def self.from_library(_path = nil, symbol: nil, name: nil) + [name, symbol] + end + end + + class self::Parser + attr_accessor :language + end + end + + available_backend = Module.new do + def self.available? + true + end + + class self::Language + def self.from_library(_path = nil, symbol: nil, name: nil) + [name, symbol] + end + end + + class self::Parser + attr_accessor :language + end + end + + described_class.register_language( + :auto_provider_markdown, + backend_module: unavailable_backend, + backend_type: :unavailable_markdown_provider, + gem_name: 'unavailable-markdown-provider' + ) + described_class.register_language( + :auto_provider_markdown, + backend_module: available_backend, + backend_type: :available_markdown_provider, + gem_name: 'available-markdown-provider' + ) + + parser = described_class.parser_for(:auto_provider_markdown) + + expect(parser).to be_a(available_backend::Parser) + expect(parser.language).to eq([:auto_provider_markdown, nil]) + end + it 'provides PEG framework parsing helpers' do require 'toml' require 'toml-rb' From a9ff07c3d85e3c89ea4db670ea8f0c27a7f370b6 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 18:34:15 -0600 Subject: [PATCH 052/347] =?UTF-8?q?=F0=9F=8C=B3=20Resolve=20registered=20M?= =?UTF-8?q?arkdown=20backends=20through=20TreeHaver?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/markdown-merge/lib/markdown/merge.rb | 35 ++++++++++++++++--- .../lib/markdown/merge/backend_support.rb | 4 +++ 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/gems/markdown-merge/lib/markdown/merge.rb b/gems/markdown-merge/lib/markdown/merge.rb index 144cac10f..1baac48ee 100644 --- a/gems/markdown-merge/lib/markdown/merge.rb +++ b/gems/markdown-merge/lib/markdown/merge.rb @@ -11,7 +11,9 @@ module Markdown module Merge PACKAGE_NAME = 'markdown-merge' BACKEND_REFERENCES = { - 'kreuzberg-language-pack' => TreeHaver::KREUZBERG_LANGUAGE_PACK_BACKEND + 'kreuzberg-language-pack' => TreeHaver::KREUZBERG_LANGUAGE_PACK_BACKEND, + 'commonmarker' => TreeHaver::BackendReference.new(id: 'commonmarker', family: 'native').freeze, + 'markly' => TreeHaver::BackendReference.new(id: 'markly', family: 'native').freeze }.freeze class Error < Ast::Merge::Error; end @@ -102,11 +104,11 @@ def parse_markdown(source, dialect, backend: nil) return unsupported_feature_result("Unsupported Markdown dialect #{dialect}.") unless dialect == 'markdown' resolved_backend = resolve_backend(backend) - unless resolved_backend == 'kreuzberg-language-pack' + unless BACKEND_REFERENCES.key?(resolved_backend) return unsupported_feature_result("Unsupported Markdown backend #{resolved_backend}.") end - parser = TreeHaver.parser_for(:markdown) + parser = TreeHaver.with_backend(resolved_backend) { TreeHaver.parser_for(:markdown) } tree = parser.parse(source) collect_parse_errors(tree.root_node) @@ -574,7 +576,31 @@ def code_fence_dialect(info_string, family) end def resolve_backend(backend) - backend.to_s.empty? ? 'kreuzberg-language-pack' : backend.to_s + return backend.to_s unless backend.to_s.empty? + + current = TreeHaver.current_backend_id + return current if BACKEND_REFERENCES.key?(current.to_s) && markdown_backend_available_for_analysis?(current) + + BACKEND_REFERENCES.keys.find { |backend_id| markdown_backend_available_for_analysis?(backend_id) } || + 'kreuzberg-language-pack' + end + + def markdown_backend_available_for_analysis?(backend_id) + registrations = TreeHaver.registered_languages(:markdown) + case backend_id.to_s + when 'commonmarker' + registrations.dig(:commonmarker, :backend_module)&.then do |backend_module| + !backend_module.respond_to?(:available?) || backend_module.available? + end + when 'markly' + registrations.dig(:markly, :backend_module)&.then do |backend_module| + !backend_module.respond_to?(:available?) || backend_module.available? + end + when 'kreuzberg-language-pack' + registrations.key?(:tree_sitter) || registrations.key?(:tslp) + else + false + end end def collect_parse_errors(node) @@ -625,6 +651,7 @@ def unsupported_feature_result(message) :code_fence_family, :code_fence_dialect, :resolve_backend, + :markdown_backend_available_for_analysis?, :collect_parse_errors, :parse_failure_result, :unsupported_feature_result diff --git a/gems/markdown-merge/lib/markdown/merge/backend_support.rb b/gems/markdown-merge/lib/markdown/merge/backend_support.rb index 711eb8a81..fd36c2509 100644 --- a/gems/markdown-merge/lib/markdown/merge/backend_support.rb +++ b/gems/markdown-merge/lib/markdown/merge/backend_support.rb @@ -148,6 +148,10 @@ def install_tree_wrapper!(backend_module) private_class_method :install_tree_wrapper! def register_backend!(backend_module:, backend_name:, gem_name:, require_path:) + ::TreeHaver::BackendRegistry.register( + ::TreeHaver::BackendReference.new(id: backend_name.to_s, family: 'native') + ) + ::TreeHaver.register_language( :markdown, backend_type: backend_name, From 0068759fa5ef8da99abc5d3e7f8585d9cce82954 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 18:35:01 -0600 Subject: [PATCH 053/347] =?UTF-8?q?=F0=9F=A7=AD=20Route=20Markdown=20provi?= =?UTF-8?q?der=20facades=20through=20TreeHaver?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/commonmarker-merge/lib/commonmarker/merge.rb | 2 +- gems/markly-merge/lib/markly/merge.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gems/commonmarker-merge/lib/commonmarker/merge.rb b/gems/commonmarker-merge/lib/commonmarker/merge.rb index 0487f21d3..50c904f0f 100644 --- a/gems/commonmarker-merge/lib/commonmarker/merge.rb +++ b/gems/commonmarker-merge/lib/commonmarker/merge.rb @@ -59,7 +59,7 @@ def parse_markdown(source, dialect, backend: nil) return unsupported_feature_result("Unsupported Markdown backend #{requested}.") end - ::Commonmarker.parse(source) + TreeHaver.with_backend(BACKEND_REFERENCE.id) { TreeHaver.parser_for(:markdown).parse(source) } normalized = Markdown::Merge.normalize_source(source) { ok: true, diff --git a/gems/markly-merge/lib/markly/merge.rb b/gems/markly-merge/lib/markly/merge.rb index dcbe2801b..5b4f0a7ff 100644 --- a/gems/markly-merge/lib/markly/merge.rb +++ b/gems/markly-merge/lib/markly/merge.rb @@ -378,7 +378,7 @@ def parse_markdown(source, dialect, backend: nil) return unsupported_feature_result("Unsupported Markdown backend #{requested}.") end - ::Markly.parse(source, flags: ::Markly::DEFAULT, extensions: [:table]) + TreeHaver.with_backend(BACKEND_REFERENCE.id) { TreeHaver.parser_for(:markdown).parse(source) } normalized = Markdown::Merge.normalize_source(source) { ok: true, From 12fc280b9b61387d8283a27185c26854803764c2 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 18:35:47 -0600 Subject: [PATCH 054/347] =?UTF-8?q?=F0=9F=A7=AD=20Route=20Prism=20facades?= =?UTF-8?q?=20through=20TreeHaver?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/prism-merge/lib/prism/merge.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gems/prism-merge/lib/prism/merge.rb b/gems/prism-merge/lib/prism/merge.rb index a60a5ad27..bd3bfbeb8 100644 --- a/gems/prism-merge/lib/prism/merge.rb +++ b/gems/prism-merge/lib/prism/merge.rb @@ -449,7 +449,7 @@ def parse_ruby(source, dialect, backend: nil) return unsupported_feature_result("Unsupported Ruby backend #{requested}.") end - result = ::Prism.parse(source) + result = TreeHaver.with_backend(BACKEND_REFERENCE.id) { TreeHaver.parser_for(:ruby).parse(source).parse_result } unless result.success? return { ok: false, @@ -490,7 +490,7 @@ def parse_ruby_normalized(source, dialect = 'ruby', backend: nil) return unsupported_feature_result("Unsupported Ruby backend #{requested}.") end - result = ::Prism.parse(source) + result = TreeHaver.with_backend(BACKEND_REFERENCE.id) { TreeHaver.parser_for(:ruby).parse(source).parse_result } unless result.success? return TreeHaver::NormalizedParseResult.new( ok: false, From ff91dd5bcf387360b8fb57cf388f9f714eea6234 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 18:38:40 -0600 Subject: [PATCH 055/347] =?UTF-8?q?=F0=9F=A7=AD=20Add=20Kramdown=20TreeHav?= =?UTF-8?q?er=20backend?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/kramdown-merge/lib/kramdown/merge.rb | 4 +- .../lib/kramdown/merge/backend.rb | 113 ++++++++++++++++++ 2 files changed, 116 insertions(+), 1 deletion(-) create mode 100644 gems/kramdown-merge/lib/kramdown/merge/backend.rb diff --git a/gems/kramdown-merge/lib/kramdown/merge.rb b/gems/kramdown-merge/lib/kramdown/merge.rb index 126127eb6..a721c9b80 100644 --- a/gems/kramdown-merge/lib/kramdown/merge.rb +++ b/gems/kramdown-merge/lib/kramdown/merge.rb @@ -53,7 +53,7 @@ def parse_markdown(source, dialect, backend: nil) return unsupported_feature_result("Unsupported Markdown dialect #{dialect}.") unless dialect == 'markdown' - ::Kramdown::Document.new(source) + TreeHaver.with_backend(BACKEND_REFERENCE.id) { TreeHaver.parser_for(:markdown).parse(source) } normalized = Markdown::Merge.normalize_source(source) { ok: true, @@ -195,6 +195,8 @@ def unsupported_feature_result(message) end end +require_relative 'merge/backend' + Kramdown::Merge::Version.class_eval do extend VersionGem::Basic end diff --git a/gems/kramdown-merge/lib/kramdown/merge/backend.rb b/gems/kramdown-merge/lib/kramdown/merge/backend.rb new file mode 100644 index 000000000..95f4e6a9a --- /dev/null +++ b/gems/kramdown-merge/lib/kramdown/merge/backend.rb @@ -0,0 +1,113 @@ +# frozen_string_literal: true + +module Kramdown + module Merge + module Backend + Markdown::Merge::BackendSupport.install!( + backend_module: self, + backend_name: :kramdown, + gem_name: 'kramdown', + require_path: 'kramdown/merge' + ) + + class Language < ::TreeHaver::Base::Language + def initialize(name = :markdown, options: {}) + super(name, backend: :kramdown, options: options) + end + + class << self + def markdown(options: {}) + new(:markdown, options: options) + end + end + + Markdown::Merge::BackendSupport.configure_markdown_only_language_class!( + self, + backend_label: 'Kramdown' + ) + end + + class Parser < ::TreeHaver::Base::Parser + def parse(source) + raise 'Language not set' unless language + + Backend.available? or raise 'Kramdown not available' + + document = ::Kramdown::Document.new(source, **(language.options || {})) + Tree.new(document.root, source) + end + end + + class Node < ::TreeHaver::Base::Node + TYPE_MAP = { + root: 'document', + header: 'heading', + codeblock: 'code_block', + p: 'paragraph' + }.freeze + + Markdown::Merge::BackendSupport.configure_node_link_and_navigation!( + self, + next_sibling_selector: :next, + prev_sibling_selector: :previous, + parent_selector: :parent + ) + Markdown::Merge::BackendSupport.configure_node_heading_and_code_block_helpers!( + self, + heading_matcher: ->(node) { node.raw_type == 'header' }, + code_block_matcher: ->(node) { node.raw_type == 'codeblock' } + ) + + def type + TYPE_MAP.fetch(raw_type.to_sym, raw_type) + end + + alias kind type + + def raw_type + inner_node.type.to_s + end + + def text + return inner_node.value.to_s if inner_node.value + return inner_node.options[:raw_text].to_s if inner_node.options.key?(:raw_text) + + children.map(&:text).join + end + + def children + Array(inner_node.children).map { |child| self.class.new(child, source: source, lines: lines) } + end + + def header_level + return unless raw_type == 'header' + + inner_node.options[:level] + end + + def fence_info + return unless raw_type == 'codeblock' + + inner_node.options[:lang] + end + + def start_point + line = [inner_node.options.fetch(:location, 1).to_i - 1, 0].max + Point.new(line, 0) + end + + def end_point + Point.new([start_point.row + text.lines.count - 1, start_point.row].max, 0) + end + + def start_byte + calculate_byte_offset(start_point.row, start_point.column) + end + + def end_byte + calculate_byte_offset(end_point.row, end_point.column) + end + end + end + end +end From 0bb867def7c174d89a30c98ff021bd035737401c Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 18:41:41 -0600 Subject: [PATCH 056/347] =?UTF-8?q?=F0=9F=A7=AD=20Route=20Psych=20partial?= =?UTF-8?q?=20parsing=20through=20TreeHaver?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/psych-merge/lib/psych/merge.rb | 8 ++++++-- .../lib/psych/merge/partial_template_merger.rb | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gems/psych-merge/lib/psych/merge.rb b/gems/psych-merge/lib/psych/merge.rb index 25055b6f4..02a7c2009 100644 --- a/gems/psych-merge/lib/psych/merge.rb +++ b/gems/psych-merge/lib/psych/merge.rb @@ -158,8 +158,7 @@ def parse_yaml(source, dialect, backend: nil) end return unsupported_feature_parse_result("Unsupported YAML dialect #{dialect}.") unless dialect == 'yaml' - tree = TreeHaver.parser_for(:yaml).parse(source) - parsed = yaml_document_value_from_tree(tree) + parsed = yaml_value_for_source(source) Yaml::Merge.analyze_yaml_document(parsed, dialect) rescue TreeHaver::Error, StandardError => e parse_error_result(e.message) @@ -227,6 +226,11 @@ def register_backend! end end + def yaml_value_for_source(source) + tree = TreeHaver.with_backend(BACKEND_REFERENCE.id) { TreeHaver.parser_for(:yaml).parse(source) } + yaml_document_value_from_tree(tree) + end + private def diagnostic(severity, category, message) diff --git a/gems/psych-merge/lib/psych/merge/partial_template_merger.rb b/gems/psych-merge/lib/psych/merge/partial_template_merger.rb index ac86dcc76..a26ca7810 100644 --- a/gems/psych-merge/lib/psych/merge/partial_template_merger.rb +++ b/gems/psych-merge/lib/psych/merge/partial_template_merger.rb @@ -73,7 +73,7 @@ def create_smart_merger(template_content, destination_content) end def parse_content_value(content) - ::Psych.safe_load(content) + Psych::Merge.yaml_value_for_source(content) end def dump_content_value(value) From 66e1473ff6bbda810449454522bd255bbf84a3b0 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 18:46:09 -0600 Subject: [PATCH 057/347] =?UTF-8?q?=F0=9F=A7=AD=20Route=20Markdown=20analy?= =?UTF-8?q?sis=20through=20TreeHaver=20backends?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/kramdown-merge/lib/kramdown/merge.rb | 17 +++-- gems/markdown-merge/lib/markdown/merge.rb | 11 ++-- .../lib/markdown/merge/file_analysis.rb | 63 ++++++++++--------- .../markdown/merge/partial_template_merger.rb | 2 +- .../lib/markdown/merge/smart_merger.rb | 2 +- 5 files changed, 50 insertions(+), 45 deletions(-) diff --git a/gems/kramdown-merge/lib/kramdown/merge.rb b/gems/kramdown-merge/lib/kramdown/merge.rb index a721c9b80..e21164e44 100644 --- a/gems/kramdown-merge/lib/kramdown/merge.rb +++ b/gems/kramdown-merge/lib/kramdown/merge.rb @@ -85,7 +85,7 @@ def merge_markdown(template_source, destination_source, dialect, backend: nil) return unsupported_feature_result("Unsupported Markdown backend #{requested}.") end - Markdown::Merge.merge_markdown(template_source, destination_source, dialect) + Markdown::Merge.merge_markdown(template_source, destination_source, dialect, backend: BACKEND_REFERENCE.id) end def merge_markdown_with_reviewed_nested_outputs(template_source, destination_source, dialect, review_state, @@ -100,7 +100,8 @@ def merge_markdown_with_reviewed_nested_outputs(template_source, destination_sou destination_source, dialect, review_state, - applied_children + applied_children, + backend: BACKEND_REFERENCE.id ) end @@ -115,7 +116,8 @@ def merge_markdown_with_reviewed_nested_outputs_from_replay_bundle(template_sour template_source, destination_source, dialect, - replay_bundle + replay_bundle, + backend: BACKEND_REFERENCE.id ) end @@ -130,7 +132,8 @@ def merge_markdown_with_reviewed_nested_outputs_from_replay_bundle_envelope(temp template_source, destination_source, dialect, - envelope + envelope, + backend: BACKEND_REFERENCE.id ) end @@ -145,7 +148,8 @@ def merge_markdown_with_reviewed_nested_outputs_from_review_state(template_sourc template_source, destination_source, dialect, - review_state + review_state, + backend: BACKEND_REFERENCE.id ) end @@ -160,7 +164,8 @@ def merge_markdown_with_reviewed_nested_outputs_from_review_state_envelope(templ template_source, destination_source, dialect, - envelope + envelope, + backend: BACKEND_REFERENCE.id ) end diff --git a/gems/markdown-merge/lib/markdown/merge.rb b/gems/markdown-merge/lib/markdown/merge.rb index 1baac48ee..bcd78590a 100644 --- a/gems/markdown-merge/lib/markdown/merge.rb +++ b/gems/markdown-merge/lib/markdown/merge.rb @@ -13,7 +13,8 @@ module Merge BACKEND_REFERENCES = { 'kreuzberg-language-pack' => TreeHaver::KREUZBERG_LANGUAGE_PACK_BACKEND, 'commonmarker' => TreeHaver::BackendReference.new(id: 'commonmarker', family: 'native').freeze, - 'markly' => TreeHaver::BackendReference.new(id: 'markly', family: 'native').freeze + 'markly' => TreeHaver::BackendReference.new(id: 'markly', family: 'native').freeze, + 'kramdown' => TreeHaver::BackendReference.new(id: 'kramdown', family: 'native').freeze }.freeze class Error < Ast::Merge::Error; end @@ -588,12 +589,8 @@ def resolve_backend(backend) def markdown_backend_available_for_analysis?(backend_id) registrations = TreeHaver.registered_languages(:markdown) case backend_id.to_s - when 'commonmarker' - registrations.dig(:commonmarker, :backend_module)&.then do |backend_module| - !backend_module.respond_to?(:available?) || backend_module.available? - end - when 'markly' - registrations.dig(:markly, :backend_module)&.then do |backend_module| + when 'commonmarker', 'markly', 'kramdown' + registrations.dig(backend_id.to_sym, :backend_module)&.then do |backend_module| !backend_module.respond_to?(:available?) || backend_module.available? end when 'kreuzberg-language-pack' diff --git a/gems/markdown-merge/lib/markdown/merge/file_analysis.rb b/gems/markdown-merge/lib/markdown/merge/file_analysis.rb index ffc20dcc6..66753c964 100644 --- a/gems/markdown-merge/lib/markdown/merge/file_analysis.rb +++ b/gems/markdown-merge/lib/markdown/merge/file_analysis.rb @@ -61,7 +61,7 @@ def default_freeze_node_class end end - # @return [Symbol] The backend being used (:commonmarker, :markly) + # @return [Symbol] The backend being used (:commonmarker, :markly, :kramdown) attr_reader :backend # @return [Hash] Parser-specific options @@ -70,7 +70,7 @@ def default_freeze_node_class # Initialize file analysis with tree_haver backend. # # @param source [String] Markdown source code to analyze - # @param backend [Symbol] Backend to use (:commonmarker, :markly, :auto) + # @param backend [Symbol] Backend to use (:commonmarker, :markly, :kramdown, :auto) # @param freeze_token [String] Token for freeze block markers # @param signature_generator [Proc, nil] Custom signature generator # @param parser_options [Hash] Backend-specific parser options @@ -311,63 +311,66 @@ def collect_text_recursive(node, text_parts) # Resolve the backend to use. # - # For :auto, attempts commonmarker first, then markly. - # tree_haver handles the actual availability checking. + # For :auto, use the same backend selection as the Markdown substrate facade. + # tree_haver handles the final availability checking. # # @param backend [Symbol] Requested backend - # @return [Symbol] Resolved backend (:commonmarker or :markly) + # @return [Symbol] Resolved backend def resolve_backend(backend) - return backend unless backend == :auto + return Markdown::Merge.resolve_backend(nil).to_sym if backend.to_s.empty? || backend == :auto - # Try commonmarker first, then markly - if TreeHaver::BackendRegistry.available?(:commonmarker) - :commonmarker - elsif TreeHaver::BackendRegistry.available?(:markly) - :markly - else - # Let tree_haver raise the appropriate error - :commonmarker - end + backend.to_sym end # Create a parser for the resolved backend. # # @return [Object] tree_haver parser instance def create_parser + raise ArgumentError, "Unknown backend: #{@backend}" unless Markdown::Merge::BACKEND_REFERENCES.key?(@backend.to_s) + + parser = TreeHaver.with_backend(@backend) { TreeHaver.parser_for(:markdown) } + case @backend when :commonmarker - create_commonmarker_parser + parser.language = commonmarker_language when :markly - create_markly_parser + parser.language = markly_language + when :kramdown + parser.language = kramdown_language else - raise ArgumentError, "Unknown backend: #{@backend}" + return parser end + + parser end - # Create a Commonmarker parser via commonmarker-merge backend. + # Create a Commonmarker language config for the TreeHaver parser. # - # @return [Commonmarker::Merge::Backend::Parser] - def create_commonmarker_parser - parser = Commonmarker::Merge::Backend::Parser.new + # @return [Commonmarker::Merge::Backend::Language] + def commonmarker_language # Default options enable table extension for GFM compatibility default_options = { extension: { table: true } } options = default_options.merge(@parser_options[:options] || {}) - parser.language = Commonmarker::Merge::Backend::Language.markdown(options: options) - parser + Commonmarker::Merge::Backend::Language.markdown(options: options) end - # Create a Markly parser via markly-merge backend. + # Create a Markly language config for the TreeHaver parser. # - # @return [Markly::Merge::Backend::Parser] - def create_markly_parser - parser = Markly::Merge::Backend::Parser.new + # @return [Markly::Merge::Backend::Language] + def markly_language flags = @parser_options[:flags] extensions = @parser_options[:extensions] || [:table] - parser.language = Markly::Merge::Backend::Language.markdown( + Markly::Merge::Backend::Language.markdown( flags: flags, extensions: extensions ) - parser + end + + # Create a Kramdown language config for the TreeHaver parser. + # + # @return [Kramdown::Merge::Backend::Language] + def kramdown_language + Kramdown::Merge::Backend::Language.markdown(options: @parser_options[:options] || {}) end end end diff --git a/gems/markdown-merge/lib/markdown/merge/partial_template_merger.rb b/gems/markdown-merge/lib/markdown/merge/partial_template_merger.rb index c6af2096c..ddcbc84da 100644 --- a/gems/markdown-merge/lib/markdown/merge/partial_template_merger.rb +++ b/gems/markdown-merge/lib/markdown/merge/partial_template_merger.rb @@ -169,7 +169,7 @@ def merge_section_content(section_content, section_context: nil) # @param backend [Symbol] The backend to validate # @raise [ArgumentError] If backend is not supported def validate_backend!(backend) - valid_backends = %i[auto markly commonmarker] + valid_backends = %i[auto markly commonmarker kramdown] return if valid_backends.include?(backend.to_sym) raise ArgumentError, "Unknown backend: #{backend}. Supported: #{valid_backends.join(', ')}" diff --git a/gems/markdown-merge/lib/markdown/merge/smart_merger.rb b/gems/markdown-merge/lib/markdown/merge/smart_merger.rb index 3620460fa..b7c228393 100644 --- a/gems/markdown-merge/lib/markdown/merge/smart_merger.rb +++ b/gems/markdown-merge/lib/markdown/merge/smart_merger.rb @@ -59,7 +59,7 @@ module Merge # @see FileAnalysis # @see SmartMergerBase class SmartMerger < SmartMergerBase - VALID_BACKENDS = %i[auto commonmarker markly].freeze + VALID_BACKENDS = %i[auto commonmarker markly kramdown].freeze class << self def default_backend From 1d129e9fe4dfe42a5d6e62bd11f076c327e5cdbf Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 18:49:34 -0600 Subject: [PATCH 058/347] =?UTF-8?q?=F0=9F=9A=AB=20Fail=20closed=20ast-merg?= =?UTF-8?q?e-git=20JSON=20merge3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-merge-git/lib/ast/merge/git.rb | 235 +----------------- .../spec/fixtures_integration_spec.rb | 43 +--- spec/architecture/tree_haver_only_spec.rb | 2 +- 3 files changed, 8 insertions(+), 272 deletions(-) diff --git a/gems/ast-merge-git/lib/ast/merge/git.rb b/gems/ast-merge-git/lib/ast/merge/git.rb index f1766c986..f4a51bbfa 100644 --- a/gems/ast-merge-git/lib/ast/merge/git.rb +++ b/gems/ast-merge-git/lib/ast/merge/git.rb @@ -1,6 +1,5 @@ # frozen_string_literal: true -require 'json' require 'version_gem' require 'ast/merge' @@ -33,54 +32,13 @@ def merge3(request) end def merge3_json(request) - base = parse_json_role('base', request.fetch(:base_source)) - ours = parse_json_role('ours', request.fetch(:ours_source)) - theirs = parse_json_role('theirs', request.fetch(:theirs_source)) - conflicts = [] - change_classifications = classify_json_changes(base, ours, theirs) - merged = merge_json_value(base, ours, theirs, '', conflicts) - if conflicts.any? - owned_regions = json_owned_regions_for_conflicts(request, conflicts) - render_strategy = owned_regions.empty? ? 'full_file_conflict_markers' : 'owned_region_conflict_markers' - return response( - ok: false, - request: request, - conflicted_source: render_json_owned_region_conflict_source(request, - owned_regions.first) || render_conflict_source( - request, conflicts - ), - conflicts: conflicts, - change_classifications: change_classifications, - owned_regions: owned_regions, - render_strategy: render_strategy, - diagnostics: [{ - severity: 'error', - category: MERGE_CONFLICT_CATEGORY, - message: "merge3 found #{conflicts.length} unresolved conflict(s)." - }] - ) - end - - output = JSON.generate(merged) - response( - ok: true, - request: request, - merged_source: output, - change_classifications: change_classifications, - reparse_after_render: JSON.parse(output) && true, - formatting_preservation: { - line_diff_score: 1.0, - character_diff_score: 1.0 - } - ) - rescue JSON::ParserError => e response( ok: false, request: request, diagnostics: [{ severity: 'error', - category: 'parse_error', - message: e.message + category: 'unsupported_feature', + message: 'JSON merge3 must be rebuilt on top of Json::Merge and TreeHaver before ast-merge-git can use it.' }] ) end @@ -202,7 +160,7 @@ def secondary_formatting_metrics_for(merged) def render_identity(request) case normalize_language(request) when 'json' - { backend_id: 'native-json', parser_identity: 'standard-json' } + { backend_id: 'tree-haver-required', parser_identity: 'json-merge-unavailable' } else {} end @@ -225,188 +183,6 @@ def render_conflict_source(request, conflicts) ].join("\n") end - def render_json_owned_region_conflict_source(request, region) - return nil unless region && region.fetch(:region_kind) == 'node' - - key = region.fetch(:owner_path).delete_prefix('/') - ours_region = json_member_source(request.fetch(:ours_source), key) - base_region = json_member_source(request.fetch(:base_source), key) - theirs_region = json_member_source(request.fetch(:theirs_source), key) - return nil unless ours_region && base_region && theirs_region - - marker_size = request[:conflict_marker_size].to_i - marker_size = 7 unless marker_size.positive? - replacement = [ - "#{'<' * marker_size} ours", - ours_region.fetch(:text), - "#{'|' * marker_size} base", - base_region.fetch(:text), - '=' * marker_size, - theirs_region.fetch(:text), - "#{'>' * marker_size} theirs" - ].join("\n") - range = ours_region.fetch(:byte_range) - source = request.fetch(:ours_source) - prefix = source.byteslice(0, range.fetch(:start)) || '' - suffix = source.byteslice(range.fetch(:end), source.bytesize - range.fetch(:end)) || '' - prefix + replacement + suffix - end - - def json_member_source(source, key) - return nil unless source.include?("\"#{key}\"") - - range = json_key_byte_range(source, key) - return nil if range.fetch(:end) <= range.fetch(:start) - - { - byte_range: range, - text: source.byteslice(range.fetch(:start)...range.fetch(:end)) - } - end - - def json_owned_regions_for_conflicts(request, conflicts) - conflicts.filter_map do |conflict| - path = conflict.fetch(:path).to_s - next unless path.start_with?('/') && path.count('/') == 1 - - key = path.delete_prefix('/') - base_region = json_member_source(request.fetch(:base_source), key) - next unless base_region && json_member_source(request.fetch(:ours_source), - key) && json_member_source(request.fetch(:theirs_source), key) - - { - owner_path: path, - node_id: "json:key:#{key}", - region_kind: 'node', - byte_range: base_region.fetch(:byte_range), - line_range: { start: 1, end: 1 }, - attached_spans: [], - backend_id: 'native-json', - parser_identity: 'standard-json', - can_replace: true, - can_line_merge: false, - requires_reparse: true - } - end - end - - def json_key_byte_range(source, key) - needle = "\"#{key}\"" - start = source.index(needle) - return { start: 0, end: source.bytesize } unless start - - finish = start + needle.bytesize - finish += 1 while finish < source.bytesize && ![',', '}'].include?(source[finish]) - { start: start, end: finish } - end - - def parse_json_role(role, source) - JSON.parse(source) - rescue JSON::ParserError => e - raise JSON::ParserError, "#{role} parse error: #{e.message}" - end - - def merge_json_value(base, ours, theirs, path, conflicts) - return ours if ours == theirs - return theirs if base == ours - return ours if base == theirs - if base.is_a?(Hash) && ours.is_a?(Hash) && theirs.is_a?(Hash) - return merge_json_objects(base, ours, theirs, path, - conflicts) - end - - add_conflict(conflicts, 'edit_edit', path, 'value changed differently in ours and theirs') - ours - end - - def merge_json_objects(base, ours, theirs, path, conflicts) - base = base.transform_keys(&:to_s) - ours = ours.transform_keys(&:to_s) - theirs = theirs.transform_keys(&:to_s) - keys = (base.keys | ours.keys | theirs.keys).sort - keys.each_with_object({}) do |key, result| - merged, keep = merge_json_entry( - base.key?(key) ? base[key] : :__absent__, - ours.key?(key) ? ours[key] : :__absent__, - theirs.key?(key) ? theirs[key] : :__absent__, - json_pointer_join(path, key), - conflicts - ) - result[key] = merged if keep - end - end - - def classify_json_changes(base, ours, theirs) - if base.is_a?(Hash) && ours.is_a?(Hash) && theirs.is_a?(Hash) - base = base.transform_keys(&:to_s) - ours = ours.transform_keys(&:to_s) - theirs = theirs.transform_keys(&:to_s) - keys = (base.keys | ours.keys | theirs.keys).sort - return keys.filter_map do |key| - ours_change = classify_json_value_change(base.key?(key) ? base[key] : :__absent__, - ours.key?(key) ? ours[key] : :__absent__) - theirs_change = classify_json_value_change(base.key?(key) ? base[key] : :__absent__, - theirs.key?(key) ? theirs[key] : :__absent__) - next if ours_change == 'unchanged' && theirs_change == 'unchanged' - - { path: json_pointer_join('', key), ours: ours_change, theirs: theirs_change } - end - end - - ours_change = classify_json_value_change(base, ours) - theirs_change = classify_json_value_change(base, theirs) - return [] if ours_change == 'unchanged' && theirs_change == 'unchanged' - - [{ path: '/', ours: ours_change, theirs: theirs_change }] - end - - def classify_json_value_change(base, value) - return 'unchanged' if base == :__absent__ && value == :__absent__ - return 'added' if base == :__absent__ - return 'deleted' if value == :__absent__ - return 'unchanged' if base == value - - 'edited' - end - - def merge_json_entry(base, ours, theirs, path, conflicts) - base_absent = base == :__absent__ - ours_absent = ours == :__absent__ - theirs_absent = theirs == :__absent__ - return [nil, false] if base_absent && ours_absent && theirs_absent - return [theirs, true] if base_absent && ours_absent - return [ours, true] if base_absent && theirs_absent - return [ours, true] if base_absent && ours == theirs - - if base_absent - add_conflict(conflicts, 'add_add', path, 'same path added differently in ours and theirs') - return [ours, true] - end - return [nil, false] if ours_absent && theirs_absent - return [nil, false] if ours_absent && base == theirs - return [nil, false] if theirs_absent && base == ours - - if ours_absent - add_conflict(conflicts, 'delete_edit', path, 'ours deleted a value that theirs edited') - return [theirs, true] - end - if theirs_absent - add_conflict(conflicts, 'delete_edit', path, 'theirs deleted a value that ours edited') - return [ours, true] - end - - [merge_json_value(base, ours, theirs, path, conflicts), true] - end - - def add_conflict(conflicts, category, path, message) - conflicts << { - conflict_id: "conflict-#{conflicts.length + 1}", - category: category, - path: path.empty? ? '/' : path, - message: message - } - end - def comment_conflict(category, path, message) { conflict_id: 'comment-conflict-1', @@ -416,11 +192,6 @@ def comment_conflict(category, path, message) } end - def json_pointer_join(parent, token) - escaped = token.to_s.gsub('~', '~0').gsub('/', '~1') - parent.empty? ? "/#{escaped}" : "#{parent}/#{escaped}" - end - def normalize_language(request) language = request[:language].to_s.strip.downcase return 'json' if language == 'json' diff --git a/gems/ast-merge-git/spec/fixtures_integration_spec.rb b/gems/ast-merge-git/spec/fixtures_integration_spec.rb index 523101801..7d25a9c99 100644 --- a/gems/ast-merge-git/spec/fixtures_integration_spec.rb +++ b/gems/ast-merge-git/spec/fixtures_integration_spec.rb @@ -11,52 +11,17 @@ def read_json(path) Ast::Merge.normalize_value(JSON.parse(path.read)) end - it 'conforms to the git merge3 contract fixture' do + it 'fails closed for the git merge3 contract fixture until JSON merge3 is TreeHaver-backed' do fixture = read_json(fixtures_root.join('diagnostics', 'slice-950-git-merge3-contract', 'git-merge3-contract.json')) expect(fixture.dig(:contract, :package)).to eq('ast-merge-git') expect(fixture.dig(:contract, :operation)).to eq('merge3') fixture.fetch(:cases).each do |test_case| result = described_class.merge3(test_case.fetch(:request)) - expected = test_case.fetch(:expected) - expect(result.fetch(:ok)).to eq(expected.fetch(:ok)), test_case.fetch(:case_id) - expect(result.fetch(:conflicts).length).to eq(expected.fetch(:conflict_count)), test_case.fetch(:case_id) - if expected.key?(:change_classifications) - expect(result.fetch(:change_classifications)).to eq(expected.fetch(:change_classifications)) - end - expect(result.fetch(:reparse_after_render)).to eq(expected.fetch(:reparse_after_render)) - expect(result.fetch(:render_report)).to eq(expected.fetch(:render_report)) if expected.key?(:render_report) - if expected.key?(:formatting_preservation) - expect(result.fetch(:formatting_preservation)).to eq(expected.fetch(:formatting_preservation)) - end - if expected.key?(:secondary_formatting_metrics) - expect(result.fetch(:secondary_formatting_metrics)).to eq(expected.fetch(:secondary_formatting_metrics)) - end - if expected.key?(:default_driver_evaluation) - expect(result.fetch(:default_driver_evaluation)).to eq(expected.fetch(:default_driver_evaluation)) - end - if expected.key?(:owned_regions) - expect(result.fetch(:owned_regions).length).to eq(expected.fetch(:owned_regions).length), - test_case.fetch(:case_id) - expected.fetch(:owned_regions).each_with_index do |expected_region, index| - expect(result.fetch(:owned_regions)[index]).to include(expected_region), test_case.fetch(:case_id) - end - end - if result.fetch(:ok) - expect(JSON.parse(result.fetch(:merged_source))).to eq(JSON.parse(JSON.generate(expected.fetch(:merged_json)))) - else - expect(result.fetch(:conflicts).map do |conflict| - conflict.fetch(:category) - end).to eq(expected.fetch(:conflict_categories)) - expect(result.fetch(:conflicts).map { |conflict| conflict.fetch(:path) }).to eq(expected.fetch(:conflict_paths)) - expected.fetch(:conflicted_source_contains, []).each do |needle| - expect(result.fetch(:conflicted_source)).to include(needle), test_case.fetch(:case_id) - end - expected.fetch(:conflicted_source_not_contains, []).each do |needle| - expect(result.fetch(:conflicted_source)).not_to include(needle), test_case.fetch(:case_id) - end - end + expect(result.fetch(:ok)).to be(false), test_case.fetch(:case_id) + expect(result.fetch(:diagnostics).first.fetch(:category)).to eq('unsupported_feature') + expect(result.fetch(:diagnostics).first.fetch(:message)).to include('Json::Merge and TreeHaver') end end diff --git a/spec/architecture/tree_haver_only_spec.rb b/spec/architecture/tree_haver_only_spec.rb index e9ea7acd1..05c9b9933 100644 --- a/spec/architecture/tree_haver_only_spec.rb +++ b/spec/architecture/tree_haver_only_spec.rb @@ -20,7 +20,7 @@ ).freeze def current_parser_bypass_references - Dir.glob(ROOT.join('gems', '*-merge', 'lib', '**', '*.rb')).each_with_object(Set.new) do |path, matches| + Dir.glob(ROOT.join('gems', '{*-merge,*-merge-git}', 'lib', '**', '*.rb')).each_with_object(Set.new) do |path, matches| relative_path = Pathname.new(path).relative_path_from(ROOT).to_s next if relative_path.include?('/rspec/') From 1ecb01fcfcc6cb77625283bf5a1a78615a3c7863 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 18:59:12 -0600 Subject: [PATCH 059/347] route TSLP backend through on-demand parser --- gems/tree_haver/Gemfile | 12 +++++- .../lib/tree_haver/backends/tslp.rb | 11 +++--- gems/tree_haver/spec/backends/tslp_spec.rb | 38 ++++++++++++++----- 3 files changed, 46 insertions(+), 15 deletions(-) diff --git a/gems/tree_haver/Gemfile b/gems/tree_haver/Gemfile index ffa800806..4be2ceec0 100644 --- a/gems/tree_haver/Gemfile +++ b/gems/tree_haver/Gemfile @@ -25,7 +25,17 @@ gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? && !tslp_dev.to_s.empty? -if !tslp_declared_by_templating && tslp_dev.to_s.empty? +unless tslp_declared_by_templating + if tslp_dev.to_s.empty? + gem( + 'tree_sitter_language_pack', + git: 'https://github.com/structuredmerge/tree-sitter-language-pack.git', + branch: 'fix/ruby-4-installs', + glob: 'packages/ruby/*.gemspec' + ) + else + gem 'tree_sitter_language_pack', path: tslp_dev + end end # Modular sibling dependencies (env-switched inside each modular Gemfile) diff --git a/gems/tree_haver/lib/tree_haver/backends/tslp.rb b/gems/tree_haver/lib/tree_haver/backends/tslp.rb index e8b0eadd6..1d4e7f8a4 100644 --- a/gems/tree_haver/lib/tree_haver/backends/tslp.rb +++ b/gems/tree_haver/lib/tree_haver/backends/tslp.rb @@ -2,7 +2,7 @@ module TreeHaver module Backends - # TSLP backend using tree_sitter_language_pack's parser API. + # TSLP backend using tree_sitter_language_pack's on-demand parser API. # # This backend intentionally requires the real parser API. The language-pack # process API is not a TreeHaver parser backend and must not be used as a @@ -55,10 +55,10 @@ def capabilities private def parser_api_available? + return false unless ::TreeSitterLanguagePack.respond_to?(:get_parser) return false unless defined?(::TreeSitterLanguagePack::Parser) - parser = ::TreeSitterLanguagePack::Parser.new - parser.respond_to?(:set_language) && parser.respond_to?(:parse) + ::TreeSitterLanguagePack::Parser.instance_methods.include?(:parse) rescue StandardError => e @unavailable_reason = e.message false @@ -82,8 +82,9 @@ def parse(source) raise TreeHaver::NotAvailable, unavailable_message unless Tslp.available? raise TreeHaver::NotAvailable, 'TSLP language is not set' unless language - parser = ::TreeSitterLanguagePack::Parser.new - parser.set_language(language.name.to_s) + parser = ::TreeSitterLanguagePack.get_parser(language.name.to_s) + raise TreeHaver::NotAvailable, "TSLP did not return a parser for #{language.name}" unless parser + raw_tree = parser.parse(source) raise TreeHaver::NotAvailable, "TSLP did not return a parse tree for #{language.name}" unless raw_tree diff --git a/gems/tree_haver/spec/backends/tslp_spec.rb b/gems/tree_haver/spec/backends/tslp_spec.rb index 484369571..3e1d3fc76 100644 --- a/gems/tree_haver/spec/backends/tslp_spec.rb +++ b/gems/tree_haver/spec/backends/tslp_spec.rb @@ -10,13 +10,12 @@ it 'reports availability only when tree_sitter_language_pack exposes a parser API' do stub_const('TreeSitterLanguagePack', Module.new) parser_class = Class.new do - def set_language(_name); end - def parse(_source) :tree end end TreeSitterLanguagePack.const_set(:Parser, parser_class) + allow(TreeSitterLanguagePack).to receive(:get_parser) expect(described_class.available?).to be(true) end @@ -25,6 +24,7 @@ def parse(_source) stub_const('TreeSitterLanguagePack', Module.new) parser_class = Class.new TreeSitterLanguagePack.const_set(:Parser, parser_class) + allow(TreeSitterLanguagePack).to receive(:get_parser) expect(described_class.available?).to be(false) expect(described_class.unavailable_reason).to eq('tree_sitter_language_pack parser API is not exposed') @@ -44,21 +44,41 @@ def parse(_source) is_extra: false ) raw_tree = instance_double('TreeSitterLanguagePack::Tree', root_node: raw_node) - parser = double( - 'TreeSitterLanguagePack::Parser', - set_language: nil, - parse: raw_tree - ) - parser_class = double('TreeSitterLanguagePack::Parser', new: parser) + parser = double('TreeSitterLanguagePack::Parser', parse: raw_tree) + parser_class = Class.new do + def parse(_source) + :tree + end + end stub_const('TreeSitterLanguagePack', Module.new) TreeSitterLanguagePack.const_set(:Parser, parser_class) + allow(TreeSitterLanguagePack).to receive(:get_parser).with('toml').and_return(parser) tree_haver_parser = described_class::Parser.new tree_haver_parser.language = described_class::Language.new(:toml) tree = tree_haver_parser.parse("title = 1\n") - expect(parser).to have_received(:set_language).with('toml') + expect(TreeSitterLanguagePack).to have_received(:get_parser).with('toml') expect(parser).to have_received(:parse).with("title = 1\n") expect(tree.root_node.type).to eq('document') end + + it 'can parse through a real TSLP language when the installed binding exposes parser methods' do + begin + require 'tree_sitter_language_pack' + rescue LoadError + skip 'tree_sitter_language_pack is not installed' + end + + described_class.reset! + skip described_class.unavailable_reason || 'tree_sitter_language_pack parser API is unavailable' unless described_class.available? + skip 'tree_sitter_language_pack does not publish json' unless TreeSitterLanguagePack.has_language('json') + + tree_haver_parser = described_class::Parser.new + tree_haver_parser.language = described_class::Language.new(:json) + tree = tree_haver_parser.parse('{"a":1}') + + expect(tree.root_node.type).to eq('document') + expect(tree.root_node.children.map(&:type)).to include('object') + end end From 2bd79173cb831eb5ea4813e4776ea49535102c0c Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 19:04:25 -0600 Subject: [PATCH 060/347] rebuild JSON analysis on TreeHaver nodes --- gems/json-merge/lib/json/merge.rb | 169 +++++------------- .../lib/json/merge/file_analysis.rb | 4 +- .../json-merge/lib/json/merge/node_wrapper.rb | 15 +- .../spec/fixtures_integration_spec.rb | 11 +- 4 files changed, 63 insertions(+), 136 deletions(-) diff --git a/gems/json-merge/lib/json/merge.rb b/gems/json-merge/lib/json/merge.rb index 8d83f9df3..1f55d3f9b 100644 --- a/gems/json-merge/lib/json/merge.rb +++ b/gems/json-merge/lib/json/merge.rb @@ -14,10 +14,6 @@ module Merge surface: 'array', name: 'destination_wins_array' }.freeze - TRAILING_COMMA_FALLBACK_POLICY = { - surface: 'fallback', - name: 'trailing_comma_destination_fallback' - }.freeze BACKEND_REGISTRY = Struct.new(:registered, :mutex).new(false, Mutex.new) class Error < Ast::Merge::Error; end @@ -62,7 +58,7 @@ def json_feature_profile { family: 'json', supported_dialects: %w[json jsonc], - supported_policies: [DESTINATION_WINS_ARRAY_POLICY, TRAILING_COMMA_FALLBACK_POLICY] + supported_policies: [DESTINATION_WINS_ARRAY_POLICY] } end @@ -72,14 +68,21 @@ def parse_json(source, dialect) return parse_failure("Trailing commas are not supported for #{dialect}.") end + register_backend! analysis = FileAnalysis.new(normalized_source) unless analysis.valid? return parse_failure(analysis.errors.map { |error| error.respond_to?(:message) ? error.message : error.inspect }.join(', ')) end { - ok: false, - diagnostics: [unsupported_feature('json-merge owner extraction must be rebuilt from TreeHaver AST nodes.')], + ok: true, + diagnostics: [], + analysis: { + dialect: dialect, + allows_comments: dialect == 'jsonc', + root_kind: json_analysis_root_kind(analysis), + owners: collect_file_analysis_owners(analysis) + }, policies: [] } rescue TreeHaver::Error, StandardError => e @@ -131,16 +134,6 @@ def parse_failure(message) end private_class_method :parse_failure - def unsupported_jsonc_language_pack_result - { - ok: false, - diagnostics: [ - unsupported_feature('tree-sitter-language-pack json parsing currently supports only the json dialect.') - ] - } - end - private_class_method :unsupported_jsonc_language_pack_result - def parse_error(message) { severity: 'error', category: 'parse_error', message: message } end @@ -151,57 +144,46 @@ def unsupported_feature(message) end private_class_method :unsupported_feature - def fallback_applied(message) - { severity: 'warning', category: 'fallback_applied', message: message } - end - private_class_method :fallback_applied - - def json_root_kind(value) - return 'object' if value.is_a?(Hash) - return 'array' if value.is_a?(Array) + def json_analysis_root_kind(analysis) + root = analysis.root_object || analysis.root_node + return 'object' if root&.object? + return 'array' if root&.array? 'scalar' end - private_class_method :json_root_kind + private_class_method :json_analysis_root_kind + + def collect_file_analysis_owners(analysis) + root = analysis.root_object || analysis.root_node + return [] unless root - def collect_json_owners(value, path = '') - if value.is_a?(Hash) - value.keys.sort.flat_map do |key| - next_path = "#{path}/#{key}" - [{ path: next_path, owner_kind: 'member', match_key: key }] + collect_json_owners(value[key], next_path) + collect_json_node_owners(root, '') + .sort_by { |owner| owner.fetch(:path) } + end + private_class_method :collect_file_analysis_owners + + def collect_json_node_owners(node, path) + if node.object? + node.pairs.flat_map do |pair| + key = pair.key_name + next [] unless key + + owner_path = "#{path}/#{key}" + value = pair.value_node + [{ path: owner_path, owner_kind: 'member', match_key: key }] + + (value ? collect_json_node_owners(value, owner_path) : []) end - elsif value.is_a?(Array) - value.each_with_index.flat_map do |item, index| - next_path = "#{path}/#{index}" - [{ path: next_path, owner_kind: 'element' }] + collect_json_owners(item, next_path) + elsif node.array? + node.elements.each_with_index.flat_map do |element, index| + owner_path = "#{path}/#{index}" + [{ path: owner_path, owner_kind: 'element' }] + + collect_json_node_owners(element, owner_path) end else [] end end - private_class_method :collect_json_owners - - def merge_json_values(template, destination) - if template.is_a?(Hash) && destination.is_a?(Hash) - ordered_merge_keys(template, destination).each_with_object({}) do |key, merged| - merged[key] = if !template.key?(key) - destination[key] - elsif !destination.key?(key) - template[key] - else - merge_json_values(template[key], destination[key]) - end - end - else - destination - end - end - private_class_method :merge_json_values - - def ordered_merge_keys(template, destination) - template.keys + destination.keys.reject { |key| template.key?(key) } - end - private_class_method :ordered_merge_keys + private_class_method :collect_json_node_owners def detect_trailing_comma(source) state = scanner_state @@ -288,77 +270,6 @@ def strip_json_comments(source) end private_class_method :strip_json_comments - def try_destination_trailing_comma_fallback(source) - stripped = strip_trailing_commas(source) - return nil if stripped == source - - stripped - end - private_class_method :try_destination_trailing_comma_fallback - - def strip_trailing_commas(source) - result = +'' - state = scanner_state - source.each_char.with_index do |char, index| - next_char = source[index + 1] - - if state[:in_line_comment] - result << char - state[:in_line_comment] = false if char == "\n" - next - end - - if state[:in_block_comment] - result << char - if char == '*' && next_char == '/' - result << next_char - state[:in_block_comment] = false - end - next - end - - if state[:in_string] - result << char - if state[:escaped] - state[:escaped] = false - elsif char == '\\' - state[:escaped] = true - elsif char == '"' - state[:in_string] = false - end - next - end - - if char == '"' - state[:in_string] = true - result << char - next - end - - if char == '/' && next_char == '/' - state[:in_line_comment] = true - result << char - next - end - - if char == '/' && next_char == '*' - state[:in_block_comment] = true - result << char - next - end - - if char == ',' - lookahead = source[(index + 1)..] - trimmed = lookahead&.lstrip - next if trimmed&.start_with?(']', '}') - end - - result << char - end - result - end - private_class_method :strip_trailing_commas - def scanner_state { in_string: false, diff --git a/gems/json-merge/lib/json/merge/file_analysis.rb b/gems/json-merge/lib/json/merge/file_analysis.rb index 602851804..81cad85b6 100644 --- a/gems/json-merge/lib/json/merge/file_analysis.rb +++ b/gems/json-merge/lib/json/merge/file_analysis.rb @@ -220,7 +220,9 @@ def parse_json end def collect_parse_errors(node, found_errors = []) - if node.type.to_s == 'ERROR' || (node.respond_to?(:missing?) && node.missing?) + if node.type.to_s == 'ERROR' || + (node.respond_to?(:has_error?) && node.has_error?) || + (node.respond_to?(:missing?) && node.missing?) found_errors << { type: node.type.to_s, start_point: node.respond_to?(:start_point) ? node.start_point : nil, diff --git a/gems/json-merge/lib/json/merge/node_wrapper.rb b/gems/json-merge/lib/json/merge/node_wrapper.rb index 9ee8d23b4..d1fdde691 100644 --- a/gems/json-merge/lib/json/merge/node_wrapper.rb +++ b/gems/json-merge/lib/json/merge/node_wrapper.rb @@ -40,7 +40,7 @@ def comment? def key_name return unless pair? - key_node = find_child_by_field('key') + key_node = find_child_by_field('key') || semantic_children.first return unless key_node node_text(key_node)&.gsub(/\A"|"\z/, '') @@ -49,7 +49,7 @@ def key_name def value_node return unless pair? - value = find_child_by_field('value') + value = find_child_by_field('value') || semantic_children[1] return unless value NodeWrapper.new(value, lines: @lines, source: @source) @@ -153,6 +153,17 @@ def find_child_by_type(type_name) nil end + def semantic_children + return [] unless @node.respond_to?(:each) + + @node.each.filter_map do |child| + child_type = child.type.to_s + next if %w[comment , : { } [ ]].include?(child_type) + + child + end + end + protected def wrap_child(child) diff --git a/gems/json-merge/spec/fixtures_integration_spec.rb b/gems/json-merge/spec/fixtures_integration_spec.rb index bc739d09d..bf7bfe564 100644 --- a/gems/json-merge/spec/fixtures_integration_spec.rb +++ b/gems/json-merge/spec/fixtures_integration_spec.rb @@ -122,11 +122,10 @@ def json_ready(value) fallback_fixture = json_fixture('fallback') fallback_result = described_class.merge_json(fallback_fixture[:template], fallback_fixture[:destination], 'json') - expect(fallback_result[:ok]).to eq(fallback_fixture.dig(:expected, :ok)) - expect(fallback_result[:output]).to eq(fallback_fixture.dig(:expected, :output)) + expect(fallback_result[:ok]).to be(false) expect( json_ready(fallback_result[:diagnostics].map { |diagnostic| diagnostic.slice(:severity, :category) }) - ).to eq(json_ready(fallback_fixture.dig(:expected, :diagnostics))) + ).to eq(json_ready([{ severity: 'error', category: 'destination_parse_error' }])) end it 'records emitter source provenance line metadata for raw source rendering' do @@ -179,6 +178,10 @@ def json_ready(value) end it 'conforms to the shared family feature profile fixture' do - expect(json_ready(described_class.json_feature_profile)).to eq(json_ready(family_profile_fixture[:feature_profile])) + expected_profile = family_profile_fixture[:feature_profile].dup + expected_profile[:supported_policies] = + expected_profile[:supported_policies].reject { |policy| policy[:surface] == 'fallback' } + + expect(json_ready(described_class.json_feature_profile)).to eq(json_ready(expected_profile)) end end From 895b42016a325b872b357a0723048317aa80f2a1 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 19:06:08 -0600 Subject: [PATCH 061/347] preserve TSLP node point locations --- .../lib/tree_haver/backends/tslp.rb | 10 +++++++ gems/tree_haver/spec/backends/tslp_spec.rb | 26 +++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/gems/tree_haver/lib/tree_haver/backends/tslp.rb b/gems/tree_haver/lib/tree_haver/backends/tslp.rb index 1d4e7f8a4..c8e5aeda0 100644 --- a/gems/tree_haver/lib/tree_haver/backends/tslp.rb +++ b/gems/tree_haver/lib/tree_haver/backends/tslp.rb @@ -119,6 +119,16 @@ def end_byte inner_node.end_byte end + def start_point + point = inner_node.start_position + { row: point.row, column: point.column } + end + + def end_point + point = inner_node.end_position + { row: point.row, column: point.column } + end + def children Array.new(inner_node.child_count) do |index| child = inner_node.child(index) diff --git a/gems/tree_haver/spec/backends/tslp_spec.rb b/gems/tree_haver/spec/backends/tslp_spec.rb index 3e1d3fc76..23e8e7150 100644 --- a/gems/tree_haver/spec/backends/tslp_spec.rb +++ b/gems/tree_haver/spec/backends/tslp_spec.rb @@ -36,6 +36,8 @@ def parse(_source) kind: 'document', start_byte: 0, end_byte: 9, + start_position: instance_double('TreeSitterLanguagePack::Point', row: 0, column: 0), + end_position: instance_double('TreeSitterLanguagePack::Point', row: 0, column: 9), child_count: 0, is_named: true, has_error: false, @@ -61,6 +63,8 @@ def parse(_source) expect(TreeSitterLanguagePack).to have_received(:get_parser).with('toml') expect(parser).to have_received(:parse).with("title = 1\n") expect(tree.root_node.type).to eq('document') + expect(tree.root_node.start_point).to eq({ row: 0, column: 0 }) + expect(tree.root_node.end_point).to eq({ row: 0, column: 9 }) end it 'can parse through a real TSLP language when the installed binding exposes parser methods' do @@ -81,4 +85,26 @@ def parse(_source) expect(tree.root_node.type).to eq('document') expect(tree.root_node.children.map(&:type)).to include('object') end + + it 'exposes real TSLP point locations through TreeHaver nodes when available' do + begin + require 'tree_sitter_language_pack' + rescue LoadError + skip 'tree_sitter_language_pack is not installed' + end + + described_class.reset! + skip described_class.unavailable_reason || 'tree_sitter_language_pack parser API is unavailable' unless described_class.available? + skip 'tree_sitter_language_pack does not publish json' unless TreeSitterLanguagePack.has_language('json') + + tree_haver_parser = described_class::Parser.new + tree_haver_parser.language = described_class::Language.new(:json) + object = tree_haver_parser.parse("{\n \"a\": 1\n}\n").root_node.children.find { |child| child.type == 'object' } + pair = object.children.find { |child| child.type == 'pair' } + + expect(pair.start_point).to eq({ row: 1, column: 2 }) + expect(pair.end_point).to eq({ row: 1, column: 8 }) + expect(pair.start_line).to eq(2) + expect(pair.end_line).to eq(2) + end end From a8d0cc27eacedadb47d060b1b776103367ae0519 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 19:08:20 -0600 Subject: [PATCH 062/347] resolve TSLP backend aliases for registered parsers --- gems/toml-merge/lib/toml/merge.rb | 2 +- gems/tree_haver/lib/tree_haver.rb | 12 ++++++++++++ gems/tree_haver/spec/backend_registry_spec.rb | 16 ++++++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/gems/toml-merge/lib/toml/merge.rb b/gems/toml-merge/lib/toml/merge.rb index 699187d75..db9b54112 100644 --- a/gems/toml-merge/lib/toml/merge.rb +++ b/gems/toml-merge/lib/toml/merge.rb @@ -303,7 +303,7 @@ def toml_backend_available_for_analysis?(backend_id) registrations = TreeHaver.registered_languages(:toml) case backend_id.to_s when TREE_SITTER_BACKEND_REFERENCE.id - registrations.key?(:tree_sitter) + registrations.key?(:tree_sitter) || registrations.key?(:tslp) else false end diff --git a/gems/tree_haver/lib/tree_haver.rb b/gems/tree_haver/lib/tree_haver.rb index db1abe91e..030da294a 100644 --- a/gems/tree_haver/lib/tree_haver.rb +++ b/gems/tree_haver/lib/tree_haver.rb @@ -383,6 +383,8 @@ def requested_backend_type(registrations) backend_ref = BackendRegistry.fetch(backend_id.to_s) type = if registrations.key?(backend_id.to_s.to_sym) backend_id.to_s.to_sym + elsif (registered_type = registered_backend_type_for_requested_backend(backend_id, registrations)) + registered_type elsif backend_ref&.family == 'tree-sitter' :tree_sitter else @@ -394,6 +396,16 @@ def requested_backend_type(registrations) end private_class_method :requested_backend_type + def registered_backend_type_for_requested_backend(backend_id, registrations) + requested_module = backend_module_for(backend_id) + return unless requested_module + + registrations.find do |_backend_type, config| + config[:backend_module].equal?(requested_module) + end&.first + end + private_class_method :registered_backend_type_for_requested_backend + def parser_for_registered_backend(name, backend_type, registrations) config = registrations.fetch(backend_type) case backend_type diff --git a/gems/tree_haver/spec/backend_registry_spec.rb b/gems/tree_haver/spec/backend_registry_spec.rb index b9dc81408..d63af2028 100644 --- a/gems/tree_haver/spec/backend_registry_spec.rb +++ b/gems/tree_haver/spec/backend_registry_spec.rb @@ -19,6 +19,22 @@ end end + it 'resolves registered backend-module aliases before falling back to tree-sitter paths' do + TreeHaver.register_language( + :alias_resolution_json, + backend_module: TreeHaver::Backends::Tslp, + backend_type: :tslp, + gem_name: 'tree_sitter_language_pack' + ) + + parser = TreeHaver.with_backend('kreuzberg-language-pack') do + TreeHaver.parser_for(:alias_resolution_json) + end + + expect(parser).to be_a(TreeHaver::Backends::Tslp::Parser) + expect(parser.language.name).to eq(:alias_resolution_json) + end + it 'loads MRI tree-sitter languages with a string language name' do stub_const('TreeSitter', Module.new) language_class = class_double('TreeSitter::Language') From 2a233f6d93c9e435d536368bca7a94d94aadcfab Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 19:10:05 -0600 Subject: [PATCH 063/347] cover TSLP source-family parsing --- gems/tree_haver/spec/backends/tslp_spec.rb | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gems/tree_haver/spec/backends/tslp_spec.rb b/gems/tree_haver/spec/backends/tslp_spec.rb index 23e8e7150..8ae1ed48c 100644 --- a/gems/tree_haver/spec/backends/tslp_spec.rb +++ b/gems/tree_haver/spec/backends/tslp_spec.rb @@ -107,4 +107,37 @@ def parse(_source) expect(pair.start_line).to eq(2) expect(pair.end_line).to eq(2) end + + it 'parses the source-family languages expected to use TSLP when available' do + begin + require 'tree_sitter_language_pack' + rescue LoadError + skip 'tree_sitter_language_pack is not installed' + end + + described_class.reset! + skip described_class.unavailable_reason || 'tree_sitter_language_pack parser API is unavailable' unless described_class.available? + + fixtures = { + json: ['{"a":1}', 'document'], + toml: ["title = \"demo\"\n[tool]\nname = \"x\"\n", 'document'], + bash: ["echo hi\n", 'program'], + go: ["package main\nfunc main() {}\n", 'source_file'], + rust: ["fn main() {}\n", 'source_file'], + typescript: ["export const x = 1;\n", 'program'], + ruby: ["class X\nend\n", 'program'], + yaml: ["name: demo\n", 'stream'], + markdown: ["# Heading\n\nBody\n", 'document'] + } + + fixtures.each do |language, (source, expected_root)| + skip "tree_sitter_language_pack does not publish #{language}" unless TreeSitterLanguagePack.has_language(language.to_s) + + TreeHaver::GrammarFinder.new(language).register!(raise_on_missing: true) + tree = TreeHaver.with_backend('tslp') { TreeHaver.parser_for(language).parse(source) } + + expect(tree.root_node.type).to eq(expected_root) + expect(tree.root_node).not_to have_error + end + end end From a4645bc9f890add9750dbc2e720cbcbc177d4b4e Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 19:14:45 -0600 Subject: [PATCH 064/347] report source-family owner extraction as unsupported --- gems/go-merge/lib/go/merge.rb | 6 +++++- .../go-merge/spec/fixtures_integration_spec.rb | 18 ++++++------------ gems/rust-merge/lib/rust/merge.rb | 9 +++++++++ .../spec/fixtures_integration_spec.rb | 18 ++++++------------ gems/typescript-merge/lib/typescript/merge.rb | 6 +++++- .../spec/fixtures_integration_spec.rb | 18 ++++++------------ 6 files changed, 37 insertions(+), 38 deletions(-) diff --git a/gems/go-merge/lib/go/merge.rb b/gems/go-merge/lib/go/merge.rb index e28b0b766..20c74a767 100644 --- a/gems/go-merge/lib/go/merge.rb +++ b/gems/go-merge/lib/go/merge.rb @@ -145,7 +145,11 @@ def line_anchored_slice(source, span) private_class_method :import_text, :declaration_text, :slice_span, :line_anchored_slice def unsupported_feature_result(message) - Ast::Merge.unsupported_feature_result(message) + { + ok: false, + diagnostics: [{ severity: 'error', category: 'unsupported_feature', message: message }], + policies: [] + } end private_class_method :unsupported_feature_result end diff --git a/gems/go-merge/spec/fixtures_integration_spec.rb b/gems/go-merge/spec/fixtures_integration_spec.rb index 0bf103b40..23b23af55 100644 --- a/gems/go-merge/spec/fixtures_integration_spec.rb +++ b/gems/go-merge/spec/fixtures_integration_spec.rb @@ -12,21 +12,15 @@ def json_ready(value) = Ast::Merge.json_ready(value) analysis_fixture = read_json(fixtures_root.join('go', 'slice-110-analysis', 'module-owners.json')) analysis = described_class.parse_go(analysis_fixture[:source], analysis_fixture[:dialect]) - expect(analysis[:ok]).to be(true) - expect(json_ready(analysis.dig(:analysis, :owners))).to eq(json_ready(analysis_fixture.dig(:expected, :owners))) - - matching_fixture = read_json(fixtures_root.join('go', 'slice-111-matching', 'path-equality.json')) - template = described_class.parse_go(matching_fixture[:template], 'go') - destination = described_class.parse_go(matching_fixture[:destination], 'go') - matching = described_class.match_go_owners(template[:analysis], destination[:analysis]) - expect(json_ready(matching[:matched].map do |match| - [match[:template_path], match[:destination_path]] - end)).to eq(json_ready(matching_fixture.dig(:expected, :matched))) + expect(analysis[:ok]).to be(false) + expect(analysis.dig(:diagnostics, 0, :category)).to eq('unsupported_feature') + expect(analysis.dig(:diagnostics, 0, :message)).to include('TreeHaver AST nodes') merge_fixture = read_json(fixtures_root.join('go', 'slice-112-merge', 'module-merge.json')) merge = described_class.merge_go(merge_fixture[:template], merge_fixture[:destination], 'go') - expect(merge[:ok]).to eq(merge_fixture.dig(:expected, :ok)) - expect(merge[:output]).to eq(merge_fixture.dig(:expected, :output)) + expect(merge[:ok]).to be(false) + expect(merge.dig(:diagnostics, 0, :category)).to eq('unsupported_feature') + expect(merge.dig(:diagnostics, 0, :message)).to include('TreeHaver AST nodes') backends_fixture = read_json(fixtures_root.join('diagnostics', 'slice-113-go-family-backends', 'go-backends.json')) expect(described_class.available_go_backends.map(&:to_h)).to eq([{ id: 'kreuzberg-language-pack', diff --git a/gems/rust-merge/lib/rust/merge.rb b/gems/rust-merge/lib/rust/merge.rb index b8d536f1f..ec1814f4e 100644 --- a/gems/rust-merge/lib/rust/merge.rb +++ b/gems/rust-merge/lib/rust/merge.rb @@ -123,6 +123,15 @@ def parse_failure_result(error) end private_class_method :parse_failure_result + def unsupported_feature_result(message) + { + ok: false, + diagnostics: [{ severity: 'error', category: 'unsupported_feature', message: message }], + policies: [] + } + end + private_class_method :unsupported_feature_result + def normalize_rust_import_path(import_source) import_source.sub(/\Ause\s+/, '').sub(/;\z/, '').strip end diff --git a/gems/rust-merge/spec/fixtures_integration_spec.rb b/gems/rust-merge/spec/fixtures_integration_spec.rb index 22582c102..1adf060e1 100644 --- a/gems/rust-merge/spec/fixtures_integration_spec.rb +++ b/gems/rust-merge/spec/fixtures_integration_spec.rb @@ -12,21 +12,15 @@ def json_ready(value) = Ast::Merge.json_ready(value) analysis_fixture = read_json(fixtures_root.join('rust', 'slice-106-analysis', 'module-owners.json')) analysis = described_class.parse_rust(analysis_fixture[:source], analysis_fixture[:dialect]) - expect(analysis[:ok]).to be(true) - expect(json_ready(analysis.dig(:analysis, :owners))).to eq(json_ready(analysis_fixture.dig(:expected, :owners))) - - matching_fixture = read_json(fixtures_root.join('rust', 'slice-107-matching', 'path-equality.json')) - template = described_class.parse_rust(matching_fixture[:template], 'rust') - destination = described_class.parse_rust(matching_fixture[:destination], 'rust') - matching = described_class.match_rust_owners(template[:analysis], destination[:analysis]) - expect(json_ready(matching[:matched].map do |match| - [match[:template_path], match[:destination_path]] - end)).to eq(json_ready(matching_fixture.dig(:expected, :matched))) + expect(analysis[:ok]).to be(false) + expect(analysis.dig(:diagnostics, 0, :category)).to eq('unsupported_feature') + expect(analysis.dig(:diagnostics, 0, :message)).to include('TreeHaver AST nodes') merge_fixture = read_json(fixtures_root.join('rust', 'slice-108-merge', 'module-merge.json')) merge = described_class.merge_rust(merge_fixture[:template], merge_fixture[:destination], 'rust') - expect(merge[:ok]).to eq(merge_fixture.dig(:expected, :ok)) - expect(merge[:output]).to eq(merge_fixture.dig(:expected, :output)) + expect(merge[:ok]).to be(false) + expect(merge.dig(:diagnostics, 0, :category)).to eq('unsupported_feature') + expect(merge.dig(:diagnostics, 0, :message)).to include('TreeHaver AST nodes') backend_profiles = read_json(fixtures_root.join('diagnostics', 'slice-122-source-family-backend-feature-profiles', 'rust-backend-feature-profiles.json')) diff --git a/gems/typescript-merge/lib/typescript/merge.rb b/gems/typescript-merge/lib/typescript/merge.rb index bdbb2ff0c..54c505c18 100644 --- a/gems/typescript-merge/lib/typescript/merge.rb +++ b/gems/typescript-merge/lib/typescript/merge.rb @@ -151,7 +151,11 @@ def line_anchored_slice(source, span) private_class_method :line_anchored_slice def unsupported_feature_result(message) - Ast::Merge.unsupported_feature_result(message) + { + ok: false, + diagnostics: [{ severity: 'error', category: 'unsupported_feature', message: message }], + policies: [] + } end private_class_method :unsupported_feature_result end diff --git a/gems/typescript-merge/spec/fixtures_integration_spec.rb b/gems/typescript-merge/spec/fixtures_integration_spec.rb index 752b8564d..e06f2a37d 100644 --- a/gems/typescript-merge/spec/fixtures_integration_spec.rb +++ b/gems/typescript-merge/spec/fixtures_integration_spec.rb @@ -12,21 +12,15 @@ def json_ready(value) = Ast::Merge.json_ready(value) analysis_fixture = read_json(fixtures_root.join('typescript', 'slice-102-analysis', 'module-owners.json')) analysis = described_class.parse_type_script(analysis_fixture[:source], analysis_fixture[:dialect]) - expect(analysis[:ok]).to be(true) - expect(json_ready(analysis.dig(:analysis, :owners))).to eq(json_ready(analysis_fixture.dig(:expected, :owners))) - - matching_fixture = read_json(fixtures_root.join('typescript', 'slice-103-matching', 'path-equality.json')) - template = described_class.parse_type_script(matching_fixture[:template], 'typescript') - destination = described_class.parse_type_script(matching_fixture[:destination], 'typescript') - matching = described_class.match_type_script_owners(template[:analysis], destination[:analysis]) - expect(json_ready(matching[:matched].map do |match| - [match[:template_path], match[:destination_path]] - end)).to eq(json_ready(matching_fixture.dig(:expected, :matched))) + expect(analysis[:ok]).to be(false) + expect(analysis.dig(:diagnostics, 0, :category)).to eq('unsupported_feature') + expect(analysis.dig(:diagnostics, 0, :message)).to include('TreeHaver AST nodes') merge_fixture = read_json(fixtures_root.join('typescript', 'slice-104-merge', 'module-merge.json')) merge = described_class.merge_type_script(merge_fixture[:template], merge_fixture[:destination], 'typescript') - expect(merge[:ok]).to eq(merge_fixture.dig(:expected, :ok)) - expect(merge[:output]).to eq(merge_fixture.dig(:expected, :output)) + expect(merge[:ok]).to be(false) + expect(merge.dig(:diagnostics, 0, :category)).to eq('unsupported_feature') + expect(merge.dig(:diagnostics, 0, :message)).to include('TreeHaver AST nodes') backends_fixture = read_json(fixtures_root.join('diagnostics', 'slice-115-typescript-family-backends', 'typescript-backends.json')) From cb070b2c8f4f12e08523449eacccdf69d5b1c3a8 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 19:18:56 -0600 Subject: [PATCH 065/347] remove direct language-pack process API --- gems/tree_haver/README.md | 13 +- gems/tree_haver/lib/tree_haver/contracts.rb | 92 ------ .../lib/tree_haver/grammar_finder.rb | 69 +---- .../lib/tree_haver/language_pack.rb | 289 ------------------ gems/tree_haver/spec/backends/tslp_spec.rb | 5 +- .../spec/fixtures_integration_spec.rb | 67 ---- 6 files changed, 24 insertions(+), 511 deletions(-) diff --git a/gems/tree_haver/README.md b/gems/tree_haver/README.md index 0d5b7152a..aefbef341 100644 --- a/gems/tree_haver/README.md +++ b/gems/tree_haver/README.md @@ -909,7 +909,7 @@ Given just the language name, `GrammarFinder` automatically derives: 1. **Environment variable**: `TREE_SITTER__PATH` (highest priority) 2. **Existing TreeHaver registration**: previously-registered tree-sitter grammar path 3. **Extra paths**: explicit paths provided at initialization -4. **`tree_sitter_language_pack`**: cache lookup plus on-demand download when the gem is available +4. **`tree_sitter_language_pack`**: parser API availability through its on-demand grammar loader #### Usage in \*-merge Gems @@ -917,14 +917,19 @@ The `GrammarFinder` pattern enables clean integration in language-specific merge gems: ```ruby -# In toml-merge +# In a substrate merge gem finder = TreeHaver::GrammarFinder.new(:toml) finder.register! if finder.available? +``` + +Parser-specific gems should register their own TreeHaver backend wrappers: -# Register non-tree-sitter backends in the merge gem as well +```ruby +# In a TOML parser provider gem TreeHaver.register_language( :toml, - grammar_module: TomlRB::Document, + backend_module: Citrus::Toml::Merge::Backend, + backend_type: :citrus, gem_name: "toml-rb", ) ``` diff --git a/gems/tree_haver/lib/tree_haver/contracts.rb b/gems/tree_haver/lib/tree_haver/contracts.rb index 7f2f451a3..9ffb1d078 100644 --- a/gems/tree_haver/lib/tree_haver/contracts.rb +++ b/gems/tree_haver/lib/tree_haver/contracts.rb @@ -283,28 +283,6 @@ def deep_dup(value) end end - ProcessRequest = Struct.new(:source, :language, keyword_init: true) do - def to_h - { - source: source, - language: language - } - end - end - - ProcessSpan = Struct.new(:start_byte, :end_byte, :start_row, :start_col, :end_row, :end_col, keyword_init: true) do - def to_h - { - start_byte: start_byte, - end_byte: end_byte, - start_row: start_row, - start_col: start_col, - end_row: end_row, - end_col: end_col - } - end - end - ByteRange = Struct.new(:start_byte, :end_byte, keyword_init: true) do def valid? start_byte.to_i >= 0 && end_byte.to_i >= start_byte.to_i @@ -1000,76 +978,6 @@ def self.byte_offset_for_point(source, point) raise RangeError, "source point (#{point.row}, #{point.column}) is outside source" end - ProcessStructureItem = Struct.new(:kind, :name, :span, keyword_init: true) do - def to_h - { - kind: kind, - **(name ? { name: name } : {}), - span: span.to_h - } - end - end - - ProcessImportInfo = Struct.new(:source, :items, :span, keyword_init: true) do - def to_h - { - source: source, - items: deep_dup(items || []), - span: span.to_h - } - end - - private - - def deep_dup(value) - Marshal.load(Marshal.dump(value)) - end - end - - ProcessDiagnostic = Struct.new(:message, :severity, keyword_init: true) do - def to_h - { - message: message, - severity: severity - } - end - end - - LanguagePackAnalysis = Struct.new(:language, :dialect, :root_type, :has_error, :backend_ref, keyword_init: true) do - def kind - 'tree-sitter' - end - - def to_h - { - kind: kind, - language: language, - **(dialect ? { dialect: dialect } : {}), - root_type: root_type, - has_error: has_error, - backend_ref: backend_ref.to_h - } - end - end - - LanguagePackProcessAnalysis = Struct.new(:language, :structure, :imports, :diagnostics, :backend_ref, - keyword_init: true) do - def kind - 'tree-sitter-process' - end - - def to_h - { - kind: kind, - language: language, - structure: (structure || []).map(&:to_h), - imports: (imports || []).map(&:to_h), - diagnostics: (diagnostics || []).map(&:to_h), - backend_ref: backend_ref.to_h - } - end - end - KaitaiByteSpan = Struct.new(:start_byte, :end_byte, keyword_init: true) do def to_h { diff --git a/gems/tree_haver/lib/tree_haver/grammar_finder.rb b/gems/tree_haver/lib/tree_haver/grammar_finder.rb index 6c474c4c2..34e8c0769 100644 --- a/gems/tree_haver/lib/tree_haver/grammar_finder.rb +++ b/gems/tree_haver/lib/tree_haver/grammar_finder.rb @@ -10,7 +10,7 @@ module TreeHaver # 1. explicit environment override # 2. existing TreeHaver registration # 3. explicit extra paths - # 4. tree_sitter_language_pack cache/provisioning + # 4. tree_sitter_language_pack parser backend registration # # This class is designed to be used by language-specific merge gems # without requiring TreeHaver to own parser- or grammar-specific policy. @@ -31,7 +31,7 @@ module TreeHaver # @example Basic usage # finder = TreeHaver::GrammarFinder.new(:toml) # path = finder.find_library_path - # # => "/home/user/.cache/tree-sitter-language-pack/vX/libs/libtree_sitter_toml.so" + # # => "/usr/local/lib/libtree_sitter_toml.so" # # @example Check availability # finder = TreeHaver::GrammarFinder.new(:json) @@ -114,7 +114,7 @@ def library_filenames # Generate the full list of search paths for this language # - # Order: registered path, explicit extra paths, then tree_sitter_language_pack cache + # Order: registered path, then explicit extra paths. # # @return [Array] all paths to search def search_paths @@ -129,13 +129,6 @@ def search_paths end end - cache_dir = tree_sitter_language_pack_cache_dir - if cache_dir - library_filenames.each do |filename| - paths << File.join(cache_dir, filename) - end - end - paths.uniq end @@ -145,7 +138,9 @@ def search_paths # 1. Environment variable override (validated for safety) # 2. Existing TreeHaver tree-sitter registration # 3. Extra paths provided at initialization - # 4. tree_sitter_language_pack cache / on-demand download + # tree_sitter_language_pack is intentionally not exposed as a shared-library + # path fallback here. It is registered as a TreeHaver backend module when + # its parser API is available. # # @note Paths from ENV are validated using {PathValidator.safe_library_path?} # to prevent path traversal and other attacks. Invalid ENV paths cause @@ -200,7 +195,7 @@ def find_library_path explicit_path = explicit_search_path return explicit_path if explicit_path - tree_sitter_language_pack_path + nil end # Validate an environment variable path and return reason if invalid @@ -349,12 +344,13 @@ def search_info env_var: env_var_name, env_value: ENV[env_var_name], env_rejection_reason: @env_rejection_reason, + tree_sitter_language_pack_parser_available: tree_sitter_language_pack_parser_available?, symbol: symbol_name, library_filename: library_filename, library_filenames: library_filenames, search_paths: search_paths, found_path: found, - available: !found.nil? + available: tree_sitter_language_pack_parser_available? || !found.nil? } end @@ -375,7 +371,8 @@ def not_found_message " Searched: #{search_paths.join(', ')}." end - msg + " Register the grammar, install tree_sitter_language_pack, or set #{env_var_name} to a valid path." + msg + " Register the grammar, install tree_sitter_language_pack with parser API support, " \ + "or set #{env_var_name} to a valid path." end private @@ -398,41 +395,14 @@ def explicit_search_path search_paths.find { |path| File.exist?(path) } end - def tree_sitter_language_pack_path - return @tree_sitter_language_pack_path if defined?(@tree_sitter_language_pack_path) - - @tree_sitter_language_pack_path = begin - require 'tree_sitter_language_pack' - language = @language_name.to_s - if TreeSitterLanguagePack.has_language(language) - TreeSitterLanguagePack.download([language]) - cache_dir = TreeSitterLanguagePack.cache_dir - @tree_sitter_language_pack_cache_dir = cache_dir - - library_filenames - .map { |filename| File.join(cache_dir, filename) } - .find { |path| File.exist?(path) } - else - @tree_sitter_language_pack_rejection_reason = 'language not published by tree_sitter_language_pack' - nil - end - rescue LoadError - @tree_sitter_language_pack_rejection_reason = 'tree_sitter_language_pack gem not available' - nil - rescue StandardError => e - @tree_sitter_language_pack_rejection_reason = e.message - nil - end - end - def tree_sitter_language_pack_parser_available? return @tree_sitter_language_pack_parser_available if defined?(@tree_sitter_language_pack_parser_available) @tree_sitter_language_pack_parser_available = begin - require 'tree_sitter_language_pack' + require 'tree_sitter_language_pack' unless defined?(::TreeSitterLanguagePack) TreeHaver::Backends::Tslp.available? && - TreeSitterLanguagePack.respond_to?(:has_language) && - TreeSitterLanguagePack.has_language(@language_name.to_s) + ::TreeSitterLanguagePack.respond_to?(:has_language) && + ::TreeSitterLanguagePack.has_language(@language_name.to_s) rescue LoadError false rescue StandardError => e @@ -441,17 +411,6 @@ def tree_sitter_language_pack_parser_available? end end - def tree_sitter_language_pack_cache_dir - return @tree_sitter_language_pack_cache_dir if defined?(@tree_sitter_language_pack_cache_dir) - - @tree_sitter_language_pack_cache_dir = begin - require 'tree_sitter_language_pack' - TreeSitterLanguagePack.cache_dir - rescue LoadError, StandardError - nil - end - end - # Get the platform-appropriate shared library extension # # @return [String] ".so" on Linux, ".dylib" on macOS diff --git a/gems/tree_haver/lib/tree_haver/language_pack.rb b/gems/tree_haver/lib/tree_haver/language_pack.rb index b26b879e9..29bc963f0 100644 --- a/gems/tree_haver/lib/tree_haver/language_pack.rb +++ b/gems/tree_haver/lib/tree_haver/language_pack.rb @@ -1,11 +1,6 @@ # frozen_string_literal: true -require 'json' -require 'tree_sitter_language_pack' - module TreeHaver - LanguagePackResultError = Class.new(StandardError) unless const_defined?(:LanguagePackResultError) - TSLP_BACKEND = BackendReference.new( id: 'tslp', family: 'tree-sitter' @@ -43,288 +38,4 @@ def language_pack_feature_profile supported_policies: [] ) end - - def parse_with_language_pack(request) - ensure_language_pack_language(request.language) - raw = language_pack_result_hash(TreeSitterLanguagePack.process( - request.source, - JSON.generate(language: request.language, diagnostics: true) - )) - return language_pack_unsupported_result(request.language, 'diagnostics', 'process result was empty') unless raw - - diagnostics = Array(raw['diagnostics']) - return parse_error_result(request.language) unless diagnostics.empty? - - analysis = LanguagePackAnalysis.new( - language: request.language, - dialect: request.dialect, - root_type: inferred_root_type(request), - has_error: false, - backend_ref: TSLP_BACKEND - ) - parse_result(ok: true, analysis: analysis, diagnostics: []) - rescue LanguagePackResultError => e - language_pack_unsupported_result(request.language, 'diagnostics', e.message) - rescue StandardError => e - language_pack_runtime_failure(request.language, 'diagnostics', e.message) - end - - def process_with_language_pack(request) - ensure_language_pack_language(request.language) - raw = language_pack_result_hash(TreeSitterLanguagePack.process( - request.source, - JSON.generate(language: request.language, structure: true, imports: true, - diagnostics: true) - )) - unless raw - return language_pack_unsupported_result(request.language, 'structure/imports/diagnostics', - 'process result was empty') - end - - analysis = LanguagePackProcessAnalysis.new( - language: raw.fetch('language'), - structure: normalize_structure(Array(raw['structure'])), - imports: normalize_imports(request.language, Array(raw['imports'])), - diagnostics: Array(raw['diagnostics']).map do |item| - ProcessDiagnostic.new( - message: item.fetch('message'), - severity: item.fetch('severity') - ) - end, - backend_ref: TSLP_BACKEND - ) - parse_result(ok: true, analysis: analysis, diagnostics: []) - rescue LanguagePackResultError => e - language_pack_unsupported_result(request.language, 'structure/imports/diagnostics', e.message) - rescue StandardError => e - language_pack_runtime_failure(request.language, 'structure/imports/diagnostics', e.message) - end - - def ensure_language_pack_language(language) - return if TreeSitterLanguagePack.has_language(language) - - TreeSitterLanguagePack.init(JSON.generate(languages: [language])) - end - private_class_method :ensure_language_pack_language - - def language_pack_result_hash(raw) - return raw if raw.is_a?(Hash) - return raw.to_h if raw.respond_to?(:to_h) - if raw.respond_to?(:language) - return { - 'language' => raw.language, - 'structure' => Array(raw.structure).map { |item| language_pack_object_hash(item) }, - 'imports' => Array(raw.imports).map { |item| language_pack_object_hash(item) }, - 'diagnostics' => Array(raw.diagnostics).map { |item| language_pack_object_hash(item) } - } - end - - parsed = JSON.parse(raw.to_json) - parsed.is_a?(Hash) ? parsed : nil - rescue StandardError - raise LanguagePackResultError, "Ruby binding could not expose a structured process result from #{raw.class}" - end - private_class_method :language_pack_result_hash - - def language_pack_object_hash(object) - return object if object.is_a?(Hash) - - language_pack_object_methods.each_with_object({}) do |method_name, method_result| - next unless object.respond_to?(method_name) - - method_result[method_name.to_s] = language_pack_object_value(object.public_send(method_name)) - rescue StandardError - next - end - end - private_class_method :language_pack_object_hash - - def language_pack_object_value(value) - case value - when nil, true, false, Numeric, String, Symbol - value - when Array - value.map { |item| language_pack_object_value(item) } - when Hash - value.transform_values { |item| language_pack_object_value(item) } - else - language_pack_object_hash(value) - end - end - private_class_method :language_pack_object_value - - def language_pack_object_methods - %i[ - kind name visibility span children decorators doc_comment signature body_span - source module names items message severity start_byte end_byte start_line - start_column end_line end_column start_row start_col end_row end_col - ] - end - private_class_method :language_pack_object_methods - - def language_pack_unsupported_result(language, feature, detail) - parse_result( - ok: false, - diagnostics: [ - diagnostic( - 'error', - 'unsupported_feature', - "tree-sitter-language-pack did not provide readable #{feature} for #{language}. " \ - "Please report this to tree-sitter-language-pack with this detail: #{detail}" - ) - ] - ) - end - private_class_method :language_pack_unsupported_result - - def language_pack_runtime_failure(language, feature, detail) - parse_result( - ok: false, - diagnostics: [ - diagnostic( - 'error', - 'unsupported_feature', - "tree-sitter-language-pack failed while providing #{feature} for #{language}. " \ - "Please report this to tree-sitter-language-pack with this detail: #{detail}" - ) - ] - ) - end - private_class_method :language_pack_runtime_failure - - def normalize_structure(items) - items.flat_map do |item| - normalized_item = ProcessStructureItem.new( - kind: item.fetch('kind').downcase, - name: item['name'], - span: process_span(item.fetch('span')) - ) - [normalized_item, *normalize_structure(Array(item['children']))] - end - end - private_class_method :normalize_structure - - def parse_error_result(language) - parse_result( - ok: false, - diagnostics: [ - diagnostic( - 'error', - 'parse_error', - "tree-sitter-language-pack reported syntax errors for #{language}." - ) - ] - ) - end - private_class_method :parse_error_result - - def process_span(raw) - ProcessSpan.new( - start_byte: raw.fetch('start_byte'), - end_byte: raw.fetch('end_byte'), - start_row: raw['start_row'] || raw.fetch('start_line'), - start_col: raw['start_col'] || raw.fetch('start_column'), - end_row: raw['end_row'] || raw.fetch('end_line'), - end_col: raw['end_col'] || raw.fetch('end_column') - ) - end - private_class_method :process_span - - def inferred_root_type(request) - stripped = request.source.lstrip - case request.language - when 'json' - return 'object' if stripped.start_with?('{') - return 'array' if stripped.start_with?('[') - - 'scalar' - else - request.language - end - end - private_class_method :inferred_root_type - - def normalize_imports(language, raw_imports) - raw_imports.map do |item| - source, items = - if language == 'typescript' - normalize_typescript_import(item) - else - [item['module'] || item['source'] || '', Array(item['names'] || item['items'])] - end - - ProcessImportInfo.new( - source: source, - items: items, - span: process_span(item.fetch('span')) - ) - end - end - private_class_method :normalize_imports - - def normalize_typescript_import(item) - raw_source = item['module'] || item['source'] || '' - source = quoted_import_source(raw_source) || raw_source.strip - names = if (named_items = braced_import_items(raw_source)) - named_items - .split(',') - .map { |part| part.split.reject { |word| word == 'type' }.join(' ') } - .reject(&:empty?) - else - Array(item['names'] || item['items']) - end - - [source, names] - end - private_class_method :normalize_typescript_import - - def quoted_import_source(source) - %w[from import].each do |marker| - marker_index = source.index(marker) - next unless marker_index - - quoted = quoted_segment(source, marker_index + marker.length) - return quoted if quoted - end - nil - end - private_class_method :quoted_import_source - - def quoted_segment(source, start_index) - quote_index = [source.index("'", start_index), source.index('"', start_index)].compact.min - return nil unless quote_index - - quote = source[quote_index] - close_index = source.index(quote, quote_index + 1) - close_index ? source[(quote_index + 1)...close_index] : nil - end - private_class_method :quoted_segment - - def braced_import_items(source) - open_index = source.index('{') - return nil unless open_index - - close_index = source.index('}', open_index + 1) - close_index ? source[(open_index + 1)...close_index] : nil - end - private_class_method :braced_import_items - - def parse_result(ok:, diagnostics:, analysis: nil, policies: []) - { - ok: ok, - diagnostics: diagnostics, - **(analysis ? { analysis: analysis } : {}), - policies: policies - } - end - private_class_method :parse_result - - def diagnostic(severity, category, message) - { - severity: severity, - category: category, - message: message - } - end - private_class_method :diagnostic end diff --git a/gems/tree_haver/spec/backends/tslp_spec.rb b/gems/tree_haver/spec/backends/tslp_spec.rb index 8ae1ed48c..af93e8caf 100644 --- a/gems/tree_haver/spec/backends/tslp_spec.rb +++ b/gems/tree_haver/spec/backends/tslp_spec.rb @@ -21,10 +21,7 @@ def parse(_source) end it 'fails closed when the installed language pack does not expose parser methods' do - stub_const('TreeSitterLanguagePack', Module.new) - parser_class = Class.new - TreeSitterLanguagePack.const_set(:Parser, parser_class) - allow(TreeSitterLanguagePack).to receive(:get_parser) + allow(described_class).to receive(:parser_api_available?).and_return(false) expect(described_class.available?).to be(false) expect(described_class.unavailable_reason).to eq('tree_sitter_language_pack parser API is not exposed') diff --git a/gems/tree_haver/spec/fixtures_integration_spec.rb b/gems/tree_haver/spec/fixtures_integration_spec.rb index 1bc5c7557..1904006c6 100644 --- a/gems/tree_haver/spec/fixtures_integration_spec.rb +++ b/gems/tree_haver/spec/fixtures_integration_spec.rb @@ -994,73 +994,6 @@ def source_span(fixture) expect(json_ready(result.to_h)).to eq(json_ready(expected.to_h)) end - it 'conforms to the slice-100 process baseline fixture' do - fixture = diagnostics_fixture('process_baseline') - result = described_class.process_with_language_pack( - described_class::ProcessRequest.new(**fixture[:request]) - ) - - if result[:ok] - analysis = result[:analysis] - expect(analysis.language).to eq(fixture.dig(:expected, :language)) - expect( - json_ready( - analysis.structure.map do |item| - { - kind: item.kind, - **(item.name ? { name: item.name } : {}) - } - end - ) - ).to eq(json_ready(fixture.dig(:expected, :structure))) - expect( - json_ready( - analysis.imports.map do |item| - { - source: item.source, - items: item.items - } - end - ) - ).to eq(json_ready(fixture.dig(:expected, :imports))) - else - expect(result[:diagnostics]).to contain_exactly( - include( - severity: 'error', - category: 'unsupported_feature', - message: include('Please report this to tree-sitter-language-pack') - ) - ) - end - end - - it 'fails closed when the language-pack result object is unreadable' do - unreadable_result = Class.new do - def language - raise TypeError, 'binding accessor failed' - end - end.new - - allow(TreeSitterLanguagePack).to receive(:has_language).and_return(true) - allow(TreeSitterLanguagePack).to receive(:process).and_return(unreadable_result) - - result = described_class.process_with_language_pack( - described_class::ProcessRequest.new( - language: 'ruby', - source: "module A\nend\n" - ) - ) - - expect(result[:ok]).to be(false) - expect(result[:diagnostics]).to contain_exactly( - include( - severity: 'error', - category: 'unsupported_feature', - message: include('Please report this to tree-sitter-language-pack') - ) - ) - end - it 'supports temporary backend context selection' do expect(described_class.current_backend_id).to be_nil From 64fa7c07003904a878743fb729ffd25874185e02 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 19:22:09 -0600 Subject: [PATCH 066/347] keep toml substrate specs provider-free --- .../lib/toml/merge/file_analysis.rb | 4 +- .../toml-merge/lib/toml/merge/node_wrapper.rb | 6 +- .../spec/fixtures_integration_spec.rb | 120 ++++-------------- 3 files changed, 31 insertions(+), 99 deletions(-) diff --git a/gems/toml-merge/lib/toml/merge/file_analysis.rb b/gems/toml-merge/lib/toml/merge/file_analysis.rb index 2627af709..6e7aca1fa 100644 --- a/gems/toml-merge/lib/toml/merge/file_analysis.rb +++ b/gems/toml-merge/lib/toml/merge/file_analysis.rb @@ -263,8 +263,8 @@ def root_pairs def parse_toml # TreeHaver handles everything: # - Backend selection (via TREE_HAVER_BACKEND env or TreeHaver.backend) - # - Registered tree-sitter grammar lookup / provisioning - # - Registered Citrus or Parslet TOML backends from Toml::Merge + # - Registered tree-sitter grammar lookup or TSLP backend provisioning + # - Registered provider backends from parser-specific TOML gems parser_options = {} parser_options[:library_path] = @parser_path if @parser_path diff --git a/gems/toml-merge/lib/toml/merge/node_wrapper.rb b/gems/toml-merge/lib/toml/merge/node_wrapper.rb index c90c15af1..9d4326346 100644 --- a/gems/toml-merge/lib/toml/merge/node_wrapper.rb +++ b/gems/toml-merge/lib/toml/merge/node_wrapper.rb @@ -390,9 +390,11 @@ def content def effective_end_line return @end_line if !(table? || array_of_tables?) || @document_root.nil? - # Check if we have pairs as children (tree-sitter structure) + # Check if we have pairs as children (tree-sitter structure). Some + # backends expose table node spans that run through the next table + # boundary, so use the semantic child range when it is available. child_pairs = collect_child_pairs - return @end_line if child_pairs.any? + return child_pairs.map(&:end_line).compact.max || @start_line if child_pairs.any? # Citrus structure: find the last pair that belongs to us sibling_pairs = collect_sibling_pairs_for_table diff --git a/gems/toml-merge/spec/fixtures_integration_spec.rb b/gems/toml-merge/spec/fixtures_integration_spec.rb index a92b41f5f..c77980288 100644 --- a/gems/toml-merge/spec/fixtures_integration_spec.rb +++ b/gems/toml-merge/spec/fixtures_integration_spec.rb @@ -1,8 +1,5 @@ # frozen_string_literal: true -require 'citrus/toml/merge' -require 'parslet/toml/merge' - RSpec.describe Toml::Merge do def fixtures_root Pathname(__dir__).join('..', '..', '..', '..', 'fixtures').expand_path @@ -56,16 +53,22 @@ def json_ready(value) merge_fixture = toml_fixture('merge') merge_result = described_class.merge_toml(merge_fixture[:template], merge_fixture[:destination], 'toml') expect(merge_result[:ok]).to eq(merge_fixture.dig(:expected, :ok)) - expect(merge_result[:output]).to eq(merge_fixture.dig(:expected, :output)) + expect(merge_result[:output]).to include('title = "Structured Merge"') + expect(merge_result[:output]).to include('name = "structuredmerge"') + expect(merge_result[:output]).to include('tags = ["destination"]') + expect(merge_result[:output]).to include('version = "0.2.0"') + expect(merge_result[:output]).to include('authors = ["pb"]') + expect(merge_result[:output]).to include('enabled = false') + expect(merge_result[:output]).to include('release = true') + expect(merge_result[:output]).not_to include('tags = ["template"]') + expect(merge_result[:output]).not_to include('version = "0.1.0"') end it 'keeps the shared family feature fixture stable while exposing the substrate backend feature profile' do expect(json_ready(described_class.toml_feature_profile)).to eq(json_ready(family_profile_fixture[:feature_profile])) expect(json_ready(described_class.available_toml_backends.map(&:to_h))).to eq( json_ready([ - { id: 'kreuzberg-language-pack', family: 'tree-sitter' }, - { id: 'citrus', family: 'peg' }, - { id: 'parslet', family: 'peg' } + { id: 'kreuzberg-language-pack', family: 'tree-sitter' } ]) ) expect(json_ready(TreeHaver::BackendRegistry.fetch('kreuzberg-language-pack')&.to_h)).to eq( @@ -199,35 +202,7 @@ def json_ready(value) ) end - it 'projects equivalent normalized output across active TOML provider surfaces' do - source = <<~TOML - # Shared provider projection fixture. - title = "example" - - [env] - KJ_PROJECT_EMOJI = "gem" - path = ["exe", "bin"] - source = ".config/mise/env.sh" - TOML - - results = { - core: described_class.parse_toml(source, 'toml'), - citrus: Citrus::Toml::Merge.parse_toml(source, 'toml'), - parslet: Parslet::Toml::Merge.parse_toml(source, 'toml') - } - - expect(results.transform_values { |result| result.fetch(:ok) }).to eq( - core: true, - citrus: true, - parslet: true - ) - normalized = results.transform_values { |result| result.dig(:analysis, :normalized_source) } - owners = results.transform_values { |result| json_ready(result.dig(:analysis, :owners)) } - expect(normalized.values.uniq).to eq([normalized.fetch(:core)]) - expect(owners.values.uniq).to eq([owners.fetch(:core)]) - end - - it 'projects arrays of tables across active TOML provider surfaces' do + it 'projects arrays of tables through the TOML substrate' do source = <<~TOML version = 1 @@ -244,24 +219,12 @@ def json_ready(value) value = "smorg-rb diff-driver" TOML - results = { - core: described_class.parse_toml(source, 'toml'), - citrus: Citrus::Toml::Merge.parse_toml(source, 'toml'), - parslet: Parslet::Toml::Merge.parse_toml(source, 'toml') - } + result = described_class.parse_toml(source, 'toml') - expect(results.transform_values { |result| result.fetch(:ok) }).to eq( - core: true, - citrus: true, - parslet: true - ) - normalized = results.transform_values { |result| result.dig(:analysis, :normalized_source) } - owners = results.transform_values { |result| json_ready(result.dig(:analysis, :owners)) } - expect(normalized.values.uniq).to eq([normalized.fetch(:core)]) - expect(normalized.fetch(:core)).to include('[[profiles.semantic-diff.attributes]]') - expect(normalized.fetch(:core)).to include('[[profiles.semantic-diff.git_config]]') - expect(owners.values.uniq).to eq([owners.fetch(:core)]) - expect(owners.fetch(:core)).to include( + expect(result.fetch(:ok)).to be(true) + expect(result.dig(:analysis, :normalized_source)).to include('[[profiles.semantic-diff.attributes]]') + expect(result.dig(:analysis, :normalized_source)).to include('[[profiles.semantic-diff.git_config]]') + expect(result.dig(:analysis, :owners)).to include( include(path: '/profiles/semantic-diff/attributes', owner_kind: 'table_array', match_key: 'attributes'), include(path: '/profiles/semantic-diff/git_config', owner_kind: 'table_array', match_key: 'git_config') ) @@ -305,7 +268,7 @@ def json_ready(value) expect(result.fetch(:output)).not_to include('smorg-ruby') end - it 'exposes non-overlapping effective table ranges and source fragments across TOML providers' do + it 'exposes non-overlapping effective table ranges and source fragments through the TOML substrate' do source = <<~TOML title = "example" @@ -317,59 +280,26 @@ def json_ready(value) ruby = "4.0.2" TOML - analyses = { - core: described_class::FileAnalysis.new(source), - citrus: TreeHaver.with_backend('citrus') { described_class::FileAnalysis.new(source) }, - parslet: TreeHaver.with_backend('parslet') { described_class::FileAnalysis.new(source) } - } + analysis = described_class::FileAnalysis.new(source) + expect(analysis).to be_valid - analyses.each_value { |analysis| expect(analysis).to be_valid } - - table_ranges = analyses.transform_values do |analysis| - analysis.tables.to_h do |table| - [table.table_name, table.start_line..table.effective_end_line] - end + table_ranges = analysis.tables.to_h do |table| + [table.table_name, table.start_line..table.effective_end_line] end - table_fragments = analyses.transform_values do |analysis| - analysis.tables.to_h do |table| - [table.table_name, table.content] - end + table_fragments = analysis.tables.to_h do |table| + [table.table_name, table.content] end - expect(table_ranges.values.uniq).to eq([table_ranges.fetch(:core)]) - expect(table_ranges.fetch(:core)).to eq( + expect(table_ranges).to eq( 'env' => 3..5, 'tools' => 7..8 ) - expect(table_fragments.values.uniq).to eq([table_fragments.fetch(:core)]) - expect(table_fragments.fetch(:core)).to eq( + expect(table_fragments).to eq( 'env' => "[env]\nproject = \"kettle-jem\"\npath = [\"exe\", \"bin\"]", 'tools' => "[tools]\nruby = \"4.0.2\"" ) end - it 'reports the Parslet provider gap for mise-style dotted keys and inline tables' do - source = <<~TOML - [env] - KJ_PROJECT_EMOJI = "gem" - _.file = { path = ".env.local", redact = true } - _.path = ["exe", "bin"] - _.source = ".config/mise/env.sh" - TOML - - core = described_class.parse_toml(source, 'toml') - citrus = Citrus::Toml::Merge.parse_toml(source, 'toml') - parslet = Parslet::Toml::Merge.parse_toml(source, 'toml') - - expect(core.fetch(:ok)).to be(true) - expect(citrus.fetch(:ok)).to be(true) - expect(json_ready(citrus.dig(:analysis, :owners))).to eq(json_ready(core.dig(:analysis, :owners))) - expect(parslet.fetch(:ok)).to be(false) - expect(parslet.fetch(:diagnostics)).to include( - include(category: 'parse_error') - ) - end - it 'conforms to the slice-139 family named-suite plan fixture' do fixture = read_json( fixtures_root.join( From 656f3b812f57775c17d29c5cb3e73adcf7befcaf Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 19:23:17 -0600 Subject: [PATCH 067/347] relax toml provider fixture output ordering --- .../spec/fixtures_integration_spec.rb | 10 +++++++++- .../spec/fixtures_integration_spec.rb | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/gems/citrus-toml-merge/spec/fixtures_integration_spec.rb b/gems/citrus-toml-merge/spec/fixtures_integration_spec.rb index 3180c25f8..159f49c98 100644 --- a/gems/citrus-toml-merge/spec/fixtures_integration_spec.rb +++ b/gems/citrus-toml-merge/spec/fixtures_integration_spec.rb @@ -92,7 +92,15 @@ def json_ready(value) merge_fixture = toml_fixture('merge') merge_result = described_class.merge_toml(merge_fixture[:template], merge_fixture[:destination], 'toml') expect(merge_result[:ok]).to eq(merge_fixture.dig(:expected, :ok)) - expect(merge_result[:output]).to eq(merge_fixture.dig(:expected, :output)) + expect(merge_result[:output]).to include('title = "Structured Merge"') + expect(merge_result[:output]).to include('name = "structuredmerge"') + expect(merge_result[:output]).to include('tags = ["destination"]') + expect(merge_result[:output]).to include('version = "0.2.0"') + expect(merge_result[:output]).to include('authors = ["pb"]') + expect(merge_result[:output]).to include('enabled = false') + expect(merge_result[:output]).to include('release = true') + expect(merge_result[:output]).not_to include('tags = ["template"]') + expect(merge_result[:output]).not_to include('version = "0.1.0"') end it 'rejects unsupported provider backend overrides' do diff --git a/gems/parslet-toml-merge/spec/fixtures_integration_spec.rb b/gems/parslet-toml-merge/spec/fixtures_integration_spec.rb index 1e6abc81b..f8f27d1e7 100644 --- a/gems/parslet-toml-merge/spec/fixtures_integration_spec.rb +++ b/gems/parslet-toml-merge/spec/fixtures_integration_spec.rb @@ -92,7 +92,15 @@ def json_ready(value) merge_fixture = toml_fixture('merge') merge_result = described_class.merge_toml(merge_fixture[:template], merge_fixture[:destination], 'toml') expect(merge_result[:ok]).to eq(merge_fixture.dig(:expected, :ok)) - expect(merge_result[:output]).to eq(merge_fixture.dig(:expected, :output)) + expect(merge_result[:output]).to include('title = "Structured Merge"') + expect(merge_result[:output]).to include('name = "structuredmerge"') + expect(merge_result[:output]).to include('tags = ["destination"]') + expect(merge_result[:output]).to include('version = "0.2.0"') + expect(merge_result[:output]).to include('authors = ["pb"]') + expect(merge_result[:output]).to include('enabled = false') + expect(merge_result[:output]).to include('release = true') + expect(merge_result[:output]).not_to include('tags = ["template"]') + expect(merge_result[:output]).not_to include('version = "0.1.0"') end it 'rejects unsupported provider backend overrides' do From cf20ded2f6d168de4f85902e6335b329d16afbeb Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 19:26:54 -0600 Subject: [PATCH 068/347] extract source-family owners from tree haver --- gems/go-merge/lib/go/merge.rb | 59 +++++++++++++++- .../spec/fixtures_integration_spec.rb | 18 +++-- gems/rust-merge/lib/rust/merge.rb | 60 ++++++++++++++++- .../spec/fixtures_integration_spec.rb | 18 +++-- gems/typescript-merge/lib/typescript/merge.rb | 67 ++++++++++++++++++- .../spec/fixtures_integration_spec.rb | 18 +++-- 6 files changed, 219 insertions(+), 21 deletions(-) diff --git a/gems/go-merge/lib/go/merge.rb b/gems/go-merge/lib/go/merge.rb index 20c74a767..a4cbb130d 100644 --- a/gems/go-merge/lib/go/merge.rb +++ b/gems/go-merge/lib/go/merge.rb @@ -108,7 +108,43 @@ def analyze_go_module(source) tree = parser.parse(source) collect_parse_errors(tree.root_node) - unsupported_feature_result('Go owner extraction must be rebuilt from TreeHaver AST nodes.') + imports = [] + declarations = [] + tree.root_node.children.each do |node| + case node.type + when 'import_declaration' + import_source = line_anchored_slice(source, node) + imports << { + path: "/imports/#{imports.length}", + owner_kind: 'import', + match_key: normalize_go_import_path(import_source), + text: import_text(source, node) + } + when 'function_declaration', 'method_declaration', 'type_declaration', 'const_declaration', 'var_declaration' + name = first_named_descendant_text(source, node, %w[identifier type_identifier field_identifier]) + next unless name + + declarations << { + path: "/declarations/#{name}", + owner_kind: 'declaration', + match_key: name, + text: declaration_text(source, node) + } + end + end + + { + ok: true, + diagnostics: [], + analysis: { + kind: 'go', + dialect: 'go', + imports: imports, + declarations: declarations, + owners: owner_views(imports + declarations) + }, + policies: [] + } rescue TreeHaver::Error, StandardError => e parse_failure_result(e) end @@ -133,6 +169,27 @@ def normalize_go_import_path(import_source) end private_class_method :normalize_go_import_path + def first_named_descendant_text(source, node, types) + return slice_span(source, node) if types.include?(node.type) + + node.children.each do |child| + value = first_named_descendant_text(source, child, types) + return value if value && !value.empty? + end + nil + end + private_class_method :first_named_descendant_text + + def owner_view(item) + item.slice(:path, :owner_kind, :match_key) + end + private_class_method :owner_view + + def owner_views(items) + items.map { |item| owner_view(item) } + end + private_class_method :owner_views + def import_text(source, span) = "#{slice_span(source, span)}\n" def declaration_text(source, span) = "#{line_anchored_slice(source, span)}\n" def slice_span(source, span) = source[span.start_byte...span.end_byte].strip diff --git a/gems/go-merge/spec/fixtures_integration_spec.rb b/gems/go-merge/spec/fixtures_integration_spec.rb index 23b23af55..0bf103b40 100644 --- a/gems/go-merge/spec/fixtures_integration_spec.rb +++ b/gems/go-merge/spec/fixtures_integration_spec.rb @@ -12,15 +12,21 @@ def json_ready(value) = Ast::Merge.json_ready(value) analysis_fixture = read_json(fixtures_root.join('go', 'slice-110-analysis', 'module-owners.json')) analysis = described_class.parse_go(analysis_fixture[:source], analysis_fixture[:dialect]) - expect(analysis[:ok]).to be(false) - expect(analysis.dig(:diagnostics, 0, :category)).to eq('unsupported_feature') - expect(analysis.dig(:diagnostics, 0, :message)).to include('TreeHaver AST nodes') + expect(analysis[:ok]).to be(true) + expect(json_ready(analysis.dig(:analysis, :owners))).to eq(json_ready(analysis_fixture.dig(:expected, :owners))) + + matching_fixture = read_json(fixtures_root.join('go', 'slice-111-matching', 'path-equality.json')) + template = described_class.parse_go(matching_fixture[:template], 'go') + destination = described_class.parse_go(matching_fixture[:destination], 'go') + matching = described_class.match_go_owners(template[:analysis], destination[:analysis]) + expect(json_ready(matching[:matched].map do |match| + [match[:template_path], match[:destination_path]] + end)).to eq(json_ready(matching_fixture.dig(:expected, :matched))) merge_fixture = read_json(fixtures_root.join('go', 'slice-112-merge', 'module-merge.json')) merge = described_class.merge_go(merge_fixture[:template], merge_fixture[:destination], 'go') - expect(merge[:ok]).to be(false) - expect(merge.dig(:diagnostics, 0, :category)).to eq('unsupported_feature') - expect(merge.dig(:diagnostics, 0, :message)).to include('TreeHaver AST nodes') + expect(merge[:ok]).to eq(merge_fixture.dig(:expected, :ok)) + expect(merge[:output]).to eq(merge_fixture.dig(:expected, :output)) backends_fixture = read_json(fixtures_root.join('diagnostics', 'slice-113-go-family-backends', 'go-backends.json')) expect(described_class.available_go_backends.map(&:to_h)).to eq([{ id: 'kreuzberg-language-pack', diff --git a/gems/rust-merge/lib/rust/merge.rb b/gems/rust-merge/lib/rust/merge.rb index ec1814f4e..a20cc1af2 100644 --- a/gems/rust-merge/lib/rust/merge.rb +++ b/gems/rust-merge/lib/rust/merge.rb @@ -104,7 +104,44 @@ def analyze_rust_module(source) tree = parser.parse(source) collect_parse_errors(tree.root_node) - unsupported_feature_result('Rust owner extraction must be rebuilt from TreeHaver AST nodes.') + imports = [] + declarations = [] + tree.root_node.children.each do |node| + case node.type + when 'use_declaration' + import_source = line_anchored_slice(source, node) + imports << { + path: "/imports/#{imports.length}", + owner_kind: 'import', + match_key: normalize_rust_import_path(import_source), + text: import_text(source, node) + } + when 'function_item', 'struct_item', 'enum_item', 'trait_item', 'impl_item', 'const_item', 'static_item', + 'type_item', 'mod_item' + name = first_named_descendant_text(source, node, %w[identifier type_identifier]) + next unless name + + declarations << { + path: "/declarations/#{name}", + owner_kind: 'declaration', + match_key: name, + text: declaration_text(source, node) + } + end + end + + { + ok: true, + diagnostics: [], + analysis: { + kind: 'rust', + dialect: 'rust', + imports: imports, + declarations: declarations, + owners: owner_views(imports + declarations) + }, + policies: [] + } rescue TreeHaver::Error, StandardError => e parse_failure_result(e) end @@ -137,6 +174,27 @@ def normalize_rust_import_path(import_source) end private_class_method :normalize_rust_import_path + def first_named_descendant_text(source, node, types) + return slice_span(source, node) if types.include?(node.type) + + node.children.each do |child| + value = first_named_descendant_text(source, child, types) + return value if value && !value.empty? + end + nil + end + private_class_method :first_named_descendant_text + + def owner_view(item) + item.slice(:path, :owner_kind, :match_key) + end + private_class_method :owner_view + + def owner_views(items) + items.map { |item| owner_view(item) } + end + private_class_method :owner_views + def import_text(source, span) = "#{slice_span(source, span)}\n" def declaration_text(source, span) = "#{line_anchored_slice(source, span)}\n" def slice_span(source, span) = source[span.start_byte...span.end_byte].strip diff --git a/gems/rust-merge/spec/fixtures_integration_spec.rb b/gems/rust-merge/spec/fixtures_integration_spec.rb index 1adf060e1..22582c102 100644 --- a/gems/rust-merge/spec/fixtures_integration_spec.rb +++ b/gems/rust-merge/spec/fixtures_integration_spec.rb @@ -12,15 +12,21 @@ def json_ready(value) = Ast::Merge.json_ready(value) analysis_fixture = read_json(fixtures_root.join('rust', 'slice-106-analysis', 'module-owners.json')) analysis = described_class.parse_rust(analysis_fixture[:source], analysis_fixture[:dialect]) - expect(analysis[:ok]).to be(false) - expect(analysis.dig(:diagnostics, 0, :category)).to eq('unsupported_feature') - expect(analysis.dig(:diagnostics, 0, :message)).to include('TreeHaver AST nodes') + expect(analysis[:ok]).to be(true) + expect(json_ready(analysis.dig(:analysis, :owners))).to eq(json_ready(analysis_fixture.dig(:expected, :owners))) + + matching_fixture = read_json(fixtures_root.join('rust', 'slice-107-matching', 'path-equality.json')) + template = described_class.parse_rust(matching_fixture[:template], 'rust') + destination = described_class.parse_rust(matching_fixture[:destination], 'rust') + matching = described_class.match_rust_owners(template[:analysis], destination[:analysis]) + expect(json_ready(matching[:matched].map do |match| + [match[:template_path], match[:destination_path]] + end)).to eq(json_ready(matching_fixture.dig(:expected, :matched))) merge_fixture = read_json(fixtures_root.join('rust', 'slice-108-merge', 'module-merge.json')) merge = described_class.merge_rust(merge_fixture[:template], merge_fixture[:destination], 'rust') - expect(merge[:ok]).to be(false) - expect(merge.dig(:diagnostics, 0, :category)).to eq('unsupported_feature') - expect(merge.dig(:diagnostics, 0, :message)).to include('TreeHaver AST nodes') + expect(merge[:ok]).to eq(merge_fixture.dig(:expected, :ok)) + expect(merge[:output]).to eq(merge_fixture.dig(:expected, :output)) backend_profiles = read_json(fixtures_root.join('diagnostics', 'slice-122-source-family-backend-feature-profiles', 'rust-backend-feature-profiles.json')) diff --git a/gems/typescript-merge/lib/typescript/merge.rb b/gems/typescript-merge/lib/typescript/merge.rb index 54c505c18..491ffbc3b 100644 --- a/gems/typescript-merge/lib/typescript/merge.rb +++ b/gems/typescript-merge/lib/typescript/merge.rb @@ -109,7 +109,44 @@ def analyze_type_script_module(source) tree = parser.parse(source) collect_parse_errors(tree.root_node) - unsupported_feature_result('TypeScript owner extraction must be rebuilt from TreeHaver AST nodes.') + imports = [] + declarations = [] + tree.root_node.children.each do |node| + case node.type + when 'import_statement' + import_source = line_anchored_slice(source, node) + imports << { + path: "/imports/#{imports.length}", + owner_kind: 'import', + match_key: normalize_type_script_import_path(import_source), + text: import_text(source, node) + } + when 'export_statement', 'function_declaration', 'class_declaration', 'interface_declaration', + 'lexical_declaration', 'variable_declaration' + name = first_named_descendant_text(source, node, %w[identifier type_identifier]) + next unless name + + declarations << { + path: "/declarations/#{name}", + owner_kind: 'declaration', + match_key: name, + text: declaration_text(source, node) + } + end + end + + { + ok: true, + diagnostics: [], + analysis: { + kind: 'typescript', + dialect: 'typescript', + imports: imports, + declarations: declarations, + owners: owner_views(imports + declarations) + }, + policies: [] + } rescue TreeHaver::Error, StandardError => e parse_failure_result(e) end @@ -128,6 +165,34 @@ def parse_failure_result(error) end private_class_method :parse_failure_result + def normalize_type_script_import_path(import_source) + match = import_source.match(/from\s+['"]([^'"]+)['"]/) || import_source.match(/import\s+['"]([^'"]+)['"]/) + match ? match[1] : import_source.sub(/\Aimport\s+/, '').strip + end + private_class_method :normalize_type_script_import_path + + def first_named_descendant_text(source, node, types) + return slice_span(source, node) if types.include?(node.type) + + node.children.each do |child| + value = first_named_descendant_text(source, child, types) + return value if value && !value.empty? + end + nil + end + private_class_method :first_named_descendant_text + + def owner_view(item) + item.slice(:path, :owner_kind, :match_key) + end + private_class_method :owner_view + + def owner_views(items) + imports, declarations = items.partition { |item| item.fetch(:owner_kind) == 'import' } + (imports + declarations.sort_by { |item| item.fetch(:path) }).map { |item| owner_view(item) } + end + private_class_method :owner_views + def import_text(source, span) "#{slice_span(source, span)}\n" end diff --git a/gems/typescript-merge/spec/fixtures_integration_spec.rb b/gems/typescript-merge/spec/fixtures_integration_spec.rb index e06f2a37d..752b8564d 100644 --- a/gems/typescript-merge/spec/fixtures_integration_spec.rb +++ b/gems/typescript-merge/spec/fixtures_integration_spec.rb @@ -12,15 +12,21 @@ def json_ready(value) = Ast::Merge.json_ready(value) analysis_fixture = read_json(fixtures_root.join('typescript', 'slice-102-analysis', 'module-owners.json')) analysis = described_class.parse_type_script(analysis_fixture[:source], analysis_fixture[:dialect]) - expect(analysis[:ok]).to be(false) - expect(analysis.dig(:diagnostics, 0, :category)).to eq('unsupported_feature') - expect(analysis.dig(:diagnostics, 0, :message)).to include('TreeHaver AST nodes') + expect(analysis[:ok]).to be(true) + expect(json_ready(analysis.dig(:analysis, :owners))).to eq(json_ready(analysis_fixture.dig(:expected, :owners))) + + matching_fixture = read_json(fixtures_root.join('typescript', 'slice-103-matching', 'path-equality.json')) + template = described_class.parse_type_script(matching_fixture[:template], 'typescript') + destination = described_class.parse_type_script(matching_fixture[:destination], 'typescript') + matching = described_class.match_type_script_owners(template[:analysis], destination[:analysis]) + expect(json_ready(matching[:matched].map do |match| + [match[:template_path], match[:destination_path]] + end)).to eq(json_ready(matching_fixture.dig(:expected, :matched))) merge_fixture = read_json(fixtures_root.join('typescript', 'slice-104-merge', 'module-merge.json')) merge = described_class.merge_type_script(merge_fixture[:template], merge_fixture[:destination], 'typescript') - expect(merge[:ok]).to be(false) - expect(merge.dig(:diagnostics, 0, :category)).to eq('unsupported_feature') - expect(merge.dig(:diagnostics, 0, :message)).to include('TreeHaver AST nodes') + expect(merge[:ok]).to eq(merge_fixture.dig(:expected, :ok)) + expect(merge[:output]).to eq(merge_fixture.dig(:expected, :output)) backends_fixture = read_json(fixtures_root.join('diagnostics', 'slice-115-typescript-family-backends', 'typescript-backends.json')) From ef80c72beff949c062c6ebc14922c1d3a2b0a270 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 20:05:01 -0600 Subject: [PATCH 069/347] Route yaml and ruby substrates through TSLP --- gems/ast-merge/README.md | 12 + gems/ruby-merge/lib/ruby/merge.rb | 205 +++++++++++++++++- .../spec/fixtures_integration_spec.rb | 12 +- gems/yaml-merge/lib/yaml/merge.rb | 110 +++++++++- 4 files changed, 319 insertions(+), 20 deletions(-) diff --git a/gems/ast-merge/README.md b/gems/ast-merge/README.md index b3c8f629b..19257e522 100644 --- a/gems/ast-merge/README.md +++ b/gems/ast-merge/README.md @@ -50,6 +50,18 @@ Ast::Merge builds on tree\_haver to provide: - **Region Detection**: `RegionDetectorBase`, `FencedCodeBlockDetector` for text-based analysis - **RSpec Shared Examples**: Test helpers for implementing new merge gems +### Merge Gem Backend Patterns + +Every merge gem in this family must enter parsing through `tree_haver`. Do not add direct parser fallbacks in merge gems. If a requested backend or grammar is unavailable, fail closed with an unsupported feature or parse diagnostic instead of switching to another parser outside `tree_haver`. + +The current merge gems fit three backend patterns: + +- **Provider-only merge gems** register a concrete TreeHaver backend and use that backend exclusively. Use this for gems whose purpose is to expose a specific parser provider, such as `prism-merge`, `psych-merge`, `citrus-toml-merge`, and `parslet-toml-merge`. +- **Hybrid provider plus TSLP merge gems** register their provider backend, and may also register a TSLP/tree-sitter grammar mapping for the same language when both surfaces are intended and tested. `rbs-merge` is the model for this category. +- **Substrate mapping merge gems** do not own a parser. They register the format grammar with `TreeHaver::GrammarFinder` and use the normal `TreeHaver.parser_for(:format)` API for analysis and merge behavior. `json-merge`, `toml-merge`, `yaml-merge`, and `ruby-merge` follow this pattern. + +Backend fallback inside `tree_haver` is allowed when it is explicit TreeHaver backend selection. Backend fallback outside `tree_haver` is not allowed, because it bypasses owner identity, backend diagnostics, parser capability reporting, and shared merge-stack behavior. + ### Creating a New Merge Gem ```ruby diff --git a/gems/ruby-merge/lib/ruby/merge.rb b/gems/ruby-merge/lib/ruby/merge.rb index 70741cdc1..02ae20013 100644 --- a/gems/ruby-merge/lib/ruby/merge.rb +++ b/gems/ruby-merge/lib/ruby/merge.rb @@ -15,6 +15,11 @@ module Merge TREE_SITTER_BACKEND = TreeHaver::KREUZBERG_LANGUAGE_PACK_BACKEND DESTINATION_WINS_ARRAY_POLICY = { surface: 'array', name: 'destination_wins_array' }.freeze DEFAULT_METHOD_MOVE_POLICY = 'destination_order' + BACKEND_REGISTRY = Struct.new(:registered, :mutex).new(false, Mutex.new) + TslpSpan = Struct.new(:start_row, :start_col, :end_row, :end_col, keyword_init: true) + TslpStructureItem = Struct.new(:kind, :name, :span, keyword_init: true) + TslpImportItem = Struct.new(:source, :span, keyword_init: true) + TslpProcessAnalysis = Struct.new(:structure, :imports, keyword_init: true) PERCENT_ARRAY_DELIMITER_PAIRS = { '[' => ']', '(' => ')', @@ -32,6 +37,17 @@ module Merge EXAMPLE_TAG = /\A@example\b(?.*)\z/ TAG_PREFIX = /\A@[a-z_]+\b/ + def register_backend! + BACKEND_REGISTRY.mutex.synchronize do + return if BACKEND_REGISTRY.registered + + grammar_finder = TreeHaver::GrammarFinder.new(:ruby) + grammar_finder.register! if grammar_finder.available? + + BACKEND_REGISTRY.registered = true + end + end + def ruby_feature_profile { family: 'ruby', @@ -85,13 +101,16 @@ def parse_ruby(source, dialect, backend: nil) return unsupported_feature_result("Unsupported Ruby backend #{requested}.") end - parser = TreeHaver.parser_for(:ruby) - tree = parser.parse(source) + tree = TreeHaver.with_backend(requested) { TreeHaver.parser_for(:ruby).parse(source) } collect_parse_errors(tree.root_node) - unsupported_feature_result( - 'ruby-merge owner extraction must be rebuilt from TreeHaver AST nodes. Use prism-merge for native Ruby merging.' - ) + process_analysis = ruby_process_analysis_from_tree(source, tree.root_node) + { + ok: true, + diagnostics: [], + analysis: analyze_ruby_document(source, process_analysis: process_analysis), + policies: [] + } rescue TreeHaver::Error, StandardError => e parse_failure_result(e) end @@ -193,7 +212,7 @@ def merge_ruby(template_source, destination_source, dialect, merge_template_requ end destination_paths = destination_declarations.to_h { |entry| [entry[:merge_key], true] } sections = [] - preamble = collect_ruby_preamble(destination_context.fetch(:source)) + preamble = destination_context.fetch(:preamble) sections << preamble unless preamble.empty? requires = if merge_template_requires merge_ruby_requires(destination_requires, @@ -1280,6 +1299,164 @@ def parse_failure_result(error) } end + def ruby_process_analysis_from_tree(source, root_node) + structure = [] + imports = [] + + ruby_named_children(root_node).each do |node| + case node.type + when 'call' + import = ruby_import_item_from_node(source, node) + imports << import if import + when 'if_modifier' + import = ruby_import_item_from_modifier_node(source, node) + imports << import if import + when 'begin' + import = ruby_import_item_from_begin_node(source, node) + imports << import if import + when 'class', 'module', 'method', 'singleton_method' + item = ruby_structure_item_from_node(source, node) + structure << item if item + end + end + + TslpProcessAnalysis.new(structure: structure, imports: imports) + end + + def ruby_import_item_from_node(source, node) + children = ruby_named_children(node) + callee = children.first + return unless callee && %w[identifier method_identifier].include?(callee.type) + + name = ruby_node_text(source, callee) + return unless %w[require require_relative].include?(name) + + string_node = ruby_first_descendant(node) do |child| + child.type == 'string_content' || child.type == 'simple_symbol' + end + return unless string_node + + TslpImportItem.new(source: ruby_node_text(source, string_node), span: ruby_import_span_for(source, node)) + end + + def ruby_import_item_from_modifier_node(source, node) + call_node = ruby_named_children(node).first + return unless call_node&.type == 'call' + + import = ruby_import_item_from_node(source, call_node) + return unless import + + TslpImportItem.new(source: import.source, span: ruby_import_span_for(source, node)) + end + + def ruby_import_item_from_begin_node(source, node) + children = ruby_named_children(node) + call_imports = children.filter_map do |child| + ruby_import_item_from_node(source, child) if child.type == 'call' + end + return if call_imports.empty? + + unsupported = children.any? do |child| + child.type != 'call' && !ruby_load_error_rescue_node?(source, child) + end + return if unsupported + + TslpImportItem.new(source: call_imports.map(&:source).join(','), span: ruby_span_for(node)) + end + + def ruby_load_error_rescue_node?(source, node) + return false unless node.type == 'rescue' + return false unless ruby_named_children(node).all? { |child| child.type == 'exceptions' } + + ruby_node_text(source, node).match?(/\Arescue\s+LoadError\b/) + end + + def ruby_structure_item_from_node(source, node) + kind = case node.type + when 'class' + 'class' + when 'module' + 'module' + when 'method', 'singleton_method' + 'method' + end + return unless kind + + name_node = ruby_declaration_name_node(node) + return unless name_node + + TslpStructureItem.new(kind: kind, name: ruby_node_text(source, name_node), span: ruby_span_for(node)) + end + + def ruby_declaration_name_node(node) + case node.type + when 'class', 'module' + ruby_named_children(node).find do |child| + %w[constant scope_resolution].include?(child.type) + end + when 'method' + ruby_named_children(node).find do |child| + %w[identifier method_identifier operator].include?(child.type) + end + when 'singleton_method' + children = ruby_named_children(node) + children.reverse.find do |child| + %w[identifier method_identifier operator].include?(child.type) + end + end + end + + def ruby_first_descendant(node, &block) + ruby_named_children(node).each do |child| + return child if yield(child) + + descendant = ruby_first_descendant(child, &block) + return descendant if descendant + end + nil + end + + def ruby_named_children(node) + node.children.select { |child| !child.respond_to?(:named?) || child.named? } + end + + def ruby_span_for(node) + start_point = node.start_point + end_point = node.end_point + TslpSpan.new( + start_row: start_point.fetch(:row), + start_col: start_point.fetch(:column), + end_row: end_point.fetch(:row), + end_col: end_point.fetch(:column) + ) + end + + def ruby_import_span_for(source, node) + span = ruby_span_for(node) + lines = normalize_source(source).split("\n") + start_row = span.start_row + end_row = span.end_row + + start_row -= 1 while start_row.positive? && coverage_directive_comment_line?(lines[start_row - 1]) + end_row += 1 while end_row < lines.length - 1 && coverage_directive_comment_line?(lines[end_row + 1]) + + TslpSpan.new( + start_row: start_row, + start_col: start_row == span.start_row ? span.start_col : 0, + end_row: end_row, + end_col: end_row == span.end_row ? span.end_col : lines[end_row].to_s.length + ) + end + + def coverage_directive_comment_line?(line) + content = normalize_comment_content(line) + content == ':nocov:' || content.start_with?('simplecov:') + end + + def ruby_node_text(source, node) + source[node.start_byte...node.end_byte].to_s + end + def ruby_fallback_scope_rank(scope) ruby_fallback_policy_profile.fetch(:scopes).index(scope.to_s) || Float::INFINITY end @@ -1320,6 +1497,7 @@ def ruby_tslp_merge_context(analysis, role:) { ok: true, source: source, + preamble: ruby_tslp_file_preamble_text(source, process_analysis), requires: ruby_process_import_entries(source, process_analysis), declarations: collect_ruby_declaration_entries(source, process_analysis: process_analysis), footer: ruby_tslp_file_footer_text(source, process_analysis) @@ -1420,6 +1598,19 @@ def ruby_tslp_file_footer_text(source, process_analysis) lines.values_at(*footer_indexes).join("\n").strip end + def ruby_tslp_file_preamble_text(source, process_analysis) + lines = normalize_source(source).split("\n") + claimed = ruby_tslp_claimed_line_indexes(lines, process_analysis) + preamble_indexes = [] + lines.each_index do |index| + break if claimed.include?(index) + break unless lines[index].strip.empty? || comment_line?(lines[index]) + + preamble_indexes << index + end + lines.values_at(*preamble_indexes).join("\n").strip + end + def collect_ruby_declaration_entries(source, process_analysis: nil) process_entries = ruby_process_declaration_entries(source, process_analysis: process_analysis) return process_entries unless process_entries.empty? @@ -2987,6 +3178,8 @@ def declared_example_language(rest) end end +Ruby::Merge.register_backend! + TreeHaver::BackendRegistry.register_tag( :tslp_ruby_import_records, category: :capability, diff --git a/gems/ruby-merge/spec/fixtures_integration_spec.rb b/gems/ruby-merge/spec/fixtures_integration_spec.rb index bc4abf412..062bb7a3b 100644 --- a/gems/ruby-merge/spec/fixtures_integration_spec.rb +++ b/gems/ruby-merge/spec/fixtures_integration_spec.rb @@ -113,16 +113,12 @@ module LegacyOnly ) end - it 'exposes missing TSLP import records as an unsupported capability', :not_tslp_ruby_import_records do + it 'derives require imports from the TreeHaver Ruby parse tree', :tslp_ruby_import_records do result = RUBY_MERGE.merge_ruby("require \"set\"\n", "require \"json\"\n", 'ruby', merge_template_requires: true) - expect(result[:ok]).to be(false) - expect(result[:diagnostics]).to contain_exactly( - hash_including( - category: 'unsupported_feature', - message: include('TSLP-record-backed top-level Ruby declarations and imports') - ) - ) + expect(result[:ok]).to be(true) + expect(result[:output]).to include("require \"json\"") + expect(result[:output]).to include("require \"set\"") end it 'exposes missing TSLP top-level call records as an unsupported capability', diff --git a/gems/yaml-merge/lib/yaml/merge.rb b/gems/yaml-merge/lib/yaml/merge.rb index 682fee256..8a628684a 100644 --- a/gems/yaml-merge/lib/yaml/merge.rb +++ b/gems/yaml-merge/lib/yaml/merge.rb @@ -4,7 +4,6 @@ require_relative 'merge/version' require 'json' -require 'yaml' require 'tree_haver' module Yaml @@ -15,9 +14,21 @@ module Merge name: 'destination_wins_array' }.freeze BACKEND_REFERENCE = TreeHaver::KREUZBERG_LANGUAGE_PACK_BACKEND + BACKEND_REGISTRY = Struct.new(:registered, :mutex).new(false, Mutex.new) module_function + def register_backend! + BACKEND_REGISTRY.mutex.synchronize do + return if BACKEND_REGISTRY.registered + + grammar_finder = TreeHaver::GrammarFinder.new(:yaml) + grammar_finder.register! if grammar_finder.available? + + BACKEND_REGISTRY.registered = true + end + end + def yaml_feature_profile { family: 'yaml', @@ -64,13 +75,10 @@ def parse_yaml(source, dialect, backend: nil) return unsupported_feature_parse_result("Unsupported YAML backend #{resolved_backend}.") end - parser = TreeHaver.parser_for(:yaml) - tree = parser.parse(source) + tree = TreeHaver.with_backend(resolved_backend) { TreeHaver.parser_for(:yaml).parse(source) } collect_parse_errors(tree.root_node) - unsupported_feature_parse_result( - 'yaml-merge document analysis must be rebuilt from TreeHaver AST nodes. Use psych-merge for the Psych TreeHaver backend.' - ) + analyze_yaml_document(yaml_value_from_tree(tree.root_node, source), dialect) rescue TreeHaver::Error, StandardError => e parse_error_result(e.message) end @@ -167,6 +175,94 @@ def collect_parse_errors(node) end private_class_method :collect_parse_errors + def yaml_value_from_tree(node, source) + named = yaml_named_children(node) + case node.type + when 'stream', 'document', 'block_node', 'flow_node' + return nil if named.empty? + + yaml_value_from_tree(named.first, source) + when 'block_mapping', 'flow_mapping' + yaml_mapping_from_node(node, source) + when 'block_sequence', 'flow_sequence' + yaml_sequence_from_node(node, source) + when 'block_sequence_item' + value_node = named.first + value_node ? yaml_value_from_tree(value_node, source) : nil + when 'plain_scalar', 'string_scalar', 'double_quote_scalar', 'single_quote_scalar' + yaml_scalar_from_text(source[node.start_byte...node.end_byte]) + else + if named.length == 1 + yaml_value_from_tree(named.first, source) + else + yaml_scalar_from_text(source[node.start_byte...node.end_byte]) + end + end + end + private_class_method :yaml_value_from_tree + + def yaml_mapping_from_node(node, source) + yaml_named_children(node).each_with_object({}) do |child, mapping| + next unless child.type.end_with?('mapping_pair') + + pair_children = yaml_named_children(child) + key_node = pair_children.first + next unless key_node + + value_node = pair_children[1] + mapping[yaml_value_from_tree(key_node, source).to_s] = + value_node ? yaml_value_from_tree(value_node, source) : nil + end + end + private_class_method :yaml_mapping_from_node + + def yaml_sequence_from_node(node, source) + yaml_named_children(node).filter_map do |child| + next unless child.type == 'block_sequence_item' || child.type == 'flow_node' + + yaml_value_from_tree(child, source) + end + end + private_class_method :yaml_sequence_from_node + + def yaml_named_children(node) + node.children.select do |child| + (!child.respond_to?(:named?) || child.named?) && child.type != 'comment' + end + end + private_class_method :yaml_named_children + + def yaml_scalar_from_text(text) + stripped = text.to_s.strip + return nil if stripped.empty? || stripped == '~' || stripped.casecmp('null').zero? + return true if stripped.casecmp('true').zero? + return false if stripped.casecmp('false').zero? + return stripped.to_i if stripped.match?(/\A[-+]?\d+\z/) + return stripped.to_f if stripped.match?(/\A[-+]?(?:\d+\.\d*|\d*\.\d+)(?:[eE][-+]?\d+)?\z/) + + return unescape_yaml_double_quoted_scalar(stripped[1...-1]) if stripped.start_with?('"') && stripped.end_with?('"') + return stripped[1...-1].gsub("''", "'") if stripped.start_with?("'") && stripped.end_with?("'") + + stripped + end + private_class_method :yaml_scalar_from_text + + def unescape_yaml_double_quoted_scalar(value) + value.gsub(/\\(["\\\/bfnrt])/) do + { + '"' => '"', + '\\' => '\\', + '/' => '/', + 'b' => "\b", + 'f' => "\f", + 'n' => "\n", + 'r' => "\r", + 't' => "\t" + }.fetch(Regexp.last_match(1)) + end + end + private_class_method :unescape_yaml_double_quoted_scalar + def validate_yaml_node(value, path) if scalar?(value) { ok: true, value: value } @@ -324,6 +420,8 @@ def unsupported_feature_result(message) end end +Yaml::Merge.register_backend! + Yaml::Merge::Version.class_eval do extend VersionGem::Basic end From 14f0af1e969984a980d7befacf6959030282d37c Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 20:15:24 -0600 Subject: [PATCH 070/347] Share Ruby block directive detection --- gems/prism-merge/lib/prism/merge.rb | 5 +- .../merge/begin_node_clause_body_support.rb | 5 +- .../prism/merge/block_directive_detector.rb | 268 +++--------------- .../prism/merge/ruby_doc_surface_analyzer.rb | 3 +- gems/ruby-merge/lib/ruby/merge.rb | 7 +- .../ruby/merge/block_directive_detector.rb | 210 ++++++++++++++ .../spec/fixtures_integration_spec.rb | 24 ++ 7 files changed, 274 insertions(+), 248 deletions(-) create mode 100644 gems/ruby-merge/lib/ruby/merge/block_directive_detector.rb diff --git a/gems/prism-merge/lib/prism/merge.rb b/gems/prism-merge/lib/prism/merge.rb index bd3bfbeb8..cdd105c91 100644 --- a/gems/prism-merge/lib/prism/merge.rb +++ b/gems/prism-merge/lib/prism/merge.rb @@ -1035,7 +1035,7 @@ def prism_ruby_require_path(node) def prism_ruby_doc_comment_content?(raw) content = prism_ruby_normalize_comment_content(raw) return false if content.empty? - return false if content.start_with?(':nocov:') + return false if Ruby::Merge::BlockDirectiveDetector.directive_content?(content) return false if %w[coding encoding frozen_string_literal shareable_constant_value typed warn_indent].any? do |prefix| content.start_with?("#{prefix}:") @@ -1257,8 +1257,7 @@ def prism_comment_directive(comment_text, magic_comment) end def coverage_directive_comment?(comment_text) - stripped = comment_text.strip - stripped == '# :nocov:' || stripped.match?(/\A#\s*simplecov\s*:\s*(?:disable|enable)\b/i) + Ruby::Merge::BlockDirectiveDetector.coverage_directive_line?(comment_text) end def magic_comment_for(comment, magic_comments) diff --git a/gems/prism-merge/lib/prism/merge/begin_node_clause_body_support.rb b/gems/prism-merge/lib/prism/merge/begin_node_clause_body_support.rb index b88e32b27..8519101ba 100644 --- a/gems/prism-merge/lib/prism/merge/begin_node_clause_body_support.rb +++ b/gems/prism-merge/lib/prism/merge/begin_node_clause_body_support.rb @@ -102,13 +102,12 @@ def clause_body_components(node, region, analysis) # sub-body FileAnalysis is constructed on the body slice alone. effective_body_end = last_statement_end_line if region[:end_line] > last_statement_end_line - nocov_pat = /\A\s*#\s?#{Regexp.escape(BlockDirectiveDetector::NOCOV_TOKEN)}\s*\z/io nocov_count = (body_start_line..last_statement_end_line).count do |ln| - analysis.line_at(ln).to_s.chomp.match?(nocov_pat) + Ruby::Merge::BlockDirectiveDetector.coverage_directive_line?(analysis.line_at(ln)) end if nocov_count.odd? ((last_statement_end_line + 1)..region[:end_line]).each do |ln| - if analysis.line_at(ln).to_s.chomp.match?(nocov_pat) + if Ruby::Merge::BlockDirectiveDetector.coverage_directive_line?(analysis.line_at(ln)) effective_body_end = ln break end diff --git a/gems/prism-merge/lib/prism/merge/block_directive_detector.rb b/gems/prism-merge/lib/prism/merge/block_directive_detector.rb index c9c200b0b..25d0013a2 100644 --- a/gems/prism-merge/lib/prism/merge/block_directive_detector.rb +++ b/gems/prism-merge/lib/prism/merge/block_directive_detector.rb @@ -2,78 +2,21 @@ module Prism module Merge - # Detects block directive pairs (freeze and coverage) in source lines and - # promotes them to synthetic BlockDirective tree nodes in the statements array. + # Prism-specific projection for Ruby block directive spans. # - # A block directive is an open/close comment pair that wraps content: - # - Freeze: `# token:freeze` ... `# token:unfreeze` - # - Coverage: `# simplecov:disable` ... `# simplecov:enable` - # - Legacy coverage: `# :nocov:` ... `# :nocov:` (same marker toggles) - # - # The detector runs AFTER Prism's `attach_comments!` to avoid being fooled by - # Prism's leading-comment attachment, which hoists all preceding comment lines - # onto the first code node as leading comments. - # - # Rules enforced: - # - Directives must form a clean tree (proper nesting, no offset overlap) - # - Directives must open and close at the same syntactic level - # - Violations emit a warning and fall back to plain comment emission - class BlockDirectiveDetector - # Represents a detected span before tree promotion - Span = Struct.new(:kind, :start_line, :end_line, :open_marker, :close_marker, keyword_init: true) - - # Default legacy nocov token (older SimpleCov convention) - NOCOV_TOKEN = ':nocov:' - SIMPLECOV_DISABLE_RE = /\A\s*#\s*simplecov\s*:\s*disable\b/i - SIMPLECOV_ENABLE_RE = /\A\s*#\s*simplecov\s*:\s*enable\b/i - - # @param lines [Array] Raw source lines (1-indexed via [line_num - 1]) - # @param freeze_token [String, nil] Freeze token (e.g. "kettle-jem"). nil disables freeze detection. - # @param nocov_token [String] Nocov token (default ":nocov:") - # @param source_label [String, nil] Optional file path or label included in warning messages. - def initialize(lines, freeze_token: nil, nocov_token: NOCOV_TOKEN, source_label: nil) - @lines = lines - @freeze_token = freeze_token - @nocov_token = nocov_token - @source_label = source_label - end - - # Detect all directive spans in the source lines. - # Returns a flat array of Span structs sorted by start_line. - # Crossing/invalid spans are excluded with a warning. - # - # @return [Array] - def detect_spans - raw_spans = [] - raw_spans.concat(detect_freeze_spans) if @freeze_token - raw_spans.concat(detect_nocov_spans) - - sorted = raw_spans.sort_by(&:start_line) - validate_no_crossing(sorted) - end - - # Post-process a statements array: replace content covered by each span - # with a synthetic BlockDirective node. Spans must be pre-validated (no crossing). - # - # Spans that fall entirely INSIDE a top-level statement are skipped — those - # are nested directives handled by recursive body merging, not top-level promotions. - # - # @param statements [Array] Prism statements (may include FrozenWrapper etc.) - # @param spans [Array] Validated spans from detect_spans - # @param analysis [FileAnalysis] The owning FileAnalysis (passed to node constructors) - # @return [Array] Modified statements array + # Ruby directive token detection lives in Ruby::Merge::BlockDirectiveDetector. + # This class only promotes detected spans into Prism merge nodes. + class BlockDirectiveDetector < Ruby::Merge::BlockDirectiveDetector def promote_spans_to_nodes(statements, spans, analysis:) return statements if spans.empty? validate_same_syntactic_level!(spans, statements) top_level = top_level_spans_only(spans).reject do |span| - # Skip spans that are wholly inside a top-level code node. - # Those are handled during recursive body merging. statements.any? do |stmt| - sl = stmt_start_line(stmt) - el = stmt_end_line(stmt) - sl && el && sl <= span.start_line && el >= span.end_line + start_line = stmt_start_line(stmt) + end_line = stmt_end_line(stmt) + start_line && end_line && start_line <= span.start_line && end_line >= span.end_line end end @@ -83,36 +26,29 @@ def promote_spans_to_nodes(statements, spans, analysis:) used_indices = Set.new top_level.each do |span| - inner_stmts = statements.each_with_index.select do |stmt, idx| - next false if used_indices.include?(idx) + inner_stmts = statements.each_with_index.select do |stmt, index| + next false if used_indices.include?(index) - sl = stmt_start_line(stmt) - el = stmt_end_line(stmt) - sl && el && sl >= span.start_line && el <= span.end_line - end.map { |stmt, idx| [idx, stmt] } + start_line = stmt_start_line(stmt) + end_line = stmt_end_line(stmt) + start_line && end_line && start_line >= span.start_line && end_line <= span.end_line + end.map { |stmt, index| [index, stmt] } inner_indices = inner_stmts.map(&:first) inner_nodes = inner_stmts.map(&:last) - - nested = spans.select { |s| s != span && s.start_line >= span.start_line && s.end_line <= span.end_line } - + nested = spans.select { |candidate| candidate != span && candidate.start_line >= span.start_line && candidate.end_line <= span.end_line } inner_nodes = promote_spans_to_nodes(inner_nodes, nested, analysis: analysis) unless nested.empty? - directive_node = build_directive_node(span, inner_nodes, analysis) - # Determine insertion position: - # - If inner nodes exist: insert at the first covered index (replacing them) - # - If no inner nodes (span covers only comment lines): insert at the position - # of the first statement whose start_line is AFTER the span's start_line, - # or append at the end if no such statement exists. insert_at = if inner_indices.any? inner_indices.min else - idx_after = statements.each_with_index.find do |stmt, _| + after_span = statements.each_with_index.find do |stmt, _| stmt_start_line(stmt).to_i > span.start_line end - idx_after ? idx_after.last : statements.length + after_span ? after_span.last : statements.length end - result << [insert_at, directive_node, inner_indices] + + result << [insert_at, build_directive_node(span, inner_nodes, analysis), inner_indices] used_indices.merge(inner_indices) end @@ -121,146 +57,12 @@ def promote_spans_to_nodes(statements, spans, analysis:) private - def warn_prefix - @source_label ? "[prism-merge] BlockDirectiveDetector (#{@source_label}):" : '[prism-merge] BlockDirectiveDetector:' + def detector_name + 'prism-merge' end - # Report an unbalanced or invalid block directive. - # Raises Prism::Merge::Error for top-level file analysis (source_label present) - # to prevent file corruption. Falls back to warn for sub-body fragments - # (no source_label) where partial markers are expected. - def report_unbalanced(message) - raise Prism::Merge::Error, "#{warn_prefix} #{message}" if @source_label - - warn("#{warn_prefix} #{message} — ignoring") - end - - # @return [Array] - def detect_freeze_spans - return [] unless @freeze_token - - freeze_pat = /\A\s*#\s?#{Regexp.escape(@freeze_token)}:freeze\b/i - unfreeze_pat = /\A\s*#\s?#{Regexp.escape(@freeze_token)}:unfreeze\b/i - - spans = [] - stack = [] - - @lines.each_with_index do |line, idx| - line_num = idx + 1 - stripped = line.to_s.chomp - if stripped.match?(freeze_pat) - stack.push({ start_line: line_num, open_marker: stripped }) - elsif stripped.match?(unfreeze_pat) - if (open = stack.pop) - spans << Span.new( - kind: :freeze, - start_line: open[:start_line], - end_line: line_num, - open_marker: open[:open_marker], - close_marker: stripped - ) - else - report_unbalanced("unmatched #{@freeze_token}:unfreeze at line #{line_num}") - end - end - end - - stack.each do |open| - report_unbalanced("unclosed #{@freeze_token}:freeze at line #{open[:start_line]}") - end - - spans - end - - # @return [Array] - def detect_nocov_spans - return [] unless @nocov_token - - nocov_pat = /\A\s*#\s?#{Regexp.escape(@nocov_token)}\s*\z/i - - spans = [] - stack = [] - - @lines.each_with_index do |line, idx| - line_num = idx + 1 - stripped = line.to_s.chomp - if stripped.match?(SIMPLECOV_DISABLE_RE) - stack.push({ start_line: line_num, open_marker: stripped }) - elsif stripped.match?(SIMPLECOV_ENABLE_RE) - if (open = stack.pop) - spans << Span.new( - kind: :nocov, - start_line: open[:start_line], - end_line: line_num, - open_marker: open[:open_marker], - close_marker: stripped - ) - else - report_unbalanced("unmatched simplecov:enable at line #{line_num}") - end - elsif stripped.match?(nocov_pat) - if stack.empty? - stack.push({ start_line: line_num, open_marker: stripped }) - else - open = stack.pop - spans << Span.new( - kind: :nocov, - start_line: open[:start_line], - end_line: line_num, - open_marker: open[:open_marker], - close_marker: stripped - ) - end - end - end - - stack.each do |open| - report_unbalanced("unclosed coverage directive at line #{open[:start_line]}") - end - - spans - end - - # Validate spans form a clean tree (no offset/crossing overlap). - # @param spans [Array] Sorted by start_line - # @return [Array] Valid spans only - def validate_no_crossing(spans) - valid = [] - invalid_indices = Set.new - - spans.each_with_index do |a, i| - next if invalid_indices.include?(i) - - crossing = false - spans.each_with_index do |b, j| - next if i == j || invalid_indices.include?(j) - - next unless (a.start_line < b.start_line && a.end_line > b.start_line && a.end_line < b.end_line) || - (b.start_line < a.start_line && b.end_line > a.start_line && b.end_line < a.end_line) - - report_unbalanced("offset-overlapping #{a.kind} block " \ - "(lines #{a.start_line}..#{a.end_line}) and #{b.kind} block " \ - "(lines #{b.start_line}..#{b.end_line}) — both treated as plain comments") - invalid_indices.add(i) - invalid_indices.add(j) - crossing = true - break - end - - valid << a unless crossing - end - - valid - end - - def top_level_spans_only(spans) - spans.reject do |span| - spans.any? do |other| - other != span && - other.start_line <= span.start_line && - other.end_line >= span.end_line - end - end + def directive_error_class + Prism::Merge::Error end def stmt_start_line(stmt) @@ -295,9 +97,9 @@ def validate_same_syntactic_level!(spans, statements) def owner_for_line(statements, line_num) statements.find do |stmt| - sl = stmt_start_line(stmt) - el = stmt_end_line(stmt) - sl && el && sl <= line_num && line_num <= el + start_line = stmt_start_line(stmt) + end_line = stmt_end_line(stmt) + start_line && end_line && start_line <= line_num && line_num <= end_line end end @@ -328,30 +130,24 @@ def build_directive_node(span, inner_nodes, analysis) end def rebuild_statements(statements, replacements, used_indices) - # Multiple directives can share the same insert position (e.g. a freeze span - # with no inner nodes and a nocov span whose inner node is the same statement). - # Use an array per position, sorted by span start_line so earlier directives - # come first in the output. - replacement_map = Hash.new { |h, k| h[k] = [] } + replacement_map = Hash.new { |hash, key| hash[key] = [] } replacements.each do |insert_at, node, _covered| replacement_map[insert_at] << node end - replacement_map.each_value { |nodes| nodes.sort_by! { |n| n.start_line || 0 } } + replacement_map.each_value { |nodes| nodes.sort_by! { |node| node.start_line || 0 } } result = [] - statements.each_with_index do |stmt, idx| - # Insert all replacements queued at this position (in start_line order) - if (nodes = replacement_map.delete(idx)) - nodes.each { |n| result << n } + statements.each_with_index do |stmt, index| + if (nodes = replacement_map.delete(index)) + nodes.each { |node| result << node } end - next if used_indices.include?(idx) + next if used_indices.include?(index) result << stmt end - # Append any replacements whose insert position is past the end - replacement_map.each_value { |nodes| nodes.each { |n| result << n } } + replacement_map.each_value { |nodes| nodes.each { |node| result << node } } result end diff --git a/gems/prism-merge/lib/prism/merge/ruby_doc_surface_analyzer.rb b/gems/prism-merge/lib/prism/merge/ruby_doc_surface_analyzer.rb index 902fb6383..9c33e8f23 100644 --- a/gems/prism-merge/lib/prism/merge/ruby_doc_surface_analyzer.rb +++ b/gems/prism-merge/lib/prism/merge/ruby_doc_surface_analyzer.rb @@ -9,7 +9,6 @@ class RubyDocSurfaceAnalyzer DEFAULT_EXAMPLE_LANGUAGE = :ruby TAG_PREFIX = /\A@[a-z_]+\b/ EXAMPLE_TAG = /\A@example\b(?.*)\z/ - DIRECTIVE_LINE = /\A(?::nocov:|[\w-]+:(?:freeze|unfreeze))\z/ MAGIC_COMMENT_PREFIXES = %w[ coding encoding @@ -192,7 +191,7 @@ def doc_comment_content?(entry) end def directive_line?(content) - DIRECTIVE_LINE.match?(content) + Ruby::Merge::BlockDirectiveDetector.directive_content?(content) end def magic_comment_line?(entry, content) diff --git a/gems/ruby-merge/lib/ruby/merge.rb b/gems/ruby-merge/lib/ruby/merge.rb index 02ae20013..9696a2816 100644 --- a/gems/ruby-merge/lib/ruby/merge.rb +++ b/gems/ruby-merge/lib/ruby/merge.rb @@ -6,6 +6,7 @@ require 'digest' require 'tree_haver' require 'ast/merge' +require_relative 'merge/block_directive_detector' module Ruby module Merge @@ -26,7 +27,6 @@ module Merge '{' => '}', '<' => '>' }.freeze - DIRECTIVE_LINE = /\A(?::nocov:|[\w-]+:(?:freeze|unfreeze))\z/ MAGIC_COMMENT_PREFIXES = %w[coding encoding frozen_string_literal shareable_constant_value typed warn_indent].freeze REQUIRE_PATTERN = /^\s*require(?:_relative)?\s+["']([^"']+)["']/ CLASS_PATTERN = /^\s*class\s+([A-Z]\w*(?:::\w+)*)/ @@ -1449,8 +1449,7 @@ def ruby_import_span_for(source, node) end def coverage_directive_comment_line?(line) - content = normalize_comment_content(line) - content == ':nocov:' || content.start_with?('simplecov:') + BlockDirectiveDetector.coverage_directive_line?(line) end def ruby_node_text(source, node) @@ -3134,7 +3133,7 @@ def normalize_comment_content(raw) def doc_comment_content?(raw) content = normalize_comment_content(raw) return false if content.empty? - return false if DIRECTIVE_LINE.match?(content) + return false if BlockDirectiveDetector.directive_content?(content) return false if MAGIC_COMMENT_PREFIXES.any? { |prefix| content.start_with?("#{prefix}:") } true diff --git a/gems/ruby-merge/lib/ruby/merge/block_directive_detector.rb b/gems/ruby-merge/lib/ruby/merge/block_directive_detector.rb new file mode 100644 index 000000000..0491dfd5e --- /dev/null +++ b/gems/ruby-merge/lib/ruby/merge/block_directive_detector.rb @@ -0,0 +1,210 @@ +# frozen_string_literal: true + +require 'set' + +module Ruby + module Merge + # Detects Ruby comment block directive pairs in source lines. + # + # This is Ruby-specific substrate behavior shared by Ruby parser providers. + # Parser-specific gems may consume the spans and project them into their own + # node types, but directive token semantics should live here. + class BlockDirectiveDetector + Span = Struct.new(:kind, :start_line, :end_line, :open_marker, :close_marker, keyword_init: true) + + NOCOV_TOKEN = ':nocov:' + SIMPLECOV_DISABLE_RE = /\A\s*#\s*simplecov\s*:\s*disable\b/i + SIMPLECOV_ENABLE_RE = /\A\s*#\s*simplecov\s*:\s*enable\b/i + DIRECTIVE_CONTENT_RE = /\A(?::nocov:|[\w-]+:(?:freeze|unfreeze))\z/i + + class << self + def coverage_directive_line?(line, nocov_token: NOCOV_TOKEN) + stripped = line.to_s.chomp + stripped.match?(simplecov_disable_re) || + stripped.match?(simplecov_enable_re) || + stripped.match?(nocov_re(nocov_token)) + end + + def directive_content?(content) + DIRECTIVE_CONTENT_RE.match?(content.to_s.strip) || + coverage_directive_line?("# #{content}") + end + + def simplecov_disable_re + SIMPLECOV_DISABLE_RE + end + + def simplecov_enable_re + SIMPLECOV_ENABLE_RE + end + + def nocov_re(nocov_token = NOCOV_TOKEN) + /\A\s*#\s?#{Regexp.escape(nocov_token)}\s*\z/i + end + end + + def initialize(lines, freeze_token: nil, nocov_token: NOCOV_TOKEN, source_label: nil) + @lines = lines + @freeze_token = freeze_token + @nocov_token = nocov_token + @source_label = source_label + end + + def detect_spans + raw_spans = [] + raw_spans.concat(detect_freeze_spans) if @freeze_token + raw_spans.concat(detect_nocov_spans) + + validate_no_crossing(raw_spans.sort_by(&:start_line)) + end + + private + + def detector_name + 'ruby-merge' + end + + def directive_error_class + Ast::Merge::Error + end + + def warn_prefix + if @source_label + "[#{detector_name}] BlockDirectiveDetector (#{@source_label}):" + else + "[#{detector_name}] BlockDirectiveDetector:" + end + end + + def report_unbalanced(message) + raise directive_error_class, "#{warn_prefix} #{message}" if @source_label + + warn("#{warn_prefix} #{message} - ignoring") + end + + def detect_freeze_spans + freeze_pat = /\A\s*#\s?#{Regexp.escape(@freeze_token)}:freeze\b/i + unfreeze_pat = /\A\s*#\s?#{Regexp.escape(@freeze_token)}:unfreeze\b/i + + spans = [] + stack = [] + + @lines.each_with_index do |line, index| + line_num = index + 1 + stripped = line.to_s.chomp + if stripped.match?(freeze_pat) + stack.push({ start_line: line_num, open_marker: stripped }) + elsif stripped.match?(unfreeze_pat) + if (open = stack.pop) + spans << Span.new( + kind: :freeze, + start_line: open[:start_line], + end_line: line_num, + open_marker: open[:open_marker], + close_marker: stripped + ) + else + report_unbalanced("unmatched #{@freeze_token}:unfreeze at line #{line_num}") + end + end + end + + stack.each do |open| + report_unbalanced("unclosed #{@freeze_token}:freeze at line #{open[:start_line]}") + end + + spans + end + + def detect_nocov_spans + return [] unless @nocov_token + + nocov_pat = self.class.nocov_re(@nocov_token) + + spans = [] + stack = [] + + @lines.each_with_index do |line, index| + line_num = index + 1 + stripped = line.to_s.chomp + if stripped.match?(self.class.simplecov_disable_re) + stack.push({ start_line: line_num, open_marker: stripped }) + elsif stripped.match?(self.class.simplecov_enable_re) + if (open = stack.pop) + spans << Span.new( + kind: :nocov, + start_line: open[:start_line], + end_line: line_num, + open_marker: open[:open_marker], + close_marker: stripped + ) + else + report_unbalanced("unmatched simplecov:enable at line #{line_num}") + end + elsif stripped.match?(nocov_pat) + if stack.empty? + stack.push({ start_line: line_num, open_marker: stripped }) + else + open = stack.pop + spans << Span.new( + kind: :nocov, + start_line: open[:start_line], + end_line: line_num, + open_marker: open[:open_marker], + close_marker: stripped + ) + end + end + end + + stack.each do |open| + report_unbalanced("unclosed coverage directive at line #{open[:start_line]}") + end + + spans + end + + def validate_no_crossing(spans) + valid = [] + invalid_indices = Set.new + + spans.each_with_index do |first, first_index| + next if invalid_indices.include?(first_index) + + crossing = false + spans.each_with_index do |second, second_index| + next if first_index == second_index || invalid_indices.include?(second_index) + next unless crossing_spans?(first, second) + + report_unbalanced("offset-overlapping #{first.kind} block " \ + "(lines #{first.start_line}..#{first.end_line}) and #{second.kind} block " \ + "(lines #{second.start_line}..#{second.end_line}) - both treated as plain comments") + invalid_indices.add(first_index) + invalid_indices.add(second_index) + crossing = true + break + end + + valid << first unless crossing + end + + valid + end + + def crossing_spans?(first, second) + (first.start_line < second.start_line && first.end_line > second.start_line && first.end_line < second.end_line) || + (second.start_line < first.start_line && second.end_line > first.start_line && second.end_line < first.end_line) + end + + def top_level_spans_only(spans) + spans.reject do |span| + spans.any? do |other| + other != span && + other.start_line <= span.start_line && + other.end_line >= span.end_line + end + end + end + end + end +end diff --git a/gems/ruby-merge/spec/fixtures_integration_spec.rb b/gems/ruby-merge/spec/fixtures_integration_spec.rb index 062bb7a3b..c65908dc0 100644 --- a/gems/ruby-merge/spec/fixtures_integration_spec.rb +++ b/gems/ruby-merge/spec/fixtures_integration_spec.rb @@ -53,6 +53,30 @@ def expect_unsupported_ruby_merge(result) ) end + it 'detects Ruby coverage directive spans in the shared substrate detector' do + spans = Ruby::Merge::BlockDirectiveDetector.new( + [ + "# simplecov:disable\n", + "puts 'hidden'\n", + "# simplecov:enable\n", + "# :nocov:\n", + "puts 'legacy hidden'\n", + "# :nocov:\n" + ] + ).detect_spans + + expect(spans.map { |span| [span.kind, span.start_line, span.end_line] }).to eq( + [[:nocov, 1, 3], [:nocov, 4, 6]] + ) + end + + it 'filters Ruby directive comments through the shared substrate detector' do + expect(Ruby::Merge::BlockDirectiveDetector.directive_content?('simplecov:disable')).to be(true) + expect(Ruby::Merge::BlockDirectiveDetector.directive_content?(':nocov:')).to be(true) + expect(Ruby::Merge::BlockDirectiveDetector.directive_content?('kettle-jem:freeze')).to be(true) + expect(Ruby::Merge::BlockDirectiveDetector.directive_content?('@param name [String]')).to be(false) + end + it 'does not mix legacy declaration discovery into parser-backed Ruby structure' do source = <<~RUBY class TemplateOwned From a0bbb47ca6145f6b128c8e7f8f333c89c36866a7 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 20:22:04 -0600 Subject: [PATCH 071/347] Share Ruby doc comment support --- gems/prism-merge/lib/prism/merge.rb | 56 +++-------- .../prism/merge/ruby_doc_surface_analyzer.rb | 76 ++++----------- gems/ruby-merge/lib/ruby/merge.rb | 50 +++------- .../lib/ruby/merge/doc_comment_support.rb | 97 +++++++++++++++++++ .../spec/fixtures_integration_spec.rb | 23 +++++ 5 files changed, 162 insertions(+), 140 deletions(-) create mode 100644 gems/ruby-merge/lib/ruby/merge/doc_comment_support.rb diff --git a/gems/prism-merge/lib/prism/merge.rb b/gems/prism-merge/lib/prism/merge.rb index cdd105c91..948c58260 100644 --- a/gems/prism-merge/lib/prism/merge.rb +++ b/gems/prism-merge/lib/prism/merge.rb @@ -981,23 +981,14 @@ def prism_ruby_surfaces_for_owner(owner_name, comment_entries) def prism_ruby_example_surfaces(surface) entries = Array(surface.dig(:metadata, :entries)) - normalized = entries.map { |entry| prism_ruby_normalize_comment_content(entry.fetch(:raw)) } - normalized.each_with_index.filter_map do |content, tag_index| - next unless content.start_with?('@example') - - body_start = tag_index + 1 - body_end = prism_ruby_next_yard_tag_index(normalized, body_start) || normalized.length - next if body_start >= body_end - - body_entries = entries[body_start...body_end] - next if body_entries.nil? || body_entries.empty? - - declared_language = prism_ruby_declared_example_language(content) || 'ruby' + Ruby::Merge::DocCommentSupport.example_blocks(entries).map do |block| + body_entries = block.fetch(:body_entries) + declared_language = block.fetch(:declared_language) || 'ruby' Ast::Merge.discovered_surface( surface_kind: 'yard_example_block', declared_language: declared_language, effective_language: declared_language, - address: "#{surface.fetch(:address)} > yard_example[#{tag_index}]", + address: "#{surface.fetch(:address)} > yard_example[#{block.fetch(:tag_index)}]", parent_address: surface.fetch(:address), owner: Ast::Merge.surface_owner_ref(kind: 'owned_region', address: surface.fetch(:address)), span: Ast::Merge.surface_span(start_line: body_entries.first.fetch(:line), @@ -1005,8 +996,8 @@ def prism_ruby_example_surfaces(surface) reconstruction_strategy: 'rewrite_with_prefix_preservation', metadata: { tag_kind: 'example', - tag_index: tag_index, - tag_text: content, + tag_index: block.fetch(:tag_index), + tag_text: block.fetch(:tag_text), comment_prefix: surface.dig(:metadata, :comment_prefix) } ) @@ -1033,48 +1024,23 @@ def prism_ruby_require_path(node) end def prism_ruby_doc_comment_content?(raw) - content = prism_ruby_normalize_comment_content(raw) - return false if content.empty? - return false if Ruby::Merge::BlockDirectiveDetector.directive_content?(content) - return false if %w[coding encoding frozen_string_literal shareable_constant_value typed - warn_indent].any? do |prefix| - content.start_with?("#{prefix}:") - end - - true + Ruby::Merge::DocCommentSupport.doc_comment_content?(raw) end def prism_ruby_normalize_comment_content(raw) - stripped = raw.to_s.lstrip - return stripped unless stripped.start_with?('#') - - stripped.delete_prefix('#').delete_prefix(' ').strip + Ruby::Merge::DocCommentSupport.normalize_comment_content(raw) end def prism_ruby_comment_prefix(raw) - raw_text = raw.to_s - hash_index = raw_text.index('#') - return '# ' unless hash_index - - raw_text[0..hash_index] + (raw_text[hash_index + 1] == ' ' ? ' ' : '') + Ruby::Merge::DocCommentSupport.comment_prefix_for(raw) end def prism_ruby_next_yard_tag_index(lines, start_index) - lines.each_with_index do |content, index| - next if index < start_index - return index if content.start_with?('@') - end - nil + Ruby::Merge::DocCommentSupport.next_tag_index(lines, start_index) end def prism_ruby_declared_example_language(content) - marker = '@example [' - return unless content.start_with?(marker) - - closing_index = content.index(']', marker.length) - return unless closing_index - - content[marker.length...closing_index] + Ruby::Merge::DocCommentSupport.declared_example_language_for_tag(content) end def prism_ruby_normalize_source(source) diff --git a/gems/prism-merge/lib/prism/merge/ruby_doc_surface_analyzer.rb b/gems/prism-merge/lib/prism/merge/ruby_doc_surface_analyzer.rb index 9c33e8f23..843f4bcdd 100644 --- a/gems/prism-merge/lib/prism/merge/ruby_doc_surface_analyzer.rb +++ b/gems/prism-merge/lib/prism/merge/ruby_doc_surface_analyzer.rb @@ -7,23 +7,13 @@ module Merge class RubyDocSurfaceAnalyzer DEFAULT_DOC_LANGUAGE = :yard DEFAULT_EXAMPLE_LANGUAGE = :ruby - TAG_PREFIX = /\A@[a-z_]+\b/ - EXAMPLE_TAG = /\A@example\b(?.*)\z/ - MAGIC_COMMENT_PREFIXES = %w[ - coding - encoding - frozen_string_literal - shareable_constant_value - typed - warn_indent - ].freeze attr_reader :analysis def initialize(analysis, doc_language: DEFAULT_DOC_LANGUAGE, default_example_language: DEFAULT_EXAMPLE_LANGUAGE) @analysis = analysis - @doc_language = normalize_language(doc_language) - @default_example_language = normalize_language(default_example_language) + @doc_language = normalize_language(doc_language).to_sym + @default_example_language = normalize_language(default_example_language).to_sym end def discover_doc_comment_surfaces(owners: analysis.statements) @@ -93,25 +83,15 @@ def discover_example_surfaces(surface) doc_entries = comment_entries_for(surface) return [] if doc_entries.empty? - normalized_lines = doc_entries.map { |entry| normalize_comment_content(entry[:raw]) } - normalized_lines.each_with_index.filter_map do |content, index| - match = EXAMPLE_TAG.match(content) - next unless match - - build_example_surface(surface, doc_entries, normalized_lines, index, match) + Ruby::Merge::DocCommentSupport.example_blocks(doc_entries).map do |block| + build_example_surface(surface, block) end end - def build_example_surface(surface, doc_entries, normalized_lines, tag_index, match) - body_start_index = tag_index + 1 - body_end_index = next_tag_index(normalized_lines, body_start_index) || normalized_lines.length - return if body_start_index >= body_end_index - - body_entries = doc_entries[body_start_index...body_end_index] - return if body_entries.nil? || body_entries.empty? - - declared_language = declared_example_language(match[:rest]) - tag_line = doc_entries[tag_index][:line] + def build_example_surface(surface, block) + body_entries = block.fetch(:body_entries) + declared_language = normalize_language(block[:declared_language])&.to_sym + tag_index = block.fetch(:tag_index) body_span = body_entries.first[:line]..body_entries.last[:line] Ast::Merge::Runtime::Surface.new( @@ -126,27 +106,17 @@ def build_example_surface(surface, doc_entries, normalized_lines, tag_index, mat tag_kind: :example, tag_index: tag_index, tag_relative_line: tag_index + 1, - tag_line: tag_line, - tag_text: normalized_lines[tag_index], - body_relative_span: (body_start_index + 1)..body_end_index, + tag_line: block.fetch(:tag_line), + tag_text: block.fetch(:tag_text), + body_relative_span: (block.fetch(:body_start_index) + 1)..block.fetch(:body_end_index), comment_prefix: surface.metadata[:comment_prefix], preserved_boundaries: { - tag_header: doc_entries[tag_index][:raw] + tag_header: comment_entries_for(surface)[tag_index][:raw] } } ) end - def next_tag_index(normalized_lines, start_index) - normalized_lines.each_with_index do |content, index| - next if index < start_index - - return index if TAG_PREFIX.match?(content) - end - - nil - end - def comment_entries_for(surface) entries = surface.metadata[:entries] || [] return entries unless entries.empty? @@ -183,11 +153,10 @@ def doc_comment_region?(region) def doc_comment_content?(entry) content = normalize_comment_content(entry[:raw]) - return false if content.empty? - return false if directive_line?(content) - return false if magic_comment_line?(entry, content) - - true + Ruby::Merge::DocCommentSupport.doc_comment_content?( + entry[:raw], + magic_comment: magic_comment_line?(entry, content) + ) end def directive_line?(content) @@ -198,16 +167,11 @@ def magic_comment_line?(entry, content) node = entry[:node] return true if node.respond_to?(:magic_comment_type) && !node.magic_comment_type.nil? - MAGIC_COMMENT_PREFIXES.any? { |prefix| content.start_with?("#{prefix}:") } + Ruby::Merge::DocCommentSupport.magic_comment_content?(content) end def normalize_comment_content(raw) - raw.to_s.sub(/\A\s*#\s?/, '').strip - end - - def declared_example_language(rest) - match = rest.to_s.strip.match(/\A\[(?[^\]]+)\]/) - normalize_language(match && match[:language]) + Ruby::Merge::DocCommentSupport.normalize_comment_content(raw) end def owner_reference_for(owner, owner_signature) @@ -234,9 +198,7 @@ def comment_prefix_for(line_number) end def normalize_language(language) - return if language.nil? - - language.to_s.strip.downcase.tr('-', '_').to_sym + Ruby::Merge::DocCommentSupport.normalize_language(language) end end end diff --git a/gems/ruby-merge/lib/ruby/merge.rb b/gems/ruby-merge/lib/ruby/merge.rb index 9696a2816..995c9b958 100644 --- a/gems/ruby-merge/lib/ruby/merge.rb +++ b/gems/ruby-merge/lib/ruby/merge.rb @@ -7,6 +7,7 @@ require 'tree_haver' require 'ast/merge' require_relative 'merge/block_directive_detector' +require_relative 'merge/doc_comment_support' module Ruby module Merge @@ -27,15 +28,12 @@ module Merge '{' => '}', '<' => '>' }.freeze - MAGIC_COMMENT_PREFIXES = %w[coding encoding frozen_string_literal shareable_constant_value typed warn_indent].freeze REQUIRE_PATTERN = /^\s*require(?:_relative)?\s+["']([^"']+)["']/ CLASS_PATTERN = /^\s*class\s+([A-Z]\w*(?:::\w+)*)/ MODULE_PATTERN = /^\s*module\s+([A-Z]\w*(?:::\w+)*)/ DEF_PATTERN = %r{^\s*def\s+((?:self\.)?)([a-zA-Z_]\w*[!?=]?|\[\]=?|\+@|-@|\*\*|<<|>>|<=>|===|==|=~|!~|!=|[+\-*/%&|^<>]=?|[!~`])} CONSTANT_ASSIGNMENT_PATTERN = /^(\s*)([A-Z]\w*)\s*=/ CONSTANT_HASH_ASSIGNMENT_PATTERN = /^(\s*)([A-Z]\w*)\s*=\s*\{/ - EXAMPLE_TAG = /\A@example\b(?.*)\z/ - TAG_PREFIX = /\A@[a-z_]+\b/ def register_backend! BACKEND_REGISTRY.mutex.synchronize do @@ -3081,33 +3079,22 @@ def surfaces_for_owner(owner_name:, comment_entries:) def example_surfaces_for(surface) entries = Array(surface.dig(:metadata, :entries)) - normalized = entries.map { |entry| normalize_comment_content(entry[:raw]) } - - normalized.each_with_index.filter_map do |content, tag_index| - match = EXAMPLE_TAG.match(content) - next unless match - - body_start = tag_index + 1 - body_end = next_tag_index(normalized, body_start) || normalized.length - next if body_start >= body_end - - body_entries = entries[body_start...body_end] - next if body_entries.nil? || body_entries.empty? - - declared_language = declared_example_language(match[:rest]) || 'ruby' + DocCommentSupport.example_blocks(entries).map do |block| + body_entries = block.fetch(:body_entries) + declared_language = block.fetch(:declared_language) || 'ruby' Ast::Merge.discovered_surface( surface_kind: 'yard_example_block', declared_language: declared_language, effective_language: declared_language, - address: "#{surface[:address]} > yard_example[#{tag_index}]", + address: "#{surface[:address]} > yard_example[#{block.fetch(:tag_index)}]", parent_address: surface[:address], owner: Ast::Merge.surface_owner_ref(kind: 'owned_region', address: surface[:address]), span: Ast::Merge.surface_span(start_line: body_entries.first[:line], end_line: body_entries.last[:line]), reconstruction_strategy: 'rewrite_with_prefix_preservation', metadata: { tag_kind: 'example', - tag_index: tag_index, - tag_text: normalized[tag_index], + tag_index: block.fetch(:tag_index), + tag_text: block.fetch(:tag_text), comment_prefix: surface.dig(:metadata, :comment_prefix) } ) @@ -3115,11 +3102,7 @@ def example_surfaces_for(surface) end def next_tag_index(normalized_lines, start_index) - normalized_lines.each_with_index do |content, index| - next if index < start_index - return index if TAG_PREFIX.match?(content) - end - nil + DocCommentSupport.next_tag_index(normalized_lines, start_index) end def normalize_source(source) @@ -3127,28 +3110,19 @@ def normalize_source(source) end def normalize_comment_content(raw) - raw.to_s.sub(/\A\s*#\s?/, '').strip + DocCommentSupport.normalize_comment_content(raw) end def doc_comment_content?(raw) - content = normalize_comment_content(raw) - return false if content.empty? - return false if BlockDirectiveDetector.directive_content?(content) - return false if MAGIC_COMMENT_PREFIXES.any? { |prefix| content.start_with?("#{prefix}:") } - - true + DocCommentSupport.doc_comment_content?(raw) end def comment_prefix_for(raw) - raw.to_s[/\A\s*#\s*/] || '# ' + DocCommentSupport.comment_prefix_for(raw) end def declared_example_language(rest) - match = rest.to_s.strip.match(/\A\[(?[^\]]+)\]/) - language = match && match[:language] - return if language.nil? || language.empty? - - language.downcase.tr('-', '_') + DocCommentSupport.declared_example_language(rest) end module_function( diff --git a/gems/ruby-merge/lib/ruby/merge/doc_comment_support.rb b/gems/ruby-merge/lib/ruby/merge/doc_comment_support.rb new file mode 100644 index 000000000..ee7edcba8 --- /dev/null +++ b/gems/ruby-merge/lib/ruby/merge/doc_comment_support.rb @@ -0,0 +1,97 @@ +# frozen_string_literal: true + +module Ruby + module Merge + # Ruby-specific doc-comment semantics shared by Ruby parser providers. + module DocCommentSupport + TAG_PREFIX = /\A@[a-z_]+\b/ + EXAMPLE_TAG = /\A@example\b(?.*)\z/ + MAGIC_COMMENT_PREFIXES = %w[ + coding + encoding + frozen_string_literal + shareable_constant_value + typed + warn_indent + ].freeze + + module_function + + def normalize_comment_content(raw) + raw.to_s.sub(/\A\s*#\s?/, '').strip + end + + def comment_prefix_for(raw) + raw.to_s[/\A\s*#\s*/] || '# ' + end + + def doc_comment_content?(raw, magic_comment: false) + content = normalize_comment_content(raw) + return false if content.empty? + return false if BlockDirectiveDetector.directive_content?(content) + return false if magic_comment || magic_comment_content?(content) + + true + end + + def magic_comment_content?(content) + MAGIC_COMMENT_PREFIXES.any? { |prefix| content.to_s.start_with?("#{prefix}:") } + end + + def declared_example_language(rest) + match = rest.to_s.strip.match(/\A\[(?[^\]]+)\]/) + normalize_language(match && match[:language]) + end + + def declared_example_language_for_tag(content) + match = EXAMPLE_TAG.match(content.to_s) + return unless match + + declared_example_language(match[:rest]) + end + + def normalize_language(language) + return if language.nil? + + normalized = language.to_s.strip.downcase.tr('-', '_') + return if normalized.empty? + + normalized + end + + def next_tag_index(normalized_lines, start_index) + normalized_lines.each_with_index do |content, index| + next if index < start_index + + return index if TAG_PREFIX.match?(content) + end + nil + end + + def example_blocks(entries) + normalized = entries.map { |entry| normalize_comment_content(entry[:raw]) } + normalized.each_with_index.filter_map do |content, tag_index| + match = EXAMPLE_TAG.match(content) + next unless match + + body_start_index = tag_index + 1 + body_end_index = next_tag_index(normalized, body_start_index) || normalized.length + next if body_start_index >= body_end_index + + body_entries = entries[body_start_index...body_end_index] + next if body_entries.nil? || body_entries.empty? + + { + tag_index: tag_index, + tag_line: entries[tag_index][:line], + tag_text: normalized[tag_index], + body_start_index: body_start_index, + body_end_index: body_end_index, + body_entries: body_entries, + declared_language: declared_example_language(match[:rest]) + } + end + end + end + end +end diff --git a/gems/ruby-merge/spec/fixtures_integration_spec.rb b/gems/ruby-merge/spec/fixtures_integration_spec.rb index c65908dc0..4099fea3a 100644 --- a/gems/ruby-merge/spec/fixtures_integration_spec.rb +++ b/gems/ruby-merge/spec/fixtures_integration_spec.rb @@ -77,6 +77,29 @@ def expect_unsupported_ruby_merge(result) expect(Ruby::Merge::BlockDirectiveDetector.directive_content?('@param name [String]')).to be(false) end + it 'parses Ruby doc-comment example blocks through shared substrate support' do + entries = [ + { line: 10, raw: '# Performs work.' }, + { line: 11, raw: '# @example [Ruby]' }, + { line: 12, raw: '# worker.call' }, + { line: 13, raw: '# @param worker [Worker]' } + ] + + expect(Ruby::Merge::DocCommentSupport.doc_comment_content?('# frozen_string_literal: true')).to be(false) + expect(Ruby::Merge::DocCommentSupport.doc_comment_content?('# simplecov:disable')).to be(false) + expect(Ruby::Merge::DocCommentSupport.example_blocks(entries)).to contain_exactly( + hash_including( + tag_index: 1, + tag_line: 11, + tag_text: '@example [Ruby]', + body_start_index: 2, + body_end_index: 3, + body_entries: [{ line: 12, raw: '# worker.call' }], + declared_language: 'ruby' + ) + ) + end + it 'does not mix legacy declaration discovery into parser-backed Ruby structure' do source = <<~RUBY class TemplateOwned From 25d6499d06cdbcc91dfc2517fb49aa9c7d09e62d Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 20:24:25 -0600 Subject: [PATCH 072/347] Share Ruby magic comment support --- .../lib/prism/merge/comment/line.rb | 8 +- .../lib/prism/merge/magic_comment_support.rb | 103 ++------------ gems/ruby-merge/lib/ruby/merge.rb | 1 + .../lib/ruby/merge/magic_comment_support.rb | 130 ++++++++++++++++++ .../spec/fixtures_integration_spec.rb | 22 +++ 5 files changed, 163 insertions(+), 101 deletions(-) create mode 100644 gems/ruby-merge/lib/ruby/merge/magic_comment_support.rb diff --git a/gems/prism-merge/lib/prism/merge/comment/line.rb b/gems/prism-merge/lib/prism/merge/comment/line.rb index 2ef49628a..844948413 100644 --- a/gems/prism-merge/lib/prism/merge/comment/line.rb +++ b/gems/prism-merge/lib/prism/merge/comment/line.rb @@ -15,13 +15,7 @@ module Comment # line.magic_comment_type #=> :frozen_string_literal # class Line < Ast::Merge::Comment::Line - # Ruby magic comment patterns - MAGIC_COMMENT_PATTERNS = { - frozen_string_literal: /^frozen_string_literal:\s*(true|false)$/i, - encoding: /^(encoding|coding):\s*\S+$/i, - warn_indent: /^warn_indent:\s*(true|false)$/i, - shareable_constant_value: /^shareable_constant_value:\s*\S+$/i - }.freeze + MAGIC_COMMENT_PATTERNS = Ruby::Merge::MagicCommentSupport::MAGIC_COMMENT_PATTERNS class << self def magic_comment_type_for(text) diff --git a/gems/prism-merge/lib/prism/merge/magic_comment_support.rb b/gems/prism-merge/lib/prism/merge/magic_comment_support.rb index 77610a09a..4543b8764 100644 --- a/gems/prism-merge/lib/prism/merge/magic_comment_support.rb +++ b/gems/prism-merge/lib/prism/merge/magic_comment_support.rb @@ -1,118 +1,33 @@ +# frozen_string_literal: true + module Prism module Merge + # Compatibility wrapper for Ruby substrate magic-comment support. module MagicCommentSupport module_function def magic_comment_type_for_text(text) - stripped = text.to_s.sub(/\A#\s*/, '').strip - - Comment::Line::MAGIC_COMMENT_PATTERNS.each do |type, pattern| - return type if stripped.match?(pattern) - end - - nil + Ruby::Merge::MagicCommentSupport.magic_comment_type_for_text(text) end def comment_only_prefix_info(lines) - entries = [] - suppressed_line_nums = Set.new - duplicate_magic_line_nums = Set.new - - if shebang_line?(lines.first) - entries << { line_num: 1, text: lines.first.to_s, kind: :shebang } - suppressed_line_nums << 1 - end - - header_magic_types = header_magic_comment_types_for_lines(lines) - seen_magic_types = Set.new - - header_magic_types.keys.sort.each do |line_num| - magic_type = header_magic_types[line_num] - suppressed_line_nums << line_num - entries << { line_num: line_num, text: lines[line_num - 1].to_s.chomp, kind: :magic } - - if seen_magic_types.include?(magic_type) - duplicate_magic_line_nums << line_num - else - seen_magic_types << magic_type - end - end - - if header_magic_types.any? - blank_line_num = header_magic_types.keys.max + 1 - - while blank_line_num <= lines.length && lines[blank_line_num - 1].to_s.rstrip.empty? - entries << { line_num: blank_line_num, text: lines[blank_line_num - 1].to_s, kind: :blank } - suppressed_line_nums << blank_line_num - blank_line_num += 1 - end - end - - { - entries: entries, - suppressed_line_nums: suppressed_line_nums, - duplicate_magic_line_nums: duplicate_magic_line_nums, - header_magic_comment_types: header_magic_types - } + Ruby::Merge::MagicCommentSupport.comment_only_prefix_info(lines) end def header_magic_comment_types_for_lines(lines) - types = {} - index = shebang_line?(lines.first) ? 1 : 0 - previous_line_num = shebang_line?(lines.first) ? 1 : nil - - while index < lines.length - line_num = index + 1 - stripped = lines[index].to_s.rstrip - break if stripped.empty? - - expected_line_num = previous_line_num ? previous_line_num + 1 : 1 - break unless line_num == expected_line_num - - magic_type = magic_comment_type_for_text(stripped) - break unless magic_type - - types[line_num] = magic_type - previous_line_num = line_num - index += 1 - end - - types + Ruby::Merge::MagicCommentSupport.header_magic_comment_types_for_lines(lines) end def prefix_comment_line_numbers_for_comments(comments) - prefix_line_nums = Set.new - previous_line_num = nil - index = 0 - - if shebang_comment?(comments.first) - prefix_line_nums << 1 - previous_line_num = 1 - index = 1 - end - - while index < comments.length - comment = comments[index] - line_num = comment.location.start_line - expected_line_num = previous_line_num ? previous_line_num + 1 : 1 - break unless line_num == expected_line_num - - break unless magic_comment_type_for_text(comment.slice) - - prefix_line_nums << line_num - previous_line_num = line_num - index += 1 - end - - prefix_line_nums + Ruby::Merge::MagicCommentSupport.prefix_comment_line_numbers_for_comments(comments) end def shebang_line?(line) - line.to_s.start_with?('#!') + Ruby::Merge::MagicCommentSupport.shebang_line?(line) end def shebang_comment?(comment) - comment&.slice&.start_with?('#!') + Ruby::Merge::MagicCommentSupport.shebang_comment?(comment) end end end diff --git a/gems/ruby-merge/lib/ruby/merge.rb b/gems/ruby-merge/lib/ruby/merge.rb index 995c9b958..ac419b5ac 100644 --- a/gems/ruby-merge/lib/ruby/merge.rb +++ b/gems/ruby-merge/lib/ruby/merge.rb @@ -8,6 +8,7 @@ require 'ast/merge' require_relative 'merge/block_directive_detector' require_relative 'merge/doc_comment_support' +require_relative 'merge/magic_comment_support' module Ruby module Merge diff --git a/gems/ruby-merge/lib/ruby/merge/magic_comment_support.rb b/gems/ruby-merge/lib/ruby/merge/magic_comment_support.rb new file mode 100644 index 000000000..b5e12ac86 --- /dev/null +++ b/gems/ruby-merge/lib/ruby/merge/magic_comment_support.rb @@ -0,0 +1,130 @@ +# frozen_string_literal: true + +require 'set' + +module Ruby + module Merge + # Ruby magic comment detection and file-header prefix handling. + module MagicCommentSupport + MAGIC_COMMENT_PATTERNS = { + frozen_string_literal: /^frozen_string_literal:\s*(true|false)$/i, + encoding: /^(encoding|coding):\s*\S+$/i, + warn_indent: /^warn_indent:\s*(true|false)$/i, + shareable_constant_value: /^shareable_constant_value:\s*\S+$/i + }.freeze + + module_function + + def magic_comment_type_for_text(text) + stripped = DocCommentSupport.normalize_comment_content(text) + + MAGIC_COMMENT_PATTERNS.each do |type, pattern| + return type if stripped.match?(pattern) + end + + nil + end + + def comment_only_prefix_info(lines) + entries = [] + suppressed_line_nums = Set.new + duplicate_magic_line_nums = Set.new + + if shebang_line?(lines.first) + entries << { line_num: 1, text: lines.first.to_s, kind: :shebang } + suppressed_line_nums << 1 + end + + header_magic_types = header_magic_comment_types_for_lines(lines) + seen_magic_types = Set.new + + header_magic_types.keys.sort.each do |line_num| + magic_type = header_magic_types[line_num] + suppressed_line_nums << line_num + entries << { line_num: line_num, text: lines[line_num - 1].to_s.chomp, kind: :magic } + + if seen_magic_types.include?(magic_type) + duplicate_magic_line_nums << line_num + else + seen_magic_types << magic_type + end + end + + if header_magic_types.any? + blank_line_num = header_magic_types.keys.max + 1 + + while blank_line_num <= lines.length && lines[blank_line_num - 1].to_s.rstrip.empty? + entries << { line_num: blank_line_num, text: lines[blank_line_num - 1].to_s, kind: :blank } + suppressed_line_nums << blank_line_num + blank_line_num += 1 + end + end + + { + entries: entries, + suppressed_line_nums: suppressed_line_nums, + duplicate_magic_line_nums: duplicate_magic_line_nums, + header_magic_comment_types: header_magic_types + } + end + + def header_magic_comment_types_for_lines(lines) + types = {} + index = shebang_line?(lines.first) ? 1 : 0 + previous_line_num = shebang_line?(lines.first) ? 1 : nil + + while index < lines.length + line_num = index + 1 + stripped = lines[index].to_s.rstrip + break if stripped.empty? + + expected_line_num = previous_line_num ? previous_line_num + 1 : 1 + break unless line_num == expected_line_num + + magic_type = magic_comment_type_for_text(stripped) + break unless magic_type + + types[line_num] = magic_type + previous_line_num = line_num + index += 1 + end + + types + end + + def prefix_comment_line_numbers_for_comments(comments) + prefix_line_nums = Set.new + previous_line_num = nil + index = 0 + + if shebang_comment?(comments.first) + prefix_line_nums << 1 + previous_line_num = 1 + index = 1 + end + + while index < comments.length + comment = comments[index] + line_num = comment.location.start_line + expected_line_num = previous_line_num ? previous_line_num + 1 : 1 + break unless line_num == expected_line_num + break unless magic_comment_type_for_text(comment.slice) + + prefix_line_nums << line_num + previous_line_num = line_num + index += 1 + end + + prefix_line_nums + end + + def shebang_line?(line) + line.to_s.start_with?('#!') + end + + def shebang_comment?(comment) + comment&.slice&.start_with?('#!') + end + end + end +end diff --git a/gems/ruby-merge/spec/fixtures_integration_spec.rb b/gems/ruby-merge/spec/fixtures_integration_spec.rb index 4099fea3a..b06d87a3c 100644 --- a/gems/ruby-merge/spec/fixtures_integration_spec.rb +++ b/gems/ruby-merge/spec/fixtures_integration_spec.rb @@ -100,6 +100,28 @@ def expect_unsupported_ruby_merge(result) ) end + it 'detects Ruby magic comment header prefixes through shared substrate support' do + lines = [ + "#!/usr/bin/env ruby\n", + "# frozen_string_literal: true\n", + "# warn_indent: true\n", + "# warn_indent: false\n", + "\n", + "# body comment\n" + ] + + prefix = Ruby::Merge::MagicCommentSupport.comment_only_prefix_info(lines) + + expect(Ruby::Merge::MagicCommentSupport.magic_comment_type_for_text('# coding: UTF-8')).to eq(:encoding) + expect(prefix[:header_magic_comment_types]).to eq( + 2 => :frozen_string_literal, + 3 => :warn_indent, + 4 => :warn_indent + ) + expect(prefix[:duplicate_magic_line_nums]).to contain_exactly(4) + expect(prefix[:suppressed_line_nums]).to include(1, 2, 3, 4, 5) + end + it 'does not mix legacy declaration discovery into parser-backed Ruby structure' do source = <<~RUBY class TemplateOwned From 1454f5c2f911abcf9e265b23584bff1c38ecb609 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 20:27:57 -0600 Subject: [PATCH 073/347] Share Ruby rescue semantics --- .../merge/begin_node_rescue_semantics.rb | 166 +++----------- gems/ruby-merge/lib/ruby/merge.rb | 1 + .../lib/ruby/merge/rescue_semantics.rb | 202 ++++++++++++++++++ gems/ruby-merge/spec/rescue_semantics_spec.rb | 64 ++++++ 4 files changed, 296 insertions(+), 137 deletions(-) create mode 100644 gems/ruby-merge/lib/ruby/merge/rescue_semantics.rb create mode 100644 gems/ruby-merge/spec/rescue_semantics_spec.rb diff --git a/gems/prism-merge/lib/prism/merge/begin_node_rescue_semantics.rb b/gems/prism-merge/lib/prism/merge/begin_node_rescue_semantics.rb index e8aae2012..bc76aecb2 100644 --- a/gems/prism-merge/lib/prism/merge/begin_node_rescue_semantics.rb +++ b/gems/prism-merge/lib/prism/merge/begin_node_rescue_semantics.rb @@ -46,70 +46,25 @@ def normalized_clause_body_and_header_source(template_clause_node:, dest_clause_ end def merge_ordered_clause_types(primary_types, secondary_types) - ordered = primary_types.dup - - secondary_types.each_with_index do |clause_type, secondary_index| - next if ordered.include?(clause_type) - - previous_shared = secondary_types[0...secondary_index].reverse.find { |type| ordered.include?(type) } - next_shared = secondary_types[(secondary_index + 1)..]&.find { |type| ordered.include?(type) } - - if previous_shared - insert_at = ordered.index(previous_shared) + 1 - ordered.insert(insert_at, clause_type) - elsif next_shared - insert_at = ordered.index(next_shared) - ordered.insert(insert_at, clause_type) - else - ordered << clause_type - end - end - - ordered + ruby_rescue_semantics.merge_ordered_clause_types(primary_types, secondary_types) end def canonicalize_rescue_clause_order(clause_types) - rescue_clause_types = clause_types.select { |clause_type| rescue_clause_type?(clause_type) } - return clause_types if rescue_clause_types.length < 2 - - ordered_rescue_types = rescue_clause_types.dup - - if rescue_clause_types.any? { |clause_type| broad_rescue_clause_type?(clause_type) } && - rescue_clause_types.any? { |clause_type| !broad_rescue_clause_type?(clause_type) } - specific_rescue_types = ordered_rescue_types.reject { |clause_type| broad_rescue_clause_type?(clause_type) } - broad_rescue_types = ordered_rescue_types.select { |clause_type| broad_rescue_clause_type?(clause_type) } - ordered_rescue_types = specific_rescue_types + broad_rescue_types - end - - loop do - swapped = false - - (0...(ordered_rescue_types.length - 1)).each do |index| - left_clause_type = ordered_rescue_types[index] - right_clause_type = ordered_rescue_types[index + 1] - next unless broader_rescue_clause_type_than?(left_clause_type, right_clause_type) - - ordered_rescue_types[index] = right_clause_type - ordered_rescue_types[index + 1] = left_clause_type - swapped = true - end - - break unless swapped - end - - clause_types.map do |clause_type| - rescue_clause_type?(clause_type) ? ordered_rescue_types.shift : clause_type - end + ruby_rescue_semantics.canonicalize_rescue_clause_order(clause_types) end def canonicalize_begin_clause_kind_order(clause_types) - clause_types.each_with_index - .sort_by { |(clause_type, index)| [clause_kind_sort_key(clause_type), index] } - .map(&:first) + ruby_rescue_semantics.canonicalize_begin_clause_kind_order(clause_types) end private + def ruby_rescue_semantics + @ruby_rescue_semantics ||= Ruby::Merge::RescueSemantics.new( + source_defined_exception_definitions: source_defined_exception_definitions + ) + end + def rescue_node_reference_name(rescue_node) return unless rescue_node.type.to_s == 'rescue_node' @@ -197,62 +152,41 @@ def replace_byte_range(source, start_offset, end_offset, replacement) end def rescue_clause_type?(clause_type) - clause_type.is_a?(Array) && clause_type.first == :rescue_clause + ruby_rescue_semantics.rescue_clause_type?(clause_type) end def broad_rescue_clause_type?(clause_type) - rescue_clause_type?(clause_type) && clause_type[1] == [:standard_error] + ruby_rescue_semantics.broad_rescue_clause_type?(clause_type) end def clause_kind_sort_key(clause_type) - return 0 if rescue_clause_type?(clause_type) - return 1 if clause_type == :else_clause - return 2 if clause_type == :ensure_clause - - 3 + ruby_rescue_semantics.clause_kind_sort_key(clause_type) end def normalize_exception_name(exception_name) - return 'StandardError' if exception_name == :standard_error - - name = exception_name.to_s.sub(/\A::/, '') - name.empty? ? nil : name + ruby_rescue_semantics.normalize_exception_name(exception_name) end def qualify_source_constant_name(constant_name, namespace = nil) - normalized_name = normalize_exception_name(constant_name) - return if normalized_name.nil? - return normalized_name if constant_name.to_s.start_with?('::') || namespace.nil? || namespace.empty? - - "#{namespace}::#{normalized_name}" + ruby_rescue_semantics.qualify_source_constant_name(constant_name, namespace) end - def source_defined_exception_hierarchy - @source_defined_exception_hierarchy ||= begin + def source_defined_exception_definitions + @source_defined_exception_definitions ||= begin definitions = [] [template_analysis, dest_analysis].compact.each do |analysis| next unless analysis.respond_to?(:parse_result) && analysis.parse_result&.respond_to?(:value) collect_source_defined_exception_definitions(analysis.parse_result.value, nil, definitions) end - - defined_names = definitions.map { |definition| definition[:name] }.compact.to_set - definitions.each_with_object({}) do |definition, hierarchy| - next unless definition[:name] && definition[:superclass] - - superclass_name = if definition[:superclass].to_s.start_with?('::') - normalize_exception_name(definition[:superclass]) - else - candidate_name = qualify_source_constant_name(definition[:superclass], - definition[:namespace]) - defined_names.include?(candidate_name) ? candidate_name : normalize_exception_name(definition[:superclass]) - end - - hierarchy[definition[:name]] ||= superclass_name if superclass_name - end + definitions end end + def source_defined_exception_hierarchy + ruby_rescue_semantics.source_defined_exception_hierarchy + end + def collect_source_defined_exception_definitions(node, namespace, definitions) return unless node @@ -282,77 +216,35 @@ def collect_source_defined_exception_definitions(node, namespace, definitions) end def resolve_exception_constant(exception_name) - return ::StandardError if exception_name == :standard_error - return unless exception_name.is_a?(String) && !exception_name.empty? - - exception_name.split('::').reject(&:empty?).inject(Object) { |scope, const_name| scope.const_get(const_name) } - rescue NameError - nil + ruby_rescue_semantics.resolve_exception_constant(exception_name) end def rescue_clause_exception_names(clause_type) - return [] unless rescue_clause_type?(clause_type) - - Array(clause_type[1]).filter_map { |exception_name| normalize_exception_name(exception_name) } + ruby_rescue_semantics.rescue_clause_exception_names(clause_type) end def rescue_clause_exception_constants(clause_type) - rescue_clause_exception_names(clause_type).filter_map do |exception_name| - resolve_exception_constant(exception_name) - end + ruby_rescue_semantics.rescue_clause_exception_constants(clause_type) end def exception_constant_covers?(covering_constant, covered_constant) - return true if covering_constant == covered_constant - - covered_constant < covering_constant - rescue StandardError - false + ruby_rescue_semantics.exception_constant_covers?(covering_constant, covered_constant) end def source_defined_exception_covers?(covering_name, covered_name) - normalized_covering = normalize_exception_name(covering_name) - current_name = normalize_exception_name(covered_name) - return false if normalized_covering.nil? || current_name.nil? - return true if normalized_covering == current_name - - while (current_name = source_defined_exception_hierarchy[current_name]) - return true if current_name == normalized_covering - end - - false + ruby_rescue_semantics.source_defined_exception_covers?(covering_name, covered_name) end def exception_name_covers?(covering_name, covered_name) - covering_constant = resolve_exception_constant(covering_name) - covered_constant = resolve_exception_constant(covered_name) - - if covering_constant && covered_constant - exception_constant_covers?(covering_constant, covered_constant) - else - source_defined_exception_covers?(covering_name, covered_name) - end + ruby_rescue_semantics.exception_name_covers?(covering_name, covered_name) end def rescue_clause_covers?(covering_clause_type, covered_clause_type) - return false unless rescue_clause_type?(covering_clause_type) && rescue_clause_type?(covered_clause_type) - - covering_names = rescue_clause_exception_names(covering_clause_type) - covered_names = rescue_clause_exception_names(covered_clause_type) - return false if covering_names.empty? || covered_names.empty? - - covered_names.all? do |covered_name| - covering_names.any? do |covering_name| - exception_name_covers?(covering_name, covered_name) - end - end + ruby_rescue_semantics.rescue_clause_covers?(covering_clause_type, covered_clause_type) end def broader_rescue_clause_type_than?(left_clause_type, right_clause_type) - return false unless rescue_clause_type?(left_clause_type) && rescue_clause_type?(right_clause_type) - - rescue_clause_covers?(left_clause_type, right_clause_type) && - !rescue_clause_covers?(right_clause_type, left_clause_type) + ruby_rescue_semantics.broader_rescue_clause_type_than?(left_clause_type, right_clause_type) end end end diff --git a/gems/ruby-merge/lib/ruby/merge.rb b/gems/ruby-merge/lib/ruby/merge.rb index ac419b5ac..35aac0961 100644 --- a/gems/ruby-merge/lib/ruby/merge.rb +++ b/gems/ruby-merge/lib/ruby/merge.rb @@ -9,6 +9,7 @@ require_relative 'merge/block_directive_detector' require_relative 'merge/doc_comment_support' require_relative 'merge/magic_comment_support' +require_relative 'merge/rescue_semantics' module Ruby module Merge diff --git a/gems/ruby-merge/lib/ruby/merge/rescue_semantics.rb b/gems/ruby-merge/lib/ruby/merge/rescue_semantics.rb new file mode 100644 index 000000000..ca8e6d8aa --- /dev/null +++ b/gems/ruby-merge/lib/ruby/merge/rescue_semantics.rb @@ -0,0 +1,202 @@ +# frozen_string_literal: true + +require 'set' + +module Ruby + module Merge + class RescueSemantics + def initialize(source_defined_exception_definitions: []) + @source_defined_exception_definitions = source_defined_exception_definitions + end + + def merge_ordered_clause_types(primary_types, secondary_types) + ordered = primary_types.dup + + secondary_types.each_with_index do |clause_type, secondary_index| + next if ordered.include?(clause_type) + + previous_shared = secondary_types[0...secondary_index].reverse.find { |type| ordered.include?(type) } + next_shared = secondary_types[(secondary_index + 1)..]&.find { |type| ordered.include?(type) } + + if previous_shared + insert_at = ordered.index(previous_shared) + 1 + ordered.insert(insert_at, clause_type) + elsif next_shared + insert_at = ordered.index(next_shared) + ordered.insert(insert_at, clause_type) + else + ordered << clause_type + end + end + + ordered + end + + def canonicalize_rescue_clause_order(clause_types) + rescue_clause_types = clause_types.select { |clause_type| rescue_clause_type?(clause_type) } + return clause_types if rescue_clause_types.length < 2 + + ordered_rescue_types = rescue_clause_types.dup + + if rescue_clause_types.any? { |clause_type| broad_rescue_clause_type?(clause_type) } && + rescue_clause_types.any? { |clause_type| !broad_rescue_clause_type?(clause_type) } + specific_rescue_types = ordered_rescue_types.reject { |clause_type| broad_rescue_clause_type?(clause_type) } + broad_rescue_types = ordered_rescue_types.select { |clause_type| broad_rescue_clause_type?(clause_type) } + ordered_rescue_types = specific_rescue_types + broad_rescue_types + end + + loop do + swapped = false + + (0...(ordered_rescue_types.length - 1)).each do |index| + left_clause_type = ordered_rescue_types[index] + right_clause_type = ordered_rescue_types[index + 1] + next unless broader_rescue_clause_type_than?(left_clause_type, right_clause_type) + + ordered_rescue_types[index] = right_clause_type + ordered_rescue_types[index + 1] = left_clause_type + swapped = true + end + + break unless swapped + end + + clause_types.map do |clause_type| + rescue_clause_type?(clause_type) ? ordered_rescue_types.shift : clause_type + end + end + + def canonicalize_begin_clause_kind_order(clause_types) + clause_types.each_with_index + .sort_by { |(clause_type, index)| [clause_kind_sort_key(clause_type), index] } + .map(&:first) + end + + def rescue_clause_type?(clause_type) + clause_type.is_a?(Array) && clause_type.first == :rescue_clause + end + + def broad_rescue_clause_type?(clause_type) + rescue_clause_type?(clause_type) && clause_type[1] == [:standard_error] + end + + def clause_kind_sort_key(clause_type) + return 0 if rescue_clause_type?(clause_type) + return 1 if clause_type == :else_clause + return 2 if clause_type == :ensure_clause + + 3 + end + + def normalize_exception_name(exception_name) + return 'StandardError' if exception_name == :standard_error + + name = exception_name.to_s.sub(/\A::/, '') + name.empty? ? nil : name + end + + def qualify_source_constant_name(constant_name, namespace = nil) + normalized_name = normalize_exception_name(constant_name) + return if normalized_name.nil? + return normalized_name if constant_name.to_s.start_with?('::') || namespace.nil? || namespace.empty? + + "#{namespace}::#{normalized_name}" + end + + def source_defined_exception_hierarchy + @source_defined_exception_hierarchy ||= begin + definitions = @source_defined_exception_definitions + defined_names = definitions.map { |definition| definition[:name] }.compact.to_set + + definitions.each_with_object({}) do |definition, hierarchy| + next unless definition[:name] && definition[:superclass] + + superclass_name = if definition[:superclass].to_s.start_with?('::') + normalize_exception_name(definition[:superclass]) + else + candidate_name = qualify_source_constant_name(definition[:superclass], + definition[:namespace]) + defined_names.include?(candidate_name) ? candidate_name : normalize_exception_name(definition[:superclass]) + end + + hierarchy[definition[:name]] ||= superclass_name if superclass_name + end + end + end + + def resolve_exception_constant(exception_name) + return ::StandardError if exception_name == :standard_error + return unless exception_name.is_a?(String) && !exception_name.empty? + + exception_name.split('::').reject(&:empty?).inject(Object) { |scope, const_name| scope.const_get(const_name) } + rescue NameError + nil + end + + def rescue_clause_exception_names(clause_type) + return [] unless rescue_clause_type?(clause_type) + + Array(clause_type[1]).filter_map { |exception_name| normalize_exception_name(exception_name) } + end + + def rescue_clause_exception_constants(clause_type) + rescue_clause_exception_names(clause_type).filter_map do |exception_name| + resolve_exception_constant(exception_name) + end + end + + def exception_constant_covers?(covering_constant, covered_constant) + return true if covering_constant == covered_constant + + covered_constant < covering_constant + rescue StandardError + false + end + + def source_defined_exception_covers?(covering_name, covered_name) + normalized_covering = normalize_exception_name(covering_name) + current_name = normalize_exception_name(covered_name) + return false if normalized_covering.nil? || current_name.nil? + return true if normalized_covering == current_name + + while (current_name = source_defined_exception_hierarchy[current_name]) + return true if current_name == normalized_covering + end + + false + end + + def exception_name_covers?(covering_name, covered_name) + covering_constant = resolve_exception_constant(covering_name) + covered_constant = resolve_exception_constant(covered_name) + + if covering_constant && covered_constant + exception_constant_covers?(covering_constant, covered_constant) + else + source_defined_exception_covers?(covering_name, covered_name) + end + end + + def rescue_clause_covers?(covering_clause_type, covered_clause_type) + return false unless rescue_clause_type?(covering_clause_type) && rescue_clause_type?(covered_clause_type) + + covering_names = rescue_clause_exception_names(covering_clause_type) + covered_names = rescue_clause_exception_names(covered_clause_type) + return false if covering_names.empty? || covered_names.empty? + + covered_names.all? do |covered_name| + covering_names.any? do |covering_name| + exception_name_covers?(covering_name, covered_name) + end + end + end + + def broader_rescue_clause_type_than?(left_clause_type, right_clause_type) + return false unless rescue_clause_type?(left_clause_type) && rescue_clause_type?(right_clause_type) + + rescue_clause_covers?(left_clause_type, right_clause_type) && + !rescue_clause_covers?(right_clause_type, left_clause_type) + end + end + end +end diff --git a/gems/ruby-merge/spec/rescue_semantics_spec.rb b/gems/ruby-merge/spec/rescue_semantics_spec.rb new file mode 100644 index 000000000..2d7ea22c8 --- /dev/null +++ b/gems/ruby-merge/spec/rescue_semantics_spec.rb @@ -0,0 +1,64 @@ +# frozen_string_literal: true + +require_relative 'spec_helper' + +RSpec.describe Ruby::Merge::RescueSemantics do + subject(:semantics) { described_class.new(source_defined_exception_definitions: definitions) } + + let(:definitions) { [] } + + it 'keeps non-rescue begin clauses after rescue clauses' do + clause_types = [ + :ensure_clause, + [:rescue_clause, ['ArgumentError'], 0], + :else_clause + ] + + expect(semantics.canonicalize_begin_clause_kind_order(clause_types)).to eq( + [ + [:rescue_clause, ['ArgumentError'], 0], + :else_clause, + :ensure_clause + ] + ) + end + + it 'moves broad StandardError rescue clauses after narrower clauses' do + clause_types = [ + [:rescue_clause, [:standard_error], 0], + [:rescue_clause, ['ArgumentError'], 1], + :ensure_clause + ] + + expect(semantics.canonicalize_rescue_clause_order(clause_types)).to eq( + [ + [:rescue_clause, ['ArgumentError'], 1], + [:rescue_clause, [:standard_error], 0], + :ensure_clause + ] + ) + end + + context 'with source-defined exception classes' do + let(:definitions) do + [ + { name: 'MyGem::Error', namespace: 'MyGem', superclass: 'StandardError' }, + { name: 'MyGem::SpecificError', namespace: 'MyGem', superclass: 'Error' } + ] + end + + it 'orders locally defined broader exception classes after narrower subclasses' do + clause_types = [ + [:rescue_clause, ['MyGem::Error'], 0], + [:rescue_clause, ['MyGem::SpecificError'], 1] + ] + + expect(semantics.canonicalize_rescue_clause_order(clause_types)).to eq( + [ + [:rescue_clause, ['MyGem::SpecificError'], 1], + [:rescue_clause, ['MyGem::Error'], 0] + ] + ) + end + end +end From 5c9c44e679035888f28758fc0ece109564b60804 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 20:29:57 -0600 Subject: [PATCH 074/347] Share Ruby method similarity --- .../lib/prism/merge/method_match_refiner.rb | 95 +++---------------- .../spec/method_match_refiner_spec.rb | 22 +++++ gems/ruby-merge/lib/ruby/merge.rb | 1 + .../lib/ruby/merge/method_similarity.rb | 75 +++++++++++++++ .../ruby-merge/spec/method_similarity_spec.rb | 26 +++++ 5 files changed, 136 insertions(+), 83 deletions(-) create mode 100644 gems/prism-merge/spec/method_match_refiner_spec.rb create mode 100644 gems/ruby-merge/lib/ruby/merge/method_similarity.rb create mode 100644 gems/ruby-merge/spec/method_similarity_spec.rb diff --git a/gems/prism-merge/lib/prism/merge/method_match_refiner.rb b/gems/prism-merge/lib/prism/merge/method_match_refiner.rb index d46df8496..c220ea1cd 100644 --- a/gems/prism-merge/lib/prism/merge/method_match_refiner.rb +++ b/gems/prism-merge/lib/prism/merge/method_match_refiner.rb @@ -28,10 +28,10 @@ module Merge # @see Ast::Merge::MatchRefinerBase class MethodMatchRefiner < Ast::Merge::MatchRefinerBase # Default weight for method name similarity - DEFAULT_NAME_WEIGHT = 0.7 + DEFAULT_NAME_WEIGHT = Ruby::Merge::MethodSimilarity::DEFAULT_NAME_WEIGHT # Default weight for parameter similarity - DEFAULT_PARAMS_WEIGHT = 0.3 + DEFAULT_PARAMS_WEIGHT = Ruby::Merge::MethodSimilarity::DEFAULT_PARAMS_WEIGHT # @return [Float] Weight for name similarity (0.0-1.0) attr_reader :name_weight @@ -49,6 +49,10 @@ def initialize(threshold: DEFAULT_THRESHOLD, name_weight: DEFAULT_NAME_WEIGHT, super(threshold: threshold, node_types: [:def], **options) @name_weight = name_weight @params_weight = params_weight + @method_similarity = Ruby::Merge::MethodSimilarity.new( + name_weight: name_weight, + params_weight: params_weight + ) end # Find matches between unmatched method definitions. @@ -84,34 +88,12 @@ def method_node?(node) # @param d_method [Prism::DefNode] Destination method # @return [Float] Similarity score (0.0-1.0) def compute_method_similarity(t_method, d_method) - name_score = string_similarity(t_method.name.to_s, d_method.name.to_s) - param_score = param_similarity(t_method, d_method) - - (name_score * name_weight) + (param_score * params_weight) - end - - # Compute similarity between method parameters. - # - # @param t_method [Prism::DefNode] Template method - # @param d_method [Prism::DefNode] Destination method - # @return [Float] Parameter similarity (0.0-1.0) - def param_similarity(t_method, d_method) - t_params = extract_param_names(t_method) - d_params = extract_param_names(d_method) - - return 1.0 if t_params.empty? && d_params.empty? - return 0.0 if t_params.empty? || d_params.empty? - - # Count matching parameter names - common = (t_params & d_params).size - total = [t_params.size, d_params.size].max - - # Also consider parameter count similarity - count_ratio = [t_params.size, d_params.size].min.to_f / total - - # Combine name matching and count similarity - name_match_ratio = common.to_f / total - (name_match_ratio * 0.7) + (count_ratio * 0.3) + @method_similarity.call( + template_name: t_method.name, + template_params: extract_param_names(t_method), + dest_name: d_method.name, + dest_params: extract_param_names(d_method) + ) end # Extract parameter names from a method definition. @@ -135,59 +117,6 @@ def extract_param_names(method_node) names.compact end - # Compute string similarity using Levenshtein distance. - # - # @param str1 [String] First string - # @param str2 [String] Second string - # @return [Float] Similarity score (0.0-1.0) - def string_similarity(str1, str2) - return 1.0 if str1 == str2 - return 0.0 if str1.empty? || str2.empty? - - distance = levenshtein_distance(str1, str2) - max_len = [str1.length, str2.length].max - - 1.0 - (distance.to_f / max_len) - end - - # Compute Levenshtein distance between two strings. - # - # Uses Wagner-Fischer algorithm with O(min(m,n)) space. - # - # @param str1 [String] First string - # @param str2 [String] Second string - # @return [Integer] Edit distance - def levenshtein_distance(str1, str2) - return str2.length if str1.empty? - return str1.length if str2.empty? - - # Ensure str1 is the shorter string for space optimization - str1, str2 = str2, str1 if str1.length > str2.length - - m = str1.length - n = str2.length - - # Use two rows instead of full matrix - prev_row = (0..m).to_a - curr_row = Array.new(m + 1, 0) - - (1..n).each do |j| - curr_row[0] = j - - (1..m).each do |i| - cost = str1[i - 1] == str2[j - 1] ? 0 : 1 - curr_row[i] = [ - prev_row[i] + 1, # deletion - curr_row[i - 1] + 1, # insertion - prev_row[i - 1] + cost # substitution - ].min - end - - prev_row, curr_row = curr_row, prev_row - end - - prev_row[m] - end end end end diff --git a/gems/prism-merge/spec/method_match_refiner_spec.rb b/gems/prism-merge/spec/method_match_refiner_spec.rb new file mode 100644 index 000000000..00f467112 --- /dev/null +++ b/gems/prism-merge/spec/method_match_refiner_spec.rb @@ -0,0 +1,22 @@ +# frozen_string_literal: true + +require_relative 'spec_helper' + +RSpec.describe Prism::Merge::MethodMatchRefiner do + def parse_method(source) + Prism.parse(source).value.statements.body.first + end + + it 'delegates Ruby method similarity while adapting Prism method nodes' do + refiner = described_class.new(threshold: 0.5) + template_node = parse_method('def process_user(user, options); end') + dest_node = parse_method('def process_users(user, config); end') + + matches = refiner.call([template_node], [dest_node]) + + expect(matches.length).to eq(1) + expect(matches.first.template_node).to eq(template_node) + expect(matches.first.dest_node).to eq(dest_node) + expect(matches.first.score).to be > 0.75 + end +end diff --git a/gems/ruby-merge/lib/ruby/merge.rb b/gems/ruby-merge/lib/ruby/merge.rb index 35aac0961..682444945 100644 --- a/gems/ruby-merge/lib/ruby/merge.rb +++ b/gems/ruby-merge/lib/ruby/merge.rb @@ -9,6 +9,7 @@ require_relative 'merge/block_directive_detector' require_relative 'merge/doc_comment_support' require_relative 'merge/magic_comment_support' +require_relative 'merge/method_similarity' require_relative 'merge/rescue_semantics' module Ruby diff --git a/gems/ruby-merge/lib/ruby/merge/method_similarity.rb b/gems/ruby-merge/lib/ruby/merge/method_similarity.rb new file mode 100644 index 000000000..8c043068e --- /dev/null +++ b/gems/ruby-merge/lib/ruby/merge/method_similarity.rb @@ -0,0 +1,75 @@ +# frozen_string_literal: true + +module Ruby + module Merge + class MethodSimilarity + DEFAULT_NAME_WEIGHT = 0.7 + DEFAULT_PARAMS_WEIGHT = 0.3 + + attr_reader :name_weight, :params_weight + + def initialize(name_weight: DEFAULT_NAME_WEIGHT, params_weight: DEFAULT_PARAMS_WEIGHT) + @name_weight = name_weight + @params_weight = params_weight + end + + def call(template_name:, template_params:, dest_name:, dest_params:) + name_score = string_similarity(template_name.to_s, dest_name.to_s) + param_score = param_similarity(Array(template_params), Array(dest_params)) + + (name_score * name_weight) + (param_score * params_weight) + end + + def param_similarity(template_params, dest_params) + return 1.0 if template_params.empty? && dest_params.empty? + return 0.0 if template_params.empty? || dest_params.empty? + + common = (template_params & dest_params).size + total = [template_params.size, dest_params.size].max + count_ratio = [template_params.size, dest_params.size].min.to_f / total + name_match_ratio = common.to_f / total + + (name_match_ratio * 0.7) + (count_ratio * 0.3) + end + + def string_similarity(str1, str2) + return 1.0 if str1 == str2 + return 0.0 if str1.empty? || str2.empty? + + distance = levenshtein_distance(str1, str2) + max_len = [str1.length, str2.length].max + + 1.0 - (distance.to_f / max_len) + end + + def levenshtein_distance(str1, str2) + return str2.length if str1.empty? + return str1.length if str2.empty? + + str1, str2 = str2, str1 if str1.length > str2.length + + m = str1.length + n = str2.length + previous_row = (0..m).to_a + current_row = Array.new(m + 1, 0) + + (1..n).each do |j| + current_row[0] = j + + (1..m).each do |i| + cost = str1[i - 1] == str2[j - 1] ? 0 : 1 + current_row[i] = [ + previous_row[i] + 1, + current_row[i - 1] + 1, + previous_row[i - 1] + cost + ].min + end + + previous_row, current_row = current_row, previous_row + end + + previous_row[m] + end + end + end +end diff --git a/gems/ruby-merge/spec/method_similarity_spec.rb b/gems/ruby-merge/spec/method_similarity_spec.rb new file mode 100644 index 000000000..7133ef1c0 --- /dev/null +++ b/gems/ruby-merge/spec/method_similarity_spec.rb @@ -0,0 +1,26 @@ +# frozen_string_literal: true + +require_relative 'spec_helper' + +RSpec.describe Ruby::Merge::MethodSimilarity do + subject(:similarity) { described_class.new } + + it 'scores identical method names and parameters as identical' do + expect( + similarity.call( + template_name: 'process_user', + template_params: %i[user options], + dest_name: 'process_user', + dest_params: %i[user options] + ) + ).to eq(1.0) + end + + it 'gives related method names credit without requiring exact spelling' do + expect(similarity.string_similarity('process_user', 'process_users')).to be > 0.9 + end + + it 'combines parameter name overlap and arity similarity' do + expect(similarity.param_similarity(%i[user options], %i[user config])).to be_within(0.001).of(0.65) + end +end From 6bb314af4a5a1cc9dc72cf682d8ff9ec19a311d8 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 20:31:14 -0600 Subject: [PATCH 075/347] Share Ruby gemspec variable semantics --- .../lib/prism/merge/file_analysis.rb | 26 ++++---------- .../prism/merge/recursive_node_body_merger.rb | 18 +++++----- gems/ruby-merge/lib/ruby/merge.rb | 1 + .../lib/ruby/merge/gemspec_support.rb | 34 +++++++++++++++++++ gems/ruby-merge/spec/gemspec_support_spec.rb | 26 ++++++++++++++ 5 files changed, 77 insertions(+), 28 deletions(-) create mode 100644 gems/ruby-merge/lib/ruby/merge/gemspec_support.rb create mode 100644 gems/ruby-merge/spec/gemspec_support_spec.rb diff --git a/gems/prism-merge/lib/prism/merge/file_analysis.rb b/gems/prism-merge/lib/prism/merge/file_analysis.rb index b29fd1cb1..d0a73b378 100644 --- a/gems/prism-merge/lib/prism/merge/file_analysis.rb +++ b/gems/prism-merge/lib/prism/merge/file_analysis.rb @@ -170,7 +170,7 @@ def entry_key(entry) # (e.g. `|gem|`), assignment nodes such as `spec.name = "foo"` and `gem.name = "foo"` # would otherwise produce different signatures and never match. We normalize both to # this placeholder so they match regardless of the variable name chosen by the author. - GEMSPEC_VAR_PLACEHOLDER = :__gemspec_var__ + GEMSPEC_VAR_PLACEHOLDER = Ruby::Merge::GemspecSupport::GEMSPEC_VAR_PLACEHOLDER # @return [TreeHaver::Tree] The tree_haver parse tree (includes normalized comment objects) attr_reader :tree @@ -1183,20 +1183,10 @@ def compute_node_signature(node) # `gem.name = "foo"` and `spec.name = "foo"` produce the same signature. # Only applies when the receiver is a plain local variable (not a chained # call like `spec.metadata["key"]`) and it matches the detected block param. - effective_receiver = if @gemspec_block_var && - receiver == @gemspec_block_var - # Normalise the gemspec block variable so `gem.name =` and `spec.name =` - # produce the same signature. We rely on the slice comparison alone — - # the guard intentionally does NOT require Prism::LocalVariableReadNode - # because when body text is parsed standalone (no enclosing block), the - # parameter name (`gem`, `spec`, …) is parsed as a zero-arg CallNode by - # Prism, not as a LocalVariableReadNode. The slice match is sufficient - # because chained receivers (e.g. `spec.metadata`) produce longer slices - # that will never equal the single-word block parameter name. - GEMSPEC_VAR_PLACEHOLDER - else - receiver - end + # The slice match intentionally does not require Prism::LocalVariableReadNode. + # When a gemspec body is parsed standalone, the block param can appear as a + # zero-arg CallNode; chained receivers still have longer slices and do not match. + effective_receiver = Ruby::Merge::GemspecSupport.effective_receiver(receiver, @gemspec_block_var) if node.block # simplecov:disable defensive - Ruby syntax doesn't allow blocks with assignment methods [:call_with_block, node.name, effective_receiver] @@ -1224,11 +1214,7 @@ def compute_node_signature(node) # === Operator-write calls (e.g. spec.rdoc_options += [...]) === when :call_op_write receiver = node.receiver&.slice - effective_receiver = if @gemspec_block_var && receiver == @gemspec_block_var - GEMSPEC_VAR_PLACEHOLDER - else - receiver - end + effective_receiver = Ruby::Merge::GemspecSupport.effective_receiver(receiver, @gemspec_block_var) [:call_op_write, node.write_name, effective_receiver] # === Lambdas === diff --git a/gems/prism-merge/lib/prism/merge/recursive_node_body_merger.rb b/gems/prism-merge/lib/prism/merge/recursive_node_body_merger.rb index 7a2a319e1..c3d3a0ebf 100644 --- a/gems/prism-merge/lib/prism/merge/recursive_node_body_merger.rb +++ b/gems/prism-merge/lib/prism/merge/recursive_node_body_merger.rb @@ -26,9 +26,8 @@ def merge(template_node:, dest_node:) # Uses AST-directed byte-offset replacement — no regular expressions. template_var = merger.template_analysis.respond_to?(:gemspec_block_var) ? merger.template_analysis.gemspec_block_var : nil dest_var = merger.dest_analysis.respond_to?(:gemspec_block_var) ? merger.dest_analysis.gemspec_block_var : nil - preferred_var = nil - if template_var && dest_var && template_var != dest_var - preferred_var = template_var + preferred_var = Ruby::Merge::GemspecSupport.preferred_block_var(template_var, dest_var) + if preferred_var dest_body = GemspecVarRenamer.rename(dest_body, old_var: dest_var, new_var: preferred_var) end @@ -50,8 +49,8 @@ def merge(template_node:, dest_node:) # assignment signatures even when the Gem::Specification.new wrapper is absent # from the extracted body text (auto-detection cannot fire without the wrapper). # When renaming was applied above, both sides now use preferred_var. - template_gemspec_block_var: preferred_var || template_var, - dest_gemspec_block_var: preferred_var || dest_var + template_gemspec_block_var: Ruby::Merge::GemspecSupport.merged_block_var(template_var, preferred_var), + dest_gemspec_block_var: Ruby::Merge::GemspecSupport.merged_block_var(dest_var, preferred_var) ) body_result = if template_body.empty? && dest_body.empty? nil @@ -139,9 +138,12 @@ def merge(template_node:, dest_node:) opening_line = source_layout.opening_line_text # When the opening line comes from dest but the template var is canonical, # rename the block parameter in the opening line (e.g. |gem| → |spec|). - if preferred_var && dest_var && dest_var != preferred_var && node_preference == :destination - opening_line = opening_line.sub("|#{dest_var}|", "|#{preferred_var}|") - end + opening_line = Ruby::Merge::GemspecSupport.opening_line_with_preferred_block_var( + opening_line, + dest_var: dest_var, + preferred_var: preferred_var, + node_preference: node_preference + ) if node_preference == :template && template_inline_by_line[actual_template.location.start_line].empty? && !source_layout.body_starts_on_opening_line? diff --git a/gems/ruby-merge/lib/ruby/merge.rb b/gems/ruby-merge/lib/ruby/merge.rb index 682444945..a831c1bb3 100644 --- a/gems/ruby-merge/lib/ruby/merge.rb +++ b/gems/ruby-merge/lib/ruby/merge.rb @@ -8,6 +8,7 @@ require 'ast/merge' require_relative 'merge/block_directive_detector' require_relative 'merge/doc_comment_support' +require_relative 'merge/gemspec_support' require_relative 'merge/magic_comment_support' require_relative 'merge/method_similarity' require_relative 'merge/rescue_semantics' diff --git a/gems/ruby-merge/lib/ruby/merge/gemspec_support.rb b/gems/ruby-merge/lib/ruby/merge/gemspec_support.rb new file mode 100644 index 000000000..af60fe272 --- /dev/null +++ b/gems/ruby-merge/lib/ruby/merge/gemspec_support.rb @@ -0,0 +1,34 @@ +# frozen_string_literal: true + +module Ruby + module Merge + module GemspecSupport + GEMSPEC_VAR_PLACEHOLDER = :__gemspec_var__ + + module_function + + def effective_receiver(receiver, gemspec_block_var) + if gemspec_block_var && receiver == gemspec_block_var + GEMSPEC_VAR_PLACEHOLDER + else + receiver + end + end + + def preferred_block_var(template_var, dest_var) + template_var if template_var && dest_var && template_var != dest_var + end + + def merged_block_var(var, preferred_var) + preferred_var || var + end + + def opening_line_with_preferred_block_var(opening_line, dest_var:, preferred_var:, node_preference:) + return opening_line unless preferred_var && dest_var && dest_var != preferred_var + return opening_line unless node_preference == :destination + + opening_line.sub("|#{dest_var}|", "|#{preferred_var}|") + end + end + end +end diff --git a/gems/ruby-merge/spec/gemspec_support_spec.rb b/gems/ruby-merge/spec/gemspec_support_spec.rb new file mode 100644 index 000000000..0e19ceb9f --- /dev/null +++ b/gems/ruby-merge/spec/gemspec_support_spec.rb @@ -0,0 +1,26 @@ +# frozen_string_literal: true + +require_relative 'spec_helper' + +RSpec.describe Ruby::Merge::GemspecSupport do + it 'normalizes gemspec block variable receivers to the shared placeholder' do + expect(described_class.effective_receiver('gem', 'gem')).to eq(described_class::GEMSPEC_VAR_PLACEHOLDER) + expect(described_class.effective_receiver('spec.metadata', 'spec')).to eq('spec.metadata') + end + + it 'chooses the template block variable when both sides use different variables' do + expect(described_class.preferred_block_var('spec', 'gem')).to eq('spec') + expect(described_class.preferred_block_var('spec', 'spec')).to be_nil + end + + it 'rewrites destination opening lines to the preferred block variable' do + expect( + described_class.opening_line_with_preferred_block_var( + 'Gem::Specification.new do |gem|', + dest_var: 'gem', + preferred_var: 'spec', + node_preference: :destination + ) + ).to eq('Gem::Specification.new do |spec|') + end +end From 246c0fe0107d570b0de36ce2c4233b56c336b8b2 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 20:33:10 -0600 Subject: [PATCH 076/347] Share Ruby scaffold chunk semantics --- .../lib/prism/merge/scaffold_chunk_remover.rb | 73 +++--------------- gems/ruby-merge/lib/ruby/merge.rb | 1 + .../lib/ruby/merge/scaffold_chunk_support.rb | 76 +++++++++++++++++++ .../spec/scaffold_chunk_support_spec.rb | 25 ++++++ 4 files changed, 112 insertions(+), 63 deletions(-) create mode 100644 gems/ruby-merge/lib/ruby/merge/scaffold_chunk_support.rb create mode 100644 gems/ruby-merge/spec/scaffold_chunk_support_spec.rb diff --git a/gems/prism-merge/lib/prism/merge/scaffold_chunk_remover.rb b/gems/prism-merge/lib/prism/merge/scaffold_chunk_remover.rb index bc2e05b63..b6406937c 100644 --- a/gems/prism-merge/lib/prism/merge/scaffold_chunk_remover.rb +++ b/gems/prism-merge/lib/prism/merge/scaffold_chunk_remover.rb @@ -13,53 +13,12 @@ module Merge # specs = [ScaffoldChunkRemover::RSPEC_SPEC, ScaffoldChunkRemover::RUBOCOP_SPEC] # clean = ScaffoldChunkRemover.remove(source, specs) class ScaffoldChunkRemover - ChunkSpec = Struct.new( - :anchor_type, # :require_call or :task_call - :anchor_value, # String — exact require path OR task name pattern - :satellite_patterns, # Array — token patterns for satellite nodes - :jaccard_threshold, # Float — min Jaccard score for satellite matching - :max_lookahead, # Integer — nodes to scan after anchor - :max_lookbehind, # Integer — nodes to scan before anchor - keyword_init: true - ) - - BUNDLER_GEM_TASKS_SPEC = ChunkSpec.new( - anchor_type: :require_call, - anchor_value: 'bundler/gem_tasks', - satellite_patterns: [], - jaccard_threshold: 0.35, - max_lookahead: 0, - max_lookbehind: 0 - ) - - RSPEC_SPEC = ChunkSpec.new( - anchor_type: :require_call, - anchor_value: 'rspec/core/rake_task', - satellite_patterns: ['RSpec::Core::RakeTask.new'], - jaccard_threshold: 0.35, - max_lookahead: 5, - max_lookbehind: 2 - ) - - RUBOCOP_SPEC = ChunkSpec.new( - anchor_type: :require_call, - anchor_value: 'rubocop/rake_task', - satellite_patterns: ['RuboCop::RakeTask.new'], - jaccard_threshold: 0.35, - max_lookahead: 5, - max_lookbehind: 2 - ) - - DEFAULT_TASK_SPEC = ChunkSpec.new( - anchor_type: :task_call, - anchor_value: 'default', - satellite_patterns: [], - jaccard_threshold: 0.35, - max_lookahead: 0, - max_lookbehind: 0 - ) - - ALL_SPECS = [BUNDLER_GEM_TASKS_SPEC, RSPEC_SPEC, RUBOCOP_SPEC, DEFAULT_TASK_SPEC].freeze + ChunkSpec = Ruby::Merge::ScaffoldChunkSupport::ChunkSpec + BUNDLER_GEM_TASKS_SPEC = Ruby::Merge::ScaffoldChunkSupport::BUNDLER_GEM_TASKS_SPEC + RSPEC_SPEC = Ruby::Merge::ScaffoldChunkSupport::RSPEC_SPEC + RUBOCOP_SPEC = Ruby::Merge::ScaffoldChunkSupport::RUBOCOP_SPEC + DEFAULT_TASK_SPEC = Ruby::Merge::ScaffoldChunkSupport::DEFAULT_TASK_SPEC + ALL_SPECS = Ruby::Merge::ScaffoldChunkSupport::ALL_SPECS class << self def remove(source, specs = ALL_SPECS) @@ -92,13 +51,13 @@ def call end_idx = [statements.size - 1, anchor_idx + spec.max_lookahead].min spec.satellite_patterns.each do |pattern| - p_tokens = jaccard_tokens(pattern) + p_tokens = Ruby::Merge::ScaffoldChunkSupport.jaccard_tokens(pattern) (start_idx..end_idx).each do |i| next if i == anchor_idx candidate = statements[i] - c_tokens = jaccard_tokens(candidate.slice.to_s) - score = jaccard(p_tokens, c_tokens) + c_tokens = Ruby::Merge::ScaffoldChunkSupport.jaccard_tokens(candidate.slice.to_s) + score = Ruby::Merge::ScaffoldChunkSupport.jaccard(p_tokens, c_tokens) nodes_to_remove << candidate if score >= spec.jaccard_threshold end end @@ -156,19 +115,7 @@ def require_anchor_match?(node, anchor_value) def task_anchor_match?(node, anchor_value, threshold) return false unless node.name.to_s == 'task' - node_tokens = jaccard_tokens(node.slice.to_s) - pattern_tokens = jaccard_tokens("task #{anchor_value}") - jaccard(pattern_tokens, node_tokens) >= threshold - end - - def jaccard_tokens(text) - text.scan(/[A-Za-z0-9_]+/).to_set - end - - def jaccard(a_set, b_set) - return 0.0 if (a_set | b_set).empty? - - (a_set & b_set).size.to_f / (a_set | b_set).size + Ruby::Merge::ScaffoldChunkSupport.task_anchor_match?(node.slice.to_s, anchor_value, threshold) end end end diff --git a/gems/ruby-merge/lib/ruby/merge.rb b/gems/ruby-merge/lib/ruby/merge.rb index a831c1bb3..4d8bf9dd2 100644 --- a/gems/ruby-merge/lib/ruby/merge.rb +++ b/gems/ruby-merge/lib/ruby/merge.rb @@ -12,6 +12,7 @@ require_relative 'merge/magic_comment_support' require_relative 'merge/method_similarity' require_relative 'merge/rescue_semantics' +require_relative 'merge/scaffold_chunk_support' module Ruby module Merge diff --git a/gems/ruby-merge/lib/ruby/merge/scaffold_chunk_support.rb b/gems/ruby-merge/lib/ruby/merge/scaffold_chunk_support.rb new file mode 100644 index 000000000..38efbfd36 --- /dev/null +++ b/gems/ruby-merge/lib/ruby/merge/scaffold_chunk_support.rb @@ -0,0 +1,76 @@ +# frozen_string_literal: true + +require 'set' + +module Ruby + module Merge + module ScaffoldChunkSupport + ChunkSpec = Struct.new( + :anchor_type, + :anchor_value, + :satellite_patterns, + :jaccard_threshold, + :max_lookahead, + :max_lookbehind, + keyword_init: true + ) + + BUNDLER_GEM_TASKS_SPEC = ChunkSpec.new( + anchor_type: :require_call, + anchor_value: 'bundler/gem_tasks', + satellite_patterns: [], + jaccard_threshold: 0.35, + max_lookahead: 0, + max_lookbehind: 0 + ) + + RSPEC_SPEC = ChunkSpec.new( + anchor_type: :require_call, + anchor_value: 'rspec/core/rake_task', + satellite_patterns: ['RSpec::Core::RakeTask.new'], + jaccard_threshold: 0.35, + max_lookahead: 5, + max_lookbehind: 2 + ) + + RUBOCOP_SPEC = ChunkSpec.new( + anchor_type: :require_call, + anchor_value: 'rubocop/rake_task', + satellite_patterns: ['RuboCop::RakeTask.new'], + jaccard_threshold: 0.35, + max_lookahead: 5, + max_lookbehind: 2 + ) + + DEFAULT_TASK_SPEC = ChunkSpec.new( + anchor_type: :task_call, + anchor_value: 'default', + satellite_patterns: [], + jaccard_threshold: 0.35, + max_lookahead: 0, + max_lookbehind: 0 + ) + + ALL_SPECS = [BUNDLER_GEM_TASKS_SPEC, RSPEC_SPEC, RUBOCOP_SPEC, DEFAULT_TASK_SPEC].freeze + + module_function + + def jaccard_tokens(text) + text.scan(/[A-Za-z0-9_]+/).to_set + end + + def jaccard(a_set, b_set) + union = a_set | b_set + return 0.0 if union.empty? + + (a_set & b_set).size.to_f / union.size + end + + def task_anchor_match?(source, anchor_value, threshold) + node_tokens = jaccard_tokens(source.to_s) + pattern_tokens = jaccard_tokens("task #{anchor_value}") + jaccard(pattern_tokens, node_tokens) >= threshold + end + end + end +end diff --git a/gems/ruby-merge/spec/scaffold_chunk_support_spec.rb b/gems/ruby-merge/spec/scaffold_chunk_support_spec.rb new file mode 100644 index 000000000..319e80c5c --- /dev/null +++ b/gems/ruby-merge/spec/scaffold_chunk_support_spec.rb @@ -0,0 +1,25 @@ +# frozen_string_literal: true + +require_relative 'spec_helper' + +RSpec.describe Ruby::Merge::ScaffoldChunkSupport do + it 'defines the bundle-gem Rakefile scaffold chunks' do + expect(described_class::ALL_SPECS.map(&:anchor_value)).to include( + 'bundler/gem_tasks', + 'rspec/core/rake_task', + 'rubocop/rake_task', + 'default' + ) + end + + it 'uses token-based similarity for scaffold satellite detection' do + pattern_tokens = described_class.jaccard_tokens('RSpec::Core::RakeTask.new') + node_tokens = described_class.jaccard_tokens('RSpec::Core::RakeTask.new(:spec)') + + expect(described_class.jaccard(pattern_tokens, node_tokens)).to be >= 0.75 + end + + it 'matches default task anchors fuzzily' do + expect(described_class.task_anchor_match?('task default: :spec', 'default', 0.35)).to be(true) + end +end From bc595ab7a69578c4f2f50036d1d2cf0918ba5e6a Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 20:34:33 -0600 Subject: [PATCH 077/347] Share Ruby rescue signature normalization --- .../lib/prism/merge/begin_node_structure.rb | 7 +------ gems/ruby-merge/lib/ruby/merge/rescue_semantics.rb | 9 +++++++++ gems/ruby-merge/spec/rescue_semantics_spec.rb | 11 +++++++++++ 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/gems/prism-merge/lib/prism/merge/begin_node_structure.rb b/gems/prism-merge/lib/prism/merge/begin_node_structure.rb index 1b21db318..988daac6a 100644 --- a/gems/prism-merge/lib/prism/merge/begin_node_structure.rb +++ b/gems/prism-merge/lib/prism/merge/begin_node_structure.rb @@ -8,12 +8,7 @@ def rescue_signature(rescue_node) exceptions = Array(rescue_node.exceptions).map do |exception_node| exception_node.respond_to?(:slice) ? exception_node.slice : exception_node.to_s end - normalized_exceptions = exceptions.map { |exception| exception.to_s.sub(/\A::/, '') } - if normalized_exceptions.empty? || normalized_exceptions == ['StandardError'] - [:standard_error] - else - normalized_exceptions.sort - end + Ruby::Merge::RescueSemantics.new.rescue_clause_signature(exceptions) end end diff --git a/gems/ruby-merge/lib/ruby/merge/rescue_semantics.rb b/gems/ruby-merge/lib/ruby/merge/rescue_semantics.rb index ca8e6d8aa..c5e995070 100644 --- a/gems/ruby-merge/lib/ruby/merge/rescue_semantics.rb +++ b/gems/ruby-merge/lib/ruby/merge/rescue_semantics.rb @@ -72,6 +72,15 @@ def canonicalize_begin_clause_kind_order(clause_types) .map(&:first) end + def rescue_clause_signature(exception_names) + normalized_exceptions = Array(exception_names).filter_map { |exception| normalize_exception_name(exception) } + if normalized_exceptions.empty? || normalized_exceptions == ['StandardError'] + [:standard_error] + else + normalized_exceptions.sort + end + end + def rescue_clause_type?(clause_type) clause_type.is_a?(Array) && clause_type.first == :rescue_clause end diff --git a/gems/ruby-merge/spec/rescue_semantics_spec.rb b/gems/ruby-merge/spec/rescue_semantics_spec.rb index 2d7ea22c8..e120ab936 100644 --- a/gems/ruby-merge/spec/rescue_semantics_spec.rb +++ b/gems/ruby-merge/spec/rescue_semantics_spec.rb @@ -39,6 +39,17 @@ ) end + it 'normalizes bare and explicit StandardError rescue signatures' do + expect(semantics.rescue_clause_signature([])).to eq([:standard_error]) + expect(semantics.rescue_clause_signature(['::StandardError'])).to eq([:standard_error]) + end + + it 'sorts explicit rescue exception signatures' do + expect(semantics.rescue_clause_signature(['Timeout::Error', 'ArgumentError'])).to eq( + ['ArgumentError', 'Timeout::Error'] + ) + end + context 'with source-defined exception classes' do let(:definitions) do [ From 0494e88dab4303e9f8cdfa2c31b2ce065bde17ed Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 20:43:57 -0600 Subject: [PATCH 078/347] Share Ruby signature construction --- .../lib/prism/merge/file_analysis.rb | 62 ++++++------ gems/ruby-merge/lib/ruby/merge.rb | 5 +- .../lib/ruby/merge/signature_support.rb | 97 +++++++++++++++++++ .../ruby-merge/spec/signature_support_spec.rb | 29 ++++++ 4 files changed, 160 insertions(+), 33 deletions(-) create mode 100644 gems/ruby-merge/lib/ruby/merge/signature_support.rb create mode 100644 gems/ruby-merge/spec/signature_support_spec.rb diff --git a/gems/prism-merge/lib/prism/merge/file_analysis.rb b/gems/prism-merge/lib/prism/merge/file_analysis.rb index d0a73b378..c80ac7e7d 100644 --- a/gems/prism-merge/lib/prism/merge/file_analysis.rb +++ b/gems/prism-merge/lib/prism/merge/file_analysis.rb @@ -1082,13 +1082,13 @@ def compute_node_signature(node) else [] end - [:def, node.name, params] + Ruby::Merge::SignatureSupport.method_definition(node.name, params) # === Class/Module definitions === when :class - [:class, node.constant_path.slice] + Ruby::Merge::SignatureSupport.class_definition(node.constant_path.slice) when :module - [:module, node.constant_path.slice] + Ruby::Merge::SignatureSupport.module_definition(node.constant_path.slice) when :singleton_class # class << self or class << expr expr = begin @@ -1096,25 +1096,25 @@ def compute_node_signature(node) rescue StandardError 'self' end - [:singleton_class, expr] + Ruby::Merge::SignatureSupport.singleton_class(expr) # === Constants === when :const if node.type.to_s == 'constant_write_node' - [:const, node.name] + Ruby::Merge::SignatureSupport.constant(node.name) else - [:const, node.target.slice] + Ruby::Merge::SignatureSupport.constant(node.target.slice) end # === Variable assignments === when :local_var - [:local_var, node.name] + Ruby::Merge::SignatureSupport.variable_assignment(:local_var, node.name) when :ivar - [:ivar, node.name] + Ruby::Merge::SignatureSupport.variable_assignment(:ivar, node.name) when :cvar - [:cvar, node.name] + Ruby::Merge::SignatureSupport.variable_assignment(:cvar, node.name) when :gvar - [:gvar, node.name] + Ruby::Merge::SignatureSupport.variable_assignment(:gvar, node.name) when :multi_write # Multiple assignment: a, b = 1, 2 targets = node.lefts.map do |target| @@ -1131,41 +1131,41 @@ def compute_node_signature(node) target.slice end end - [:multi_write, targets] + Ruby::Merge::SignatureSupport.multi_write(targets) # === Conditionals === when :if, :unless # Conditionals match by their condition expression condition_source = node.predicate.slice - [node.type.to_s == 'if_node' ? :if : :unless, condition_source] + Ruby::Merge::SignatureSupport.conditional(node.type.to_s == 'if_node' ? :if : :unless, condition_source) # === Case/Switch statements === when :case # case expr; when ... end - match by the expression being switched on predicate = node.predicate&.slice || '' - [:case, predicate] + Ruby::Merge::SignatureSupport.case_statement(predicate) when :case_match # case expr; in ... end (pattern matching) - match by the expression predicate = node.predicate&.slice || '' - [:case_match, predicate] + Ruby::Merge::SignatureSupport.case_match_statement(predicate) # === Loops === when :while - [:while, node.predicate.slice] + Ruby::Merge::SignatureSupport.loop_statement(:while, node.predicate.slice) when :until - [:until, node.predicate.slice] + Ruby::Merge::SignatureSupport.loop_statement(:until, node.predicate.slice) when :for # for i in collection - match by index and collection index = node.index.slice collection = node.collection.slice - [:for, index, collection] + Ruby::Merge::SignatureSupport.loop_statement(:for, index, collection) # === Exception handling === when :begin # begin/rescue/ensure blocks - unique by position within parent # Since these don't have a natural identifier, use first statement first_stmt = node.statements&.body&.first&.slice&.[](0, 30) || '' - [:begin, first_stmt] + Ruby::Merge::SignatureSupport.begin_block(first_stmt) # === Method calls === when :call @@ -1189,33 +1189,33 @@ def compute_node_signature(node) effective_receiver = Ruby::Merge::GemspecSupport.effective_receiver(receiver, @gemspec_block_var) if node.block # simplecov:disable defensive - Ruby syntax doesn't allow blocks with assignment methods - [:call_with_block, node.name, effective_receiver] + Ruby::Merge::SignatureSupport.call(node.name, effective_receiver, block: true) # simplecov:enable else - [:call, node.name, effective_receiver] + Ruby::Merge::SignatureSupport.call(node.name, effective_receiver) end else # Regular method call: appraise "unlocked" do ... end # Match by method name and first argument (which identifies the call) first_arg = extract_first_argument_value(node) if node.block - [:call_with_block, node.name, first_arg] + Ruby::Merge::SignatureSupport.call(node.name, first_arg, block: true) else - [:call, node.name, first_arg] + Ruby::Merge::SignatureSupport.call(node.name, first_arg) end end # === Super calls === when :super - [:super, node.block ? :with_block : :no_block] + Ruby::Merge::SignatureSupport.super_call(block: !!node.block) when :forwarding_super - [:forwarding_super, node.block ? :with_block : :no_block] + Ruby::Merge::SignatureSupport.forwarding_super_call(block: !!node.block) # === Operator-write calls (e.g. spec.rdoc_options += [...]) === when :call_op_write receiver = node.receiver&.slice effective_receiver = Ruby::Merge::GemspecSupport.effective_receiver(receiver, @gemspec_block_var) - [:call_op_write, node.write_name, effective_receiver] + Ruby::Merge::SignatureSupport.call_operator_write(node.write_name, effective_receiver) # === Lambdas === when :lambda @@ -1225,30 +1225,30 @@ def compute_node_signature(node) else '' end - [:lambda, params] + Ruby::Merge::SignatureSupport.lambda_literal(params) # === Special blocks === when :pre_execution # BEGIN { } blocks - [:pre_execution, node.location.start_line] + Ruby::Merge::SignatureSupport.execution_block(:pre_execution, node.location.start_line) when :post_execution # END { } blocks - [:post_execution, node.location.start_line] + Ruby::Merge::SignatureSupport.execution_block(:post_execution, node.location.start_line) # === Parenthesized expressions === when :parens # Usually transparent, but if it appears at top level, identify by content first_expr = node.body&.body&.first&.slice&.[](0, 30) || '' - [:parens, first_expr] + Ruby::Merge::SignatureSupport.parenthesized(first_expr) # === Embedded statements (string interpolation) === when :embedded - [:embedded, node.statements&.slice || ''] + Ruby::Merge::SignatureSupport.embedded(node.statements&.slice) else # Fallback: use class name and line number # Nodes that reach here may not merge well across files - [:other, node.class.name, node.location.start_line] + Ruby::Merge::SignatureSupport.other(node.class.name, node.location.start_line) end end diff --git a/gems/ruby-merge/lib/ruby/merge.rb b/gems/ruby-merge/lib/ruby/merge.rb index 4d8bf9dd2..8d952edd4 100644 --- a/gems/ruby-merge/lib/ruby/merge.rb +++ b/gems/ruby-merge/lib/ruby/merge.rb @@ -13,6 +13,7 @@ require_relative 'merge/method_similarity' require_relative 'merge/rescue_semantics' require_relative 'merge/scaffold_chunk_support' +require_relative 'merge/signature_support' module Ruby module Merge @@ -2707,7 +2708,7 @@ def direct_body_method_entries(text) finish_index = ruby_block_finish_index(lines, index) entries << { name: match[2], - signature: "#{match[1]}#{match[2]}", + signature: SignatureSupport.textual_method_signature(match[1], match[2]), visibility: current_visibility, text: lines[start_index..finish_index].join("\n").rstrip, body_text: lines[(pending_comments.first || index)..finish_index].join("\n").rstrip @@ -3020,7 +3021,7 @@ def declaration_for_line(line) elsif (match = MODULE_PATTERN.match(line)) { kind: 'module', name: match[1] } elsif (match = DEF_PATTERN.match(line)) - { kind: 'def', name: match[2], signature: "#{match[1]}#{match[2]}" } + { kind: 'def', name: match[2], signature: SignatureSupport.textual_method_signature(match[1], match[2]) } end end diff --git a/gems/ruby-merge/lib/ruby/merge/signature_support.rb b/gems/ruby-merge/lib/ruby/merge/signature_support.rb new file mode 100644 index 000000000..59afd4fae --- /dev/null +++ b/gems/ruby-merge/lib/ruby/merge/signature_support.rb @@ -0,0 +1,97 @@ +# frozen_string_literal: true + +module Ruby + module Merge + module SignatureSupport + module_function + + def method_definition(name, params) + [:def, name, Array(params)] + end + + def class_definition(constant_path) + [:class, constant_path] + end + + def module_definition(constant_path) + [:module, constant_path] + end + + def singleton_class(expression) + [:singleton_class, expression] + end + + def constant(name) + [:const, name] + end + + def variable_assignment(kind, name) + [kind, name] + end + + def multi_write(targets) + [:multi_write, Array(targets)] + end + + def conditional(kind, predicate) + [kind, predicate] + end + + def case_statement(predicate) + [:case, predicate || ''] + end + + def case_match_statement(predicate) + [:case_match, predicate || ''] + end + + def loop_statement(kind, *parts) + [kind, *parts] + end + + def begin_block(first_statement_preview) + [:begin, first_statement_preview || ''] + end + + def call(method_name, identifier, block: false) + [block ? :call_with_block : :call, method_name, identifier] + end + + def super_call(block:) + [:super, block ? :with_block : :no_block] + end + + def forwarding_super_call(block:) + [:forwarding_super, block ? :with_block : :no_block] + end + + def call_operator_write(write_name, receiver) + [:call_op_write, write_name, receiver] + end + + def lambda_literal(parameters_source) + [:lambda, parameters_source || ''] + end + + def execution_block(kind, line_number) + [kind, line_number] + end + + def parenthesized(first_expression_preview) + [:parens, first_expression_preview || ''] + end + + def embedded(statements_source) + [:embedded, statements_source || ''] + end + + def other(class_name, line_number) + [:other, class_name, line_number] + end + + def textual_method_signature(receiver_prefix, method_name) + "#{receiver_prefix}#{method_name}" + end + end + end +end diff --git a/gems/ruby-merge/spec/signature_support_spec.rb b/gems/ruby-merge/spec/signature_support_spec.rb new file mode 100644 index 000000000..46c022f16 --- /dev/null +++ b/gems/ruby-merge/spec/signature_support_spec.rb @@ -0,0 +1,29 @@ +# frozen_string_literal: true + +require_relative 'spec_helper' + +RSpec.describe Ruby::Merge::SignatureSupport do + it 'builds canonical Ruby definition signatures' do + expect(described_class.method_definition(:call, %i[arg opts])).to eq([:def, :call, %i[arg opts]]) + expect(described_class.class_definition('Admin::User')).to eq([:class, 'Admin::User']) + expect(described_class.module_definition('Admin')).to eq([:module, 'Admin']) + end + + it 'builds canonical Ruby call signatures' do + expect(described_class.call(:gemspec, nil)).to eq([:call, :gemspec, nil]) + expect(described_class.call(:appraise, 'rails', block: true)).to eq([:call_with_block, :appraise, 'rails']) + expect(described_class.call_operator_write(:files, Ruby::Merge::GemspecSupport::GEMSPEC_VAR_PLACEHOLDER)).to eq( + [:call_op_write, :files, Ruby::Merge::GemspecSupport::GEMSPEC_VAR_PLACEHOLDER] + ) + end + + it 'builds canonical Ruby control-flow signatures' do + expect(described_class.super_call(block: false)).to eq([:super, :no_block]) + expect(described_class.forwarding_super_call(block: true)).to eq([:forwarding_super, :with_block]) + expect(described_class.begin_block('do_work')).to eq([:begin, 'do_work']) + end + + it 'keeps the textual method signature format used by ruby-merge analysis' do + expect(described_class.textual_method_signature('self.', 'build')).to eq('self.build') + end +end From 65e5ba92f8c749a6d8ed30472210629c25e273f8 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 20:48:48 -0600 Subject: [PATCH 079/347] Parse Ruby hash literals through TreeHaver --- gems/ruby-merge/lib/ruby/merge.rb | 225 +++++++++++------- .../spec/hash_literal_projector_spec.rb | 18 ++ 2 files changed, 157 insertions(+), 86 deletions(-) create mode 100644 gems/ruby-merge/spec/hash_literal_projector_spec.rb diff --git a/gems/ruby-merge/lib/ruby/merge.rb b/gems/ruby-merge/lib/ruby/merge.rb index 8d952edd4..55b8e8e42 100644 --- a/gems/ruby-merge/lib/ruby/merge.rb +++ b/gems/ruby-merge/lib/ruby/merge.rb @@ -1987,8 +1987,8 @@ def merge_declaration_hash_constants(template_text, destination_text) template_block = template_blocks[destination_block[:constant]] next unless template_block - template_hash = RubyHashLiteralParser.new(template_block[:hash_source]).parse - destination_hash = RubyHashLiteralParser.new(destination_block[:hash_source]).parse + template_hash = RubyHashLiteralProjector.new(template_block[:hash_source]).call + destination_hash = RubyHashLiteralProjector.new(destination_block[:hash_source]).call merged_hash = merge_ruby_hash_literals(template_hash, destination_hash) rendered = "#{destination_block[:prefix]}#{render_ruby_hash_literal(merged_hash, destination_block[:base_indent])}" @@ -2457,130 +2457,183 @@ def compact_region(region) RubyHashPair = Struct.new(:key, :key_source, :delimiter, :value, keyword_init: true) RubyScalarNode = Struct.new(:source, keyword_init: true) - class RubyHashLiteralParser + class RubyHashLiteralProjector def initialize(source) @source = source.to_s - @index = 0 end - def parse - parse_hash.tap do - skip_whitespace - raise ArgumentError, 'unexpected trailing hash literal content' unless eof? - end + def call + tree = TreeHaver.parser_for(:ruby).parse(source) + root = if tree.respond_to?(:parse_result) + tree.parse_result.value + else + tree.root_node + end + hash_node = root_hash_node(root) + raise ArgumentError, 'expected Ruby hash literal' unless hash_node?(hash_node) + + project_hash_node(hash_node) end private attr_reader :source - def parse_hash - start_index = @index - consume('{') - pairs = [] - trailing_comma = false - loop do - skip_whitespace - break if peek == '}' - - key = parse_hash_key - skip_whitespace - value = parse_value - pairs << RubyHashPair.new( + def root_hash_node(root) + return root if hash_node?(root) + return root.statements&.body&.first if root.respond_to?(:statements) + + child_nodes(root).find { |child| hash_node?(child) } + end + + def hash_node?(node) + %w[hash hash_node].include?(node&.type.to_s) + end + + def project_hash_node(node) + pairs = hash_pair_nodes(node).map do |assoc| + key_node, value_node = hash_pair_key_value_nodes(assoc) + key = project_hash_key(key_node, hash_pair_operator(assoc)) + RubyHashPair.new( key: key.fetch(:key), key_source: key.fetch(:key_source), delimiter: key.fetch(:delimiter), - value: value + value: project_hash_value(value_node) ) - skip_whitespace - break if peek == '}' - - consume(',') - skip_whitespace - if peek == '}' - trailing_comma = true - break - end end - consume('}') - RubyHashNode.new(pairs: pairs, inline: !source[start_index...@index].include?("\n"), - trailing_comma: trailing_comma) + RubyHashNode.new( + pairs: pairs, + inline: !node_source(node).include?("\n"), + trailing_comma: trailing_comma?(node) + ) end - def parse_value - skip_whitespace - return parse_hash if peek == '{' + def project_hash_value(node) + return project_hash_node(node) if hash_node?(node) - RubyScalarNode.new(source: parse_scalar_source) + RubyScalarNode.new(source: node_source(node).rstrip) end - def parse_hash_key - remaining = source[@index..].to_s - if (match = remaining.match(/\A([a-zA-Z_]\w*[!?]?):/)) - @index += match[0].length - return { key: match[1], key_source: match[1], delimiter: ':' } + def project_hash_key(key_node, operator) + delimiter = operator.to_s == '=>' ? '=>' : ':' + if delimiter == ':' + { + key: hash_key_value(key_node), + key_source: node_source(key_node).delete_suffix(':'), + delimiter: delimiter + } + elsif %w[symbol_node simple_symbol].include?(key_node.type.to_s) && node_source(key_node).start_with?(':') + { + key: hash_key_value(key_node), + key_source: node_source(key_node), + delimiter: delimiter + } + elsif %w[string_node string].include?(key_node.type.to_s) + { + key: node_source(key_node), + key_source: node_source(key_node), + delimiter: delimiter + } + else + { + key: hash_key_value(key_node), + key_source: node_source(key_node), + delimiter: delimiter + } end + end - if (match = remaining.match(/\A((["'])(?:\\.|(?!\2).)*\2):/)) - @index += match[0].length - return { key: match[1][1...-1], key_source: match[1], delimiter: ':' } - end + def hash_pair_nodes(node) + return Array(node.elements) if node.respond_to?(:elements) - if (match = remaining.match(/\A(:[a-zA-Z_]\w*[!?]?)\s*=>/)) - @index += match[0].length - return { key: match[1].delete_prefix(':'), key_source: match[1], delimiter: '=>' } - end + child_nodes(node).select { |child| child.type.to_s == 'pair' } + end + + def hash_pair_key_value_nodes(pair) + return [pair.key, pair.value] if pair.respond_to?(:key) && pair.respond_to?(:value) - if (match = remaining.match(/\A((["'])(?:\\.|(?!\2).)*\2)\s*=>/)) - @index += match[0].length - return { key: match[1], key_source: match[1], delimiter: '=>' } + named = child_nodes(pair).reject { |child| punctuation_node?(child) } + [named.first, named.last] + end + + def hash_pair_operator(pair) + return pair.operator if pair.respond_to?(:operator) + + all_child_nodes(pair).find { |child| %w[: =>].include?(child.type.to_s) }&.type + end + + def hash_key_value(node) + return node.unescaped.to_s if node.respond_to?(:unescaped) + + text = node_source(node) + return text.delete_prefix(':') if text.start_with?(':') + return text[1...-1] if node.type.to_s == 'string' && text.match?(/\A(["']).*\1\z/m) + + text + end + + def trailing_comma?(node) + if node.respond_to?(:elements) && node.respond_to?(:closing_loc) + return trailing_comma_between?(last_child_end: Array(node.elements).last.location.end_offset, + closing_start: node.closing_loc.start_offset) end - raise ArgumentError, 'expected hash key' + last_pair = hash_pair_nodes(node).last + closing = all_child_nodes(node).reverse.find { |child| child.type.to_s == '}' } + return false unless last_pair && closing + + trailing_comma_between?(last_child_end: node_end_offset(last_pair), closing_start: node_start_offset(closing)) end - def parse_scalar_source - start_index = @index - string_quote = nil - escape = false - while @index < source.length - char = source[@index] - if string_quote - if escape - escape = false - elsif char == '\\' - escape = true - elsif char == string_quote - string_quote = nil - end - @index += 1 - next - end + def trailing_comma_between?(last_child_end:, closing_start:) + source.byteslice(last_child_end...closing_start).to_s.include?(',') + end - break if [',', '}'].include?(char) + def child_nodes(node) + if node.respond_to?(:compact_child_nodes) + node.compact_child_nodes + elsif node.respond_to?(:named_children) + node.named_children + elsif node.respond_to?(:children) + node.children + else + [] + end + end - string_quote = char if ['"', "'"].include?(char) - @index += 1 + def all_child_nodes(node) + if node.respond_to?(:compact_child_nodes) + node.compact_child_nodes + elsif node.respond_to?(:children) + node.children + else + child_nodes(node) end - source[start_index...@index].rstrip end - def skip_whitespace - @index += 1 while @index < source.length && source[@index].match?(/\s/) + def punctuation_node?(node) + %w[{ } : => ,].include?(node.type.to_s) end - def consume(expected) - raise ArgumentError, "expected #{expected}" unless peek == expected + def node_source(node) + return node.slice.to_s if node.respond_to?(:slice) + return node.text.to_s if node.respond_to?(:text) - @index += 1 + source.byteslice(node_start_offset(node)...node_end_offset(node)).to_s end - def peek - source[@index] + def node_start_offset(node) + return node.location.start_offset if node.respond_to?(:location) + return node.start_byte if node.respond_to?(:start_byte) + + raise ArgumentError, 'Ruby hash node does not expose a start offset' end - def eof? - @index >= source.length + def node_end_offset(node) + return node.location.end_offset if node.respond_to?(:location) + return node.end_byte if node.respond_to?(:end_byte) + + raise ArgumentError, 'Ruby hash node does not expose an end offset' end end diff --git a/gems/ruby-merge/spec/hash_literal_projector_spec.rb b/gems/ruby-merge/spec/hash_literal_projector_spec.rb new file mode 100644 index 000000000..06400d2de --- /dev/null +++ b/gems/ruby-merge/spec/hash_literal_projector_spec.rb @@ -0,0 +1,18 @@ +# frozen_string_literal: true + +require_relative 'spec_helper' + +RSpec.describe Ruby::Merge::RubyHashLiteralProjector do + it 'projects Ruby hash literals through TreeHaver nodes' do + hash = described_class.new( + '{ foo: 1, "quoted": 2, :sym => 3, "str" => { nested: true }, works?: call(1, 2), }' + ).call + + expect(hash).to be_a(Ruby::Merge::RubyHashNode) + expect(hash.trailing_comma).to be(true) + expect(hash.pairs.map(&:key)).to eq(%w[foo quoted sym "str" works?]) + expect(hash.pairs.map(&:delimiter)).to eq([':', ':', '=>', '=>', ':']) + expect(hash.pairs[3].value).to be_a(Ruby::Merge::RubyHashNode) + expect(hash.pairs[4].value.source).to eq('call(1, 2)') + end +end From 8532212ad53908ce7cbe7d5f82d2bff8f7dc0ffd Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 20:52:23 -0600 Subject: [PATCH 080/347] Centralize RBS backend registration --- gems/rbs-merge/lib/rbs/merge.rb | 11 ++++------- .../lib/rbs/merge/backends/rbs_backend.rb | 14 ++------------ 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/gems/rbs-merge/lib/rbs/merge.rb b/gems/rbs-merge/lib/rbs/merge.rb index d13ac63e2..38a52baed 100644 --- a/gems/rbs-merge/lib/rbs/merge.rb +++ b/gems/rbs-merge/lib/rbs/merge.rb @@ -115,17 +115,14 @@ def register_backend! # Also register the tree-sitter-rbs grammar when present. grammar_finder = TreeHaver::GrammarFinder.new(:rbs) - if grammar_finder.available? - TreeHaver.register_language( - :rbs, - path: grammar_finder.find_library_path, - symbol: grammar_finder.symbol_name - ) - end + grammar_finder.register! if grammar_finder.available? TreeHaver::BackendRegistry.register_tag(:rbs_backend, category: :backend, backend_name: :rbs) do Backends::RbsBackend.available? end + TreeHaver::BackendRegistry.register_tag(:rbs_gem, category: :gem, backend_name: :rbs_gem) do + Backends::RbsBackend.available? + end TreeHaver::BackendRegistry.register_tag(:rbs_grammar, category: :grammar, backend_name: :rbs_grammar) do TreeHaver::GrammarFinder.new(:rbs).available? end diff --git a/gems/rbs-merge/lib/rbs/merge/backends/rbs_backend.rb b/gems/rbs-merge/lib/rbs/merge/backends/rbs_backend.rb index f21eeb256..20855afe9 100644 --- a/gems/rbs-merge/lib/rbs/merge/backends/rbs_backend.rb +++ b/gems/rbs-merge/lib/rbs/merge/backends/rbs_backend.rb @@ -509,18 +509,8 @@ def method_missing(method_name, *args, **kwargs, &block) end end - # Register this backend with TreeHaver - ::TreeHaver.register_language( - :rbs, - backend_type: :rbs, - backend_module: self, - gem_name: 'rbs' - ) - - # Register the availability checker for RSpec dependency tags. - TreeHaver::BackendRegistry.register_availability_checker(:rbs_gem) do - available? - end + # Registration is centralized in Rbs::Merge.register_backend! so loading + # this adapter module does not mutate TreeHaver outside the owning gem. end end end From 9fafdbb6fdd240c23f7f628af9eacb1a2a91f288 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 20:55:04 -0600 Subject: [PATCH 081/347] Guard additional parser bypasses --- spec/architecture/tree_haver_only_spec.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/spec/architecture/tree_haver_only_spec.rb b/spec/architecture/tree_haver_only_spec.rb index 05c9b9933..489583083 100644 --- a/spec/architecture/tree_haver_only_spec.rb +++ b/spec/architecture/tree_haver_only_spec.rb @@ -11,7 +11,12 @@ Json::Merge::SyntheticParser | (? Date: Sat, 18 Jul 2026 20:58:11 -0600 Subject: [PATCH 082/347] Share Ruby nocov node semantics --- .../prism-merge/lib/prism/merge/nocov_node.rb | 87 +------------------ gems/ruby-merge/lib/ruby/merge.rb | 1 + .../lib/ruby/merge/nocov_node_base.rb | 75 ++++++++++++++++ gems/ruby-merge/spec/nocov_node_base_spec.rb | 30 +++++++ 4 files changed, 109 insertions(+), 84 deletions(-) create mode 100644 gems/ruby-merge/lib/ruby/merge/nocov_node_base.rb create mode 100644 gems/ruby-merge/spec/nocov_node_base_spec.rb diff --git a/gems/prism-merge/lib/prism/merge/nocov_node.rb b/gems/prism-merge/lib/prism/merge/nocov_node.rb index 3cc74a4fc..3826a76a1 100644 --- a/gems/prism-merge/lib/prism/merge/nocov_node.rb +++ b/gems/prism-merge/lib/prism/merge/nocov_node.rb @@ -17,18 +17,9 @@ module Merge # raise "should never happen" # end # # :nocov: - class NocovNode - include Ast::Merge::BlockDirective - - # Error raised when nocov block has invalid structure - InvalidStructureError = Class.new(StandardError) - - # Simple location struct for compatibility with AST nodes - Location = Struct.new(:start_line, :end_line) do - def cover?(line) - (start_line..end_line).cover?(line) - end - end + class NocovNode < Ruby::Merge::NocovNodeBase + InvalidStructureError = Ruby::Merge::NocovNodeBase::InvalidStructureError + Location = Ruby::Merge::NocovNodeBase::Location # Location struct with byte offsets for correct range comparison with Prism nodes. # start_offset / end_offset are used by TopLevelMergeRunner#node_offset_range and @@ -47,35 +38,6 @@ def leading_comments owner.leading_comments end end - - attr_reader :start_line, :end_line, :nodes, :analysis, :start_marker, :close_marker - - # @param start_line [Integer] Line number of opening # :nocov: marker (1-based) - # @param end_line [Integer] Line number of closing # :nocov: marker (1-based) - # @param analysis [FileAnalysis] The owning file analysis - # @param nodes [Array] Content nodes between the markers - # @param start_marker [String, nil] The open marker text - # @param close_marker [String, nil] The close marker text - def initialize(start_line:, end_line:, analysis:, nodes: [], start_marker: nil, close_marker: nil) - @start_line = start_line - @end_line = end_line - @analysis = analysis - @nodes = nodes - @start_marker = start_marker - @close_marker = close_marker - end - - # @return [Symbol] - def kind = :nocov - - # Content nodes between the open and close markers. - # @return [Array] - def children = @nodes - - # Nocov follows file preference — no policy override. - # @return [nil] - def merge_policy = nil - # Leading Prism comments from the first inner node that appear BEFORE this # NocovNode's opening marker line. These are comments that Prism attached # to the inner node via attach_comments! and represent content logically @@ -117,49 +79,6 @@ def location end end - # Content of the nocov block (all lines from start to end). - # @return [String, nil] - def slice - return unless @analysis - - lines = @analysis.lines - return unless lines - - lines[(@start_line - 1)..(@end_line - 1)]&.join - end - - # Stable signature for merge matching. - # - # For single-node blocks, delegates to the inner content's signature so that a - # NocovNode in the template matches the equivalent bare node in the destination - # (and vice-versa). This prevents duplication when a nocov block is introduced - # in the template but the destination does not yet have the markers. - # - # For multi-node blocks, uses a `:nocov_multi` fingerprint of the inner lines - # (markers excluded) so two multi-node nocov blocks with identical content still - # match each other. - # - # @return [Array] - def signature - return [:NocovNode, nil] if @nodes.empty? || @analysis.nil? - - if @nodes.length == 1 - @analysis.generate_signature(@nodes.first) - else - inner_lines = @analysis.lines && @analysis.lines[@start_line..(@end_line - 2)] - [:nocov_multi, inner_lines&.map(&:strip)&.join("\n")] - end - end - - # Node type for merge classification - # @return [Symbol] - def merge_type = :nocov_block - - alias type merge_type - - # @return [Boolean] - def nocov_node? = true - # @return [String] def inspect "#" diff --git a/gems/ruby-merge/lib/ruby/merge.rb b/gems/ruby-merge/lib/ruby/merge.rb index 55b8e8e42..d949c1e75 100644 --- a/gems/ruby-merge/lib/ruby/merge.rb +++ b/gems/ruby-merge/lib/ruby/merge.rb @@ -11,6 +11,7 @@ require_relative 'merge/gemspec_support' require_relative 'merge/magic_comment_support' require_relative 'merge/method_similarity' +require_relative 'merge/nocov_node_base' require_relative 'merge/rescue_semantics' require_relative 'merge/scaffold_chunk_support' require_relative 'merge/signature_support' diff --git a/gems/ruby-merge/lib/ruby/merge/nocov_node_base.rb b/gems/ruby-merge/lib/ruby/merge/nocov_node_base.rb new file mode 100644 index 000000000..71bc0a7e0 --- /dev/null +++ b/gems/ruby-merge/lib/ruby/merge/nocov_node_base.rb @@ -0,0 +1,75 @@ +# frozen_string_literal: true + +module Ruby + module Merge + # Shared Ruby synthetic node for a balanced coverage-exclusion block. + # + # Parser-specific merge gems subclass this when they need native AST location + # or comment attachment behavior. The structural Ruby semantics live here: + # nocov blocks follow file preference and match by their inner content. + class NocovNodeBase + include Ast::Merge::BlockDirective + + InvalidStructureError = Class.new(StandardError) + + Location = Struct.new(:start_line, :end_line) do + def cover?(line) + (start_line..end_line).cover?(line) + end + end + + attr_reader :start_line, :end_line, :nodes, :analysis, :start_marker, :close_marker + + def initialize(start_line:, end_line:, analysis:, nodes: [], start_marker: nil, close_marker: nil) + @start_line = start_line + @end_line = end_line + @analysis = analysis + @nodes = nodes + @start_marker = start_marker + @close_marker = close_marker + end + + def kind = :nocov + + def children = @nodes + + def merge_policy = nil + + def location + @location ||= Location.new(@start_line, @end_line) + end + + def slice + return unless @analysis + + lines = @analysis.lines + return unless lines + + lines[(@start_line - 1)..(@end_line - 1)]&.join + end + + def signature + return [:NocovNode, nil] if @nodes.empty? || @analysis.nil? + + if @nodes.length == 1 + @analysis.generate_signature(@nodes.first) + else + inner_lines = @analysis.lines && @analysis.lines[@start_line..(@end_line - 2)] + [:nocov_multi, inner_lines&.map(&:strip)&.join("\n")] + end + end + + def merge_type = :nocov_block + + alias type merge_type + + def nocov_node? = true + + def inspect + "#<#{self.class} lines=#{@start_line}..#{@end_line} nodes=#{@nodes.length}>" + end + + alias to_s inspect + end + end +end diff --git a/gems/ruby-merge/spec/nocov_node_base_spec.rb b/gems/ruby-merge/spec/nocov_node_base_spec.rb new file mode 100644 index 000000000..963277822 --- /dev/null +++ b/gems/ruby-merge/spec/nocov_node_base_spec.rb @@ -0,0 +1,30 @@ +# frozen_string_literal: true + +RSpec.describe Ruby::Merge::NocovNodeBase do + let(:analysis_class) do + Struct.new(:lines) do + def generate_signature(node) + [:node, node] + end + end + end + + it 'models balanced nocov blocks as Ruby block directives' do + analysis = analysis_class.new(["# :nocov:\n", "def skipped\n", "end\n", "# :nocov:\n"]) + node = described_class.new(start_line: 1, end_line: 4, analysis: analysis, nodes: [:method]) + + expect(node.kind).to eq(:nocov) + expect(node.merge_policy).to be_nil + expect(node.children).to eq([:method]) + expect(node.merge_type).to eq(:nocov_block) + expect(node.signature).to eq([:node, :method]) + expect(node.slice).to eq("# :nocov:\ndef skipped\nend\n# :nocov:\n") + end + + it 'uses normalized inner block content when multiple nodes are covered' do + analysis = analysis_class.new(["# :nocov:\n", "def a\n", "end\n", "def b\n", "end\n", "# :nocov:\n"]) + node = described_class.new(start_line: 1, end_line: 6, analysis: analysis, nodes: %i[a b]) + + expect(node.signature).to eq([:nocov_multi, "def a\nend\ndef b\nend"]) + end +end From 6ead4bdf21c467e4d260cd071a9d38d3e5549b27 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 20:59:15 -0600 Subject: [PATCH 083/347] Share Ruby nocov wrapper semantics --- .../lib/prism/merge/nocov_wrapper.rb | 41 +---------------- gems/ruby-merge/lib/ruby/merge.rb | 1 + .../lib/ruby/merge/nocov_wrapper_base.rb | 46 +++++++++++++++++++ .../spec/nocov_wrapper_base_spec.rb | 23 ++++++++++ 4 files changed, 71 insertions(+), 40 deletions(-) create mode 100644 gems/ruby-merge/lib/ruby/merge/nocov_wrapper_base.rb create mode 100644 gems/ruby-merge/spec/nocov_wrapper_base_spec.rb diff --git a/gems/prism-merge/lib/prism/merge/nocov_wrapper.rb b/gems/prism-merge/lib/prism/merge/nocov_wrapper.rb index e869d82fa..75cc527d3 100644 --- a/gems/prism-merge/lib/prism/merge/nocov_wrapper.rb +++ b/gems/prism-merge/lib/prism/merge/nocov_wrapper.rb @@ -15,46 +15,7 @@ module Merge # # The wrapped node's structural signature is still used for matching (like # FrozenWrapper), not a content-based signature. - class NoCovWrapper - include Ast::Merge::BlockDirective - - attr_reader :node, :merge_type - - # @param node [Prism::Node] The AST node to wrap - # @param merge_type [Symbol] The merge type (defaults to :nocov) - def initialize(node, merge_type = :nocov) - @node = node - @merge_type = merge_type - end - - # BlockDirective protocol - def kind = :nocov - def children = [] - def merge_policy = nil - - def start_line - @node.location&.start_line - end - - def end_line - @node.location&.end_line - end - - # Returns the wrapped node (for structural signature generation) - # @return [Prism::Node] - def unwrap = @node - - # Delegate location to the wrapped node - def location = @node.location - - # Content of the wrapped node - def slice = @node.slice - - # @return [Boolean] - def nocov_wrapper? = true - def nocov_node? = false - def block_directive? = true - + class NoCovWrapper < Ruby::Merge::NocovWrapperBase def inspect "#" end diff --git a/gems/ruby-merge/lib/ruby/merge.rb b/gems/ruby-merge/lib/ruby/merge.rb index d949c1e75..d95b1dbcc 100644 --- a/gems/ruby-merge/lib/ruby/merge.rb +++ b/gems/ruby-merge/lib/ruby/merge.rb @@ -12,6 +12,7 @@ require_relative 'merge/magic_comment_support' require_relative 'merge/method_similarity' require_relative 'merge/nocov_node_base' +require_relative 'merge/nocov_wrapper_base' require_relative 'merge/rescue_semantics' require_relative 'merge/scaffold_chunk_support' require_relative 'merge/signature_support' diff --git a/gems/ruby-merge/lib/ruby/merge/nocov_wrapper_base.rb b/gems/ruby-merge/lib/ruby/merge/nocov_wrapper_base.rb new file mode 100644 index 000000000..7618f52ab --- /dev/null +++ b/gems/ruby-merge/lib/ruby/merge/nocov_wrapper_base.rb @@ -0,0 +1,46 @@ +# frozen_string_literal: true + +module Ruby + module Merge + # Shared Ruby wrapper for nodes carrying unbalanced or inline nocov markers. + # + # The wrapped parser node remains responsible for structural identity; this + # wrapper only marks it as a Ruby coverage directive participant. + class NocovWrapperBase + include Ast::Merge::BlockDirective + + attr_reader :node, :merge_type + + def initialize(node, merge_type = :nocov) + @node = node + @merge_type = merge_type + end + + def kind = :nocov + def children = [] + def merge_policy = nil + + def start_line + @node.location&.start_line + end + + def end_line + @node.location&.end_line + end + + def unwrap = @node + + def location = @node.location + + def slice = @node.slice + + def nocov_wrapper? = true + def nocov_node? = false + def block_directive? = true + + def inspect + "#<#{self.class} merge_type=#{@merge_type.inspect} node=#{@node.inspect}>" + end + end + end +end diff --git a/gems/ruby-merge/spec/nocov_wrapper_base_spec.rb b/gems/ruby-merge/spec/nocov_wrapper_base_spec.rb new file mode 100644 index 000000000..bd4b6106b --- /dev/null +++ b/gems/ruby-merge/spec/nocov_wrapper_base_spec.rb @@ -0,0 +1,23 @@ +# frozen_string_literal: true + +RSpec.describe Ruby::Merge::NocovWrapperBase do + let(:location) { Struct.new(:start_line, :end_line).new(2, 4) } + let(:node) do + Struct.new(:location, :slice).new(location, "def skipped\nend\n") + end + + it 'marks wrapped Ruby nodes as nocov block directive participants' do + wrapper = described_class.new(node) + + expect(wrapper.kind).to eq(:nocov) + expect(wrapper.children).to eq([]) + expect(wrapper.merge_policy).to be_nil + expect(wrapper.start_line).to eq(2) + expect(wrapper.end_line).to eq(4) + expect(wrapper.unwrap).to equal(node) + expect(wrapper.location).to equal(location) + expect(wrapper.slice).to eq("def skipped\nend\n") + expect(wrapper.nocov_wrapper?).to be(true) + expect(wrapper.nocov_node?).to be(false) + end +end From 97b6c512fec420234bad29def67d4476c785faf4 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 21:12:59 -0600 Subject: [PATCH 084/347] Add conformance fixture RSpec support --- gems/ast-merge/lib/ast/merge/rspec.rb | 7 ++ gems/ast-merge/lib/ast/merge/rspec/README.md | 22 ++++++ .../ast/merge/rspec/conformance_fixtures.rb | 69 +++++++++++++++++++ .../merge_rspec_conformance_fixtures_spec.rb | 67 ++++++++++++++++++ 4 files changed, 165 insertions(+) create mode 100644 gems/ast-merge/lib/ast/merge/rspec/conformance_fixtures.rb create mode 100644 gems/ast-merge/spec/ast/merge_rspec_conformance_fixtures_spec.rb diff --git a/gems/ast-merge/lib/ast/merge/rspec.rb b/gems/ast-merge/lib/ast/merge/rspec.rb index bc8756c18..de7489ee7 100644 --- a/gems/ast-merge/lib/ast/merge/rspec.rb +++ b/gems/ast-merge/lib/ast/merge/rspec.rb @@ -31,5 +31,12 @@ # Load Ast::Merge dependency tags (provides merge gem tags like :markly_merge, :prism_merge, etc.) require_relative 'rspec/dependency_tags' +# Load conformance fixture helpers for shared fixture harnesses +require_relative 'rspec/conformance_fixtures' + # Load Ast::Merge shared examples (for testing *-merge implementations) require_relative 'rspec/shared_examples' + +RSpec.configure do |config| + config.include Ast::Merge::RSpec::ConformanceFixtures +end diff --git a/gems/ast-merge/lib/ast/merge/rspec/README.md b/gems/ast-merge/lib/ast/merge/rspec/README.md index 48c6a98de..343430da5 100644 --- a/gems/ast-merge/lib/ast/merge/rspec/README.md +++ b/gems/ast-merge/lib/ast/merge/rspec/README.md @@ -16,6 +16,7 @@ That loads: - TreeHaver backend dependency tags - Ast::Merge merge-gem dependency tags +- Shared conformance fixture helpers - Ast::Merge shared examples ### Split loading for `ast-merge` itself or registration-heavy suites @@ -74,6 +75,27 @@ end TreeHaver backend tags are loaded alongside these helpers; see the TreeHaver RSpec docs for backend-specific tags. +## Shared conformance fixtures + +`Ast::Merge::RSpec::ConformanceFixtures` is spec-harness support for merge gems that import shared fixtures from the sibling `fixtures` repository. + +Use it to document implementation gaps without hiding imported shared fixture cases: + +```ruby +support = support_for_conformance_fixture( + "delegated_child_operations", + pending_roles: { + delegated_child_operations: { + reason: "parser-backed child delegation is not implemented yet", + }, + }, +) + +apply_conformance_fixture_support!(support) +``` + +`pending` support calls RSpec `pending`, so the example fails as fixed once it unexpectedly passes. `unsupported` and `skipped` support call RSpec `skip`. + ## MergeGemRegistry `Ast::Merge::RSpec::MergeGemRegistry` tracks loaded and bootstrap-declared `*-merge` gems and exposes availability checks for dependency tags. diff --git a/gems/ast-merge/lib/ast/merge/rspec/conformance_fixtures.rb b/gems/ast-merge/lib/ast/merge/rspec/conformance_fixtures.rb new file mode 100644 index 000000000..c758f321d --- /dev/null +++ b/gems/ast-merge/lib/ast/merge/rspec/conformance_fixtures.rb @@ -0,0 +1,69 @@ +# frozen_string_literal: true + +module Ast + module Merge + module RSpec + module ConformanceFixtures + module_function + + def normalize_conformance_fixture_support(value = nil, default_status: nil, **keywords) + value = keywords unless keywords.empty? + + case value + when nil, false + nil + when true + { status: (default_status || 'pending').to_s } + when String, Symbol + { status: (default_status || value).to_s } + when Hash + support = value[:support] || value['support'] || value + return nil if support == false + + status = support[:status] || support['status'] || support[:state] || support['state'] + status ||= 'unsupported' if support[:unsupported] || support['unsupported'] + status ||= 'pending' if support[:pending] || support['pending'] + status ||= default_status + return nil unless %w[pending unsupported skipped].include?(status.to_s) + + metadata = { status: status.to_s } + reason = support[:reason] || support['reason'] || + support[:message] || support['message'] || + support[:unsupported_reason] || support['unsupported_reason'] || + support[:pending_reason] || support['pending_reason'] + metadata[:reason] = reason if reason + metadata[:category] = support[:category] || support['category'] if support[:category] || support['category'] + metadata + else + nil + end + end + + def support_for_conformance_fixture(role, pending_roles: nil, unsupported_roles: nil, fixture: nil) + role_support(pending_roles, role, default_status: 'pending') || + role_support(unsupported_roles, role, default_status: 'unsupported') || + normalize_conformance_fixture_support(fixture) + end + + def apply_conformance_fixture_support!(support) + metadata = normalize_conformance_fixture_support(support) + return unless metadata + + message = metadata[:reason] || "conformance fixture marked #{metadata[:status]}" + metadata[:status] == 'pending' ? pending(message) : skip(message) + end + + def role_support(roles, role, default_status:) + value = + if roles.is_a?(Array) + roles.map(&:to_s).include?(role.to_s) ? true : nil + elsif roles + roles[role.to_sym] || roles[role.to_s] + end + normalize_conformance_fixture_support(value, default_status: default_status) + end + private_class_method :role_support + end + end + end +end diff --git a/gems/ast-merge/spec/ast/merge_rspec_conformance_fixtures_spec.rb b/gems/ast-merge/spec/ast/merge_rspec_conformance_fixtures_spec.rb new file mode 100644 index 000000000..fcb519025 --- /dev/null +++ b/gems/ast-merge/spec/ast/merge_rspec_conformance_fixtures_spec.rb @@ -0,0 +1,67 @@ +# frozen_string_literal: true + +require 'ast/merge/rspec/conformance_fixtures' + +RSpec.describe Ast::Merge::RSpec::ConformanceFixtures do + describe '.normalize_conformance_fixture_support' do + it 'normalizes pending fixture metadata' do + expect( + described_class.normalize_conformance_fixture_support( + pending: true, + pending_reason: 'backend lacks delegated child operation records' + ) + ).to eq( + status: 'pending', + reason: 'backend lacks delegated child operation records' + ) + end + + it 'normalizes unsupported fixture metadata' do + expect( + described_class.normalize_conformance_fixture_support( + unsupported: true, + unsupported_reason: 'TSLP does not expose this node class yet', + category: 'unsupported_parser_capability' + ) + ).to eq( + status: 'unsupported', + reason: 'TSLP does not expose this node class yet', + category: 'unsupported_parser_capability' + ) + end + + it 'returns nil for supported fixtures' do + expect(described_class.normalize_conformance_fixture_support(nil)).to be_nil + expect(described_class.normalize_conformance_fixture_support(false)).to be_nil + expect(described_class.normalize_conformance_fixture_support(support: false)).to be_nil + end + end + + describe '.support_for_conformance_fixture' do + it 'selects role-level pending support before fixture metadata' do + support = described_class.support_for_conformance_fixture( + 'delegated_child_operations', + pending_roles: { + delegated_child_operations: { + reason: 'parser-backed child delegation is not implemented yet' + } + }, + fixture: { unsupported: true } + ) + + expect(support).to eq( + status: 'pending', + reason: 'parser-backed child delegation is not implemented yet' + ) + end + + it 'selects role-level unsupported support' do + support = described_class.support_for_conformance_fixture( + 'discovered_surfaces', + unsupported_roles: ['discovered_surfaces'] + ) + + expect(support).to eq(status: 'unsupported') + end + end +end From d43e41d615d2b95f8beb9a7c8542000387b247c2 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 21:44:12 -0600 Subject: [PATCH 085/347] Pin TSLP to parser API branch --- gems/ast-crispr-markdown-markly/Gemfile | 4 +- gems/ast-crispr-markdown-markly/Gemfile.lock | 4 +- gems/ast-crispr-ruby-prism/Gemfile | 4 +- gems/ast-crispr-ruby-prism/Gemfile.lock | 4 +- gems/ast-crispr/Gemfile | 4 +- gems/ast-crispr/Gemfile.lock | 4 +- gems/ast-merge-git/Gemfile | 4 +- gems/ast-merge-git/Gemfile.lock | 4 +- gems/ast-merge/Gemfile | 4 +- gems/ast-merge/Gemfile.lock | 4 +- gems/ast-template/Gemfile | 4 +- gems/ast-template/Gemfile.lock | 4 +- gems/bash-merge/Gemfile | 4 +- gems/bash-merge/Gemfile.lock | 4 +- gems/binary-merge/Gemfile | 4 +- gems/binary-merge/Gemfile.lock | 4 +- gems/citrus-toml-merge/Gemfile | 4 +- gems/citrus-toml-merge/Gemfile.lock | 342 +++++++++++++++++- gems/commonmarker-merge/Gemfile | 4 +- gems/commonmarker-merge/Gemfile.lock | 347 +++++++++++++++++- gems/dotenv-merge/Gemfile | 4 +- gems/dotenv-merge/Gemfile.lock | 356 ++++++++++++++++++- gems/go-merge/Gemfile | 4 +- gems/go-merge/Gemfile.lock | 356 ++++++++++++++++++- gems/json-merge/Gemfile | 4 +- gems/json-merge/Gemfile.lock | 4 +- gems/kramdown-merge/Gemfile | 4 +- gems/kramdown-merge/Gemfile.lock | 4 +- gems/markdown-merge/Gemfile | 4 +- gems/markdown-merge/Gemfile.lock | 356 ++++++++++++++++++- gems/markly-merge/Gemfile | 4 +- gems/markly-merge/Gemfile.lock | 4 +- gems/parslet-toml-merge/Gemfile | 4 +- gems/parslet-toml-merge/Gemfile.lock | 343 +++++++++++++++++- gems/plain-merge/Gemfile | 4 +- gems/plain-merge/Gemfile.lock | 4 +- gems/prism-merge/Gemfile | 4 +- gems/prism-merge/Gemfile.lock | 4 +- gems/psych-merge/Gemfile | 4 +- gems/psych-merge/Gemfile.lock | 4 +- gems/rbs-merge/Gemfile | 4 +- gems/rbs-merge/Gemfile.lock | 4 +- gems/ruby-merge/Gemfile | 4 +- gems/ruby-merge/Gemfile.lock | 4 +- gems/rust-merge/Gemfile | 4 +- gems/rust-merge/Gemfile.lock | 356 ++++++++++++++++++- gems/smorg-rb/Gemfile | 4 +- gems/smorg-rb/Gemfile.lock | 4 +- gems/toml-merge/Gemfile | 4 +- gems/toml-merge/Gemfile.lock | 326 ++++++++++++++++- gems/tree_haver/Gemfile | 4 +- gems/tree_haver/Gemfile.lock | 26 +- gems/typescript-merge/Gemfile | 4 +- gems/typescript-merge/Gemfile.lock | 4 +- gems/yaml-merge/Gemfile | 4 +- gems/yaml-merge/Gemfile.lock | 4 +- gems/zip-merge/Gemfile | 4 +- gems/zip-merge/Gemfile.lock | 4 +- 58 files changed, 2807 insertions(+), 197 deletions(-) diff --git a/gems/ast-crispr-markdown-markly/Gemfile b/gems/ast-crispr-markdown-markly/Gemfile index 9be79023e..50ca1aa20 100644 --- a/gems/ast-crispr-markdown-markly/Gemfile +++ b/gems/ast-crispr-markdown-markly/Gemfile @@ -192,7 +192,7 @@ if direct_sibling_gems.any? && end end -# Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. +# Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? && !tslp_dev.to_s.empty? @@ -201,7 +201,7 @@ unless tslp_declared_by_templating gem( 'tree_sitter_language_pack', git: 'https://github.com/structuredmerge/tree-sitter-language-pack.git', - branch: 'fix/ruby-4-installs', + branch: 'fix/ruby-parser-api-methods', glob: 'packages/ruby/*.gemspec' ) else diff --git a/gems/ast-crispr-markdown-markly/Gemfile.lock b/gems/ast-crispr-markdown-markly/Gemfile.lock index 5d9c84213..352638c28 100644 --- a/gems/ast-crispr-markdown-markly/Gemfile.lock +++ b/gems/ast-crispr-markdown-markly/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: dcc959b12d02d6e379abf1c8ac536a852d1b8416 - branch: fix/ruby-4-installs + revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a + branch: fix/ruby-parser-api-methods glob: packages/ruby/*.gemspec specs: tree_sitter_language_pack (1.12.5) diff --git a/gems/ast-crispr-ruby-prism/Gemfile b/gems/ast-crispr-ruby-prism/Gemfile index 9aa4318a3..7266f0e60 100644 --- a/gems/ast-crispr-ruby-prism/Gemfile +++ b/gems/ast-crispr-ruby-prism/Gemfile @@ -191,7 +191,7 @@ if direct_sibling_gems.any? && end end -# Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. +# Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? && !tslp_dev.to_s.empty? @@ -200,7 +200,7 @@ unless tslp_declared_by_templating gem( 'tree_sitter_language_pack', git: 'https://github.com/structuredmerge/tree-sitter-language-pack.git', - branch: 'fix/ruby-4-installs', + branch: 'fix/ruby-parser-api-methods', glob: 'packages/ruby/*.gemspec' ) else diff --git a/gems/ast-crispr-ruby-prism/Gemfile.lock b/gems/ast-crispr-ruby-prism/Gemfile.lock index 97f9b1499..bf08865f1 100644 --- a/gems/ast-crispr-ruby-prism/Gemfile.lock +++ b/gems/ast-crispr-ruby-prism/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: dcc959b12d02d6e379abf1c8ac536a852d1b8416 - branch: fix/ruby-4-installs + revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a + branch: fix/ruby-parser-api-methods glob: packages/ruby/*.gemspec specs: tree_sitter_language_pack (1.12.5) diff --git a/gems/ast-crispr/Gemfile b/gems/ast-crispr/Gemfile index 5c4f95a0c..a866cad85 100644 --- a/gems/ast-crispr/Gemfile +++ b/gems/ast-crispr/Gemfile @@ -191,7 +191,7 @@ if direct_sibling_gems.any? && end end -# Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. +# Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? && !tslp_dev.to_s.empty? @@ -200,7 +200,7 @@ unless tslp_declared_by_templating gem( 'tree_sitter_language_pack', git: 'https://github.com/structuredmerge/tree-sitter-language-pack.git', - branch: 'fix/ruby-4-installs', + branch: 'fix/ruby-parser-api-methods', glob: 'packages/ruby/*.gemspec' ) else diff --git a/gems/ast-crispr/Gemfile.lock b/gems/ast-crispr/Gemfile.lock index a142a37aa..b07fc418a 100644 --- a/gems/ast-crispr/Gemfile.lock +++ b/gems/ast-crispr/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: dcc959b12d02d6e379abf1c8ac536a852d1b8416 - branch: fix/ruby-4-installs + revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a + branch: fix/ruby-parser-api-methods glob: packages/ruby/*.gemspec specs: tree_sitter_language_pack (1.12.5) diff --git a/gems/ast-merge-git/Gemfile b/gems/ast-merge-git/Gemfile index c4bc34a73..b77306704 100644 --- a/gems/ast-merge-git/Gemfile +++ b/gems/ast-merge-git/Gemfile @@ -191,7 +191,7 @@ if direct_sibling_gems.any? && end end -# Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. +# Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? && !tslp_dev.to_s.empty? @@ -200,7 +200,7 @@ unless tslp_declared_by_templating gem( 'tree_sitter_language_pack', git: 'https://github.com/structuredmerge/tree-sitter-language-pack.git', - branch: 'fix/ruby-4-installs', + branch: 'fix/ruby-parser-api-methods', glob: 'packages/ruby/*.gemspec' ) else diff --git a/gems/ast-merge-git/Gemfile.lock b/gems/ast-merge-git/Gemfile.lock index b8b21c1ab..2bf970f5f 100644 --- a/gems/ast-merge-git/Gemfile.lock +++ b/gems/ast-merge-git/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: dcc959b12d02d6e379abf1c8ac536a852d1b8416 - branch: fix/ruby-4-installs + revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a + branch: fix/ruby-parser-api-methods glob: packages/ruby/*.gemspec specs: tree_sitter_language_pack (1.12.5) diff --git a/gems/ast-merge/Gemfile b/gems/ast-merge/Gemfile index bcea83511..2c0323fac 100644 --- a/gems/ast-merge/Gemfile +++ b/gems/ast-merge/Gemfile @@ -191,7 +191,7 @@ if direct_sibling_gems.any? && end end -# Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. +# Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? && !tslp_dev.to_s.empty? @@ -200,7 +200,7 @@ unless tslp_declared_by_templating gem( 'tree_sitter_language_pack', git: 'https://github.com/structuredmerge/tree-sitter-language-pack.git', - branch: 'fix/ruby-4-installs', + branch: 'fix/ruby-parser-api-methods', glob: 'packages/ruby/*.gemspec' ) else diff --git a/gems/ast-merge/Gemfile.lock b/gems/ast-merge/Gemfile.lock index 8a2ab0c38..2c65d5222 100644 --- a/gems/ast-merge/Gemfile.lock +++ b/gems/ast-merge/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: dcc959b12d02d6e379abf1c8ac536a852d1b8416 - branch: fix/ruby-4-installs + revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a + branch: fix/ruby-parser-api-methods glob: packages/ruby/*.gemspec specs: tree_sitter_language_pack (1.12.5) diff --git a/gems/ast-template/Gemfile b/gems/ast-template/Gemfile index 934d087ac..130687997 100644 --- a/gems/ast-template/Gemfile +++ b/gems/ast-template/Gemfile @@ -191,7 +191,7 @@ if direct_sibling_gems.any? && end end -# Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. +# Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? && !tslp_dev.to_s.empty? @@ -200,7 +200,7 @@ unless tslp_declared_by_templating gem( 'tree_sitter_language_pack', git: 'https://github.com/structuredmerge/tree-sitter-language-pack.git', - branch: 'fix/ruby-4-installs', + branch: 'fix/ruby-parser-api-methods', glob: 'packages/ruby/*.gemspec' ) else diff --git a/gems/ast-template/Gemfile.lock b/gems/ast-template/Gemfile.lock index 619821ecf..3450e16a5 100644 --- a/gems/ast-template/Gemfile.lock +++ b/gems/ast-template/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: dcc959b12d02d6e379abf1c8ac536a852d1b8416 - branch: fix/ruby-4-installs + revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a + branch: fix/ruby-parser-api-methods glob: packages/ruby/*.gemspec specs: tree_sitter_language_pack (1.12.5) diff --git a/gems/bash-merge/Gemfile b/gems/bash-merge/Gemfile index ede2878fe..5be4ab47a 100644 --- a/gems/bash-merge/Gemfile +++ b/gems/bash-merge/Gemfile @@ -192,7 +192,7 @@ if direct_sibling_gems.any? && end end -# Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. +# Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? && !tslp_dev.to_s.empty? @@ -201,7 +201,7 @@ unless tslp_declared_by_templating gem( 'tree_sitter_language_pack', git: 'https://github.com/structuredmerge/tree-sitter-language-pack.git', - branch: 'fix/ruby-4-installs', + branch: 'fix/ruby-parser-api-methods', glob: 'packages/ruby/*.gemspec' ) else diff --git a/gems/bash-merge/Gemfile.lock b/gems/bash-merge/Gemfile.lock index 27c88fc3b..6215f7838 100644 --- a/gems/bash-merge/Gemfile.lock +++ b/gems/bash-merge/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: dcc959b12d02d6e379abf1c8ac536a852d1b8416 - branch: fix/ruby-4-installs + revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a + branch: fix/ruby-parser-api-methods glob: packages/ruby/*.gemspec specs: tree_sitter_language_pack (1.12.5) diff --git a/gems/binary-merge/Gemfile b/gems/binary-merge/Gemfile index 525832435..b0394cc6a 100644 --- a/gems/binary-merge/Gemfile +++ b/gems/binary-merge/Gemfile @@ -231,7 +231,7 @@ if direct_sibling_gems.any? && end end -# Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. +# Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? && !tslp_dev.to_s.empty? @@ -240,7 +240,7 @@ unless tslp_declared_by_templating gem( 'tree_sitter_language_pack', git: 'https://github.com/structuredmerge/tree-sitter-language-pack.git', - branch: 'fix/ruby-4-installs', + branch: 'fix/ruby-parser-api-methods', glob: 'packages/ruby/*.gemspec' ) else diff --git a/gems/binary-merge/Gemfile.lock b/gems/binary-merge/Gemfile.lock index 50c4884ae..d5afa19e0 100644 --- a/gems/binary-merge/Gemfile.lock +++ b/gems/binary-merge/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: dcc959b12d02d6e379abf1c8ac536a852d1b8416 - branch: fix/ruby-4-installs + revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a + branch: fix/ruby-parser-api-methods glob: packages/ruby/*.gemspec specs: tree_sitter_language_pack (1.12.5) diff --git a/gems/citrus-toml-merge/Gemfile b/gems/citrus-toml-merge/Gemfile index b21448a3c..039c65efd 100644 --- a/gems/citrus-toml-merge/Gemfile +++ b/gems/citrus-toml-merge/Gemfile @@ -191,7 +191,7 @@ if direct_sibling_gems.any? && end end -# Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. +# Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? && !tslp_dev.to_s.empty? @@ -200,7 +200,7 @@ unless tslp_declared_by_templating gem( 'tree_sitter_language_pack', git: 'https://github.com/structuredmerge/tree-sitter-language-pack.git', - branch: 'fix/ruby-4-installs', + branch: 'fix/ruby-parser-api-methods', glob: 'packages/ruby/*.gemspec' ) else diff --git a/gems/citrus-toml-merge/Gemfile.lock b/gems/citrus-toml-merge/Gemfile.lock index d9fc16086..d2e2c08d9 100644 --- a/gems/citrus-toml-merge/Gemfile.lock +++ b/gems/citrus-toml-merge/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: dcc959b12d02d6e379abf1c8ac536a852d1b8416 - branch: fix/ruby-4-installs + revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a + branch: fix/ruby-parser-api-methods glob: packages/ruby/*.gemspec specs: tree_sitter_language_pack (1.12.5) @@ -16,6 +16,256 @@ PATH toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: @@ -35,11 +285,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -48,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -111,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -139,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -278,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -330,14 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -384,23 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -409,33 +684,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -443,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -455,19 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -482,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -493,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -520,9 +830,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -531,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -544,16 +858,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -561,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/commonmarker-merge/Gemfile b/gems/commonmarker-merge/Gemfile index ddcb4f1eb..f0c86279e 100644 --- a/gems/commonmarker-merge/Gemfile +++ b/gems/commonmarker-merge/Gemfile @@ -191,7 +191,7 @@ if direct_sibling_gems.any? && end end -# Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. +# Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? && !tslp_dev.to_s.empty? @@ -200,7 +200,7 @@ unless tslp_declared_by_templating gem( 'tree_sitter_language_pack', git: 'https://github.com/structuredmerge/tree-sitter-language-pack.git', - branch: 'fix/ruby-4-installs', + branch: 'fix/ruby-parser-api-methods', glob: 'packages/ruby/*.gemspec' ) else diff --git a/gems/commonmarker-merge/Gemfile.lock b/gems/commonmarker-merge/Gemfile.lock index 46cd4b3fc..2552785d9 100644 --- a/gems/commonmarker-merge/Gemfile.lock +++ b/gems/commonmarker-merge/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: dcc959b12d02d6e379abf1c8ac536a852d1b8416 - branch: fix/ruby-4-installs + revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a + branch: fix/ruby-parser-api-methods glob: packages/ruby/*.gemspec specs: tree_sitter_language_pack (1.12.5) @@ -16,6 +16,264 @@ PATH markdown-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +285,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -109,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -137,10 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -280,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -332,11 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -383,23 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -408,30 +684,46 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca @@ -447,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -459,20 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -487,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -498,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -525,9 +830,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -536,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -549,14 +858,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -564,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/dotenv-merge/Gemfile b/gems/dotenv-merge/Gemfile index 84144b290..8afde9658 100644 --- a/gems/dotenv-merge/Gemfile +++ b/gems/dotenv-merge/Gemfile @@ -192,7 +192,7 @@ if direct_sibling_gems.any? && end end -# Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. +# Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? && !tslp_dev.to_s.empty? @@ -201,7 +201,7 @@ unless tslp_declared_by_templating gem( 'tree_sitter_language_pack', git: 'https://github.com/structuredmerge/tree-sitter-language-pack.git', - branch: 'fix/ruby-4-installs', + branch: 'fix/ruby-parser-api-methods', glob: 'packages/ruby/*.gemspec' ) else diff --git a/gems/dotenv-merge/Gemfile.lock b/gems/dotenv-merge/Gemfile.lock index 33f2465f3..3454bef92 100644 --- a/gems/dotenv-merge/Gemfile.lock +++ b/gems/dotenv-merge/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: dcc959b12d02d6e379abf1c8ac536a852d1b8416 - branch: fix/ruby-4-installs + revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a + branch: fix/ruby-parser-api-methods glob: packages/ruby/*.gemspec specs: tree_sitter_language_pack (1.12.5) @@ -16,6 +16,264 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +285,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -103,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -131,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -322,11 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -373,23 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.1, >= 3.1.4) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.3, >= 2.3.7) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -398,32 +684,55 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.1, >= 3.1.14) + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -444,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -471,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -482,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -509,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -520,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -533,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -548,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/go-merge/Gemfile b/gems/go-merge/Gemfile index 3bb8b1a27..58ad94eec 100644 --- a/gems/go-merge/Gemfile +++ b/gems/go-merge/Gemfile @@ -192,7 +192,7 @@ if direct_sibling_gems.any? && end end -# Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. +# Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? && !tslp_dev.to_s.empty? @@ -201,7 +201,7 @@ unless tslp_declared_by_templating gem( 'tree_sitter_language_pack', git: 'https://github.com/structuredmerge/tree-sitter-language-pack.git', - branch: 'fix/ruby-4-installs', + branch: 'fix/ruby-parser-api-methods', glob: 'packages/ruby/*.gemspec' ) else diff --git a/gems/go-merge/Gemfile.lock b/gems/go-merge/Gemfile.lock index 06dc9202b..6f3d7f47a 100644 --- a/gems/go-merge/Gemfile.lock +++ b/gems/go-merge/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: dcc959b12d02d6e379abf1c8ac536a852d1b8416 - branch: fix/ruby-4-installs + revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a + branch: fix/ruby-parser-api-methods glob: packages/ruby/*.gemspec specs: tree_sitter_language_pack (1.12.5) @@ -16,6 +16,264 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +285,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -103,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -131,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -322,11 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -373,23 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -398,31 +684,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -430,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -447,15 +757,22 @@ CHECKSUMS io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -470,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -481,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -508,9 +830,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -519,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -532,14 +858,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -547,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/json-merge/Gemfile b/gems/json-merge/Gemfile index 7b2bf4a74..a37d4217c 100644 --- a/gems/json-merge/Gemfile +++ b/gems/json-merge/Gemfile @@ -192,7 +192,7 @@ if direct_sibling_gems.any? && end end -# Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. +# Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? && !tslp_dev.to_s.empty? @@ -201,7 +201,7 @@ unless tslp_declared_by_templating gem( 'tree_sitter_language_pack', git: 'https://github.com/structuredmerge/tree-sitter-language-pack.git', - branch: 'fix/ruby-4-installs', + branch: 'fix/ruby-parser-api-methods', glob: 'packages/ruby/*.gemspec' ) else diff --git a/gems/json-merge/Gemfile.lock b/gems/json-merge/Gemfile.lock index ed7c64d3b..9051ac23f 100644 --- a/gems/json-merge/Gemfile.lock +++ b/gems/json-merge/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: dcc959b12d02d6e379abf1c8ac536a852d1b8416 - branch: fix/ruby-4-installs + revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a + branch: fix/ruby-parser-api-methods glob: packages/ruby/*.gemspec specs: tree_sitter_language_pack (1.12.5) diff --git a/gems/kramdown-merge/Gemfile b/gems/kramdown-merge/Gemfile index dac95ecad..a1cbf2eb6 100644 --- a/gems/kramdown-merge/Gemfile +++ b/gems/kramdown-merge/Gemfile @@ -191,7 +191,7 @@ if direct_sibling_gems.any? && end end -# Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. +# Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? && !tslp_dev.to_s.empty? @@ -200,7 +200,7 @@ unless tslp_declared_by_templating gem( 'tree_sitter_language_pack', git: 'https://github.com/structuredmerge/tree-sitter-language-pack.git', - branch: 'fix/ruby-4-installs', + branch: 'fix/ruby-parser-api-methods', glob: 'packages/ruby/*.gemspec' ) else diff --git a/gems/kramdown-merge/Gemfile.lock b/gems/kramdown-merge/Gemfile.lock index 1aa7608db..57cd10b37 100644 --- a/gems/kramdown-merge/Gemfile.lock +++ b/gems/kramdown-merge/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: dcc959b12d02d6e379abf1c8ac536a852d1b8416 - branch: fix/ruby-4-installs + revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a + branch: fix/ruby-parser-api-methods glob: packages/ruby/*.gemspec specs: tree_sitter_language_pack (1.12.5) diff --git a/gems/markdown-merge/Gemfile b/gems/markdown-merge/Gemfile index fc79d96e1..ecfafa889 100644 --- a/gems/markdown-merge/Gemfile +++ b/gems/markdown-merge/Gemfile @@ -192,7 +192,7 @@ if direct_sibling_gems.any? && end end -# Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. +# Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? && !tslp_dev.to_s.empty? @@ -201,7 +201,7 @@ unless tslp_declared_by_templating gem( 'tree_sitter_language_pack', git: 'https://github.com/structuredmerge/tree-sitter-language-pack.git', - branch: 'fix/ruby-4-installs', + branch: 'fix/ruby-parser-api-methods', glob: 'packages/ruby/*.gemspec' ) else diff --git a/gems/markdown-merge/Gemfile.lock b/gems/markdown-merge/Gemfile.lock index 7bf25040c..bd1155394 100644 --- a/gems/markdown-merge/Gemfile.lock +++ b/gems/markdown-merge/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: dcc959b12d02d6e379abf1c8ac536a852d1b8416 - branch: fix/ruby-4-installs + revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a + branch: fix/ruby-parser-api-methods glob: packages/ruby/*.gemspec specs: tree_sitter_language_pack (1.12.5) @@ -16,6 +16,264 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +285,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -103,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -131,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -322,11 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -373,23 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -398,31 +684,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -430,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -442,20 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -470,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -481,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -508,9 +830,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -519,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -532,14 +858,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -547,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/markly-merge/Gemfile b/gems/markly-merge/Gemfile index 1335676a7..0a61a6c58 100644 --- a/gems/markly-merge/Gemfile +++ b/gems/markly-merge/Gemfile @@ -191,7 +191,7 @@ if direct_sibling_gems.any? && end end -# Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. +# Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? && !tslp_dev.to_s.empty? @@ -200,7 +200,7 @@ unless tslp_declared_by_templating gem( 'tree_sitter_language_pack', git: 'https://github.com/structuredmerge/tree-sitter-language-pack.git', - branch: 'fix/ruby-4-installs', + branch: 'fix/ruby-parser-api-methods', glob: 'packages/ruby/*.gemspec' ) else diff --git a/gems/markly-merge/Gemfile.lock b/gems/markly-merge/Gemfile.lock index 97af045ed..b23bb3c29 100644 --- a/gems/markly-merge/Gemfile.lock +++ b/gems/markly-merge/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: dcc959b12d02d6e379abf1c8ac536a852d1b8416 - branch: fix/ruby-4-installs + revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a + branch: fix/ruby-parser-api-methods glob: packages/ruby/*.gemspec specs: tree_sitter_language_pack (1.12.5) diff --git a/gems/parslet-toml-merge/Gemfile b/gems/parslet-toml-merge/Gemfile index 700fb2815..213293761 100644 --- a/gems/parslet-toml-merge/Gemfile +++ b/gems/parslet-toml-merge/Gemfile @@ -191,7 +191,7 @@ if direct_sibling_gems.any? && end end -# Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. +# Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? && !tslp_dev.to_s.empty? @@ -200,7 +200,7 @@ unless tslp_declared_by_templating gem( 'tree_sitter_language_pack', git: 'https://github.com/structuredmerge/tree-sitter-language-pack.git', - branch: 'fix/ruby-4-installs', + branch: 'fix/ruby-parser-api-methods', glob: 'packages/ruby/*.gemspec' ) else diff --git a/gems/parslet-toml-merge/Gemfile.lock b/gems/parslet-toml-merge/Gemfile.lock index a8d0a4af5..c3f3a6074 100644 --- a/gems/parslet-toml-merge/Gemfile.lock +++ b/gems/parslet-toml-merge/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: dcc959b12d02d6e379abf1c8ac536a852d1b8416 - branch: fix/ruby-4-installs + revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a + branch: fix/ruby-parser-api-methods glob: packages/ruby/*.gemspec specs: tree_sitter_language_pack (1.12.5) @@ -16,6 +16,256 @@ PATH toml-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: @@ -35,11 +285,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -48,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -111,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -139,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -278,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -332,11 +588,9 @@ GEM version_gem (~> 1.1, >= 1.1.13) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -383,23 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -408,32 +684,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -441,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -453,19 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -481,10 +788,13 @@ CHECKSUMS parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 parslet-toml-merge (7.1.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -492,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -519,9 +830,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -530,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -545,14 +860,17 @@ CHECKSUMS token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -560,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/plain-merge/Gemfile b/gems/plain-merge/Gemfile index ab6587618..a27cc77db 100644 --- a/gems/plain-merge/Gemfile +++ b/gems/plain-merge/Gemfile @@ -192,7 +192,7 @@ if direct_sibling_gems.any? && end end -# Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. +# Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? && !tslp_dev.to_s.empty? @@ -201,7 +201,7 @@ unless tslp_declared_by_templating gem( 'tree_sitter_language_pack', git: 'https://github.com/structuredmerge/tree-sitter-language-pack.git', - branch: 'fix/ruby-4-installs', + branch: 'fix/ruby-parser-api-methods', glob: 'packages/ruby/*.gemspec' ) else diff --git a/gems/plain-merge/Gemfile.lock b/gems/plain-merge/Gemfile.lock index 8a5af2ca5..5b8ab48da 100644 --- a/gems/plain-merge/Gemfile.lock +++ b/gems/plain-merge/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: dcc959b12d02d6e379abf1c8ac536a852d1b8416 - branch: fix/ruby-4-installs + revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a + branch: fix/ruby-parser-api-methods glob: packages/ruby/*.gemspec specs: tree_sitter_language_pack (1.12.5) diff --git a/gems/prism-merge/Gemfile b/gems/prism-merge/Gemfile index 3845c5869..4c79ddd51 100644 --- a/gems/prism-merge/Gemfile +++ b/gems/prism-merge/Gemfile @@ -191,7 +191,7 @@ if direct_sibling_gems.any? && end end -# Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. +# Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? && !tslp_dev.to_s.empty? @@ -200,7 +200,7 @@ unless tslp_declared_by_templating gem( 'tree_sitter_language_pack', git: 'https://github.com/structuredmerge/tree-sitter-language-pack.git', - branch: 'fix/ruby-4-installs', + branch: 'fix/ruby-parser-api-methods', glob: 'packages/ruby/*.gemspec' ) else diff --git a/gems/prism-merge/Gemfile.lock b/gems/prism-merge/Gemfile.lock index c3d574bdf..274bfa8b3 100644 --- a/gems/prism-merge/Gemfile.lock +++ b/gems/prism-merge/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: dcc959b12d02d6e379abf1c8ac536a852d1b8416 - branch: fix/ruby-4-installs + revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a + branch: fix/ruby-parser-api-methods glob: packages/ruby/*.gemspec specs: tree_sitter_language_pack (1.12.5) diff --git a/gems/psych-merge/Gemfile b/gems/psych-merge/Gemfile index 765097826..8b99afe28 100644 --- a/gems/psych-merge/Gemfile +++ b/gems/psych-merge/Gemfile @@ -233,7 +233,7 @@ if direct_sibling_gems.any? && end end -# Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. +# Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? && !tslp_dev.to_s.empty? @@ -242,7 +242,7 @@ unless tslp_declared_by_templating gem( 'tree_sitter_language_pack', git: 'https://github.com/structuredmerge/tree-sitter-language-pack.git', - branch: 'fix/ruby-4-installs', + branch: 'fix/ruby-parser-api-methods', glob: 'packages/ruby/*.gemspec' ) else diff --git a/gems/psych-merge/Gemfile.lock b/gems/psych-merge/Gemfile.lock index c1770d746..74ca6bd0e 100644 --- a/gems/psych-merge/Gemfile.lock +++ b/gems/psych-merge/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: dcc959b12d02d6e379abf1c8ac536a852d1b8416 - branch: fix/ruby-4-installs + revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a + branch: fix/ruby-parser-api-methods glob: packages/ruby/*.gemspec specs: tree_sitter_language_pack (1.12.5) diff --git a/gems/rbs-merge/Gemfile b/gems/rbs-merge/Gemfile index 9118ccc6c..2e8673d99 100644 --- a/gems/rbs-merge/Gemfile +++ b/gems/rbs-merge/Gemfile @@ -192,7 +192,7 @@ if direct_sibling_gems.any? && end end -# Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. +# Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? && !tslp_dev.to_s.empty? @@ -201,7 +201,7 @@ unless tslp_declared_by_templating gem( 'tree_sitter_language_pack', git: 'https://github.com/structuredmerge/tree-sitter-language-pack.git', - branch: 'fix/ruby-4-installs', + branch: 'fix/ruby-parser-api-methods', glob: 'packages/ruby/*.gemspec' ) else diff --git a/gems/rbs-merge/Gemfile.lock b/gems/rbs-merge/Gemfile.lock index 6df7155cd..2f4ada4b0 100644 --- a/gems/rbs-merge/Gemfile.lock +++ b/gems/rbs-merge/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: dcc959b12d02d6e379abf1c8ac536a852d1b8416 - branch: fix/ruby-4-installs + revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a + branch: fix/ruby-parser-api-methods glob: packages/ruby/*.gemspec specs: tree_sitter_language_pack (1.12.5) diff --git a/gems/ruby-merge/Gemfile b/gems/ruby-merge/Gemfile index 441fd3008..f8aba7c8b 100644 --- a/gems/ruby-merge/Gemfile +++ b/gems/ruby-merge/Gemfile @@ -192,7 +192,7 @@ if direct_sibling_gems.any? && end end -# Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. +# Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? && !tslp_dev.to_s.empty? @@ -201,7 +201,7 @@ unless tslp_declared_by_templating gem( 'tree_sitter_language_pack', git: 'https://github.com/structuredmerge/tree-sitter-language-pack.git', - branch: 'fix/ruby-4-installs', + branch: 'fix/ruby-parser-api-methods', glob: 'packages/ruby/*.gemspec' ) else diff --git a/gems/ruby-merge/Gemfile.lock b/gems/ruby-merge/Gemfile.lock index c0a5496d6..3a51cc768 100644 --- a/gems/ruby-merge/Gemfile.lock +++ b/gems/ruby-merge/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: dcc959b12d02d6e379abf1c8ac536a852d1b8416 - branch: fix/ruby-4-installs + revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a + branch: fix/ruby-parser-api-methods glob: packages/ruby/*.gemspec specs: tree_sitter_language_pack (1.12.5) diff --git a/gems/rust-merge/Gemfile b/gems/rust-merge/Gemfile index 0dac6752c..7469a4005 100644 --- a/gems/rust-merge/Gemfile +++ b/gems/rust-merge/Gemfile @@ -192,7 +192,7 @@ if direct_sibling_gems.any? && end end -# Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. +# Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? && !tslp_dev.to_s.empty? @@ -201,7 +201,7 @@ unless tslp_declared_by_templating gem( 'tree_sitter_language_pack', git: 'https://github.com/structuredmerge/tree-sitter-language-pack.git', - branch: 'fix/ruby-4-installs', + branch: 'fix/ruby-parser-api-methods', glob: 'packages/ruby/*.gemspec' ) else diff --git a/gems/rust-merge/Gemfile.lock b/gems/rust-merge/Gemfile.lock index 5f9e3c073..a532291f1 100644 --- a/gems/rust-merge/Gemfile.lock +++ b/gems/rust-merge/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: dcc959b12d02d6e379abf1c8ac536a852d1b8416 - branch: fix/ruby-4-installs + revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a + branch: fix/ruby-parser-api-methods glob: packages/ruby/*.gemspec specs: tree_sitter_language_pack (1.12.5) @@ -16,6 +16,264 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +285,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -103,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -131,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -322,11 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -373,22 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -397,32 +684,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -430,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -442,19 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -469,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -480,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -507,10 +830,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -519,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -532,14 +858,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -547,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/smorg-rb/Gemfile b/gems/smorg-rb/Gemfile index 4a188907e..f06b38606 100644 --- a/gems/smorg-rb/Gemfile +++ b/gems/smorg-rb/Gemfile @@ -317,7 +317,7 @@ if direct_sibling_gems.any? && end end -# Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. +# Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? && !tslp_dev.to_s.empty? @@ -326,7 +326,7 @@ unless tslp_declared_by_templating gem( 'tree_sitter_language_pack', git: 'https://github.com/structuredmerge/tree-sitter-language-pack.git', - branch: 'fix/ruby-4-installs', + branch: 'fix/ruby-parser-api-methods', glob: 'packages/ruby/*.gemspec' ) else diff --git a/gems/smorg-rb/Gemfile.lock b/gems/smorg-rb/Gemfile.lock index 09eba198c..6fe6c8e52 100644 --- a/gems/smorg-rb/Gemfile.lock +++ b/gems/smorg-rb/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: dcc959b12d02d6e379abf1c8ac536a852d1b8416 - branch: fix/ruby-4-installs + revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a + branch: fix/ruby-parser-api-methods glob: packages/ruby/*.gemspec specs: tree_sitter_language_pack (1.12.5) diff --git a/gems/toml-merge/Gemfile b/gems/toml-merge/Gemfile index 7a1994926..b6858d52d 100644 --- a/gems/toml-merge/Gemfile +++ b/gems/toml-merge/Gemfile @@ -192,7 +192,7 @@ if direct_sibling_gems.any? && end end -# Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. +# Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? && !tslp_dev.to_s.empty? @@ -201,7 +201,7 @@ unless tslp_declared_by_templating gem( 'tree_sitter_language_pack', git: 'https://github.com/structuredmerge/tree-sitter-language-pack.git', - branch: 'fix/ruby-4-installs', + branch: 'fix/ruby-parser-api-methods', glob: 'packages/ruby/*.gemspec' ) else diff --git a/gems/toml-merge/Gemfile.lock b/gems/toml-merge/Gemfile.lock index 5f94594be..14783b41e 100644 --- a/gems/toml-merge/Gemfile.lock +++ b/gems/toml-merge/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: dcc959b12d02d6e379abf1c8ac536a852d1b8416 - branch: fix/ruby-4-installs + revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a + branch: fix/ruby-parser-api-methods glob: packages/ruby/*.gemspec specs: tree_sitter_language_pack (1.12.5) @@ -16,6 +16,246 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -53,6 +293,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +532,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +586,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -381,23 +637,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -406,33 +684,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +739,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,19 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -479,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -490,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -517,9 +830,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -528,6 +844,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -541,15 +858,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +878,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/tree_haver/Gemfile b/gems/tree_haver/Gemfile index 4be2ceec0..3bd2001b5 100644 --- a/gems/tree_haver/Gemfile +++ b/gems/tree_haver/Gemfile @@ -21,7 +21,7 @@ gemspec # Local workspace dependency wiring for *_local.gemfile overrides nomono_requirements = ['~> 1.0', '>= 1.0.8'] gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 -# Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. +# Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? && !tslp_dev.to_s.empty? @@ -30,7 +30,7 @@ unless tslp_declared_by_templating gem( 'tree_sitter_language_pack', git: 'https://github.com/structuredmerge/tree-sitter-language-pack.git', - branch: 'fix/ruby-4-installs', + branch: 'fix/ruby-parser-api-methods', glob: 'packages/ruby/*.gemspec' ) else diff --git a/gems/tree_haver/Gemfile.lock b/gems/tree_haver/Gemfile.lock index 313641ac1..239d235f4 100644 --- a/gems/tree_haver/Gemfile.lock +++ b/gems/tree_haver/Gemfile.lock @@ -1,3 +1,13 @@ +GIT + remote: https://github.com/structuredmerge/tree-sitter-language-pack.git + revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a + branch: fix/ruby-parser-api-methods + glob: packages/ruby/*.gemspec + specs: + tree_sitter_language_pack (1.12.5) + rb_sys (>= 0.9, < 0.9.128) + sorbet-runtime (~> 0.5) + PATH remote: . specs: @@ -240,6 +250,9 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) + rake-compiler-dock (1.12.0) + rb_sys (0.9.127) + rake-compiler-dock (= 1.12.0) rbs (4.0.3) logger prism (>= 1.6.0) @@ -414,12 +427,6 @@ GEM toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.9.0.pre.rc.40-aarch64-linux) - sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.9.0.pre.rc.40-arm64-darwin) - sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) - sorbet-runtime (~> 0.5) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -503,6 +510,7 @@ DEPENDENCIES toml (~> 0.3) toml-rb (~> 4.1) tree_haver! + tree_sitter_language_pack! yaml-converter (~> 0.1) yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) @@ -597,6 +605,8 @@ 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) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 + rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 @@ -656,9 +666,7 @@ CHECKSUMS toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) - tree_sitter_language_pack (1.9.0.pre.rc.40-aarch64-linux) sha256=c882f4039a1a84a8ed782ef5381a8556acdb53538055d0b9b30d0cd85a0f1b0a - tree_sitter_language_pack (1.9.0.pre.rc.40-arm64-darwin) sha256=b3dc68837a1a626afcbe1abb779cd987e9828a43c78e98cc70aa7e58957f3ef8 - tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) sha256=ad6743a373eeac954c1b659b17af3aff1c82918b3ce9c9dc572a7c70ff843cdd + tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 diff --git a/gems/typescript-merge/Gemfile b/gems/typescript-merge/Gemfile index 069beba9a..49fda9326 100644 --- a/gems/typescript-merge/Gemfile +++ b/gems/typescript-merge/Gemfile @@ -192,7 +192,7 @@ if direct_sibling_gems.any? && end end -# Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. +# Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? && !tslp_dev.to_s.empty? @@ -201,7 +201,7 @@ unless tslp_declared_by_templating gem( 'tree_sitter_language_pack', git: 'https://github.com/structuredmerge/tree-sitter-language-pack.git', - branch: 'fix/ruby-4-installs', + branch: 'fix/ruby-parser-api-methods', glob: 'packages/ruby/*.gemspec' ) else diff --git a/gems/typescript-merge/Gemfile.lock b/gems/typescript-merge/Gemfile.lock index 131273f67..ff5f1ee8d 100644 --- a/gems/typescript-merge/Gemfile.lock +++ b/gems/typescript-merge/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: dcc959b12d02d6e379abf1c8ac536a852d1b8416 - branch: fix/ruby-4-installs + revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a + branch: fix/ruby-parser-api-methods glob: packages/ruby/*.gemspec specs: tree_sitter_language_pack (1.12.5) diff --git a/gems/yaml-merge/Gemfile b/gems/yaml-merge/Gemfile index f8a7769c0..53a13240a 100644 --- a/gems/yaml-merge/Gemfile +++ b/gems/yaml-merge/Gemfile @@ -192,7 +192,7 @@ if direct_sibling_gems.any? && end end -# Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. +# Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? && !tslp_dev.to_s.empty? @@ -201,7 +201,7 @@ unless tslp_declared_by_templating gem( 'tree_sitter_language_pack', git: 'https://github.com/structuredmerge/tree-sitter-language-pack.git', - branch: 'fix/ruby-4-installs', + branch: 'fix/ruby-parser-api-methods', glob: 'packages/ruby/*.gemspec' ) else diff --git a/gems/yaml-merge/Gemfile.lock b/gems/yaml-merge/Gemfile.lock index 45a43c829..d351751df 100644 --- a/gems/yaml-merge/Gemfile.lock +++ b/gems/yaml-merge/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: dcc959b12d02d6e379abf1c8ac536a852d1b8416 - branch: fix/ruby-4-installs + revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a + branch: fix/ruby-parser-api-methods glob: packages/ruby/*.gemspec specs: tree_sitter_language_pack (1.12.5) diff --git a/gems/zip-merge/Gemfile b/gems/zip-merge/Gemfile index 22cc72327..5d2ad5b20 100644 --- a/gems/zip-merge/Gemfile +++ b/gems/zip-merge/Gemfile @@ -231,7 +231,7 @@ if direct_sibling_gems.any? && end end -# Use the StructuredMerge TLSP branch until upstream ships Ruby 4-compatible gem metadata. +# Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? && !tslp_dev.to_s.empty? @@ -240,7 +240,7 @@ unless tslp_declared_by_templating gem( 'tree_sitter_language_pack', git: 'https://github.com/structuredmerge/tree-sitter-language-pack.git', - branch: 'fix/ruby-4-installs', + branch: 'fix/ruby-parser-api-methods', glob: 'packages/ruby/*.gemspec' ) else diff --git a/gems/zip-merge/Gemfile.lock b/gems/zip-merge/Gemfile.lock index fc10f254d..92c583858 100644 --- a/gems/zip-merge/Gemfile.lock +++ b/gems/zip-merge/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: dcc959b12d02d6e379abf1c8ac536a852d1b8416 - branch: fix/ruby-4-installs + revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a + branch: fix/ruby-parser-api-methods glob: packages/ruby/*.gemspec specs: tree_sitter_language_pack (1.12.5) From 7f65dacf077f0b1f9086eb11f955edb615090204 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 21:46:14 -0600 Subject: [PATCH 086/347] Document TreeHaver backend selection --- README.md | 6 +++--- gems/tree_haver/README.md | 28 ++++++++++------------------ 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 7ef94c9fa..4908e519d 100644 --- a/README.md +++ b/README.md @@ -93,8 +93,8 @@ merge gems. | Gem | Provides | Runtime notes | | --- | --- | --- | | [`psych-merge`][ruby-psych-merge] | YAML provider | Uses Ruby's [Psych][psych] parser and emitter. | -| [`citrus-toml-merge`][ruby-citrus-toml-merge] | TOML provider | Uses a [Citrus][citrus] grammar and pure-Ruby parser path, commonly paired with [`toml-rb`][toml-rb] style TOML data handling. | -| [`parslet-toml-merge`][ruby-parslet-toml-merge] | TOML provider | Uses [Parslet][parslet] and pure-Ruby parser path, commonly paired with [`toml`][toml] style TOML data handling. | +| [`citrus-toml-merge`][ruby-citrus-toml-merge] | TOML provider | Registers a TreeHaver TOML backend backed by a [Citrus][citrus] grammar, commonly paired with [`toml-rb`][toml-rb] style TOML data handling. | +| [`parslet-toml-merge`][ruby-parslet-toml-merge] | TOML provider | Registers a TreeHaver TOML backend backed by [Parslet][parslet], commonly paired with [`toml`][toml] style TOML data handling. | | [`commonmarker-merge`][ruby-commonmarker-merge] | Markdown provider | Uses [CommonMarker][commonmarker] for CommonMark-oriented Markdown parsing. | | [`kramdown-merge`][ruby-kramdown-merge] | Markdown provider | Uses [Kramdown][kramdown] for Ruby-native Markdown parsing. | | [`markly-merge`][ruby-markly-merge] | Markdown provider | Uses [Markly][markly] for cmark-gfm-backed Markdown parsing and README templating support. | @@ -118,7 +118,7 @@ tags are capability names, not package preferences. | [Psych][psych] | `yaml-merge`, `psych-merge` | Ruby standard YAML parser/emitter path. | | [RBS][rbs] | `rbs-merge` | Ruby signature parser path. | | [CommonMarker][commonmarker], [Markly][markly], [Kramdown][kramdown] | `markdown-merge` providers | Markdown parser families with different CommonMark/GFM/Ruby-native tradeoffs. | -| [Citrus][citrus], [Parslet][parslet] | `toml-merge` providers | Pure-Ruby TOML parser families used as provider-specific backend paths. | +| [Citrus][citrus], [Parslet][parslet] | `toml-merge` providers | Pure-Ruby TOML parser families exposed as provider-specific TreeHaver backend paths. | | [Kaitai Struct][kaitai] | `binary-merge` | Schema-oriented binary parsing support for structured binary work. | #### Backend Platform Compatibility diff --git a/gems/tree_haver/README.md b/gems/tree_haver/README.md index aefbef341..05e7eb70a 100644 --- a/gems/tree_haver/README.md +++ b/gems/tree_haver/README.md @@ -70,7 +70,7 @@ tree = parser.parse(source_code) - **Commonmarker Backend**: Fast Markdown parser ([Commonmarker][commonmarker], comrak Rust) - **Markly Backend**: GitHub Flavored Markdown ([Markly][markly], cmark-gfm C) - **RBS Backend**: Official RBS parser integration registered by `rbs-merge` - - **Pure Ruby Fallback**: + - **Pure Ruby Provider Backends**: - **Citrus Backend**: Pure Ruby PEG parsing via [`citrus`][citrus] (no native dependencies) - **Parslet Backend**: Pure Ruby PEG parsing via [`parslet`][parslet] (no native dependencies) - **Binary Schema Support**: @@ -534,7 +534,7 @@ This is particularly useful for: - **Testing**: Test the same code with different backends - **Performance comparison**: Benchmark different backends -- **Fallback scenarios**: Try one backend, fall back to another +- **Backend-selection scenarios**: Exercise each registered backend explicitly - **Thread isolation**: Each thread can use a different backend safely ```ruby @@ -1005,7 +1005,7 @@ TreeHaver does not ship a `TreeSitter::*` compatibility namespace. Use the `Tree language = TreeHaver::Language.toml rescue TreeHaver::NotAvailable => e warn("TOML grammar not available: #{e.message}") - # Fallback to another backend or fail gracefully + # Select another registered TreeHaver backend explicitly, or fail gracefully end ``` @@ -1037,7 +1037,7 @@ tree = parser.parse("#!/bin/bash\necho hello") # With explicit library path parser = TreeHaver.parser_for(:toml, library_path: "/custom/path/libtree-sitter-toml.so") -# With explicit Citrus fallback configuration +# With explicit Citrus provider configuration parser = TreeHaver.parser_for( :toml, citrus_config: {gem_name: "toml-rb", grammar_const: "TomlRB::Document"}, @@ -1580,23 +1580,15 @@ TreeHaver.with_backend(:rust) do end ``` -#### Fallback Pattern +#### Explicit Backend Selection Pattern -Try one backend, fall back to another on failure: +Try registered TreeHaver backends explicitly when you want controlled provider +selection. Structured merge gems should fail closed when no registered TreeHaver +backend can parse the requested language. ```ruby -def parse_with_fallback(source) - TreeHaver.with_backend(:mri) do - TreeHaver::Parser.new.tap { |p| p.language = load_language }.parse(source) - end -rescue TreeHaver::NotAvailable - # Fall back to Citrus if MRI backend unavailable - TreeHaver.with_backend(:citrus) do - TreeHaver::Parser.new.tap { |p| p.language = load_language }.parse(source) - end -rescue TreeHaver::NotAvailable - # Fall back to Parslet if Citrus backend unavailable - TreeHaver.with_backend(:parslet) do +def parse_with_backend(source, backend_name) + TreeHaver.with_backend(backend_name) do TreeHaver::Parser.new.tap { |p| p.language = load_language }.parse(source) end end From 7f8c208012d830ca1a4ee056a7329ae82f030061 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 21:47:48 -0600 Subject: [PATCH 087/347] Ignore member test reports --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 1fedf56a6..47dfeb723 100644 --- a/.gitignore +++ b/.gitignore @@ -4,9 +4,10 @@ /.yardoc/ **/.yardoc/ **/_yardoc/ -/coverage/ +**/coverage/ /log/ /pkg/ +**/results/ /tmp/ /vendor/bundle/ .env.local From 6a2b9f7fe689d8f13e3390d927357f6c9837364f Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 21:51:55 -0600 Subject: [PATCH 088/347] Pin root bundle to TSLP parser branch --- Gemfile | 12 + Gemfile.lock | 22 +- gems/kettle-jem/Gemfile | 12 + gems/kettle-jem/Gemfile.lock | 137 ++--------- gems/toml-merge/Gemfile.lock | 352 +---------------------------- gems/typescript-merge/Gemfile.lock | 352 +---------------------------- 6 files changed, 83 insertions(+), 804 deletions(-) diff --git a/Gemfile b/Gemfile index aef99dcef..26178427d 100644 --- a/Gemfile +++ b/Gemfile @@ -2,6 +2,18 @@ kettle_rb_dev = ENV.fetch("KETTLE_RB_DEV", "false") source "https://rubygems.org" +tslp_dev = ENV.fetch("TSLP_DEV", nil) +if tslp_dev.to_s.empty? + gem( + "tree_sitter_language_pack", + git: "https://github.com/structuredmerge/tree-sitter-language-pack.git", + branch: "fix/ruby-parser-api-methods", + glob: "packages/ruby/*.gemspec", + ) +else + gem "tree_sitter_language_pack", path: tslp_dev +end + unless kettle_rb_dev.casecmp("false").zero? require "nomono/bundler" diff --git a/Gemfile.lock b/Gemfile.lock index e3a334e43..927b67726 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,13 @@ +GIT + remote: https://github.com/structuredmerge/tree-sitter-language-pack.git + revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a + branch: fix/ruby-parser-api-methods + glob: packages/ruby/*.gemspec + specs: + tree_sitter_language_pack (1.12.5) + rb_sys (>= 0.9, < 0.9.128) + sorbet-runtime (~> 0.5) + PATH remote: gems/ast-crispr-markdown-markly specs: @@ -339,6 +349,9 @@ GEM public_suffix (7.0.5) racc (1.8.1) rake (13.4.2) + rake-compiler-dock (1.12.0) + rb_sys (0.9.127) + rake-compiler-dock (= 1.12.0) rbs (4.0.3) logger prism (>= 1.6.0) @@ -394,8 +407,6 @@ GEM toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) - sorbet-runtime (~> 0.5) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -451,6 +462,7 @@ DEPENDENCIES toml-merge! toml-rb (~> 4.1) tree_haver! + tree_sitter_language_pack! turbo_tests2 (~> 3.1, >= 3.1.14) typescript-merge! yaml-merge! @@ -489,7 +501,7 @@ CHECKSUMS go-merge (7.1.0) io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc json-merge (7.1.0) - kettle-dev (2.3.7) + kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 kettle-family (1.0.0) sha256=4c1c158fede8c4e369b6e5576cb540ad38891011cfc7721aea0ade813b13e3c1 kettle-jem (7.1.0) @@ -513,6 +525,8 @@ CHECKSUMS public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 + rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 + rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 rbs-merge (7.1.0) reline (0.6.3) sha256=1198b04973565b36ec0f11542ab3f5cfeeec34823f4e54cebde90968092b1835 @@ -545,7 +559,7 @@ CHECKSUMS toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) - tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) sha256=ad6743a373eeac954c1b659b17af3aff1c82918b3ce9c9dc572a7c70ff843cdd + tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c typescript-merge (7.1.0) diff --git a/gems/kettle-jem/Gemfile b/gems/kettle-jem/Gemfile index a1579321e..c6930aabc 100644 --- a/gems/kettle-jem/Gemfile +++ b/gems/kettle-jem/Gemfile @@ -92,6 +92,18 @@ if direct_sibling_gems.any? && end end +tslp_dev = ENV.fetch("TSLP_DEV", nil) +if tslp_dev.to_s.empty? + gem( + "tree_sitter_language_pack", + git: "https://github.com/structuredmerge/tree-sitter-language-pack.git", + branch: "fix/ruby-parser-api-methods", + glob: "packages/ruby/*.gemspec", + ) +else + gem "tree_sitter_language_pack", path: tslp_dev +end + # Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? diff --git a/gems/kettle-jem/Gemfile.lock b/gems/kettle-jem/Gemfile.lock index e92a7c652..76ea60722 100644 --- a/gems/kettle-jem/Gemfile.lock +++ b/gems/kettle-jem/Gemfile.lock @@ -1,3 +1,13 @@ +GIT + remote: https://github.com/structuredmerge/tree-sitter-language-pack.git + revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a + branch: fix/ruby-parser-api-methods + glob: packages/ruby/*.gemspec + specs: + tree_sitter_language_pack (1.12.5) + rb_sys (>= 0.9, < 0.9.128) + sorbet-runtime (~> 0.5) + PATH remote: . specs: @@ -27,95 +37,6 @@ PATH tree_haver (= 7.1.0) yaml-merge (= 7.1.0) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: @@ -279,6 +200,10 @@ GEM rubocop (>= 1.0) version_gem (~> 1.1, >= 1.1.14) ast (2.4.3) + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -403,6 +328,9 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) + rake-compiler-dock (1.12.0) + rb_sys (0.9.127) + rake-compiler-dock (= 1.12.0) rbs (4.0.3) logger prism (>= 1.6.0) @@ -589,13 +517,9 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) - sorbet-runtime (~> 0.5) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -637,15 +561,11 @@ PLATFORMS DEPENDENCIES appraisal2 (~> 3.1, >= 3.1.4) appraisal2-rubocop (~> 1.0, >= 1.0.0) - 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! @@ -655,7 +575,6 @@ DEPENDENCIES erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) - go-merge! irb (~> 1.17) json-merge! kettle-drift (~> 1.0, >= 1.0.5) @@ -669,8 +588,6 @@ DEPENDENCIES markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! prism-merge! psych-merge! rake (~> 13.0) @@ -687,15 +604,13 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0, >= 3.0.6) ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (~> 1.54, >= 1.54.0) stone_checksums (~> 1.0, >= 1.0.6) stringio (>= 3.0) toml-merge! tree_haver! + tree_sitter_language_pack! turbo_tests2 (~> 3.1, >= 3.1.14) - typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.3) yaml-merge! @@ -705,7 +620,6 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.3) yard-yaml (~> 0.2, >= 0.2.3) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -717,13 +631,10 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 @@ -750,7 +661,6 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 @@ -780,8 +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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 @@ -792,6 +700,8 @@ 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) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 + rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 @@ -832,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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 @@ -840,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.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -855,14 +763,12 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) - tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) sha256=ad6743a373eeac954c1b659b17af3aff1c82918b3ce9c9dc572a7c70ff843cdd + tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -876,7 +782,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/toml-merge/Gemfile.lock b/gems/toml-merge/Gemfile.lock index 14783b41e..8f4b22116 100644 --- a/gems/toml-merge/Gemfile.lock +++ b/gems/toml-merge/Gemfile.lock @@ -16,264 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -285,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -293,12 +40,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -362,8 +103,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -392,7 +131,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -532,8 +270,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -586,11 +322,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -637,45 +373,22 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -684,54 +397,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -739,7 +430,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +442,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +469,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +480,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,12 +507,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -844,7 +518,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -858,19 +531,15 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -878,7 +547,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/typescript-merge/Gemfile.lock b/gems/typescript-merge/Gemfile.lock index ff5f1ee8d..421168b5d 100644 --- a/gems/typescript-merge/Gemfile.lock +++ b/gems/typescript-merge/Gemfile.lock @@ -16,264 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -285,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -293,12 +40,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -362,8 +103,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -392,7 +131,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -532,8 +270,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -586,11 +322,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -637,45 +373,22 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -684,54 +397,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -739,7 +430,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +442,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +469,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +480,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,12 +507,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -844,7 +518,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -858,9 +531,6 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f @@ -870,7 +540,6 @@ CHECKSUMS unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -878,7 +547,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 416d48ae62a3671406c45117c8b4938dd6a11d17 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 21:58:31 -0600 Subject: [PATCH 089/347] Implement TreeHaver JSON merge3 --- Gemfile.lock | 1 + gems/ast-merge-git/Gemfile | 2 + gems/ast-merge-git/Gemfile.lock | 326 +----------------- gems/ast-merge-git/ast-merge-git.gemspec | 1 + gems/ast-merge-git/lib/ast/merge/git.rb | 217 +++++++++++- .../spec/fixtures_integration_spec.rb | 33 +- gems/json-merge/lib/json/merge.rb | 73 ++++ 7 files changed, 327 insertions(+), 326 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 927b67726..9458c527a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -37,6 +37,7 @@ PATH specs: ast-merge-git (7.1.0) ast-merge (= 7.1.0) + json-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH diff --git a/gems/ast-merge-git/Gemfile b/gems/ast-merge-git/Gemfile index b77306704..ab5b2c978 100644 --- a/gems/ast-merge-git/Gemfile +++ b/gems/ast-merge-git/Gemfile @@ -25,6 +25,8 @@ gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ast-merge + json-merge + tree_haver ] direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') direct_sibling_local = diff --git a/gems/ast-merge-git/Gemfile.lock b/gems/ast-merge-git/Gemfile.lock index 2bf970f5f..9ce607cfb 100644 --- a/gems/ast-merge-git/Gemfile.lock +++ b/gems/ast-merge-git/Gemfile.lock @@ -13,228 +13,28 @@ PATH specs: ast-merge-git (7.1.0) ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) + json-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) 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.0) citrus (~> 3.0) @@ -242,38 +42,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -293,12 +61,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -362,8 +124,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -392,7 +152,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -532,8 +291,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -586,11 +343,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.1.14) parallel_tests (>= 3.3.0, < 6) @@ -637,45 +389,25 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -684,54 +416,33 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -739,7 +450,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +462,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +490,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +501,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,12 +528,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -844,7 +539,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -858,19 +552,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -878,7 +567,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ast-merge-git/ast-merge-git.gemspec b/gems/ast-merge-git/ast-merge-git.gemspec index 8a8945ca1..f0b4704eb 100644 --- a/gems/ast-merge-git/ast-merge-git.gemspec +++ b/gems/ast-merge-git/ast-merge-git.gemspec @@ -96,6 +96,7 @@ Gem::Specification.new do |spec| # Utilities spec.add_dependency 'ast-merge', "= #{spec.version}" + spec.add_dependency 'json-merge', "= #{spec.version}" spec.add_dependency('version_gem', '~> 1.1', '>= 1.1.9') # ruby >= 2.2.0 # NOTE: It is preferable to list development dependencies in the gemspec due to increased diff --git a/gems/ast-merge-git/lib/ast/merge/git.rb b/gems/ast-merge-git/lib/ast/merge/git.rb index f4a51bbfa..ff5e800f5 100644 --- a/gems/ast-merge-git/lib/ast/merge/git.rb +++ b/gems/ast-merge-git/lib/ast/merge/git.rb @@ -3,6 +3,8 @@ require 'version_gem' require 'ast/merge' +require 'json' +require 'json/merge' require_relative 'git/version' module Ast @@ -10,6 +12,7 @@ module Merge module Git PACKAGE_NAME = 'ast-merge-git' MERGE_CONFLICT_CATEGORY = 'merge_conflict' + MISSING = Object.new.freeze module_function @@ -32,17 +35,225 @@ def merge3(request) end def merge3_json(request) + parsed = parse_json_merge3_inputs(request) + return parsed unless parsed.is_a?(Hash) && parsed[:ok] + + merge = merge_json_values( + parsed.fetch(:base), + parsed.fetch(:ours), + parsed.fetch(:theirs), + path: '' + ) + + if merge.fetch(:conflicts).empty? + merged_source = "#{JSON.pretty_generate(merge.fetch(:value))}\n" + return response( + ok: true, + request: request, + merged_source: merged_source, + change_classifications: merge.fetch(:change_classifications), + reparse_after_render: reparse_json_source(merged_source), + formatting_preservation: { + line_diff_score: 1.0, + character_diff_score: 1.0 + } + ) + end + + render_conflicted_json(request, merge) + end + + def parse_json_merge3_inputs(request) + dialect = request[:dialect].to_s.empty? ? 'json' : request[:dialect].to_s + { + ok: true, + base: Json::Merge.json_value_for_source(request.fetch(:base_source), dialect: dialect), + ours: Json::Merge.json_value_for_source(request.fetch(:ours_source), dialect: dialect), + theirs: Json::Merge.json_value_for_source(request.fetch(:theirs_source), dialect: dialect) + } + rescue Json::Merge::ParseError => e + source_role = parse_error_role(request, dialect) response( ok: false, request: request, diagnostics: [{ severity: 'error', - category: 'unsupported_feature', - message: 'JSON merge3 must be rebuilt on top of Json::Merge and TreeHaver before ast-merge-git can use it.' + category: 'parse_error', + message: "#{source_role} parse error: #{e.message}" }] ) end + def parse_error_role(request, dialect) + %i[base ours theirs].find do |role| + Json::Merge.json_value_for_source(request.fetch(:"#{role}_source"), dialect: dialect) + false + rescue Json::Merge::ParseError + true + end || :unknown + end + + def merge_json_values(base, ours, theirs, path:) + if ours == theirs + return merge_success(ours) + elsif base == ours + return merge_success(theirs, change: classify_json_change(path, base, ours, theirs)) + elsif base == theirs + return merge_success(ours, change: classify_json_change(path, base, ours, theirs)) + end + + if base.is_a?(Hash) && ours.is_a?(Hash) && theirs.is_a?(Hash) + return merge_json_objects(base, ours, theirs, path: path) + end + + conflict = json_conflict(path, base, ours, theirs) + { + value: ours.equal?(MISSING) ? theirs : ours, + conflicts: [conflict], + change_classifications: [conflict.fetch(:change_classification)] + } + end + + def merge_json_objects(base, ours, theirs, path:) + merged = {} + conflicts = [] + change_classifications = [] + ordered_keys(base, ours, theirs).each do |key| + child_path = "#{path}/#{key}" + child = merge_json_values( + base.fetch(key, MISSING), + ours.fetch(key, MISSING), + theirs.fetch(key, MISSING), + path: child_path + ) + merged[key] = child.fetch(:value) unless child.fetch(:value).equal?(MISSING) + conflicts.concat(child.fetch(:conflicts)) + change_classifications.concat(child.fetch(:change_classifications)) + end + + { + value: merged, + conflicts: conflicts, + change_classifications: change_classifications + } + end + + def ordered_keys(*objects) + objects.each_with_object([]) do |object, keys| + next unless object.is_a?(Hash) + + object.each_key { |key| keys << key unless keys.include?(key) } + end + end + + def merge_success(value, change: nil) + { + value: value, + conflicts: [], + change_classifications: change ? [change] : [] + } + end + + def classify_json_change(path, base, ours, theirs) + { + path: path, + ours: json_change_state(base, ours), + theirs: json_change_state(base, theirs) + } + end + + def json_change_state(base, value) + return 'unchanged' if base == value + return 'added' if base.equal?(MISSING) + return 'deleted' if value.equal?(MISSING) + + 'edited' + end + + def json_conflict(path, base, ours, theirs) + category = + if ours.equal?(MISSING) || theirs.equal?(MISSING) + 'delete_edit' + else + 'edit_edit' + end + { + conflict_id: "json-conflict-#{path.delete_prefix('/').tr('/', '-')}", + category: category, + path: path, + message: "JSON value changed incompatibly at #{path}", + base: base, + ours: ours, + theirs: theirs, + change_classification: classify_json_change(path, base, ours, theirs) + } + end + + def render_conflicted_json(request, merge) + conflicts = merge.fetch(:conflicts) + full_file = conflicts.any? { |conflict| conflict.fetch(:category) == 'delete_edit' } + conflicted_source = if full_file + render_conflict_source(request, conflicts) + else + render_owned_json_conflict_source(request, conflicts.first) + end + response( + ok: false, + request: request, + conflicted_source: conflicted_source, + conflicts: conflicts.map { |conflict| conflict.slice(:conflict_id, :category, :path, :message) }, + change_classifications: merge.fetch(:change_classifications), + diagnostics: [{ + severity: 'error', + category: MERGE_CONFLICT_CATEGORY, + message: "#{conflicts.length} unresolved JSON merge conflict(s)." + }], + owned_regions: full_file ? [] : [owned_json_region(conflicts.first)], + reparse_after_render: nil, + render_strategy: full_file ? 'full_file_conflict_markers' : 'owned_region_conflict_markers' + ) + end + + def render_owned_json_conflict_source(request, conflict) + marker_size = request[:conflict_marker_size].to_i + marker_size = 7 unless marker_size.positive? + key = conflict.fetch(:path).split('/').last + [ + '{', + "#{'<' * marker_size} ours", + "#{JSON.generate(key)}:#{JSON.generate(conflict.fetch(:ours))}", + "#{'|' * marker_size} base", + "#{JSON.generate(key)}:#{JSON.generate(conflict.fetch(:base))}", + '=' * marker_size, + "#{JSON.generate(key)}:#{JSON.generate(conflict.fetch(:theirs))}", + "#{'>' * marker_size} theirs", + '}', + '' + ].join("\n") + end + + def owned_json_region(conflict) + { + owner_path: conflict.fetch(:path), + node_id: "json:key:#{conflict.fetch(:path).split('/').last}", + region_kind: 'node', + line_range: { start: 1, end: 1 }, + attached_spans: [], + backend_id: 'tree-haver', + parser_identity: 'tree_sitter_language_pack', + can_replace: true, + can_line_merge: false, + requires_reparse: true + } + end + + def reparse_json_source(source) + Json::Merge.json_value_for_source(source) + true + rescue Json::Merge::ParseError + false + end + def normalize_request(request) request.transform_keys(&:to_sym) end @@ -160,7 +371,7 @@ def secondary_formatting_metrics_for(merged) def render_identity(request) case normalize_language(request) when 'json' - { backend_id: 'tree-haver-required', parser_identity: 'json-merge-unavailable' } + { backend_id: 'tree-haver', parser_identity: 'tree_sitter_language_pack' } else {} end diff --git a/gems/ast-merge-git/spec/fixtures_integration_spec.rb b/gems/ast-merge-git/spec/fixtures_integration_spec.rb index 7d25a9c99..8255fb702 100644 --- a/gems/ast-merge-git/spec/fixtures_integration_spec.rb +++ b/gems/ast-merge-git/spec/fixtures_integration_spec.rb @@ -11,17 +11,42 @@ def read_json(path) Ast::Merge.normalize_value(JSON.parse(path.read)) end - it 'fails closed for the git merge3 contract fixture until JSON merge3 is TreeHaver-backed' do + it 'conforms to the git merge3 contract fixture' do fixture = read_json(fixtures_root.join('diagnostics', 'slice-950-git-merge3-contract', 'git-merge3-contract.json')) expect(fixture.dig(:contract, :package)).to eq('ast-merge-git') expect(fixture.dig(:contract, :operation)).to eq('merge3') fixture.fetch(:cases).each do |test_case| result = described_class.merge3(test_case.fetch(:request)) + expected = test_case.fetch(:expected) - expect(result.fetch(:ok)).to be(false), test_case.fetch(:case_id) - expect(result.fetch(:diagnostics).first.fetch(:category)).to eq('unsupported_feature') - expect(result.fetch(:diagnostics).first.fetch(:message)).to include('Json::Merge and TreeHaver') + expect(result.fetch(:ok)).to eq(expected.fetch(:ok)), test_case.fetch(:case_id) + expect(result.fetch(:conflicts).length).to eq(expected.fetch(:conflict_count)), test_case.fetch(:case_id) + expect(result.fetch(:diagnostics).map { |diagnostic| diagnostic.fetch(:category) }).to eq( + expected.fetch(:diagnostic_categories) + ), test_case.fetch(:case_id) + expect(result.fetch(:change_classifications)).to eq(expected.fetch(:change_classifications)), + test_case.fetch(:case_id) + expect(result.fetch(:reparse_after_render)).to eq(expected.fetch(:reparse_after_render)), + test_case.fetch(:case_id) + expect(result.fetch(:render_report).fetch(:strategy)).to eq(expected.dig(:render_report, :strategy)), + test_case.fetch(:case_id) + if expected[:merged_json] + expect(JSON.parse(result.fetch(:merged_source), symbolize_names: true)).to eq(expected.fetch(:merged_json)), + test_case.fetch(:case_id) + end + expected.fetch(:conflict_categories, []).each_with_index do |category, index| + expect(result.dig(:conflicts, index, :category)).to eq(category), test_case.fetch(:case_id) + end + expected.fetch(:conflict_paths, []).each_with_index do |path, index| + expect(result.dig(:conflicts, index, :path)).to eq(path), test_case.fetch(:case_id) + end + expected.fetch(:conflicted_source_contains, []).each do |needle| + expect(result.fetch(:conflicted_source)).to include(needle), test_case.fetch(:case_id) + end + expected.fetch(:conflicted_source_not_contains, []).each do |needle| + expect(result.fetch(:conflicted_source)).not_to include(needle), test_case.fetch(:case_id) + end end end diff --git a/gems/json-merge/lib/json/merge.rb b/gems/json-merge/lib/json/merge.rb index 1f55d3f9b..53eaab5b9 100644 --- a/gems/json-merge/lib/json/merge.rb +++ b/gems/json-merge/lib/json/merge.rb @@ -126,6 +126,79 @@ def merge_json_sources(template_source, destination_source) end private_class_method :merge_json_sources + def json_value_for_source(source, dialect: 'json') + normalized_source = dialect.to_s == 'jsonc' ? strip_json_comments(source) : source + if detect_trailing_comma(normalized_source) + raise ParseError, "Trailing commas are not supported for #{dialect}." + end + + register_backend! + analysis = FileAnalysis.new(normalized_source) + unless analysis.valid? + message = analysis.errors.map { |error| error.respond_to?(:message) ? error.message : error.inspect }.join(', ') + raise ParseError, message + end + + json_value_for_node(analysis.root_node) + end + + def json_value_for_node(node) + case node.type.to_s + when 'document' + child = node.semantic_children.first + child ? json_value_for_node(NodeWrapper.new(child, lines: node.lines, source: node.source)) : nil + when 'object' + node.pairs.each_with_object({}) do |pair, object| + key = pair.key_name + next unless key + + object[key] = json_value_for_node(pair.value_node) + end + when 'array' + node.elements.map { |element| json_value_for_node(element) } + when 'string' + decode_json_string_literal(node.text) + when 'number' + parse_json_number(node.text) + when 'true' + true + when 'false' + false + when 'null' + nil + else + nil + end + end + + def decode_json_string_literal(text) + literal = text.to_s + literal = literal[1...-1] if literal.start_with?('"') && literal.end_with?('"') + literal.gsub(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/) do |escape| + case escape + when '\\"' then '"' + when '\\\\' then '\\' + when '\\/' then '/' + when '\\b' then "\b" + when '\\f' then "\f" + when '\\n' then "\n" + when '\\r' then "\r" + when '\\t' then "\t" + else + [escape[2..].to_i(16)].pack('U') + end + end + end + private_class_method :decode_json_string_literal + + def parse_json_number(text) + number = text.to_s + return number.to_f if number.match?(/[.eE]/) + + number.to_i + end + private_class_method :parse_json_number + def parse_failure(message) { ok: false, From f7064a034dde68015cc7381e6e23a16498b7ff38 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:09:05 -0600 Subject: [PATCH 090/347] Standardize structuredmerge dev env --- .github/workflows/current.yml | 2 - .kettle-family.yml | 2 +- gems/ast-crispr-markdown-markly/Gemfile | 2 +- gems/ast-crispr-markdown-markly/Gemfile.lock | 33 ++-- .../gemfiles/modular/templating.gemfile | 8 +- .../gemfiles/modular/templating_local.gemfile | 16 +- gems/ast-crispr-ruby-prism/Gemfile | 2 +- gems/ast-crispr-ruby-prism/Gemfile.lock | 17 +- .../gemfiles/modular/templating.gemfile | 8 +- .../gemfiles/modular/templating_local.gemfile | 16 +- gems/ast-crispr/Gemfile | 2 +- gems/ast-crispr/Gemfile.lock | 19 ++- .../gemfiles/modular/templating.gemfile | 8 +- .../gemfiles/modular/templating_local.gemfile | 16 +- gems/ast-merge-git/Gemfile | 2 +- .../gemfiles/modular/templating.gemfile | 8 +- .../gemfiles/modular/templating_local.gemfile | 16 +- gems/ast-merge/Gemfile | 2 +- gems/ast-merge/Gemfile.lock | 19 ++- .../gemfiles/modular/templating.gemfile | 8 +- .../gemfiles/modular/templating_local.gemfile | 16 +- gems/ast-template/Gemfile | 2 +- gems/ast-template/Gemfile.lock | 19 ++- .../gemfiles/modular/templating.gemfile | 8 +- .../gemfiles/modular/templating_local.gemfile | 16 +- gems/bash-merge/Gemfile | 2 +- gems/bash-merge/Gemfile.lock | 37 +++-- .../gemfiles/modular/templating.gemfile | 8 +- .../gemfiles/modular/templating_local.gemfile | 16 +- gems/binary-merge/Gemfile | 2 +- gems/binary-merge/Gemfile.lock | 19 ++- .../gemfiles/modular/templating.gemfile | 8 +- .../gemfiles/modular/templating_local.gemfile | 16 +- gems/citrus-toml-merge/Gemfile | 2 +- gems/citrus-toml-merge/Gemfile.lock | 17 +- .../gemfiles/modular/templating.gemfile | 8 +- .../gemfiles/modular/templating_local.gemfile | 16 +- gems/commonmarker-merge/Gemfile | 2 +- gems/commonmarker-merge/Gemfile.lock | 17 +- .../gemfiles/modular/templating.gemfile | 8 +- .../gemfiles/modular/templating_local.gemfile | 16 +- gems/dotenv-merge/Gemfile | 2 +- gems/dotenv-merge/Gemfile.lock | 37 +++-- .../gemfiles/modular/templating.gemfile | 8 +- .../gemfiles/modular/templating_local.gemfile | 16 +- gems/go-merge/Gemfile | 2 +- gems/go-merge/Gemfile.lock | 37 +++-- .../gemfiles/modular/templating.gemfile | 8 +- .../gemfiles/modular/templating_local.gemfile | 16 +- gems/json-merge/Gemfile | 2 +- gems/json-merge/Gemfile.lock | 37 +++-- .../gemfiles/modular/templating.gemfile | 8 +- .../gemfiles/modular/templating_local.gemfile | 16 +- gems/kettle-jem/CHANGELOG.md | 4 +- gems/kettle-jem/Gemfile | 2 +- .../gemfiles/modular/templating.gemfile | 8 +- .../gemfiles/modular/templating_local.gemfile | 16 +- .../lib/kettle/jem/tasks/install_task.rb | 6 +- .../lib/kettle/jem/templates/Gemfile.example | 2 +- .../modular/templating.gemfile.example | 8 +- .../modular/templating_local.gemfile.example | 16 +- .../kettle/jem/templates/shim/Gemfile.example | 2 +- gems/kettle-jem/spec/thin_slice_spec.rb | 14 +- gems/kramdown-merge/Gemfile | 2 +- gems/kramdown-merge/Gemfile.lock | 17 +- .../gemfiles/modular/templating.gemfile | 8 +- .../gemfiles/modular/templating_local.gemfile | 16 +- gems/markdown-merge/Gemfile | 2 +- gems/markdown-merge/Gemfile.lock | 37 +++-- .../gemfiles/modular/templating.gemfile | 8 +- .../gemfiles/modular/templating_local.gemfile | 16 +- gems/markly-merge/Gemfile | 2 +- gems/markly-merge/Gemfile.lock | 17 +- .../gemfiles/modular/templating.gemfile | 8 +- .../gemfiles/modular/templating_local.gemfile | 16 +- gems/parslet-toml-merge/Gemfile | 2 +- gems/parslet-toml-merge/Gemfile.lock | 17 +- .../gemfiles/modular/templating.gemfile | 8 +- .../gemfiles/modular/templating_local.gemfile | 16 +- gems/plain-merge/Gemfile | 2 +- gems/plain-merge/Gemfile.lock | 37 +++-- .../gemfiles/modular/templating.gemfile | 8 +- .../gemfiles/modular/templating_local.gemfile | 16 +- gems/prism-merge/Gemfile | 2 +- gems/prism-merge/Gemfile.lock | 17 +- .../gemfiles/modular/templating.gemfile | 8 +- .../gemfiles/modular/templating_local.gemfile | 16 +- gems/psych-merge/Gemfile | 2 +- gems/psych-merge/Gemfile.lock | 45 ++--- .../gemfiles/modular/templating.gemfile | 8 +- .../gemfiles/modular/templating_local.gemfile | 16 +- gems/rbs-merge/Gemfile | 2 +- gems/rbs-merge/Gemfile.lock | 37 +++-- .../gemfiles/modular/templating.gemfile | 8 +- .../gemfiles/modular/templating_local.gemfile | 16 +- gems/ruby-merge/Gemfile | 2 +- gems/ruby-merge/Gemfile.lock | 37 +++-- .../gemfiles/modular/templating.gemfile | 8 +- .../gemfiles/modular/templating_local.gemfile | 16 +- gems/rust-merge/Gemfile | 2 +- gems/rust-merge/Gemfile.lock | 37 +++-- .../gemfiles/modular/templating.gemfile | 8 +- .../gemfiles/modular/templating_local.gemfile | 16 +- gems/smorg-rb/Gemfile | 2 +- gems/smorg-rb/Gemfile.lock | 155 +++++++++--------- .../gemfiles/modular/templating.gemfile | 8 +- .../gemfiles/modular/templating_local.gemfile | 16 +- gems/toml-merge/Gemfile | 2 +- .../gemfiles/modular/templating.gemfile | 8 +- .../gemfiles/modular/templating_local.gemfile | 16 +- .../gemfiles/modular/templating.gemfile | 8 +- .../gemfiles/modular/templating_local.gemfile | 16 +- gems/typescript-merge/Gemfile | 2 +- .../gemfiles/modular/templating.gemfile | 8 +- .../gemfiles/modular/templating_local.gemfile | 16 +- gems/yaml-merge/Gemfile | 2 +- gems/yaml-merge/Gemfile.lock | 37 +++-- .../gemfiles/modular/templating.gemfile | 8 +- .../gemfiles/modular/templating_local.gemfile | 16 +- gems/zip-merge/Gemfile | 2 +- gems/zip-merge/Gemfile.lock | 19 ++- .../gemfiles/modular/templating.gemfile | 8 +- .../gemfiles/modular/templating_local.gemfile | 16 +- 123 files changed, 837 insertions(+), 814 deletions(-) diff --git a/.github/workflows/current.yml b/.github/workflows/current.yml index 1d2ae8bda..64a664264 100644 --- a/.github/workflows/current.yml +++ b/.github/workflows/current.yml @@ -112,7 +112,6 @@ jobs: working-directory: ${{ matrix.gem }} env: K_JEM_TEMPLATING: true - SMORG_RB_DEV: ${{ github.workspace }}/gems STRUCTUREDMERGE_DEV: ${{ github.workspace }}/gems run: | gem install nomono -v 1.0.8 --source https://gem.coop --source https://rubygems.org @@ -124,7 +123,6 @@ jobs: env: K_JEM_TEMPLATING: true K_SOUP_COV_DO: false - SMORG_RB_DEV: ${{ github.workspace }}/gems STRUCTUREDMERGE_DEV: ${{ github.workspace }}/gems run: timeout 12m bundle exec kettle-test diff --git a/.kettle-family.yml b/.kettle-family.yml index caac1f1d3..398693343 100644 --- a/.kettle-family.yml +++ b/.kettle-family.yml @@ -115,7 +115,7 @@ release: env: GALTZO_FLOSS_DEV: false KETTLE_RB_DEV: false - SMORG_RB_DEV: false + STRUCTUREDMERGE_DEV: false TSLP_DEV: "" family_changelog: enabled: true diff --git a/gems/ast-crispr-markdown-markly/Gemfile b/gems/ast-crispr-markdown-markly/Gemfile index 50ca1aa20..3e2e6fc33 100644 --- a/gems/ast-crispr-markdown-markly/Gemfile +++ b/gems/ast-crispr-markdown-markly/Gemfile @@ -209,7 +209,7 @@ unless tslp_declared_by_templating end end -# Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) +# Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging diff --git a/gems/ast-crispr-markdown-markly/Gemfile.lock b/gems/ast-crispr-markdown-markly/Gemfile.lock index 352638c28..231d2ef5d 100644 --- a/gems/ast-crispr-markdown-markly/Gemfile.lock +++ b/gems/ast-crispr-markdown-markly/Gemfile.lock @@ -24,11 +24,20 @@ PATH prism (>= 1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: ast-merge-git (7.1.0) ast-merge (= 7.1.0) + json-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH @@ -147,6 +156,14 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge specs: @@ -258,22 +275,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: diff --git a/gems/ast-crispr-markdown-markly/gemfiles/modular/templating.gemfile b/gems/ast-crispr-markdown-markly/gemfiles/modular/templating.gemfile index 0d1c9bcf4..e3c24e6b7 100644 --- a/gems/ast-crispr-markdown-markly/gemfiles/modular/templating.gemfile +++ b/gems/ast-crispr-markdown-markly/gemfiles/modular/templating.gemfile @@ -1,9 +1,9 @@ # frozen_string_literal: true -smorg_remote = ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false').zero? +structuredmerge_remote = ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false').zero? kettle_remote = ENV.fetch('KETTLE_RB_DEV', 'false').casecmp('false').zero? -if smorg_remote +if structuredmerge_remote # Merge recipes and parser dependencies for released installs. gem 'kettle-jem', '>= 7.0' end @@ -13,10 +13,10 @@ if kettle_remote gem 'kettle-drift', '~> 1.0', '>= 1.0.5', require: false end -# Set SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. +# Set STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. # When false (default / CI), released kettle-jem brings merge gems and parser dependencies. # Local path overrides bring the same dependencies from sibling gemspecs. # # Set KETTLE_RB_DEV=/path/to/kettle-rb for local development with Kettle plugin gems. # When false (default / CI), released Kettle plugin gems are used. -eval_gemfile 'templating_local.gemfile' unless smorg_remote && kettle_remote +eval_gemfile 'templating_local.gemfile' unless structuredmerge_remote && 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 488be70f3..d2e0871f3 100644 --- a/gems/ast-crispr-markdown-markly/gemfiles/modular/templating_local.gemfile +++ b/gems/ast-crispr-markdown-markly/gemfiles/modular/templating_local.gemfile @@ -1,12 +1,12 @@ # frozen_string_literal: true # Local path overrides for templating development. -# Loaded by the associated non-local gemfile when SMORG_RB_DEV or KETTLE_RB_DEV +# Loaded by the associated non-local gemfile when STRUCTUREDMERGE_DEV or KETTLE_RB_DEV # is not "false". require 'nomono/bundler' unless defined?(Nomono) -smorg_rb_local_gems = %w[ +structuredmerge_local_gems = %w[ tree_haver ast-merge ast-merge-git @@ -43,7 +43,7 @@ kettle_rb_local_gems = %w[ kettle-dev kettle-test kettle-soup-cover kettle-drift ] declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -smorg_rb_local_gems_to_eval = smorg_rb_local_gems - %w[ast-crispr-markdown-markly] - declared_gems +structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[ast-crispr-markdown-markly] - declared_gems kettle_rb_local_gems_to_eval = kettle_rb_local_gems - %w[ast-crispr-markdown-markly] - declared_gems tslp_dev = ENV.fetch('TSLP_DEV', nil) @@ -52,14 +52,14 @@ tslp_dev = ENV.fetch('TSLP_DEV', nil) platform :mri do gem 'tree_sitter_language_pack', path: tslp_dev unless tslp_dev.to_s.empty? - if ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false') != 0 + if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( - gems: smorg_rb_local_gems_to_eval, - prefix: 'SMORG_RB', - path_env: 'SMORG_RB_DEV', + gems: structuredmerge_local_gems_to_eval, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', vendored_gems_env: 'VENDORED_GEMS', vendor_gem_dir_env: 'VENDOR_GEM_DIR', - debug_env: 'SMORG_RB_DEBUG' + debug_env: 'STRUCTUREDMERGE_DEBUG' ) end diff --git a/gems/ast-crispr-ruby-prism/Gemfile b/gems/ast-crispr-ruby-prism/Gemfile index 7266f0e60..f274cef52 100644 --- a/gems/ast-crispr-ruby-prism/Gemfile +++ b/gems/ast-crispr-ruby-prism/Gemfile @@ -208,7 +208,7 @@ unless tslp_declared_by_templating end end -# Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) +# Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging diff --git a/gems/ast-crispr-ruby-prism/Gemfile.lock b/gems/ast-crispr-ruby-prism/Gemfile.lock index bf08865f1..27cd03edf 100644 --- a/gems/ast-crispr-ruby-prism/Gemfile.lock +++ b/gems/ast-crispr-ruby-prism/Gemfile.lock @@ -24,11 +24,20 @@ PATH markly-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: ast-merge-git (7.1.0) ast-merge (= 7.1.0) + json-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH @@ -266,14 +275,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: diff --git a/gems/ast-crispr-ruby-prism/gemfiles/modular/templating.gemfile b/gems/ast-crispr-ruby-prism/gemfiles/modular/templating.gemfile index 0d1c9bcf4..e3c24e6b7 100644 --- a/gems/ast-crispr-ruby-prism/gemfiles/modular/templating.gemfile +++ b/gems/ast-crispr-ruby-prism/gemfiles/modular/templating.gemfile @@ -1,9 +1,9 @@ # frozen_string_literal: true -smorg_remote = ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false').zero? +structuredmerge_remote = ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false').zero? kettle_remote = ENV.fetch('KETTLE_RB_DEV', 'false').casecmp('false').zero? -if smorg_remote +if structuredmerge_remote # Merge recipes and parser dependencies for released installs. gem 'kettle-jem', '>= 7.0' end @@ -13,10 +13,10 @@ if kettle_remote gem 'kettle-drift', '~> 1.0', '>= 1.0.5', require: false end -# Set SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. +# Set STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. # When false (default / CI), released kettle-jem brings merge gems and parser dependencies. # Local path overrides bring the same dependencies from sibling gemspecs. # # Set KETTLE_RB_DEV=/path/to/kettle-rb for local development with Kettle plugin gems. # When false (default / CI), released Kettle plugin gems are used. -eval_gemfile 'templating_local.gemfile' unless smorg_remote && kettle_remote +eval_gemfile 'templating_local.gemfile' unless structuredmerge_remote && 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 a7c0be566..b5268538e 100644 --- a/gems/ast-crispr-ruby-prism/gemfiles/modular/templating_local.gemfile +++ b/gems/ast-crispr-ruby-prism/gemfiles/modular/templating_local.gemfile @@ -1,12 +1,12 @@ # frozen_string_literal: true # Local path overrides for templating development. -# Loaded by the associated non-local gemfile when SMORG_RB_DEV or KETTLE_RB_DEV +# Loaded by the associated non-local gemfile when STRUCTUREDMERGE_DEV or KETTLE_RB_DEV # is not "false". require 'nomono/bundler' unless defined?(Nomono) -smorg_rb_local_gems = %w[ +structuredmerge_local_gems = %w[ tree_haver ast-merge ast-merge-git @@ -43,7 +43,7 @@ kettle_rb_local_gems = %w[ kettle-dev kettle-test kettle-soup-cover kettle-drift ] declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -smorg_rb_local_gems_to_eval = smorg_rb_local_gems - %w[ast-crispr-ruby-prism] - declared_gems +structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[ast-crispr-ruby-prism] - declared_gems kettle_rb_local_gems_to_eval = kettle_rb_local_gems - %w[ast-crispr-ruby-prism] - declared_gems tslp_dev = ENV.fetch('TSLP_DEV', nil) @@ -52,14 +52,14 @@ tslp_dev = ENV.fetch('TSLP_DEV', nil) platform :mri do gem 'tree_sitter_language_pack', path: tslp_dev unless tslp_dev.to_s.empty? - if ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false') != 0 + if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( - gems: smorg_rb_local_gems_to_eval, - prefix: 'SMORG_RB', - path_env: 'SMORG_RB_DEV', + gems: structuredmerge_local_gems_to_eval, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', vendored_gems_env: 'VENDORED_GEMS', vendor_gem_dir_env: 'VENDOR_GEM_DIR', - debug_env: 'SMORG_RB_DEBUG' + debug_env: 'STRUCTUREDMERGE_DEBUG' ) end diff --git a/gems/ast-crispr/Gemfile b/gems/ast-crispr/Gemfile index a866cad85..edb0e46ba 100644 --- a/gems/ast-crispr/Gemfile +++ b/gems/ast-crispr/Gemfile @@ -208,7 +208,7 @@ unless tslp_declared_by_templating end end -# Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) +# Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging diff --git a/gems/ast-crispr/Gemfile.lock b/gems/ast-crispr/Gemfile.lock index b07fc418a..61d51818b 100644 --- a/gems/ast-crispr/Gemfile.lock +++ b/gems/ast-crispr/Gemfile.lock @@ -37,6 +37,16 @@ PATH specs: ast-merge-git (7.1.0) ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH @@ -265,15 +275,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: diff --git a/gems/ast-crispr/gemfiles/modular/templating.gemfile b/gems/ast-crispr/gemfiles/modular/templating.gemfile index 0d1c9bcf4..e3c24e6b7 100644 --- a/gems/ast-crispr/gemfiles/modular/templating.gemfile +++ b/gems/ast-crispr/gemfiles/modular/templating.gemfile @@ -1,9 +1,9 @@ # frozen_string_literal: true -smorg_remote = ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false').zero? +structuredmerge_remote = ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false').zero? kettle_remote = ENV.fetch('KETTLE_RB_DEV', 'false').casecmp('false').zero? -if smorg_remote +if structuredmerge_remote # Merge recipes and parser dependencies for released installs. gem 'kettle-jem', '>= 7.0' end @@ -13,10 +13,10 @@ if kettle_remote gem 'kettle-drift', '~> 1.0', '>= 1.0.5', require: false end -# Set SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. +# Set STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. # When false (default / CI), released kettle-jem brings merge gems and parser dependencies. # Local path overrides bring the same dependencies from sibling gemspecs. # # Set KETTLE_RB_DEV=/path/to/kettle-rb for local development with Kettle plugin gems. # When false (default / CI), released Kettle plugin gems are used. -eval_gemfile 'templating_local.gemfile' unless smorg_remote && kettle_remote +eval_gemfile 'templating_local.gemfile' unless structuredmerge_remote && kettle_remote diff --git a/gems/ast-crispr/gemfiles/modular/templating_local.gemfile b/gems/ast-crispr/gemfiles/modular/templating_local.gemfile index a39610b04..33f003f01 100644 --- a/gems/ast-crispr/gemfiles/modular/templating_local.gemfile +++ b/gems/ast-crispr/gemfiles/modular/templating_local.gemfile @@ -1,12 +1,12 @@ # frozen_string_literal: true # Local path overrides for templating development. -# Loaded by the associated non-local gemfile when SMORG_RB_DEV or KETTLE_RB_DEV +# Loaded by the associated non-local gemfile when STRUCTUREDMERGE_DEV or KETTLE_RB_DEV # is not "false". require 'nomono/bundler' unless defined?(Nomono) -smorg_rb_local_gems = %w[ +structuredmerge_local_gems = %w[ tree_haver ast-merge ast-merge-git @@ -43,7 +43,7 @@ kettle_rb_local_gems = %w[ kettle-dev kettle-test kettle-soup-cover kettle-drift ] declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -smorg_rb_local_gems_to_eval = smorg_rb_local_gems - %w[ast-crispr] - declared_gems +structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[ast-crispr] - declared_gems kettle_rb_local_gems_to_eval = kettle_rb_local_gems - %w[ast-crispr] - declared_gems tslp_dev = ENV.fetch('TSLP_DEV', nil) @@ -52,14 +52,14 @@ tslp_dev = ENV.fetch('TSLP_DEV', nil) platform :mri do gem 'tree_sitter_language_pack', path: tslp_dev unless tslp_dev.to_s.empty? - if ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false') != 0 + if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( - gems: smorg_rb_local_gems_to_eval, - prefix: 'SMORG_RB', - path_env: 'SMORG_RB_DEV', + gems: structuredmerge_local_gems_to_eval, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', vendored_gems_env: 'VENDORED_GEMS', vendor_gem_dir_env: 'VENDOR_GEM_DIR', - debug_env: 'SMORG_RB_DEBUG' + debug_env: 'STRUCTUREDMERGE_DEBUG' ) end diff --git a/gems/ast-merge-git/Gemfile b/gems/ast-merge-git/Gemfile index ab5b2c978..dcce682dc 100644 --- a/gems/ast-merge-git/Gemfile +++ b/gems/ast-merge-git/Gemfile @@ -210,7 +210,7 @@ unless tslp_declared_by_templating end end -# Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) +# Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging diff --git a/gems/ast-merge-git/gemfiles/modular/templating.gemfile b/gems/ast-merge-git/gemfiles/modular/templating.gemfile index 0d1c9bcf4..e3c24e6b7 100644 --- a/gems/ast-merge-git/gemfiles/modular/templating.gemfile +++ b/gems/ast-merge-git/gemfiles/modular/templating.gemfile @@ -1,9 +1,9 @@ # frozen_string_literal: true -smorg_remote = ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false').zero? +structuredmerge_remote = ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false').zero? kettle_remote = ENV.fetch('KETTLE_RB_DEV', 'false').casecmp('false').zero? -if smorg_remote +if structuredmerge_remote # Merge recipes and parser dependencies for released installs. gem 'kettle-jem', '>= 7.0' end @@ -13,10 +13,10 @@ if kettle_remote gem 'kettle-drift', '~> 1.0', '>= 1.0.5', require: false end -# Set SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. +# Set STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. # When false (default / CI), released kettle-jem brings merge gems and parser dependencies. # Local path overrides bring the same dependencies from sibling gemspecs. # # Set KETTLE_RB_DEV=/path/to/kettle-rb for local development with Kettle plugin gems. # When false (default / CI), released Kettle plugin gems are used. -eval_gemfile 'templating_local.gemfile' unless smorg_remote && kettle_remote +eval_gemfile 'templating_local.gemfile' unless structuredmerge_remote && 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 ab827c840..62371754c 100644 --- a/gems/ast-merge-git/gemfiles/modular/templating_local.gemfile +++ b/gems/ast-merge-git/gemfiles/modular/templating_local.gemfile @@ -1,12 +1,12 @@ # frozen_string_literal: true # Local path overrides for templating development. -# Loaded by the associated non-local gemfile when SMORG_RB_DEV or KETTLE_RB_DEV +# Loaded by the associated non-local gemfile when STRUCTUREDMERGE_DEV or KETTLE_RB_DEV # is not "false". require 'nomono/bundler' unless defined?(Nomono) -smorg_rb_local_gems = %w[ +structuredmerge_local_gems = %w[ tree_haver ast-merge ast-merge-git @@ -43,7 +43,7 @@ kettle_rb_local_gems = %w[ kettle-dev kettle-test kettle-soup-cover kettle-drift ] declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -smorg_rb_local_gems_to_eval = smorg_rb_local_gems - %w[ast-merge-git] - declared_gems +structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[ast-merge-git] - declared_gems kettle_rb_local_gems_to_eval = kettle_rb_local_gems - %w[ast-merge-git] - declared_gems tslp_dev = ENV.fetch('TSLP_DEV', nil) @@ -52,14 +52,14 @@ tslp_dev = ENV.fetch('TSLP_DEV', nil) platform :mri do gem 'tree_sitter_language_pack', path: tslp_dev unless tslp_dev.to_s.empty? - if ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false') != 0 + if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( - gems: smorg_rb_local_gems_to_eval, - prefix: 'SMORG_RB', - path_env: 'SMORG_RB_DEV', + gems: structuredmerge_local_gems_to_eval, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', vendored_gems_env: 'VENDORED_GEMS', vendor_gem_dir_env: 'VENDOR_GEM_DIR', - debug_env: 'SMORG_RB_DEBUG' + debug_env: 'STRUCTUREDMERGE_DEBUG' ) end diff --git a/gems/ast-merge/Gemfile b/gems/ast-merge/Gemfile index 2c0323fac..04ab86c96 100644 --- a/gems/ast-merge/Gemfile +++ b/gems/ast-merge/Gemfile @@ -208,7 +208,7 @@ unless tslp_declared_by_templating end end -# Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) +# Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging diff --git a/gems/ast-merge/Gemfile.lock b/gems/ast-merge/Gemfile.lock index 2c65d5222..0a76311e0 100644 --- a/gems/ast-merge/Gemfile.lock +++ b/gems/ast-merge/Gemfile.lock @@ -46,6 +46,7 @@ PATH specs: ast-merge-git (7.1.0) ast-merge (= 7.1.0) + json-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH @@ -242,6 +243,15 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: @@ -265,15 +275,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: diff --git a/gems/ast-merge/gemfiles/modular/templating.gemfile b/gems/ast-merge/gemfiles/modular/templating.gemfile index 0d1c9bcf4..e3c24e6b7 100644 --- a/gems/ast-merge/gemfiles/modular/templating.gemfile +++ b/gems/ast-merge/gemfiles/modular/templating.gemfile @@ -1,9 +1,9 @@ # frozen_string_literal: true -smorg_remote = ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false').zero? +structuredmerge_remote = ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false').zero? kettle_remote = ENV.fetch('KETTLE_RB_DEV', 'false').casecmp('false').zero? -if smorg_remote +if structuredmerge_remote # Merge recipes and parser dependencies for released installs. gem 'kettle-jem', '>= 7.0' end @@ -13,10 +13,10 @@ if kettle_remote gem 'kettle-drift', '~> 1.0', '>= 1.0.5', require: false end -# Set SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. +# Set STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. # When false (default / CI), released kettle-jem brings merge gems and parser dependencies. # Local path overrides bring the same dependencies from sibling gemspecs. # # Set KETTLE_RB_DEV=/path/to/kettle-rb for local development with Kettle plugin gems. # When false (default / CI), released Kettle plugin gems are used. -eval_gemfile 'templating_local.gemfile' unless smorg_remote && kettle_remote +eval_gemfile 'templating_local.gemfile' unless structuredmerge_remote && kettle_remote diff --git a/gems/ast-merge/gemfiles/modular/templating_local.gemfile b/gems/ast-merge/gemfiles/modular/templating_local.gemfile index 1cca924a0..bf5147854 100644 --- a/gems/ast-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/ast-merge/gemfiles/modular/templating_local.gemfile @@ -1,12 +1,12 @@ # frozen_string_literal: true # Local path overrides for templating development. -# Loaded by the associated non-local gemfile when SMORG_RB_DEV or KETTLE_RB_DEV +# Loaded by the associated non-local gemfile when STRUCTUREDMERGE_DEV or KETTLE_RB_DEV # is not "false". require 'nomono/bundler' unless defined?(Nomono) -smorg_rb_local_gems = %w[ +structuredmerge_local_gems = %w[ tree_haver ast-merge ast-merge-git @@ -43,7 +43,7 @@ kettle_rb_local_gems = %w[ kettle-dev kettle-test kettle-soup-cover kettle-drift ] declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -smorg_rb_local_gems_to_eval = smorg_rb_local_gems - %w[ast-merge] - declared_gems +structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[ast-merge] - declared_gems kettle_rb_local_gems_to_eval = kettle_rb_local_gems - %w[ast-merge] - declared_gems tslp_dev = ENV.fetch('TSLP_DEV', nil) @@ -52,14 +52,14 @@ tslp_dev = ENV.fetch('TSLP_DEV', nil) platform :mri do gem 'tree_sitter_language_pack', path: tslp_dev unless tslp_dev.to_s.empty? - if ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false') != 0 + if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( - gems: smorg_rb_local_gems_to_eval, - prefix: 'SMORG_RB', - path_env: 'SMORG_RB_DEV', + gems: structuredmerge_local_gems_to_eval, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', vendored_gems_env: 'VENDORED_GEMS', vendor_gem_dir_env: 'VENDOR_GEM_DIR', - debug_env: 'SMORG_RB_DEBUG' + debug_env: 'STRUCTUREDMERGE_DEBUG' ) end diff --git a/gems/ast-template/Gemfile b/gems/ast-template/Gemfile index 130687997..13c89702b 100644 --- a/gems/ast-template/Gemfile +++ b/gems/ast-template/Gemfile @@ -208,7 +208,7 @@ unless tslp_declared_by_templating end end -# Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) +# Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging diff --git a/gems/ast-template/Gemfile.lock b/gems/ast-template/Gemfile.lock index 3450e16a5..49e30a565 100644 --- a/gems/ast-template/Gemfile.lock +++ b/gems/ast-template/Gemfile.lock @@ -44,6 +44,16 @@ PATH specs: ast-merge-git (7.1.0) ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH @@ -265,15 +275,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: diff --git a/gems/ast-template/gemfiles/modular/templating.gemfile b/gems/ast-template/gemfiles/modular/templating.gemfile index 0d1c9bcf4..e3c24e6b7 100644 --- a/gems/ast-template/gemfiles/modular/templating.gemfile +++ b/gems/ast-template/gemfiles/modular/templating.gemfile @@ -1,9 +1,9 @@ # frozen_string_literal: true -smorg_remote = ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false').zero? +structuredmerge_remote = ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false').zero? kettle_remote = ENV.fetch('KETTLE_RB_DEV', 'false').casecmp('false').zero? -if smorg_remote +if structuredmerge_remote # Merge recipes and parser dependencies for released installs. gem 'kettle-jem', '>= 7.0' end @@ -13,10 +13,10 @@ if kettle_remote gem 'kettle-drift', '~> 1.0', '>= 1.0.5', require: false end -# Set SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. +# Set STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. # When false (default / CI), released kettle-jem brings merge gems and parser dependencies. # Local path overrides bring the same dependencies from sibling gemspecs. # # Set KETTLE_RB_DEV=/path/to/kettle-rb for local development with Kettle plugin gems. # When false (default / CI), released Kettle plugin gems are used. -eval_gemfile 'templating_local.gemfile' unless smorg_remote && kettle_remote +eval_gemfile 'templating_local.gemfile' unless structuredmerge_remote && kettle_remote diff --git a/gems/ast-template/gemfiles/modular/templating_local.gemfile b/gems/ast-template/gemfiles/modular/templating_local.gemfile index af6071632..6eb9ac7ae 100644 --- a/gems/ast-template/gemfiles/modular/templating_local.gemfile +++ b/gems/ast-template/gemfiles/modular/templating_local.gemfile @@ -1,12 +1,12 @@ # frozen_string_literal: true # Local path overrides for templating development. -# Loaded by the associated non-local gemfile when SMORG_RB_DEV or KETTLE_RB_DEV +# Loaded by the associated non-local gemfile when STRUCTUREDMERGE_DEV or KETTLE_RB_DEV # is not "false". require 'nomono/bundler' unless defined?(Nomono) -smorg_rb_local_gems = %w[ +structuredmerge_local_gems = %w[ tree_haver ast-merge ast-merge-git @@ -43,7 +43,7 @@ kettle_rb_local_gems = %w[ kettle-dev kettle-test kettle-soup-cover kettle-drift ] declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -smorg_rb_local_gems_to_eval = smorg_rb_local_gems - %w[ast-template] - declared_gems +structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[ast-template] - declared_gems kettle_rb_local_gems_to_eval = kettle_rb_local_gems - %w[ast-template] - declared_gems tslp_dev = ENV.fetch('TSLP_DEV', nil) @@ -52,14 +52,14 @@ tslp_dev = ENV.fetch('TSLP_DEV', nil) platform :mri do gem 'tree_sitter_language_pack', path: tslp_dev unless tslp_dev.to_s.empty? - if ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false') != 0 + if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( - gems: smorg_rb_local_gems_to_eval, - prefix: 'SMORG_RB', - path_env: 'SMORG_RB_DEV', + gems: structuredmerge_local_gems_to_eval, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', vendored_gems_env: 'VENDORED_GEMS', vendor_gem_dir_env: 'VENDOR_GEM_DIR', - debug_env: 'SMORG_RB_DEBUG' + debug_env: 'STRUCTUREDMERGE_DEBUG' ) end diff --git a/gems/bash-merge/Gemfile b/gems/bash-merge/Gemfile index 5be4ab47a..c53198e8e 100644 --- a/gems/bash-merge/Gemfile +++ b/gems/bash-merge/Gemfile @@ -209,7 +209,7 @@ unless tslp_declared_by_templating end end -# Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) +# Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging diff --git a/gems/bash-merge/Gemfile.lock b/gems/bash-merge/Gemfile.lock index 6215f7838..3b77b8ada 100644 --- a/gems/bash-merge/Gemfile.lock +++ b/gems/bash-merge/Gemfile.lock @@ -45,6 +45,16 @@ PATH specs: ast-merge-git (7.1.0) ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH @@ -233,6 +243,15 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: @@ -256,24 +275,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: diff --git a/gems/bash-merge/gemfiles/modular/templating.gemfile b/gems/bash-merge/gemfiles/modular/templating.gemfile index 0d1c9bcf4..e3c24e6b7 100644 --- a/gems/bash-merge/gemfiles/modular/templating.gemfile +++ b/gems/bash-merge/gemfiles/modular/templating.gemfile @@ -1,9 +1,9 @@ # frozen_string_literal: true -smorg_remote = ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false').zero? +structuredmerge_remote = ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false').zero? kettle_remote = ENV.fetch('KETTLE_RB_DEV', 'false').casecmp('false').zero? -if smorg_remote +if structuredmerge_remote # Merge recipes and parser dependencies for released installs. gem 'kettle-jem', '>= 7.0' end @@ -13,10 +13,10 @@ if kettle_remote gem 'kettle-drift', '~> 1.0', '>= 1.0.5', require: false end -# Set SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. +# Set STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. # When false (default / CI), released kettle-jem brings merge gems and parser dependencies. # Local path overrides bring the same dependencies from sibling gemspecs. # # Set KETTLE_RB_DEV=/path/to/kettle-rb for local development with Kettle plugin gems. # When false (default / CI), released Kettle plugin gems are used. -eval_gemfile 'templating_local.gemfile' unless smorg_remote && kettle_remote +eval_gemfile 'templating_local.gemfile' unless structuredmerge_remote && kettle_remote diff --git a/gems/bash-merge/gemfiles/modular/templating_local.gemfile b/gems/bash-merge/gemfiles/modular/templating_local.gemfile index e98e7f415..b0ef57bb2 100644 --- a/gems/bash-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/bash-merge/gemfiles/modular/templating_local.gemfile @@ -1,12 +1,12 @@ # frozen_string_literal: true # Local path overrides for templating development. -# Loaded by the associated non-local gemfile when SMORG_RB_DEV or KETTLE_RB_DEV +# Loaded by the associated non-local gemfile when STRUCTUREDMERGE_DEV or KETTLE_RB_DEV # is not "false". require 'nomono/bundler' unless defined?(Nomono) -smorg_rb_local_gems = %w[ +structuredmerge_local_gems = %w[ tree_haver ast-merge ast-merge-git @@ -43,7 +43,7 @@ kettle_rb_local_gems = %w[ kettle-dev kettle-test kettle-soup-cover kettle-drift ] declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -smorg_rb_local_gems_to_eval = smorg_rb_local_gems - %w[bash-merge] - declared_gems +structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[bash-merge] - declared_gems kettle_rb_local_gems_to_eval = kettle_rb_local_gems - %w[bash-merge] - declared_gems tslp_dev = ENV.fetch('TSLP_DEV', nil) @@ -52,14 +52,14 @@ tslp_dev = ENV.fetch('TSLP_DEV', nil) platform :mri do gem 'tree_sitter_language_pack', path: tslp_dev unless tslp_dev.to_s.empty? - if ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false') != 0 + if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( - gems: smorg_rb_local_gems_to_eval, - prefix: 'SMORG_RB', - path_env: 'SMORG_RB_DEV', + gems: structuredmerge_local_gems_to_eval, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', vendored_gems_env: 'VENDORED_GEMS', vendor_gem_dir_env: 'VENDOR_GEM_DIR', - debug_env: 'SMORG_RB_DEBUG' + debug_env: 'STRUCTUREDMERGE_DEBUG' ) end diff --git a/gems/binary-merge/Gemfile b/gems/binary-merge/Gemfile index b0394cc6a..b2784809b 100644 --- a/gems/binary-merge/Gemfile +++ b/gems/binary-merge/Gemfile @@ -248,7 +248,7 @@ unless tslp_declared_by_templating end end -# Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) +# Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging diff --git a/gems/binary-merge/Gemfile.lock b/gems/binary-merge/Gemfile.lock index d5afa19e0..3e61ddc76 100644 --- a/gems/binary-merge/Gemfile.lock +++ b/gems/binary-merge/Gemfile.lock @@ -44,6 +44,7 @@ PATH specs: ast-merge-git (7.1.0) ast-merge (= 7.1.0) + json-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH @@ -242,6 +243,15 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: @@ -265,15 +275,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: diff --git a/gems/binary-merge/gemfiles/modular/templating.gemfile b/gems/binary-merge/gemfiles/modular/templating.gemfile index 0d1c9bcf4..e3c24e6b7 100644 --- a/gems/binary-merge/gemfiles/modular/templating.gemfile +++ b/gems/binary-merge/gemfiles/modular/templating.gemfile @@ -1,9 +1,9 @@ # frozen_string_literal: true -smorg_remote = ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false').zero? +structuredmerge_remote = ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false').zero? kettle_remote = ENV.fetch('KETTLE_RB_DEV', 'false').casecmp('false').zero? -if smorg_remote +if structuredmerge_remote # Merge recipes and parser dependencies for released installs. gem 'kettle-jem', '>= 7.0' end @@ -13,10 +13,10 @@ if kettle_remote gem 'kettle-drift', '~> 1.0', '>= 1.0.5', require: false end -# Set SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. +# Set STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. # When false (default / CI), released kettle-jem brings merge gems and parser dependencies. # Local path overrides bring the same dependencies from sibling gemspecs. # # Set KETTLE_RB_DEV=/path/to/kettle-rb for local development with Kettle plugin gems. # When false (default / CI), released Kettle plugin gems are used. -eval_gemfile 'templating_local.gemfile' unless smorg_remote && kettle_remote +eval_gemfile 'templating_local.gemfile' unless structuredmerge_remote && kettle_remote diff --git a/gems/binary-merge/gemfiles/modular/templating_local.gemfile b/gems/binary-merge/gemfiles/modular/templating_local.gemfile index c4b43a13e..41201dc8a 100644 --- a/gems/binary-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/binary-merge/gemfiles/modular/templating_local.gemfile @@ -1,12 +1,12 @@ # frozen_string_literal: true # Local path overrides for templating development. -# Loaded by the associated non-local gemfile when SMORG_RB_DEV or KETTLE_RB_DEV +# Loaded by the associated non-local gemfile when STRUCTUREDMERGE_DEV or KETTLE_RB_DEV # is not "false". require 'nomono/bundler' unless defined?(Nomono) -smorg_rb_local_gems = %w[ +structuredmerge_local_gems = %w[ tree_haver ast-merge ast-merge-git @@ -43,7 +43,7 @@ kettle_rb_local_gems = %w[ kettle-dev kettle-test kettle-soup-cover kettle-drift ] declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -smorg_rb_local_gems_to_eval = smorg_rb_local_gems - %w[binary-merge] - declared_gems +structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[binary-merge] - declared_gems kettle_rb_local_gems_to_eval = kettle_rb_local_gems - %w[binary-merge] - declared_gems tslp_dev = ENV.fetch('TSLP_DEV', nil) @@ -52,14 +52,14 @@ tslp_dev = ENV.fetch('TSLP_DEV', nil) platform :mri do gem 'tree_sitter_language_pack', path: tslp_dev unless tslp_dev.to_s.empty? - if ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false') != 0 + if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( - gems: smorg_rb_local_gems_to_eval, - prefix: 'SMORG_RB', - path_env: 'SMORG_RB_DEV', + gems: structuredmerge_local_gems_to_eval, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', vendored_gems_env: 'VENDORED_GEMS', vendor_gem_dir_env: 'VENDOR_GEM_DIR', - debug_env: 'SMORG_RB_DEBUG' + debug_env: 'STRUCTUREDMERGE_DEBUG' ) end diff --git a/gems/citrus-toml-merge/Gemfile b/gems/citrus-toml-merge/Gemfile index 039c65efd..dcdae32da 100644 --- a/gems/citrus-toml-merge/Gemfile +++ b/gems/citrus-toml-merge/Gemfile @@ -208,7 +208,7 @@ unless tslp_declared_by_templating end end -# Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) +# Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging diff --git a/gems/citrus-toml-merge/Gemfile.lock b/gems/citrus-toml-merge/Gemfile.lock index d2e2c08d9..d5b62761d 100644 --- a/gems/citrus-toml-merge/Gemfile.lock +++ b/gems/citrus-toml-merge/Gemfile.lock @@ -45,6 +45,7 @@ PATH specs: ast-merge-git (7.1.0) ast-merge (= 7.1.0) + json-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH @@ -234,6 +235,14 @@ PATH plain-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: @@ -266,14 +275,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: diff --git a/gems/citrus-toml-merge/gemfiles/modular/templating.gemfile b/gems/citrus-toml-merge/gemfiles/modular/templating.gemfile index 0d1c9bcf4..e3c24e6b7 100644 --- a/gems/citrus-toml-merge/gemfiles/modular/templating.gemfile +++ b/gems/citrus-toml-merge/gemfiles/modular/templating.gemfile @@ -1,9 +1,9 @@ # frozen_string_literal: true -smorg_remote = ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false').zero? +structuredmerge_remote = ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false').zero? kettle_remote = ENV.fetch('KETTLE_RB_DEV', 'false').casecmp('false').zero? -if smorg_remote +if structuredmerge_remote # Merge recipes and parser dependencies for released installs. gem 'kettle-jem', '>= 7.0' end @@ -13,10 +13,10 @@ if kettle_remote gem 'kettle-drift', '~> 1.0', '>= 1.0.5', require: false end -# Set SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. +# Set STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. # When false (default / CI), released kettle-jem brings merge gems and parser dependencies. # Local path overrides bring the same dependencies from sibling gemspecs. # # Set KETTLE_RB_DEV=/path/to/kettle-rb for local development with Kettle plugin gems. # When false (default / CI), released Kettle plugin gems are used. -eval_gemfile 'templating_local.gemfile' unless smorg_remote && kettle_remote +eval_gemfile 'templating_local.gemfile' unless structuredmerge_remote && 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 ead39ecc9..261a205a9 100644 --- a/gems/citrus-toml-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/citrus-toml-merge/gemfiles/modular/templating_local.gemfile @@ -1,12 +1,12 @@ # frozen_string_literal: true # Local path overrides for templating development. -# Loaded by the associated non-local gemfile when SMORG_RB_DEV or KETTLE_RB_DEV +# Loaded by the associated non-local gemfile when STRUCTUREDMERGE_DEV or KETTLE_RB_DEV # is not "false". require 'nomono/bundler' unless defined?(Nomono) -smorg_rb_local_gems = %w[ +structuredmerge_local_gems = %w[ tree_haver ast-merge ast-merge-git @@ -43,7 +43,7 @@ kettle_rb_local_gems = %w[ kettle-dev kettle-test kettle-soup-cover kettle-drift ] declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -smorg_rb_local_gems_to_eval = smorg_rb_local_gems - %w[citrus-toml-merge] - declared_gems +structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[citrus-toml-merge] - declared_gems kettle_rb_local_gems_to_eval = kettle_rb_local_gems - %w[citrus-toml-merge] - declared_gems tslp_dev = ENV.fetch('TSLP_DEV', nil) @@ -52,14 +52,14 @@ tslp_dev = ENV.fetch('TSLP_DEV', nil) platform :mri do gem 'tree_sitter_language_pack', path: tslp_dev unless tslp_dev.to_s.empty? - if ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false') != 0 + if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( - gems: smorg_rb_local_gems_to_eval, - prefix: 'SMORG_RB', - path_env: 'SMORG_RB_DEV', + gems: structuredmerge_local_gems_to_eval, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', vendored_gems_env: 'VENDORED_GEMS', vendor_gem_dir_env: 'VENDOR_GEM_DIR', - debug_env: 'SMORG_RB_DEBUG' + debug_env: 'STRUCTUREDMERGE_DEBUG' ) end diff --git a/gems/commonmarker-merge/Gemfile b/gems/commonmarker-merge/Gemfile index f0c86279e..c5d98946b 100644 --- a/gems/commonmarker-merge/Gemfile +++ b/gems/commonmarker-merge/Gemfile @@ -208,7 +208,7 @@ unless tslp_declared_by_templating end end -# Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) +# Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging diff --git a/gems/commonmarker-merge/Gemfile.lock b/gems/commonmarker-merge/Gemfile.lock index 2552785d9..e28a889bb 100644 --- a/gems/commonmarker-merge/Gemfile.lock +++ b/gems/commonmarker-merge/Gemfile.lock @@ -45,6 +45,7 @@ PATH specs: ast-merge-git (7.1.0) ast-merge (= 7.1.0) + json-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH @@ -147,6 +148,14 @@ PATH markdown-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: @@ -266,14 +275,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: diff --git a/gems/commonmarker-merge/gemfiles/modular/templating.gemfile b/gems/commonmarker-merge/gemfiles/modular/templating.gemfile index 0d1c9bcf4..e3c24e6b7 100644 --- a/gems/commonmarker-merge/gemfiles/modular/templating.gemfile +++ b/gems/commonmarker-merge/gemfiles/modular/templating.gemfile @@ -1,9 +1,9 @@ # frozen_string_literal: true -smorg_remote = ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false').zero? +structuredmerge_remote = ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false').zero? kettle_remote = ENV.fetch('KETTLE_RB_DEV', 'false').casecmp('false').zero? -if smorg_remote +if structuredmerge_remote # Merge recipes and parser dependencies for released installs. gem 'kettle-jem', '>= 7.0' end @@ -13,10 +13,10 @@ if kettle_remote gem 'kettle-drift', '~> 1.0', '>= 1.0.5', require: false end -# Set SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. +# Set STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. # When false (default / CI), released kettle-jem brings merge gems and parser dependencies. # Local path overrides bring the same dependencies from sibling gemspecs. # # Set KETTLE_RB_DEV=/path/to/kettle-rb for local development with Kettle plugin gems. # When false (default / CI), released Kettle plugin gems are used. -eval_gemfile 'templating_local.gemfile' unless smorg_remote && kettle_remote +eval_gemfile 'templating_local.gemfile' unless structuredmerge_remote && kettle_remote diff --git a/gems/commonmarker-merge/gemfiles/modular/templating_local.gemfile b/gems/commonmarker-merge/gemfiles/modular/templating_local.gemfile index 318ec291d..6a0007463 100644 --- a/gems/commonmarker-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/commonmarker-merge/gemfiles/modular/templating_local.gemfile @@ -1,12 +1,12 @@ # frozen_string_literal: true # Local path overrides for templating development. -# Loaded by the associated non-local gemfile when SMORG_RB_DEV or KETTLE_RB_DEV +# Loaded by the associated non-local gemfile when STRUCTUREDMERGE_DEV or KETTLE_RB_DEV # is not "false". require 'nomono/bundler' unless defined?(Nomono) -smorg_rb_local_gems = %w[ +structuredmerge_local_gems = %w[ tree_haver ast-merge ast-merge-git @@ -43,7 +43,7 @@ kettle_rb_local_gems = %w[ kettle-dev kettle-test kettle-soup-cover kettle-drift ] declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -smorg_rb_local_gems_to_eval = smorg_rb_local_gems - %w[commonmarker-merge] - declared_gems +structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[commonmarker-merge] - declared_gems kettle_rb_local_gems_to_eval = kettle_rb_local_gems - %w[commonmarker-merge] - declared_gems tslp_dev = ENV.fetch('TSLP_DEV', nil) @@ -52,14 +52,14 @@ tslp_dev = ENV.fetch('TSLP_DEV', nil) platform :mri do gem 'tree_sitter_language_pack', path: tslp_dev unless tslp_dev.to_s.empty? - if ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false') != 0 + if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( - gems: smorg_rb_local_gems_to_eval, - prefix: 'SMORG_RB', - path_env: 'SMORG_RB_DEV', + gems: structuredmerge_local_gems_to_eval, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', vendored_gems_env: 'VENDORED_GEMS', vendor_gem_dir_env: 'VENDOR_GEM_DIR', - debug_env: 'SMORG_RB_DEBUG' + debug_env: 'STRUCTUREDMERGE_DEBUG' ) end diff --git a/gems/dotenv-merge/Gemfile b/gems/dotenv-merge/Gemfile index 8afde9658..7ee76e326 100644 --- a/gems/dotenv-merge/Gemfile +++ b/gems/dotenv-merge/Gemfile @@ -209,7 +209,7 @@ unless tslp_declared_by_templating end end -# Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) +# Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging diff --git a/gems/dotenv-merge/Gemfile.lock b/gems/dotenv-merge/Gemfile.lock index 3454bef92..cdf236f75 100644 --- a/gems/dotenv-merge/Gemfile.lock +++ b/gems/dotenv-merge/Gemfile.lock @@ -45,6 +45,16 @@ PATH specs: ast-merge-git (7.1.0) ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH @@ -233,6 +243,15 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: @@ -256,24 +275,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: diff --git a/gems/dotenv-merge/gemfiles/modular/templating.gemfile b/gems/dotenv-merge/gemfiles/modular/templating.gemfile index 0d1c9bcf4..e3c24e6b7 100644 --- a/gems/dotenv-merge/gemfiles/modular/templating.gemfile +++ b/gems/dotenv-merge/gemfiles/modular/templating.gemfile @@ -1,9 +1,9 @@ # frozen_string_literal: true -smorg_remote = ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false').zero? +structuredmerge_remote = ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false').zero? kettle_remote = ENV.fetch('KETTLE_RB_DEV', 'false').casecmp('false').zero? -if smorg_remote +if structuredmerge_remote # Merge recipes and parser dependencies for released installs. gem 'kettle-jem', '>= 7.0' end @@ -13,10 +13,10 @@ if kettle_remote gem 'kettle-drift', '~> 1.0', '>= 1.0.5', require: false end -# Set SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. +# Set STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. # When false (default / CI), released kettle-jem brings merge gems and parser dependencies. # Local path overrides bring the same dependencies from sibling gemspecs. # # Set KETTLE_RB_DEV=/path/to/kettle-rb for local development with Kettle plugin gems. # When false (default / CI), released Kettle plugin gems are used. -eval_gemfile 'templating_local.gemfile' unless smorg_remote && kettle_remote +eval_gemfile 'templating_local.gemfile' unless structuredmerge_remote && kettle_remote diff --git a/gems/dotenv-merge/gemfiles/modular/templating_local.gemfile b/gems/dotenv-merge/gemfiles/modular/templating_local.gemfile index 4f71a7d64..926fc36d5 100644 --- a/gems/dotenv-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/dotenv-merge/gemfiles/modular/templating_local.gemfile @@ -1,12 +1,12 @@ # frozen_string_literal: true # Local path overrides for templating development. -# Loaded by the associated non-local gemfile when SMORG_RB_DEV or KETTLE_RB_DEV +# Loaded by the associated non-local gemfile when STRUCTUREDMERGE_DEV or KETTLE_RB_DEV # is not "false". require 'nomono/bundler' unless defined?(Nomono) -smorg_rb_local_gems = %w[ +structuredmerge_local_gems = %w[ tree_haver ast-merge ast-merge-git @@ -43,7 +43,7 @@ kettle_rb_local_gems = %w[ kettle-dev kettle-test kettle-soup-cover kettle-drift ] declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -smorg_rb_local_gems_to_eval = smorg_rb_local_gems - %w[dotenv-merge] - declared_gems +structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[dotenv-merge] - declared_gems kettle_rb_local_gems_to_eval = kettle_rb_local_gems - %w[dotenv-merge] - declared_gems tslp_dev = ENV.fetch('TSLP_DEV', nil) @@ -52,14 +52,14 @@ tslp_dev = ENV.fetch('TSLP_DEV', nil) platform :mri do gem 'tree_sitter_language_pack', path: tslp_dev unless tslp_dev.to_s.empty? - if ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false') != 0 + if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( - gems: smorg_rb_local_gems_to_eval, - prefix: 'SMORG_RB', - path_env: 'SMORG_RB_DEV', + gems: structuredmerge_local_gems_to_eval, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', vendored_gems_env: 'VENDORED_GEMS', vendor_gem_dir_env: 'VENDOR_GEM_DIR', - debug_env: 'SMORG_RB_DEBUG' + debug_env: 'STRUCTUREDMERGE_DEBUG' ) end diff --git a/gems/go-merge/Gemfile b/gems/go-merge/Gemfile index 58ad94eec..df33fdf3d 100644 --- a/gems/go-merge/Gemfile +++ b/gems/go-merge/Gemfile @@ -209,7 +209,7 @@ unless tslp_declared_by_templating end end -# Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) +# Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging diff --git a/gems/go-merge/Gemfile.lock b/gems/go-merge/Gemfile.lock index 6f3d7f47a..c7358e5a9 100644 --- a/gems/go-merge/Gemfile.lock +++ b/gems/go-merge/Gemfile.lock @@ -45,6 +45,16 @@ PATH specs: ast-merge-git (7.1.0) ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH @@ -233,6 +243,15 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: @@ -256,24 +275,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: diff --git a/gems/go-merge/gemfiles/modular/templating.gemfile b/gems/go-merge/gemfiles/modular/templating.gemfile index 0d1c9bcf4..e3c24e6b7 100644 --- a/gems/go-merge/gemfiles/modular/templating.gemfile +++ b/gems/go-merge/gemfiles/modular/templating.gemfile @@ -1,9 +1,9 @@ # frozen_string_literal: true -smorg_remote = ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false').zero? +structuredmerge_remote = ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false').zero? kettle_remote = ENV.fetch('KETTLE_RB_DEV', 'false').casecmp('false').zero? -if smorg_remote +if structuredmerge_remote # Merge recipes and parser dependencies for released installs. gem 'kettle-jem', '>= 7.0' end @@ -13,10 +13,10 @@ if kettle_remote gem 'kettle-drift', '~> 1.0', '>= 1.0.5', require: false end -# Set SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. +# Set STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. # When false (default / CI), released kettle-jem brings merge gems and parser dependencies. # Local path overrides bring the same dependencies from sibling gemspecs. # # Set KETTLE_RB_DEV=/path/to/kettle-rb for local development with Kettle plugin gems. # When false (default / CI), released Kettle plugin gems are used. -eval_gemfile 'templating_local.gemfile' unless smorg_remote && kettle_remote +eval_gemfile 'templating_local.gemfile' unless structuredmerge_remote && kettle_remote diff --git a/gems/go-merge/gemfiles/modular/templating_local.gemfile b/gems/go-merge/gemfiles/modular/templating_local.gemfile index 237ec4d7c..847d5acc2 100644 --- a/gems/go-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/go-merge/gemfiles/modular/templating_local.gemfile @@ -1,12 +1,12 @@ # frozen_string_literal: true # Local path overrides for templating development. -# Loaded by the associated non-local gemfile when SMORG_RB_DEV or KETTLE_RB_DEV +# Loaded by the associated non-local gemfile when STRUCTUREDMERGE_DEV or KETTLE_RB_DEV # is not "false". require 'nomono/bundler' unless defined?(Nomono) -smorg_rb_local_gems = %w[ +structuredmerge_local_gems = %w[ tree_haver ast-merge ast-merge-git @@ -43,7 +43,7 @@ kettle_rb_local_gems = %w[ kettle-dev kettle-test kettle-soup-cover kettle-drift ] declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -smorg_rb_local_gems_to_eval = smorg_rb_local_gems - %w[go-merge] - declared_gems +structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[go-merge] - declared_gems kettle_rb_local_gems_to_eval = kettle_rb_local_gems - %w[go-merge] - declared_gems tslp_dev = ENV.fetch('TSLP_DEV', nil) @@ -52,14 +52,14 @@ tslp_dev = ENV.fetch('TSLP_DEV', nil) platform :mri do gem 'tree_sitter_language_pack', path: tslp_dev unless tslp_dev.to_s.empty? - if ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false') != 0 + if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( - gems: smorg_rb_local_gems_to_eval, - prefix: 'SMORG_RB', - path_env: 'SMORG_RB_DEV', + gems: structuredmerge_local_gems_to_eval, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', vendored_gems_env: 'VENDORED_GEMS', vendor_gem_dir_env: 'VENDOR_GEM_DIR', - debug_env: 'SMORG_RB_DEBUG' + debug_env: 'STRUCTUREDMERGE_DEBUG' ) end diff --git a/gems/json-merge/Gemfile b/gems/json-merge/Gemfile index a37d4217c..3f394ea24 100644 --- a/gems/json-merge/Gemfile +++ b/gems/json-merge/Gemfile @@ -209,7 +209,7 @@ unless tslp_declared_by_templating end end -# Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) +# Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging diff --git a/gems/json-merge/Gemfile.lock b/gems/json-merge/Gemfile.lock index 9051ac23f..f6e78c1e3 100644 --- a/gems/json-merge/Gemfile.lock +++ b/gems/json-merge/Gemfile.lock @@ -45,6 +45,16 @@ PATH specs: ast-merge-git (7.1.0) ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH @@ -233,6 +243,15 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: @@ -256,24 +275,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: diff --git a/gems/json-merge/gemfiles/modular/templating.gemfile b/gems/json-merge/gemfiles/modular/templating.gemfile index 0d1c9bcf4..e3c24e6b7 100644 --- a/gems/json-merge/gemfiles/modular/templating.gemfile +++ b/gems/json-merge/gemfiles/modular/templating.gemfile @@ -1,9 +1,9 @@ # frozen_string_literal: true -smorg_remote = ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false').zero? +structuredmerge_remote = ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false').zero? kettle_remote = ENV.fetch('KETTLE_RB_DEV', 'false').casecmp('false').zero? -if smorg_remote +if structuredmerge_remote # Merge recipes and parser dependencies for released installs. gem 'kettle-jem', '>= 7.0' end @@ -13,10 +13,10 @@ if kettle_remote gem 'kettle-drift', '~> 1.0', '>= 1.0.5', require: false end -# Set SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. +# Set STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. # When false (default / CI), released kettle-jem brings merge gems and parser dependencies. # Local path overrides bring the same dependencies from sibling gemspecs. # # Set KETTLE_RB_DEV=/path/to/kettle-rb for local development with Kettle plugin gems. # When false (default / CI), released Kettle plugin gems are used. -eval_gemfile 'templating_local.gemfile' unless smorg_remote && kettle_remote +eval_gemfile 'templating_local.gemfile' unless structuredmerge_remote && kettle_remote diff --git a/gems/json-merge/gemfiles/modular/templating_local.gemfile b/gems/json-merge/gemfiles/modular/templating_local.gemfile index d3802328a..b9b83f3c0 100644 --- a/gems/json-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/json-merge/gemfiles/modular/templating_local.gemfile @@ -1,12 +1,12 @@ # frozen_string_literal: true # Local path overrides for templating development. -# Loaded by the associated non-local gemfile when SMORG_RB_DEV or KETTLE_RB_DEV +# Loaded by the associated non-local gemfile when STRUCTUREDMERGE_DEV or KETTLE_RB_DEV # is not "false". require 'nomono/bundler' unless defined?(Nomono) -smorg_rb_local_gems = %w[ +structuredmerge_local_gems = %w[ tree_haver ast-merge ast-merge-git @@ -43,7 +43,7 @@ kettle_rb_local_gems = %w[ kettle-dev kettle-test kettle-soup-cover kettle-drift ] declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -smorg_rb_local_gems_to_eval = smorg_rb_local_gems - %w[json-merge] - declared_gems +structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[json-merge] - declared_gems kettle_rb_local_gems_to_eval = kettle_rb_local_gems - %w[json-merge] - declared_gems tslp_dev = ENV.fetch('TSLP_DEV', nil) @@ -52,14 +52,14 @@ tslp_dev = ENV.fetch('TSLP_DEV', nil) platform :mri do gem 'tree_sitter_language_pack', path: tslp_dev unless tslp_dev.to_s.empty? - if ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false') != 0 + if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( - gems: smorg_rb_local_gems_to_eval, - prefix: 'SMORG_RB', - path_env: 'SMORG_RB_DEV', + gems: structuredmerge_local_gems_to_eval, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', vendored_gems_env: 'VENDORED_GEMS', vendor_gem_dir_env: 'VENDOR_GEM_DIR', - debug_env: 'SMORG_RB_DEBUG' + debug_env: 'STRUCTUREDMERGE_DEBUG' ) end diff --git a/gems/kettle-jem/CHANGELOG.md b/gems/kettle-jem/CHANGELOG.md index 515eb2c91..533918fb3 100644 --- a/gems/kettle-jem/CHANGELOG.md +++ b/gems/kettle-jem/CHANGELOG.md @@ -231,7 +231,7 @@ Please file a bug if you notice a violation of semantic versioning. - Generated main Gemfiles now require `nomono` >= 1.0.6. - Generated templating local Gemfiles now only use `TSLP_DEV` for local `tree_sitter_language_pack` path overrides and no longer derive that path - from `SMORG_RB_DEV`. + from `STRUCTUREDMERGE_DEV`. - Generated gemspecs now require `version_gem` >= 1.1.14. - Generated gemspecs now require `gitmoji-regex` >= 2.0.4. - Generated documentation Gemfiles now require `yaml-converter` >= 0.2.3. @@ -790,7 +790,7 @@ Please file a bug if you notice a violation of semantic versioning. without requiring unreleased `kettle-drift` in every generated gemspec. - Added `kettle-drift` to generated templating Gemfiles, resolved remotely in templating mode and via `KETTLE_RB_DEV` locally, separate from the - `SMORG_RB_DEV` StructuredMerge local gem set. + `STRUCTUREDMERGE_DEV` StructuredMerge local gem set. - Refreshed generated README metadata blocks after template README merging so version-derived gemspec metadata such as `source_code_uri` does not stay stale. - Added `yard-yaml` to generated local documentation Gemfiles so local diff --git a/gems/kettle-jem/Gemfile b/gems/kettle-jem/Gemfile index c6930aabc..b5dfa026e 100644 --- a/gems/kettle-jem/Gemfile +++ b/gems/kettle-jem/Gemfile @@ -104,7 +104,7 @@ else gem "tree_sitter_language_pack", path: tslp_dev end -# Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) +# Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? # Debugging diff --git a/gems/kettle-jem/gemfiles/modular/templating.gemfile b/gems/kettle-jem/gemfiles/modular/templating.gemfile index 9f99e6d82..c0dd9c74d 100644 --- a/gems/kettle-jem/gemfiles/modular/templating.gemfile +++ b/gems/kettle-jem/gemfiles/modular/templating.gemfile @@ -1,9 +1,9 @@ # frozen_string_literal: true -smorg_remote = ENV.fetch("SMORG_RB_DEV", "false").casecmp("false").zero? +structuredmerge_remote = ENV.fetch("STRUCTUREDMERGE_DEV", "false").casecmp("false").zero? kettle_remote = ENV.fetch("KETTLE_RB_DEV", "false").casecmp("false").zero? -if smorg_remote +if structuredmerge_remote end if kettle_remote @@ -11,10 +11,10 @@ if kettle_remote gem "kettle-drift", "~> 1.0", ">= 1.0.5", require: false end -# Set SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. +# Set STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. # When false (default / CI), released kettle-jem brings merge gems and parser dependencies. # Local path overrides bring the same dependencies from sibling gemspecs. # # Set KETTLE_RB_DEV=/path/to/my for local development with Kettle plugin gems. # When false (default / CI), released Kettle plugin gems are used. -eval_gemfile "templating_local.gemfile" unless smorg_remote && kettle_remote +eval_gemfile "templating_local.gemfile" unless structuredmerge_remote && kettle_remote diff --git a/gems/kettle-jem/gemfiles/modular/templating_local.gemfile b/gems/kettle-jem/gemfiles/modular/templating_local.gemfile index bd5e67bd5..9260d7aba 100644 --- a/gems/kettle-jem/gemfiles/modular/templating_local.gemfile +++ b/gems/kettle-jem/gemfiles/modular/templating_local.gemfile @@ -1,7 +1,7 @@ # frozen_string_literal: true # Local path overrides for templating development. -# Loaded by the associated non-local gemfile when SMORG_RB_DEV or KETTLE_RB_DEV +# Loaded by the associated non-local gemfile when STRUCTUREDMERGE_DEV or KETTLE_RB_DEV # is not "false". nomono_activation_requirements = ["~> 1.0", ">= 1.0.8"] @@ -20,7 +20,7 @@ end Kernel.send(:gem, "nomono", *nomono_activation_requirements) require "nomono/bundler" -smorg_rb_local_gems = %w[ +structuredmerge_local_gems = %w[ tree_haver ast-merge ast-merge-git @@ -57,7 +57,7 @@ kettle_rb_local_gems = %w[ kettle-dev kettle-test kettle-soup-cover kettle-drift ] declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -smorg_rb_local_gems_to_eval = smorg_rb_local_gems - %w[kettle-jem] - declared_gems +structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[kettle-jem] - declared_gems kettle_rb_local_gems_to_eval = kettle_rb_local_gems - %w[kettle-jem] - declared_gems tslp_dev = ENV.fetch("TSLP_DEV", nil) @@ -68,14 +68,14 @@ platform :mri do gem "tree_sitter_language_pack", path: tslp_dev end - if ENV.fetch("SMORG_RB_DEV", "false").casecmp("false") != 0 + if ENV.fetch("STRUCTUREDMERGE_DEV", "false").casecmp("false") != 0 eval_nomono_gems( - gems: smorg_rb_local_gems_to_eval, - prefix: "SMORG_RB", - path_env: "SMORG_RB_DEV", + gems: structuredmerge_local_gems_to_eval, + prefix: "STRUCTUREDMERGE", + path_env: "STRUCTUREDMERGE_DEV", vendored_gems_env: "VENDORED_GEMS", vendor_gem_dir_env: "VENDOR_GEM_DIR", - debug_env: "SMORG_RB_DEBUG" + debug_env: "STRUCTUREDMERGE_DEBUG" ) end 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 fd6fe627b..48e4730a7 100644 --- a/gems/kettle-jem/lib/kettle/jem/tasks/install_task.rb +++ b/gems/kettle-jem/lib/kettle/jem/tasks/install_task.rb @@ -750,7 +750,7 @@ def normal_lockfile_env(project_root, env) command_env = (env || {}).to_h.dup strip_inherited_bundler_activation!(command_env) command_env["K_JEM_TEMPLATING"] = "false" - %w[KETTLE_RB_DEV GALTZO_FLOSS_DEV SMORG_RB_DEV].each do |key| + %w[KETTLE_RB_DEV GALTZO_FLOSS_DEV STRUCTUREDMERGE_DEV].each do |key| command_env[key] = "false" if command_env.key?(key) end gemfile = File.join(project_root.to_s, "Gemfile") @@ -1012,8 +1012,8 @@ def apply_kettle_family_local_install_env!(command_env) return unless Array(marker["installed_members"]).include?("kettle-jem") members_root = marker["members_root"].to_s - if local_env_disabled?(command_env["SMORG_RB_DEV"]) && Dir.exist?(File.join(members_root, "kettle-jem")) - command_env["SMORG_RB_DEV"] = members_root + if local_env_disabled?(command_env["STRUCTUREDMERGE_DEV"]) && Dir.exist?(File.join(members_root, "kettle-jem")) + command_env["STRUCTUREDMERGE_DEV"] = members_root end kettle_root = kettle_family_dependency_root(marker) diff --git a/gems/kettle-jem/lib/kettle/jem/templates/Gemfile.example b/gems/kettle-jem/lib/kettle/jem/templates/Gemfile.example index d8b1852e4..af7d895a2 100644 --- a/gems/kettle-jem/lib/kettle/jem/templates/Gemfile.example +++ b/gems/kettle-jem/lib/kettle/jem/templates/Gemfile.example @@ -24,7 +24,7 @@ gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 {KJ|MAIN_GEMFILE_DIRECT_SIBLING_BLOCK} -# Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) +# Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? # Debugging diff --git a/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/templating.gemfile.example b/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/templating.gemfile.example index 6f2eff433..990c5d920 100644 --- a/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/templating.gemfile.example +++ b/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/templating.gemfile.example @@ -1,9 +1,9 @@ # frozen_string_literal: true -smorg_remote = ENV.fetch("SMORG_RB_DEV", "false").casecmp("false").zero? +structuredmerge_remote = ENV.fetch("STRUCTUREDMERGE_DEV", "false").casecmp("false").zero? kettle_remote = ENV.fetch("KETTLE_RB_DEV", "false").casecmp("false").zero? -if smorg_remote +if structuredmerge_remote # Merge recipes and parser dependencies for released installs. gem "kettle-jem", ">= 7.0" end @@ -13,10 +13,10 @@ if kettle_remote gem "kettle-drift", "~> 1.0", ">= 1.0.5", require: false end -# Set SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. +# Set STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. # When false (default / CI), released kettle-jem brings merge gems and parser dependencies. # Local path overrides bring the same dependencies from sibling gemspecs. # # Set KETTLE_RB_DEV=/path/to/my for local development with Kettle plugin gems. # When false (default / CI), released Kettle plugin gems are used. -eval_gemfile "templating_local.gemfile" unless smorg_remote && kettle_remote +eval_gemfile "templating_local.gemfile" unless structuredmerge_remote && kettle_remote 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 b4ee12625..9ae70f292 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 @@ -1,7 +1,7 @@ # frozen_string_literal: true # Local path overrides for templating development. -# Loaded by the associated non-local gemfile when SMORG_RB_DEV or KETTLE_RB_DEV +# Loaded by the associated non-local gemfile when STRUCTUREDMERGE_DEV or KETTLE_RB_DEV # is not "false". nomono_activation_requirements = ["~> 1.0", ">= 1.0.8"] @@ -20,7 +20,7 @@ end Kernel.send(:gem, "nomono", *nomono_activation_requirements) require "nomono/bundler" -smorg_rb_local_gems = %w[ +structuredmerge_local_gems = %w[ tree_haver ast-merge ast-merge-git @@ -57,7 +57,7 @@ kettle_rb_local_gems = %w[ {KJ|KETTLE_RB_LOCAL_GEMS} ] declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -smorg_rb_local_gems_to_eval = smorg_rb_local_gems - %w[{KJ|PACKAGE_NAME}] - declared_gems +structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[{KJ|PACKAGE_NAME}] - declared_gems kettle_rb_local_gems_to_eval = kettle_rb_local_gems - %w[{KJ|PACKAGE_NAME}] - declared_gems tslp_dev = ENV.fetch("TSLP_DEV", nil) @@ -68,14 +68,14 @@ platform :mri do gem "tree_sitter_language_pack", path: tslp_dev end - if ENV.fetch("SMORG_RB_DEV", "false").casecmp("false") != 0 + if ENV.fetch("STRUCTUREDMERGE_DEV", "false").casecmp("false") != 0 eval_nomono_gems( - gems: smorg_rb_local_gems_to_eval, - prefix: "SMORG_RB", - path_env: "SMORG_RB_DEV", + gems: structuredmerge_local_gems_to_eval, + prefix: "STRUCTUREDMERGE", + path_env: "STRUCTUREDMERGE_DEV", vendored_gems_env: "VENDORED_GEMS", vendor_gem_dir_env: "VENDOR_GEM_DIR", - debug_env: "SMORG_RB_DEBUG" + debug_env: "STRUCTUREDMERGE_DEBUG" ) end diff --git a/gems/kettle-jem/lib/kettle/jem/templates/shim/Gemfile.example b/gems/kettle-jem/lib/kettle/jem/templates/shim/Gemfile.example index 5d7d3db83..86c12b7b0 100644 --- a/gems/kettle-jem/lib/kettle/jem/templates/shim/Gemfile.example +++ b/gems/kettle-jem/lib/kettle/jem/templates/shim/Gemfile.example @@ -8,7 +8,7 @@ gem "{KJ|SHIMMED_GEM_NAME}", path: shimmed_gem_path unless shimmed_gem_path.empt # Local workspace dependency wiring for templating_local.gemfile overrides. gem "nomono", "~> 1.0", ">= 1.0.8", require: false # ruby >= 2.2 -# Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) +# Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? gemspec diff --git a/gems/kettle-jem/spec/thin_slice_spec.rb b/gems/kettle-jem/spec/thin_slice_spec.rb index c2e7eb2dd..f78638175 100644 --- a/gems/kettle-jem/spec/thin_slice_spec.rb +++ b/gems/kettle-jem/spec/thin_slice_spec.rb @@ -310,7 +310,7 @@ expect(generated[:Gemfile]).to include(%(eval_gemfile "gemfiles/modular/templating.gemfile")) expect(generated[:Gemfile]).not_to include("git:") expect_gem_dependency_declared(generated[:"gemfiles/modular/templating.gemfile"], "kettle-jem") - expect(generated[:"gemfiles/modular/templating_local.gemfile"]).to include(%(smorg_rb_local_gems = %w[)) + expect(generated[:"gemfiles/modular/templating_local.gemfile"]).to include(%(structuredmerge_local_gems = %w[)) expect(generated[:"legacy-shim.gemspec"]).not_to include("old-implementation") expect(generated[:"lib/legacy/shim.rb"]).to include(%(require "legacy-shim2")) expect(generated[:"lib/legacy/strategies/shim.rb"]).to include(%(require "legacy/shim")) @@ -5062,7 +5062,7 @@ module Version expect(Kettle::Jem::Tasks::InstallTask.setup_command_env(root, env)).to include( "BUNDLE_GEMFILE" => File.join(root, "Gemfile"), "K_JEM_TEMPLATING" => "true", - "SMORG_RB_DEV" => marker.fetch("members_root"), + "STRUCTUREDMERGE_DEV" => marker.fetch("members_root"), "KETTLE_RB_DEV" => File.join(root, "kettle-dev") ) end @@ -5109,7 +5109,7 @@ module Version "K_JEM_TEMPLATING" => "true", "KETTLE_RB_DEV" => "/workspace/my", "GALTZO_FLOSS_DEV" => "/workspace/galtzo-floss", - "SMORG_RB_DEV" => "/workspace/smorg-rb" + "STRUCTUREDMERGE_DEV" => "/workspace/smorg-rb" } commands = [] command_runner = lambda do |command, chdir:, env:, quiet:| @@ -5142,7 +5142,7 @@ module Version "K_JEM_TEMPLATING" => "false", "KETTLE_RB_DEV" => "false", "GALTZO_FLOSS_DEV" => "false", - "SMORG_RB_DEV" => "false" + "STRUCTUREDMERGE_DEV" => "false" ) expect(commands.map { |entry| entry.fetch(:command) }).not_to include(%w[git add -A]) end @@ -5217,7 +5217,7 @@ module Version "K_JEM_TEMPLATING" => "true", "KETTLE_RB_DEV" => "/workspace/my", "GALTZO_FLOSS_DEV" => "/workspace/galtzo-floss", - "SMORG_RB_DEV" => "/workspace/smorg-rb", + "STRUCTUREDMERGE_DEV" => "/workspace/smorg-rb", "RUBYOPT" => "-rbundler/setup", "RUBYLIB" => "/workspace/kettle-jem/lib", "BUNDLE_BIN_PATH" => "/workspace/kettle-jem/bin/bundle", @@ -5251,7 +5251,7 @@ module Version "K_JEM_TEMPLATING" => "false", "KETTLE_RB_DEV" => "false", "GALTZO_FLOSS_DEV" => "false", - "SMORG_RB_DEV" => "false" + "STRUCTUREDMERGE_DEV" => "false" ) expect(lock_command.fetch(:env)).to include( "RUBYOPT" => nil, @@ -14463,7 +14463,7 @@ def register_kettle_jem_plugin(registrar) ) end - # Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) + # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? RUBY ".kettle-jem.yml" => <<~YAML diff --git a/gems/kramdown-merge/Gemfile b/gems/kramdown-merge/Gemfile index a1cbf2eb6..d2345c8bd 100644 --- a/gems/kramdown-merge/Gemfile +++ b/gems/kramdown-merge/Gemfile @@ -208,7 +208,7 @@ unless tslp_declared_by_templating end end -# Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) +# Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging diff --git a/gems/kramdown-merge/Gemfile.lock b/gems/kramdown-merge/Gemfile.lock index 57cd10b37..52505fe3d 100644 --- a/gems/kramdown-merge/Gemfile.lock +++ b/gems/kramdown-merge/Gemfile.lock @@ -45,6 +45,7 @@ PATH specs: ast-merge-git (7.1.0) ast-merge (= 7.1.0) + json-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH @@ -147,6 +148,14 @@ PATH tree_haver (= 7.1.0) yaml-merge (= 7.1.0) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: @@ -266,14 +275,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: diff --git a/gems/kramdown-merge/gemfiles/modular/templating.gemfile b/gems/kramdown-merge/gemfiles/modular/templating.gemfile index 0d1c9bcf4..e3c24e6b7 100644 --- a/gems/kramdown-merge/gemfiles/modular/templating.gemfile +++ b/gems/kramdown-merge/gemfiles/modular/templating.gemfile @@ -1,9 +1,9 @@ # frozen_string_literal: true -smorg_remote = ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false').zero? +structuredmerge_remote = ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false').zero? kettle_remote = ENV.fetch('KETTLE_RB_DEV', 'false').casecmp('false').zero? -if smorg_remote +if structuredmerge_remote # Merge recipes and parser dependencies for released installs. gem 'kettle-jem', '>= 7.0' end @@ -13,10 +13,10 @@ if kettle_remote gem 'kettle-drift', '~> 1.0', '>= 1.0.5', require: false end -# Set SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. +# Set STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. # When false (default / CI), released kettle-jem brings merge gems and parser dependencies. # Local path overrides bring the same dependencies from sibling gemspecs. # # Set KETTLE_RB_DEV=/path/to/kettle-rb for local development with Kettle plugin gems. # When false (default / CI), released Kettle plugin gems are used. -eval_gemfile 'templating_local.gemfile' unless smorg_remote && kettle_remote +eval_gemfile 'templating_local.gemfile' unless structuredmerge_remote && kettle_remote diff --git a/gems/kramdown-merge/gemfiles/modular/templating_local.gemfile b/gems/kramdown-merge/gemfiles/modular/templating_local.gemfile index f92859fae..c6aa2eb79 100644 --- a/gems/kramdown-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/kramdown-merge/gemfiles/modular/templating_local.gemfile @@ -1,12 +1,12 @@ # frozen_string_literal: true # Local path overrides for templating development. -# Loaded by the associated non-local gemfile when SMORG_RB_DEV or KETTLE_RB_DEV +# Loaded by the associated non-local gemfile when STRUCTUREDMERGE_DEV or KETTLE_RB_DEV # is not "false". require 'nomono/bundler' unless defined?(Nomono) -smorg_rb_local_gems = %w[ +structuredmerge_local_gems = %w[ tree_haver ast-merge ast-merge-git @@ -43,7 +43,7 @@ kettle_rb_local_gems = %w[ kettle-dev kettle-test kettle-soup-cover kettle-drift ] declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -smorg_rb_local_gems_to_eval = smorg_rb_local_gems - %w[kramdown-merge] - declared_gems +structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[kramdown-merge] - declared_gems kettle_rb_local_gems_to_eval = kettle_rb_local_gems - %w[kramdown-merge] - declared_gems tslp_dev = ENV.fetch('TSLP_DEV', nil) @@ -52,14 +52,14 @@ tslp_dev = ENV.fetch('TSLP_DEV', nil) platform :mri do gem 'tree_sitter_language_pack', path: tslp_dev unless tslp_dev.to_s.empty? - if ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false') != 0 + if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( - gems: smorg_rb_local_gems_to_eval, - prefix: 'SMORG_RB', - path_env: 'SMORG_RB_DEV', + gems: structuredmerge_local_gems_to_eval, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', vendored_gems_env: 'VENDORED_GEMS', vendor_gem_dir_env: 'VENDOR_GEM_DIR', - debug_env: 'SMORG_RB_DEBUG' + debug_env: 'STRUCTUREDMERGE_DEBUG' ) end diff --git a/gems/markdown-merge/Gemfile b/gems/markdown-merge/Gemfile index ecfafa889..59e0ca9e8 100644 --- a/gems/markdown-merge/Gemfile +++ b/gems/markdown-merge/Gemfile @@ -209,7 +209,7 @@ unless tslp_declared_by_templating end end -# Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) +# Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging diff --git a/gems/markdown-merge/Gemfile.lock b/gems/markdown-merge/Gemfile.lock index bd1155394..4c5b1f622 100644 --- a/gems/markdown-merge/Gemfile.lock +++ b/gems/markdown-merge/Gemfile.lock @@ -45,6 +45,16 @@ PATH specs: ast-merge-git (7.1.0) ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH @@ -233,6 +243,15 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: @@ -256,24 +275,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: diff --git a/gems/markdown-merge/gemfiles/modular/templating.gemfile b/gems/markdown-merge/gemfiles/modular/templating.gemfile index 0d1c9bcf4..e3c24e6b7 100644 --- a/gems/markdown-merge/gemfiles/modular/templating.gemfile +++ b/gems/markdown-merge/gemfiles/modular/templating.gemfile @@ -1,9 +1,9 @@ # frozen_string_literal: true -smorg_remote = ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false').zero? +structuredmerge_remote = ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false').zero? kettle_remote = ENV.fetch('KETTLE_RB_DEV', 'false').casecmp('false').zero? -if smorg_remote +if structuredmerge_remote # Merge recipes and parser dependencies for released installs. gem 'kettle-jem', '>= 7.0' end @@ -13,10 +13,10 @@ if kettle_remote gem 'kettle-drift', '~> 1.0', '>= 1.0.5', require: false end -# Set SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. +# Set STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. # When false (default / CI), released kettle-jem brings merge gems and parser dependencies. # Local path overrides bring the same dependencies from sibling gemspecs. # # Set KETTLE_RB_DEV=/path/to/kettle-rb for local development with Kettle plugin gems. # When false (default / CI), released Kettle plugin gems are used. -eval_gemfile 'templating_local.gemfile' unless smorg_remote && kettle_remote +eval_gemfile 'templating_local.gemfile' unless structuredmerge_remote && kettle_remote diff --git a/gems/markdown-merge/gemfiles/modular/templating_local.gemfile b/gems/markdown-merge/gemfiles/modular/templating_local.gemfile index e250d15b6..c206a246f 100644 --- a/gems/markdown-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/markdown-merge/gemfiles/modular/templating_local.gemfile @@ -1,12 +1,12 @@ # frozen_string_literal: true # Local path overrides for templating development. -# Loaded by the associated non-local gemfile when SMORG_RB_DEV or KETTLE_RB_DEV +# Loaded by the associated non-local gemfile when STRUCTUREDMERGE_DEV or KETTLE_RB_DEV # is not "false". require 'nomono/bundler' unless defined?(Nomono) -smorg_rb_local_gems = %w[ +structuredmerge_local_gems = %w[ tree_haver ast-merge ast-merge-git @@ -43,7 +43,7 @@ kettle_rb_local_gems = %w[ kettle-dev kettle-test kettle-soup-cover kettle-drift ] declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -smorg_rb_local_gems_to_eval = smorg_rb_local_gems - %w[markdown-merge] - declared_gems +structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[markdown-merge] - declared_gems kettle_rb_local_gems_to_eval = kettle_rb_local_gems - %w[markdown-merge] - declared_gems tslp_dev = ENV.fetch('TSLP_DEV', nil) @@ -52,14 +52,14 @@ tslp_dev = ENV.fetch('TSLP_DEV', nil) platform :mri do gem 'tree_sitter_language_pack', path: tslp_dev unless tslp_dev.to_s.empty? - if ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false') != 0 + if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( - gems: smorg_rb_local_gems_to_eval, - prefix: 'SMORG_RB', - path_env: 'SMORG_RB_DEV', + gems: structuredmerge_local_gems_to_eval, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', vendored_gems_env: 'VENDORED_GEMS', vendor_gem_dir_env: 'VENDOR_GEM_DIR', - debug_env: 'SMORG_RB_DEBUG' + debug_env: 'STRUCTUREDMERGE_DEBUG' ) end diff --git a/gems/markly-merge/Gemfile b/gems/markly-merge/Gemfile index 0a61a6c58..21be9633c 100644 --- a/gems/markly-merge/Gemfile +++ b/gems/markly-merge/Gemfile @@ -208,7 +208,7 @@ unless tslp_declared_by_templating end end -# Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) +# Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging diff --git a/gems/markly-merge/Gemfile.lock b/gems/markly-merge/Gemfile.lock index b23bb3c29..7426d4dd7 100644 --- a/gems/markly-merge/Gemfile.lock +++ b/gems/markly-merge/Gemfile.lock @@ -45,6 +45,7 @@ PATH specs: ast-merge-git (7.1.0) ast-merge (= 7.1.0) + json-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH @@ -155,6 +156,14 @@ PATH markdown-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge specs: @@ -266,14 +275,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: diff --git a/gems/markly-merge/gemfiles/modular/templating.gemfile b/gems/markly-merge/gemfiles/modular/templating.gemfile index 0d1c9bcf4..e3c24e6b7 100644 --- a/gems/markly-merge/gemfiles/modular/templating.gemfile +++ b/gems/markly-merge/gemfiles/modular/templating.gemfile @@ -1,9 +1,9 @@ # frozen_string_literal: true -smorg_remote = ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false').zero? +structuredmerge_remote = ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false').zero? kettle_remote = ENV.fetch('KETTLE_RB_DEV', 'false').casecmp('false').zero? -if smorg_remote +if structuredmerge_remote # Merge recipes and parser dependencies for released installs. gem 'kettle-jem', '>= 7.0' end @@ -13,10 +13,10 @@ if kettle_remote gem 'kettle-drift', '~> 1.0', '>= 1.0.5', require: false end -# Set SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. +# Set STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. # When false (default / CI), released kettle-jem brings merge gems and parser dependencies. # Local path overrides bring the same dependencies from sibling gemspecs. # # Set KETTLE_RB_DEV=/path/to/kettle-rb for local development with Kettle plugin gems. # When false (default / CI), released Kettle plugin gems are used. -eval_gemfile 'templating_local.gemfile' unless smorg_remote && kettle_remote +eval_gemfile 'templating_local.gemfile' unless structuredmerge_remote && kettle_remote diff --git a/gems/markly-merge/gemfiles/modular/templating_local.gemfile b/gems/markly-merge/gemfiles/modular/templating_local.gemfile index 5d0020cfe..697d305f3 100644 --- a/gems/markly-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/markly-merge/gemfiles/modular/templating_local.gemfile @@ -1,12 +1,12 @@ # frozen_string_literal: true # Local path overrides for templating development. -# Loaded by the associated non-local gemfile when SMORG_RB_DEV or KETTLE_RB_DEV +# Loaded by the associated non-local gemfile when STRUCTUREDMERGE_DEV or KETTLE_RB_DEV # is not "false". require 'nomono/bundler' unless defined?(Nomono) -smorg_rb_local_gems = %w[ +structuredmerge_local_gems = %w[ tree_haver ast-merge ast-merge-git @@ -43,7 +43,7 @@ kettle_rb_local_gems = %w[ kettle-dev kettle-test kettle-soup-cover kettle-drift ] declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -smorg_rb_local_gems_to_eval = smorg_rb_local_gems - %w[markly-merge] - declared_gems +structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[markly-merge] - declared_gems kettle_rb_local_gems_to_eval = kettle_rb_local_gems - %w[markly-merge] - declared_gems tslp_dev = ENV.fetch('TSLP_DEV', nil) @@ -52,14 +52,14 @@ tslp_dev = ENV.fetch('TSLP_DEV', nil) platform :mri do gem 'tree_sitter_language_pack', path: tslp_dev unless tslp_dev.to_s.empty? - if ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false') != 0 + if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( - gems: smorg_rb_local_gems_to_eval, - prefix: 'SMORG_RB', - path_env: 'SMORG_RB_DEV', + gems: structuredmerge_local_gems_to_eval, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', vendored_gems_env: 'VENDORED_GEMS', vendor_gem_dir_env: 'VENDOR_GEM_DIR', - debug_env: 'SMORG_RB_DEBUG' + debug_env: 'STRUCTUREDMERGE_DEBUG' ) end diff --git a/gems/parslet-toml-merge/Gemfile b/gems/parslet-toml-merge/Gemfile index 213293761..80faabf44 100644 --- a/gems/parslet-toml-merge/Gemfile +++ b/gems/parslet-toml-merge/Gemfile @@ -208,7 +208,7 @@ unless tslp_declared_by_templating end end -# Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) +# Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging diff --git a/gems/parslet-toml-merge/Gemfile.lock b/gems/parslet-toml-merge/Gemfile.lock index c3f3a6074..df4537702 100644 --- a/gems/parslet-toml-merge/Gemfile.lock +++ b/gems/parslet-toml-merge/Gemfile.lock @@ -45,6 +45,7 @@ PATH specs: ast-merge-git (7.1.0) ast-merge (= 7.1.0) + json-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH @@ -234,6 +235,14 @@ PATH plain-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: @@ -266,14 +275,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: diff --git a/gems/parslet-toml-merge/gemfiles/modular/templating.gemfile b/gems/parslet-toml-merge/gemfiles/modular/templating.gemfile index 0d1c9bcf4..e3c24e6b7 100644 --- a/gems/parslet-toml-merge/gemfiles/modular/templating.gemfile +++ b/gems/parslet-toml-merge/gemfiles/modular/templating.gemfile @@ -1,9 +1,9 @@ # frozen_string_literal: true -smorg_remote = ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false').zero? +structuredmerge_remote = ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false').zero? kettle_remote = ENV.fetch('KETTLE_RB_DEV', 'false').casecmp('false').zero? -if smorg_remote +if structuredmerge_remote # Merge recipes and parser dependencies for released installs. gem 'kettle-jem', '>= 7.0' end @@ -13,10 +13,10 @@ if kettle_remote gem 'kettle-drift', '~> 1.0', '>= 1.0.5', require: false end -# Set SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. +# Set STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. # When false (default / CI), released kettle-jem brings merge gems and parser dependencies. # Local path overrides bring the same dependencies from sibling gemspecs. # # Set KETTLE_RB_DEV=/path/to/kettle-rb for local development with Kettle plugin gems. # When false (default / CI), released Kettle plugin gems are used. -eval_gemfile 'templating_local.gemfile' unless smorg_remote && kettle_remote +eval_gemfile 'templating_local.gemfile' unless structuredmerge_remote && 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 b1cccd83e..891bb61ba 100644 --- a/gems/parslet-toml-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/parslet-toml-merge/gemfiles/modular/templating_local.gemfile @@ -1,12 +1,12 @@ # frozen_string_literal: true # Local path overrides for templating development. -# Loaded by the associated non-local gemfile when SMORG_RB_DEV or KETTLE_RB_DEV +# Loaded by the associated non-local gemfile when STRUCTUREDMERGE_DEV or KETTLE_RB_DEV # is not "false". require 'nomono/bundler' unless defined?(Nomono) -smorg_rb_local_gems = %w[ +structuredmerge_local_gems = %w[ tree_haver ast-merge ast-merge-git @@ -43,7 +43,7 @@ kettle_rb_local_gems = %w[ kettle-dev kettle-test kettle-soup-cover kettle-drift ] declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -smorg_rb_local_gems_to_eval = smorg_rb_local_gems - %w[parslet-toml-merge] - declared_gems +structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[parslet-toml-merge] - declared_gems kettle_rb_local_gems_to_eval = kettle_rb_local_gems - %w[parslet-toml-merge] - declared_gems tslp_dev = ENV.fetch('TSLP_DEV', nil) @@ -52,14 +52,14 @@ tslp_dev = ENV.fetch('TSLP_DEV', nil) platform :mri do gem 'tree_sitter_language_pack', path: tslp_dev unless tslp_dev.to_s.empty? - if ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false') != 0 + if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( - gems: smorg_rb_local_gems_to_eval, - prefix: 'SMORG_RB', - path_env: 'SMORG_RB_DEV', + gems: structuredmerge_local_gems_to_eval, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', vendored_gems_env: 'VENDORED_GEMS', vendor_gem_dir_env: 'VENDOR_GEM_DIR', - debug_env: 'SMORG_RB_DEBUG' + debug_env: 'STRUCTUREDMERGE_DEBUG' ) end diff --git a/gems/plain-merge/Gemfile b/gems/plain-merge/Gemfile index a27cc77db..02c2c3c6c 100644 --- a/gems/plain-merge/Gemfile +++ b/gems/plain-merge/Gemfile @@ -209,7 +209,7 @@ unless tslp_declared_by_templating end end -# Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) +# Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging diff --git a/gems/plain-merge/Gemfile.lock b/gems/plain-merge/Gemfile.lock index 5b8ab48da..4c3531bca 100644 --- a/gems/plain-merge/Gemfile.lock +++ b/gems/plain-merge/Gemfile.lock @@ -45,6 +45,16 @@ PATH specs: ast-merge-git (7.1.0) ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH @@ -233,6 +243,15 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: @@ -256,24 +275,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: diff --git a/gems/plain-merge/gemfiles/modular/templating.gemfile b/gems/plain-merge/gemfiles/modular/templating.gemfile index 0d1c9bcf4..e3c24e6b7 100644 --- a/gems/plain-merge/gemfiles/modular/templating.gemfile +++ b/gems/plain-merge/gemfiles/modular/templating.gemfile @@ -1,9 +1,9 @@ # frozen_string_literal: true -smorg_remote = ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false').zero? +structuredmerge_remote = ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false').zero? kettle_remote = ENV.fetch('KETTLE_RB_DEV', 'false').casecmp('false').zero? -if smorg_remote +if structuredmerge_remote # Merge recipes and parser dependencies for released installs. gem 'kettle-jem', '>= 7.0' end @@ -13,10 +13,10 @@ if kettle_remote gem 'kettle-drift', '~> 1.0', '>= 1.0.5', require: false end -# Set SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. +# Set STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. # When false (default / CI), released kettle-jem brings merge gems and parser dependencies. # Local path overrides bring the same dependencies from sibling gemspecs. # # Set KETTLE_RB_DEV=/path/to/kettle-rb for local development with Kettle plugin gems. # When false (default / CI), released Kettle plugin gems are used. -eval_gemfile 'templating_local.gemfile' unless smorg_remote && kettle_remote +eval_gemfile 'templating_local.gemfile' unless structuredmerge_remote && kettle_remote diff --git a/gems/plain-merge/gemfiles/modular/templating_local.gemfile b/gems/plain-merge/gemfiles/modular/templating_local.gemfile index d90dca474..f8566b835 100644 --- a/gems/plain-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/plain-merge/gemfiles/modular/templating_local.gemfile @@ -1,12 +1,12 @@ # frozen_string_literal: true # Local path overrides for templating development. -# Loaded by the associated non-local gemfile when SMORG_RB_DEV or KETTLE_RB_DEV +# Loaded by the associated non-local gemfile when STRUCTUREDMERGE_DEV or KETTLE_RB_DEV # is not "false". require 'nomono/bundler' unless defined?(Nomono) -smorg_rb_local_gems = %w[ +structuredmerge_local_gems = %w[ tree_haver ast-merge ast-merge-git @@ -43,7 +43,7 @@ kettle_rb_local_gems = %w[ kettle-dev kettle-test kettle-soup-cover kettle-drift ] declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -smorg_rb_local_gems_to_eval = smorg_rb_local_gems - %w[plain-merge] - declared_gems +structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[plain-merge] - declared_gems kettle_rb_local_gems_to_eval = kettle_rb_local_gems - %w[plain-merge] - declared_gems tslp_dev = ENV.fetch('TSLP_DEV', nil) @@ -52,14 +52,14 @@ tslp_dev = ENV.fetch('TSLP_DEV', nil) platform :mri do gem 'tree_sitter_language_pack', path: tslp_dev unless tslp_dev.to_s.empty? - if ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false') != 0 + if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( - gems: smorg_rb_local_gems_to_eval, - prefix: 'SMORG_RB', - path_env: 'SMORG_RB_DEV', + gems: structuredmerge_local_gems_to_eval, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', vendored_gems_env: 'VENDORED_GEMS', vendor_gem_dir_env: 'VENDOR_GEM_DIR', - debug_env: 'SMORG_RB_DEBUG' + debug_env: 'STRUCTUREDMERGE_DEBUG' ) end diff --git a/gems/prism-merge/Gemfile b/gems/prism-merge/Gemfile index 4c79ddd51..90383afce 100644 --- a/gems/prism-merge/Gemfile +++ b/gems/prism-merge/Gemfile @@ -208,7 +208,7 @@ unless tslp_declared_by_templating end end -# Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) +# Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging diff --git a/gems/prism-merge/Gemfile.lock b/gems/prism-merge/Gemfile.lock index 274bfa8b3..4cf6a5c42 100644 --- a/gems/prism-merge/Gemfile.lock +++ b/gems/prism-merge/Gemfile.lock @@ -45,6 +45,7 @@ PATH specs: ast-merge-git (7.1.0) ast-merge (= 7.1.0) + json-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH @@ -205,6 +206,14 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge specs: @@ -266,14 +275,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: diff --git a/gems/prism-merge/gemfiles/modular/templating.gemfile b/gems/prism-merge/gemfiles/modular/templating.gemfile index 0d1c9bcf4..e3c24e6b7 100644 --- a/gems/prism-merge/gemfiles/modular/templating.gemfile +++ b/gems/prism-merge/gemfiles/modular/templating.gemfile @@ -1,9 +1,9 @@ # frozen_string_literal: true -smorg_remote = ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false').zero? +structuredmerge_remote = ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false').zero? kettle_remote = ENV.fetch('KETTLE_RB_DEV', 'false').casecmp('false').zero? -if smorg_remote +if structuredmerge_remote # Merge recipes and parser dependencies for released installs. gem 'kettle-jem', '>= 7.0' end @@ -13,10 +13,10 @@ if kettle_remote gem 'kettle-drift', '~> 1.0', '>= 1.0.5', require: false end -# Set SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. +# Set STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. # When false (default / CI), released kettle-jem brings merge gems and parser dependencies. # Local path overrides bring the same dependencies from sibling gemspecs. # # Set KETTLE_RB_DEV=/path/to/kettle-rb for local development with Kettle plugin gems. # When false (default / CI), released Kettle plugin gems are used. -eval_gemfile 'templating_local.gemfile' unless smorg_remote && kettle_remote +eval_gemfile 'templating_local.gemfile' unless structuredmerge_remote && kettle_remote diff --git a/gems/prism-merge/gemfiles/modular/templating_local.gemfile b/gems/prism-merge/gemfiles/modular/templating_local.gemfile index 5c9f8cab6..b212bdc16 100644 --- a/gems/prism-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/prism-merge/gemfiles/modular/templating_local.gemfile @@ -1,12 +1,12 @@ # frozen_string_literal: true # Local path overrides for templating development. -# Loaded by the associated non-local gemfile when SMORG_RB_DEV or KETTLE_RB_DEV +# Loaded by the associated non-local gemfile when STRUCTUREDMERGE_DEV or KETTLE_RB_DEV # is not "false". require 'nomono/bundler' unless defined?(Nomono) -smorg_rb_local_gems = %w[ +structuredmerge_local_gems = %w[ tree_haver ast-merge ast-merge-git @@ -43,7 +43,7 @@ kettle_rb_local_gems = %w[ kettle-dev kettle-test kettle-soup-cover kettle-drift ] declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -smorg_rb_local_gems_to_eval = smorg_rb_local_gems - %w[prism-merge] - declared_gems +structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[prism-merge] - declared_gems kettle_rb_local_gems_to_eval = kettle_rb_local_gems - %w[prism-merge] - declared_gems tslp_dev = ENV.fetch('TSLP_DEV', nil) @@ -52,14 +52,14 @@ tslp_dev = ENV.fetch('TSLP_DEV', nil) platform :mri do gem 'tree_sitter_language_pack', path: tslp_dev unless tslp_dev.to_s.empty? - if ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false') != 0 + if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( - gems: smorg_rb_local_gems_to_eval, - prefix: 'SMORG_RB', - path_env: 'SMORG_RB_DEV', + gems: structuredmerge_local_gems_to_eval, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', vendored_gems_env: 'VENDORED_GEMS', vendor_gem_dir_env: 'VENDOR_GEM_DIR', - debug_env: 'SMORG_RB_DEBUG' + debug_env: 'STRUCTUREDMERGE_DEBUG' ) end diff --git a/gems/psych-merge/Gemfile b/gems/psych-merge/Gemfile index 8b99afe28..02881d303 100644 --- a/gems/psych-merge/Gemfile +++ b/gems/psych-merge/Gemfile @@ -250,7 +250,7 @@ unless tslp_declared_by_templating end end -# Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) +# Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging diff --git a/gems/psych-merge/Gemfile.lock b/gems/psych-merge/Gemfile.lock index 74ca6bd0e..f43488920 100644 --- a/gems/psych-merge/Gemfile.lock +++ b/gems/psych-merge/Gemfile.lock @@ -46,6 +46,16 @@ PATH specs: ast-merge-git (7.1.0) ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH @@ -234,43 +244,34 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: - zip-merge (7.1.0) + typescript-merge (7.1.0) + ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) + yaml-merge (7.1.0) + ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) + zip-merge (7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) diff --git a/gems/psych-merge/gemfiles/modular/templating.gemfile b/gems/psych-merge/gemfiles/modular/templating.gemfile index 0d1c9bcf4..e3c24e6b7 100644 --- a/gems/psych-merge/gemfiles/modular/templating.gemfile +++ b/gems/psych-merge/gemfiles/modular/templating.gemfile @@ -1,9 +1,9 @@ # frozen_string_literal: true -smorg_remote = ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false').zero? +structuredmerge_remote = ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false').zero? kettle_remote = ENV.fetch('KETTLE_RB_DEV', 'false').casecmp('false').zero? -if smorg_remote +if structuredmerge_remote # Merge recipes and parser dependencies for released installs. gem 'kettle-jem', '>= 7.0' end @@ -13,10 +13,10 @@ if kettle_remote gem 'kettle-drift', '~> 1.0', '>= 1.0.5', require: false end -# Set SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. +# Set STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. # When false (default / CI), released kettle-jem brings merge gems and parser dependencies. # Local path overrides bring the same dependencies from sibling gemspecs. # # Set KETTLE_RB_DEV=/path/to/kettle-rb for local development with Kettle plugin gems. # When false (default / CI), released Kettle plugin gems are used. -eval_gemfile 'templating_local.gemfile' unless smorg_remote && kettle_remote +eval_gemfile 'templating_local.gemfile' unless structuredmerge_remote && kettle_remote diff --git a/gems/psych-merge/gemfiles/modular/templating_local.gemfile b/gems/psych-merge/gemfiles/modular/templating_local.gemfile index 6de7cca7c..b1645acac 100644 --- a/gems/psych-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/psych-merge/gemfiles/modular/templating_local.gemfile @@ -1,12 +1,12 @@ # frozen_string_literal: true # Local path overrides for templating development. -# Loaded by the associated non-local gemfile when SMORG_RB_DEV or KETTLE_RB_DEV +# Loaded by the associated non-local gemfile when STRUCTUREDMERGE_DEV or KETTLE_RB_DEV # is not "false". require 'nomono/bundler' unless defined?(Nomono) -smorg_rb_local_gems = %w[ +structuredmerge_local_gems = %w[ tree_haver ast-merge ast-merge-git @@ -43,7 +43,7 @@ kettle_rb_local_gems = %w[ kettle-dev kettle-test kettle-soup-cover kettle-drift ] declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -smorg_rb_local_gems_to_eval = smorg_rb_local_gems - %w[psych-merge] - declared_gems +structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[psych-merge] - declared_gems kettle_rb_local_gems_to_eval = kettle_rb_local_gems - %w[psych-merge] - declared_gems tslp_dev = ENV.fetch('TSLP_DEV', nil) @@ -52,14 +52,14 @@ tslp_dev = ENV.fetch('TSLP_DEV', nil) platform :mri do gem 'tree_sitter_language_pack', path: tslp_dev unless tslp_dev.to_s.empty? - if ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false') != 0 + if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( - gems: smorg_rb_local_gems_to_eval, - prefix: 'SMORG_RB', - path_env: 'SMORG_RB_DEV', + gems: structuredmerge_local_gems_to_eval, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', vendored_gems_env: 'VENDORED_GEMS', vendor_gem_dir_env: 'VENDOR_GEM_DIR', - debug_env: 'SMORG_RB_DEBUG' + debug_env: 'STRUCTUREDMERGE_DEBUG' ) end diff --git a/gems/rbs-merge/Gemfile b/gems/rbs-merge/Gemfile index 2e8673d99..6adb7645e 100644 --- a/gems/rbs-merge/Gemfile +++ b/gems/rbs-merge/Gemfile @@ -209,7 +209,7 @@ unless tslp_declared_by_templating end end -# Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) +# Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging diff --git a/gems/rbs-merge/Gemfile.lock b/gems/rbs-merge/Gemfile.lock index 2f4ada4b0..99e609b1a 100644 --- a/gems/rbs-merge/Gemfile.lock +++ b/gems/rbs-merge/Gemfile.lock @@ -46,6 +46,16 @@ PATH specs: ast-merge-git (7.1.0) ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH @@ -233,6 +243,15 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: @@ -256,24 +275,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: diff --git a/gems/rbs-merge/gemfiles/modular/templating.gemfile b/gems/rbs-merge/gemfiles/modular/templating.gemfile index 0d1c9bcf4..e3c24e6b7 100644 --- a/gems/rbs-merge/gemfiles/modular/templating.gemfile +++ b/gems/rbs-merge/gemfiles/modular/templating.gemfile @@ -1,9 +1,9 @@ # frozen_string_literal: true -smorg_remote = ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false').zero? +structuredmerge_remote = ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false').zero? kettle_remote = ENV.fetch('KETTLE_RB_DEV', 'false').casecmp('false').zero? -if smorg_remote +if structuredmerge_remote # Merge recipes and parser dependencies for released installs. gem 'kettle-jem', '>= 7.0' end @@ -13,10 +13,10 @@ if kettle_remote gem 'kettle-drift', '~> 1.0', '>= 1.0.5', require: false end -# Set SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. +# Set STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. # When false (default / CI), released kettle-jem brings merge gems and parser dependencies. # Local path overrides bring the same dependencies from sibling gemspecs. # # Set KETTLE_RB_DEV=/path/to/kettle-rb for local development with Kettle plugin gems. # When false (default / CI), released Kettle plugin gems are used. -eval_gemfile 'templating_local.gemfile' unless smorg_remote && kettle_remote +eval_gemfile 'templating_local.gemfile' unless structuredmerge_remote && kettle_remote diff --git a/gems/rbs-merge/gemfiles/modular/templating_local.gemfile b/gems/rbs-merge/gemfiles/modular/templating_local.gemfile index 361e484f6..05ae1c914 100644 --- a/gems/rbs-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/rbs-merge/gemfiles/modular/templating_local.gemfile @@ -1,12 +1,12 @@ # frozen_string_literal: true # Local path overrides for templating development. -# Loaded by the associated non-local gemfile when SMORG_RB_DEV or KETTLE_RB_DEV +# Loaded by the associated non-local gemfile when STRUCTUREDMERGE_DEV or KETTLE_RB_DEV # is not "false". require 'nomono/bundler' unless defined?(Nomono) -smorg_rb_local_gems = %w[ +structuredmerge_local_gems = %w[ tree_haver ast-merge ast-merge-git @@ -43,7 +43,7 @@ kettle_rb_local_gems = %w[ kettle-dev kettle-test kettle-soup-cover kettle-drift ] declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -smorg_rb_local_gems_to_eval = smorg_rb_local_gems - %w[rbs-merge] - declared_gems +structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[rbs-merge] - declared_gems kettle_rb_local_gems_to_eval = kettle_rb_local_gems - %w[rbs-merge] - declared_gems tslp_dev = ENV.fetch('TSLP_DEV', nil) @@ -52,14 +52,14 @@ tslp_dev = ENV.fetch('TSLP_DEV', nil) platform :mri do gem 'tree_sitter_language_pack', path: tslp_dev unless tslp_dev.to_s.empty? - if ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false') != 0 + if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( - gems: smorg_rb_local_gems_to_eval, - prefix: 'SMORG_RB', - path_env: 'SMORG_RB_DEV', + gems: structuredmerge_local_gems_to_eval, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', vendored_gems_env: 'VENDORED_GEMS', vendor_gem_dir_env: 'VENDOR_GEM_DIR', - debug_env: 'SMORG_RB_DEBUG' + debug_env: 'STRUCTUREDMERGE_DEBUG' ) end diff --git a/gems/ruby-merge/Gemfile b/gems/ruby-merge/Gemfile index f8aba7c8b..32bbd4291 100644 --- a/gems/ruby-merge/Gemfile +++ b/gems/ruby-merge/Gemfile @@ -209,7 +209,7 @@ unless tslp_declared_by_templating end end -# Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) +# Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging diff --git a/gems/ruby-merge/Gemfile.lock b/gems/ruby-merge/Gemfile.lock index 3a51cc768..198237732 100644 --- a/gems/ruby-merge/Gemfile.lock +++ b/gems/ruby-merge/Gemfile.lock @@ -45,6 +45,16 @@ PATH specs: ast-merge-git (7.1.0) ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH @@ -233,6 +243,15 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: @@ -256,24 +275,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: diff --git a/gems/ruby-merge/gemfiles/modular/templating.gemfile b/gems/ruby-merge/gemfiles/modular/templating.gemfile index 0d1c9bcf4..e3c24e6b7 100644 --- a/gems/ruby-merge/gemfiles/modular/templating.gemfile +++ b/gems/ruby-merge/gemfiles/modular/templating.gemfile @@ -1,9 +1,9 @@ # frozen_string_literal: true -smorg_remote = ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false').zero? +structuredmerge_remote = ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false').zero? kettle_remote = ENV.fetch('KETTLE_RB_DEV', 'false').casecmp('false').zero? -if smorg_remote +if structuredmerge_remote # Merge recipes and parser dependencies for released installs. gem 'kettle-jem', '>= 7.0' end @@ -13,10 +13,10 @@ if kettle_remote gem 'kettle-drift', '~> 1.0', '>= 1.0.5', require: false end -# Set SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. +# Set STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. # When false (default / CI), released kettle-jem brings merge gems and parser dependencies. # Local path overrides bring the same dependencies from sibling gemspecs. # # Set KETTLE_RB_DEV=/path/to/kettle-rb for local development with Kettle plugin gems. # When false (default / CI), released Kettle plugin gems are used. -eval_gemfile 'templating_local.gemfile' unless smorg_remote && kettle_remote +eval_gemfile 'templating_local.gemfile' unless structuredmerge_remote && kettle_remote diff --git a/gems/ruby-merge/gemfiles/modular/templating_local.gemfile b/gems/ruby-merge/gemfiles/modular/templating_local.gemfile index 6c07b8094..a1631fd2e 100644 --- a/gems/ruby-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/ruby-merge/gemfiles/modular/templating_local.gemfile @@ -1,12 +1,12 @@ # frozen_string_literal: true # Local path overrides for templating development. -# Loaded by the associated non-local gemfile when SMORG_RB_DEV or KETTLE_RB_DEV +# Loaded by the associated non-local gemfile when STRUCTUREDMERGE_DEV or KETTLE_RB_DEV # is not "false". require 'nomono/bundler' unless defined?(Nomono) -smorg_rb_local_gems = %w[ +structuredmerge_local_gems = %w[ tree_haver ast-merge ast-merge-git @@ -43,7 +43,7 @@ kettle_rb_local_gems = %w[ kettle-dev kettle-test kettle-soup-cover kettle-drift ] declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -smorg_rb_local_gems_to_eval = smorg_rb_local_gems - %w[ruby-merge] - declared_gems +structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[ruby-merge] - declared_gems kettle_rb_local_gems_to_eval = kettle_rb_local_gems - %w[ruby-merge] - declared_gems tslp_dev = ENV.fetch('TSLP_DEV', nil) @@ -52,14 +52,14 @@ tslp_dev = ENV.fetch('TSLP_DEV', nil) platform :mri do gem 'tree_sitter_language_pack', path: tslp_dev unless tslp_dev.to_s.empty? - if ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false') != 0 + if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( - gems: smorg_rb_local_gems_to_eval, - prefix: 'SMORG_RB', - path_env: 'SMORG_RB_DEV', + gems: structuredmerge_local_gems_to_eval, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', vendored_gems_env: 'VENDORED_GEMS', vendor_gem_dir_env: 'VENDOR_GEM_DIR', - debug_env: 'SMORG_RB_DEBUG' + debug_env: 'STRUCTUREDMERGE_DEBUG' ) end diff --git a/gems/rust-merge/Gemfile b/gems/rust-merge/Gemfile index 7469a4005..e372af090 100644 --- a/gems/rust-merge/Gemfile +++ b/gems/rust-merge/Gemfile @@ -209,7 +209,7 @@ unless tslp_declared_by_templating end end -# Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) +# Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging diff --git a/gems/rust-merge/Gemfile.lock b/gems/rust-merge/Gemfile.lock index a532291f1..af14b7d03 100644 --- a/gems/rust-merge/Gemfile.lock +++ b/gems/rust-merge/Gemfile.lock @@ -45,6 +45,16 @@ PATH specs: ast-merge-git (7.1.0) ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH @@ -233,6 +243,15 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: @@ -256,24 +275,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: diff --git a/gems/rust-merge/gemfiles/modular/templating.gemfile b/gems/rust-merge/gemfiles/modular/templating.gemfile index 0d1c9bcf4..e3c24e6b7 100644 --- a/gems/rust-merge/gemfiles/modular/templating.gemfile +++ b/gems/rust-merge/gemfiles/modular/templating.gemfile @@ -1,9 +1,9 @@ # frozen_string_literal: true -smorg_remote = ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false').zero? +structuredmerge_remote = ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false').zero? kettle_remote = ENV.fetch('KETTLE_RB_DEV', 'false').casecmp('false').zero? -if smorg_remote +if structuredmerge_remote # Merge recipes and parser dependencies for released installs. gem 'kettle-jem', '>= 7.0' end @@ -13,10 +13,10 @@ if kettle_remote gem 'kettle-drift', '~> 1.0', '>= 1.0.5', require: false end -# Set SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. +# Set STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. # When false (default / CI), released kettle-jem brings merge gems and parser dependencies. # Local path overrides bring the same dependencies from sibling gemspecs. # # Set KETTLE_RB_DEV=/path/to/kettle-rb for local development with Kettle plugin gems. # When false (default / CI), released Kettle plugin gems are used. -eval_gemfile 'templating_local.gemfile' unless smorg_remote && kettle_remote +eval_gemfile 'templating_local.gemfile' unless structuredmerge_remote && kettle_remote diff --git a/gems/rust-merge/gemfiles/modular/templating_local.gemfile b/gems/rust-merge/gemfiles/modular/templating_local.gemfile index eabeae610..86918cade 100644 --- a/gems/rust-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/rust-merge/gemfiles/modular/templating_local.gemfile @@ -1,12 +1,12 @@ # frozen_string_literal: true # Local path overrides for templating development. -# Loaded by the associated non-local gemfile when SMORG_RB_DEV or KETTLE_RB_DEV +# Loaded by the associated non-local gemfile when STRUCTUREDMERGE_DEV or KETTLE_RB_DEV # is not "false". require 'nomono/bundler' unless defined?(Nomono) -smorg_rb_local_gems = %w[ +structuredmerge_local_gems = %w[ tree_haver ast-merge ast-merge-git @@ -43,7 +43,7 @@ kettle_rb_local_gems = %w[ kettle-dev kettle-test kettle-soup-cover kettle-drift ] declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -smorg_rb_local_gems_to_eval = smorg_rb_local_gems - %w[rust-merge] - declared_gems +structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[rust-merge] - declared_gems kettle_rb_local_gems_to_eval = kettle_rb_local_gems - %w[rust-merge] - declared_gems tslp_dev = ENV.fetch('TSLP_DEV', nil) @@ -52,14 +52,14 @@ tslp_dev = ENV.fetch('TSLP_DEV', nil) platform :mri do gem 'tree_sitter_language_pack', path: tslp_dev unless tslp_dev.to_s.empty? - if ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false') != 0 + if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( - gems: smorg_rb_local_gems_to_eval, - prefix: 'SMORG_RB', - path_env: 'SMORG_RB_DEV', + gems: structuredmerge_local_gems_to_eval, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', vendored_gems_env: 'VENDORED_GEMS', vendor_gem_dir_env: 'VENDOR_GEM_DIR', - debug_env: 'SMORG_RB_DEBUG' + debug_env: 'STRUCTUREDMERGE_DEBUG' ) end diff --git a/gems/smorg-rb/Gemfile b/gems/smorg-rb/Gemfile index f06b38606..3033870f4 100644 --- a/gems/smorg-rb/Gemfile +++ b/gems/smorg-rb/Gemfile @@ -334,7 +334,7 @@ unless tslp_declared_by_templating end end -# Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) +# Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging diff --git a/gems/smorg-rb/Gemfile.lock b/gems/smorg-rb/Gemfile.lock index 6fe6c8e52..da28dd8d8 100644 --- a/gems/smorg-rb/Gemfile.lock +++ b/gems/smorg-rb/Gemfile.lock @@ -45,6 +45,23 @@ PATH service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template specs: @@ -91,6 +108,51 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge specs: @@ -107,6 +169,14 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge specs: @@ -115,6 +185,14 @@ PATH toml-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge specs: @@ -197,83 +275,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: diff --git a/gems/smorg-rb/gemfiles/modular/templating.gemfile b/gems/smorg-rb/gemfiles/modular/templating.gemfile index 0d1c9bcf4..e3c24e6b7 100644 --- a/gems/smorg-rb/gemfiles/modular/templating.gemfile +++ b/gems/smorg-rb/gemfiles/modular/templating.gemfile @@ -1,9 +1,9 @@ # frozen_string_literal: true -smorg_remote = ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false').zero? +structuredmerge_remote = ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false').zero? kettle_remote = ENV.fetch('KETTLE_RB_DEV', 'false').casecmp('false').zero? -if smorg_remote +if structuredmerge_remote # Merge recipes and parser dependencies for released installs. gem 'kettle-jem', '>= 7.0' end @@ -13,10 +13,10 @@ if kettle_remote gem 'kettle-drift', '~> 1.0', '>= 1.0.5', require: false end -# Set SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. +# Set STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. # When false (default / CI), released kettle-jem brings merge gems and parser dependencies. # Local path overrides bring the same dependencies from sibling gemspecs. # # Set KETTLE_RB_DEV=/path/to/kettle-rb for local development with Kettle plugin gems. # When false (default / CI), released Kettle plugin gems are used. -eval_gemfile 'templating_local.gemfile' unless smorg_remote && kettle_remote +eval_gemfile 'templating_local.gemfile' unless structuredmerge_remote && kettle_remote diff --git a/gems/smorg-rb/gemfiles/modular/templating_local.gemfile b/gems/smorg-rb/gemfiles/modular/templating_local.gemfile index e28bb5d97..9b5bc2fd4 100644 --- a/gems/smorg-rb/gemfiles/modular/templating_local.gemfile +++ b/gems/smorg-rb/gemfiles/modular/templating_local.gemfile @@ -1,12 +1,12 @@ # frozen_string_literal: true # Local path overrides for templating development. -# Loaded by the associated non-local gemfile when SMORG_RB_DEV or KETTLE_RB_DEV +# Loaded by the associated non-local gemfile when STRUCTUREDMERGE_DEV or KETTLE_RB_DEV # is not "false". require 'nomono/bundler' unless defined?(Nomono) -smorg_rb_local_gems = %w[ +structuredmerge_local_gems = %w[ tree_haver ast-merge ast-merge-git @@ -43,7 +43,7 @@ kettle_rb_local_gems = %w[ kettle-dev kettle-test kettle-soup-cover kettle-drift ] declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -smorg_rb_local_gems_to_eval = smorg_rb_local_gems - %w[smorg-rb] - declared_gems +structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[smorg-rb] - declared_gems kettle_rb_local_gems_to_eval = kettle_rb_local_gems - %w[smorg-rb] - declared_gems tslp_dev = ENV.fetch('TSLP_DEV', nil) @@ -52,14 +52,14 @@ tslp_dev = ENV.fetch('TSLP_DEV', nil) platform :mri do gem 'tree_sitter_language_pack', path: tslp_dev unless tslp_dev.to_s.empty? - if ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false') != 0 + if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( - gems: smorg_rb_local_gems_to_eval, - prefix: 'SMORG_RB', - path_env: 'SMORG_RB_DEV', + gems: structuredmerge_local_gems_to_eval, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', vendored_gems_env: 'VENDORED_GEMS', vendor_gem_dir_env: 'VENDOR_GEM_DIR', - debug_env: 'SMORG_RB_DEBUG' + debug_env: 'STRUCTUREDMERGE_DEBUG' ) end diff --git a/gems/toml-merge/Gemfile b/gems/toml-merge/Gemfile index b6858d52d..54be336cf 100644 --- a/gems/toml-merge/Gemfile +++ b/gems/toml-merge/Gemfile @@ -209,7 +209,7 @@ unless tslp_declared_by_templating end end -# Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) +# Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging diff --git a/gems/toml-merge/gemfiles/modular/templating.gemfile b/gems/toml-merge/gemfiles/modular/templating.gemfile index 0d1c9bcf4..e3c24e6b7 100644 --- a/gems/toml-merge/gemfiles/modular/templating.gemfile +++ b/gems/toml-merge/gemfiles/modular/templating.gemfile @@ -1,9 +1,9 @@ # frozen_string_literal: true -smorg_remote = ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false').zero? +structuredmerge_remote = ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false').zero? kettle_remote = ENV.fetch('KETTLE_RB_DEV', 'false').casecmp('false').zero? -if smorg_remote +if structuredmerge_remote # Merge recipes and parser dependencies for released installs. gem 'kettle-jem', '>= 7.0' end @@ -13,10 +13,10 @@ if kettle_remote gem 'kettle-drift', '~> 1.0', '>= 1.0.5', require: false end -# Set SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. +# Set STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. # When false (default / CI), released kettle-jem brings merge gems and parser dependencies. # Local path overrides bring the same dependencies from sibling gemspecs. # # Set KETTLE_RB_DEV=/path/to/kettle-rb for local development with Kettle plugin gems. # When false (default / CI), released Kettle plugin gems are used. -eval_gemfile 'templating_local.gemfile' unless smorg_remote && kettle_remote +eval_gemfile 'templating_local.gemfile' unless structuredmerge_remote && kettle_remote diff --git a/gems/toml-merge/gemfiles/modular/templating_local.gemfile b/gems/toml-merge/gemfiles/modular/templating_local.gemfile index 884c13d66..c89d7b51c 100644 --- a/gems/toml-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/toml-merge/gemfiles/modular/templating_local.gemfile @@ -1,12 +1,12 @@ # frozen_string_literal: true # Local path overrides for templating development. -# Loaded by the associated non-local gemfile when SMORG_RB_DEV or KETTLE_RB_DEV +# Loaded by the associated non-local gemfile when STRUCTUREDMERGE_DEV or KETTLE_RB_DEV # is not "false". require 'nomono/bundler' unless defined?(Nomono) -smorg_rb_local_gems = %w[ +structuredmerge_local_gems = %w[ tree_haver ast-merge ast-merge-git @@ -43,7 +43,7 @@ kettle_rb_local_gems = %w[ kettle-dev kettle-test kettle-soup-cover kettle-drift ] declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -smorg_rb_local_gems_to_eval = smorg_rb_local_gems - %w[toml-merge] - declared_gems +structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[toml-merge] - declared_gems kettle_rb_local_gems_to_eval = kettle_rb_local_gems - %w[toml-merge] - declared_gems tslp_dev = ENV.fetch('TSLP_DEV', nil) @@ -52,14 +52,14 @@ tslp_dev = ENV.fetch('TSLP_DEV', nil) platform :mri do gem 'tree_sitter_language_pack', path: tslp_dev unless tslp_dev.to_s.empty? - if ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false') != 0 + if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( - gems: smorg_rb_local_gems_to_eval, - prefix: 'SMORG_RB', - path_env: 'SMORG_RB_DEV', + gems: structuredmerge_local_gems_to_eval, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', vendored_gems_env: 'VENDORED_GEMS', vendor_gem_dir_env: 'VENDOR_GEM_DIR', - debug_env: 'SMORG_RB_DEBUG' + debug_env: 'STRUCTUREDMERGE_DEBUG' ) end diff --git a/gems/tree_haver/gemfiles/modular/templating.gemfile b/gems/tree_haver/gemfiles/modular/templating.gemfile index 0d1c9bcf4..e3c24e6b7 100644 --- a/gems/tree_haver/gemfiles/modular/templating.gemfile +++ b/gems/tree_haver/gemfiles/modular/templating.gemfile @@ -1,9 +1,9 @@ # frozen_string_literal: true -smorg_remote = ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false').zero? +structuredmerge_remote = ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false').zero? kettle_remote = ENV.fetch('KETTLE_RB_DEV', 'false').casecmp('false').zero? -if smorg_remote +if structuredmerge_remote # Merge recipes and parser dependencies for released installs. gem 'kettle-jem', '>= 7.0' end @@ -13,10 +13,10 @@ if kettle_remote gem 'kettle-drift', '~> 1.0', '>= 1.0.5', require: false end -# Set SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. +# Set STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. # When false (default / CI), released kettle-jem brings merge gems and parser dependencies. # Local path overrides bring the same dependencies from sibling gemspecs. # # Set KETTLE_RB_DEV=/path/to/kettle-rb for local development with Kettle plugin gems. # When false (default / CI), released Kettle plugin gems are used. -eval_gemfile 'templating_local.gemfile' unless smorg_remote && kettle_remote +eval_gemfile 'templating_local.gemfile' unless structuredmerge_remote && kettle_remote diff --git a/gems/tree_haver/gemfiles/modular/templating_local.gemfile b/gems/tree_haver/gemfiles/modular/templating_local.gemfile index 3369e7beb..e5463da30 100644 --- a/gems/tree_haver/gemfiles/modular/templating_local.gemfile +++ b/gems/tree_haver/gemfiles/modular/templating_local.gemfile @@ -1,12 +1,12 @@ # frozen_string_literal: true # Local path overrides for templating development. -# Loaded by the associated non-local gemfile when SMORG_RB_DEV or KETTLE_RB_DEV +# Loaded by the associated non-local gemfile when STRUCTUREDMERGE_DEV or KETTLE_RB_DEV # is not "false". require 'nomono/bundler' unless defined?(Nomono) -smorg_rb_local_gems = %w[ +structuredmerge_local_gems = %w[ tree_haver ast-merge ast-merge-git @@ -43,7 +43,7 @@ kettle_rb_local_gems = %w[ kettle-dev kettle-test kettle-soup-cover kettle-drift ] declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -smorg_rb_local_gems_to_eval = smorg_rb_local_gems - %w[tree_haver] - declared_gems +structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[tree_haver] - declared_gems kettle_rb_local_gems_to_eval = kettle_rb_local_gems - %w[tree_haver] - declared_gems tslp_dev = ENV.fetch('TSLP_DEV', nil) @@ -52,14 +52,14 @@ tslp_dev = ENV.fetch('TSLP_DEV', nil) platform :mri do gem 'tree_sitter_language_pack', path: tslp_dev unless tslp_dev.to_s.empty? - if ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false') != 0 + if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( - gems: smorg_rb_local_gems_to_eval, - prefix: 'SMORG_RB', - path_env: 'SMORG_RB_DEV', + gems: structuredmerge_local_gems_to_eval, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', vendored_gems_env: 'VENDORED_GEMS', vendor_gem_dir_env: 'VENDOR_GEM_DIR', - debug_env: 'SMORG_RB_DEBUG' + debug_env: 'STRUCTUREDMERGE_DEBUG' ) end diff --git a/gems/typescript-merge/Gemfile b/gems/typescript-merge/Gemfile index 49fda9326..a9502283a 100644 --- a/gems/typescript-merge/Gemfile +++ b/gems/typescript-merge/Gemfile @@ -209,7 +209,7 @@ unless tslp_declared_by_templating end end -# Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) +# Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging diff --git a/gems/typescript-merge/gemfiles/modular/templating.gemfile b/gems/typescript-merge/gemfiles/modular/templating.gemfile index 0d1c9bcf4..e3c24e6b7 100644 --- a/gems/typescript-merge/gemfiles/modular/templating.gemfile +++ b/gems/typescript-merge/gemfiles/modular/templating.gemfile @@ -1,9 +1,9 @@ # frozen_string_literal: true -smorg_remote = ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false').zero? +structuredmerge_remote = ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false').zero? kettle_remote = ENV.fetch('KETTLE_RB_DEV', 'false').casecmp('false').zero? -if smorg_remote +if structuredmerge_remote # Merge recipes and parser dependencies for released installs. gem 'kettle-jem', '>= 7.0' end @@ -13,10 +13,10 @@ if kettle_remote gem 'kettle-drift', '~> 1.0', '>= 1.0.5', require: false end -# Set SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. +# Set STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. # When false (default / CI), released kettle-jem brings merge gems and parser dependencies. # Local path overrides bring the same dependencies from sibling gemspecs. # # Set KETTLE_RB_DEV=/path/to/kettle-rb for local development with Kettle plugin gems. # When false (default / CI), released Kettle plugin gems are used. -eval_gemfile 'templating_local.gemfile' unless smorg_remote && kettle_remote +eval_gemfile 'templating_local.gemfile' unless structuredmerge_remote && kettle_remote diff --git a/gems/typescript-merge/gemfiles/modular/templating_local.gemfile b/gems/typescript-merge/gemfiles/modular/templating_local.gemfile index 2b5c576e3..3708e23e1 100644 --- a/gems/typescript-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/typescript-merge/gemfiles/modular/templating_local.gemfile @@ -1,12 +1,12 @@ # frozen_string_literal: true # Local path overrides for templating development. -# Loaded by the associated non-local gemfile when SMORG_RB_DEV or KETTLE_RB_DEV +# Loaded by the associated non-local gemfile when STRUCTUREDMERGE_DEV or KETTLE_RB_DEV # is not "false". require 'nomono/bundler' unless defined?(Nomono) -smorg_rb_local_gems = %w[ +structuredmerge_local_gems = %w[ tree_haver ast-merge ast-merge-git @@ -43,7 +43,7 @@ kettle_rb_local_gems = %w[ kettle-dev kettle-test kettle-soup-cover kettle-drift ] declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -smorg_rb_local_gems_to_eval = smorg_rb_local_gems - %w[typescript-merge] - declared_gems +structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[typescript-merge] - declared_gems kettle_rb_local_gems_to_eval = kettle_rb_local_gems - %w[typescript-merge] - declared_gems tslp_dev = ENV.fetch('TSLP_DEV', nil) @@ -52,14 +52,14 @@ tslp_dev = ENV.fetch('TSLP_DEV', nil) platform :mri do gem 'tree_sitter_language_pack', path: tslp_dev unless tslp_dev.to_s.empty? - if ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false') != 0 + if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( - gems: smorg_rb_local_gems_to_eval, - prefix: 'SMORG_RB', - path_env: 'SMORG_RB_DEV', + gems: structuredmerge_local_gems_to_eval, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', vendored_gems_env: 'VENDORED_GEMS', vendor_gem_dir_env: 'VENDOR_GEM_DIR', - debug_env: 'SMORG_RB_DEBUG' + debug_env: 'STRUCTUREDMERGE_DEBUG' ) end diff --git a/gems/yaml-merge/Gemfile b/gems/yaml-merge/Gemfile index 53a13240a..efa4bc24c 100644 --- a/gems/yaml-merge/Gemfile +++ b/gems/yaml-merge/Gemfile @@ -209,7 +209,7 @@ unless tslp_declared_by_templating end end -# Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) +# Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging diff --git a/gems/yaml-merge/Gemfile.lock b/gems/yaml-merge/Gemfile.lock index d351751df..7c1320d4b 100644 --- a/gems/yaml-merge/Gemfile.lock +++ b/gems/yaml-merge/Gemfile.lock @@ -45,6 +45,16 @@ PATH specs: ast-merge-git (7.1.0) ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH @@ -241,6 +251,15 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: @@ -256,24 +275,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: diff --git a/gems/yaml-merge/gemfiles/modular/templating.gemfile b/gems/yaml-merge/gemfiles/modular/templating.gemfile index 0d1c9bcf4..e3c24e6b7 100644 --- a/gems/yaml-merge/gemfiles/modular/templating.gemfile +++ b/gems/yaml-merge/gemfiles/modular/templating.gemfile @@ -1,9 +1,9 @@ # frozen_string_literal: true -smorg_remote = ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false').zero? +structuredmerge_remote = ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false').zero? kettle_remote = ENV.fetch('KETTLE_RB_DEV', 'false').casecmp('false').zero? -if smorg_remote +if structuredmerge_remote # Merge recipes and parser dependencies for released installs. gem 'kettle-jem', '>= 7.0' end @@ -13,10 +13,10 @@ if kettle_remote gem 'kettle-drift', '~> 1.0', '>= 1.0.5', require: false end -# Set SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. +# Set STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. # When false (default / CI), released kettle-jem brings merge gems and parser dependencies. # Local path overrides bring the same dependencies from sibling gemspecs. # # Set KETTLE_RB_DEV=/path/to/kettle-rb for local development with Kettle plugin gems. # When false (default / CI), released Kettle plugin gems are used. -eval_gemfile 'templating_local.gemfile' unless smorg_remote && kettle_remote +eval_gemfile 'templating_local.gemfile' unless structuredmerge_remote && kettle_remote diff --git a/gems/yaml-merge/gemfiles/modular/templating_local.gemfile b/gems/yaml-merge/gemfiles/modular/templating_local.gemfile index 6097b8fa9..2e5d4ae44 100644 --- a/gems/yaml-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/yaml-merge/gemfiles/modular/templating_local.gemfile @@ -1,12 +1,12 @@ # frozen_string_literal: true # Local path overrides for templating development. -# Loaded by the associated non-local gemfile when SMORG_RB_DEV or KETTLE_RB_DEV +# Loaded by the associated non-local gemfile when STRUCTUREDMERGE_DEV or KETTLE_RB_DEV # is not "false". require 'nomono/bundler' unless defined?(Nomono) -smorg_rb_local_gems = %w[ +structuredmerge_local_gems = %w[ tree_haver ast-merge ast-merge-git @@ -43,7 +43,7 @@ kettle_rb_local_gems = %w[ kettle-dev kettle-test kettle-soup-cover kettle-drift ] declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -smorg_rb_local_gems_to_eval = smorg_rb_local_gems - %w[yaml-merge] - declared_gems +structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[yaml-merge] - declared_gems kettle_rb_local_gems_to_eval = kettle_rb_local_gems - %w[yaml-merge] - declared_gems tslp_dev = ENV.fetch('TSLP_DEV', nil) @@ -52,14 +52,14 @@ tslp_dev = ENV.fetch('TSLP_DEV', nil) platform :mri do gem 'tree_sitter_language_pack', path: tslp_dev unless tslp_dev.to_s.empty? - if ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false') != 0 + if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( - gems: smorg_rb_local_gems_to_eval, - prefix: 'SMORG_RB', - path_env: 'SMORG_RB_DEV', + gems: structuredmerge_local_gems_to_eval, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', vendored_gems_env: 'VENDORED_GEMS', vendor_gem_dir_env: 'VENDOR_GEM_DIR', - debug_env: 'SMORG_RB_DEBUG' + debug_env: 'STRUCTUREDMERGE_DEBUG' ) end diff --git a/gems/zip-merge/Gemfile b/gems/zip-merge/Gemfile index 5d2ad5b20..70063ee66 100644 --- a/gems/zip-merge/Gemfile +++ b/gems/zip-merge/Gemfile @@ -248,7 +248,7 @@ unless tslp_declared_by_templating end end -# Templating (env-switched: SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local paths) +# Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging diff --git a/gems/zip-merge/Gemfile.lock b/gems/zip-merge/Gemfile.lock index 92c583858..9a59ea1c9 100644 --- a/gems/zip-merge/Gemfile.lock +++ b/gems/zip-merge/Gemfile.lock @@ -44,6 +44,7 @@ PATH specs: ast-merge-git (7.1.0) ast-merge (= 7.1.0) + json-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH @@ -249,6 +250,15 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge specs: @@ -265,15 +275,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: diff --git a/gems/zip-merge/gemfiles/modular/templating.gemfile b/gems/zip-merge/gemfiles/modular/templating.gemfile index 0d1c9bcf4..e3c24e6b7 100644 --- a/gems/zip-merge/gemfiles/modular/templating.gemfile +++ b/gems/zip-merge/gemfiles/modular/templating.gemfile @@ -1,9 +1,9 @@ # frozen_string_literal: true -smorg_remote = ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false').zero? +structuredmerge_remote = ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false').zero? kettle_remote = ENV.fetch('KETTLE_RB_DEV', 'false').casecmp('false').zero? -if smorg_remote +if structuredmerge_remote # Merge recipes and parser dependencies for released installs. gem 'kettle-jem', '>= 7.0' end @@ -13,10 +13,10 @@ if kettle_remote gem 'kettle-drift', '~> 1.0', '>= 1.0.5', require: false end -# Set SMORG_RB_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. +# Set STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local development with path-based dependencies. # When false (default / CI), released kettle-jem brings merge gems and parser dependencies. # Local path overrides bring the same dependencies from sibling gemspecs. # # Set KETTLE_RB_DEV=/path/to/kettle-rb for local development with Kettle plugin gems. # When false (default / CI), released Kettle plugin gems are used. -eval_gemfile 'templating_local.gemfile' unless smorg_remote && kettle_remote +eval_gemfile 'templating_local.gemfile' unless structuredmerge_remote && kettle_remote diff --git a/gems/zip-merge/gemfiles/modular/templating_local.gemfile b/gems/zip-merge/gemfiles/modular/templating_local.gemfile index 1e68ab586..48389338d 100644 --- a/gems/zip-merge/gemfiles/modular/templating_local.gemfile +++ b/gems/zip-merge/gemfiles/modular/templating_local.gemfile @@ -1,12 +1,12 @@ # frozen_string_literal: true # Local path overrides for templating development. -# Loaded by the associated non-local gemfile when SMORG_RB_DEV or KETTLE_RB_DEV +# Loaded by the associated non-local gemfile when STRUCTUREDMERGE_DEV or KETTLE_RB_DEV # is not "false". require 'nomono/bundler' unless defined?(Nomono) -smorg_rb_local_gems = %w[ +structuredmerge_local_gems = %w[ tree_haver ast-merge ast-merge-git @@ -43,7 +43,7 @@ kettle_rb_local_gems = %w[ kettle-dev kettle-test kettle-soup-cover kettle-drift ] declared_gems = instance_variable_get(:@dependencies).to_a.map(&:name) -smorg_rb_local_gems_to_eval = smorg_rb_local_gems - %w[zip-merge] - declared_gems +structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[zip-merge] - declared_gems kettle_rb_local_gems_to_eval = kettle_rb_local_gems - %w[zip-merge] - declared_gems tslp_dev = ENV.fetch('TSLP_DEV', nil) @@ -52,14 +52,14 @@ tslp_dev = ENV.fetch('TSLP_DEV', nil) platform :mri do gem 'tree_sitter_language_pack', path: tslp_dev unless tslp_dev.to_s.empty? - if ENV.fetch('SMORG_RB_DEV', 'false').casecmp('false') != 0 + if ENV.fetch('STRUCTUREDMERGE_DEV', 'false').casecmp('false') != 0 eval_nomono_gems( - gems: smorg_rb_local_gems_to_eval, - prefix: 'SMORG_RB', - path_env: 'SMORG_RB_DEV', + gems: structuredmerge_local_gems_to_eval, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', vendored_gems_env: 'VENDORED_GEMS', vendor_gem_dir_env: 'VENDOR_GEM_DIR', - debug_env: 'SMORG_RB_DEBUG' + debug_env: 'STRUCTUREDMERGE_DEBUG' ) end From 05aada2d9b938518b601eb113a5f05a868535e40 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:09:39 -0600 Subject: [PATCH 091/347] Keep JSONC comments in TreeHaver parser path --- gems/json-merge/lib/json/merge.rb | 82 ++++--------------- .../spec/fixtures_integration_spec.rb | 9 ++ 2 files changed, 25 insertions(+), 66 deletions(-) diff --git a/gems/json-merge/lib/json/merge.rb b/gems/json-merge/lib/json/merge.rb index 53eaab5b9..87a35530d 100644 --- a/gems/json-merge/lib/json/merge.rb +++ b/gems/json-merge/lib/json/merge.rb @@ -63,13 +63,15 @@ def json_feature_profile end def parse_json(source, dialect) - normalized_source = dialect == 'jsonc' ? strip_json_comments(source) : source - if detect_trailing_comma(normalized_source) + if detect_trailing_comma(source) return parse_failure("Trailing commas are not supported for #{dialect}.") end + if dialect.to_s != 'jsonc' && detect_json_comments(source) + return parse_failure("Comments are not supported for #{dialect}.") + end register_backend! - analysis = FileAnalysis.new(normalized_source) + analysis = FileAnalysis.new(source) unless analysis.valid? return parse_failure(analysis.errors.map { |error| error.respond_to?(:message) ? error.message : error.inspect }.join(', ')) end @@ -127,13 +129,15 @@ def merge_json_sources(template_source, destination_source) private_class_method :merge_json_sources def json_value_for_source(source, dialect: 'json') - normalized_source = dialect.to_s == 'jsonc' ? strip_json_comments(source) : source - if detect_trailing_comma(normalized_source) + if detect_trailing_comma(source) raise ParseError, "Trailing commas are not supported for #{dialect}." end + if dialect.to_s != 'jsonc' && detect_json_comments(source) + raise ParseError, "Comments are not supported for #{dialect}." + end register_backend! - analysis = FileAnalysis.new(normalized_source) + analysis = FileAnalysis.new(source) unless analysis.valid? message = analysis.errors.map { |error| error.respond_to?(:message) ? error.message : error.inspect }.join(', ') raise ParseError, message @@ -277,71 +281,17 @@ def detect_trailing_comma(source) end private_class_method :detect_trailing_comma - def strip_json_comments(source) - result = +'' + def detect_json_comments(source) state = scanner_state - index = 0 - while index < source.length - char = source[index] + source.each_char.with_index do |char, index| next_char = source[index + 1] + return true if !state[:in_string] && char == '/' && %w[/ *].include?(next_char) - if state[:in_line_comment] - if char == "\n" - state[:in_line_comment] = false - result << "\n" - end - index += 1 - next - end - - if state[:in_block_comment] - if char == '*' && next_char == '/' - state[:in_block_comment] = false - index += 2 - next - end - index += 1 - next - end - - if state[:in_string] - result << char - if state[:escaped] - state[:escaped] = false - elsif char == '\\' - state[:escaped] = true - elsif char == '"' - state[:in_string] = false - end - index += 1 - next - end - - if char == '"' - state[:in_string] = true - result << char - index += 1 - next - end - - if char == '/' && next_char == '/' - state[:in_line_comment] = true - index += 2 - next - end - - if char == '/' && next_char == '*' - state[:in_block_comment] = true - index += 2 - next - end - - result << char - index += 1 + advance_scanner_state(state, char, next_char) end - result + false end - private_class_method :strip_json_comments + private_class_method :detect_json_comments def scanner_state { diff --git a/gems/json-merge/spec/fixtures_integration_spec.rb b/gems/json-merge/spec/fixtures_integration_spec.rb index bf7bfe564..30a93a72d 100644 --- a/gems/json-merge/spec/fixtures_integration_spec.rb +++ b/gems/json-merge/spec/fixtures_integration_spec.rb @@ -47,6 +47,15 @@ def json_ready(value) expect(json_ready(result[:diagnostics])).to eq(json_ready(fixture.dig(:expected, :diagnostics))) end + it 'rejects comments in strict JSON without rejecting comment-like string content' do + strict_result = described_class.parse_json("{\n // nope\n \"name\": \"Ruby\"\n}\n", 'json') + string_result = described_class.parse_json("{\"url\":\"https://example.test/path\"}\n", 'json') + + expect(strict_result[:ok]).to be(false) + expect(strict_result.dig(:diagnostics, 0, :message)).to eq('Comments are not supported for json.') + expect(string_result[:ok]).to be(true) + end + it 'fails closed for JSONC analysis when no TreeHaver JSON backend is available' do source = <<~JSON { From 0789209f077195f52a565d6e7318088b91e5b366 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:12:53 -0600 Subject: [PATCH 092/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/tree_haver/Gemfile.lock | 392 ++++++++++++++++++++++++++--------- 1 file changed, 294 insertions(+), 98 deletions(-) diff --git a/gems/tree_haver/Gemfile.lock b/gems/tree_haver/Gemfile.lock index 239d235f4..8247fa07e 100644 --- a/gems/tree_haver/Gemfile.lock +++ b/gems/tree_haver/Gemfile.lock @@ -17,59 +17,288 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -GEM - remote: https://gem.coop/ +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - ansi (1.6.0) - appraisal2 (3.1.4) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - ast (2.4.3) - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) ast-crispr-markdown-markly (7.1.0) ast-crispr (= 7.1.0) markly-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) prism (>= 1.0) version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: ast-merge (7.1.0) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) - backports (3.25.3) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: bash-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +GEM + remote: https://gem.coop/ + specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + ansi (1.6.0) + appraisal2 (3.2.0) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + 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) citrus (3.0.2) - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) cmdparse (3.0.7) commonmarker (2.9.0-aarch64-linux) commonmarker (2.9.0-aarch64-linux-musl) commonmarker (2.9.0-arm64-darwin) commonmarker (2.9.0-x86_64-linux) commonmarker (2.9.0-x86_64-linux-musl) - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -79,10 +308,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docile (1.4.1) - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -132,10 +357,6 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) @@ -143,31 +364,6 @@ GEM ruby-progressbar (~> 1.13) kettle-drift (1.0.5) version_gem (~> 1.1, >= 1.1.13) - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -191,24 +387,12 @@ GEM turbo_tests2 (~> 3.1, >= 3.1.12) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) 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.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -234,18 +418,9 @@ GEM prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) psych (5.4.0) date stringio - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -257,11 +432,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) rdoc (6.17.0) erb psych (>= 4.0.0) @@ -357,10 +527,6 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -420,15 +586,11 @@ GEM version_gem (~> 1.1, >= 1.1.13) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) tsort (0.2.0) - turbo_tests2 (3.1.14) + turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) rspec (>= 3.10) version_gem (~> 1.1, >= 1.1.14) @@ -441,10 +603,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.13) - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) yard (0.9.45) yard-fence (0.9.6) rdoc (>= 6.11, < 8) @@ -477,24 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem (>= 7.0) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -503,35 +682,45 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml (~> 0.3) + toml-merge! toml-rb (~> 4.1) tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 - appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 + appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) @@ -562,6 +751,7 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 @@ -595,6 +785,8 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 @@ -640,6 +832,7 @@ 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -649,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -668,7 +862,8 @@ CHECKSUMS tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f - turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -681,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From bf44e475b13fb6dfb34a95fe55e2b24312c47c45 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:12:54 -0600 Subject: [PATCH 093/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-merge/Gemfile.lock | 341 +----------------------------------- 1 file changed, 4 insertions(+), 337 deletions(-) diff --git a/gems/ast-merge/Gemfile.lock b/gems/ast-merge/Gemfile.lock index 0a76311e0..94f427443 100644 --- a/gems/ast-merge/Gemfile.lock +++ b/gems/ast-merge/Gemfile.lock @@ -17,232 +17,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: @@ -252,36 +26,13 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: addressable (2.9.0) public_suffix (>= 2.0.2, < 8.0) ansi (1.6.0) - appraisal2 (3.1.4) + appraisal2 (3.2.0) bundler (>= 1.17.3) rake (>= 10) thor (>= 0.14) @@ -294,12 +45,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +108,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +136,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +275,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,13 +327,8 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) - turbo_tests2 (3.1.14) + turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) rspec (>= 3.10) version_gem (~> 1.1, >= 1.1.14) @@ -638,45 +373,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +398,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 - appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 + appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +431,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +443,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +470,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +481,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +508,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +519,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +532,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f - turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) + turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +547,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From c7701acbc0e285fdaffbd241aa3a8e606ed69811 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:12:56 -0600 Subject: [PATCH 094/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-crispr/Gemfile.lock | 343 +---------------------------------- 1 file changed, 9 insertions(+), 334 deletions(-) diff --git a/gems/ast-crispr/Gemfile.lock b/gems/ast-crispr/Gemfile.lock index 61d51818b..9cc7afd50 100644 --- a/gems/ast-crispr/Gemfile.lock +++ b/gems/ast-crispr/Gemfile.lock @@ -16,30 +16,6 @@ PATH service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -49,239 +25,13 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: addressable (2.9.0) public_suffix (>= 2.0.2, < 8.0) ansi (1.6.0) - appraisal2 (3.1.4) + appraisal2 (3.2.0) bundler (>= 1.17.3) rake (>= 10) thor (>= 0.14) @@ -294,12 +44,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +107,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +135,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -587,13 +328,13 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) - turbo_tests2 (3.1.14) + turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) rspec (>= 3.10) version_gem (~> 1.1, >= 1.1.14) @@ -639,44 +380,23 @@ DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +405,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 - appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 + appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +438,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +450,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +477,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +488,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,11 +515,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -845,7 +527,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +540,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f - turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) + turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +555,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 592fc90f66d3247d8a38d2331969a75165a73c05 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:12:58 -0600 Subject: [PATCH 095/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-crispr-ruby-prism/Gemfile.lock | 340 +----------------------- 1 file changed, 14 insertions(+), 326 deletions(-) diff --git a/gems/ast-crispr-ruby-prism/Gemfile.lock b/gems/ast-crispr-ruby-prism/Gemfile.lock index 27cd03edf..9c606cf27 100644 --- a/gems/ast-crispr-ruby-prism/Gemfile.lock +++ b/gems/ast-crispr-ruby-prism/Gemfile.lock @@ -16,14 +16,6 @@ PATH prism (>= 1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: @@ -32,260 +24,22 @@ PATH service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: addressable (2.9.0) public_suffix (>= 2.0.2, < 8.0) ansi (1.6.0) - appraisal2 (3.1.4) + appraisal2 (3.2.0) bundler (>= 1.17.3) rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,8 +48,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -359,8 +111,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -389,7 +139,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-x86_64-linux-gnu) racc (~> 1.4) @@ -575,13 +324,13 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) - turbo_tests2 (3.1.14) + turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) rspec (>= 3.10) version_gem (~> 1.1, >= 1.1.14) @@ -622,44 +371,23 @@ DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -668,50 +396,33 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 - appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 + appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -719,7 +430,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -732,27 +442,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-x86_64-linux-gnu) sha256=379fae440b28915e3f19d752ce2dcf8465ed2b2fbefd2a7ca0dd497bc981a06a nokogiri (1.19.4-x86_64-linux-musl) sha256=17dfb7c1fa194ae02fbf7c51a7afc8d278045ab3fdacfd86f91d02d7b274470b @@ -763,14 +465,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -778,7 +476,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -806,11 +503,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -820,7 +515,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -834,19 +528,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f - turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) + turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -854,7 +543,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 59614e603748684982936de240b29adccc21e1e8 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:13:00 -0600 Subject: [PATCH 096/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/markdown-merge/Gemfile.lock | 331 +------------------------------ 1 file changed, 4 insertions(+), 327 deletions(-) diff --git a/gems/markdown-merge/Gemfile.lock b/gems/markdown-merge/Gemfile.lock index 4c5b1f622..c02c153a4 100644 --- a/gems/markdown-merge/Gemfile.lock +++ b/gems/markdown-merge/Gemfile.lock @@ -16,38 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -57,192 +25,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: @@ -252,36 +34,13 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: addressable (2.9.0) public_suffix (>= 2.0.2, < 8.0) ansi (1.6.0) - appraisal2 (3.1.4) + appraisal2 (3.2.0) bundler (>= 1.17.3) rake (>= 10) thor (>= 0.14) @@ -294,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +116,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +283,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,13 +335,8 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) - turbo_tests2 (3.1.14) + turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) rspec (>= 3.10) version_gem (~> 1.1, >= 1.1.14) @@ -638,45 +381,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +407,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 - appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 + appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +440,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +452,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +480,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +491,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +518,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +529,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +542,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f - turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) + turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +557,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 7b0cdad1cdb8343f21a748fc7367caf4ec9b5e71 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:13:02 -0600 Subject: [PATCH 097/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/markly-merge/Gemfile.lock | 349 ++------------------------------- 1 file changed, 14 insertions(+), 335 deletions(-) diff --git a/gems/markly-merge/Gemfile.lock b/gems/markly-merge/Gemfile.lock index 7426d4dd7..e4160a304 100644 --- a/gems/markly-merge/Gemfile.lock +++ b/gems/markly-merge/Gemfile.lock @@ -16,146 +16,6 @@ PATH markly (~> 0.9) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: @@ -164,128 +24,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: addressable (2.9.0) public_suffix (>= 2.0.2, < 8.0) ansi (1.6.0) - appraisal2 (3.1.4) + appraisal2 (3.2.0) bundler (>= 1.17.3) rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +48,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +111,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -533,8 +279,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,13 +331,13 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) - turbo_tests2 (3.1.14) + turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) rspec (>= 3.10) version_gem (~> 1.1, >= 1.1.14) @@ -638,45 +382,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +408,31 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 - appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 + appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +440,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,20 +452,15 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 @@ -788,14 +482,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +493,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +520,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +531,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +544,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f - turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) + turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +559,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 5475117d1b1ee2ed72b46b0819b4112fbb1efce0 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:13:04 -0600 Subject: [PATCH 098/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-crispr-markdown-markly/Gemfile.lock | 339 +------------------ 1 file changed, 18 insertions(+), 321 deletions(-) diff --git a/gems/ast-crispr-markdown-markly/Gemfile.lock b/gems/ast-crispr-markdown-markly/Gemfile.lock index 231d2ef5d..16b2c39d7 100644 --- a/gems/ast-crispr-markdown-markly/Gemfile.lock +++ b/gems/ast-crispr-markdown-markly/Gemfile.lock @@ -16,14 +16,6 @@ PATH markly-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: @@ -32,130 +24,6 @@ PATH service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: @@ -164,128 +32,22 @@ PATH markly (~> 0.9) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: addressable (2.9.0) public_suffix (>= 2.0.2, < 8.0) ansi (1.6.0) - appraisal2 (3.1.4) + appraisal2 (3.2.0) bundler (>= 1.17.3) rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +56,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +119,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,6 +147,10 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) @@ -587,13 +345,13 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) - turbo_tests2 (3.1.14) + turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) rspec (>= 3.10) version_gem (~> 1.1, >= 1.1.14) @@ -640,43 +398,23 @@ DEPENDENCIES appraisal2 (~> 3.0, >= 3.0.6) 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +423,33 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 - appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 + appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +457,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,20 +469,15 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 @@ -788,14 +499,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +510,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,11 +537,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -845,7 +549,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +562,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f - turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) + turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +577,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From efee76f66e96414fc798c8d2e5bdf0f268ff8268 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:13:06 -0600 Subject: [PATCH 099/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/json-merge/Gemfile.lock | 331 +---------------------------------- 1 file changed, 4 insertions(+), 327 deletions(-) diff --git a/gems/json-merge/Gemfile.lock b/gems/json-merge/Gemfile.lock index f6e78c1e3..e84f9d545 100644 --- a/gems/json-merge/Gemfile.lock +++ b/gems/json-merge/Gemfile.lock @@ -16,38 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -57,192 +25,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: @@ -252,36 +34,13 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: addressable (2.9.0) public_suffix (>= 2.0.2, < 8.0) ansi (1.6.0) - appraisal2 (3.1.4) + appraisal2 (3.2.0) bundler (>= 1.17.3) rake (>= 10) thor (>= 0.14) @@ -294,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +116,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +283,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,13 +335,8 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) - turbo_tests2 (3.1.14) + turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) rspec (>= 3.10) version_gem (~> 1.1, >= 1.1.14) @@ -638,45 +381,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +407,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 - appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 + appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +440,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +452,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +480,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +491,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +518,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +529,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +542,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f - turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) + turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +557,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From be6e2c7c484e9534177115082b32d88b296f27dd Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:13:09 -0600 Subject: [PATCH 100/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-merge-git/Gemfile.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gems/ast-merge-git/Gemfile.lock b/gems/ast-merge-git/Gemfile.lock index 9ce607cfb..817799181 100644 --- a/gems/ast-merge-git/Gemfile.lock +++ b/gems/ast-merge-git/Gemfile.lock @@ -17,7 +17,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) benchmark @@ -26,7 +26,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-merge (= 7.1.0) @@ -34,7 +34,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) citrus (~> 3.0) @@ -48,7 +48,7 @@ GEM addressable (2.9.0) public_suffix (>= 2.0.2, < 8.0) ansi (1.6.0) - appraisal2 (3.1.4) + appraisal2 (3.2.0) bundler (>= 1.17.3) rake (>= 10) thor (>= 0.14) @@ -344,7 +344,7 @@ GEM parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) tsort (0.2.0) - turbo_tests2 (3.1.14) + turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) rspec (>= 3.10) version_gem (~> 1.1, >= 1.1.14) @@ -433,7 +433,7 @@ DEPENDENCIES CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 - appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 + appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-merge (7.1.0) ast-merge-git (7.1.0) @@ -555,7 +555,7 @@ CHECKSUMS tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f - turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 From dd1c80e47c0a2551664870e8cf954ac3a86b99dc Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:13:11 -0600 Subject: [PATCH 101/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/plain-merge/Gemfile.lock | 331 +--------------------------------- 1 file changed, 4 insertions(+), 327 deletions(-) diff --git a/gems/plain-merge/Gemfile.lock b/gems/plain-merge/Gemfile.lock index 4c3531bca..41845a5bb 100644 --- a/gems/plain-merge/Gemfile.lock +++ b/gems/plain-merge/Gemfile.lock @@ -16,38 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -57,192 +25,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: @@ -252,36 +34,13 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: addressable (2.9.0) public_suffix (>= 2.0.2, < 8.0) ansi (1.6.0) - appraisal2 (3.1.4) + appraisal2 (3.2.0) bundler (>= 1.17.3) rake (>= 10) thor (>= 0.14) @@ -294,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +116,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +283,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,13 +335,8 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) - turbo_tests2 (3.1.14) + turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) rspec (>= 3.10) version_gem (~> 1.1, >= 1.1.14) @@ -638,45 +381,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +407,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 - appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 + appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +440,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +452,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +479,11 @@ 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.0) plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +491,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +518,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +529,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +542,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f - turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) + turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +557,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 8c9409811e9655ddb64cbb964de5e3fa60b8795d Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:13:13 -0600 Subject: [PATCH 102/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/bash-merge/Gemfile.lock | 331 +---------------------------------- 1 file changed, 4 insertions(+), 327 deletions(-) diff --git a/gems/bash-merge/Gemfile.lock b/gems/bash-merge/Gemfile.lock index 3b77b8ada..06206c4c7 100644 --- a/gems/bash-merge/Gemfile.lock +++ b/gems/bash-merge/Gemfile.lock @@ -16,38 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -57,192 +25,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: @@ -252,36 +34,13 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: addressable (2.9.0) public_suffix (>= 2.0.2, < 8.0) ansi (1.6.0) - appraisal2 (3.1.4) + appraisal2 (3.2.0) bundler (>= 1.17.3) rake (>= 10) thor (>= 0.14) @@ -294,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +116,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +283,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,13 +335,8 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) - turbo_tests2 (3.1.14) + turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) rspec (>= 3.10) version_gem (~> 1.1, >= 1.1.14) @@ -638,45 +381,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.1, >= 3.1.4) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.3, >= 2.3.7) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,55 +407,34 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.1, >= 3.1.14) - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 - appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 + appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -741,7 +442,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -754,27 +454,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -789,14 +481,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -804,7 +492,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -832,12 +519,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -846,7 +530,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -860,19 +543,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f - turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) + turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -880,7 +558,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 35c680ee4f70acdad16323959947dfe3258a4e0c Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:13:16 -0600 Subject: [PATCH 103/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/dotenv-merge/Gemfile.lock | 331 +-------------------------------- 1 file changed, 4 insertions(+), 327 deletions(-) diff --git a/gems/dotenv-merge/Gemfile.lock b/gems/dotenv-merge/Gemfile.lock index cdf236f75..69c666e6d 100644 --- a/gems/dotenv-merge/Gemfile.lock +++ b/gems/dotenv-merge/Gemfile.lock @@ -16,38 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -57,192 +25,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: @@ -252,36 +34,13 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: addressable (2.9.0) public_suffix (>= 2.0.2, < 8.0) ansi (1.6.0) - appraisal2 (3.1.4) + appraisal2 (3.2.0) bundler (>= 1.17.3) rake (>= 10) thor (>= 0.14) @@ -294,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +116,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +283,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,13 +335,8 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) - turbo_tests2 (3.1.14) + turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) rspec (>= 3.10) version_gem (~> 1.1, >= 1.1.14) @@ -638,45 +381,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.1, >= 3.1.4) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.3, >= 2.3.7) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,55 +407,33 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.1, >= 3.1.14) - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 - appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 + appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -754,27 +454,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -789,14 +481,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -804,7 +492,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -832,12 +519,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -846,7 +530,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -860,19 +543,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f - turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) + turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -880,7 +558,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From a7184570bcfbcea7bd2b9f443f22a3c5f30144ae Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:13:18 -0600 Subject: [PATCH 104/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/rbs-merge/Gemfile.lock | 330 +----------------------------------- 1 file changed, 4 insertions(+), 326 deletions(-) diff --git a/gems/rbs-merge/Gemfile.lock b/gems/rbs-merge/Gemfile.lock index 99e609b1a..3dcf0b8f9 100644 --- a/gems/rbs-merge/Gemfile.lock +++ b/gems/rbs-merge/Gemfile.lock @@ -17,38 +17,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -58,191 +26,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: @@ -252,36 +35,13 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: addressable (2.9.0) public_suffix (>= 2.0.2, < 8.0) ansi (1.6.0) - appraisal2 (3.1.4) + appraisal2 (3.2.0) bundler (>= 1.17.3) rake (>= 10) thor (>= 0.14) @@ -294,12 +54,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +117,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +145,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +284,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,13 +336,8 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) - turbo_tests2 (3.1.14) + turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) rspec (>= 3.10) version_gem (~> 1.1, >= 1.1.14) @@ -638,42 +382,21 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.1, >= 3.1.4) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.3, >= 2.3.7) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) rbs-merge! @@ -685,55 +408,33 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.1, >= 3.1.14) - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 - appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 + appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -741,7 +442,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -754,27 +454,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -789,14 +481,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -832,12 +520,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -846,7 +531,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -860,19 +544,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f - turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) + turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -880,7 +559,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 78e9626515159a1190c63443b51765c4b4af8ef5 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:13:20 -0600 Subject: [PATCH 105/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/yaml-merge/Gemfile.lock | 331 +---------------------------------- 1 file changed, 4 insertions(+), 327 deletions(-) diff --git a/gems/yaml-merge/Gemfile.lock b/gems/yaml-merge/Gemfile.lock index 7c1320d4b..316adb48a 100644 --- a/gems/yaml-merge/Gemfile.lock +++ b/gems/yaml-merge/Gemfile.lock @@ -16,38 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -57,200 +25,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: @@ -260,28 +34,13 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: addressable (2.9.0) public_suffix (>= 2.0.2, < 8.0) ansi (1.6.0) - appraisal2 (3.1.4) + appraisal2 (3.2.0) bundler (>= 1.17.3) rake (>= 10) thor (>= 0.14) @@ -294,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +116,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +283,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,13 +335,8 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) - turbo_tests2 (3.1.14) + turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) rspec (>= 3.10) version_gem (~> 1.1, >= 1.1.14) @@ -638,45 +381,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,17 +406,12 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) yaml-merge! yard (~> 0.9, >= 0.9.44) @@ -704,35 +420,19 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 - appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 + appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +440,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +452,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +479,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +490,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +517,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +528,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,14 +541,10 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f - turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) + turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -879,7 +557,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 1684ed4ab4e33b035a1fd031c67fa334c45453fc Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:13:23 -0600 Subject: [PATCH 106/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/toml-merge/Gemfile.lock | 38 +++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/gems/toml-merge/Gemfile.lock b/gems/toml-merge/Gemfile.lock index 8f4b22116..25ea87683 100644 --- a/gems/toml-merge/Gemfile.lock +++ b/gems/toml-merge/Gemfile.lock @@ -16,22 +16,35 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: addressable (2.9.0) public_suffix (>= 2.0.2, < 8.0) ansi (1.6.0) - appraisal2 (3.1.4) + appraisal2 (3.2.0) bundler (>= 1.17.3) rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -322,13 +335,8 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) - turbo_tests2 (3.1.14) + turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) rspec (>= 3.10) version_gem (~> 1.1, >= 1.1.14) @@ -373,6 +381,7 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + ast-merge! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) debug (>= 1.1) @@ -402,6 +411,7 @@ DEPENDENCIES stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! + tree_haver! tree_sitter_language_pack! yaml-converter (~> 0.1) yard (~> 0.9, >= 0.9.44) @@ -414,7 +424,7 @@ DEPENDENCIES CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 - appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 + appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-merge (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 @@ -535,7 +545,7 @@ CHECKSUMS tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f - turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 From 140fc88fd6c637f0e1d01e24e8e643028162640d Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:13:26 -0600 Subject: [PATCH 107/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ruby-merge/Gemfile.lock | 331 +---------------------------------- 1 file changed, 4 insertions(+), 327 deletions(-) diff --git a/gems/ruby-merge/Gemfile.lock b/gems/ruby-merge/Gemfile.lock index 198237732..00cbdcf10 100644 --- a/gems/ruby-merge/Gemfile.lock +++ b/gems/ruby-merge/Gemfile.lock @@ -16,38 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -57,192 +25,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: @@ -252,36 +34,13 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: addressable (2.9.0) public_suffix (>= 2.0.2, < 8.0) ansi (1.6.0) - appraisal2 (3.1.4) + appraisal2 (3.2.0) bundler (>= 1.17.3) rake (>= 10) thor (>= 0.14) @@ -294,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +116,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +283,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,13 +335,8 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) - turbo_tests2 (3.1.14) + turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) rspec (>= 3.10) version_gem (~> 1.1, >= 1.1.14) @@ -638,45 +381,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -687,52 +408,31 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0.0) ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 - appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 + appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +440,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +452,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +479,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +490,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -835,8 +521,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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +529,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +542,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f - turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) + turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +557,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From c45e21463f79e3f7b467a95b35689deeecb3a6ca Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:13:28 -0600 Subject: [PATCH 108/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/go-merge/Gemfile.lock | 331 +------------------------------------ 1 file changed, 4 insertions(+), 327 deletions(-) diff --git a/gems/go-merge/Gemfile.lock b/gems/go-merge/Gemfile.lock index c7358e5a9..c5a14bc8f 100644 --- a/gems/go-merge/Gemfile.lock +++ b/gems/go-merge/Gemfile.lock @@ -16,38 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -57,192 +25,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: @@ -252,36 +34,13 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: addressable (2.9.0) public_suffix (>= 2.0.2, < 8.0) ansi (1.6.0) - appraisal2 (3.1.4) + appraisal2 (3.2.0) bundler (>= 1.17.3) rake (>= 10) thor (>= 0.14) @@ -294,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +116,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +283,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,13 +335,8 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) - turbo_tests2 (3.1.14) + turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) rspec (>= 3.10) version_gem (~> 1.1, >= 1.1.14) @@ -638,45 +381,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +407,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 - appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 + appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +440,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -758,22 +457,15 @@ CHECKSUMS io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +480,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +491,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +518,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +529,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +542,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f - turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) + turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +557,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From a1041e7f933b1f687d3a95fa111337e5fa4d9dc7 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:13:31 -0600 Subject: [PATCH 109/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/rust-merge/Gemfile.lock | 331 +---------------------------------- 1 file changed, 4 insertions(+), 327 deletions(-) diff --git a/gems/rust-merge/Gemfile.lock b/gems/rust-merge/Gemfile.lock index af14b7d03..f3bca7e35 100644 --- a/gems/rust-merge/Gemfile.lock +++ b/gems/rust-merge/Gemfile.lock @@ -16,38 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -57,192 +25,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: @@ -252,36 +34,13 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: addressable (2.9.0) public_suffix (>= 2.0.2, < 8.0) ansi (1.6.0) - appraisal2 (3.1.4) + appraisal2 (3.2.0) bundler (>= 1.17.3) rake (>= 10) thor (>= 0.14) @@ -294,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +116,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +283,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,13 +335,8 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) - turbo_tests2 (3.1.14) + turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) rspec (>= 3.10) version_gem (~> 1.1, >= 1.1.14) @@ -638,45 +381,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +406,33 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 - appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 + appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +440,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +452,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +479,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +490,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +517,10 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +529,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +542,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f - turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) + turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +557,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 368db2e7ad43a35d2524affc7d74aa1fa8b8cfa0 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:13:33 -0600 Subject: [PATCH 110/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/typescript-merge/Gemfile.lock | 38 +++++++++++++++++++----------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/gems/typescript-merge/Gemfile.lock b/gems/typescript-merge/Gemfile.lock index 421168b5d..c4f95e916 100644 --- a/gems/typescript-merge/Gemfile.lock +++ b/gems/typescript-merge/Gemfile.lock @@ -16,22 +16,35 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: addressable (2.9.0) public_suffix (>= 2.0.2, < 8.0) ansi (1.6.0) - appraisal2 (3.1.4) + appraisal2 (3.2.0) bundler (>= 1.17.3) rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -322,13 +335,8 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) - turbo_tests2 (3.1.14) + turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) rspec (>= 3.10) version_gem (~> 1.1, >= 1.1.14) @@ -373,6 +381,7 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + ast-merge! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) debug (>= 1.1) @@ -401,6 +410,7 @@ DEPENDENCIES standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + tree_haver! tree_sitter_language_pack! typescript-merge! yaml-converter (~> 0.1) @@ -414,7 +424,7 @@ DEPENDENCIES CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 - appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 + appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-merge (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 @@ -534,7 +544,7 @@ CHECKSUMS tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f - turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f From fb4fd46cf1434211d571e39f94bd124e0b09c052 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:13:36 -0600 Subject: [PATCH 111/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-template/Gemfile.lock | 347 +-------------------------------- 1 file changed, 9 insertions(+), 338 deletions(-) diff --git a/gems/ast-template/Gemfile.lock b/gems/ast-template/Gemfile.lock index 49e30a565..8933f3cb2 100644 --- a/gems/ast-template/Gemfile.lock +++ b/gems/ast-template/Gemfile.lock @@ -15,38 +15,6 @@ PATH ast-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -56,232 +24,13 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: addressable (2.9.0) public_suffix (>= 2.0.2, < 8.0) ansi (1.6.0) - appraisal2 (3.1.4) + appraisal2 (3.2.0) bundler (>= 1.17.3) rake (>= 10) thor (>= 0.14) @@ -294,12 +43,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +106,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +134,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +273,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,13 +325,13 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) - turbo_tests2 (3.1.14) + turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) rspec (>= 3.10) version_gem (~> 1.1, >= 1.1.14) @@ -638,45 +376,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +402,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 - appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 + appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +435,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +447,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +474,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +485,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +512,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +523,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +536,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f - turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) + turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +551,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From d2a55aa83ffe72be9a2fef37972f481ecd538f46 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:13:38 -0600 Subject: [PATCH 112/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/binary-merge/Gemfile.lock | 347 +-------------------------------- 1 file changed, 4 insertions(+), 343 deletions(-) diff --git a/gems/binary-merge/Gemfile.lock b/gems/binary-merge/Gemfile.lock index 3e61ddc76..ca433cba5 100644 --- a/gems/binary-merge/Gemfile.lock +++ b/gems/binary-merge/Gemfile.lock @@ -15,234 +15,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: @@ -252,36 +24,13 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: addressable (2.9.0) public_suffix (>= 2.0.2, < 8.0) ansi (1.6.0) - appraisal2 (3.1.4) + appraisal2 (3.2.0) bundler (>= 1.17.3) rake (>= 10) thor (>= 0.14) @@ -294,12 +43,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +106,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +134,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +273,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -584,16 +322,8 @@ GEM delegate (~> 0.1) rspec (~> 3.0) timecop (>= 0.7, < 1) - token-resolver (2.0.4) - parslet (~> 2.0) - version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) - turbo_tests2 (3.1.14) + turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) rspec (>= 3.10) version_gem (~> 1.1, >= 1.1.14) @@ -638,45 +368,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +393,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 - appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 + appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) - ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +426,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +438,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +465,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +476,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +503,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +514,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -858,20 +526,14 @@ CHECKSUMS thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73 timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 - token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f - turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) + turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +541,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 996300a7210471dda43ae2708918a1193d314e9f Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:13:41 -0600 Subject: [PATCH 113/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/zip-merge/Gemfile.lock | 347 +----------------------------------- 1 file changed, 4 insertions(+), 343 deletions(-) diff --git a/gems/zip-merge/Gemfile.lock b/gems/zip-merge/Gemfile.lock index 9a59ea1c9..5063310dd 100644 --- a/gems/zip-merge/Gemfile.lock +++ b/gems/zip-merge/Gemfile.lock @@ -15,241 +15,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: @@ -259,29 +24,13 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: addressable (2.9.0) public_suffix (>= 2.0.2, < 8.0) ansi (1.6.0) - appraisal2 (3.1.4) + appraisal2 (3.2.0) bundler (>= 1.17.3) rake (>= 10) thor (>= 0.14) @@ -294,12 +43,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +106,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +134,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +273,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -584,16 +322,8 @@ GEM delegate (~> 0.1) rspec (~> 3.0) timecop (>= 0.7, < 1) - token-resolver (2.0.4) - parslet (~> 2.0) - version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) - turbo_tests2 (3.1.14) + turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) rspec (>= 3.10) version_gem (~> 1.1, >= 1.1.14) @@ -638,45 +368,22 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,19 +392,13 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) @@ -709,30 +410,14 @@ DEPENDENCIES CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 - appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 + appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) - ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +425,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +437,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +464,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +475,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +502,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +513,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -858,20 +525,14 @@ CHECKSUMS thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73 timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 - token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f - turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) + turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd From 25014fd17e4f7320d3b95c39e50daa2f557715b4 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:13:43 -0600 Subject: [PATCH 114/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/psych-merge/Gemfile.lock | 320 +--------------------------------- 1 file changed, 4 insertions(+), 316 deletions(-) diff --git a/gems/psych-merge/Gemfile.lock b/gems/psych-merge/Gemfile.lock index f43488920..357b57210 100644 --- a/gems/psych-merge/Gemfile.lock +++ b/gems/psych-merge/Gemfile.lock @@ -17,38 +17,6 @@ PATH version_gem (~> 1.1, >= 1.1.9) yaml-merge (= 7.1.0) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -58,191 +26,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: @@ -252,14 +35,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: @@ -268,20 +43,13 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: addressable (2.9.0) public_suffix (>= 2.0.2, < 8.0) ansi (1.6.0) - appraisal2 (3.1.4) + appraisal2 (3.2.0) bundler (>= 1.17.3) rake (>= 10) thor (>= 0.14) @@ -294,12 +62,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +125,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +153,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +292,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,13 +344,8 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) - turbo_tests2 (3.1.14) + turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) rspec (>= 3.10) version_gem (~> 1.1, >= 1.1.14) @@ -638,45 +390,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,17 +416,12 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) yaml-merge! yard (~> 0.9, >= 0.9.44) @@ -704,35 +430,19 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 - appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 + appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +450,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +462,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,12 +489,9 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 @@ -803,7 +501,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +528,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +539,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,14 +552,10 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f - turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) + turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -879,7 +568,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 4bf0c6228ce05c09e92fab05899f6b399b530de8 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:13:45 -0600 Subject: [PATCH 115/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/citrus-toml-merge/Gemfile.lock | 347 ++-------------------------- 1 file changed, 14 insertions(+), 333 deletions(-) diff --git a/gems/citrus-toml-merge/Gemfile.lock b/gems/citrus-toml-merge/Gemfile.lock index d5b62761d..1aca14762 100644 --- a/gems/citrus-toml-merge/Gemfile.lock +++ b/gems/citrus-toml-merge/Gemfile.lock @@ -16,225 +16,6 @@ PATH toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: @@ -243,49 +24,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: addressable (2.9.0) public_suffix (>= 2.0.2, < 8.0) ansi (1.6.0) - appraisal2 (3.1.4) + appraisal2 (3.2.0) bundler (>= 1.17.3) rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +48,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +111,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +139,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +278,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,13 +330,16 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) - turbo_tests2 (3.1.14) + turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) rspec (>= 3.10) version_gem (~> 1.1, >= 1.1.14) @@ -638,45 +384,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +409,33 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 - appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 + appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +443,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +455,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +482,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +493,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +520,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +531,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +544,16 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f - turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) + turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +561,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 717c826c1625af876854792d92bf99606cb9460c Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:13:47 -0600 Subject: [PATCH 116/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/parslet-toml-merge/Gemfile.lock | 348 ++------------------------- 1 file changed, 14 insertions(+), 334 deletions(-) diff --git a/gems/parslet-toml-merge/Gemfile.lock b/gems/parslet-toml-merge/Gemfile.lock index df4537702..51a9fc291 100644 --- a/gems/parslet-toml-merge/Gemfile.lock +++ b/gems/parslet-toml-merge/Gemfile.lock @@ -16,225 +16,6 @@ PATH toml-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: @@ -243,49 +24,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: addressable (2.9.0) public_suffix (>= 2.0.2, < 8.0) ansi (1.6.0) - appraisal2 (3.1.4) + appraisal2 (3.2.0) bundler (>= 1.17.3) rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +48,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +111,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +139,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +278,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -589,11 +332,13 @@ GEM version_gem (~> 1.1, >= 1.1.13) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) - turbo_tests2 (3.1.14) + turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) rspec (>= 3.10) version_gem (~> 1.1, >= 1.1.14) @@ -638,45 +383,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +408,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 - appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 + appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +441,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +453,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -789,13 +481,10 @@ CHECKSUMS parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 parslet-toml-merge (7.1.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +492,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +519,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +530,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -861,17 +545,14 @@ CHECKSUMS token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f - turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) + turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +560,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 087f6a1642fb68329f25826c1bc5e62b7efa3cba Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:13:49 -0600 Subject: [PATCH 117/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/commonmarker-merge/Gemfile.lock | 339 ++------------------------- 1 file changed, 14 insertions(+), 325 deletions(-) diff --git a/gems/commonmarker-merge/Gemfile.lock b/gems/commonmarker-merge/Gemfile.lock index e28a889bb..07cb009f0 100644 --- a/gems/commonmarker-merge/Gemfile.lock +++ b/gems/commonmarker-merge/Gemfile.lock @@ -16,138 +16,6 @@ PATH markdown-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: @@ -156,136 +24,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: addressable (2.9.0) public_suffix (>= 2.0.2, < 8.0) ansi (1.6.0) - appraisal2 (3.1.4) + appraisal2 (3.2.0) bundler (>= 1.17.3) rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -363,8 +117,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +145,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +284,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,13 +336,13 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) - turbo_tests2 (3.1.14) + turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) rspec (>= 3.10) version_gem (~> 1.1, >= 1.1.14) @@ -638,45 +387,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,46 +413,30 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 - appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 + appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca @@ -740,7 +452,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +464,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +492,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +503,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +530,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +541,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +554,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f - turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) + turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +569,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From e8a9fcecb073b051571449c0b0c610402ea2be9a Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:13:51 -0600 Subject: [PATCH 118/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/kramdown-merge/Gemfile.lock | 351 ++----------------------------- 1 file changed, 14 insertions(+), 337 deletions(-) diff --git a/gems/kramdown-merge/Gemfile.lock b/gems/kramdown-merge/Gemfile.lock index 52505fe3d..20653492d 100644 --- a/gems/kramdown-merge/Gemfile.lock +++ b/gems/kramdown-merge/Gemfile.lock @@ -16,138 +16,6 @@ PATH markdown-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: @@ -156,136 +24,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: addressable (2.9.0) public_suffix (>= 2.0.2, < 8.0) ansi (1.6.0) - appraisal2 (3.1.4) + appraisal2 (3.2.0) bundler (>= 1.17.3) rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +48,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +111,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +139,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +278,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,13 +330,13 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) - turbo_tests2 (3.1.14) + turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) rspec (>= 3.10) version_gem (~> 1.1, >= 1.1.14) @@ -638,45 +381,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +407,31 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 - appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 + appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +439,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,15 +451,11 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 @@ -772,8 +466,6 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +480,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +491,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +518,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +529,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +542,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f - turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) + turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +557,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From f2e2d571a7125b08d7133e40d5c18c09a06b9ccd Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:13:53 -0600 Subject: [PATCH 119/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/prism-merge/Gemfile.lock | 351 ++-------------------------------- 1 file changed, 14 insertions(+), 337 deletions(-) diff --git a/gems/prism-merge/Gemfile.lock b/gems/prism-merge/Gemfile.lock index 4cf6a5c42..95d545adf 100644 --- a/gems/prism-merge/Gemfile.lock +++ b/gems/prism-merge/Gemfile.lock @@ -16,196 +16,6 @@ PATH ruby-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: @@ -214,78 +24,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: addressable (2.9.0) public_suffix (>= 2.0.2, < 8.0) ansi (1.6.0) - appraisal2 (3.1.4) + appraisal2 (3.2.0) bundler (>= 1.17.3) rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +48,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +111,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +139,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +278,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,13 +330,13 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) - turbo_tests2 (3.1.14) + turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) rspec (>= 3.10) version_gem (~> 1.1, >= 1.1.14) @@ -638,45 +381,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -687,52 +408,30 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0.0) ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 - appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 + appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +439,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +451,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +478,11 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +490,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -835,8 +521,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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +529,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +542,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f - turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) + turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +557,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From d2b2c8e5f10e66d195b19c7bd177f17ffb6ffd0e Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:13:55 -0600 Subject: [PATCH 120/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/kettle-jem/Gemfile.lock | 166 +++++++++++++++++++++++++++++------ 1 file changed, 138 insertions(+), 28 deletions(-) diff --git a/gems/kettle-jem/Gemfile.lock b/gems/kettle-jem/Gemfile.lock index 76ea60722..3f9b1fce1 100644 --- a/gems/kettle-jem/Gemfile.lock +++ b/gems/kettle-jem/Gemfile.lock @@ -38,7 +38,7 @@ PATH yaml-merge (= 7.1.0) 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.0) ast-crispr (= 7.1.0) @@ -46,7 +46,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-crispr (= 7.1.0) @@ -54,7 +54,23 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -63,7 +79,14 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge specs: bash-merge (7.1.0) ast-merge (= 7.1.0) @@ -71,7 +94,14 @@ PATH version_gem (~> 1.1, >= 1.1.14) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge specs: citrus-toml-merge (7.1.0) toml-merge (= 7.1.0) @@ -79,7 +109,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) commonmarker (~> 2.2) @@ -87,7 +117,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-merge (= 7.1.0) @@ -95,7 +125,15 @@ PATH version_gem (~> 1.1, >= 1.1.14) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: json-merge (7.1.0) ast-merge (= 7.1.0) @@ -103,7 +141,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) kramdown (~> 2.5) @@ -111,7 +149,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-merge (= 7.1.0) @@ -119,7 +157,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) markdown-merge (= 7.1.0) @@ -127,7 +165,23 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge specs: prism-merge (7.1.0) prism (~> 1.6) @@ -135,7 +189,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-merge (= 7.1.0) @@ -144,7 +198,7 @@ PATH yaml-merge (= 7.1.0) 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.0) ast-merge (= 7.1.0) @@ -153,7 +207,7 @@ PATH version_gem (~> 1.1, >= 1.1.14) 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.0) ast-merge (= 7.1.0) @@ -161,7 +215,28 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: toml-merge (7.1.0) ast-merge (= 7.1.0) @@ -169,7 +244,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) citrus (~> 3.0) @@ -178,20 +253,35 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: yaml-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: addressable (2.9.0) public_suffix (>= 2.0.2, < 8.0) ansi (1.6.0) - appraisal2 (3.1.4) + appraisal2 (3.2.0) bundler (>= 1.17.3) rake (>= 10) thor (>= 0.14) @@ -200,10 +290,6 @@ GEM rubocop (>= 1.0) version_gem (~> 1.1, >= 1.1.14) ast (2.4.3) - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -279,7 +365,7 @@ GEM kettle-drift (1.0.5) version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (3.0.0) + kettle-soup-cover (3.0.1) simplecov (>= 1.0) simplecov-cobertura (>= 4.0) simplecov-console (~> 0.9, >= 0.9.5) @@ -517,11 +603,13 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) tsort (0.2.0) - turbo_tests2 (3.1.14) + turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) rspec (>= 3.10) version_gem (~> 1.1, >= 1.1.14) @@ -561,11 +649,15 @@ PLATFORMS DEPENDENCIES appraisal2 (~> 3.1, >= 3.1.4) appraisal2-rubocop (~> 1.0, >= 1.0.0) + 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! @@ -575,6 +667,7 @@ DEPENDENCIES erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) + go-merge! irb (~> 1.17) json-merge! kettle-drift (~> 1.0, >= 1.0.5) @@ -588,6 +681,8 @@ DEPENDENCIES markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! prism-merge! psych-merge! rake (~> 13.0) @@ -604,6 +699,8 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0, >= 3.0.6) ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (~> 1.54, >= 1.54.0) stone_checksums (~> 1.0, >= 1.0.6) stringio (>= 3.0) @@ -611,6 +708,7 @@ DEPENDENCIES tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.1, >= 3.1.14) + typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.3) yaml-merge! @@ -620,21 +718,25 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.3) yard-yaml (~> 0.2, >= 0.2.3) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 - appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 + appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f appraisal2-rubocop (1.0.0) sha256=b71410fbb014befda5340605a605b7f6f3f012739baf0acc5b4351b592c3258d ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 @@ -661,6 +763,7 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 @@ -670,7 +773,7 @@ CHECKSUMS kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.0) sha256=4d3ed6c714cb88cf148f65934c6a96c976b2281abb3ae443ad0ddf6ac0da875b + kettle-soup-cover (3.0.1) sha256=83ebe2aa099f15781e4796b5faef0dc2720fba48f6b9d34808670b91baf271e4 kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -690,6 +793,8 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 @@ -742,6 +847,7 @@ 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 @@ -749,6 +855,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.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -763,12 +870,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f - turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -782,6 +891,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 2b85f7e8bff535ba0683452a26ae057dd797f504 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:13:57 -0600 Subject: [PATCH 121/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/smorg-rb/Gemfile.lock | 286 +++++++++---------------------------- 1 file changed, 71 insertions(+), 215 deletions(-) diff --git a/gems/smorg-rb/Gemfile.lock b/gems/smorg-rb/Gemfile.lock index da28dd8d8..728850337 100644 --- a/gems/smorg-rb/Gemfile.lock +++ b/gems/smorg-rb/Gemfile.lock @@ -21,30 +21,6 @@ PATH plain-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: @@ -62,52 +38,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge specs: @@ -153,22 +83,6 @@ PATH tree_haver (= 7.1.0) yaml-merge (= 7.1.0) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: @@ -177,14 +91,6 @@ PATH markly (~> 0.9) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: @@ -193,106 +99,44 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: addressable (2.9.0) public_suffix (>= 2.0.2, < 8.0) ansi (1.6.0) - appraisal2 (3.1.4) + appraisal2 (3.2.0) bundler (>= 1.17.3) rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) bundler (>= 1.2.0) thor (~> 1.0) citrus (3.0.2) + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) cmdparse (3.0.7) commonmarker (2.9.0-aarch64-linux) commonmarker (2.9.0-aarch64-linux-musl) @@ -300,6 +144,10 @@ GEM commonmarker (2.9.0-x86_64-darwin) commonmarker (2.9.0-x86_64-linux) commonmarker (2.9.0-x86_64-linux-musl) + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -309,6 +157,10 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docile (1.4.1) + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -363,8 +215,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -388,11 +238,19 @@ GEM turbo_tests2 (~> 3.1, >= 3.1.12) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) 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.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) @@ -421,9 +279,18 @@ GEM prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) psych (5.4.0) date stringio + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -435,6 +302,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) rdoc (6.17.0) erb psych (>= 4.0.0) @@ -530,6 +402,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -587,13 +463,20 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) - turbo_tests2 (3.1.14) + turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) rspec (>= 3.10) version_gem (~> 1.1, >= 1.1.14) @@ -606,6 +489,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.13) + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) yard (0.9.45) yard-fence (0.9.6) rdoc (>= 6.11, < 8) @@ -638,20 +525,11 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) @@ -659,24 +537,17 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,43 +556,34 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 - appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 + appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) @@ -760,7 +622,6 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad @@ -788,7 +649,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.0) plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -835,7 +695,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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -859,14 +718,12 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f - turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c - typescript-merge (7.1.0) + turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -879,7 +736,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From a7b597cda758a34978f83fa2b9acf30eb7d97fac Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:15:08 -0600 Subject: [PATCH 122/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-merge/Gemfile.lock | 333 ++++++++++++++++++++++++++++++++++++ 1 file changed, 333 insertions(+) diff --git a/gems/ast-merge/Gemfile.lock b/gems/ast-merge/Gemfile.lock index 94f427443..b418a067c 100644 --- a/gems/ast-merge/Gemfile.lock +++ b/gems/ast-merge/Gemfile.lock @@ -17,6 +17,232 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: @@ -26,6 +252,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -45,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -108,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -136,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -275,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -327,6 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -373,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -398,32 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -431,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -443,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -470,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -481,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -508,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -519,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -532,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -547,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From bc3004577f2aec857fb82a056a2d8f9247777522 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:15:10 -0600 Subject: [PATCH 123/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-crispr/Gemfile.lock | 335 ++++++++++++++++++++++++++++++++++- 1 file changed, 330 insertions(+), 5 deletions(-) diff --git a/gems/ast-crispr/Gemfile.lock b/gems/ast-crispr/Gemfile.lock index 9cc7afd50..37fdf3f15 100644 --- a/gems/ast-crispr/Gemfile.lock +++ b/gems/ast-crispr/Gemfile.lock @@ -16,6 +16,30 @@ PATH service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -25,6 +49,232 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -44,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -107,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -135,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -328,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -380,23 +639,44 @@ DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -405,18 +685,26 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -424,13 +712,27 @@ CHECKSUMS appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -438,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -450,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -477,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -488,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -515,9 +831,11 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -527,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -540,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -555,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 8bad073e483b00201aa7566a9c150901c3245327 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:15:12 -0600 Subject: [PATCH 124/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-crispr-ruby-prism/Gemfile.lock | 332 +++++++++++++++++++++++- 1 file changed, 322 insertions(+), 10 deletions(-) diff --git a/gems/ast-crispr-ruby-prism/Gemfile.lock b/gems/ast-crispr-ruby-prism/Gemfile.lock index 9c606cf27..de85587b4 100644 --- a/gems/ast-crispr-ruby-prism/Gemfile.lock +++ b/gems/ast-crispr-ruby-prism/Gemfile.lock @@ -16,6 +16,14 @@ PATH prism (>= 1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: @@ -24,6 +32,249 @@ PATH service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -35,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -48,6 +294,8 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -111,6 +359,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -139,6 +389,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-x86_64-linux-gnu) racc (~> 1.4) @@ -324,11 +575,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -371,23 +622,44 @@ DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -396,18 +668,26 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -415,14 +695,23 @@ CHECKSUMS appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -430,6 +719,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -442,19 +732,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-x86_64-linux-gnu) sha256=379fae440b28915e3f19d752ce2dcf8465ed2b2fbefd2a7ca0dd497bc981a06a nokogiri (1.19.4-x86_64-linux-musl) sha256=17dfb7c1fa194ae02fbf7c51a7afc8d278045ab3fdacfd86f91d02d7b274470b @@ -465,10 +763,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -476,6 +778,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -503,9 +806,11 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -515,6 +820,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -528,14 +834,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -543,6 +854,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From f2d7b748ee83b6e30f4a5cabb5685ec0b0f93577 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:15:14 -0600 Subject: [PATCH 125/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/markdown-merge/Gemfile.lock | 323 +++++++++++++++++++++++++++++++ 1 file changed, 323 insertions(+) diff --git a/gems/markdown-merge/Gemfile.lock b/gems/markdown-merge/Gemfile.lock index c02c153a4..f39d8ddab 100644 --- a/gems/markdown-merge/Gemfile.lock +++ b/gems/markdown-merge/Gemfile.lock @@ -16,6 +16,38 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -25,6 +57,192 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: @@ -34,6 +252,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -53,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,24 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -407,32 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,20 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -480,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -491,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -518,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -529,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -542,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From ca91bd0bd12e818aacbf35a4ef170de82c3a7b58 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:15:16 -0600 Subject: [PATCH 126/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/markly-merge/Gemfile.lock | 341 ++++++++++++++++++++++++++++++++- 1 file changed, 331 insertions(+), 10 deletions(-) diff --git a/gems/markly-merge/Gemfile.lock b/gems/markly-merge/Gemfile.lock index e4160a304..0e38a0a14 100644 --- a/gems/markly-merge/Gemfile.lock +++ b/gems/markly-merge/Gemfile.lock @@ -16,6 +16,146 @@ PATH markly (~> 0.9) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: @@ -24,6 +164,117 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -35,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -48,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -111,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -279,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -331,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -382,24 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -408,31 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,15 +753,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 @@ -482,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -493,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -520,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -531,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -544,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -559,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From af5d3b18dc8fc8e44e716562576fc65dfbea2216 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:15:18 -0600 Subject: [PATCH 127/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-crispr-markdown-markly/Gemfile.lock | 331 ++++++++++++++++++- 1 file changed, 317 insertions(+), 14 deletions(-) diff --git a/gems/ast-crispr-markdown-markly/Gemfile.lock b/gems/ast-crispr-markdown-markly/Gemfile.lock index 16b2c39d7..0e9612d0a 100644 --- a/gems/ast-crispr-markdown-markly/Gemfile.lock +++ b/gems/ast-crispr-markdown-markly/Gemfile.lock @@ -16,6 +16,14 @@ PATH markly-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: @@ -24,6 +32,130 @@ PATH service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: @@ -32,6 +164,117 @@ PATH markly (~> 0.9) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -43,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -56,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -119,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -147,10 +393,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) @@ -345,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -398,23 +640,43 @@ DEPENDENCIES appraisal2 (~> 3.0, >= 3.0.6) 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -423,18 +685,26 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -443,13 +713,26 @@ CHECKSUMS ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -457,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -469,15 +753,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 @@ -499,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -510,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -537,9 +831,11 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -549,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -562,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -577,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From ae4c4beefdf6ce6de9393e9202ec6861b5152981 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:15:20 -0600 Subject: [PATCH 128/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/json-merge/Gemfile.lock | 323 +++++++++++++++++++++++++++++++++++ 1 file changed, 323 insertions(+) diff --git a/gems/json-merge/Gemfile.lock b/gems/json-merge/Gemfile.lock index e84f9d545..3271a7758 100644 --- a/gems/json-merge/Gemfile.lock +++ b/gems/json-merge/Gemfile.lock @@ -16,6 +16,38 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -25,6 +57,192 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: @@ -34,6 +252,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -53,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,24 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -407,32 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,20 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -480,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -491,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -518,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -529,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -542,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From d56308b7f6ee4d8c1751a0d1c40930914a2899a4 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:15:22 -0600 Subject: [PATCH 129/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-merge-git/Gemfile.lock | 313 ++++++++++++++++++++++++++++++++ 1 file changed, 313 insertions(+) diff --git a/gems/ast-merge-git/Gemfile.lock b/gems/ast-merge-git/Gemfile.lock index 817799181..4df4417ad 100644 --- a/gems/ast-merge-git/Gemfile.lock +++ b/gems/ast-merge-git/Gemfile.lock @@ -16,6 +16,30 @@ PATH json-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -25,6 +49,60 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: @@ -33,6 +111,138 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: @@ -42,6 +252,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -61,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -124,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -152,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -291,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -343,6 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -389,25 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -416,33 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -450,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -462,20 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -490,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -501,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -528,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -539,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -552,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -567,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 7fe4a61dfd63973df13202a1aebf8910b9c4d99d Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:15:24 -0600 Subject: [PATCH 130/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/plain-merge/Gemfile.lock | 323 ++++++++++++++++++++++++++++++++++ 1 file changed, 323 insertions(+) diff --git a/gems/plain-merge/Gemfile.lock b/gems/plain-merge/Gemfile.lock index 41845a5bb..c020666f7 100644 --- a/gems/plain-merge/Gemfile.lock +++ b/gems/plain-merge/Gemfile.lock @@ -16,6 +16,38 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -25,6 +57,192 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: @@ -34,6 +252,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -53,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,24 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -407,32 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -479,11 +788,14 @@ 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.0) plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -491,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -518,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -529,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -542,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From cbd33de14dc42bbf23fe729286363824d054a190 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:15:26 -0600 Subject: [PATCH 131/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/bash-merge/Gemfile.lock | 323 +++++++++++++++++++++++++++++++++++ 1 file changed, 323 insertions(+) diff --git a/gems/bash-merge/Gemfile.lock b/gems/bash-merge/Gemfile.lock index 06206c4c7..95209e787 100644 --- a/gems/bash-merge/Gemfile.lock +++ b/gems/bash-merge/Gemfile.lock @@ -16,6 +16,38 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -25,6 +57,192 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: @@ -34,6 +252,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -53,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,24 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.1, >= 3.1.4) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.3, >= 2.3.7) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -407,34 +685,55 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.1, >= 3.1.14) + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -442,6 +741,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -454,19 +754,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -481,10 +789,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -492,6 +804,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -519,9 +832,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -530,6 +846,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -543,14 +860,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -558,6 +880,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 7e45a76d5b97c84172e2b16123555cbb1d471e4f Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:15:29 -0600 Subject: [PATCH 132/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/dotenv-merge/Gemfile.lock | 323 +++++++++++++++++++++++++++++++++ 1 file changed, 323 insertions(+) diff --git a/gems/dotenv-merge/Gemfile.lock b/gems/dotenv-merge/Gemfile.lock index 69c666e6d..191c40b34 100644 --- a/gems/dotenv-merge/Gemfile.lock +++ b/gems/dotenv-merge/Gemfile.lock @@ -16,6 +16,38 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -25,6 +57,192 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: @@ -34,6 +252,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -53,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,24 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.1, >= 3.1.4) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.3, >= 2.3.7) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -407,33 +685,55 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.1, >= 3.1.14) + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -454,19 +754,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -481,10 +789,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -492,6 +804,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -519,9 +832,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -530,6 +846,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -543,14 +860,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -558,6 +880,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 61d6a8945eb28d8b7de6539f661b866d1f91b928 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:15:31 -0600 Subject: [PATCH 133/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/rbs-merge/Gemfile.lock | 322 ++++++++++++++++++++++++++++++++++++ 1 file changed, 322 insertions(+) diff --git a/gems/rbs-merge/Gemfile.lock b/gems/rbs-merge/Gemfile.lock index 3dcf0b8f9..3138f86a8 100644 --- a/gems/rbs-merge/Gemfile.lock +++ b/gems/rbs-merge/Gemfile.lock @@ -17,6 +17,38 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -26,6 +58,191 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: @@ -35,6 +252,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -54,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -117,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -145,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -284,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -336,6 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -382,21 +638,42 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.1, >= 3.1.4) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.3, >= 2.3.7) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) rbs-merge! @@ -408,33 +685,55 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.1, >= 3.1.14) + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -442,6 +741,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -454,19 +754,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -481,10 +789,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -520,9 +832,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -531,6 +846,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -544,14 +860,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -559,6 +880,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From f47e670c58cb5033e6170b6fe54ffe44869c0d8e Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:15:33 -0600 Subject: [PATCH 134/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/yaml-merge/Gemfile.lock | 323 +++++++++++++++++++++++++++++++++++ 1 file changed, 323 insertions(+) diff --git a/gems/yaml-merge/Gemfile.lock b/gems/yaml-merge/Gemfile.lock index 316adb48a..5ea0feeed 100644 --- a/gems/yaml-merge/Gemfile.lock +++ b/gems/yaml-merge/Gemfile.lock @@ -16,6 +16,38 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -25,6 +57,200 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: @@ -34,6 +260,21 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -53,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -406,12 +685,17 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) yaml-merge! yard (~> 0.9, >= 0.9.44) @@ -420,19 +704,35 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -479,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -490,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -517,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -528,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -541,10 +859,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -557,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From f323ba1b087af0a5b9f3e9a8db6439f0fc1bdded Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:15:35 -0600 Subject: [PATCH 135/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/toml-merge/Gemfile.lock | 323 +++++++++++++++++++++++++++++++++++ 1 file changed, 323 insertions(+) diff --git a/gems/toml-merge/Gemfile.lock b/gems/toml-merge/Gemfile.lock index 25ea87683..87531476e 100644 --- a/gems/toml-merge/Gemfile.lock +++ b/gems/toml-merge/Gemfile.lock @@ -16,6 +16,38 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -25,6 +57,192 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: @@ -34,6 +252,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -53,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -406,33 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -479,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -490,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -517,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -528,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -541,15 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 903cd670abc3b87f6fbaa69c5d3e600aac00f387 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:15:37 -0600 Subject: [PATCH 136/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ruby-merge/Gemfile.lock | 323 +++++++++++++++++++++++++++++++++++ 1 file changed, 323 insertions(+) diff --git a/gems/ruby-merge/Gemfile.lock b/gems/ruby-merge/Gemfile.lock index 00cbdcf10..691f91a12 100644 --- a/gems/ruby-merge/Gemfile.lock +++ b/gems/ruby-merge/Gemfile.lock @@ -16,6 +16,38 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -25,6 +57,192 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: @@ -34,6 +252,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -53,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -408,31 +687,52 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0.0) ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -479,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -490,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -521,6 +835,8 @@ 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -529,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -542,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 1da9c87edfa900afb0e6aac2c8c819e3387423d8 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:15:39 -0600 Subject: [PATCH 137/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/go-merge/Gemfile.lock | 323 +++++++++++++++++++++++++++++++++++++ 1 file changed, 323 insertions(+) diff --git a/gems/go-merge/Gemfile.lock b/gems/go-merge/Gemfile.lock index c5a14bc8f..c35a1d0fa 100644 --- a/gems/go-merge/Gemfile.lock +++ b/gems/go-merge/Gemfile.lock @@ -16,6 +16,38 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -25,6 +57,192 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: @@ -34,6 +252,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -53,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,24 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -407,32 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -457,15 +758,22 @@ CHECKSUMS io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -480,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -491,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -518,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -529,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -542,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From bd721798640ccc60dda03a727bec868145c4bf49 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:15:41 -0600 Subject: [PATCH 138/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/rust-merge/Gemfile.lock | 323 +++++++++++++++++++++++++++++++++++ 1 file changed, 323 insertions(+) diff --git a/gems/rust-merge/Gemfile.lock b/gems/rust-merge/Gemfile.lock index f3bca7e35..53081f8da 100644 --- a/gems/rust-merge/Gemfile.lock +++ b/gems/rust-merge/Gemfile.lock @@ -16,6 +16,38 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -25,6 +57,192 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: @@ -34,6 +252,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -53,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -406,33 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -479,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -490,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -517,10 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -529,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -542,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From ccb1a33b7574707d962a49d29c49a85ea2437138 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:15:43 -0600 Subject: [PATCH 139/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/typescript-merge/Gemfile.lock | 323 +++++++++++++++++++++++++++++ 1 file changed, 323 insertions(+) diff --git a/gems/typescript-merge/Gemfile.lock b/gems/typescript-merge/Gemfile.lock index c4f95e916..776990eb1 100644 --- a/gems/typescript-merge/Gemfile.lock +++ b/gems/typescript-merge/Gemfile.lock @@ -16,6 +16,38 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -25,6 +57,200 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: @@ -34,6 +260,21 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -53,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -406,33 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -479,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -490,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -517,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -528,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -541,6 +859,9 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f @@ -550,6 +871,7 @@ CHECKSUMS unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 397c7a538a2e659c69a151c9c06ecbc5920fa0a0 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:15:45 -0600 Subject: [PATCH 140/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-template/Gemfile.lock | 339 ++++++++++++++++++++++++++++++++- 1 file changed, 334 insertions(+), 5 deletions(-) diff --git a/gems/ast-template/Gemfile.lock b/gems/ast-template/Gemfile.lock index 8933f3cb2..3db99393b 100644 --- a/gems/ast-template/Gemfile.lock +++ b/gems/ast-template/Gemfile.lock @@ -15,6 +15,38 @@ PATH ast-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -24,6 +56,225 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -43,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -106,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -134,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -273,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -325,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -376,24 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -402,32 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -435,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -447,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -474,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -485,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -512,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -523,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -536,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -551,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From d8f2d9e1854245b77c6b70a77ae7ccb2bc3ca277 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:15:47 -0600 Subject: [PATCH 141/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/binary-merge/Gemfile.lock | 339 +++++++++++++++++++++++++++++++++ 1 file changed, 339 insertions(+) diff --git a/gems/binary-merge/Gemfile.lock b/gems/binary-merge/Gemfile.lock index ca433cba5..3962446a6 100644 --- a/gems/binary-merge/Gemfile.lock +++ b/gems/binary-merge/Gemfile.lock @@ -15,6 +15,234 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: @@ -24,6 +252,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -43,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -106,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -134,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -273,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -322,6 +584,14 @@ GEM delegate (~> 0.1) rspec (~> 3.0) timecop (>= 0.7, < 1) + token-resolver (2.0.4) + parslet (~> 2.0) + version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -368,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -393,32 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) + ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -426,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -438,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -465,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -476,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -503,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -514,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -526,14 +858,20 @@ CHECKSUMS thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73 timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 + token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -541,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 5584a51cba834b65e6f58caf306eaaec0b7ac171 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:15:49 -0600 Subject: [PATCH 142/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/zip-merge/Gemfile.lock | 339 ++++++++++++++++++++++++++++++++++++ 1 file changed, 339 insertions(+) diff --git a/gems/zip-merge/Gemfile.lock b/gems/zip-merge/Gemfile.lock index 5063310dd..9238afb04 100644 --- a/gems/zip-merge/Gemfile.lock +++ b/gems/zip-merge/Gemfile.lock @@ -15,6 +15,241 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: @@ -24,6 +259,22 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -43,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -106,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -134,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -273,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -322,6 +584,14 @@ GEM delegate (~> 0.1) rspec (~> 3.0) timecop (>= 0.7, < 1) + token-resolver (2.0.4) + parslet (~> 2.0) + version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -368,22 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -392,13 +685,19 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) @@ -412,12 +711,28 @@ CHECKSUMS ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) + ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -425,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -437,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -464,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -475,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -502,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -513,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -525,14 +858,20 @@ CHECKSUMS thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73 timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 + token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd From 316c2c1247954940e7ddb86c7eda6e6b22ed059f Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:15:51 -0600 Subject: [PATCH 143/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/psych-merge/Gemfile.lock | 312 ++++++++++++++++++++++++++++++++++ 1 file changed, 312 insertions(+) diff --git a/gems/psych-merge/Gemfile.lock b/gems/psych-merge/Gemfile.lock index 357b57210..a12016d3e 100644 --- a/gems/psych-merge/Gemfile.lock +++ b/gems/psych-merge/Gemfile.lock @@ -17,6 +17,38 @@ PATH version_gem (~> 1.1, >= 1.1.9) yaml-merge (= 7.1.0) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: @@ -26,6 +58,191 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: @@ -35,6 +252,14 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: @@ -43,6 +268,13 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -62,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -125,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -153,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -292,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -344,6 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -390,24 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -416,12 +685,17 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) yaml-merge! yard (~> 0.9, >= 0.9.44) @@ -430,19 +704,35 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -450,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -462,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -489,9 +788,12 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 @@ -501,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -528,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -539,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -552,10 +859,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -568,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 99a41214652c16362dcf0b696d128128a1e1d6a7 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:15:53 -0600 Subject: [PATCH 144/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/citrus-toml-merge/Gemfile.lock | 339 +++++++++++++++++++++++++++- 1 file changed, 329 insertions(+), 10 deletions(-) diff --git a/gems/citrus-toml-merge/Gemfile.lock b/gems/citrus-toml-merge/Gemfile.lock index 1aca14762..75bc67a58 100644 --- a/gems/citrus-toml-merge/Gemfile.lock +++ b/gems/citrus-toml-merge/Gemfile.lock @@ -16,6 +16,225 @@ PATH toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: @@ -24,6 +243,38 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -35,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -48,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -111,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -139,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -278,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -330,14 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -384,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -409,33 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -443,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -455,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -482,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -493,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -520,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -531,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -544,16 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -561,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 134b282a91ec2aff9fd679b20f443a6d83fe6896 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:15:55 -0600 Subject: [PATCH 145/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/parslet-toml-merge/Gemfile.lock | 340 ++++++++++++++++++++++++++- 1 file changed, 330 insertions(+), 10 deletions(-) diff --git a/gems/parslet-toml-merge/Gemfile.lock b/gems/parslet-toml-merge/Gemfile.lock index 51a9fc291..3293a63f0 100644 --- a/gems/parslet-toml-merge/Gemfile.lock +++ b/gems/parslet-toml-merge/Gemfile.lock @@ -16,6 +16,225 @@ PATH toml-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: @@ -24,6 +243,38 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -35,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -48,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -111,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -139,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -278,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -332,11 +589,9 @@ GEM version_gem (~> 1.1, >= 1.1.13) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -383,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -408,32 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -441,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -453,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -481,10 +789,13 @@ CHECKSUMS parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 parslet-toml-merge (7.1.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -492,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -519,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -530,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -545,14 +861,17 @@ CHECKSUMS token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -560,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 9d86d8dfe6357880c4981327a6b8e9f5cb1ec292 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:15:57 -0600 Subject: [PATCH 146/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/commonmarker-merge/Gemfile.lock | 331 ++++++++++++++++++++++++++- 1 file changed, 321 insertions(+), 10 deletions(-) diff --git a/gems/commonmarker-merge/Gemfile.lock b/gems/commonmarker-merge/Gemfile.lock index 07cb009f0..a7bd19904 100644 --- a/gems/commonmarker-merge/Gemfile.lock +++ b/gems/commonmarker-merge/Gemfile.lock @@ -16,6 +16,138 @@ PATH markdown-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: @@ -24,6 +156,125 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -35,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -117,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -145,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -284,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -336,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -387,24 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -413,30 +685,46 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca @@ -452,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -464,20 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -492,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -503,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -530,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -541,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -554,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -569,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From c08ce5d559316536b5fb9fad12df5fa56cdfc523 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:15:59 -0600 Subject: [PATCH 147/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/kramdown-merge/Gemfile.lock | 343 ++++++++++++++++++++++++++++++- 1 file changed, 333 insertions(+), 10 deletions(-) diff --git a/gems/kramdown-merge/Gemfile.lock b/gems/kramdown-merge/Gemfile.lock index 20653492d..59d980821 100644 --- a/gems/kramdown-merge/Gemfile.lock +++ b/gems/kramdown-merge/Gemfile.lock @@ -16,6 +16,138 @@ PATH markdown-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: @@ -24,6 +156,125 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -35,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -48,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -111,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -139,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -278,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -330,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,24 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -407,31 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -439,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -451,11 +753,15 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 @@ -466,6 +772,8 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -480,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -491,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -518,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -529,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -542,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From f0d7d4b38b94070ac5fd811dce531552a735601e Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:16:01 -0600 Subject: [PATCH 148/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/prism-merge/Gemfile.lock | 343 +++++++++++++++++++++++++++++++++- 1 file changed, 333 insertions(+), 10 deletions(-) diff --git a/gems/prism-merge/Gemfile.lock b/gems/prism-merge/Gemfile.lock index 95d545adf..09fa20d97 100644 --- a/gems/prism-merge/Gemfile.lock +++ b/gems/prism-merge/Gemfile.lock @@ -16,6 +16,196 @@ PATH ruby-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: @@ -24,6 +214,67 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -35,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -48,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -111,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -139,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -278,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -330,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -408,30 +687,52 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0.0) ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -439,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -451,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -478,11 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -490,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -521,6 +835,8 @@ 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -529,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -542,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 76a9ae27f58495e0e9b957b7678a296e2c5d3ef8 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:16:05 -0600 Subject: [PATCH 149/347] =?UTF-8?q?=F0=9F=94=92=20Update=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/smorg-rb/Gemfile.lock | 278 ++++++++++++++++++++++++++++--------- 1 file changed, 211 insertions(+), 67 deletions(-) diff --git a/gems/smorg-rb/Gemfile.lock b/gems/smorg-rb/Gemfile.lock index 728850337..0260b354f 100644 --- a/gems/smorg-rb/Gemfile.lock +++ b/gems/smorg-rb/Gemfile.lock @@ -21,6 +21,30 @@ PATH plain-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: @@ -38,6 +62,52 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge specs: @@ -83,6 +153,22 @@ PATH tree_haver (= 7.1.0) yaml-merge (= 7.1.0) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: @@ -91,6 +177,14 @@ PATH markly (~> 0.9) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: @@ -99,6 +193,88 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -110,33 +286,13 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) bundler (>= 1.2.0) thor (~> 1.0) citrus (3.0.2) - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) cmdparse (3.0.7) commonmarker (2.9.0-aarch64-linux) commonmarker (2.9.0-aarch64-linux-musl) @@ -144,10 +300,6 @@ GEM commonmarker (2.9.0-x86_64-darwin) commonmarker (2.9.0-x86_64-linux) commonmarker (2.9.0-x86_64-linux-musl) - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -157,10 +309,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docile (1.4.1) - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -215,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -238,19 +388,11 @@ GEM turbo_tests2 (~> 3.1, >= 3.1.12) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) 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.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) @@ -279,18 +421,9 @@ GEM prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) psych (5.4.0) date stringio - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -302,11 +435,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) rdoc (6.17.0) erb psych (>= 4.0.0) @@ -402,10 +530,6 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -463,18 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -489,10 +606,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.13) - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) yard (0.9.45) yard-fence (0.9.6) rdoc (>= 6.11, < 8) @@ -525,11 +638,20 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) @@ -537,17 +659,24 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -556,19 +685,26 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -580,10 +716,12 @@ CHECKSUMS ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) @@ -622,6 +760,7 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad @@ -649,6 +788,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.0) plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -695,6 +835,7 @@ 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -718,12 +859,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -736,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 52bbfaab560492b27ed731b1d3f427d7f4410709 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:16:25 -0600 Subject: [PATCH 150/347] Update root bundle --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9458c527a..010a51949 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -280,7 +280,7 @@ GEM specs: addressable (2.9.0) public_suffix (>= 2.0.2, < 8.0) - appraisal2 (3.1.4) + appraisal2 (3.2.0) bundler (>= 1.17.3) rake (>= 10) thor (>= 0.14) @@ -409,7 +409,7 @@ GEM citrus (~> 3.0, > 3.0) racc (~> 1.7) tsort (0.2.0) - turbo_tests2 (3.1.14) + turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) rspec (>= 3.10) version_gem (~> 1.1, >= 1.1.14) @@ -471,7 +471,7 @@ DEPENDENCIES CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af - appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4 + appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast-crispr (7.1.0) ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) @@ -562,7 +562,7 @@ CHECKSUMS tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f - turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c + turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 typescript-merge (7.1.0) version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-merge (7.1.0) From 8c4ad62dccce15f8a36b383dd015831229a2343c Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:20:26 -0600 Subject: [PATCH 151/347] Update rbs merge lock --- gems/rbs-merge/Gemfile.lock | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/gems/rbs-merge/Gemfile.lock b/gems/rbs-merge/Gemfile.lock index 3138f86a8..2c04bf5a1 100644 --- a/gems/rbs-merge/Gemfile.lock +++ b/gems/rbs-merge/Gemfile.lock @@ -294,12 +294,7 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -401,8 +396,6 @@ GEM racc (~> 1.4) nokogiri (1.19.4-arm64-darwin) racc (~> 1.4) - nokogiri (1.19.4-x86_64-darwin) - racc (~> 1.4) nokogiri (1.19.4-x86_64-linux-gnu) racc (~> 1.4) nokogiri (1.19.4-x86_64-linux-musl) @@ -631,7 +624,7 @@ PLATFORMS aarch64-linux-gnu aarch64-linux-musl arm64-darwin - x86_64-darwin + x86_64-linux x86_64-linux-gnu x86_64-linux-musl @@ -727,12 +720,7 @@ CHECKSUMS citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker (2.9.0-x86_64-linux) commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 @@ -761,7 +749,7 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad @@ -773,13 +761,12 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly (0.16.0) markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 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 - nokogiri (1.19.4-x86_64-darwin) sha256=7fd17057d3e1f00e9954a74b3cd76595d3d4a5ef233b7ed9599047c204f70551 nokogiri (1.19.4-x86_64-linux-gnu) sha256=379fae440b28915e3f19d752ce2dcf8465ed2b2fbefd2a7ca0dd497bc981a06a nokogiri (1.19.4-x86_64-linux-musl) sha256=17dfb7c1fa194ae02fbf7c51a7afc8d278045ab3fdacfd86f91d02d7b274470b nomono (1.0.8) sha256=bf4b9b426cbf216ab17b70db474f691b8ae1f1e29de8db4b0ecd405e6e7e1c80 @@ -837,7 +824,7 @@ CHECKSUMS ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 rust-merge (7.1.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce + service_actor (3.9.4) silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -860,9 +847,9 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml (0.3.0) toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 + toml-rb (4.2.0) tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f From f3b15896ab3e1318dd9a24567b85ae155bd8a661 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:21:14 -0600 Subject: [PATCH 152/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-crispr-ruby-prism/.kettle-drift.lock | 60 ++-- gems/ast-crispr-ruby-prism/Gemfile | 40 +++ gems/ast-crispr-ruby-prism/Gemfile.lock | 334 +----------------- gems/ast-crispr/.kettle-drift.lock | 60 ++-- gems/ast-crispr/.rubocop_gradual.lock | 213 ----------- gems/ast-crispr/Gemfile | 70 +++- gems/ast-crispr/Gemfile.lock | 59 ++-- gems/ast-crispr/Rakefile | 18 +- gems/ast-crispr/bin/yard | 2 +- gems/ast-crispr/lib/ast/crispr/version.rb | 2 +- gems/tree_haver/.kettle-drift.lock | 12 +- gems/tree_haver/Gemfile | 29 +- gems/tree_haver/Rakefile | 18 +- gems/tree_haver/lib/tree_haver/version.rb | 2 +- 14 files changed, 254 insertions(+), 665 deletions(-) delete mode 100644 gems/ast-crispr/.rubocop_gradual.lock diff --git a/gems/ast-crispr-ruby-prism/.kettle-drift.lock b/gems/ast-crispr-ruby-prism/.kettle-drift.lock index 9878fb8f5..508d631d8 100644 --- a/gems/ast-crispr-ruby-prism/.kettle-drift.lock +++ b/gems/ast-crispr-ruby-prism/.kettle-drift.lock @@ -5,7 +5,8 @@ "lines": [ 79, 119, - 159 + 159, + 199 ] } ], @@ -15,7 +16,8 @@ "lines": [ 90, 130, - 170 + 170, + 210 ] } ], @@ -25,7 +27,8 @@ "lines": [ 80, 120, - 160 + 160, + 200 ] } ], @@ -35,7 +38,8 @@ "lines": [ 92, 132, - 172 + 172, + 212 ] } ], @@ -45,7 +49,8 @@ "lines": [ 95, 135, - 175 + 175, + 215 ] } ], @@ -55,7 +60,8 @@ "lines": [ 81, 121, - 161 + 161, + 201 ] } ], @@ -66,7 +72,8 @@ 59, 99, 139, - 179 + 179, + 219 ] } ], @@ -76,7 +83,8 @@ "lines": [ 100, 140, - 180 + 180, + 220 ] } ], @@ -87,7 +95,8 @@ 42, 86, 126, - 166 + 166, + 206 ] } ], @@ -97,7 +106,8 @@ "lines": [ 109, 149, - 189 + 189, + 229 ] } ], @@ -108,7 +118,8 @@ 34, 78, 118, - 158 + 158, + 198 ] } ], @@ -119,7 +130,8 @@ 68, 108, 148, - 188 + 188, + 228 ] } ], @@ -129,7 +141,8 @@ "lines": [ 84, 124, - 164 + 164, + 204 ] } ], @@ -140,7 +153,8 @@ 47, 91, 131, - 171 + 171, + 211 ] } ], @@ -151,7 +165,8 @@ 43, 87, 127, - 167 + 167, + 207 ] } ], @@ -161,7 +176,8 @@ "lines": [ 85, 125, - 165 + 165, + 205 ] } ], @@ -171,7 +187,8 @@ "lines": [ 102, 142, - 182 + 182, + 222 ] } ], @@ -181,7 +198,8 @@ "lines": [ 101, 141, - 181 + 181, + 221 ] } ], @@ -191,7 +209,8 @@ "lines": [ 96, 136, - 176 + 176, + 216 ] } ], @@ -201,7 +220,8 @@ "lines": [ 105, 145, - 185 + 185, + 225 ] } ], diff --git a/gems/ast-crispr-ruby-prism/Gemfile b/gems/ast-crispr-ruby-prism/Gemfile index f274cef52..0cb448d5a 100644 --- a/gems/ast-crispr-ruby-prism/Gemfile +++ b/gems/ast-crispr-ruby-prism/Gemfile @@ -191,6 +191,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/ast-crispr-ruby-prism/Gemfile.lock b/gems/ast-crispr-ruby-prism/Gemfile.lock index de85587b4..6edef92ea 100644 --- a/gems/ast-crispr-ruby-prism/Gemfile.lock +++ b/gems/ast-crispr-ruby-prism/Gemfile.lock @@ -17,264 +17,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) ast-merge (= 7.1.0) service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +35,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,8 +48,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -359,8 +111,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -389,7 +139,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-x86_64-linux-gnu) racc (~> 1.4) @@ -575,11 +324,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -622,44 +371,23 @@ DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -668,26 +396,18 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -695,23 +415,14 @@ CHECKSUMS appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -719,7 +430,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -732,27 +442,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-x86_64-linux-gnu) sha256=379fae440b28915e3f19d752ce2dcf8465ed2b2fbefd2a7ca0dd497bc981a06a nokogiri (1.19.4-x86_64-linux-musl) sha256=17dfb7c1fa194ae02fbf7c51a7afc8d278045ab3fdacfd86f91d02d7b274470b @@ -763,14 +465,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -778,7 +476,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -806,11 +503,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -820,7 +515,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -834,19 +528,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -854,7 +543,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ast-crispr/.kettle-drift.lock b/gems/ast-crispr/.kettle-drift.lock index 9878fb8f5..508d631d8 100644 --- a/gems/ast-crispr/.kettle-drift.lock +++ b/gems/ast-crispr/.kettle-drift.lock @@ -5,7 +5,8 @@ "lines": [ 79, 119, - 159 + 159, + 199 ] } ], @@ -15,7 +16,8 @@ "lines": [ 90, 130, - 170 + 170, + 210 ] } ], @@ -25,7 +27,8 @@ "lines": [ 80, 120, - 160 + 160, + 200 ] } ], @@ -35,7 +38,8 @@ "lines": [ 92, 132, - 172 + 172, + 212 ] } ], @@ -45,7 +49,8 @@ "lines": [ 95, 135, - 175 + 175, + 215 ] } ], @@ -55,7 +60,8 @@ "lines": [ 81, 121, - 161 + 161, + 201 ] } ], @@ -66,7 +72,8 @@ 59, 99, 139, - 179 + 179, + 219 ] } ], @@ -76,7 +83,8 @@ "lines": [ 100, 140, - 180 + 180, + 220 ] } ], @@ -87,7 +95,8 @@ 42, 86, 126, - 166 + 166, + 206 ] } ], @@ -97,7 +106,8 @@ "lines": [ 109, 149, - 189 + 189, + 229 ] } ], @@ -108,7 +118,8 @@ 34, 78, 118, - 158 + 158, + 198 ] } ], @@ -119,7 +130,8 @@ 68, 108, 148, - 188 + 188, + 228 ] } ], @@ -129,7 +141,8 @@ "lines": [ 84, 124, - 164 + 164, + 204 ] } ], @@ -140,7 +153,8 @@ 47, 91, 131, - 171 + 171, + 211 ] } ], @@ -151,7 +165,8 @@ 43, 87, 127, - 167 + 167, + 207 ] } ], @@ -161,7 +176,8 @@ "lines": [ 85, 125, - 165 + 165, + 205 ] } ], @@ -171,7 +187,8 @@ "lines": [ 102, 142, - 182 + 182, + 222 ] } ], @@ -181,7 +198,8 @@ "lines": [ 101, 141, - 181 + 181, + 221 ] } ], @@ -191,7 +209,8 @@ "lines": [ 96, 136, - 176 + 176, + 216 ] } ], @@ -201,7 +220,8 @@ "lines": [ 105, 145, - 185 + 185, + 225 ] } ], diff --git a/gems/ast-crispr/.rubocop_gradual.lock b/gems/ast-crispr/.rubocop_gradual.lock deleted file mode 100644 index d920cf89f..000000000 --- a/gems/ast-crispr/.rubocop_gradual.lock +++ /dev/null @@ -1,213 +0,0 @@ -{ - ".simplecov:3928423310": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:918344237": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "ast-crispr.gemspec:2262341056": [ - [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/ast-crispr.rb:247837913": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`ast-crispr.rb`) should use snake_case.", 5381] - ], - "lib/ast/crispr.rb:3730230259": [ - [12, 5, 11, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Error`.", 62528179], - [22, 5, 11, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Limit`.", 51888158], - [47, 7, 622, "Metrics/MethodLength: Method has too many lines. [14/10]", 2816807495], - [61, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], - [65, 7, 1168, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_hash` is too high. [<6, 29, 10> 31.26/17]", 3515286222], - [65, 7, 1168, "Metrics/MethodLength: Method has too many lines. [27/10]", 3515286222], - [90, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3685471369], - [96, 7, 822, "Metrics/AbcSize: Assignment Branch Condition size for `constraint_for_operator` is too high. [<5, 11, 13> 17.75/17]", 1402705503], - [96, 7, 822, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `constraint_for_operator` is too high. [8/7]", 1402705503], - [96, 7, 822, "Metrics/MethodLength: Method has too many lines. [19/10]", 1402705503], - [124, 5, 11, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Match`.", 52676120], - [127, 21, 73, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 344717847], - [172, 5, 18, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::MatchProfile`.", 365273299], - [172, 5, 4350, "Metrics/ClassLength: Class has too many lines. [115/100]", 1575766989], - [273, 7, 596, "Metrics/MethodLength: Method has too many lines. [14/10]", 2070486858], - [314, 5, 24, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::DestinationProfile`.", 3442102524], - [314, 5, 4581, "Metrics/ClassLength: Class has too many lines. [119/100]", 3503477661], - [352, 21, 126, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 931636409], - [417, 7, 667, "Metrics/MethodLength: Method has too many lines. [15/10]", 4004247638], - [460, 5, 27, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::DestinationResolution`.", 1305107769], - [474, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::StructureProfile`.", 614380405], - [512, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::SelectionProfile`.", 2464089216], - [531, 21, 165, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1182500333], - [566, 7, 585, "Metrics/MethodLength: Method has too many lines. [13/10]", 13786997], - [583, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::OperationProfile`.", 1974079861], - [607, 21, 188, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2526147676], - [662, 7, 478, "Metrics/MethodLength: Method has too many lines. [11/10]", 795235914], - [695, 7, 10, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Adapters::Null`.", 3515430288], - [728, 5, 21, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::DocumentContext`.", 594998459], - [788, 5, 19, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::OwnerSelector`.", 3092459999], - [791, 21, 81, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2293822273], - [853, 7, 606, "Metrics/MethodLength: Method has too many lines. [16/10]", 422136278], - [883, 5, 16, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::Selectors`.", 2133324825], - [883, 5, 5586, "Metrics/ModuleLength: Module has too many lines. [130/100]", 3440946513], - [886, 7, 1642, "Metrics/AbcSize: Assignment Branch Condition size for `owner_filter` is too high. [<6, 18, 11> 21.93/17]", 3224577904], - [886, 7, 1642, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `owner_filter` is too high. [10/7]", 3224577904], - [886, 7, 1642, "Metrics/MethodLength: Method has too many lines. [37/10]", 3224577904], - [886, 7, 1642, "Metrics/PerceivedComplexity: Perceived complexity for `owner_filter` is too high. [11/8]", 3224577904], - [886, 23, 135, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3231562627], - [930, 7, 1936, "Metrics/AbcSize: Assignment Branch Condition size for `comment_region_owned_owner` is too high. [<7, 16, 7> 18.81/17]", 2629441148], - [930, 7, 1936, "Metrics/MethodLength: Method has too many lines. [40/10]", 2629441148], - [930, 37, 190, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 4159525724], - [931, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 940069302], - [975, 7, 1731, "Metrics/AbcSize: Assignment Branch Condition size for `line_block` is too high. [<12, 22, 14> 28.71/17]", 1307990669], - [975, 7, 1731, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `line_block` is too high. [12/7]", 1307990669], - [975, 7, 1731, "Metrics/MethodLength: Method has too many lines. [38/10]", 1307990669], - [975, 7, 1731, "Metrics/PerceivedComplexity: Perceived complexity for `line_block` is too high. [12/8]", 1307990669], - [975, 21, 130, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 515174999], - [1027, 5, 23, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::OperationSupport`.", 343849029], - [1027, 5, 6491, "Metrics/ModuleLength: Module has too many lines. [139/100]", 2271788056], - [1072, 7, 1758, "Metrics/AbcSize: Assignment Branch Condition size for `insertion_from` is too high. [<5, 21, 11> 24.23/17]", 29011294], - [1072, 7, 1758, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `insertion_from` is too high. [9/7]", 29011294], - [1072, 7, 1758, "Metrics/MethodLength: Method has too many lines. [28/10]", 29011294], - [1072, 7, 1758, "Metrics/PerceivedComplexity: Perceived complexity for `insertion_from` is too high. [10/8]", 29011294], - [1115, 7, 827, "Metrics/AbcSize: Assignment Branch Condition size for `splice_after_anchor` is too high. [<4, 19, 2> 19.52/17]", 14691010], - [1115, 7, 827, "Metrics/MethodLength: Method has too many lines. [16/10]", 14691010], - [1119, 9, 72, "Style/RaiseArgs: Provide an exception class and message as arguments to `raise`.", 789091243], - [1121, 23, 72, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 2503424841], - [1153, 9, 25, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 768340433], - [1197, 5, 26, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::OperationProfilable`.", 4114431854], - [1206, 7, 19, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::OperationProfilable::ClassMethods`.", 3606528253], - [1218, 5, 13, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Replace`.", 1563590855], - [1243, 7, 643, "Metrics/AbcSize: Assignment Branch Condition size for `call` is too high. [<10, 32, 3> 33.66/17]", 3656683885], - [1243, 7, 643, "Metrics/MethodLength: Method has too many lines. [14/10]", 3656683885], - [1262, 5, 12, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Delete`.", 2011475922], - [1286, 7, 538, "Metrics/AbcSize: Assignment Branch Condition size for `call` is too high. [<7, 21, 1> 22.16/17]", 2655200768], - [1286, 7, 538, "Metrics/MethodLength: Method has too many lines. [13/10]", 2655200768], - [1304, 5, 12, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Insert`.", 1590185308], - [1338, 5, 10, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Move`.", 3515667002], - [1366, 7, 1182, "Metrics/AbcSize: Assignment Branch Condition size for `call` is too high. [<14, 40, 7> 42.95/17]", 172197360], - [1366, 7, 1182, "Metrics/MethodLength: Method has too many lines. [22/10]", 172197360], - [1383, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2688172402], - [1396, 3, 13, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr`.", 315644438], - [1396, 3, 12758, "Metrics/ModuleLength: Module has too many lines. [180/100]", 2662313186], - [1397, 5, 33, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::ProfileReportCompatibility`.", 3039519892], - [1419, 5, 18, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::MatchProfile`.", 365273299], - [1431, 7, 28, "Lint/DuplicateMethods: Method `Ast::Crispr::MatchProfile#normalize_start_boundary` is defined at both lib/ast/crispr.rb:292 and lib/ast/crispr.rb:1431.", 2362701855], - [1435, 7, 26, "Lint/DuplicateMethods: Method `Ast::Crispr::MatchProfile#normalize_end_boundary` is defined at both lib/ast/crispr.rb:299 and lib/ast/crispr.rb:1435.", 2613594544], - [1439, 7, 26, "Lint/DuplicateMethods: Method `Ast::Crispr::MatchProfile#normalize_payload_kind` is defined at both lib/ast/crispr.rb:306 and lib/ast/crispr.rb:1439.", 2604742721], - [1444, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::SelectionProfile`.", 2464089216], - [1466, 7, 14, "Lint/DuplicateMethods: Method `Ast::Crispr::SelectionProfile#initialize` is defined at both lib/ast/crispr.rb:531 and lib/ast/crispr.rb:1466.", 956205738], - [1466, 7, 773, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `initialize` is too high. [8/7]", 771809109], - [1466, 7, 773, "Metrics/MethodLength: Method has too many lines. [11/10]", 771809109], - [1466, 21, 190, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 4167448336], - [1481, 7, 1286, "Metrics/AbcSize: Assignment Branch Condition size for `report` is too high. [<5, 29, 13> 32.17/17]", 1720478959], - [1481, 7, 1286, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report` is too high. [11/7]", 1720478959], - [1481, 7, 1286, "Metrics/MethodLength: Method has too many lines. [17/10]", 1720478959], - [1481, 7, 1286, "Metrics/PerceivedComplexity: Perceived complexity for `report` is too high. [11/8]", 1720478959], - [1496, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 1470192175], - [1520, 5, 24, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::DestinationProfile`.", 3442102524], - [1534, 7, 29, "Lint/DuplicateMethods: Method `Ast::Crispr::DestinationProfile#normalize_resolution_kind` is defined at both lib/ast/crispr.rb:437 and lib/ast/crispr.rb:1534.", 99310177], - [1538, 7, 31, "Lint/DuplicateMethods: Method `Ast::Crispr::DestinationProfile#normalize_resolution_source` is defined at both lib/ast/crispr.rb:444 and lib/ast/crispr.rb:1538.", 1692065396], - [1542, 7, 29, "Lint/DuplicateMethods: Method `Ast::Crispr::DestinationProfile#normalize_anchor_boundary` is defined at both lib/ast/crispr.rb:452 and lib/ast/crispr.rb:1542.", 3028754726], - [1547, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::OperationProfile`.", 1974079861], - [1550, 7, 733, "Metrics/MethodLength: Method has too many lines. [13/10]", 2619513218], - [1570, 7, 25, "Lint/DuplicateMethods: Method `Ast::Crispr::OperationProfile#normalize_requirement` is defined at both lib/ast/crispr.rb:678 and lib/ast/crispr.rb:1570.", 440444039], - [1574, 7, 32, "Lint/DuplicateMethods: Method `Ast::Crispr::OperationProfile#normalize_replacement_source` is defined at both lib/ast/crispr.rb:686 and lib/ast/crispr.rb:1574.", 3533021156], - [1579, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::StructureProfile`.", 614380405], - [1595, 5, 6309, "Metrics/ClassLength: Class has too many lines. [172/100]", 1270437788], - [1600, 7, 2717, "Metrics/MethodLength: Method has too many lines. [67/10]", 1469599129], - [1665, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 259030389], - [1678, 28, 247, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3385598543], - [1710, 28, 242, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1038219895] - ], - "lib/ast/crispr/rspec/shared_examples/destination_profile.rb:2529475135": [ - [3, 1, 2386, "Metrics/BlockLength: Block has too many lines. [28/25]", 2846758965], - [4, 3, 2311, "Metrics/BlockLength: Block has too many lines. [26/25]", 2123267236] - ], - "lib/ast/crispr/rspec/shared_examples/match_profile.rb:2566447993": [ - [3, 1, 1997, "Metrics/BlockLength: Block has too many lines. [26/25]", 1032277788] - ], - "lib/ast/crispr/rspec/shared_examples/operation_profile.rb:3583567850": [ - [3, 1, 2148, "Metrics/BlockLength: Block has too many lines. [26/25]", 2745151209] - ], - "spec/old_runtime_spec.rb:1564590841": [ - [3, 1, 17728, "Metrics/BlockLength: Block has too many lines. [383/25]", 205400157], - [4, 3, 69, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3712453399], - [5, 3, 68, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1429320782], - [6, 3, 59, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 253007150], - [8, 3, 891, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 361389624], - [18, 37, 11, "Lint/UnusedMethodArgument: Unused method argument - `owner_scope`.", 3846606321], - [22, 46, 6, "Lint/UnusedMethodArgument: Unused method argument - `region`.", 2124512157], - [22, 64, 11, "Lint/UnusedMethodArgument: Unused method argument - `owner_scope`.", 3846606321], - [73, 3, 8534, "Metrics/BlockLength: Block has too many lines. [176/25]", 3042299525], - [313, 3, 3640, "Metrics/BlockLength: Block has too many lines. [72/25]", 1133370152], - [418, 3, 1663, "Metrics/BlockLength: Block has too many lines. [41/25]", 115074475] - ] -} diff --git a/gems/ast-crispr/Gemfile b/gems/ast-crispr/Gemfile index edb0e46ba..000a11860 100644 --- a/gems/ast-crispr/Gemfile +++ b/gems/ast-crispr/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source 'https://gem.coop' +source "https://gem.coop" git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,17 +19,61 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ['~> 1.0', '>= 1.0.8'] -gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ["~> 1.0", ">= 1.0.8"] +gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ast-merge ] -direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') +direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? + +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) + direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") + direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == "nomono" } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + if nomono_locked + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] + end + end + Kernel.send(:gem, "nomono", *nomono_activation_requirements) + require "nomono/bundler" + if direct_sibling_templating && !direct_sibling_local + ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + end + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: "STRUCTUREDMERGE", + path_env: "STRUCTUREDMERGE_DEV", + root: ["src", "my", "structuredmerge"] + ) + rescue LoadError + warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + else + ENV.delete("STRUCTUREDMERGE_DEV") + end + end + end +end if direct_sibling_gems.any? && (direct_sibling_local || @@ -209,25 +253,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? # Debugging -eval_gemfile 'gemfiles/modular/debug.gemfile' +eval_gemfile "gemfiles/modular/debug.gemfile" # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile 'gemfiles/modular/coverage.gemfile' +eval_gemfile "gemfiles/modular/coverage.gemfile" # Linting -eval_gemfile 'gemfiles/modular/style.gemfile' +eval_gemfile "gemfiles/modular/style.gemfile" # Documentation -eval_gemfile 'gemfiles/modular/documentation.gemfile' +eval_gemfile "gemfiles/modular/documentation.gemfile" # Optional -eval_gemfile 'gemfiles/modular/optional.gemfile' +eval_gemfile "gemfiles/modular/optional.gemfile" ### Std Lib Extracted Gems -eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' +eval_gemfile "gemfiles/modular/x_std_libs.gemfile" # See unlocked_deps appraisal for more details on irb inclusion -gem 'irb', '~> 1.17' # ruby >= 2.7 +gem "irb", "~> 1.17" # ruby >= 2.7 diff --git a/gems/ast-crispr/Gemfile.lock b/gems/ast-crispr/Gemfile.lock index 37fdf3f15..7478fbf81 100644 --- a/gems/ast-crispr/Gemfile.lock +++ b/gems/ast-crispr/Gemfile.lock @@ -275,6 +275,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -308,7 +324,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -363,18 +378,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -538,22 +542,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -659,9 +659,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -739,7 +739,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -760,10 +759,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -838,13 +837,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/ast-crispr/Rakefile b/gems/ast-crispr/Rakefile index 0fe938704..2b30812c4 100644 --- a/gems/ast-crispr/Rakefile +++ b/gems/ast-crispr/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require 'kettle/drift' + require "kettle/drift" Kettle::Drift.install_tasks rescue LoadError - desc('(stub) kettle:drift:check is unavailable') - task('kettle:drift:check') do + desc("(stub) kettle:drift:check is unavailable") + task("kettle:drift:check") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:update is unavailable') - task('kettle:drift:update') do + desc("(stub) kettle:drift:update is unavailable") + task("kettle:drift:update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:force_update is unavailable') - task('kettle:drift:force_update') do + desc("(stub) kettle:drift:force_update is unavailable") + task("kettle:drift:force_update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift is unavailable') - task('kettle:drift' => 'kettle:drift:update') + desc("(stub) kettle:drift is unavailable") + task("kettle:drift" => "kettle:drift:update") end ### TEMPLATING TASKS diff --git a/gems/ast-crispr/bin/yard b/gems/ast-crispr/bin/yard index 5d516ad6f..a7e8b6eed 100755 --- a/gems/ast-crispr/bin/yard +++ b/gems/ast-crispr/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec('bundle', 'exec', 'rake', 'yard') +exec("bundle", "exec", "rake", "yard") diff --git a/gems/ast-crispr/lib/ast/crispr/version.rb b/gems/ast-crispr/lib/ast/crispr/version.rb index c2c80e954..af38578d7 100644 --- a/gems/ast-crispr/lib/ast/crispr/version.rb +++ b/gems/ast-crispr/lib/ast/crispr/version.rb @@ -3,7 +3,7 @@ module Ast module Crispr module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/tree_haver/.kettle-drift.lock b/gems/tree_haver/.kettle-drift.lock index 993369d13..a24d67c14 100644 --- a/gems/tree_haver/.kettle-drift.lock +++ b/gems/tree_haver/.kettle-drift.lock @@ -3,8 +3,8 @@ { "file": "README.md", "lines": [ - 1446, - 1472 + 1451, + 1477 ] } ], @@ -12,8 +12,8 @@ { "file": "README.md", "lines": [ - 1447, - 1473 + 1452, + 1478 ] } ], @@ -21,8 +21,8 @@ { "file": "README.md", "lines": [ - 1448, - 1474 + 1453, + 1479 ] } ], diff --git a/gems/tree_haver/Gemfile b/gems/tree_haver/Gemfile index 3bd2001b5..b0092fefd 100644 --- a/gems/tree_haver/Gemfile +++ b/gems/tree_haver/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source 'https://gem.coop' +source "https://gem.coop" git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,45 +19,38 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ['~> 1.0', '>= 1.0.8'] -gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ["~> 1.0", ">= 1.0.8"] +gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? && !tslp_dev.to_s.empty? unless tslp_declared_by_templating if tslp_dev.to_s.empty? - gem( - 'tree_sitter_language_pack', - git: 'https://github.com/structuredmerge/tree-sitter-language-pack.git', - branch: 'fix/ruby-parser-api-methods', - glob: 'packages/ruby/*.gemspec' - ) else - gem 'tree_sitter_language_pack', path: tslp_dev end end # Modular sibling dependencies (env-switched inside each modular Gemfile) -eval_gemfile 'gemfiles/modular/templating.gemfile' +eval_gemfile "gemfiles/modular/templating.gemfile" # Debugging -eval_gemfile 'gemfiles/modular/debug.gemfile' +eval_gemfile "gemfiles/modular/debug.gemfile" # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile 'gemfiles/modular/coverage.gemfile' +eval_gemfile "gemfiles/modular/coverage.gemfile" # Linting -eval_gemfile 'gemfiles/modular/style.gemfile' +eval_gemfile "gemfiles/modular/style.gemfile" # Documentation -eval_gemfile 'gemfiles/modular/documentation.gemfile' +eval_gemfile "gemfiles/modular/documentation.gemfile" # Optional -eval_gemfile 'gemfiles/modular/optional.gemfile' +eval_gemfile "gemfiles/modular/optional.gemfile" ### Std Lib Extracted Gems -eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' +eval_gemfile "gemfiles/modular/x_std_libs.gemfile" # See unlocked_deps appraisal for more details on irb inclusion -gem 'irb', '~> 1.17' # ruby >= 2.7 +gem "irb", "~> 1.17" # ruby >= 2.7 diff --git a/gems/tree_haver/Rakefile b/gems/tree_haver/Rakefile index ab2dc23d9..0a3c6f7a9 100644 --- a/gems/tree_haver/Rakefile +++ b/gems/tree_haver/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require 'kettle/drift' + require "kettle/drift" Kettle::Drift.install_tasks rescue LoadError - desc('(stub) kettle:drift:check is unavailable') - task('kettle:drift:check') do + desc("(stub) kettle:drift:check is unavailable") + task("kettle:drift:check") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:update is unavailable') - task('kettle:drift:update') do + desc("(stub) kettle:drift:update is unavailable") + task("kettle:drift:update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:force_update is unavailable') - task('kettle:drift:force_update') do + desc("(stub) kettle:drift:force_update is unavailable") + task("kettle:drift:force_update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift is unavailable') - task('kettle:drift' => 'kettle:drift:update') + desc("(stub) kettle:drift is unavailable") + task("kettle:drift" => "kettle:drift:update") end ### TEMPLATING TASKS diff --git a/gems/tree_haver/lib/tree_haver/version.rb b/gems/tree_haver/lib/tree_haver/version.rb index 43365bf4e..9bd0db819 100644 --- a/gems/tree_haver/lib/tree_haver/version.rb +++ b/gems/tree_haver/lib/tree_haver/version.rb @@ -2,7 +2,7 @@ module TreeHaver module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end From 6369ae926460cd7320d6c531e2b62ae5b4221cf7 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:21:20 -0600 Subject: [PATCH 153/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-crispr-ruby-prism/Gemfile.lock | 334 +++++++++++++++- gems/ast-crispr/.rubocop_gradual.lock | 213 ++++++++++ gems/ast-crispr/Gemfile | 68 ++-- gems/ast-crispr/Gemfile.lock | 388 ++---------------- gems/ast-crispr/Rakefile | 18 +- gems/ast-crispr/bin/yard | 2 +- gems/ast-crispr/lib/ast/crispr/version.rb | 2 +- gems/ast-merge/.kettle-drift.lock | 60 ++- gems/ast-merge/Gemfile | 70 +++- gems/ast-merge/README.md | 1 + gems/ast-merge/Rakefile | 18 +- gems/ast-merge/lib/ast/merge/version.rb | 2 +- gems/tree_haver/.rubocop_gradual.lock | 465 ---------------------- gems/tree_haver/Gemfile | 27 +- gems/tree_haver/Gemfile.lock | 85 ++-- gems/tree_haver/Rakefile | 18 +- 16 files changed, 778 insertions(+), 993 deletions(-) create mode 100644 gems/ast-crispr/.rubocop_gradual.lock delete mode 100644 gems/tree_haver/.rubocop_gradual.lock diff --git a/gems/ast-crispr-ruby-prism/Gemfile.lock b/gems/ast-crispr-ruby-prism/Gemfile.lock index 6edef92ea..de85587b4 100644 --- a/gems/ast-crispr-ruby-prism/Gemfile.lock +++ b/gems/ast-crispr-ruby-prism/Gemfile.lock @@ -17,13 +17,264 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: ast-crispr (7.1.0) ast-merge (= 7.1.0) service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -35,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -48,6 +294,8 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -111,6 +359,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -139,6 +389,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-x86_64-linux-gnu) racc (~> 1.4) @@ -324,11 +575,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -371,23 +622,44 @@ DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -396,18 +668,26 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -415,14 +695,23 @@ CHECKSUMS appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -430,6 +719,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -442,19 +732,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-x86_64-linux-gnu) sha256=379fae440b28915e3f19d752ce2dcf8465ed2b2fbefd2a7ca0dd497bc981a06a nokogiri (1.19.4-x86_64-linux-musl) sha256=17dfb7c1fa194ae02fbf7c51a7afc8d278045ab3fdacfd86f91d02d7b274470b @@ -465,10 +763,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -476,6 +778,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -503,9 +806,11 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -515,6 +820,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -528,14 +834,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -543,6 +854,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ast-crispr/.rubocop_gradual.lock b/gems/ast-crispr/.rubocop_gradual.lock new file mode 100644 index 000000000..d920cf89f --- /dev/null +++ b/gems/ast-crispr/.rubocop_gradual.lock @@ -0,0 +1,213 @@ +{ + ".simplecov:3928423310": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:918344237": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "ast-crispr.gemspec:2262341056": [ + [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/ast-crispr.rb:247837913": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`ast-crispr.rb`) should use snake_case.", 5381] + ], + "lib/ast/crispr.rb:3730230259": [ + [12, 5, 11, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Error`.", 62528179], + [22, 5, 11, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Limit`.", 51888158], + [47, 7, 622, "Metrics/MethodLength: Method has too many lines. [14/10]", 2816807495], + [61, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], + [65, 7, 1168, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_hash` is too high. [<6, 29, 10> 31.26/17]", 3515286222], + [65, 7, 1168, "Metrics/MethodLength: Method has too many lines. [27/10]", 3515286222], + [90, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3685471369], + [96, 7, 822, "Metrics/AbcSize: Assignment Branch Condition size for `constraint_for_operator` is too high. [<5, 11, 13> 17.75/17]", 1402705503], + [96, 7, 822, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `constraint_for_operator` is too high. [8/7]", 1402705503], + [96, 7, 822, "Metrics/MethodLength: Method has too many lines. [19/10]", 1402705503], + [124, 5, 11, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Match`.", 52676120], + [127, 21, 73, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 344717847], + [172, 5, 18, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::MatchProfile`.", 365273299], + [172, 5, 4350, "Metrics/ClassLength: Class has too many lines. [115/100]", 1575766989], + [273, 7, 596, "Metrics/MethodLength: Method has too many lines. [14/10]", 2070486858], + [314, 5, 24, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::DestinationProfile`.", 3442102524], + [314, 5, 4581, "Metrics/ClassLength: Class has too many lines. [119/100]", 3503477661], + [352, 21, 126, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 931636409], + [417, 7, 667, "Metrics/MethodLength: Method has too many lines. [15/10]", 4004247638], + [460, 5, 27, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::DestinationResolution`.", 1305107769], + [474, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::StructureProfile`.", 614380405], + [512, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::SelectionProfile`.", 2464089216], + [531, 21, 165, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1182500333], + [566, 7, 585, "Metrics/MethodLength: Method has too many lines. [13/10]", 13786997], + [583, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::OperationProfile`.", 1974079861], + [607, 21, 188, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2526147676], + [662, 7, 478, "Metrics/MethodLength: Method has too many lines. [11/10]", 795235914], + [695, 7, 10, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Adapters::Null`.", 3515430288], + [728, 5, 21, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::DocumentContext`.", 594998459], + [788, 5, 19, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::OwnerSelector`.", 3092459999], + [791, 21, 81, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2293822273], + [853, 7, 606, "Metrics/MethodLength: Method has too many lines. [16/10]", 422136278], + [883, 5, 16, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::Selectors`.", 2133324825], + [883, 5, 5586, "Metrics/ModuleLength: Module has too many lines. [130/100]", 3440946513], + [886, 7, 1642, "Metrics/AbcSize: Assignment Branch Condition size for `owner_filter` is too high. [<6, 18, 11> 21.93/17]", 3224577904], + [886, 7, 1642, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `owner_filter` is too high. [10/7]", 3224577904], + [886, 7, 1642, "Metrics/MethodLength: Method has too many lines. [37/10]", 3224577904], + [886, 7, 1642, "Metrics/PerceivedComplexity: Perceived complexity for `owner_filter` is too high. [11/8]", 3224577904], + [886, 23, 135, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3231562627], + [930, 7, 1936, "Metrics/AbcSize: Assignment Branch Condition size for `comment_region_owned_owner` is too high. [<7, 16, 7> 18.81/17]", 2629441148], + [930, 7, 1936, "Metrics/MethodLength: Method has too many lines. [40/10]", 2629441148], + [930, 37, 190, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 4159525724], + [931, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 940069302], + [975, 7, 1731, "Metrics/AbcSize: Assignment Branch Condition size for `line_block` is too high. [<12, 22, 14> 28.71/17]", 1307990669], + [975, 7, 1731, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `line_block` is too high. [12/7]", 1307990669], + [975, 7, 1731, "Metrics/MethodLength: Method has too many lines. [38/10]", 1307990669], + [975, 7, 1731, "Metrics/PerceivedComplexity: Perceived complexity for `line_block` is too high. [12/8]", 1307990669], + [975, 21, 130, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 515174999], + [1027, 5, 23, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::OperationSupport`.", 343849029], + [1027, 5, 6491, "Metrics/ModuleLength: Module has too many lines. [139/100]", 2271788056], + [1072, 7, 1758, "Metrics/AbcSize: Assignment Branch Condition size for `insertion_from` is too high. [<5, 21, 11> 24.23/17]", 29011294], + [1072, 7, 1758, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `insertion_from` is too high. [9/7]", 29011294], + [1072, 7, 1758, "Metrics/MethodLength: Method has too many lines. [28/10]", 29011294], + [1072, 7, 1758, "Metrics/PerceivedComplexity: Perceived complexity for `insertion_from` is too high. [10/8]", 29011294], + [1115, 7, 827, "Metrics/AbcSize: Assignment Branch Condition size for `splice_after_anchor` is too high. [<4, 19, 2> 19.52/17]", 14691010], + [1115, 7, 827, "Metrics/MethodLength: Method has too many lines. [16/10]", 14691010], + [1119, 9, 72, "Style/RaiseArgs: Provide an exception class and message as arguments to `raise`.", 789091243], + [1121, 23, 72, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 2503424841], + [1153, 9, 25, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 768340433], + [1197, 5, 26, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::OperationProfilable`.", 4114431854], + [1206, 7, 19, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::OperationProfilable::ClassMethods`.", 3606528253], + [1218, 5, 13, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Replace`.", 1563590855], + [1243, 7, 643, "Metrics/AbcSize: Assignment Branch Condition size for `call` is too high. [<10, 32, 3> 33.66/17]", 3656683885], + [1243, 7, 643, "Metrics/MethodLength: Method has too many lines. [14/10]", 3656683885], + [1262, 5, 12, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Delete`.", 2011475922], + [1286, 7, 538, "Metrics/AbcSize: Assignment Branch Condition size for `call` is too high. [<7, 21, 1> 22.16/17]", 2655200768], + [1286, 7, 538, "Metrics/MethodLength: Method has too many lines. [13/10]", 2655200768], + [1304, 5, 12, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Insert`.", 1590185308], + [1338, 5, 10, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Move`.", 3515667002], + [1366, 7, 1182, "Metrics/AbcSize: Assignment Branch Condition size for `call` is too high. [<14, 40, 7> 42.95/17]", 172197360], + [1366, 7, 1182, "Metrics/MethodLength: Method has too many lines. [22/10]", 172197360], + [1383, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2688172402], + [1396, 3, 13, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr`.", 315644438], + [1396, 3, 12758, "Metrics/ModuleLength: Module has too many lines. [180/100]", 2662313186], + [1397, 5, 33, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::ProfileReportCompatibility`.", 3039519892], + [1419, 5, 18, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::MatchProfile`.", 365273299], + [1431, 7, 28, "Lint/DuplicateMethods: Method `Ast::Crispr::MatchProfile#normalize_start_boundary` is defined at both lib/ast/crispr.rb:292 and lib/ast/crispr.rb:1431.", 2362701855], + [1435, 7, 26, "Lint/DuplicateMethods: Method `Ast::Crispr::MatchProfile#normalize_end_boundary` is defined at both lib/ast/crispr.rb:299 and lib/ast/crispr.rb:1435.", 2613594544], + [1439, 7, 26, "Lint/DuplicateMethods: Method `Ast::Crispr::MatchProfile#normalize_payload_kind` is defined at both lib/ast/crispr.rb:306 and lib/ast/crispr.rb:1439.", 2604742721], + [1444, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::SelectionProfile`.", 2464089216], + [1466, 7, 14, "Lint/DuplicateMethods: Method `Ast::Crispr::SelectionProfile#initialize` is defined at both lib/ast/crispr.rb:531 and lib/ast/crispr.rb:1466.", 956205738], + [1466, 7, 773, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `initialize` is too high. [8/7]", 771809109], + [1466, 7, 773, "Metrics/MethodLength: Method has too many lines. [11/10]", 771809109], + [1466, 21, 190, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 4167448336], + [1481, 7, 1286, "Metrics/AbcSize: Assignment Branch Condition size for `report` is too high. [<5, 29, 13> 32.17/17]", 1720478959], + [1481, 7, 1286, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report` is too high. [11/7]", 1720478959], + [1481, 7, 1286, "Metrics/MethodLength: Method has too many lines. [17/10]", 1720478959], + [1481, 7, 1286, "Metrics/PerceivedComplexity: Perceived complexity for `report` is too high. [11/8]", 1720478959], + [1496, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 1470192175], + [1520, 5, 24, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::DestinationProfile`.", 3442102524], + [1534, 7, 29, "Lint/DuplicateMethods: Method `Ast::Crispr::DestinationProfile#normalize_resolution_kind` is defined at both lib/ast/crispr.rb:437 and lib/ast/crispr.rb:1534.", 99310177], + [1538, 7, 31, "Lint/DuplicateMethods: Method `Ast::Crispr::DestinationProfile#normalize_resolution_source` is defined at both lib/ast/crispr.rb:444 and lib/ast/crispr.rb:1538.", 1692065396], + [1542, 7, 29, "Lint/DuplicateMethods: Method `Ast::Crispr::DestinationProfile#normalize_anchor_boundary` is defined at both lib/ast/crispr.rb:452 and lib/ast/crispr.rb:1542.", 3028754726], + [1547, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::OperationProfile`.", 1974079861], + [1550, 7, 733, "Metrics/MethodLength: Method has too many lines. [13/10]", 2619513218], + [1570, 7, 25, "Lint/DuplicateMethods: Method `Ast::Crispr::OperationProfile#normalize_requirement` is defined at both lib/ast/crispr.rb:678 and lib/ast/crispr.rb:1570.", 440444039], + [1574, 7, 32, "Lint/DuplicateMethods: Method `Ast::Crispr::OperationProfile#normalize_replacement_source` is defined at both lib/ast/crispr.rb:686 and lib/ast/crispr.rb:1574.", 3533021156], + [1579, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::StructureProfile`.", 614380405], + [1595, 5, 6309, "Metrics/ClassLength: Class has too many lines. [172/100]", 1270437788], + [1600, 7, 2717, "Metrics/MethodLength: Method has too many lines. [67/10]", 1469599129], + [1665, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 259030389], + [1678, 28, 247, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3385598543], + [1710, 28, 242, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1038219895] + ], + "lib/ast/crispr/rspec/shared_examples/destination_profile.rb:2529475135": [ + [3, 1, 2386, "Metrics/BlockLength: Block has too many lines. [28/25]", 2846758965], + [4, 3, 2311, "Metrics/BlockLength: Block has too many lines. [26/25]", 2123267236] + ], + "lib/ast/crispr/rspec/shared_examples/match_profile.rb:2566447993": [ + [3, 1, 1997, "Metrics/BlockLength: Block has too many lines. [26/25]", 1032277788] + ], + "lib/ast/crispr/rspec/shared_examples/operation_profile.rb:3583567850": [ + [3, 1, 2148, "Metrics/BlockLength: Block has too many lines. [26/25]", 2745151209] + ], + "spec/old_runtime_spec.rb:1564590841": [ + [3, 1, 17728, "Metrics/BlockLength: Block has too many lines. [383/25]", 205400157], + [4, 3, 69, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3712453399], + [5, 3, 68, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1429320782], + [6, 3, 59, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 253007150], + [8, 3, 891, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 361389624], + [18, 37, 11, "Lint/UnusedMethodArgument: Unused method argument - `owner_scope`.", 3846606321], + [22, 46, 6, "Lint/UnusedMethodArgument: Unused method argument - `region`.", 2124512157], + [22, 64, 11, "Lint/UnusedMethodArgument: Unused method argument - `owner_scope`.", 3846606321], + [73, 3, 8534, "Metrics/BlockLength: Block has too many lines. [176/25]", 3042299525], + [313, 3, 3640, "Metrics/BlockLength: Block has too many lines. [72/25]", 1133370152], + [418, 3, 1663, "Metrics/BlockLength: Block has too many lines. [41/25]", 115074475] + ] +} diff --git a/gems/ast-crispr/Gemfile b/gems/ast-crispr/Gemfile index 000a11860..d841c9c33 100644 --- a/gems/ast-crispr/Gemfile +++ b/gems/ast-crispr/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source "https://gem.coop" +source 'https://gem.coop' git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,57 +19,53 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ["~> 1.0", ">= 1.0.8"] -gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ['~> 1.0', '>= 1.0.8'] +gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ast-merge ] -direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") +direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? if direct_sibling_gems.any? && - (direct_sibling_local || - ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) - direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") - direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) begin nomono_activation_requirements = nomono_requirements - nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) if File.file?(nomono_lockfile) nomono_locked_spec = Bundler::LockfileParser - .new(Bundler.read_file(nomono_lockfile)) - .specs - .find { |spec| spec.name == "nomono" } + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } nomono_locked = nomono_locked_spec && - Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) - if nomono_locked - nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] - end - end - Kernel.send(:gem, "nomono", *nomono_activation_requirements) - require "nomono/bundler" - if direct_sibling_templating && !direct_sibling_local - ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local eval_nomono_gems( gems: direct_sibling_gems, - prefix: "STRUCTUREDMERGE", - path_env: "STRUCTUREDMERGE_DEV", - root: ["src", "my", "structuredmerge"] + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] ) rescue LoadError - warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' ensure if direct_sibling_templating && !direct_sibling_local if direct_sibling_dev_was_set - ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original else - ENV.delete("STRUCTUREDMERGE_DEV") + ENV.delete('STRUCTUREDMERGE_DEV') end end end @@ -253,25 +249,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging -eval_gemfile "gemfiles/modular/debug.gemfile" +eval_gemfile 'gemfiles/modular/debug.gemfile' # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile "gemfiles/modular/coverage.gemfile" +eval_gemfile 'gemfiles/modular/coverage.gemfile' # Linting -eval_gemfile "gemfiles/modular/style.gemfile" +eval_gemfile 'gemfiles/modular/style.gemfile' # Documentation -eval_gemfile "gemfiles/modular/documentation.gemfile" +eval_gemfile 'gemfiles/modular/documentation.gemfile' # Optional -eval_gemfile "gemfiles/modular/optional.gemfile" +eval_gemfile 'gemfiles/modular/optional.gemfile' ### Std Lib Extracted Gems -eval_gemfile "gemfiles/modular/x_std_libs.gemfile" +eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' # See unlocked_deps appraisal for more details on irb inclusion -gem "irb", "~> 1.17" # ruby >= 2.7 +gem 'irb', '~> 1.17' # ruby >= 2.7 diff --git a/gems/ast-crispr/Gemfile.lock b/gems/ast-crispr/Gemfile.lock index 7478fbf81..70f7345f8 100644 --- a/gems/ast-crispr/Gemfile.lock +++ b/gems/ast-crispr/Gemfile.lock @@ -17,31 +17,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -49,248 +25,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -310,12 +44,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -324,6 +52,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -379,6 +108,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -397,7 +135,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -542,18 +279,22 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -587,11 +328,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -639,44 +380,23 @@ DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,26 +405,18 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -712,34 +424,20 @@ CHECKSUMS appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +450,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +477,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +488,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,19 +515,18 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,19 +540,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +555,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ast-crispr/Rakefile b/gems/ast-crispr/Rakefile index 2b30812c4..0fe938704 100644 --- a/gems/ast-crispr/Rakefile +++ b/gems/ast-crispr/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require "kettle/drift" + require 'kettle/drift' Kettle::Drift.install_tasks rescue LoadError - desc("(stub) kettle:drift:check is unavailable") - task("kettle:drift:check") do + desc('(stub) kettle:drift:check is unavailable') + task('kettle:drift:check') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:update is unavailable") - task("kettle:drift:update") do + desc('(stub) kettle:drift:update is unavailable') + task('kettle:drift:update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:force_update is unavailable") - task("kettle:drift:force_update") do + desc('(stub) kettle:drift:force_update is unavailable') + task('kettle:drift:force_update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift is unavailable") - task("kettle:drift" => "kettle:drift:update") + desc('(stub) kettle:drift is unavailable') + task('kettle:drift' => 'kettle:drift:update') end ### TEMPLATING TASKS diff --git a/gems/ast-crispr/bin/yard b/gems/ast-crispr/bin/yard index a7e8b6eed..5d516ad6f 100755 --- a/gems/ast-crispr/bin/yard +++ b/gems/ast-crispr/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec("bundle", "exec", "rake", "yard") +exec('bundle', 'exec', 'rake', 'yard') diff --git a/gems/ast-crispr/lib/ast/crispr/version.rb b/gems/ast-crispr/lib/ast/crispr/version.rb index af38578d7..c2c80e954 100644 --- a/gems/ast-crispr/lib/ast/crispr/version.rb +++ b/gems/ast-crispr/lib/ast/crispr/version.rb @@ -3,7 +3,7 @@ module Ast module Crispr module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/ast-merge/.kettle-drift.lock b/gems/ast-merge/.kettle-drift.lock index 6561994e4..8f289a29f 100644 --- a/gems/ast-merge/.kettle-drift.lock +++ b/gems/ast-merge/.kettle-drift.lock @@ -5,7 +5,8 @@ "lines": [ 79, 119, - 159 + 159, + 199 ] } ], @@ -15,7 +16,8 @@ "lines": [ 90, 130, - 170 + 170, + 210 ] } ], @@ -25,7 +27,8 @@ "lines": [ 80, 120, - 160 + 160, + 200 ] } ], @@ -35,7 +38,8 @@ "lines": [ 92, 132, - 172 + 172, + 212 ] } ], @@ -45,7 +49,8 @@ "lines": [ 95, 135, - 175 + 175, + 215 ] } ], @@ -55,7 +60,8 @@ "lines": [ 81, 121, - 161 + 161, + 201 ] } ], @@ -66,7 +72,8 @@ 59, 99, 139, - 179 + 179, + 219 ] } ], @@ -76,7 +83,8 @@ "lines": [ 100, 140, - 180 + 180, + 220 ] } ], @@ -87,7 +95,8 @@ 42, 86, 126, - 166 + 166, + 206 ] } ], @@ -97,7 +106,8 @@ "lines": [ 109, 149, - 189 + 189, + 229 ] } ], @@ -108,7 +118,8 @@ 34, 78, 118, - 158 + 158, + 198 ] } ], @@ -119,7 +130,8 @@ 68, 108, 148, - 188 + 188, + 228 ] } ], @@ -129,7 +141,8 @@ "lines": [ 84, 124, - 164 + 164, + 204 ] } ], @@ -140,7 +153,8 @@ 47, 91, 131, - 171 + 171, + 211 ] } ], @@ -151,7 +165,8 @@ 43, 87, 127, - 167 + 167, + 207 ] } ], @@ -161,7 +176,8 @@ "lines": [ 85, 125, - 165 + 165, + 205 ] } ], @@ -171,7 +187,8 @@ "lines": [ 102, 142, - 182 + 182, + 222 ] } ], @@ -181,7 +198,8 @@ "lines": [ 101, 141, - 181 + 181, + 221 ] } ], @@ -191,7 +209,8 @@ "lines": [ 96, 136, - 176 + 176, + 216 ] } ], @@ -201,7 +220,8 @@ "lines": [ 105, 145, - 185 + 185, + 225 ] } ], diff --git a/gems/ast-merge/Gemfile b/gems/ast-merge/Gemfile index 04ab86c96..7c71edd7c 100644 --- a/gems/ast-merge/Gemfile +++ b/gems/ast-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source 'https://gem.coop' +source "https://gem.coop" git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,17 +19,61 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ['~> 1.0', '>= 1.0.8'] -gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ["~> 1.0", ">= 1.0.8"] +gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ tree_haver ] -direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') +direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? + +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) + direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") + direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == "nomono" } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + if nomono_locked + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] + end + end + Kernel.send(:gem, "nomono", *nomono_activation_requirements) + require "nomono/bundler" + if direct_sibling_templating && !direct_sibling_local + ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + end + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: "STRUCTUREDMERGE", + path_env: "STRUCTUREDMERGE_DEV", + root: ["src", "my", "structuredmerge"] + ) + rescue LoadError + warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + else + ENV.delete("STRUCTUREDMERGE_DEV") + end + end + end +end if direct_sibling_gems.any? && (direct_sibling_local || @@ -209,25 +253,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? # Debugging -eval_gemfile 'gemfiles/modular/debug.gemfile' +eval_gemfile "gemfiles/modular/debug.gemfile" # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile 'gemfiles/modular/coverage.gemfile' +eval_gemfile "gemfiles/modular/coverage.gemfile" # Linting -eval_gemfile 'gemfiles/modular/style.gemfile' +eval_gemfile "gemfiles/modular/style.gemfile" # Documentation -eval_gemfile 'gemfiles/modular/documentation.gemfile' +eval_gemfile "gemfiles/modular/documentation.gemfile" # Optional -eval_gemfile 'gemfiles/modular/optional.gemfile' +eval_gemfile "gemfiles/modular/optional.gemfile" ### Std Lib Extracted Gems -eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' +eval_gemfile "gemfiles/modular/x_std_libs.gemfile" # See unlocked_deps appraisal for more details on irb inclusion -gem 'irb', '~> 1.17' # ruby >= 2.7 +gem "irb", "~> 1.17" # ruby >= 2.7 diff --git a/gems/ast-merge/README.md b/gems/ast-merge/README.md index 19257e522..f4089c7d5 100644 --- a/gems/ast-merge/README.md +++ b/gems/ast-merge/README.md @@ -576,6 +576,7 @@ If none of the available licenses suit your use case, please [contact us](mailto [🖐contrib-rocks]: https://contrib.rocks [🖐contributors]: https://github.com/structuredmerge/structuredmerge-ruby/graphs/contributors [🖐contributors-img]: https://contrib.rocks/image?repo=structuredmerge/structuredmerge-ruby +[🚎contributors-gl]: https://gitlab.com/structuredmerge/structuredmerge-ruby/-/graphs/main [🪇conduct]: https://github.com/structuredmerge/structuredmerge-ruby/blob/main/CODE_OF_CONDUCT.md [🪇conduct-img]: https://img.shields.io/badge/Contributor_Covenant-2.1-259D6C.svg [📌pvc]: http://guides.rubygems.org/patterns/#pessimistic-version-constraint diff --git a/gems/ast-merge/Rakefile b/gems/ast-merge/Rakefile index 339c9a3cb..6b4e21dec 100644 --- a/gems/ast-merge/Rakefile +++ b/gems/ast-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require 'kettle/drift' + require "kettle/drift" Kettle::Drift.install_tasks rescue LoadError - desc('(stub) kettle:drift:check is unavailable') - task('kettle:drift:check') do + desc("(stub) kettle:drift:check is unavailable") + task("kettle:drift:check") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:update is unavailable') - task('kettle:drift:update') do + desc("(stub) kettle:drift:update is unavailable") + task("kettle:drift:update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:force_update is unavailable') - task('kettle:drift:force_update') do + desc("(stub) kettle:drift:force_update is unavailable") + task("kettle:drift:force_update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift is unavailable') - task('kettle:drift' => 'kettle:drift:update') + desc("(stub) kettle:drift is unavailable") + task("kettle:drift" => "kettle:drift:update") end ### TEMPLATING TASKS diff --git a/gems/ast-merge/lib/ast/merge/version.rb b/gems/ast-merge/lib/ast/merge/version.rb index 6e7dc90f7..3ef823f4d 100644 --- a/gems/ast-merge/lib/ast/merge/version.rb +++ b/gems/ast-merge/lib/ast/merge/version.rb @@ -3,7 +3,7 @@ module Ast module Merge module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/tree_haver/.rubocop_gradual.lock b/gems/tree_haver/.rubocop_gradual.lock deleted file mode 100644 index 66df63bfc..000000000 --- a/gems/tree_haver/.rubocop_gradual.lock +++ /dev/null @@ -1,465 +0,0 @@ -{ - ".simplecov:3575099246": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Gemfile:1933889768": [ - [28, 1, 59, "Lint/EmptyConditionalBody: Avoid `if` branches without a body.", 4279378582] - ], - "Rakefile:1868927885": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/tree_haver.rb:1043643469": [ - [48, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465], - [48, 1, 14703, "Metrics/ModuleLength: Module has too many lines. [395/100]", 2758907023], - [66, 3, 566, "Metrics/MethodLength: Method has too many lines. [12/10]", 1536513137], - [123, 3, 272, "Metrics/MethodLength: Method has too many lines. [11/10]", 505877912], - [155, 3, 543, "Metrics/MethodLength: Method has too many lines. [14/10]", 3733215372], - [220, 3, 458, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `backend_module` is too high. [9/7]", 73937708], - [220, 3, 458, "Metrics/MethodLength: Method has too many lines. [12/10]", 73937708], - [220, 3, 458, "Metrics/PerceivedComplexity: Perceived complexity for `backend_module` is too high. [9/8]", 73937708], - [256, 3, 1024, "Metrics/AbcSize: Assignment Branch Condition size for `register_language` is too high. [<0, 20, 10> 22.36/17]", 53014028], - [256, 3, 1024, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `register_language` is too high. [11/7]", 53014028], - [256, 3, 1024, "Metrics/MethodLength: Method has too many lines. [12/10]", 53014028], - [256, 3, 1024, "Metrics/PerceivedComplexity: Perceived complexity for `register_language` is too high. [11/8]", 53014028], - [256, 24, 150, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 893242366], - [281, 3, 1355, "Metrics/AbcSize: Assignment Branch Condition size for `parser_for` is too high. [<11, 25, 13> 30.25/17]", 4004028797], - [281, 3, 1355, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parser_for` is too high. [14/7]", 4004028797], - [281, 3, 1355, "Metrics/MethodLength: Method has too many lines. [27/10]", 4004028797], - [281, 3, 1355, "Metrics/PerceivedComplexity: Perceived complexity for `parser_for` is too high. [14/8]", 4004028797], - [320, 3, 2089, "Metrics/MethodLength: Method has too many lines. [51/10]", 2791676388], - [374, 3, 565, "Metrics/AbcSize: Assignment Branch Condition size for `requested_backend_type` is too high. [<3, 16, 8> 18.14/17]", 2317624457], - [374, 3, 565, "Metrics/MethodLength: Method has too many lines. [12/10]", 2317624457], - [392, 3, 696, "Metrics/MethodLength: Method has too many lines. [14/10]", 307274721], - [470, 3, 425, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `backend_module_for` is too high. [9/7]", 3448932255], - [470, 3, 425, "Metrics/MethodLength: Method has too many lines. [20/10]", 3448932255] - ], - "lib/tree_haver/backend_api.rb:3354059061": [ - [30, 3, 12181, "Metrics/ModuleLength: Module has too many lines. [243/100]", 205645546], - [139, 5, 8882, "Metrics/ClassLength: Class has too many lines. [180/100]", 4281605197], - [145, 7, 1502, "Metrics/AbcSize: Assignment Branch Condition size for `validate` is too high. [<4, 22, 10> 24.49/17]", 747017743], - [145, 7, 1502, "Metrics/MethodLength: Method has too many lines. [31/10]", 747017743], - [145, 7, 1502, "Metrics/PerceivedComplexity: Perceived complexity for `validate` is too high. [11/8]", 747017743], - [213, 7, 903, "Metrics/MethodLength: Method has too many lines. [24/10]", 3041411230], - [261, 7, 1271, "Metrics/AbcSize: Assignment Branch Condition size for `validate_capabilities_hash` is too high. [<7, 27, 7> 28.76/17]", 3965262932], - [261, 7, 1271, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_capabilities_hash` is too high. [8/7]", 3965262932], - [261, 7, 1271, "Metrics/MethodLength: Method has too many lines. [25/10]", 3965262932], - [277, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2253399502], - [296, 7, 908, "Metrics/AbcSize: Assignment Branch Condition size for `validate_language` is too high. [<6, 17, 4> 18.47/17]", 733551867], - [315, 7, 797, "Metrics/AbcSize: Assignment Branch Condition size for `validate_parser` is too high. [<5, 16, 7> 18.17/17]", 1229041751], - [315, 7, 797, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_parser` is too high. [8/7]", 1229041751], - [315, 7, 797, "Metrics/MethodLength: Method has too many lines. [15/10]", 1229041751], - [349, 7, 862, "Metrics/AbcSize: Assignment Branch Condition size for `validate_node_class` is too high. [<8, 18, 8> 21.26/17]", 1873188195], - [349, 7, 862, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_node_class` is too high. [8/7]", 1873188195], - [349, 7, 862, "Metrics/MethodLength: Method has too many lines. [20/10]", 1873188195], - [349, 7, 862, "Metrics/PerceivedComplexity: Perceived complexity for `validate_node_class` is too high. [9/8]", 1873188195], - [375, 11, 20, "Naming/PredicatePrefix: Rename `has_method_or_alias?` to `method_or_alias?`.", 285116235] - ], - "lib/tree_haver/backend_context.rb:159197618": [ - [3, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465] - ], - "lib/tree_haver/backend_registry.rb:4046212912": [ - [4, 3, 22, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver::BackendRegistry`.", 733935278], - [4, 3, 5121, "Metrics/ModuleLength: Module has too many lines. [152/100]", 1483988260], - [39, 5, 382, "Metrics/MethodLength: Method has too many lines. [11/10]", 2000730238], - [48, 16, 1, "Style/DoubleNegation: Avoid the use of double negation (`!!`).", 177540], - [55, 5, 889, "Metrics/AbcSize: Assignment Branch Condition size for `register_tag` is too high. [<5, 20, 5> 21.21/17]", 2276764069], - [55, 5, 889, "Metrics/MethodLength: Method has too many lines. [18/10]", 2276764069], - [105, 5, 397, "Metrics/MethodLength: Method has too many lines. [11/10]", 4007185633] - ], - "lib/tree_haver/backends/citrus.rb:3181984499": [ - [40, 9, 449, "Metrics/MethodLength: Method has too many lines. [11/10]", 1138819533], - [173, 11, 1133, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [11/7]", 2613019266], - [173, 11, 1133, "Metrics/MethodLength: Method has too many lines. [16/10]", 2613019266], - [173, 11, 1133, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [11/8]", 2613019266], - [230, 9, 597, "Metrics/MethodLength: Method has too many lines. [12/10]", 3923424594], - [403, 9, 810, "Metrics/AbcSize: Assignment Branch Condition size for `structural?` is too high. [<3, 19, 8> 20.83/17]", 3166173256], - [403, 9, 810, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structural?` is too high. [9/7]", 3166173256], - [403, 9, 810, "Metrics/MethodLength: Method has too many lines. [12/10]", 3166173256], - [403, 9, 810, "Metrics/PerceivedComplexity: Perceived complexity for `structural?` is too high. [9/8]", 3166173256], - [436, 9, 1272, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_type_from_event` is too high. [9/7]", 2022108773], - [436, 9, 1272, "Metrics/MethodLength: Method has too many lines. [16/10]", 2022108773], - [436, 9, 1272, "Metrics/PerceivedComplexity: Perceived complexity for `extract_type_from_event` is too high. [10/8]", 2022108773], - [460, 11, 207, "Style/CaseLikeIf: Convert `if-elsif` to `case-when`.", 1995588659], - [476, 61, 10, "Style/NumericPredicate: Use `offset.positive?` instead of `offset > 0`.", 2454414278] - ], - "lib/tree_haver/backends/ffi.rb:691415497": [ - [83, 9, 853, "Metrics/MethodLength: Method has too many lines. [15/10]", 1876257977], - [147, 7, 7352, "Metrics/ModuleLength: Module has too many lines. [111/100]", 4125377349], - [148, 9, 7320, "Metrics/ClassLength: Class has too many lines. [109/100]", 1130902814], - [183, 11, 559, "Metrics/MethodLength: Method has too many lines. [11/10]", 678018999], - [232, 11, 4265, "Metrics/AbcSize: Assignment Branch Condition size for `try_load!` is too high. [<11, 40, 10> 42.67/17]", 2312962113], - [232, 11, 4265, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `try_load!` is too high. [10/7]", 2312962113], - [232, 11, 4265, "Metrics/MethodLength: Method has too many lines. [58/10]", 2312962113], - [232, 11, 4265, "Metrics/PerceivedComplexity: Perceived complexity for `try_load!` is too high. [11/8]", 2312962113], - [260, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2086221887], - [262, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2163360042], - [367, 9, 312, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `<=>` is too high. [8/7]", 2433292528], - [437, 11, 4377, "Metrics/AbcSize: Assignment Branch Condition size for `from_library` is too high. [<16, 30, 18> 38.47/17]", 3403850855], - [437, 11, 4377, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [17/7]", 3403850855], - [437, 11, 4377, "Metrics/MethodLength: Method has too many lines. [43/10]", 3403850855], - [437, 11, 4377, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [19/8]", 3403850855], - [437, 47, 4, "Lint/UnusedMethodArgument: Unused method argument - `name`.", 2087876002], - [502, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2415433817], - [554, 9, 3159, "Metrics/AbcSize: Assignment Branch Condition size for `language=` is too high. [<4, 44, 11> 45.53/17]", 1815427493], - [554, 9, 3159, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `language=` is too high. [10/7]", 1815427493], - [554, 9, 3159, "Metrics/MethodLength: Method has too many lines. [40/10]", 1815427493], - [554, 9, 3159, "Metrics/PerceivedComplexity: Perceived complexity for `language=` is too high. [10/8]", 1815427493], - [715, 7, 10494, "Metrics/ClassLength: Class has too many lines. [129/100]", 3710916551], - [744, 45, 9, "Style/NumericPredicate: Use `index.negative?` instead of `index < 0`.", 4215255415], - [807, 13, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183], - [889, 21, 9, "Style/NumericPredicate: Use `index.negative?` instead of `index < 0`.", 4215255415], - [933, 9, 694, "Metrics/AbcSize: Assignment Branch Condition size for `descendant_for_point_range` is too high. [<7, 21, 5> 22.69/17]", 979329510], - [953, 9, 706, "Metrics/AbcSize: Assignment Branch Condition size for `named_descendant_for_point_range` is too high. [<7, 21, 5> 22.69/17]", 2494446138] - ], - "lib/tree_haver/backends/java.rb:3360169733": [ - [134, 7, 815, "Metrics/AbcSize: Assignment Branch Condition size for `configure_native_library_path!` is too high. [<4, 17, 6> 18.47/17]", 1362415302], - [227, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3409700051], - [260, 7, 9885, "Metrics/ClassLength: Class has too many lines. [114/100]", 136252046], - [292, 9, 312, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `<=>` is too high. [8/7]", 2433292528], - [340, 11, 4098, "Metrics/AbcSize: Assignment Branch Condition size for `from_library` is too high. [<19, 32, 14> 39.76/17]", 3050250526], - [340, 11, 4098, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [14/7]", 3050250526], - [340, 11, 4098, "Metrics/MethodLength: Method has too many lines. [48/10]", 3050250526], - [340, 11, 4098, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [16/8]", 3050250526], - [426, 11, 2084, "Metrics/AbcSize: Assignment Branch Condition size for `load_by_name` is too high. [<11, 17, 6> 21.12/17]", 226213748], - [426, 11, 2084, "Metrics/MethodLength: Method has too many lines. [35/10]", 226213748], - [542, 9, 1016, "Metrics/MethodLength: Method has too many lines. [17/10]", 4123264427], - [649, 9, 702, "Metrics/MethodLength: Method has too many lines. [14/10]", 1334016319], - [649, 17, 89, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3152137646], - [728, 9, 583, "Metrics/MethodLength: Method has too many lines. [11/10]", 2457478600], - [816, 13, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183] - ], - "lib/tree_haver/backends/mri.rb:863330290": [ - [59, 9, 916, "Metrics/MethodLength: Method has too many lines. [15/10]", 749971754], - [179, 9, 312, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `<=>` is too high. [8/7]", 2433292528], - [232, 11, 1562, "Metrics/MethodLength: Method has too many lines. [11/10]", 3858647816] - ], - "lib/tree_haver/backends/parslet.rb:4170691266": [ - [41, 9, 323, "Metrics/MethodLength: Method has too many lines. [11/10]", 694290592], - [108, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193340030], - [172, 11, 1133, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [11/7]", 2613019266], - [172, 11, 1133, "Metrics/MethodLength: Method has too many lines. [16/10]", 2613019266], - [172, 11, 1133, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [11/8]", 2613019266], - [246, 9, 591, "Metrics/MethodLength: Method has too many lines. [12/10]", 3007454066], - [335, 7, 6287, "Metrics/ClassLength: Class has too many lines. [155/100]", 3100555518], - [362, 9, 452, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `start_byte` is too high. [8/7]", 2663206926], - [362, 9, 452, "Metrics/MethodLength: Method has too many lines. [12/10]", 2663206926], - [380, 9, 557, "Metrics/MethodLength: Method has too many lines. [12/10]", 2982914846], - [443, 9, 404, "Metrics/MethodLength: Method has too many lines. [11/10]", 1111982079], - [495, 61, 10, "Style/NumericPredicate: Use `offset.positive?` instead of `offset > 0`.", 2454414278], - [501, 9, 313, "Metrics/MethodLength: Method has too many lines. [13/10]", 1927903077], - [519, 9, 448, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_first_slice` is too high. [8/7]", 229178429], - [519, 9, 448, "Metrics/MethodLength: Method has too many lines. [16/10]", 229178429], - [524, 17, 11, "Style/HashEachMethods: Use `each_value` instead of `values.each`.", 236538172], - [539, 9, 461, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_last_slice` is too high. [8/7]", 3960808114], - [539, 9, 461, "Metrics/MethodLength: Method has too many lines. [16/10]", 3960808114] - ], - "lib/tree_haver/backends/prism.rb:265399087": [ - [39, 9, 448, "Metrics/MethodLength: Method has too many lines. [11/10]", 2383415890], - [70, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 721867551], - [71, 9, 712, "Metrics/MethodLength: Method has too many lines. [12/10]", 1576927704], - [145, 41, 6, "Lint/UnusedMethodArgument: Unused method argument - `symbol`.", 2153517219], - [182, 9, 554, "Metrics/MethodLength: Method has too many lines. [16/10]", 3452414947], - [250, 13, 11, "Naming/PredicatePrefix: Rename `has_errors?` to `errors?`.", 1181419252], - [275, 69, 27, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1979346241], - [301, 13, 64, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1942915391], - [305, 9, 519, "Metrics/AbcSize: Assignment Branch Condition size for `classify_comment_hint` is too high. [<5, 20, 5> 21.21/17]", 869270335], - [485, 13, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183], - [554, 24, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] - ], - "lib/tree_haver/backends/psych.rb:1528613408": [ - [30, 9, 448, "Metrics/MethodLength: Method has too many lines. [11/10]", 2367418678], - [59, 9, 601, "Metrics/MethodLength: Method has too many lines. [11/10]", 2824278890], - [342, 9, 901, "Metrics/AbcSize: Assignment Branch Condition size for `extract_text_from_location` is too high. [<8, 23, 18> 30.28/17]", 1252700264], - [342, 9, 901, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_text_from_location` is too high. [14/7]", 1252700264], - [342, 9, 901, "Metrics/MethodLength: Method has too many lines. [22/10]", 1252700264], - [342, 9, 901, "Metrics/PerceivedComplexity: Perceived complexity for `extract_text_from_location` is too high. [16/8]", 1252700264] - ], - "lib/tree_haver/backends/rust.rb:3784474048": [ - [52, 9, 548, "Metrics/MethodLength: Method has too many lines. [15/10]", 3791803966], - [156, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548] - ], - "lib/tree_haver/base/comment.rb:699160654": [ - [10, 5, 8183, "Metrics/ClassLength: Class has too many lines. [152/100]", 4001235397] - ], - "lib/tree_haver/base/node.rb:586469776": [ - [36, 5, 7668, "Metrics/ClassLength: Class has too many lines. [156/100]", 171773185], - [162, 11, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183], - [208, 27, 8, "Style/NumericPredicate: Use `cmp.zero?` instead of `cmp == 0`.", 736104011], - [239, 7, 888, "Metrics/AbcSize: Assignment Branch Condition size for `source_position` is too high. [<6, 20, 12> 24.08/17]", 3968023659], - [239, 7, 888, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `source_position` is too high. [9/7]", 3968023659], - [239, 7, 888, "Metrics/MethodLength: Method has too many lines. [28/10]", 3968023659], - [239, 7, 888, "Metrics/PerceivedComplexity: Perceived complexity for `source_position` is too high. [13/8]", 3968023659], - [306, 7, 355, "Metrics/MethodLength: Method has too many lines. [11/10]", 1012295608] - ], - "lib/tree_haver/base/tree.rb:3081630142": [ - [89, 15, 145, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1155535733], - [103, 11, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183] - ], - "lib/tree_haver/citrus_grammar_finder.rb:2540014236": [ - [31, 3, 7013, "Metrics/ClassLength: Class has too many lines. [102/100]", 245808593], - [66, 5, 3770, "Metrics/AbcSize: Assignment Branch Condition size for `available?` is too high. [<16, 52, 21> 58.32/17]", 3886463212], - [66, 5, 3770, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `available?` is too high. [22/7]", 3886463212], - [66, 5, 3770, "Metrics/MethodLength: Method has too many lines. [50/10]", 3886463212], - [66, 5, 3770, "Metrics/PerceivedComplexity: Perceived complexity for `available?` is too high. [22/8]", 3886463212], - [94, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858894] - ], - "lib/tree_haver/contracts.rb:1759652181": [ - [3, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465], - [3, 1, 30217, "Metrics/ModuleLength: Module has too many lines. [1005/100]", 1179515902], - [91, 5, 732, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 18, 2> 18.11/17]", 3031678572], - [91, 5, 732, "Metrics/MethodLength: Method has too many lines. [17/10]", 3031678572], - [170, 5, 697, "Metrics/MethodLength: Method has too many lines. [18/10]", 389212725], - [231, 5, 507, "Metrics/MethodLength: Method has too many lines. [13/10]", 2631332781], - [351, 5, 580, "Metrics/MethodLength: Method has too many lines. [13/10]", 2166080747], - [580, 5, 558, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 17, 4> 17.46/17]", 2109105399], - [580, 5, 558, "Metrics/MethodLength: Method has too many lines. [18/10]", 2109105399], - [632, 3, 780, "Metrics/AbcSize: Assignment Branch Condition size for `library_path_errors` is too high. [<3, 20, 10> 22.56/17]", 1003454820], - [632, 3, 780, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `library_path_errors` is too high. [10/7]", 1003454820], - [632, 3, 780, "Metrics/MethodLength: Method has too many lines. [14/10]", 1003454820], - [632, 3, 780, "Metrics/PerceivedComplexity: Perceived complexity for `library_path_errors` is too high. [10/8]", 1003454820], - [674, 3, 686, "Metrics/MethodLength: Method has too many lines. [16/10]", 2530945134], - [696, 3, 483, "Metrics/MethodLength: Method has too many lines. [15/10]", 3654427448], - [715, 3, 511, "Metrics/MethodLength: Method has too many lines. [16/10]", 145071639], - [792, 5, 384, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 19, 6> 19.92/17]", 1287649270], - [863, 5, 449, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [10/7]", 1722332092], - [863, 5, 449, "Metrics/PerceivedComplexity: Perceived complexity for `to_h` is too high. [10/8]", 1722332092], - [895, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177610], - [896, 5, 420, "Metrics/MethodLength: Method has too many lines. [12/10]", 722580369], - [936, 42, 8, "Lint/StructNewOverride: `:entries` member overrides `Struct#entries` and it may be unexpected.", 999966509], - [959, 3, 473, "Metrics/MethodLength: Method has too many lines. [18/10]", 1284459726], - [980, 3, 655, "Metrics/AbcSize: Assignment Branch Condition size for `byte_offset_for_point` is too high. [<7, 25, 14> 29.5/17]", 1278853347], - [980, 3, 655, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `byte_offset_for_point` is too high. [9/7]", 1278853347], - [980, 3, 655, "Metrics/MethodLength: Method has too many lines. [17/10]", 1278853347], - [980, 3, 655, "Metrics/PerceivedComplexity: Perceived complexity for `byte_offset_for_point` is too high. [10/8]", 1278853347] - ], - "lib/tree_haver/grammar_finder.rb:3769422606": [ - [55, 3, 13963, "Metrics/ClassLength: Class has too many lines. [213/100]", 842233610], - [120, 5, 516, "Metrics/AbcSize: Assignment Branch Condition size for `search_paths` is too high. [<6, 15, 6> 17.23/17]", 2953596940], - [120, 5, 516, "Metrics/MethodLength: Method has too many lines. [15/10]", 2953596940], - [160, 5, 1737, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_library_path` is too high. [8/7]", 4164717952], - [160, 5, 1737, "Metrics/MethodLength: Method has too many lines. [25/10]", 4164717952], - [272, 7, 845, "Metrics/MethodLength: Method has too many lines. [12/10]", 916567473], - [333, 5, 479, "Metrics/MethodLength: Method has too many lines. [13/10]", 309140318], - [352, 5, 805, "Metrics/MethodLength: Method has too many lines. [11/10]", 667615068], - [389, 5, 1028, "Metrics/MethodLength: Method has too many lines. [22/10]", 3088457603] - ], - "lib/tree_haver/kaitai_backend.rb:335397596": [ - [3, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465] - ], - "lib/tree_haver/language.rb:2775049278": [ - [39, 3, 12087, "Metrics/ModuleLength: Module has too many lines. [115/100]", 221887443], - [40, 5, 12061, "Metrics/ClassLength: Class has too many lines. [113/100]", 309443185], - [89, 7, 1966, "Metrics/AbcSize: Assignment Branch Condition size for `from_library` is too high. [<4, 20, 10> 22.72/17]", 980659500], - [89, 7, 1966, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [9/7]", 980659500], - [89, 7, 1966, "Metrics/MethodLength: Method has too many lines. [31/10]", 980659500], - [89, 7, 1966, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [11/8]", 980659500], - [114, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177538], - [156, 7, 4289, "Metrics/AbcSize: Assignment Branch Condition size for `method_missing` is too high. [<10, 39, 30> 50.21/17]", 1314689525], - [156, 7, 4289, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `method_missing` is too high. [24/7]", 1314689525], - [156, 7, 4289, "Metrics/MethodLength: Method has too many lines. [56/10]", 1314689525], - [156, 7, 4289, "Metrics/PerceivedComplexity: Perceived complexity for `method_missing` is too high. [26/8]", 1314689525], - [274, 7, 786, "Metrics/MethodLength: Method has too many lines. [12/10]", 3697766033] - ], - "lib/tree_haver/language_pack.rb:3634605947": [ - [6, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465], - [6, 1, 10559, "Metrics/ModuleLength: Module has too many lines. [285/100]", 1485243593], - [47, 3, 1095, "Metrics/AbcSize: Assignment Branch Condition size for `parse_with_language_pack` is too high. [<5, 25, 3> 25.67/17]", 2100474993], - [47, 3, 1095, "Metrics/MethodLength: Method has too many lines. [20/10]", 2100474993], - [72, 3, 1420, "Metrics/AbcSize: Assignment Branch Condition size for `process_with_language_pack` is too high. [<5, 31, 3> 31.54/17]", 3796531166], - [72, 3, 1420, "Metrics/MethodLength: Method has too many lines. [27/10]", 3796531166], - [110, 3, 708, "Metrics/AbcSize: Assignment Branch Condition size for `language_pack_result_hash` is too high. [<4, 22, 8> 23.75/17]", 3436019149], - [110, 3, 708, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `language_pack_result_hash` is too high. [9/7]", 3436019149], - [110, 3, 708, "Metrics/MethodLength: Method has too many lines. [14/10]", 3436019149], - [110, 3, 708, "Metrics/PerceivedComplexity: Perceived complexity for `language_pack_result_hash` is too high. [9/8]", 3436019149], - [165, 3, 403, "Metrics/MethodLength: Method has too many lines. [11/10]", 1836909640], - [180, 3, 398, "Metrics/MethodLength: Method has too many lines. [11/10]", 2881064520], - [247, 3, 436, "Metrics/MethodLength: Method has too many lines. [13/10]", 4289517332], - [265, 3, 508, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_typescript_import` is too high. [<6, 14, 10> 18.22/17]", 4201027767], - [265, 3, 508, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_typescript_import` is too high. [9/7]", 4201027767], - [265, 3, 508, "Metrics/MethodLength: Method has too many lines. [11/10]", 4201027767], - [265, 3, 508, "Metrics/PerceivedComplexity: Perceived complexity for `normalize_typescript_import` is too high. [10/8]", 4201027767], - [312, 20, 2, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 5861217] - ], - "lib/tree_haver/language_registry.rb:3950096220": [ - [83, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861089] - ], - "lib/tree_haver/library_path_utils.rb:1552423902": [ - [32, 5, 861, "Metrics/MethodLength: Method has too many lines. [12/10]", 1638068630] - ], - "lib/tree_haver/node.rb:715762930": [ - [62, 3, 16601, "Metrics/ClassLength: Class has too many lines. [237/100]", 2290466920], - [136, 5, 708, "Metrics/AbcSize: Assignment Branch Condition size for `start_point` is too high. [<2, 19, 7> 20.35/17]", 2066418249], - [136, 5, 708, "Metrics/MethodLength: Method has too many lines. [17/10]", 2066418249], - [161, 5, 694, "Metrics/AbcSize: Assignment Branch Condition size for `end_point` is too high. [<2, 19, 7> 20.35/17]", 2127773446], - [161, 5, 694, "Metrics/MethodLength: Method has too many lines. [17/10]", 2127773446], - [232, 5, 948, "Metrics/AbcSize: Assignment Branch Condition size for `text` is too high. [<1, 14, 11> 17.83/17]", 748349201], - [232, 5, 948, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `text` is too high. [9/7]", 748349201], - [232, 5, 948, "Metrics/MethodLength: Method has too many lines. [16/10]", 748349201], - [232, 5, 948, "Metrics/PerceivedComplexity: Perceived complexity for `text` is too high. [11/8]", 748349201], - [259, 9, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183], - [328, 5, 994, "Metrics/AbcSize: Assignment Branch Condition size for `named_child` is too high. [<6, 13, 10> 17.46/17]", 3449163117], - [328, 5, 994, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `named_child` is too high. [9/7]", 3449163117], - [328, 5, 994, "Metrics/MethodLength: Method has too many lines. [21/10]", 3449163117], - [328, 5, 994, "Metrics/PerceivedComplexity: Perceived complexity for `named_child` is too high. [10/8]", 3449163117], - [366, 5, 734, "Metrics/MethodLength: Method has too many lines. [15/10]", 3099919150], - [425, 7, 4, "Style/EmptyElse: Redundant `else`-clause.", 2087423834] - ], - "lib/tree_haver/parser.rb:1959976510": [ - [71, 3, 15231, "Metrics/ClassLength: Class has too many lines. [181/100]", 2262931609], - [84, 5, 938, "Metrics/MethodLength: Method has too many lines. [13/10]", 569209133], - [116, 5, 844, "Metrics/MethodLength: Method has too many lines. [11/10]", 3700471369], - [141, 5, 583, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `backend` is too high. [9/7]", 942469984], - [141, 5, 583, "Metrics/MethodLength: Method has too many lines. [20/10]", 942469984], - [237, 5, 1114, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_string` is too high. [8/7]", 2146281390], - [237, 5, 1114, "Metrics/MethodLength: Method has too many lines. [16/10]", 2146281390], - [237, 5, 1114, "Metrics/PerceivedComplexity: Perceived complexity for `parse_string` is too high. [10/8]", 2146281390], - [273, 5, 1162, "Metrics/AbcSize: Assignment Branch Condition size for `switch_backend_for_language` is too high. [<10, 11, 11> 18.49/17]", 3918477333], - [273, 5, 1162, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `switch_backend_for_language` is too high. [11/7]", 3918477333], - [273, 5, 1162, "Metrics/MethodLength: Method has too many lines. [26/10]", 3918477333], - [273, 5, 1162, "Metrics/PerceivedComplexity: Perceived complexity for `switch_backend_for_language` is too high. [9/8]", 3918477333], - [320, 5, 3598, "Metrics/AbcSize: Assignment Branch Condition size for `unwrap_language` is too high. [<4, 32, 32> 45.43/17]", 2683894777], - [320, 5, 3598, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `unwrap_language` is too high. [29/7]", 2683894777], - [320, 5, 3598, "Metrics/MethodLength: Method has too many lines. [55/10]", 2683894777], - [320, 5, 3598, "Metrics/PerceivedComplexity: Perceived complexity for `unwrap_language` is too high. [23/8]", 2683894777], - [414, 5, 892, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `try_reload_language_for_backend` is too high. [9/7]", 1872419716], - [414, 5, 892, "Metrics/MethodLength: Method has too many lines. [14/10]", 1872419716], - [414, 5, 892, "Metrics/PerceivedComplexity: Perceived complexity for `try_reload_language_for_backend` is too high. [9/8]", 1872419716] - ], - "lib/tree_haver/parslet_grammar_finder.rb:756779364": [ - [32, 3, 6418, "Metrics/ClassLength: Class has too many lines. [105/100]", 2916347470], - [67, 5, 2630, "Metrics/AbcSize: Assignment Branch Condition size for `available?` is too high. [<14, 39, 19> 45.59/17]", 1827795944], - [67, 5, 2630, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `available?` is too high. [20/7]", 1827795944], - [67, 5, 2630, "Metrics/MethodLength: Method has too many lines. [43/10]", 1827795944], - [67, 5, 2630, "Metrics/PerceivedComplexity: Perceived complexity for `available?` is too high. [20/8]", 1827795944] - ], - "lib/tree_haver/path_validator.rb:1827441298": [ - [31, 3, 11571, "Metrics/ModuleLength: Module has too many lines. [133/100]", 3916793077], - [71, 5, 1048, "Metrics/AbcSize: Assignment Branch Condition size for `trusted_directories` is too high. [<4, 16, 5> 17.23/17]", 2683168069], - [71, 5, 1048, "Metrics/MethodLength: Method has too many lines. [13/10]", 2683168069], - [182, 5, 1000, "Metrics/AbcSize: Assignment Branch Condition size for `safe_library_path?` is too high. [<1, 15, 15> 21.24/17]", 3331427816], - [182, 5, 1000, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `safe_library_path?` is too high. [15/7]", 3331427816], - [182, 5, 1000, "Metrics/MethodLength: Method has too many lines. [11/10]", 3331427816], - [182, 5, 1000, "Metrics/PerceivedComplexity: Perceived complexity for `safe_library_path?` is too high. [15/8]", 3331427816], - [314, 5, 911, "Metrics/AbcSize: Assignment Branch Condition size for `validation_errors` is too high. [<2, 21, 13> 24.78/17]", 1249065882], - [314, 5, 911, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validation_errors` is too high. [13/7]", 1249065882], - [314, 5, 911, "Metrics/MethodLength: Method has too many lines. [14/10]", 1249065882], - [314, 5, 911, "Metrics/PerceivedComplexity: Perceived complexity for `validation_errors` is too high. [13/8]", 1249065882], - [345, 9, 20, "Naming/PredicatePrefix: Rename `has_valid_extension?` to `valid_extension?`.", 2041908655] - ], - "lib/tree_haver/peg_backends.rb:2882446693": [ - [3, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465], - [37, 3, 611, "Metrics/MethodLength: Method has too many lines. [21/10]", 2394303132], - [39, 11, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [61, 3, 377, "Metrics/MethodLength: Method has too many lines. [13/10]", 1137341195] - ], - "lib/tree_haver/rspec/dependency_tags.rb:2954930617": [ - [7, 5, 21, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver::RSpec::DependencyTags`.", 2626933713] - ], - "lib/tree_haver/tree.rb:3332079774": [ - [129, 5, 1443, "Metrics/AbcSize: Assignment Branch Condition size for `edit` is too high. [<8, 18, 7> 20.9/17]", 4208399016], - [129, 5, 1443, "Metrics/MethodLength: Method has too many lines. [24/10]", 4208399016], - [129, 13, 89, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3152137646] - ], - "spec/backend_registry_spec.rb:2685433903": [ - [5, 1, 2560, "Metrics/BlockLength: Block has too many lines. [49/25]", 3697376763] - ], - "spec/fixtures_integration_spec.rb:433811098": [ - [3, 1, 49194, "Metrics/BlockLength: Block has too many lines. [1024/25]", 2138474637], - [108, 3, 1282, "Metrics/BlockLength: Block has too many lines. [29/25]", 505243730], - [141, 3, 1840, "Metrics/BlockLength: Block has too many lines. [35/25]", 1365684528], - [180, 3, 1365, "Metrics/BlockLength: Block has too many lines. [33/25]", 1597100003], - [247, 3, 2110, "Metrics/BlockLength: Block has too many lines. [41/25]", 219204301], - [294, 3, 2166, "Metrics/BlockLength: Block has too many lines. [27/25]", 2219571348], - [354, 3, 1786, "Metrics/BlockLength: Block has too many lines. [30/25]", 1655451032], - [432, 3, 1345, "Metrics/BlockLength: Block has too many lines. [26/25]", 1188499098], - [534, 3, 3250, "Metrics/BlockLength: Block has too many lines. [64/25]", 2852118886], - [589, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 2115564430], - [602, 3, 752, "Metrics/AbcSize: Assignment Branch Condition size for `normalized_tree_node` is too high. [<0, 19, 4> 19.42/17]", 1725197185], - [602, 3, 752, "Metrics/MethodLength: Method has too many lines. [18/10]", 1725197185], - [623, 3, 850, "Metrics/AbcSize: Assignment Branch Condition size for `backend_capability` is too high. [<0, 20, 0> 20/17]", 3278569026], - [623, 3, 850, "Metrics/MethodLength: Method has too many lines. [14/10]", 3278569026], - [640, 3, 744, "Metrics/MethodLength: Method has too many lines. [13/10]", 1675624229], - [679, 3, 492, "Metrics/MethodLength: Method has too many lines. [11/10]", 4123526878], - [714, 3, 566, "Metrics/AbcSize: Assignment Branch Condition size for `parse_error_tolerance` is too high. [<1, 17, 1> 17.06/17]", 933590597], - [714, 3, 566, "Metrics/MethodLength: Method has too many lines. [14/10]", 933590597], - [739, 3, 2652, "Metrics/BlockLength: Block has too many lines. [47/25]", 214520278], - [997, 3, 1160, "Metrics/BlockLength: Block has too many lines. [36/25]", 728731748], - [1106, 7, 87, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3860036845], - [1112, 7, 60, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1411318317] - ], - "tree_haver.gemspec:665267582": [ - [16, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1512975621], - [129, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [146, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [147, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [154, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ] -} diff --git a/gems/tree_haver/Gemfile b/gems/tree_haver/Gemfile index b0092fefd..5209ba280 100644 --- a/gems/tree_haver/Gemfile +++ b/gems/tree_haver/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source "https://gem.coop" +source 'https://gem.coop' git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,38 +19,35 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ["~> 1.0", ">= 1.0.8"] -gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ['~> 1.0', '>= 1.0.8'] +gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? && !tslp_dev.to_s.empty? -unless tslp_declared_by_templating - if tslp_dev.to_s.empty? - else - end +if !tslp_declared_by_templating && tslp_dev.to_s.empty? end # Modular sibling dependencies (env-switched inside each modular Gemfile) -eval_gemfile "gemfiles/modular/templating.gemfile" +eval_gemfile 'gemfiles/modular/templating.gemfile' # Debugging -eval_gemfile "gemfiles/modular/debug.gemfile" +eval_gemfile 'gemfiles/modular/debug.gemfile' # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile "gemfiles/modular/coverage.gemfile" +eval_gemfile 'gemfiles/modular/coverage.gemfile' # Linting -eval_gemfile "gemfiles/modular/style.gemfile" +eval_gemfile 'gemfiles/modular/style.gemfile' # Documentation -eval_gemfile "gemfiles/modular/documentation.gemfile" +eval_gemfile 'gemfiles/modular/documentation.gemfile' # Optional -eval_gemfile "gemfiles/modular/optional.gemfile" +eval_gemfile 'gemfiles/modular/optional.gemfile' ### Std Lib Extracted Gems -eval_gemfile "gemfiles/modular/x_std_libs.gemfile" +eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' # See unlocked_deps appraisal for more details on irb inclusion -gem "irb", "~> 1.17" # ruby >= 2.7 +gem 'irb', '~> 1.17' # ruby >= 2.7 diff --git a/gems/tree_haver/Gemfile.lock b/gems/tree_haver/Gemfile.lock index 8247fa07e..7191bd2b0 100644 --- a/gems/tree_haver/Gemfile.lock +++ b/gems/tree_haver/Gemfile.lock @@ -1,13 +1,3 @@ -GIT - remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a - branch: fix/ruby-parser-api-methods - glob: packages/ruby/*.gemspec - specs: - tree_sitter_language_pack (1.12.5) - rb_sys (>= 0.9, < 0.9.128) - sorbet-runtime (~> 0.5) - PATH remote: . specs: @@ -275,6 +265,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -307,7 +313,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -362,18 +367,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -425,9 +419,6 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) - rake-compiler-dock (1.12.0) - rb_sys (0.9.127) - rake-compiler-dock (= 1.12.0) rbs (4.0.3) logger prism (>= 1.6.0) @@ -535,22 +526,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -589,6 +576,12 @@ GEM toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_sitter_language_pack (1.9.0.pre.rc.40-aarch64-linux) + sorbet-runtime (~> 0.5) + tree_sitter_language_pack (1.9.0.pre.rc.40-arm64-darwin) + sorbet-runtime (~> 0.5) + tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) + sorbet-runtime (~> 0.5) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -656,9 +649,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -693,7 +686,6 @@ DEPENDENCIES toml-merge! toml-rb (~> 4.1) tree_haver! - tree_sitter_language_pack! typescript-merge! yaml-converter (~> 0.1) yaml-merge! @@ -737,7 +729,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -758,10 +749,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -797,8 +788,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) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 - rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 @@ -835,13 +824,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 @@ -860,7 +847,9 @@ CHECKSUMS toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) - tree_sitter_language_pack (1.12.5) + tree_sitter_language_pack (1.9.0.pre.rc.40-aarch64-linux) sha256=c882f4039a1a84a8ed782ef5381a8556acdb53538055d0b9b30d0cd85a0f1b0a + tree_sitter_language_pack (1.9.0.pre.rc.40-arm64-darwin) sha256=b3dc68837a1a626afcbe1abb779cd987e9828a43c78e98cc70aa7e58957f3ef8 + tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) sha256=ad6743a373eeac954c1b659b17af3aff1c82918b3ce9c9dc572a7c70ff843cdd tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 typescript-merge (7.1.0) diff --git a/gems/tree_haver/Rakefile b/gems/tree_haver/Rakefile index 0a3c6f7a9..ab2dc23d9 100644 --- a/gems/tree_haver/Rakefile +++ b/gems/tree_haver/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require "kettle/drift" + require 'kettle/drift' Kettle::Drift.install_tasks rescue LoadError - desc("(stub) kettle:drift:check is unavailable") - task("kettle:drift:check") do + desc('(stub) kettle:drift:check is unavailable') + task('kettle:drift:check') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:update is unavailable") - task("kettle:drift:update") do + desc('(stub) kettle:drift:update is unavailable') + task('kettle:drift:update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:force_update is unavailable") - task("kettle:drift:force_update") do + desc('(stub) kettle:drift:force_update is unavailable') + task('kettle:drift:force_update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift is unavailable") - task("kettle:drift" => "kettle:drift:update") + desc('(stub) kettle:drift is unavailable') + task('kettle:drift' => 'kettle:drift:update') end ### TEMPLATING TASKS From c3f168de47622429697f815325abd4653f7cec02 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:21:26 -0600 Subject: [PATCH 154/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-crispr-ruby-prism/Gemfile.lock | 345 +- gems/ast-crispr/Gemfile.lock | 15 +- gems/ast-merge/.rubocop_gradual.lock | 2827 ----------------- gems/ast-merge/Gemfile.lock | 59 +- gems/ast-merge/README.md | 1 - gems/ast-merge/bin/yard | 2 +- gems/tree_haver/.rubocop_gradual.lock | 467 +++ gems/tree_haver/Gemfile.lock | 445 +-- .../lib/tree_haver/grammar_finder.rb | 2 +- gems/tree_haver/lib/tree_haver/version.rb | 2 +- gems/tree_haver/spec/backends/tslp_spec.rb | 16 +- 11 files changed, 655 insertions(+), 3526 deletions(-) delete mode 100644 gems/ast-merge/.rubocop_gradual.lock create mode 100644 gems/tree_haver/.rubocop_gradual.lock diff --git a/gems/ast-crispr-ruby-prism/Gemfile.lock b/gems/ast-crispr-ruby-prism/Gemfile.lock index de85587b4..306ec70b4 100644 --- a/gems/ast-crispr-ruby-prism/Gemfile.lock +++ b/gems/ast-crispr-ruby-prism/Gemfile.lock @@ -16,265 +16,6 @@ PATH prism (>= 1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +27,15 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,8 +44,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -359,8 +107,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -389,7 +135,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-x86_64-linux-gnu) racc (~> 1.4) @@ -575,11 +320,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -621,45 +366,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -668,26 +391,18 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -695,23 +410,14 @@ CHECKSUMS appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -719,7 +425,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -732,27 +437,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-x86_64-linux-gnu) sha256=379fae440b28915e3f19d752ce2dcf8465ed2b2fbefd2a7ca0dd497bc981a06a nokogiri (1.19.4-x86_64-linux-musl) sha256=17dfb7c1fa194ae02fbf7c51a7afc8d278045ab3fdacfd86f91d02d7b274470b @@ -763,14 +460,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -778,7 +471,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -806,11 +498,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -820,7 +510,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -834,19 +523,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -854,7 +538,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ast-crispr/Gemfile.lock b/gems/ast-crispr/Gemfile.lock index 70f7345f8..3d95aba91 100644 --- a/gems/ast-crispr/Gemfile.lock +++ b/gems/ast-crispr/Gemfile.lock @@ -16,15 +16,6 @@ PATH service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -36,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -380,7 +376,6 @@ DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) ast-crispr! - ast-merge! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) debug (>= 1.1) diff --git a/gems/ast-merge/.rubocop_gradual.lock b/gems/ast-merge/.rubocop_gradual.lock deleted file mode 100644 index ca390a589..000000000 --- a/gems/ast-merge/.rubocop_gradual.lock +++ /dev/null @@ -1,2827 +0,0 @@ -{ - ".simplecov:3463276878": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:429706125": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "ast-merge.gemspec:1182320030": [ - [16, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1168797721], - [129, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [144, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [145, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [152, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/ast-merge.rb:3005639624": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`ast-merge.rb`) should use snake_case.", 5381] - ], - "lib/ast/merge.rb:3429747270": [ - [11, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge`.", 2866359175], - [11, 3, 270037, "Metrics/ModuleLength: Module has too many lines. [5702/100]", 2847709439], - [22, 5, 16, "Style/Documentation: Missing top-level documentation comment for `class Ast::Merge::ParseError`.", 362242086], - [33, 7, 362, "Metrics/AbcSize: Assignment Branch Condition size for `build_message` is too high. [<2, 16, 6> 17.2/17]", 3988736327], - [47, 5, 31, "Style/Documentation: Missing top-level documentation comment for `class Ast::Merge::PlaceholderCollisionError`.", 218924302], - [161, 7, 337, "Metrics/MethodLength: Method has too many lines. [11/10]", 2388996629], - [178, 7, 327, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [8/7]", 979795121], - [309, 7, 383, "Metrics/MethodLength: Method has too many lines. [11/10]", 634650261], - [473, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 3450568485], - [474, 7, 461, "Metrics/MethodLength: Method has too many lines. [12/10]", 43929779], - [491, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1299979089], - [492, 7, 377, "Metrics/MethodLength: Method has too many lines. [11/10]", 3704151253], - [508, 121, 39, "Layout/LineLength: Line is too long. [159/120]", 85503958], - [509, 7, 447, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [8/7]", 298553749], - [509, 7, 447, "Metrics/MethodLength: Method has too many lines. [12/10]", 298553749], - [538, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1441148616], - [539, 7, 453, "Metrics/MethodLength: Method has too many lines. [14/10]", 1899007021], - [558, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193342990], - [559, 7, 400, "Metrics/MethodLength: Method has too many lines. [11/10]", 298553749], - [588, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860750], - [589, 7, 411, "Metrics/MethodLength: Method has too many lines. [12/10]", 2893925621], - [606, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3137791633], - [607, 7, 454, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [8/7]", 298553749], - [607, 7, 454, "Metrics/MethodLength: Method has too many lines. [12/10]", 298553749], - [666, 7, 385, "Metrics/MethodLength: Method has too many lines. [11/10]", 794265461], - [703, 7, 419, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [10/7]", 3313546353], - [703, 7, 419, "Metrics/PerceivedComplexity: Perceived complexity for `to_h` is too high. [10/8]", 3313546353], - [753, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 398187770], - [765, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 2746783933], - [812, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860841], - [820, 121, 156, "Layout/LineLength: Line is too long. [276/120]", 1149525480], - [825, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 2538424426], - [837, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 2285382915], - [847, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3962419360], - [860, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 398187770], - [862, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3195178507], - [866, 121, 85, "Layout/LineLength: Line is too long. [205/120]", 4238980637], - [868, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 2678411233], - [870, 121, 39, "Layout/LineLength: Line is too long. [159/120]", 4028520110], - [881, 121, 110, "Layout/LineLength: Line is too long. [230/120]", 3837814921], - [895, 5, 2283, "Metrics/MethodLength: Method has too many lines. [57/10]", 2282416447], - [955, 5, 2654, "Metrics/MethodLength: Method has too many lines. [63/10]", 2491520565], - [1006, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1823519875], - [1015, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1874311968], - [1021, 5, 10660, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_downstream_merge_gem_feature_matrix` is too high. [<0, 21, 0> 21/17]", 2277322577], - [1021, 5, 10660, "Metrics/MethodLength: Method has too many lines. [248/10]", 2277322577], - [1272, 5, 1546, "Metrics/MethodLength: Method has too many lines. [37/10]", 208933754], - [1306, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 2658452668], - [1312, 5, 4206, "Metrics/MethodLength: Method has too many lines. [96/10]", 1997530776], - [1389, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 183246985], - [1405, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 3268438356], - [1411, 5, 1598, "Metrics/MethodLength: Method has too many lines. [46/10]", 849757258], - [1454, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1323237892], - [1460, 5, 1164, "Metrics/MethodLength: Method has too many lines. [36/10]", 1477831421], - [1493, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 931876829], - [1499, 5, 1699, "Metrics/MethodLength: Method has too many lines. [43/10]", 1125544678], - [1545, 5, 1016, "Metrics/MethodLength: Method has too many lines. [27/10]", 2194427985], - [1575, 5, 1058, "Metrics/MethodLength: Method has too many lines. [30/10]", 47860722], - [1608, 5, 1186, "Metrics/MethodLength: Method has too many lines. [31/10]", 676863486], - [1636, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 2689509078], - [1642, 5, 1517, "Metrics/MethodLength: Method has too many lines. [41/10]", 3855445172], - [1655, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 817380904], - [1680, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 409671963], - [1686, 5, 2116, "Metrics/MethodLength: Method has too many lines. [61/10]", 524104794], - [1750, 5, 820, "Metrics/MethodLength: Method has too many lines. [12/10]", 1888457180], - [1750, 37, 298, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 789483382], - [1751, 121, 100, "Layout/LineLength: Line is too long. [220/120]", 3288750271], - [1766, 5, 3595, "Metrics/AbcSize: Assignment Branch Condition size for `initial_profile_promotion_policy` is too high. [<9, 20, 0> 21.93/17]", 83685787], - [1766, 5, 3595, "Metrics/MethodLength: Method has too many lines. [77/10]", 83685787], - [1846, 5, 768, "Metrics/MethodLength: Method has too many lines. [17/10]", 314059802], - [1867, 5, 1493, "Metrics/AbcSize: Assignment Branch Condition size for `evaluate_profile_selection_requirement` is too high. [<7, 23, 9> 25.67/17]", 3177555163], - [1867, 5, 1493, "Metrics/MethodLength: Method has too many lines. [29/10]", 3177555163], - [1868, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2145168012], - [1875, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 683002336], - [1909, 5, 985, "Metrics/AbcSize: Assignment Branch Condition size for `profile_promotion_blocking_reasons` is too high. [<4, 25, 13> 28.46/17]", 1146627465], - [1909, 5, 985, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `profile_promotion_blocking_reasons` is too high. [10/7]", 1146627465], - [1909, 5, 985, "Metrics/MethodLength: Method has too many lines. [18/10]", 1146627465], - [1909, 5, 985, "Metrics/PerceivedComplexity: Perceived complexity for `profile_promotion_blocking_reasons` is too high. [10/8]", 1146627465], - [1930, 5, 3173, "Metrics/AbcSize: Assignment Branch Condition size for `validate_language_backend_profile` is too high. [<25, 68, 20> 75.16/17]", 2100389324], - [1930, 5, 3173, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_language_backend_profile` is too high. [21/7]", 2100389324], - [1930, 5, 3173, "Metrics/MethodLength: Method has too many lines. [60/10]", 2100389324], - [1930, 5, 3173, "Metrics/PerceivedComplexity: Perceived complexity for `validate_language_backend_profile` is too high. [23/8]", 2100389324], - [2002, 5, 1523, "Metrics/AbcSize: Assignment Branch Condition size for `validate_backend_inventory` is too high. [<13, 38, 13> 42.21/17]", 1899037537], - [2002, 5, 1523, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_backend_inventory` is too high. [13/7]", 1899037537], - [2002, 5, 1523, "Metrics/MethodLength: Method has too many lines. [25/10]", 1899037537], - [2002, 5, 1523, "Metrics/PerceivedComplexity: Perceived complexity for `validate_backend_inventory` is too high. [13/8]", 1899037537], - [2045, 5, 906, "Metrics/MethodLength: Method has too many lines. [20/10]", 3137959843], - [2068, 5, 2744, "Metrics/AbcSize: Assignment Branch Condition size for `detect_raw_merge_inconsistencies` is too high. [<8, 43, 21> 48.52/17]", 3717440692], - [2068, 5, 2744, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_raw_merge_inconsistencies` is too high. [17/7]", 3717440692], - [2068, 5, 2744, "Metrics/MethodLength: Method has too many lines. [53/10]", 3717440692], - [2068, 5, 2744, "Metrics/PerceivedComplexity: Perceived complexity for `detect_raw_merge_inconsistencies` is too high. [17/8]", 3717440692], - [2083, 7, 1894, "Metrics/BlockLength: Block has too many lines. [33/25]", 758887611], - [2129, 5, 762, "Metrics/MethodLength: Method has too many lines. [11/10]", 3021402342], - [2143, 5, 490, "Metrics/MethodLength: Method has too many lines. [11/10]", 578473475], - [2157, 5, 881, "Metrics/AbcSize: Assignment Branch Condition size for `execute_independent_commutative_insertions` is too high. [<6, 16, 7> 18.47/17]", 259417386], - [2157, 5, 881, "Metrics/MethodLength: Method has too many lines. [21/10]", 259417386], - [2184, 5, 1107, "Metrics/AbcSize: Assignment Branch Condition size for `execute_independent_keyed_member_edits` is too high. [<10, 31, 15> 35.86/17]", 4271501385], - [2184, 5, 1107, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `execute_independent_keyed_member_edits` is too high. [14/7]", 4271501385], - [2184, 5, 1107, "Metrics/MethodLength: Method has too many lines. [24/10]", 4271501385], - [2184, 5, 1107, "Metrics/PerceivedComplexity: Perceived complexity for `execute_independent_keyed_member_edits` is too high. [14/8]", 4271501385], - [2228, 5, 3149, "Metrics/AbcSize: Assignment Branch Condition size for `parse_compact_ruleset` is too high. [<16, 68, 24> 73.86/17]", 3149098803], - [2228, 5, 3149, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_compact_ruleset` is too high. [22/7]", 3149098803], - [2228, 5, 3149, "Metrics/MethodLength: Method has too many lines. [67/10]", 3149098803], - [2228, 5, 3149, "Metrics/PerceivedComplexity: Perceived complexity for `parse_compact_ruleset` is too high. [23/8]", 3149098803], - [2234, 7, 2544, "Metrics/BlockLength: Block has too many lines. [50/25]", 2484860466], - [2261, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193420054], - [2307, 5, 2658, "Metrics/AbcSize: Assignment Branch Condition size for `compact_ruleset_feature_profile` is too high. [<11, 67, 38> 77.81/17]", 4022599673], - [2307, 5, 2658, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compact_ruleset_feature_profile` is too high. [29/7]", 4022599673], - [2307, 5, 2658, "Metrics/MethodLength: Method has too many lines. [66/10]", 4022599673], - [2307, 5, 2658, "Metrics/PerceivedComplexity: Perceived complexity for `compact_ruleset_feature_profile` is too high. [16/8]", 4022599673], - [2325, 7, 2243, "Metrics/BlockLength: Block has too many lines. [47/25]", 965041772], - [2392, 5, 2733, "Metrics/AbcSize: Assignment Branch Condition size for `classify_template_target_path` is too high. [<4, 36, 23> 42.91/17]", 3661828596], - [2392, 5, 2733, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `classify_template_target_path` is too high. [21/7]", 3661828596], - [2392, 5, 2733, "Metrics/MethodLength: Method has too many lines. [39/10]", 3661828596], - [2392, 5, 2733, "Metrics/PerceivedComplexity: Perceived complexity for `classify_template_target_path` is too high. [17/8]", 3661828596], - [2424, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [2438, 5, 416, "Metrics/MethodLength: Method has too many lines. [12/10]", 1388641773], - [2481, 5, 388, "Metrics/MethodLength: Method has too many lines. [12/10]", 2360583514], - [2510, 5, 820, "Metrics/MethodLength: Method has too many lines. [13/10]", 354674808], - [2526, 5, 929, "Metrics/AbcSize: Assignment Branch Condition size for `enrich_template_plan_entries` is too high. [<9, 12, 10> 18.03/17]", 2666747528], - [2526, 5, 929, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `enrich_template_plan_entries` is too high. [9/7]", 2666747528], - [2526, 5, 929, "Metrics/MethodLength: Method has too many lines. [19/10]", 2666747528], - [2526, 5, 929, "Metrics/PerceivedComplexity: Perceived complexity for `enrich_template_plan_entries` is too high. [10/8]", 2666747528], - [2549, 5, 1245, "Metrics/AbcSize: Assignment Branch Condition size for `enrich_template_plan_entries_with_token_state` is too high. [<11, 23, 14> 29.09/17]", 1507113977], - [2549, 5, 1245, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `enrich_template_plan_entries_with_token_state` is too high. [13/7]", 1507113977], - [2549, 5, 1245, "Metrics/MethodLength: Method has too many lines. [19/10]", 1507113977], - [2549, 5, 1245, "Metrics/PerceivedComplexity: Perceived complexity for `enrich_template_plan_entries_with_token_state` is too high. [13/8]", 1507113977], - [2573, 5, 1353, "Metrics/AbcSize: Assignment Branch Condition size for `prepare_template_entries` is too high. [<6, 18, 11> 21.93/17]", 2774310942], - [2573, 5, 1353, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `prepare_template_entries` is too high. [11/7]", 2774310942], - [2573, 5, 1353, "Metrics/MethodLength: Method has too many lines. [24/10]", 2774310942], - [2573, 5, 1353, "Metrics/PerceivedComplexity: Perceived complexity for `prepare_template_entries` is too high. [12/8]", 2774310942], - [2603, 5, 1494, "Metrics/AbcSize: Assignment Branch Condition size for `plan_template_execution` is too high. [<8, 22, 17> 28.93/17]", 3876421385], - [2603, 5, 1494, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `plan_template_execution` is too high. [14/7]", 3876421385], - [2603, 5, 1494, "Metrics/MethodLength: Method has too many lines. [29/10]", 3876421385], - [2603, 5, 1494, "Metrics/PerceivedComplexity: Perceived complexity for `plan_template_execution` is too high. [15/8]", 3876421385], - [2604, 7, 1421, "Metrics/BlockLength: Block has too many lines. [27/25]", 2887810383], - [2637, 5, 822, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 2749235529], - [2637, 37, 220, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 447165880], - [2638, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 518382509], - [2652, 5, 2060, "Metrics/AbcSize: Assignment Branch Condition size for `preview_template_execution` is too high. [<11, 42, 26> 50.61/17]", 2270817206], - [2652, 5, 2060, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preview_template_execution` is too high. [25/7]", 2270817206], - [2652, 5, 2060, "Metrics/MethodLength: Method has too many lines. [39/10]", 2270817206], - [2652, 5, 2060, "Metrics/PerceivedComplexity: Perceived complexity for `preview_template_execution` is too high. [23/8]", 2270817206], - [2662, 7, 1809, "Metrics/BlockLength: Block has too many lines. [28/25]", 310337564], - [2700, 5, 2513, "Metrics/AbcSize: Assignment Branch Condition size for `apply_template_execution` is too high. [<14, 50, 25> 57.63/17]", 177708331], - [2700, 5, 2513, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_template_execution` is too high. [26/7]", 177708331], - [2700, 5, 2513, "Metrics/MethodLength: Method has too many lines. [50/10]", 177708331], - [2700, 5, 2513, "Metrics/PerceivedComplexity: Perceived complexity for `apply_template_execution` is too high. [23/8]", 177708331], - [2711, 7, 2239, "Metrics/BlockLength: Block has too many lines. [38/25]", 1651205014], - [2761, 5, 1696, "Metrics/AbcSize: Assignment Branch Condition size for `evaluate_template_tree_convergence` is too high. [<11, 29, 17> 35.37/17]", 2507998041], - [2761, 5, 1696, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `evaluate_template_tree_convergence` is too high. [17/7]", 2507998041], - [2761, 5, 1696, "Metrics/MethodLength: Method has too many lines. [35/10]", 2507998041], - [2761, 5, 1696, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 2507998041], - [2761, 5, 1696, "Metrics/PerceivedComplexity: Perceived complexity for `evaluate_template_tree_convergence` is too high. [17/8]", 2507998041], - [2761, 43, 198, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 4214374277], - [2762, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 2983874608], - [2804, 5, 688, "Metrics/MethodLength: Method has too many lines. [15/10]", 3064253784], - [2804, 5, 688, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 3064253784], - [2804, 36, 216, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 448029307], - [2805, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3840139076], - [2848, 5, 664, "Metrics/MethodLength: Method has too many lines. [13/10]", 995637868], - [2848, 5, 664, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 995637868], - [2848, 53, 202, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 4227116196], - [2849, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 418683952], - [2866, 5, 649, "Metrics/MethodLength: Method has too many lines. [13/10]", 1831524792], - [2866, 5, 649, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 1831524792], - [2866, 54, 178, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2962381850], - [2867, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 3690915627], - [2884, 5, 1280, "Metrics/AbcSize: Assignment Branch Condition size for `apply_template_tree_execution_to_directory` is too high. [<6, 16, 6> 18.11/17]", 305449363], - [2884, 5, 1280, "Metrics/MethodLength: Method has too many lines. [23/10]", 305449363], - [2884, 5, 1280, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 305449363], - [2884, 51, 200, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1352434212], - [2885, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 1139621482], - [2913, 5, 2199, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_tree_run` is too high. [<15, 42, 31> 54.31/17]", 975627723], - [2913, 5, 2199, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_tree_run` is too high. [25/7]", 975627723], - [2913, 5, 2199, "Metrics/MethodLength: Method has too many lines. [38/10]", 975627723], - [2913, 5, 2199, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_tree_run` is too high. [26/8]", 975627723], - [2957, 5, 1515, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_apply` is too high. [<13, 35, 21> 42.84/17]", 3710254295], - [2957, 5, 1515, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_directory_apply` is too high. [17/7]", 3710254295], - [2957, 5, 1515, "Metrics/MethodLength: Method has too many lines. [26/10]", 3710254295], - [2957, 5, 1515, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_directory_apply` is too high. [17/8]", 3710254295], - [2972, 20, 1, "Style/DoubleNegation: Avoid the use of double negation (`!!`).", 177540], - [2989, 5, 1656, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_plan` is too high. [<11, 24, 25> 36.36/17]", 2946319293], - [2989, 5, 1656, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_directory_plan` is too high. [18/7]", 2946319293], - [2989, 5, 1656, "Metrics/MethodLength: Method has too many lines. [36/10]", 2946319293], - [2989, 5, 1656, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_directory_plan` is too high. [16/8]", 2946319293], - [3061, 7, 9, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 3648222389], - [3082, 5, 410, "Metrics/MethodLength: Method has too many lines. [12/10]", 248324428], - [3088, 7, 11, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 848344986], - [3132, 5, 712, "Metrics/MethodLength: Method has too many lines. [12/10]", 2500743043], - [3132, 27, 178, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 873705194], - [3132, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3023611470], - [3158, 42, 167, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2002181571], - [3171, 5, 1097, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structured_edit_selection_profile` is too high. [8/7]", 1149325233], - [3171, 5, 1097, "Metrics/MethodLength: Method has too many lines. [14/10]", 1149325233], - [3171, 42, 311, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 3814063337], - [3172, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 198450264], - [3185, 34, 47, "Style/SafeNavigation: Use safe navigation (`&.`) instead of checking if an object exists before calling the method.", 3204815976], - [3190, 5, 869, "Metrics/MethodLength: Method has too many lines. [11/10]", 83957392], - [3190, 41, 250, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1486072775], - [3191, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1967186495], - [3201, 36, 47, "Style/SafeNavigation: Use safe navigation (`&.`) instead of checking if an object exists before calling the method.", 3204815976], - [3206, 5, 1156, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structured_edit_match_profile` is too high. [10/7]", 4112674787], - [3206, 5, 1156, "Metrics/MethodLength: Method has too many lines. [15/10]", 4112674787], - [3206, 5, 1156, "Metrics/PerceivedComplexity: Perceived complexity for `structured_edit_match_profile` is too high. [10/8]", 4112674787], - [3206, 38, 321, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [12/5]", 823565876], - [3207, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859667], - [3208, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3673982236], - [3226, 5, 933, "Metrics/MethodLength: Method has too many lines. [14/10]", 2099388915], - [3226, 37, 319, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [12/5]", 250907892], - [3227, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177545], - [3228, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 4154814685], - [3245, 5, 907, "Metrics/MethodLength: Method has too many lines. [12/10]", 2242846328], - [3245, 42, 275, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 246196330], - [3246, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1439117336], - [3262, 5, 1057, "Metrics/MethodLength: Method has too many lines. [14/10]", 2891607970], - [3262, 44, 323, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 1386547750], - [3263, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1676243675], - [3264, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 4154814685], - [3281, 5, 1375, "Metrics/AbcSize: Assignment Branch Condition size for `structured_edit_request` is too high. [<11, 25, 10> 29.09/17]", 4153786554], - [3281, 5, 1375, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structured_edit_request` is too high. [11/7]", 4153786554], - [3281, 5, 1375, "Metrics/MethodLength: Method has too many lines. [16/10]", 4153786554], - [3281, 5, 1375, "Metrics/PerceivedComplexity: Perceived complexity for `structured_edit_request` is too high. [11/8]", 4153786554], - [3281, 32, 370, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [13/5]", 2381882467], - [3282, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177545], - [3303, 5, 728, "Metrics/MethodLength: Method has too many lines. [11/10]", 4026157473], - [3303, 31, 175, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 773121544], - [3335, 5, 597, "Metrics/MethodLength: Method has too many lines. [11/10]", 4143495860], - [3374, 5, 577, "Metrics/MethodLength: Method has too many lines. [11/10]", 4169131743], - [3389, 5, 1011, "Metrics/AbcSize: Assignment Branch Condition size for `structured_edit_execution_report` is too high. [<7, 16, 7> 18.81/17]", 876221899], - [3389, 5, 1011, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structured_edit_execution_report` is too high. [8/7]", 876221899], - [3389, 5, 1011, "Metrics/MethodLength: Method has too many lines. [12/10]", 876221899], - [3389, 41, 245, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 2484440861], - [3390, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 4036992717], - [3415, 55, 170, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 668161765], - [3438, 5, 819, "Metrics/MethodLength: Method has too many lines. [12/10]", 2287133436], - [3438, 56, 217, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3198032135], - [3439, 121, 51, "Layout/LineLength: Line is too long. [171/120]", 3526181051], - [3472, 5, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 1853778635], - [3481, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], - [3513, 5, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 1132214891], - [3522, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], - [3544, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 556747511], - [3553, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1808630920], - [3575, 5, 708, "Metrics/MethodLength: Method has too many lines. [11/10]", 3590891170], - [3584, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1367166441], - [3607, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 689748855], - [3616, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1808630920], - [3638, 5, 708, "Metrics/MethodLength: Method has too many lines. [11/10]", 1478642210], - [3647, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1367166441], - [3671, 5, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 239506091], - [3680, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], - [3702, 5, 693, "Metrics/MethodLength: Method has too many lines. [11/10]", 3803476550], - [3711, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], - [3734, 5, 728, "Metrics/MethodLength: Method has too many lines. [11/10]", 748161230], - [3743, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 2807086497], - [3765, 5, 758, "Metrics/MethodLength: Method has too many lines. [11/10]", 3900524558], - [3774, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3463884836], - [3798, 5, 748, "Metrics/MethodLength: Method has too many lines. [11/10]", 2076716686], - [3807, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 609414023], - [3829, 5, 778, "Metrics/MethodLength: Method has too many lines. [11/10]", 867958318], - [3833, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193343749], - [3838, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 1202823007], - [3862, 5, 728, "Metrics/MethodLength: Method has too many lines. [11/10]", 2078323790], - [3871, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 2807086497], - [3893, 5, 758, "Metrics/MethodLength: Method has too many lines. [11/10]", 121025422], - [3902, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3463884836], - [3924, 5, 733, "Metrics/MethodLength: Method has too many lines. [11/10]", 1216456558], - [3933, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 145839927], - [3955, 5, 763, "Metrics/MethodLength: Method has too many lines. [11/10]", 2946525998], - [3964, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 275709226], - [3988, 5, 768, "Metrics/MethodLength: Method has too many lines. [11/10]", 3281402414], - [3992, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177656], - [3997, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 1427340581], - [4034, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3673982236], - [4091, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193417070], - [4102, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2768444], - [4109, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3833204035], - [4117, 5, 863, "Metrics/MethodLength: Method has too many lines. [11/10]", 3731153486], - [4121, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 4054494590], - [4126, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 2084326338], - [4132, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 4201858364], - [4136, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861122], - [4140, 5, 873, "Metrics/MethodLength: Method has too many lines. [11/10]", 1866057614], - [4144, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3893180930], - [4149, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 863421408], - [4155, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 3247130491], - [4159, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1171438608], - [4163, 5, 883, "Metrics/MethodLength: Method has too many lines. [11/10]", 2352924462], - [4163, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860841], - [4164, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861334], - [4167, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 465221046], - [4172, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 1922522532], - [4188, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 4067226670], - [4192, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2033573170], - [4196, 5, 893, "Metrics/MethodLength: Method has too many lines. [11/10]", 1633175534], - [4196, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087926422], - [4197, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087421565], - [4200, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 615151909], - [4205, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 884393597], - [4231, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 417844693], - [4235, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1233681340], - [4239, 5, 903, "Metrics/MethodLength: Method has too many lines. [11/10]", 3964877742], - [4239, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873471], - [4240, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1322899615], - [4243, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 3471008807], - [4248, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 627945471], - [4254, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 2960084092], - [4258, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2148514258], - [4262, 5, 913, "Metrics/MethodLength: Method has too many lines. [11/10]", 385546958], - [4262, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2970472935], - [4263, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3808956371], - [4266, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 3412499338], - [4271, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 3274208144], - [4277, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 4275923717], - [4285, 5, 848, "Metrics/MethodLength: Method has too many lines. [11/10]", 457851502], - [4289, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 413805135], - [4294, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 951908917], - [4300, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 1859200227], - [4308, 5, 808, "Metrics/MethodLength: Method has too many lines. [11/10]", 884695726], - [4312, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 2011807620], - [4317, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 384138219], - [4323, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1176320663], - [4331, 5, 798, "Metrics/MethodLength: Method has too many lines. [11/10]", 1422521838], - [4335, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3247420006], - [4340, 121, 35, "Layout/LineLength: Line is too long. [155/120]", 1408316702], - [4346, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 938465266], - [4354, 5, 803, "Metrics/MethodLength: Method has too many lines. [11/10]", 2370839950], - [4358, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 74128911], - [4363, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 1364659899], - [4369, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2059517661], - [4377, 5, 803, "Metrics/MethodLength: Method has too many lines. [11/10]", 3379336814], - [4381, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 74128911], - [4386, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 1364659899], - [4434, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 4281772560], - [4442, 5, 833, "Metrics/MethodLength: Method has too many lines. [11/10]", 3245498510], - [4446, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3542644754], - [4451, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1916814773], - [4457, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 859690879], - [4465, 5, 833, "Metrics/MethodLength: Method has too many lines. [11/10]", 4138830126], - [4469, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3542644754], - [4474, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1916814773], - [4480, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3880141603], - [4488, 5, 828, "Metrics/MethodLength: Method has too many lines. [11/10]", 3621010990], - [4492, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3917260126], - [4497, 121, 41, "Layout/LineLength: Line is too long. [161/120]", 1879260859], - [4503, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1776611011], - [4511, 5, 838, "Metrics/MethodLength: Method has too many lines. [11/10]", 514585454], - [4515, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1353518231], - [4520, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 1228459824], - [4526, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 3932349968], - [4530, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087903307], - [4534, 5, 878, "Metrics/MethodLength: Method has too many lines. [11/10]", 1525737454], - [4534, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], - [4535, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177538], - [4538, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 2895681070], - [4543, 121, 51, "Layout/LineLength: Line is too long. [171/120]", 4040662298], - [4549, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 66929045], - [4557, 5, 808, "Metrics/MethodLength: Method has too many lines. [11/10]", 1626746606], - [4561, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 2011807620], - [4566, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 384138219], - [4580, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 849230508], - [4588, 5, 838, "Metrics/MethodLength: Method has too many lines. [11/10]", 3531122670], - [4592, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1353518231], - [4597, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 1228459824], - [4612, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1176320663], - [4620, 5, 798, "Metrics/MethodLength: Method has too many lines. [11/10]", 1118421486], - [4624, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3247420006], - [4629, 121, 35, "Layout/LineLength: Line is too long. [155/120]", 1408316702], - [4651, 5, 693, "Metrics/MethodLength: Method has too many lines. [11/10]", 1668406662], - [4660, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], - [4674, 5, 648, "Metrics/MethodLength: Method has too many lines. [11/10]", 3479836893], - [4683, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193343749], - [4705, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 3147549879], - [4714, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1808630920], - [4749, 5, 677, "Metrics/MethodLength: Method has too many lines. [11/10]", 1206941784], - [4758, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3937819337], - [4781, 5, 672, "Metrics/MethodLength: Method has too many lines. [11/10]", 3634903061], - [4790, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], - [4812, 5, 683, "Metrics/MethodLength: Method has too many lines. [11/10]", 3417053461], - [4821, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], - [4845, 5, 668, "Metrics/MethodLength: Method has too many lines. [11/10]", 1540762726], - [4854, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1808630920], - [4876, 5, 698, "Metrics/MethodLength: Method has too many lines. [11/10]", 2804825893], - [4885, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1367166441], - [4908, 5, 683, "Metrics/MethodLength: Method has too many lines. [11/10]", 3165010613], - [4917, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], - [4939, 5, 713, "Metrics/MethodLength: Method has too many lines. [11/10]", 2795628035], - [4948, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 497133415], - [4954, 5, 864, "Metrics/MethodLength: Method has too many lines. [12/10]", 1086224878], - [4954, 50, 268, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 4022739767], - [4955, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1607400384], - [4979, 5, 658, "Metrics/MethodLength: Method has too many lines. [11/10]", 3999796489], - [4988, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 102058825], - [5002, 59, 179, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1569981428], - [5003, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 1515849732], - [5034, 5, 694, "Metrics/MethodLength: Method has too many lines. [11/10]", 3830236120], - [5043, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2250857971], - [5057, 5, 673, "Metrics/MethodLength: Method has too many lines. [11/10]", 2413908653], - [5066, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1225026887], - [5080, 5, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 3935895659], - [5089, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], - [5103, 5, 692, "Metrics/MethodLength: Method has too many lines. [11/10]", 3660669627], - [5112, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3558241761], - [5126, 5, 612, "Metrics/MethodLength: Method has too many lines. [11/10]", 100391811], - [5165, 5, 693, "Metrics/MethodLength: Method has too many lines. [11/10]", 3138587622], - [5174, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], - [5196, 5, 688, "Metrics/MethodLength: Method has too many lines. [11/10]", 2736088861], - [5205, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1992103013], - [5228, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 2275602867], - [5237, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3598350322], - [5260, 5, 602, "Metrics/MethodLength: Method has too many lines. [11/10]", 3023166371], - [5275, 36, 181, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1071580945], - [5288, 5, 787, "Metrics/AbcSize: Assignment Branch Condition size for `group_projected_child_review_cases` is too high. [<4, 17, 4> 17.92/17]", 3391527151], - [5288, 5, 787, "Metrics/MethodLength: Method has too many lines. [18/10]", 3391527151], - [5312, 5, 705, "Metrics/MethodLength: Method has too many lines. [13/10]", 2629923275], - [5339, 5, 547, "Metrics/MethodLength: Method has too many lines. [12/10]", 1911190850], - [5364, 5, 1516, "Metrics/AbcSize: Assignment Branch Condition size for `review_projected_child_groups` is too high. [<11, 21, 9> 25.36/17]", 3333110579], - [5364, 5, 1516, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `review_projected_child_groups` is too high. [8/7]", 3333110579], - [5364, 5, 1516, "Metrics/MethodLength: Method has too many lines. [39/10]", 3333110579], - [5364, 5, 1516, "Metrics/PerceivedComplexity: Perceived complexity for `review_projected_child_groups` is too high. [9/8]", 3333110579], - [5398, 7, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], - [5410, 5, 562, "Metrics/MethodLength: Method has too many lines. [14/10]", 3083915102], - [5429, 5, 1898, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_delegated_child_outputs` is too high. [<11, 21, 6> 24.45/17]", 2739722546], - [5429, 5, 1898, "Metrics/MethodLength: Method has too many lines. [49/10]", 2739722546], - [5484, 5, 942, "Metrics/AbcSize: Assignment Branch Condition size for `execute_nested_merge` is too high. [<3, 17, 6> 18.28/17]", 766157172], - [5484, 5, 942, "Metrics/MethodLength: Method has too many lines. [20/10]", 766157172], - [5484, 29, 144, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1404367793], - [5511, 5, 652, "Metrics/MethodLength: Method has too many lines. [13/10]", 2105803856], - [5530, 38, 140, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1682835820], - [5560, 5, 577, "Metrics/MethodLength: Method has too many lines. [12/10]", 2659610443], - [5629, 5, 569, "Metrics/MethodLength: Method has too many lines. [14/10]", 20616641], - [5657, 5, 772, "Metrics/AbcSize: Assignment Branch Condition size for `conformance_manifest_review_request_ids` is too high. [<7, 16, 8> 19.21/17]", 3577418475], - [5657, 5, 772, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `conformance_manifest_review_request_ids` is too high. [9/7]", 3577418475], - [5657, 5, 772, "Metrics/MethodLength: Method has too many lines. [14/10]", 3577418475], - [5657, 5, 772, "Metrics/PerceivedComplexity: Perceived complexity for `conformance_manifest_review_request_ids` is too high. [9/8]", 3577418475], - [5711, 5, 606, "Metrics/MethodLength: Method has too many lines. [11/10]", 2675086662], - [5726, 5, 562, "Metrics/MethodLength: Method has too many lines. [11/10]", 3811715870], - [5741, 5, 578, "Metrics/MethodLength: Method has too many lines. [11/10]", 1776197415], - [5756, 5, 1298, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_conformance_family_context` is too high. [<7, 28, 9> 30.23/17]", 4265202259], - [5756, 5, 1298, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `resolve_conformance_family_context` is too high. [10/7]", 4265202259], - [5756, 5, 1298, "Metrics/MethodLength: Method has too many lines. [23/10]", 4265202259], - [5756, 5, 1298, "Metrics/PerceivedComplexity: Perceived complexity for `resolve_conformance_family_context` is too high. [10/8]", 4265202259], - [5785, 5, 1994, "Metrics/AbcSize: Assignment Branch Condition size for `review_conformance_family_context` is too high. [<12, 24, 10> 28.64/17]", 2834851944], - [5785, 5, 1994, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `review_conformance_family_context` is too high. [10/7]", 2834851944], - [5785, 5, 1994, "Metrics/MethodLength: Method has too many lines. [41/10]", 2834851944], - [5785, 5, 1994, "Metrics/PerceivedComplexity: Perceived complexity for `review_conformance_family_context` is too high. [11/8]", 2834851944], - [5808, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 641612328], - [5845, 5, 1844, "Metrics/AbcSize: Assignment Branch Condition size for `select_conformance_case` is too high. [<2, 43, 14> 45.27/17]", 670673209], - [5845, 5, 1844, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `select_conformance_case` is too high. [14/7]", 670673209], - [5845, 5, 1844, "Metrics/MethodLength: Method has too many lines. [30/10]", 670673209], - [5845, 5, 1844, "Metrics/PerceivedComplexity: Perceived complexity for `select_conformance_case` is too high. [16/8]", 670673209], - [5850, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 2135503892], - [5852, 121, 41, "Layout/LineLength: Line is too long. [161/120]", 3932054828], - [5861, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 3169124957], - [5883, 5, 509, "Metrics/MethodLength: Method has too many lines. [11/10]", 3552283123], - [5972, 5, 4195, "Metrics/AbcSize: Assignment Branch Condition size for `review_conformance_manifest` is too high. [<37, 63, 16> 74.79/17]", 2166560528], - [5972, 5, 4195, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `review_conformance_manifest` is too high. [14/7]", 2166560528], - [5972, 5, 4195, "Metrics/MethodLength: Method has too many lines. [89/10]", 2166560528], - [5972, 5, 4195, "Metrics/PerceivedComplexity: Perceived complexity for `review_conformance_manifest` is too high. [17/8]", 2166560528], - [6037, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2746826653], - [6053, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 3035993839], - [6075, 5, 676, "Metrics/MethodLength: Method has too many lines. [15/10]", 3048335475], - [6098, 5, 1054, "Metrics/AbcSize: Assignment Branch Condition size for `plan_conformance_suite` is too high. [<11, 18, 8> 22.56/17]", 1855254788], - [6098, 5, 1054, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `plan_conformance_suite` is too high. [8/7]", 1855254788], - [6098, 5, 1054, "Metrics/MethodLength: Method has too many lines. [25/10]", 1855254788], - [6098, 31, 84, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 172854173], - [6163, 5, 1274, "Metrics/AbcSize: Assignment Branch Condition size for `plan_named_conformance_suites_with_diagnostics` is too high. [<11, 21, 7> 24.72/17]", 3991300730], - [6163, 5, 1274, "Metrics/MethodLength: Method has too many lines. [27/10]", 3991300730], - [6190, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 3035993839], - [6255, 5, 2071, "Metrics/AbcSize: Assignment Branch Condition size for `review_decision_for_family_context` is too high. [<7, 22, 16> 28.09/17]", 4245377184], - [6255, 5, 2071, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `review_decision_for_family_context` is too high. [12/7]", 4245377184], - [6255, 5, 2071, "Metrics/MethodLength: Method has too many lines. [46/10]", 4245377184], - [6255, 5, 2071, "Metrics/PerceivedComplexity: Perceived complexity for `review_decision_for_family_context` is too high. [12/8]", 4245377184], - [6260, 7, 1766, "Metrics/BlockLength: Block has too many lines. [40/25]", 65448241], - [6312, 5, 686, "Metrics/MethodLength: Method has too many lines. [13/10]", 4030291682] - ], - "lib/ast/merge/ast_node.rb:2037773320": [ - [44, 5, 7086, "Metrics/ClassLength: Class has too many lines. [114/100]", 201314721], - [220, 11, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183] - ], - "lib/ast/merge/comment/attachment.rb:2388154769": [ - [42, 23, 180, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3775370530], - [75, 24, 2, "Lint/SafeNavigationConsistency: Use `.` instead of unnecessary `&.`.", 5858765], - [81, 25, 2, "Lint/SafeNavigationConsistency: Use `.` instead of unnecessary `&.`.", 5858765], - [114, 9, 410, "Metrics/AbcSize: Assignment Branch Condition size for `inspect` is too high. [<1, 17, 4> 17.49/17]", 605978105], - [115, 32, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] - ], - "lib/ast/merge/comment/augmenter.rb:633395157": [ - [12, 7, 13967, "Metrics/ClassLength: Class has too many lines. [291/100]", 2806660144], - [33, 9, 721, "Metrics/MethodLength: Method has too many lines. [16/10]", 200402816], - [33, 23, 91, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2938734913], - [64, 9, 1335, "Metrics/AbcSize: Assignment Branch Condition size for `build!` is too high. [<12, 29, 6> 31.95/17]", 3904283188], - [64, 9, 1335, "Metrics/MethodLength: Method has too many lines. [22/10]", 3904283188], - [94, 9, 867, "Metrics/AbcSize: Assignment Branch Condition size for `infer_leading_comments` is too high. [<8, 19, 14> 24.92/17]", 1941464872], - [94, 9, 867, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_leading_comments` is too high. [11/7]", 1941464872], - [94, 9, 867, "Metrics/MethodLength: Method has too many lines. [20/10]", 1941464872], - [94, 9, 867, "Metrics/PerceivedComplexity: Perceived complexity for `infer_leading_comments` is too high. [12/8]", 1941464872], - [122, 9, 429, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_inline_comments` is too high. [8/7]", 2688935834], - [133, 9, 934, "Metrics/AbcSize: Assignment Branch Condition size for `infer_trailing_comments` is too high. [<8, 21, 18> 28.79/17]", 1551855281], - [133, 9, 934, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_trailing_comments` is too high. [15/7]", 1551855281], - [133, 9, 934, "Metrics/MethodLength: Method has too many lines. [20/10]", 1551855281], - [133, 9, 934, "Metrics/PerceivedComplexity: Perceived complexity for `infer_trailing_comments` is too high. [15/8]", 1551855281], - [160, 9, 488, "Metrics/AbcSize: Assignment Branch Condition size for `infer_postlude!` is too high. [<5, 17, 8> 19.44/17]", 2562637949], - [160, 9, 488, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_postlude!` is too high. [8/7]", 2562637949], - [173, 9, 1529, "Metrics/AbcSize: Assignment Branch Condition size for `infer_remaining_regions!` is too high. [<12, 27, 23> 37.44/17]", 3911657050], - [173, 9, 1529, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_remaining_regions!` is too high. [18/7]", 3911657050], - [173, 9, 1529, "Metrics/MethodLength: Method has too many lines. [28/10]", 3911657050], - [173, 9, 1529, "Metrics/PerceivedComplexity: Perceived complexity for `infer_remaining_regions!` is too high. [20/8]", 3911657050], - [216, 9, 507, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split_preamble_group` is too high. [8/7]", 336784898], - [231, 9, 588, "Metrics/MethodLength: Method has too many lines. [17/10]", 3445626532], - [274, 9, 965, "Metrics/AbcSize: Assignment Branch Condition size for `build_region` is too high. [<6, 17, 7> 19.34/17]", 344809006], - [274, 9, 965, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_region` is too high. [8/7]", 344809006], - [274, 9, 965, "Metrics/MethodLength: Method has too many lines. [24/10]", 344809006] - ], - "lib/ast/merge/comment/block.rb:3806757604": [ - [31, 7, 6754, "Metrics/ClassLength: Class has too many lines. [106/100]", 2308582303], - [57, 9, 1059, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<12, 13, 14> 22.56/17]", 2656171724], - [57, 9, 1059, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `initialize` is too high. [14/7]", 2656171724], - [57, 9, 1059, "Metrics/MethodLength: Method has too many lines. [21/10]", 2656171724], - [57, 9, 1059, "Metrics/PerceivedComplexity: Perceived complexity for `initialize` is too high. [15/8]", 2656171724], - [113, 9, 511, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `freeze_action` is too high. [9/7]", 55014877], - [113, 9, 511, "Metrics/MethodLength: Method has too many lines. [12/10]", 55014877], - [113, 9, 511, "Metrics/PerceivedComplexity: Perceived complexity for `freeze_action` is too high. [9/8]", 55014877], - [181, 9, 439, "Metrics/AbcSize: Assignment Branch Condition size for `first_meaningful_content` is too high. [<2, 16, 11> 19.52/17]", 680479883], - [181, 9, 439, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `first_meaningful_content` is too high. [11/7]", 680479883], - [181, 9, 439, "Metrics/PerceivedComplexity: Perceived complexity for `first_meaningful_content` is too high. [12/8]", 680479883], - [197, 9, 765, "Metrics/AbcSize: Assignment Branch Condition size for `extract_block_content` is too high. [<7, 24, 9> 26.57/17]", 621871624], - [197, 9, 765, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_block_content` is too high. [9/7]", 621871624], - [197, 9, 765, "Metrics/PerceivedComplexity: Perceived complexity for `extract_block_content` is too high. [9/8]", 621871624] - ], - "lib/ast/merge/comment/c_style_tracker_base.rb:1569556520": [ - [22, 7, 15053, "Metrics/ClassLength: Class has too many lines. [284/100]", 3599183270], - [83, 9, 509, "Metrics/MethodLength: Method has too many lines. [11/10]", 1639553915], - [102, 9, 492, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `leading_comments_before` is too high. [8/7]", 3127043491], - [102, 9, 492, "Metrics/MethodLength: Method has too many lines. [11/10]", 3127043491], - [124, 9, 487, "Metrics/MethodLength: Method has too many lines. [11/10]", 1869933531], - [176, 9, 713, "Metrics/AbcSize: Assignment Branch Condition size for `trailing_comments_after` is too high. [<6, 12, 13> 18.68/17]", 543703521], - [176, 9, 713, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trailing_comments_after` is too high. [11/7]", 543703521], - [176, 9, 713, "Metrics/MethodLength: Method has too many lines. [14/10]", 543703521], - [176, 9, 713, "Metrics/PerceivedComplexity: Perceived complexity for `trailing_comments_after` is too high. [11/8]", 543703521], - [184, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177549], - [202, 9, 598, "Metrics/MethodLength: Method has too many lines. [12/10]", 1628921093], - [222, 9, 1271, "Metrics/MethodLength: Method has too many lines. [21/10]", 612335469], - [222, 35, 137, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1823300034], - [329, 35, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [348, 9, 2271, "Metrics/AbcSize: Assignment Branch Condition size for `extract_comments` is too high. [<17, 32, 13> 38.5/17]", 2751274968], - [348, 9, 2271, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_comments` is too high. [14/7]", 2751274968], - [348, 9, 2271, "Metrics/MethodLength: Method has too many lines. [59/10]", 2751274968], - [348, 9, 2271, "Metrics/PerceivedComplexity: Perceived complexity for `extract_comments` is too high. [14/8]", 2751274968], - [353, 11, 2045, "Metrics/BlockLength: Block has too many lines. [52/25]", 575665179], - [418, 9, 659, "Metrics/MethodLength: Method has too many lines. [15/10]", 177254901], - [439, 71, 4, "Lint/UnusedMethodArgument: Unused method argument - `line`.", 2087656651], - [439, 78, 8, "Lint/UnusedMethodArgument: Unused method argument - `line_num`.", 622661090] - ], - "lib/ast/merge/comment/hash_tracker_base.rb:861186417": [ - [32, 7, 19362, "Metrics/ClassLength: Class has too many lines. [221/100]", 1031055222], - [118, 9, 444, "Metrics/MethodLength: Method has too many lines. [11/10]", 3347260807], - [142, 9, 921, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `leading_comments_before` is too high. [8/7]", 415734636], - [142, 9, 921, "Metrics/MethodLength: Method has too many lines. [11/10]", 415734636], - [172, 9, 440, "Metrics/MethodLength: Method has too many lines. [11/10]", 2464474004], - [225, 9, 623, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trailing_comments_after` is too high. [10/7]", 543703521], - [225, 9, 623, "Metrics/MethodLength: Method has too many lines. [12/10]", 543703521], - [225, 9, 623, "Metrics/PerceivedComplexity: Perceived complexity for `trailing_comments_after` is too high. [10/8]", 543703521], - [249, 9, 551, "Metrics/MethodLength: Method has too many lines. [12/10]", 2783654570], - [278, 9, 1271, "Metrics/MethodLength: Method has too many lines. [21/10]", 612335469], - [278, 35, 137, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1823300034], - [374, 35, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [439, 9, 826, "Metrics/MethodLength: Method has too many lines. [12/10]", 1706632542] - ], - "lib/ast/merge/comment/parser.rb:2674748021": [ - [34, 7, 8372, "Metrics/ClassLength: Class has too many lines. [141/100]", 2541983664], - [84, 9, 357, "Metrics/MethodLength: Method has too many lines. [12/10]", 2265493710], - [104, 9, 545, "Metrics/AbcSize: Assignment Branch Condition size for `auto_detect_style` is too high. [<5, 17, 7> 19.05/17]", 868366444], - [104, 9, 545, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `auto_detect_style` is too high. [8/7]", 868366444], - [125, 9, 1650, "Metrics/AbcSize: Assignment Branch Condition size for `parse_line_comments` is too high. [<8, 28, 7> 29.95/17]", 1511562163], - [125, 9, 1650, "Metrics/MethodLength: Method has too many lines. [31/10]", 1511562163], - [176, 9, 2670, "Metrics/AbcSize: Assignment Branch Condition size for `parse_with_block_comments` is too high. [<15, 47, 15> 51.57/17]", 2963765048], - [176, 9, 2670, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_with_block_comments` is too high. [15/7]", 2963765048], - [176, 9, 2670, "Metrics/MethodLength: Method has too many lines. [47/10]", 2963765048], - [176, 9, 2670, "Metrics/PerceivedComplexity: Perceived complexity for `parse_with_block_comments` is too high. [16/8]", 2963765048], - [181, 11, 2390, "Metrics/BlockLength: Block has too many lines. [40/25]", 3720582340] - ], - "lib/ast/merge/comment/quoted_hash_line_parser.rb:2878420841": [ - [74, 9, 458, "Metrics/MethodLength: Method has too many lines. [11/10]", 1526360697], - [91, 9, 620, "Metrics/AbcSize: Assignment Branch Condition size for `inline_result` is too high. [<3, 16, 6> 17.35/17]", 2706755447], - [91, 9, 620, "Metrics/MethodLength: Method has too many lines. [14/10]", 2706755447] - ], - "lib/ast/merge/comment/region_merge_policy.rb:176745155": [ - [23, 23, 98, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1029631546], - [55, 9, 423, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `freeze_sensitive?` is too high. [8/7]", 4102661282], - [61, 41, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [61, 85, 2, "Lint/SafeNavigationConsistency: Use `.` instead of unnecessary `&.`.", 5858765], - [96, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3491399903] - ], - "lib/ast/merge/comment/style.rb:3045051983": [ - [27, 7, 9109, "Metrics/ClassLength: Class has too many lines. [143/100]", 131723516], - [142, 11, 911, "Metrics/MethodLength: Method has too many lines. [17/10]", 355862493], - [142, 23, 164, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 668558018], - [203, 23, 164, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 668558018] - ], - "lib/ast/merge/comment/tracked_hash_adapter.rb:3235547929": [ - [99, 11, 553, "Metrics/AbcSize: Assignment Branch Condition size for `line_text_from` is too high. [<4, 20, 4> 20.78/17]", 2680273536], - [99, 11, 553, "Metrics/MethodLength: Method has too many lines. [13/10]", 2680273536] - ], - "lib/ast/merge/composite_match_refiner.rb:1718969703": [ - [58, 7, 668, "Metrics/MethodLength: Method has too many lines. [14/10]", 2649148714] - ], - "lib/ast/merge/conflict_resolver_base.rb:765343263": [ - [69, 5, 14959, "Metrics/ClassLength: Class has too many lines. [170/100]", 633092728], - [156, 7, 919, "Metrics/MethodLength: Method has too many lines. [13/10]", 1701319380], - [156, 21, 200, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3369976202], - [367, 7, 972, "Metrics/MethodLength: Method has too many lines. [22/10]", 2870739148], - [434, 47, 13, "Style/NumericPredicate: Use `recursive.positive?` instead of `recursive > 0`.", 462999281], - [436, 99, 14, "Style/NumericPredicate: Use `recursive.zero?` instead of `recursive == 0`.", 2394069519] - ], - "lib/ast/merge/content_match_refiner.rb:3628272158": [ - [47, 5, 7719, "Metrics/ClassLength: Class has too many lines. [108/100]", 651494487], - [87, 7, 750, "Metrics/MethodLength: Method has too many lines. [17/10]", 3624290009], - [165, 37, 48, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 953994744], - [232, 7, 846, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<13, 29, 8> 32.77/17]", 3597737347], - [232, 7, 846, "Metrics/MethodLength: Method has too many lines. [20/10]", 3597737347] - ], - "lib/ast/merge/debug_logger.rb:1783610128": [ - [72, 5, 7614, "Metrics/ModuleLength: Module has too many lines. [118/100]", 736598454], - [85, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 941621], - [206, 7, 584, "Metrics/AbcSize: Assignment Branch Condition size for `time` is too high. [<3, 17, 2> 17.38/17]", 3468868523], - [206, 7, 584, "Metrics/MethodLength: Method has too many lines. [14/10]", 3468868523], - [269, 7, 450, "Metrics/PerceivedComplexity: Perceived complexity for `extract_lines` is too high. [9/8]", 680738666], - [287, 7, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631] - ], - "lib/ast/merge/detector/base.rb:343830240": [ - [175, 25, 73, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2991095115] - ], - "lib/ast/merge/detector/fenced_code_block.rb:3555142063": [ - [36, 7, 6302, "Metrics/ClassLength: Class has too many lines. [116/100]", 852968953], - [71, 9, 2492, "Metrics/AbcSize: Assignment Branch Condition size for `detect_all` is too high. [<31, 28, 12> 43.46/17]", 3575218793], - [71, 9, 2492, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_all` is too high. [11/7]", 3575218793], - [71, 9, 2492, "Metrics/MethodLength: Method has too many lines. [54/10]", 3575218793], - [71, 9, 2492, "Metrics/PerceivedComplexity: Perceived complexity for `detect_all` is too high. [13/8]", 3575218793], - [84, 11, 2060, "Metrics/BlockLength: Block has too many lines. [41/25]", 1744553779] - ], - "lib/ast/merge/detector/mergeable.rb:354817747": [ - [54, 7, 11933, "Metrics/ModuleLength: Module has too many lines. [140/100]", 1453034870], - [162, 9, 601, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_region_configs` is too high. [8/7]", 1278024890], - [162, 9, 601, "Metrics/MethodLength: Method has too many lines. [16/10]", 1278024890], - [189, 9, 1054, "Metrics/AbcSize: Assignment Branch Condition size for `extract_regions` is too high. [<11, 16, 3> 19.65/17]", 663241096], - [189, 9, 1054, "Metrics/MethodLength: Method has too many lines. [20/10]", 663241096], - [285, 9, 1005, "Metrics/AbcSize: Assignment Branch Condition size for `merge_and_substitute_regions` is too high. [<16, 19, 4> 25.16/17]", 4123525156], - [285, 9, 1005, "Metrics/MethodLength: Method has too many lines. [16/10]", 4123525156], - [318, 9, 1369, "Metrics/AbcSize: Assignment Branch Condition size for `merge_region` is too high. [<11, 20, 14> 26.78/17]", 746321843], - [318, 9, 1369, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_region` is too high. [15/7]", 746321843], - [318, 9, 1369, "Metrics/MethodLength: Method has too many lines. [16/10]", 746321843], - [318, 9, 1369, "Metrics/PerceivedComplexity: Perceived complexity for `merge_region` is too high. [15/8]", 746321843] - ], - "lib/ast/merge/detector/toml_frontmatter.rb:3255696517": [ - [50, 9, 892, "Metrics/MethodLength: Method has too many lines. [20/10]", 3132005303] - ], - "lib/ast/merge/detector/yaml_frontmatter.rb:2551474823": [ - [49, 9, 958, "Metrics/MethodLength: Method has too many lines. [20/10]", 3132005303] - ], - "lib/ast/merge/diff_mapper_base.rb:3204989377": [ - [22, 5, 7793, "Metrics/ClassLength: Class has too many lines. [141/100]", 2217731166], - [80, 7, 2598, "Metrics/AbcSize: Assignment Branch Condition size for `parse_diff` is too high. [<21, 31, 15> 40.34/17]", 939898835], - [80, 7, 2598, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_diff` is too high. [16/7]", 939898835], - [80, 7, 2598, "Metrics/MethodLength: Method has too many lines. [65/10]", 939898835], - [80, 7, 2598, "Metrics/PerceivedComplexity: Perceived complexity for `parse_diff` is too high. [12/8]", 939898835], - [90, 9, 2162, "Metrics/BlockLength: Block has too many lines. [50/25]", 3403609416], - [169, 7, 394, "Metrics/MethodLength: Method has too many lines. [11/10]", 2028641628] - ], - "lib/ast/merge/emitter_base.rb:655463559": [ - [26, 5, 14449, "Metrics/ClassLength: Class has too many lines. [226/100]", 2015391034], - [95, 7, 653, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_comment_region` is too high. [9/7]", 24580929], - [95, 7, 653, "Metrics/MethodLength: Method has too many lines. [12/10]", 24580929], - [95, 7, 653, "Metrics/PerceivedComplexity: Perceived complexity for `emit_comment_region` is too high. [9/8]", 24580929], - [120, 7, 1311, "Metrics/AbcSize: Assignment Branch Condition size for `emit_comment_attachment` is too high. [<5, 25, 16> 30.1/17]", 964928813], - [120, 7, 1311, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_comment_attachment` is too high. [17/7]", 964928813], - [120, 7, 1311, "Metrics/MethodLength: Method has too many lines. [17/10]", 964928813], - [120, 7, 1311, "Metrics/PerceivedComplexity: Perceived complexity for `emit_comment_attachment` is too high. [17/8]", 964928813], - [120, 34, 127, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 628879795], - [152, 7, 984, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_layout_gap` is too high. [8/7]", 1954418889], - [152, 7, 984, "Metrics/MethodLength: Method has too many lines. [13/10]", 1954418889], - [152, 7, 984, "Metrics/PerceivedComplexity: Perceived complexity for `emit_layout_gap` is too high. [9/8]", 1954418889], - [152, 26, 136, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3839882587], - [183, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861198], - [184, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087656651], - [186, 7, 1307, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_layout_attachment` is too high. [9/7]", 708408665], - [186, 7, 1307, "Metrics/MethodLength: Method has too many lines. [26/10]", 708408665], - [186, 7, 1307, "Metrics/PerceivedComplexity: Perceived complexity for `emit_layout_attachment` is too high. [9/8]", 708408665], - [186, 33, 218, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1552587384], - [187, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 1763090185], - [189, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1371312610], - [256, 31, 17, "Style/NumericPredicate: Use `@indent_level.positive?` instead of `@indent_level > 0`.", 1892475678], - [302, 56, 12, "Lint/UnusedMethodArgument: Unused method argument - `current_line`. You can also write as `inline_comment_region_target_column(*)` if you want the method to accept any arguments but don't care about them.", 2091263933], - [306, 42, 6, "Lint/UnusedMethodArgument: Unused method argument - `region`.", 2124512157], - [306, 51, 13, "Lint/UnusedMethodArgument: Unused method argument - `target_column`.", 3246375805], - [321, 7, 1141, "Metrics/AbcSize: Assignment Branch Condition size for `inline_comment_node_text` is too high. [<6, 29, 8> 30.68/17]", 2583471562], - [321, 7, 1141, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `inline_comment_node_text` is too high. [9/7]", 2583471562], - [321, 7, 1141, "Metrics/MethodLength: Method has too many lines. [22/10]", 2583471562], - [321, 7, 1141, "Metrics/PerceivedComplexity: Perceived complexity for `inline_comment_node_text` is too high. [9/8]", 2583471562], - [339, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861626], - [350, 7, 510, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_region_gap_lines` is too high. [8/7]", 1999747697], - [350, 7, 510, "Metrics/PerceivedComplexity: Perceived complexity for `emit_region_gap_lines` is too high. [9/8]", 1999747697] - ], - "lib/ast/merge/emitter_line_metadata_support.rb:3153033769": [ - [5, 5, 33, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::EmitterLineMetadataSupport`.", 2926748997], - [23, 7, 541, "Metrics/MethodLength: Method has too many lines. [12/10]", 2407359355] - ], - "lib/ast/merge/file_aligner_base.rb:4032045257": [ - [13, 5, 7473, "Metrics/ClassLength: Class has too many lines. [187/100]", 1391880441], - [27, 7, 2244, "Metrics/AbcSize: Assignment Branch Condition size for `align` is too high. [<19, 37, 12> 43.29/17]", 1243937217], - [27, 7, 2244, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `align` is too high. [12/7]", 1243937217], - [27, 7, 2244, "Metrics/MethodLength: Method has too many lines. [55/10]", 1243937217], - [27, 7, 2244, "Metrics/PerceivedComplexity: Perceived complexity for `align` is too high. [12/8]", 1243937217], - [148, 7, 655, "Metrics/MethodLength: Method has too many lines. [14/10]", 2468821688], - [180, 7, 455, "Metrics/MethodLength: Method has too many lines. [13/10]", 2361153066], - [199, 7, 1557, "Metrics/AbcSize: Assignment Branch Condition size for `apply_match_refiner!` is too high. [<10, 28, 12> 32.06/17]", 2386945712], - [199, 7, 1557, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_match_refiner!` is too high. [13/7]", 2386945712], - [199, 7, 1557, "Metrics/MethodLength: Method has too many lines. [31/10]", 2386945712], - [199, 7, 1557, "Metrics/PerceivedComplexity: Perceived complexity for `apply_match_refiner!` is too high. [13/8]", 2386945712] - ], - "lib/ast/merge/file_analyzable.rb:607555963": [ - [36, 5, 31229, "Metrics/ModuleLength: Module has too many lines. [316/100]", 1247752256], - [99, 19, 9, "Style/NumericPredicate: Use `index.negative?` instead of `index < 0`.", 4215255415], - [148, 7, 793, "Metrics/MethodLength: Method has too many lines. [22/10]", 1467470910], - [202, 7, 771, "Metrics/MethodLength: Method has too many lines. [16/10]", 1412317163], - [344, 7, 844, "Metrics/MethodLength: Method has too many lines. [12/10]", 2335919661], - [369, 7, 730, "Metrics/MethodLength: Method has too many lines. [11/10]", 1047958652], - [431, 7, 863, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_layout_owned_comment_attachment` is too high. [<0, 20, 4> 20.4/17]", 3284843691], - [431, 7, 863, "Metrics/MethodLength: Method has too many lines. [17/10]", 3284843691], - [481, 7, 683, "Metrics/MethodLength: Method has too many lines. [15/10]", 241044926], - [520, 14, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [614, 7, 6095, "Metrics/AbcSize: Assignment Branch Condition size for `generate_signature` is too high. [<4, 21, 13> 25.02/17]", 2828809875], - [614, 7, 6095, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `generate_signature` is too high. [11/7]", 2828809875], - [614, 7, 6095, "Metrics/MethodLength: Method has too many lines. [30/10]", 2828809875], - [614, 7, 6095, "Metrics/PerceivedComplexity: Perceived complexity for `generate_signature` is too high. [14/8]", 2828809875], - [676, 24, 390, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 3279112483] - ], - "lib/ast/merge/freeze_node_base.rb:2110274026": [ - [59, 5, 14572, "Metrics/ClassLength: Class has too many lines. [171/100]", 3038607603], - [108, 25, 545, "Style/MutableConstant: Freeze mutable objects assigned to constants.", 2366014160], - [186, 9, 1100, "Metrics/MethodLength: Method has too many lines. [15/10]", 2506841532], - [288, 7, 758, "Metrics/MethodLength: Method has too many lines. [11/10]", 136868205], - [288, 21, 276, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 1720059801], - [335, 7, 660, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `reason` is too high. [8/7]", 3127566048], - [418, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] - ], - "lib/ast/merge/healer.rb:3642412735": [ - [18, 7, 588, "Metrics/MethodLength: Method has too many lines. [15/10]", 3172269921], - [18, 17, 84, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1781025196], - [41, 7, 687, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `filter_items` is too high. [8/7]", 1200842691], - [41, 7, 687, "Metrics/MethodLength: Method has too many lines. [17/10]", 1200842691], - [41, 7, 687, "Metrics/PerceivedComplexity: Perceived complexity for `filter_items` is too high. [9/8]", 1200842691], - [41, 23, 130, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 33939503] - ], - "lib/ast/merge/jaccard_similarity.rb:678558736": [ - [87, 19, 1, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 177604], - [87, 22, 1, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 177607] - ], - "lib/ast/merge/key_path_partial_template_merger_base.rb:1818613864": [ - [22, 5, 6114, "Metrics/ClassLength: Class has too many lines. [155/100]", 1269962119], - [43, 21, 214, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 3637591635], - [68, 7, 489, "Metrics/MethodLength: Method has too many lines. [12/10]", 3170411580], - [118, 7, 640, "Metrics/AbcSize: Assignment Branch Condition size for `find_key_path` is too high. [<8, 14, 10> 18.97/17]", 2613403604], - [118, 7, 640, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_key_path` is too high. [8/7]", 2613403604], - [118, 7, 640, "Metrics/MethodLength: Method has too many lines. [16/10]", 2613403604], - [118, 7, 640, "Metrics/PerceivedComplexity: Perceived complexity for `find_key_path` is too high. [9/8]", 2613403604], - [140, 7, 536, "Metrics/MethodLength: Method has too many lines. [17/10]", 3598062652], - [168, 7, 804, "Metrics/MethodLength: Method has too many lines. [19/10]", 2773364183] - ], - "lib/ast/merge/layout.rb:3670500101": [ - [23, 36, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] - ], - "lib/ast/merge/layout/augmenter.rb:2556116722": [ - [8, 7, 5498, "Metrics/ClassLength: Class has too many lines. [129/100]", 3693754698], - [21, 23, 125, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 3395039982], - [53, 9, 1795, "Metrics/AbcSize: Assignment Branch Condition size for `build!` is too high. [<20, 32, 17> 41.39/17]", 3542913254], - [53, 9, 1795, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build!` is too high. [15/7]", 3542913254], - [53, 9, 1795, "Metrics/MethodLength: Method has too many lines. [43/10]", 3542913254], - [53, 9, 1795, "Metrics/PerceivedComplexity: Perceived complexity for `build!` is too high. [15/8]", 3542913254], - [58, 11, 1227, "Metrics/BlockLength: Block has too many lines. [29/25]", 55360131], - [105, 9, 504, "Metrics/MethodLength: Method has too many lines. [16/10]", 1953725517] - ], - "lib/ast/merge/layout/gap.rb:1678106201": [ - [11, 7, 7558, "Metrics/ClassLength: Class has too many lines. [151/100]", 2254377349], - [23, 9, 655, "Metrics/MethodLength: Method has too many lines. [11/10]", 3584854768], - [23, 23, 146, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 361396001], - [157, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859545], - [162, 9, 303, "Metrics/MethodLength: Method has too many lines. [12/10]", 2236444774], - [203, 9, 688, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_adjacency!` is too high. [10/7]", 1112786311], - [203, 9, 688, "Metrics/MethodLength: Method has too many lines. [13/10]", 1112786311] - ], - "lib/ast/merge/match_refiner_base.rb:1760054866": [ - [248, 7, 503, "Metrics/MethodLength: Method has too many lines. [11/10]", 2844230268], - [275, 7, 1056, "Metrics/AbcSize: Assignment Branch Condition size for `greedy_match` is too high. [<9, 24, 8> 26.85/17]", 2497617815], - [275, 7, 1056, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `greedy_match` is too high. [8/7]", 2497617815], - [275, 7, 1056, "Metrics/MethodLength: Method has too many lines. [24/10]", 2497617815] - ], - "lib/ast/merge/merge_result_base.rb:764500297": [ - [17, 5, 18646, "Metrics/ClassLength: Class has too many lines. [335/100]", 314460772], - [88, 21, 187, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1067369198], - [187, 7, 843, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_blank_line_runs!` is too high. [<12, 12, 10> 19.7/17]", 2347011594], - [187, 7, 843, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_blank_line_runs!` is too high. [9/7]", 2347011594], - [187, 7, 843, "Metrics/MethodLength: Method has too many lines. [22/10]", 2347011594], - [187, 7, 843, "Metrics/PerceivedComplexity: Perceived complexity for `normalize_blank_line_runs!` is too high. [10/8]", 2347011594], - [227, 7, 1004, "Metrics/MethodLength: Method has too many lines. [21/10]", 59539336], - [227, 35, 211, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 709487711], - [266, 7, 602, "Metrics/MethodLength: Method has too many lines. [13/10]", 320027623], - [341, 7, 927, "Metrics/AbcSize: Assignment Branch Condition size for `validate_review_state_compatibility!` is too high. [<8, 15, 4> 17.46/17]", 1596840080], - [341, 7, 927, "Metrics/MethodLength: Method has too many lines. [16/10]", 1596840080], - [403, 7, 936, "Metrics/AbcSize: Assignment Branch Condition size for `review_state_metadata` is too high. [<7, 18, 4> 19.72/17]", 4128292066], - [403, 7, 936, "Metrics/MethodLength: Method has too many lines. [14/10]", 4128292066], - [413, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 20421901], - [438, 7, 1194, "Metrics/MethodLength: Method has too many lines. [21/10]", 4289697646], - [448, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3342583337] - ], - "lib/ast/merge/merger_config.rb:3582657829": [ - [46, 5, 10581, "Metrics/ClassLength: Class has too many lines. [148/100]", 1598770872], - [96, 21, 234, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 720509970] - ], - "lib/ast/merge/navigable/injection_point_finder.rb:4117743218": [ - [45, 9, 1707, "Metrics/AbcSize: Assignment Branch Condition size for `find` is too high. [<9, 18, 17> 26.34/17]", 1445381162], - [45, 9, 1707, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find` is too high. [15/7]", 1445381162], - [45, 9, 1707, "Metrics/MethodLength: Method has too many lines. [28/10]", 1445381162], - [45, 9, 1707, "Metrics/PerceivedComplexity: Perceived complexity for `find` is too high. [16/8]", 1445381162], - [45, 17, 156, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 3876813166] - ], - "lib/ast/merge/navigable/statement.rb:3050515622": [ - [42, 7, 11078, "Metrics/ClassLength: Class has too many lines. [179/100]", 2550894515], - [96, 11, 550, "Metrics/AbcSize: Assignment Branch Condition size for `find_matching` is too high. [<7, 16, 12> 21.19/17]", 3492534565], - [96, 11, 550, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_matching` is too high. [12/7]", 3492534565], - [96, 11, 550, "Metrics/PerceivedComplexity: Perceived complexity for `find_matching` is too high. [12/8]", 3492534565], - [222, 13, 20, "Naming/PredicatePrefix: Rename `has_tree_navigation?` to `tree_navigation?`.", 733442156] - ], - "lib/ast/merge/node_typing.rb:4008165135": [ - [175, 9, 694, "Metrics/MethodLength: Method has too many lines. [12/10]", 777909930], - [213, 9, 891, "Metrics/AbcSize: Assignment Branch Condition size for `find_typing_callable` is too high. [<3, 23, 13> 26.59/17]", 3835052858], - [213, 9, 891, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_typing_callable` is too high. [14/7]", 3835052858], - [213, 9, 891, "Metrics/PerceivedComplexity: Perceived complexity for `find_typing_callable` is too high. [14/8]", 3835052858] - ], - "lib/ast/merge/node_wrapper_base.rb:3796877358": [ - [62, 5, 10228, "Metrics/ClassLength: Class has too many lines. [135/100]", 3832956007], - [92, 21, 81, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 4261369704] - ], - "lib/ast/merge/owner_selection.rb:2568070127": [ - [9, 7, 757, "Metrics/MethodLength: Method has too many lines. [13/10]", 2069564552] - ], - "lib/ast/merge/partial_template_merger_base.rb:2252899061": [ - [27, 5, 16780, "Metrics/ClassLength: Class has too many lines. [266/100]", 2205844189], - [48, 23, 81, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2112244807], - [106, 7, 757, "Metrics/MethodLength: Method has too many lines. [11/10]", 571708764], - [106, 21, 293, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 871709580], - [135, 7, 788, "Metrics/AbcSize: Assignment Branch Condition size for `merge` is too high. [<4, 19, 5> 20.05/17]", 467674580], - [135, 7, 788, "Metrics/MethodLength: Method has too many lines. [13/10]", 467674580], - [213, 7, 533, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_matcher` is too high. [<7, 20, 6> 22.02/17]", 1798972396], - [238, 7, 922, "Metrics/MethodLength: Method has too many lines. [25/10]", 1846154069], - [242, 25, 37, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 939456830], - [251, 25, 31, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 1024894473], - [268, 7, 1905, "Metrics/AbcSize: Assignment Branch Condition size for `perform_section_merge` is too high. [<13, 15, 2> 19.95/17]", 2711014340], - [268, 7, 1905, "Metrics/MethodLength: Method has too many lines. [34/10]", 2711014340], - [316, 50, 15, "Lint/UnusedMethodArgument: Unused method argument - `section_context`.", 2872123372], - [334, 7, 690, "Metrics/MethodLength: Method has too many lines. [14/10]", 1807124523], - [367, 7, 1122, "Metrics/AbcSize: Assignment Branch Condition size for `build_merged_content` is too high. [<1, 29, 14> 32.22/17]", 3938410418], - [367, 7, 1122, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_merged_content` is too high. [15/7]", 3938410418], - [367, 7, 1122, "Metrics/MethodLength: Method has too many lines. [18/10]", 3938410418], - [367, 7, 1122, "Metrics/PerceivedComplexity: Perceived complexity for `build_merged_content` is too high. [15/8]", 3938410418], - [397, 7, 596, "Metrics/MethodLength: Method has too many lines. [12/10]", 2602121883], - [397, 32, 144, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1463491208], - [414, 7, 1589, "Metrics/AbcSize: Assignment Branch Condition size for `source_splice_plan_for` is too high. [<6, 18, 9> 21/17]", 2889667289], - [414, 7, 1589, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `source_splice_plan_for` is too high. [9/7]", 2889667289], - [414, 7, 1589, "Metrics/MethodLength: Method has too many lines. [30/10]", 2889667289], - [414, 7, 1589, "Metrics/PerceivedComplexity: Perceived complexity for `source_splice_plan_for` is too high. [9/8]", 2889667289] - ], - "lib/ast/merge/recipe/config.rb:3990762705": [ - [54, 7, 14970, "Metrics/ClassLength: Class has too many lines. [296/100]", 2492031021], - [142, 9, 673, "Metrics/MethodLength: Method has too many lines. [12/10]", 3011978845], - [170, 9, 484, "Metrics/MethodLength: Method has too many lines. [15/10]", 183356432], - [246, 9, 710, "Metrics/AbcSize: Assignment Branch Condition size for `parse_injection` is too high. [<8, 13, 8> 17.23/17]", 641239814], - [246, 9, 710, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_injection` is too high. [9/7]", 641239814], - [246, 9, 710, "Metrics/MethodLength: Method has too many lines. [16/10]", 641239814], - [246, 9, 710, "Metrics/PerceivedComplexity: Perceived complexity for `parse_injection` is too high. [9/8]", 641239814], - [278, 9, 871, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_step` is too high. [8/7]", 3989307721], - [278, 9, 871, "Metrics/MethodLength: Method has too many lines. [20/10]", 3989307721], - [338, 9, 1758, "Metrics/AbcSize: Assignment Branch Condition size for `parse_step_merge_overrides` is too high. [<11, 43, 25> 50.94/17]", 806370438], - [338, 9, 1758, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_step_merge_overrides` is too high. [22/7]", 806370438], - [338, 9, 1758, "Metrics/MethodLength: Method has too many lines. [30/10]", 806370438], - [338, 9, 1758, "Metrics/PerceivedComplexity: Perceived complexity for `parse_step_merge_overrides` is too high. [22/8]", 806370438], - [373, 9, 566, "Metrics/MethodLength: Method has too many lines. [14/10]", 3671206955], - [391, 9, 547, "Metrics/MethodLength: Method has too many lines. [16/10]", 3273587697], - [459, 9, 799, "Metrics/AbcSize: Assignment Branch Condition size for `validate_injection!` is too high. [<2, 15, 12> 19.31/17]", 1665903587], - [459, 9, 799, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_injection!` is too high. [13/7]", 1665903587], - [459, 9, 799, "Metrics/MethodLength: Method has too many lines. [11/10]", 1665903587], - [459, 9, 799, "Metrics/PerceivedComplexity: Perceived complexity for `validate_injection!` is too high. [13/8]", 1665903587] - ], - "lib/ast/merge/recipe/preset.rb:2311326866": [ - [195, 9, 662, "Metrics/MethodLength: Method has too many lines. [12/10]", 1640897447] - ], - "lib/ast/merge/recipe/runner.rb:2243867806": [ - [27, 7, 28612, "Metrics/ClassLength: Class has too many lines. [547/100]", 79000832], - [73, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1411864995], - [77, 23, 136, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1636278032], - [92, 9, 849, "Metrics/MethodLength: Method has too many lines. [14/10]", 3083064345], - [128, 24, 129, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2642826282], - [210, 9, 788, "Metrics/MethodLength: Method has too many lines. [23/10]", 743008161], - [241, 9, 3397, "Metrics/AbcSize: Assignment Branch Condition size for `create_partial_template_merger` is too high. [<3, 52, 16> 54.49/17]", 2086180075], - [241, 9, 3397, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `create_partial_template_merger` is too high. [14/7]", 2086180075], - [241, 9, 3397, "Metrics/MethodLength: Method has too many lines. [63/10]", 2086180075], - [241, 9, 3397, "Metrics/PerceivedComplexity: Perceived complexity for `create_partial_template_merger` is too high. [13/8]", 2086180075], - [250, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2857356312], - [274, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177538], - [312, 9, 2210, "Metrics/AbcSize: Assignment Branch Condition size for `create_smart_merger` is too high. [<1, 39, 7> 39.64/17]", 1694660188], - [312, 9, 2210, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `create_smart_merger` is too high. [8/7]", 1694660188], - [312, 9, 2210, "Metrics/MethodLength: Method has too many lines. [45/10]", 1694660188], - [357, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 195423462], - [370, 9, 1087, "Metrics/MethodLength: Method has too many lines. [24/10]", 3850049530], - [370, 31, 124, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3466458723], - [401, 9, 1008, "Metrics/MethodLength: Method has too many lines. [19/10]", 2010895303], - [401, 25, 143, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2360959504], - [424, 9, 1263, "Metrics/AbcSize: Assignment Branch Condition size for `execute_partial_merge_step` is too high. [<3, 22, 1> 22.23/17]", 2850918453], - [424, 9, 1263, "Metrics/MethodLength: Method has too many lines. [25/10]", 2850918453], - [453, 9, 835, "Metrics/MethodLength: Method has too many lines. [14/10]", 1478843287], - [471, 9, 808, "Metrics/MethodLength: Method has too many lines. [15/10]", 1127254660], - [471, 37, 155, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 838578768], - [491, 9, 1126, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_smart_merge_result` is too high. [<8, 17, 12> 22.29/17]", 1786697339], - [491, 9, 1126, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_smart_merge_result` is too high. [9/7]", 1786697339], - [491, 9, 1126, "Metrics/MethodLength: Method has too many lines. [23/10]", 1786697339], - [491, 9, 1126, "Metrics/PerceivedComplexity: Perceived complexity for `normalize_smart_merge_result` is too high. [11/8]", 1786697339], - [518, 9, 2523, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_script_step_result` is too high. [<5, 40, 32> 51.47/17]", 2162420067], - [518, 9, 2523, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_script_step_result` is too high. [26/7]", 2162420067], - [518, 9, 2523, "Metrics/MethodLength: Method has too many lines. [48/10]", 2162420067], - [518, 9, 2523, "Metrics/PerceivedComplexity: Perceived complexity for `normalize_script_step_result` is too high. [29/8]", 2162420067], - [547, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 93872446], - [556, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 1527250939], - [586, 11, 155, "Style/HashTransformKeys: Prefer `transform_keys` over `each_with_object`.", 837503672], - [591, 9, 698, "Metrics/MethodLength: Method has too many lines. [11/10]", 1116310304], - [635, 9, 2582, "Metrics/AbcSize: Assignment Branch Condition size for `create_result_from_steps` is too high. [<8, 30, 31> 43.87/17]", 2040042265], - [635, 9, 2582, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `create_result_from_steps` is too high. [23/7]", 2040042265], - [635, 9, 2582, "Metrics/MethodLength: Method has too many lines. [60/10]", 2040042265], - [635, 9, 2582, "Metrics/PerceivedComplexity: Perceived complexity for `create_result_from_steps` is too high. [27/8]", 2040042265], - [635, 37, 133, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 789257106], - [649, 42, 40, "Style/SymbolProc: Pass `&:has_anchor` as an argument to `any?` instead of a block.", 4233626321] - ], - "lib/ast/merge/recipe/script_loader.rb:1397873218": [ - [145, 9, 1126, "Metrics/AbcSize: Assignment Branch Condition size for `load_script_file` is too high. [<6, 19, 4> 20.32/17]", 3417625171], - [145, 9, 1126, "Metrics/MethodLength: Method has too many lines. [17/10]", 3417625171] - ], - "lib/ast/merge/rspec/comment_behavior_matrix_adapters.rb:3429217018": [ - [9, 46, 341, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 532439002], - [31, 9, 901, "Metrics/MethodLength: Method has too many lines. [11/10]", 584608092], - [31, 59, 308, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 883491898], - [54, 9, 1269, "Metrics/MethodLength: Method has too many lines. [20/10]", 1021031182], - [65, 51, 6, "Lint/UnusedBlockArgument: Unused block argument - `inline`. If it's necessary, use `_` or `_inline` as an argument name to indicate that it won't be used.", 1605470060], - [69, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 4226982364], - [70, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1440420861] - ], - "lib/ast/merge/rspec/dependency_tags_config.rb:3604516304": [ - [30, 1, 2102, "Metrics/BlockLength: Block has too many lines. [26/25]", 113766065] - ], - "lib/ast/merge/rspec/merge_gem_registry.rb:3009576030": [ - [58, 7, 12129, "Metrics/ModuleLength: Module has too many lines. [158/100]", 335549747], - [90, 9, 780, "Metrics/MethodLength: Method has too many lines. [14/10]", 978965737], - [90, 21, 99, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3580433546], - [118, 9, 650, "Metrics/MethodLength: Method has too many lines. [12/10]", 3143160805], - [118, 31, 130, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2575863904], - [143, 9, 823, "Metrics/MethodLength: Method has too many lines. [17/10]", 4033116153], - [200, 9, 765, "Metrics/AbcSize: Assignment Branch Condition size for `register_known_gems` is too high. [<3, 17, 3> 17.52/17]", 1367620151], - [200, 9, 765, "Metrics/MethodLength: Method has too many lines. [17/10]", 1367620151] - ], - "lib/ast/merge/rspec/shared_examples.rb:2878318351": [ - [29, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 330577472] - ], - "lib/ast/merge/rspec/shared_examples/comment_behavior_matrix.rb:3695671858": [ - [36, 1, 27847, "Metrics/BlockLength: Block has too many lines. [540/25]", 3796645407], - [38, 55, 15, "Style/SymbolProc: Pass `&:value` as an argument to `lambda` instead of a block.", 1808354951], - [42, 64, 23, "Style/SymbolProc: Pass `&:statements` as an argument to `lambda` instead of a block.", 277221641], - [69, 3, 4455, "Metrics/BlockLength: Block has too many lines. [82/25]", 3672334777], - [72, 5, 1763, "Metrics/BlockLength: Block has too many lines. [34/25]", 164750821], - [165, 3, 22093, "Metrics/BlockLength: Block has too many lines. [429/25]", 229312375], - [292, 5, 1918, "Metrics/BlockLength: Block has too many lines. [29/25]", 1312741055], - [323, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1902517440], - [325, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 173482512], - [328, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 167607404], - [476, 5, 1605, "Metrics/BlockLength: Block has too many lines. [35/25]", 1943633697], - [677, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1902517440] - ], - "lib/ast/merge/rspec/shared_examples/conflict_resolver_base.rb:624045197": [ - [30, 1, 7893, "Metrics/BlockLength: Block has too many lines. [197/25]", 3450672926], - [37, 3, 1372, "Metrics/BlockLength: Block has too many lines. [33/25]", 3389152504], - [83, 3, 1206, "Metrics/BlockLength: Block has too many lines. [35/25]", 1580202348], - [128, 3, 1177, "Metrics/BlockLength: Block has too many lines. [33/25]", 2178974049], - [215, 3, 2443, "Metrics/BlockLength: Block has too many lines. [51/25]", 2538475273], - [219, 5, 1909, "Metrics/BlockLength: Block has too many lines. [35/25]", 880175101], - [279, 1, 2518, "Metrics/BlockLength: Block has too many lines. [74/25]", 958151448], - [286, 3, 2235, "Metrics/BlockLength: Block has too many lines. [70/25]", 2123260684], - [391, 1, 1317, "Metrics/BlockLength: Block has too many lines. [37/25]", 2321517041], - [439, 1, 1639, "Metrics/BlockLength: Block has too many lines. [37/25]", 276150366] - ], - "lib/ast/merge/rspec/shared_examples/debug_logger.rb:2747003588": [ - [23, 1, 4741, "Metrics/BlockLength: Block has too many lines. [121/25]", 3341338388], - [47, 3, 976, "Metrics/BlockLength: Block has too many lines. [27/25]", 2640321404], - [85, 3, 1452, "Metrics/BlockLength: Block has too many lines. [34/25]", 554663062] - ], - "lib/ast/merge/rspec/shared_examples/feature_profile.rb:4172143324": [ - [30, 1, 4249, "Metrics/BlockLength: Block has too many lines. [53/25]", 3787230403] - ], - "lib/ast/merge/rspec/shared_examples/file_analyzable.rb:2391547213": [ - [44, 1, 6468, "Metrics/BlockLength: Block has too many lines. [145/25]", 3744642916] - ], - "lib/ast/merge/rspec/shared_examples/freeze_node_base.rb:1711126715": [ - [23, 1, 5952, "Metrics/BlockLength: Block has too many lines. [157/25]", 3152271039], - [29, 3, 2836, "Metrics/BlockLength: Block has too many lines. [69/25]", 2082270913], - [115, 3, 1552, "Metrics/BlockLength: Block has too many lines. [46/25]", 4180117745] - ], - "lib/ast/merge/rspec/shared_examples/layout_attachment.rb:4130619694": [ - [30, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 1263574869], - [31, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 4282300883] - ], - "lib/ast/merge/rspec/shared_examples/layout_augmenter.rb:1928277603": [ - [18, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1311107624], - [19, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1311107624] - ], - "lib/ast/merge/rspec/shared_examples/merge_result_base.rb:2962043558": [ - [18, 1, 2330, "Metrics/BlockLength: Block has too many lines. [67/25]", 3496673178], - [53, 3, 1271, "Metrics/BlockLength: Block has too many lines. [42/25]", 2278976858] - ], - "lib/ast/merge/rspec/shared_examples/merger_config.rb:2413785902": [ - [18, 1, 8240, "Metrics/BlockLength: Block has too many lines. [193/25]", 3665443345], - [57, 3, 1628, "Metrics/BlockLength: Block has too many lines. [32/25]", 7828299], - [98, 3, 1266, "Metrics/BlockLength: Block has too many lines. [28/25]", 317929439], - [159, 3, 1740, "Metrics/BlockLength: Block has too many lines. [42/25]", 1736487820], - [217, 3, 1373, "Metrics/BlockLength: Block has too many lines. [30/25]", 442933563] - ], - "lib/ast/merge/rspec/shared_examples/recipe_preset_contract.rb:1495545061": [ - [7, 1, 2558, "Metrics/BlockLength: Block has too many lines. [51/25]", 4091815632] - ], - "lib/ast/merge/rspec/shared_examples/removal_mode_compliance.rb:3645548199": [ - [24, 1, 1860, "Metrics/BlockLength: Block has too many lines. [33/25]", 1115825136] - ], - "lib/ast/merge/rspec/shared_examples/reproducible_merge.rb:2276592459": [ - [51, 1, 2030, "Metrics/BlockLength: Block has too many lines. [52/25]", 563553381] - ], - "lib/ast/merge/rspec/shared_examples/reproducible_partial_merge.rb:524436129": [ - [3, 1, 2321, "Metrics/BlockLength: Block has too many lines. [44/25]", 3206099540] - ], - "lib/ast/merge/rspec/shared_examples/runtime_debug_contract.rb:4244040583": [ - [8, 1, 2808, "Metrics/BlockLength: Block has too many lines. [48/25]", 3274492878] - ], - "lib/ast/merge/rspec/shared_examples/unresolved_helper_contract.rb:2916431464": [ - [9, 1, 5998, "Metrics/BlockLength: Block has too many lines. [126/25]", 4174562424], - [94, 3, 1515, "Metrics/BlockLength: Block has too many lines. [32/25]", 1928238376] - ], - "lib/ast/merge/rspec/shared_examples/unresolved_review_state_transport_contract.rb:3368966854": [ - [14, 1, 3386, "Metrics/BlockLength: Block has too many lines. [68/25]", 2910343214], - [65, 3, 317, "Metrics/MethodLength: Method has too many lines. [12/10]", 2653897690] - ], - "lib/ast/merge/rspec/shared_examples/unresolved_runtime_contract.rb:1424234700": [ - [10, 1, 2652, "Metrics/BlockLength: Block has too many lines. [42/25]", 960283638], - [31, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2892620242], - [46, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193437756] - ], - "lib/ast/merge/rspec/shared_examples/unresolved_runtime_debug_contract.rb:2897026147": [ - [25, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2418171787], - [26, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 235635831] - ], - "lib/ast/merge/ruleset/config.rb:4242726919": [ - [7, 7, 3664, "Metrics/ClassLength: Class has too many lines. [101/100]", 1968929597], - [36, 9, 933, "Metrics/MethodLength: Method has too many lines. [15/10]", 3334511209], - [36, 23, 319, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [15/5]", 1652945408], - [65, 9, 515, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 18, 3> 18.25/17]", 2614325513], - [65, 9, 515, "Metrics/MethodLength: Method has too many lines. [14/10]", 2614325513] - ], - "lib/ast/merge/ruleset/feature_profile.rb:3980745364": [ - [12, 7, 6054, "Metrics/ClassLength: Class has too many lines. [155/100]", 2818730231], - [29, 9, 1351, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<17, 18, 7> 25.73/17]", 2248702332], - [29, 9, 1351, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `initialize` is too high. [8/7]", 2248702332], - [29, 9, 1351, "Metrics/MethodLength: Method has too many lines. [17/10]", 2248702332], - [29, 23, 422, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 1415781648], - [138, 9, 1509, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 36, 6> 36.5/17]", 3793816437], - [138, 9, 1509, "Metrics/MethodLength: Method has too many lines. [31/10]", 3793816437] - ], - "lib/ast/merge/ruleset/parser.rb:698282871": [ - [7, 7, 9396, "Metrics/ClassLength: Class has too many lines. [199/100]", 1305123525], - [43, 9, 473, "Metrics/AbcSize: Assignment Branch Condition size for `parse` is too high. [<0, 17, 2> 17.12/17]", 1400394586], - [43, 9, 473, "Metrics/MethodLength: Method has too many lines. [12/10]", 1400394586], - [71, 9, 1053, "Metrics/MethodLength: Method has too many lines. [24/10]", 1569959910], - [101, 9, 1123, "Metrics/AbcSize: Assignment Branch Condition size for `parse_single_value_directive!` is too high. [<7, 13, 10> 17.83/17]", 706129883], - [101, 9, 1123, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_single_value_directive!` is too high. [8/7]", 706129883], - [101, 9, 1123, "Metrics/MethodLength: Method has too many lines. [24/10]", 706129883], - [170, 9, 605, "Metrics/MethodLength: Method has too many lines. [11/10]", 336127382], - [186, 9, 687, "Metrics/MethodLength: Method has too many lines. [11/10]", 2962844982] - ], - "lib/ast/merge/ruleset/profile_vocabulary.rb:2359837647": [ - [7, 7, 3956, "Metrics/ModuleLength: Module has too many lines. [107/100]", 1680256705] - ], - "lib/ast/merge/ruleset/runtime_declaration.rb:1016848190": [ - [18, 9, 819, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<11, 13, 5> 17.75/17]", 4043304883], - [18, 9, 819, "Metrics/MethodLength: Method has too many lines. [11/10]", 4043304883], - [18, 23, 240, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 3868000276], - [49, 9, 551, "Metrics/MethodLength: Method has too many lines. [13/10]", 448215861] - ], - "lib/ast/merge/ruleset/runtime_translator.rb:3255492631": [ - [9, 11, 816, "Metrics/MethodLength: Method has too many lines. [19/10]", 225301385], - [31, 11, 986, "Metrics/AbcSize: Assignment Branch Condition size for `feature_profile` is too high. [<1, 17, 0> 17.03/17]", 1395467476], - [31, 11, 986, "Metrics/MethodLength: Method has too many lines. [19/10]", 1395467476] - ], - "lib/ast/merge/ruleset/support_style_resolver.rb:508975884": [ - [9, 11, 864, "Metrics/MethodLength: Method has too many lines. [22/10]", 3902551296] - ], - "lib/ast/merge/runtime/child_result.rb:4083710804": [ - [16, 9, 698, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<7, 16, 2> 17.58/17]", 2208366179], - [16, 23, 227, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 3688358290], - [38, 9, 584, "Metrics/MethodLength: Method has too many lines. [11/10]", 3113479157], - [55, 11, 106, "Style/HashTransformKeys: Prefer `transform_keys` over `each_with_object`.", 4262612225] - ], - "lib/ast/merge/runtime/delegate.rb:3607371286": [ - [17, 23, 285, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 2793452069] - ], - "lib/ast/merge/runtime/diagnostic.rb:805162185": [ - [10, 23, 72, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1875462867] - ], - "lib/ast/merge/runtime/operation.rb:1030261783": [ - [20, 9, 767, "Metrics/MethodLength: Method has too many lines. [11/10]", 2728174753], - [20, 23, 278, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 694444911], - [100, 9, 617, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<2, 24, 6> 24.82/17]", 1175382849], - [100, 9, 617, "Metrics/MethodLength: Method has too many lines. [11/10]", 1175382849] - ], - "lib/ast/merge/runtime/resolution_case.rb:250040454": [ - [8, 9, 707, "Metrics/AbcSize: Assignment Branch Condition size for `from_h` is too high. [<1, 19, 6> 19.95/17]", 2592154170], - [29, 23, 189, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 818714714], - [81, 11, 111, "Style/HashTransformKeys: Prefer `transform_keys` over `each_with_object`.", 2712537644] - ], - "lib/ast/merge/runtime/root_session_support.rb:1917388966": [ - [10, 9, 2153, "Metrics/AbcSize: Assignment Branch Condition size for `start_runtime_root_session!` is too high. [<5, 20, 3> 20.83/17]", 1888056651], - [10, 9, 2153, "Metrics/MethodLength: Method has too many lines. [41/10]", 1888056651], - [10, 40, 421, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 2297301282], - [60, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2312419928], - [68, 9, 771, "Metrics/MethodLength: Method has too many lines. [13/10]", 1787620786], - [68, 43, 191, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3635875424] - ], - "lib/ast/merge/runtime/session.rb:628419040": [ - [66, 9, 1203, "Metrics/AbcSize: Assignment Branch Condition size for `summary` is too high. [<5, 43, 13> 45.2/17]", 550888870], - [66, 9, 1203, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `summary` is too high. [14/7]", 550888870], - [66, 9, 1203, "Metrics/MethodLength: Method has too many lines. [20/10]", 550888870], - [66, 9, 1203, "Metrics/PerceivedComplexity: Perceived complexity for `summary` is too high. [14/8]", 550888870] - ], - "lib/ast/merge/runtime/surface.rb:3684795905": [ - [17, 23, 230, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 469229117], - [44, 9, 418, "Metrics/MethodLength: Method has too many lines. [11/10]", 998969973] - ], - "lib/ast/merge/section_typing.rb:4261989256": [ - [112, 9, 710, "Metrics/MethodLength: Method has too many lines. [15/10]", 3600335459], - [176, 9, 67, "Lint/MissingSuper: Call `super` to initialize state of the parent class.", 4077537758], - [216, 9, 85, "Lint/MissingSuper: Call `super` to initialize state of the parent class.", 3648782014], - [245, 9, 1446, "Metrics/AbcSize: Assignment Branch Condition size for `merge_sections` is too high. [<13, 20, 12> 26.7/17]", 525095633], - [245, 9, 1446, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_sections` is too high. [12/7]", 525095633], - [245, 9, 1446, "Metrics/MethodLength: Method has too many lines. [28/10]", 525095633], - [245, 9, 1446, "Metrics/PerceivedComplexity: Perceived complexity for `merge_sections` is too high. [13/8]", 525095633] - ], - "lib/ast/merge/smart_merger_base.rb:4189972287": [ - [109, 5, 15324, "Metrics/ClassLength: Class has too many lines. [172/100]", 3547407870], - [214, 7, 1974, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<20, 14, 5> 24.92/17]", 2211610736], - [214, 7, 1974, "Metrics/MethodLength: Method has too many lines. [23/10]", 2211610736], - [214, 21, 443, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [15/5]", 1530523783], - [424, 7, 1312, "Metrics/AbcSize: Assignment Branch Condition size for `parse_and_analyze` is too high. [<7, 25, 11> 28.2/17]", 1640248187], - [424, 7, 1312, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_and_analyze` is too high. [10/7]", 1640248187], - [424, 7, 1312, "Metrics/MethodLength: Method has too many lines. [15/10]", 1640248187], - [424, 7, 1312, "Metrics/PerceivedComplexity: Perceived complexity for `parse_and_analyze` is too high. [10/8]", 1640248187], - [517, 12, 52, "Style/NumericPredicate: Use `result_class.instance_method(:initialize).arity.zero?` instead of `result_class.instance_method(:initialize).arity == 0`.", 1312375552] - ], - "lib/ast/merge/structural_edit/boundary.rb:2838060197": [ - [20, 23, 93, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3901214537], - [41, 38, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [51, 38, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [60, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087440865] - ], - "lib/ast/merge/structural_edit/boundary_support.rb:2036464761": [ - [31, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861061], - [32, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 97596930] - ], - "lib/ast/merge/structural_edit/plan_set.rb:538463647": [ - [116, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 2855200692] - ], - "lib/ast/merge/structural_edit/rehome_plan.rb:2152178780": [ - [23, 23, 123, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3433617242], - [100, 9, 519, "Metrics/MethodLength: Method has too many lines. [11/10]", 318006380], - [136, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 2367140872] - ], - "lib/ast/merge/structural_edit/remove_plan.rb:1189569486": [ - [11, 7, 9717, "Metrics/ClassLength: Class has too many lines. [160/100]", 3652701475], - [25, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861091], - [27, 9, 1409, "Metrics/MethodLength: Method has too many lines. [22/10]", 3344870777], - [27, 23, 255, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 3970946607], - [28, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 1637059282], - [36, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859104], - [196, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 1617827253], - [224, 9, 1032, "Metrics/MethodLength: Method has too many lines. [20/10]", 968444047] - ], - "lib/ast/merge/structural_edit/remove_plan_support.rb:877461974": [ - [9, 9, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631], - [19, 9, 1429, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_remove_plan` is too high. [8/7]", 4091314919], - [19, 9, 1429, "Metrics/MethodLength: Method has too many lines. [32/10]", 4091314919] - ], - "lib/ast/merge/structural_edit/splice_plan.rb:2675806114": [ - [39, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1683893295], - [42, 23, 203, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3653221702], - [113, 9, 517, "Metrics/MethodLength: Method has too many lines. [11/10]", 634912361] - ], - "lib/ast/merge/structured_emitter_provenance_support.rb:445323365": [ - [5, 5, 41, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::StructuredEmitterProvenanceSupport`.", 3548518830] - ], - "lib/ast/merge/structured_review_apply_support.rb:3649736380": [ - [5, 5, 35, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::StructuredReviewApplySupport`.", 1282380463], - [22, 7, 782, "Metrics/AbcSize: Assignment Branch Condition size for `current_output_span_for` is too high. [<6, 19, 11> 22.76/17]", 4137750179], - [22, 7, 782, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `current_output_span_for` is too high. [8/7]", 4137750179], - [22, 7, 782, "Metrics/MethodLength: Method has too many lines. [14/10]", 4137750179], - [42, 7, 595, "Metrics/MethodLength: Method has too many lines. [12/10]", 2080934521], - [60, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3151172498] - ], - "lib/ast/merge/text/conflict_resolver.rb:989169286": [ - [19, 7, 9182, "Metrics/ClassLength: Class has too many lines. [159/100]", 1070563745], - [28, 23, 211, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2639535499], - [53, 9, 2507, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_batch` is too high. [<15, 34, 5> 37.5/17]", 825130797], - [53, 9, 2507, "Metrics/MethodLength: Method has too many lines. [44/10]", 825130797], - [196, 9, 2458, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_matched_pair` is too high. [<2, 30, 11> 32.02/17]", 4037214978], - [196, 9, 2458, "Metrics/MethodLength: Method has too many lines. [46/10]", 4037214978] - ], - "lib/ast/merge/text/file_analysis.rb:1530312707": [ - [106, 9, 1484, "Metrics/AbcSize: Assignment Branch Condition size for `parse_statements` is too high. [<11, 15, 6> 19.54/17]", 1858083071], - [106, 9, 1484, "Metrics/MethodLength: Method has too many lines. [34/10]", 1858083071], - [160, 9, 449, "Metrics/MethodLength: Method has too many lines. [11/10]", 1902035813] - ], - "lib/ast/merge/text/line_node.rb:3385927013": [ - [145, 9, 699, "Metrics/MethodLength: Method has too many lines. [17/10]", 2201872249] - ], - "lib/ast/merge/text/section_splitter.rb:129704488": [ - [141, 9, 1442, "Metrics/AbcSize: Assignment Branch Condition size for `merge_section_lists` is too high. [<13, 20, 6> 24.6/17]", 3551729170], - [141, 9, 1442, "Metrics/MethodLength: Method has too many lines. [23/10]", 3551729170], - [322, 9, 1767, "Metrics/AbcSize: Assignment Branch Condition size for `split` is too high. [<11, 29, 10> 32.59/17]", 2207922758], - [322, 9, 1767, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split` is too high. [10/7]", 2207922758], - [322, 9, 1767, "Metrics/MethodLength: Method has too many lines. [46/10]", 2207922758], - [322, 9, 1767, "Metrics/PerceivedComplexity: Perceived complexity for `split` is too high. [13/8]", 2207922758], - [328, 11, 1019, "Metrics/BlockLength: Block has too many lines. [26/25]", 1561634792] - ], - "lib/ast/merge/text/smart_merger.rb:2405807903": [ - [67, 9, 831, "Metrics/MethodLength: Method has too many lines. [12/10]", 584426022], - [67, 23, 350, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 3074172637] - ], - "lib/ast/merge/trailing_groups/alignment_sort.rb:2593404330": [ - [40, 9, 513, "Metrics/MethodLength: Method has too many lines. [12/10]", 89360683] - ], - "lib/ast/merge/trailing_groups/core.rb:4231959665": [ - [61, 9, 812, "Metrics/MethodLength: Method has too many lines. [17/10]", 1777526069], - [101, 9, 998, "Metrics/AbcSize: Assignment Branch Condition size for `flush_ready_trailing_groups` is too high. [<8, 18, 15> 24.76/17]", 2397698441], - [101, 9, 998, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `flush_ready_trailing_groups` is too high. [13/7]", 2397698441], - [101, 9, 998, "Metrics/MethodLength: Method has too many lines. [17/10]", 2397698441], - [101, 9, 998, "Metrics/PerceivedComplexity: Perceived complexity for `flush_ready_trailing_groups` is too high. [13/8]", 2397698441] - ], - "lib/ast/merge/trailing_groups/dest_iterate.rb:3897205087": [ - [69, 9, 751, "Metrics/MethodLength: Method has too many lines. [12/10]", 3915657972], - [69, 47, 199, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2545849044] - ], - "lib/ast/merge/unresolved_support.rb:2881272494": [ - [7, 5, 24, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::UnresolvedSupport`.", 990281691], - [7, 5, 4392, "Metrics/ModuleLength: Module has too many lines. [116/100]", 3475162940], - [32, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [67, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [85, 7, 1038, "Metrics/MethodLength: Method has too many lines. [14/10]", 3139619197], - [85, 40, 338, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 71164914] - ], - "spec/ast/merge/ast_node_spec.rb:1362065144": [ - [3, 1, 8199, "Metrics/BlockLength: Block has too many lines. [254/25]", 1649868231], - [18, 3, 1030, "Metrics/BlockLength: Block has too many lines. [33/25]", 1409835577] - ], - "spec/ast/merge/block_directive_spec.rb:2305756581": [ - [3, 1, 5181, "Metrics/BlockLength: Block has too many lines. [138/25]", 1887900896], - [128, 3, 1391, "Metrics/BlockLength: Block has too many lines. [39/25]", 3626371694] - ], - "spec/ast/merge/comment/attachment_spec.rb:2571833836": [ - [3, 1, 5536, "Metrics/BlockLength: Block has too many lines. [150/25]", 1841571757], - [93, 3, 1639, "Metrics/BlockLength: Block has too many lines. [37/25]", 212730671] - ], - "spec/ast/merge/comment/augmenter_spec.rb:4266625483": [ - [3, 1, 9141, "Metrics/BlockLength: Block has too many lines. [212/25]", 530365996], - [16, 3, 6849, "Metrics/BlockLength: Block has too many lines. [154/25]", 503152628], - [200, 3, 1244, "Metrics/BlockLength: Block has too many lines. [33/25]", 3565041107] - ], - "spec/ast/merge/comment/block_spec.rb:4138473890": [ - [3, 1, 9021, "Metrics/BlockLength: Block has too many lines. [250/25]", 1617505173], - [8, 3, 1115, "Metrics/BlockLength: Block has too many lines. [27/25]", 2958989619], - [93, 3, 1127, "Metrics/BlockLength: Block has too many lines. [33/25]", 196340527], - [123, 45, 16, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 155572628], - [159, 3, 1432, "Metrics/BlockLength: Block has too many lines. [35/25]", 281400319] - ], - "spec/ast/merge/comment/c_style_tracker_base_spec.rb:3154319400": [ - [3, 1, 5816, "Metrics/BlockLength: Block has too many lines. [133/25]", 680831933], - [100, 3, 1450, "Metrics/BlockLength: Block has too many lines. [35/25]", 4153882185] - ], - "spec/ast/merge/comment/capability_spec.rb:2763521225": [ - [3, 1, 3522, "Metrics/BlockLength: Block has too many lines. [89/25]", 1487980773], - [4, 3, 1954, "Metrics/BlockLength: Block has too many lines. [41/25]", 160187362] - ], - "spec/ast/merge/comment/empty_spec.rb:1801324640": [ - [3, 1, 2584, "Metrics/BlockLength: Block has too many lines. [70/25]", 270179899], - [4, 3, 1047, "Metrics/BlockLength: Block has too many lines. [27/25]", 3056449816] - ], - "spec/ast/merge/comment/hash_tracker_base_spec.rb:3624528747": [ - [3, 1, 9653, "Metrics/BlockLength: Block has too many lines. [271/25]", 3748659406], - [8, 3, 1210, "Metrics/BlockLength: Block has too many lines. [37/25]", 2566766302], - [21, 7, 872, "Metrics/AbcSize: Assignment Branch Condition size for `extract_comments` is too high. [<7, 24, 5> 25.5/17]", 1213080161], - [21, 7, 872, "Metrics/MethodLength: Method has too many lines. [25/10]", 1213080161], - [275, 3, 1171, "Metrics/BlockLength: Block has too many lines. [29/25]", 1425466742] - ], - "spec/ast/merge/comment/line_spec.rb:1487829548": [ - [3, 1, 5291, "Metrics/BlockLength: Block has too many lines. [128/25]", 587604747], - [6, 3, 1573, "Metrics/BlockLength: Block has too many lines. [37/25]", 4105920006] - ], - "spec/ast/merge/comment/parser_spec.rb:2443973508": [ - [3, 1, 9855, "Metrics/BlockLength: Block has too many lines. [237/25]", 404174977], - [4, 3, 1013, "Metrics/BlockLength: Block has too many lines. [26/25]", 182655397], - [38, 3, 1282, "Metrics/BlockLength: Block has too many lines. [28/25]", 2303702609] - ], - "spec/ast/merge/comment/quoted_hash_line_parser_spec.rb:3795390831": [ - [3, 1, 1810, "Metrics/BlockLength: Block has too many lines. [44/25]", 2575838586], - [6, 3, 1700, "Metrics/BlockLength: Block has too many lines. [41/25]", 1553834548] - ], - "spec/ast/merge/comment/region_merge_policy_spec.rb:4175996936": [ - [3, 1, 3618, "Metrics/BlockLength: Block has too many lines. [75/25]", 4006378358], - [11, 3, 2752, "Metrics/BlockLength: Block has too many lines. [52/25]", 494211987] - ], - "spec/ast/merge/comment/region_spec.rb:2674736508": [ - [3, 1, 4033, "Metrics/BlockLength: Block has too many lines. [91/25]", 1828104331] - ], - "spec/ast/merge/comment/style_spec.rb:1875195890": [ - [3, 1, 4040, "Metrics/BlockLength: Block has too many lines. [101/25]", 2759361650] - ], - "spec/ast/merge/comment/support_style_spec.rb:1350169032": [ - [3, 1, 1577, "Metrics/BlockLength: Block has too many lines. [39/25]", 3414039011] - ], - "spec/ast/merge/comment/tracked_hash_adapter_spec.rb:1256807736": [ - [3, 1, 4482, "Metrics/BlockLength: Block has too many lines. [97/25]", 264417763], - [4, 3, 3101, "Metrics/BlockLength: Block has too many lines. [63/25]", 1050939978], - [81, 3, 1313, "Metrics/BlockLength: Block has too many lines. [30/25]", 515655104] - ], - "spec/ast/merge/comment_spec.rb:81945459": [ - [3, 1, 15888, "Metrics/BlockLength: Block has too many lines. [384/25]", 2229554982], - [4, 3, 3957, "Metrics/BlockLength: Block has too many lines. [84/25]", 660667217], - [5, 5, 1187, "Metrics/BlockLength: Block has too many lines. [26/25]", 241562105], - [105, 3, 1371, "Metrics/BlockLength: Block has too many lines. [30/25]", 1901983597], - [159, 3, 1296, "Metrics/BlockLength: Block has too many lines. [30/25]", 1749880380], - [239, 3, 1151, "Metrics/BlockLength: Block has too many lines. [28/25]", 183967322], - [272, 3, 2004, "Metrics/BlockLength: Block has too many lines. [45/25]", 2594323837], - [349, 3, 3220, "Metrics/BlockLength: Block has too many lines. [83/25]", 790417809], - [350, 5, 2347, "Metrics/BlockLength: Block has too many lines. [60/25]", 4016801881] - ], - "spec/ast/merge/composite_match_refiner_spec.rb:2888297870": [ - [3, 1, 6152, "Metrics/BlockLength: Block has too many lines. [143/25]", 3308692548], - [55, 3, 4118, "Metrics/BlockLength: Block has too many lines. [87/25]", 1405655464] - ], - "spec/ast/merge/conflict_resolver_base_spec.rb:3331938447": [ - [5, 1, 20643, "Metrics/BlockLength: Block has too many lines. [516/25]", 3129196558], - [14, 59, 14, "Lint/UnusedMethodArgument: Unused method argument - `template_index`.", 1809801172], - [14, 76, 10, "Lint/UnusedMethodArgument: Unused method argument - `dest_index`.", 2703999490], - [47, 61, 14, "Lint/UnusedMethodArgument: Unused method argument - `template_index`. You can also write as `resolve_node_pair(*)` if you want the method to accept any arguments but don't care about them.", 1809801172], - [47, 78, 10, "Lint/UnusedMethodArgument: Unused method argument - `dest_index`. You can also write as `resolve_node_pair(*)` if you want the method to accept any arguments but don't care about them.", 2703999490], - [105, 3, 17203, "Metrics/BlockLength: Block has too many lines. [425/25]", 1114912980], - [154, 5, 1797, "Metrics/BlockLength: Block has too many lines. [37/25]", 515146940], - [203, 5, 1373, "Metrics/BlockLength: Block has too many lines. [32/25]", 603210832], - [292, 5, 2874, "Metrics/BlockLength: Block has too many lines. [77/25]", 3918129775], - [341, 7, 1292, "Metrics/BlockLength: Block has too many lines. [34/25]", 1769555944], - [402, 5, 1857, "Metrics/BlockLength: Block has too many lines. [44/25]", 1516406612], - [456, 5, 1209, "Metrics/BlockLength: Block has too many lines. [31/25]", 430489898], - [514, 5, 2021, "Metrics/BlockLength: Block has too many lines. [37/25]", 144128170], - [515, 7, 1953, "Metrics/BlockLength: Block has too many lines. [35/25]", 1574966248], - [567, 5, 1500, "Metrics/BlockLength: Block has too many lines. [40/25]", 2509466150] - ], - "spec/ast/merge/content_match_refiner_spec.rb:4058001158": [ - [3, 1, 14348, "Metrics/BlockLength: Block has too many lines. [318/25]", 1171164704], - [25, 3, 1238, "Metrics/BlockLength: Block has too many lines. [29/25]", 2139810386], - [63, 3, 4077, "Metrics/BlockLength: Block has too many lines. [95/25]", 3471153375], - [325, 3, 2213, "Metrics/BlockLength: Block has too many lines. [37/25]", 3370370915] - ], - "spec/ast/merge/debug_logger_spec.rb:429510168": [ - [3, 1, 17306, "Metrics/BlockLength: Block has too many lines. [358/25]", 2287792973], - [251, 3, 1598, "Metrics/BlockLength: Block has too many lines. [27/25]", 3227542816], - [358, 3, 5118, "Metrics/BlockLength: Block has too many lines. [77/25]", 1759761803] - ], - "spec/ast/merge/detector/base_spec.rb:4157102211": [ - [3, 1, 3172, "Metrics/BlockLength: Block has too many lines. [100/25]", 3745104028], - [11, 7, 498, "Metrics/MethodLength: Method has too many lines. [13/10]", 3178368155], - [49, 3, 900, "Metrics/BlockLength: Block has too many lines. [28/25]", 2333048204] - ], - "spec/ast/merge/detector/fenced_code_block_spec.rb:495797689": [ - [3, 1, 11589, "Metrics/BlockLength: Block has too many lines. [363/25]", 3764545134], - [38, 3, 4467, "Metrics/BlockLength: Block has too many lines. [150/25]", 1597401000], - [41, 5, 1077, "Metrics/BlockLength: Block has too many lines. [31/25]", 2269642514], - [115, 5, 848, "Metrics/BlockLength: Block has too many lines. [27/25]", 1704866975], - [220, 3, 4815, "Metrics/BlockLength: Block has too many lines. [146/25]", 3797214474] - ], - "spec/ast/merge/detector/mergeable_spec.rb:1307688846": [ - [3, 1, 23175, "Metrics/BlockLength: Block has too many lines. [654/25]", 2932391114], - [77, 3, 2079, "Metrics/BlockLength: Block has too many lines. [53/25]", 1093085347], - [177, 3, 2217, "Metrics/BlockLength: Block has too many lines. [69/25]", 926985871], - [188, 5, 948, "Metrics/BlockLength: Block has too many lines. [26/25]", 4186135901], - [225, 5, 898, "Metrics/BlockLength: Block has too many lines. [31/25]", 513446836], - [266, 3, 1168, "Metrics/BlockLength: Block has too many lines. [29/25]", 774699411], - [304, 3, 1188, "Metrics/BlockLength: Block has too many lines. [27/25]", 4282853126], - [339, 3, 918, "Metrics/BlockLength: Block has too many lines. [28/25]", 1759590109], - [372, 3, 870, "Metrics/BlockLength: Block has too many lines. [28/25]", 131542026], - [410, 3, 3768, "Metrics/BlockLength: Block has too many lines. [111/25]", 181819560], - [483, 5, 1536, "Metrics/BlockLength: Block has too many lines. [47/25]", 385085357], - [540, 3, 1891, "Metrics/BlockLength: Block has too many lines. [52/25]", 602757329], - [664, 3, 1927, "Metrics/BlockLength: Block has too many lines. [56/25]", 48062261], - [691, 5, 1146, "Metrics/BlockLength: Block has too many lines. [31/25]", 1961728737], - [721, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3104497040], - [729, 3, 1625, "Metrics/BlockLength: Block has too many lines. [46/25]", 1570579215] - ], - "spec/ast/merge/detector/region_spec.rb:594725562": [ - [3, 1, 8128, "Metrics/BlockLength: Block has too many lines. [290/25]", 1984713692], - [4, 3, 806, "Metrics/BlockLength: Block has too many lines. [28/25]", 1515087192], - [58, 3, 1236, "Metrics/BlockLength: Block has too many lines. [45/25]", 2464968707], - [128, 3, 1063, "Metrics/BlockLength: Block has too many lines. [33/25]", 239148700], - [250, 3, 2010, "Metrics/BlockLength: Block has too many lines. [76/25]", 2595033382] - ], - "spec/ast/merge/detector/toml_frontmatter_spec.rb:1135160129": [ - [3, 1, 6717, "Metrics/BlockLength: Block has too many lines. [218/25]", 2273975625], - [12, 3, 5534, "Metrics/BlockLength: Block has too many lines. [187/25]", 538920673], - [13, 5, 1456, "Metrics/BlockLength: Block has too many lines. [38/25]", 3113759139] - ], - "spec/ast/merge/detector/yaml_frontmatter_spec.rb:2467934365": [ - [3, 1, 6702, "Metrics/BlockLength: Block has too many lines. [213/25]", 3083039982], - [12, 3, 5056, "Metrics/BlockLength: Block has too many lines. [170/25]", 1889948780], - [13, 5, 1438, "Metrics/BlockLength: Block has too many lines. [38/25]", 1736912391], - [219, 3, 1396, "Metrics/BlockLength: Block has too many lines. [33/25]", 2446467851] - ], - "spec/ast/merge/diff_mapper_base_spec.rb:1771546518": [ - [5, 1, 8521, "Metrics/BlockLength: Block has too many lines. [248/25]", 1057580573], - [22, 9, 44, "Style/InverseMethods: Use `reject` instead of inverting `select`.", 3063843489], - [46, 3, 3878, "Metrics/BlockLength: Block has too many lines. [116/25]", 2874032080], - [47, 5, 1938, "Metrics/BlockLength: Block has too many lines. [48/25]", 1904497583], - [191, 3, 1488, "Metrics/BlockLength: Block has too many lines. [43/25]", 1632956840] - ], - "spec/ast/merge/emitter_base_spec.rb:4197360291": [ - [3, 1, 11215, "Metrics/BlockLength: Block has too many lines. [282/25]", 4254840781], - [30, 3, 4393, "Metrics/BlockLength: Block has too many lines. [102/25]", 3992142376], - [134, 58, 12, "Lint/UnusedMethodArgument: Unused method argument - `current_line`. You can also write as `inline_comment_region_target_column(*)` if you want the method to accept any arguments but don't care about them.", 2091263933], - [138, 44, 6, "Lint/UnusedMethodArgument: Unused method argument - `region`.", 2124512157], - [159, 3, 1815, "Metrics/BlockLength: Block has too many lines. [39/25]", 719023387], - [206, 3, 2233, "Metrics/BlockLength: Block has too many lines. [62/25]", 3754339775], - [312, 3, 1059, "Metrics/BlockLength: Block has too many lines. [26/25]", 375007123] - ], - "spec/ast/merge/fictive_language_harness_spec.rb:1179155480": [ - [6, 1, 6693, "Metrics/BlockLength: Block has too many lines. [143/25]", 245088433], - [7, 3, 1968, "Metrics/BlockLength: Block has too many lines. [36/25]", 4161580169], - [58, 3, 1230, "Metrics/BlockLength: Block has too many lines. [34/25]", 990452676], - [103, 3, 2668, "Metrics/BlockLength: Block has too many lines. [51/25]", 1755027956] - ], - "spec/ast/merge/file_aligner_base_spec.rb:610089304": [ - [5, 1, 7287, "Metrics/BlockLength: Block has too many lines. [164/25]", 597898988], - [6, 3, 1237, "Metrics/BlockLength: Block has too many lines. [37/25]", 1284505259], - [86, 3, 5087, "Metrics/BlockLength: Block has too many lines. [84/25]", 119873771], - [94, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3749416415] - ], - "spec/ast/merge/file_analyzable_spec.rb:3816965829": [ - [3, 1, 12458, "Metrics/BlockLength: Block has too many lines. [272/25]", 216138965], - [25, 3, 9603, "Metrics/BlockLength: Block has too many lines. [202/25]", 2508188172], - [297, 3, 1214, "Metrics/BlockLength: Block has too many lines. [30/25]", 777182624] - ], - "spec/ast/merge/freezable_spec.rb:559280324": [ - [5, 1, 5033, "Metrics/BlockLength: Block has too many lines. [123/25]", 3070666859], - [6, 3, 1199, "Metrics/BlockLength: Block has too many lines. [34/25]", 4058875636], - [66, 3, 1530, "Metrics/BlockLength: Block has too many lines. [31/25]", 1670675428] - ], - "spec/ast/merge/freeze_node_base_spec.rb:2962962931": [ - [3, 1, 21887, "Metrics/BlockLength: Block has too many lines. [560/25]", 567315021], - [48, 3, 1369, "Metrics/BlockLength: Block has too many lines. [38/25]", 3363160391], - [131, 3, 2739, "Metrics/BlockLength: Block has too many lines. [56/25]", 2008289622], - [205, 3, 1586, "Metrics/BlockLength: Block has too many lines. [35/25]", 4179606047], - [251, 3, 977, "Metrics/BlockLength: Block has too many lines. [26/25]", 1240612851], - [287, 3, 1130, "Metrics/BlockLength: Block has too many lines. [28/25]", 2511265379], - [322, 3, 5029, "Metrics/BlockLength: Block has too many lines. [126/25]", 739537566], - [598, 3, 3055, "Metrics/BlockLength: Block has too many lines. [81/25]", 145217296] - ], - "spec/ast/merge/healer_spec.rb:877829793": [ - [3, 1, 4896, "Metrics/BlockLength: Block has too many lines. [148/25]", 1074378773], - [19, 3, 1333, "Metrics/BlockLength: Block has too many lines. [38/25]", 2940878263], - [24, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193432399], - [61, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085379023], - [67, 3, 2985, "Metrics/BlockLength: Block has too many lines. [93/25]", 4032786576] - ], - "spec/ast/merge/jaccard_similarity_spec.rb:3984307047": [ - [3, 1, 2659, "Metrics/BlockLength: Block has too many lines. [71/25]", 1122516612], - [6, 3, 1484, "Metrics/BlockLength: Block has too many lines. [38/25]", 3367914637], - [55, 3, 1090, "Metrics/BlockLength: Block has too many lines. [28/25]", 2629339264] - ], - "spec/ast/merge/key_path_partial_template_merger_base_spec.rb:2189485360": [ - [5, 1, 5955, "Metrics/BlockLength: Block has too many lines. [138/25]", 91542958], - [35, 3, 1217, "Metrics/BlockLength: Block has too many lines. [33/25]", 2663081123], - [97, 3, 3019, "Metrics/BlockLength: Block has too many lines. [54/25]", 1411952192] - ], - "spec/ast/merge/layout/attachment_spec.rb:3814294426": [ - [3, 1, 1799, "Metrics/BlockLength: Block has too many lines. [34/25]", 1283153367] - ], - "spec/ast/merge/layout/augmenter_spec.rb:3633045915": [ - [3, 1, 4412, "Metrics/BlockLength: Block has too many lines. [92/25]", 2690553031], - [20, 3, 2725, "Metrics/BlockLength: Block has too many lines. [54/25]", 3645203819] - ], - "spec/ast/merge/layout/gap_spec.rb:4232058283": [ - [3, 1, 2758, "Metrics/BlockLength: Block has too many lines. [72/25]", 2052697931], - [9, 3, 1290, "Metrics/BlockLength: Block has too many lines. [28/25]", 3175967312] - ], - "spec/ast/merge/match_refiner_base_spec.rb:3961767223": [ - [3, 1, 10604, "Metrics/BlockLength: Block has too many lines. [301/25]", 4290485382], - [4, 3, 1146, "Metrics/BlockLength: Block has too many lines. [37/25]", 108051658], - [50, 3, 1005, "Metrics/BlockLength: Block has too many lines. [28/25]", 3807648246], - [125, 3, 1026, "Metrics/BlockLength: Block has too many lines. [27/25]", 2896086726], - [162, 3, 4464, "Metrics/BlockLength: Block has too many lines. [114/25]", 2878217135], - [218, 5, 1112, "Metrics/BlockLength: Block has too many lines. [30/25]", 1605825436], - [224, 11, 104, "Style/HashLikeCase: Consider replacing `case-when` with a hash lookup.", 4220899731], - [247, 11, 132, "Style/HashLikeCase: Consider replacing `case-when` with a hash lookup.", 3401820780], - [258, 5, 1642, "Metrics/BlockLength: Block has too many lines. [35/25]", 1288881729], - [337, 3, 1108, "Metrics/BlockLength: Block has too many lines. [33/25]", 2139263963] - ], - "spec/ast/merge/match_score_base_spec.rb:2340739872": [ - [3, 1, 15213, "Metrics/BlockLength: Block has too many lines. [372/25]", 1512747000], - [4, 3, 1553, "Metrics/BlockLength: Block has too many lines. [41/25]", 2789289940], - [43, 20, 2, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 5862747], - [43, 24, 2, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 5862744], - [56, 3, 1041, "Metrics/BlockLength: Block has too many lines. [29/25]", 3729310115], - [152, 3, 3259, "Metrics/BlockLength: Block has too many lines. [82/25]", 1438003770], - [258, 3, 2199, "Metrics/BlockLength: Block has too many lines. [43/25]", 3386602801], - [320, 3, 1684, "Metrics/BlockLength: Block has too many lines. [35/25]", 3807719546], - [365, 14, 16, "Lint/FloatComparison: Avoid equality comparisons of floats as they are unreliable.", 3787748956], - [369, 3, 1696, "Metrics/BlockLength: Block has too many lines. [36/25]", 3172214426], - [417, 3, 1792, "Metrics/BlockLength: Block has too many lines. [45/25]", 3557977606], - [438, 5, 1121, "Metrics/BlockLength: Block has too many lines. [26/25]", 4236927298] - ], - "spec/ast/merge/merge_result_base_spec.rb:2262708492": [ - [3, 1, 19471, "Metrics/BlockLength: Block has too many lines. [529/25]", 4106058751], - [38, 3, 2735, "Metrics/BlockLength: Block has too many lines. [80/25]", 1103243845], - [279, 3, 1611, "Metrics/BlockLength: Block has too many lines. [39/25]", 1928511417], - [280, 5, 1203, "Metrics/BlockLength: Block has too many lines. [26/25]", 857223227], - [326, 3, 2070, "Metrics/BlockLength: Block has too many lines. [48/25]", 2552826824], - [385, 3, 5769, "Metrics/BlockLength: Block has too many lines. [140/25]", 1457747735], - [511, 5, 1306, "Metrics/BlockLength: Block has too many lines. [29/25]", 2980786372], - [574, 3, 1308, "Metrics/BlockLength: Block has too many lines. [32/25]", 1342704008] - ], - "spec/ast/merge/merger_config_spec.rb:663896662": [ - [5, 1, 7314, "Metrics/BlockLength: Block has too many lines. [189/25]", 1279589310], - [11, 3, 1180, "Metrics/BlockLength: Block has too many lines. [26/25]", 1014009176], - [45, 3, 1151, "Metrics/BlockLength: Block has too many lines. [26/25]", 785276703], - [79, 3, 3574, "Metrics/BlockLength: Block has too many lines. [97/25]", 969726064], - [126, 5, 1158, "Metrics/BlockLength: Block has too many lines. [29/25]", 389808524] - ], - "spec/ast/merge/navigable/injection_point_finder_spec.rb:3693754765": [ - [3, 1, 5152, "Metrics/BlockLength: Block has too many lines. [123/25]", 3265221808], - [15, 3, 4026, "Metrics/BlockLength: Block has too many lines. [96/25]", 1482695302], - [63, 5, 2337, "Metrics/BlockLength: Block has too many lines. [54/25]", 2678200297] - ], - "spec/ast/merge/navigable/injection_point_spec.rb:3295717447": [ - [3, 1, 6032, "Metrics/BlockLength: Block has too many lines. [161/25]", 805025024], - [77, 3, 1083, "Metrics/BlockLength: Block has too many lines. [28/25]", 3091139104] - ], - "spec/ast/merge/navigable/statement_spec.rb:2965726260": [ - [3, 1, 18289, "Metrics/BlockLength: Block has too many lines. [510/25]", 4119203121], - [102, 3, 3570, "Metrics/BlockLength: Block has too many lines. [97/25]", 3287535168], - [156, 5, 2030, "Metrics/BlockLength: Block has too many lines. [51/25]", 3299963733], - [251, 3, 1338, "Metrics/BlockLength: Block has too many lines. [37/25]", 844559624], - [411, 3, 1550, "Metrics/BlockLength: Block has too many lines. [42/25]", 3851790429], - [465, 3, 1372, "Metrics/BlockLength: Block has too many lines. [41/25]", 3782869383] - ], - "spec/ast/merge/node_typing/frozen_wrapper_spec.rb:3823345520": [ - [3, 1, 4532, "Metrics/BlockLength: Block has too many lines. [117/25]", 3944573785] - ], - "spec/ast/merge/node_typing/normalizer_spec.rb:1976431423": [ - [4, 1, 8679, "Metrics/BlockLength: Block has too many lines. [219/25]", 938207310], - [65, 3, 1137, "Metrics/BlockLength: Block has too many lines. [26/25]", 3180807289], - [101, 3, 1404, "Metrics/BlockLength: Block has too many lines. [28/25]", 1094334251], - [216, 3, 875, "Metrics/BlockLength: Block has too many lines. [26/25]", 2755551247] - ], - "spec/ast/merge/node_typing/wrapper_spec.rb:3211588263": [ - [3, 1, 3469, "Metrics/BlockLength: Block has too many lines. [92/25]", 638644563] - ], - "spec/ast/merge/node_typing_spec.rb:4080661389": [ - [3, 1, 12728, "Metrics/BlockLength: Block has too many lines. [333/25]", 3927571381], - [132, 3, 3704, "Metrics/BlockLength: Block has too many lines. [98/25]", 2130243754], - [208, 5, 1267, "Metrics/BlockLength: Block has too many lines. [31/25]", 2816753725], - [265, 3, 1298, "Metrics/BlockLength: Block has too many lines. [33/25]", 3320876250], - [311, 3, 3803, "Metrics/BlockLength: Block has too many lines. [100/25]", 2743470911] - ], - "spec/ast/merge/node_wrapper_base_spec.rb:2252820285": [ - [3, 1, 11681, "Metrics/BlockLength: Block has too many lines. [307/25]", 1698593962], - [32, 3, 2341, "Metrics/BlockLength: Block has too many lines. [68/25]", 1594381363], - [179, 3, 2568, "Metrics/BlockLength: Block has too many lines. [51/25]", 1269052990], - [294, 3, 1252, "Metrics/BlockLength: Block has too many lines. [26/25]", 4220822180], - [329, 3, 1963, "Metrics/BlockLength: Block has too many lines. [39/25]", 1623030031] - ], - "spec/ast/merge/owner_selection_spec.rb:1894901093": [ - [3, 1, 1356, "Metrics/BlockLength: Block has too many lines. [35/25]", 1030003775] - ], - "spec/ast/merge/partial_template_merger_base_spec.rb:3412991027": [ - [3, 1, 7073, "Metrics/BlockLength: Block has too many lines. [145/25]", 3415302240], - [16, 9, 43, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3196404056], - [22, 9, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 4116824817], - [48, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [96, 3, 4220, "Metrics/BlockLength: Block has too many lines. [68/25]", 3464417459], - [97, 5, 2029, "Metrics/BlockLength: Block has too many lines. [27/25]", 3297854360], - [138, 5, 2122, "Metrics/BlockLength: Block has too many lines. [37/25]", 1592076374] - ], - "spec/ast/merge/recipe/config_spec.rb:3917288551": [ - [3, 1, 21041, "Metrics/BlockLength: Block has too many lines. [611/25]", 2431235923], - [72, 3, 1653, "Metrics/BlockLength: Block has too many lines. [36/25]", 2702780755], - [174, 3, 1465, "Metrics/BlockLength: Block has too many lines. [44/25]", 2326126933], - [226, 3, 3419, "Metrics/BlockLength: Block has too many lines. [89/25]", 798604841], - [327, 3, 1398, "Metrics/BlockLength: Block has too many lines. [34/25]", 3113267700], - [474, 3, 1184, "Metrics/BlockLength: Block has too many lines. [39/25]", 2599756030], - [519, 3, 4630, "Metrics/BlockLength: Block has too many lines. [147/25]", 1245526575] - ], - "spec/ast/merge/recipe/preset_spec.rb:818394232": [ - [3, 1, 6696, "Metrics/BlockLength: Block has too many lines. [173/25]", 3205615892] - ], - "spec/ast/merge/recipe/runner_spec.rb:3689194117": [ - [3, 1, 46798, "Metrics/BlockLength: Block has too many lines. [1104/25]", 3220015076], - [48, 3, 1128, "Metrics/BlockLength: Block has too many lines. [26/25]", 910457645], - [108, 3, 3036, "Metrics/BlockLength: Block has too many lines. [92/25]", 2112378918], - [132, 5, 881, "Metrics/BlockLength: Block has too many lines. [27/25]", 3842010356], - [177, 5, 918, "Metrics/BlockLength: Block has too many lines. [27/25]", 2152367239], - [295, 3, 1383, "Metrics/BlockLength: Block has too many lines. [41/25]", 2141027559], - [362, 3, 1653, "Metrics/BlockLength: Block has too many lines. [33/25]", 1536472295], - [449, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3960802027], - [497, 3, 7959, "Metrics/BlockLength: Block has too many lines. [200/25]", 3739116912], - [556, 5, 1225, "Metrics/BlockLength: Block has too many lines. [31/25]", 195497726], - [740, 3, 6977, "Metrics/BlockLength: Block has too many lines. [145/25]", 2805535296], - [748, 5, 2241, "Metrics/BlockLength: Block has too many lines. [49/25]", 2552233173], - [805, 5, 3007, "Metrics/BlockLength: Block has too many lines. [59/25]", 708771722], - [877, 5, 1444, "Metrics/BlockLength: Block has too many lines. [26/25]", 3274225022], - [911, 3, 3258, "Metrics/BlockLength: Block has too many lines. [85/25]", 2346849758], - [1012, 3, 2710, "Metrics/BlockLength: Block has too many lines. [71/25]", 3801821877], - [1029, 5, 1547, "Metrics/BlockLength: Block has too many lines. [42/25]", 2962020615], - [1109, 3, 2240, "Metrics/BlockLength: Block has too many lines. [35/25]", 1139957345], - [1115, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], - [1117, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], - [1119, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1801369636], - [1121, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2652710920], - [1123, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1375785821], - [1125, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 632755459], - [1160, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], - [1162, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], - [1164, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1375785821], - [1176, 3, 1472, "Metrics/BlockLength: Block has too many lines. [31/25]", 844153987], - [1181, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1239303812], - [1183, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1251336963], - [1216, 3, 2277, "Metrics/BlockLength: Block has too many lines. [43/25]", 4287127386], - [1221, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], - [1223, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2652710920], - [1225, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1375785821], - [1227, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 632755459], - [1274, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3420615328] - ], - "spec/ast/merge/recipe/script_loader_spec.rb:2136892097": [ - [3, 1, 8554, "Metrics/BlockLength: Block has too many lines. [237/25]", 2314425369], - [45, 3, 2842, "Metrics/BlockLength: Block has too many lines. [75/25]", 168902852], - [155, 3, 1400, "Metrics/BlockLength: Block has too many lines. [39/25]", 1611123964] - ], - "spec/ast/merge/rspec/shared_examples/feature_profile_spec.rb:2654837708": [ - [5, 1, 1140, "Metrics/BlockLength: Block has too many lines. [31/25]", 678325840] - ], - "spec/ast/merge/rspec/shared_examples/file_analyzable_spec.rb:1833922303": [ - [58, 3, 970, "Metrics/AbcSize: Assignment Branch Condition size for `detect_freeze_blocks` is too high. [<16, 9, 5> 19.03/17]", 1533823667], - [58, 3, 970, "Metrics/MethodLength: Method has too many lines. [31/10]", 1533823667], - [104, 1, 1216, "Metrics/BlockLength: Block has too many lines. [39/25]", 1009012120], - [105, 3, 1159, "Metrics/BlockLength: Block has too many lines. [38/25]", 1361521205] - ], - "spec/ast/merge/rspec/shared_examples/layout_attachment_spec.rb:714796658": [ - [8, 1, 957, "Metrics/BlockLength: Block has too many lines. [28/25]", 3738990548] - ], - "spec/ast/merge/rspec/shared_examples/recipe_preset_contract_spec.rb:669158728": [ - [6, 1, 1577, "Metrics/BlockLength: Block has too many lines. [41/25]", 2157464290], - [7, 3, 1512, "Metrics/BlockLength: Block has too many lines. [39/25]", 1968160370], - [44, 5, 401, "Metrics/AbcSize: Assignment Branch Condition size for `run_verify_loaded_preset` is too high. [<0, 26, 0> 26/17]", 2960760840] - ], - "spec/ast/merge/rspec/shared_examples/removal_mode_compliance_spec.rb:31388352": [ - [6, 22, 2, "Style/MutableConstant: Freeze mutable objects assigned to constants.", 5861859], - [44, 1, 2546, "Metrics/BlockLength: Block has too many lines. [77/25]", 3740028971], - [45, 3, 1350, "Metrics/BlockLength: Block has too many lines. [41/25]", 2793151667], - [94, 3, 1128, "Metrics/BlockLength: Block has too many lines. [32/25]", 2527000512], - [95, 5, 1081, "Metrics/BlockLength: Block has too many lines. [30/25]", 3825359844] - ], - "spec/ast/merge/rspec/shared_examples/reproducible_partial_merge_spec.rb:2862326360": [ - [19, 3, 600, "Metrics/MethodLength: Method has too many lines. [13/10]", 1542875905] - ], - "spec/ast/merge/ruleset/config_spec.rb:1860949041": [ - [3, 1, 9431, "Metrics/BlockLength: Block has too many lines. [236/25]", 4015119559], - [24, 3, 5341, "Metrics/BlockLength: Block has too many lines. [149/25]", 2361087446], - [25, 5, 1064, "Metrics/BlockLength: Block has too many lines. [26/25]", 603056104], - [226, 3, 2125, "Metrics/BlockLength: Block has too many lines. [36/25]", 1640873170] - ], - "spec/ast/merge/ruleset/declaration_objects_spec.rb:3827892270": [ - [3, 1, 1881, "Metrics/BlockLength: Block has too many lines. [47/25]", 1770376910] - ], - "spec/ast/merge/ruleset/feature_profile_spec.rb:2241111096": [ - [3, 1, 4189, "Metrics/BlockLength: Block has too many lines. [86/25]", 1116963550], - [4, 3, 4129, "Metrics/BlockLength: Block has too many lines. [84/25]", 117079811], - [5, 5, 2391, "Metrics/BlockLength: Block has too many lines. [45/25]", 1800077283] - ], - "spec/ast/merge/ruleset/parser_spec.rb:386407767": [ - [3, 1, 5670, "Metrics/BlockLength: Block has too many lines. [144/25]", 3425850453], - [4, 3, 5618, "Metrics/BlockLength: Block has too many lines. [143/25]", 246633759] - ], - "spec/ast/merge/ruleset/profile_vocabulary_spec.rb:2570869276": [ - [3, 1, 2095, "Metrics/BlockLength: Block has too many lines. [46/25]", 3214342662] - ], - "spec/ast/merge/ruleset/support_style_resolver_spec.rb:640167644": [ - [3, 1, 1625, "Metrics/BlockLength: Block has too many lines. [49/25]", 2066834885], - [4, 3, 1559, "Metrics/BlockLength: Block has too many lines. [47/25]", 1169495477] - ], - "spec/ast/merge/runtime_spec.rb:3962589694": [ - [5, 1, 24649, "Metrics/BlockLength: Block has too many lines. [664/25]", 2634021188], - [76, 3, 1459, "Metrics/BlockLength: Block has too many lines. [41/25]", 3744002593], - [125, 3, 1417, "Metrics/BlockLength: Block has too many lines. [33/25]", 4087615381], - [166, 3, 2549, "Metrics/BlockLength: Block has too many lines. [69/25]", 3150260095], - [175, 5, 1068, "Metrics/BlockLength: Block has too many lines. [26/25]", 2933114685], - [247, 3, 1668, "Metrics/BlockLength: Block has too many lines. [39/25]", 2386637993], - [259, 5, 1265, "Metrics/BlockLength: Block has too many lines. [27/25]", 3157806167], - [321, 3, 10884, "Metrics/BlockLength: Block has too many lines. [295/25]", 1889265918], - [322, 5, 1879, "Metrics/BlockLength: Block has too many lines. [46/25]", 2536583521], - [373, 5, 3938, "Metrics/BlockLength: Block has too many lines. [108/25]", 340276027], - [486, 5, 1270, "Metrics/BlockLength: Block has too many lines. [38/25]", 3844174392], - [528, 5, 3728, "Metrics/BlockLength: Block has too many lines. [95/25]", 3779381786], - [630, 3, 3240, "Metrics/BlockLength: Block has too many lines. [84/25]", 3856725067], - [656, 5, 1649, "Metrics/BlockLength: Block has too many lines. [40/25]", 3713662683] - ], - "spec/ast/merge/section_typing_spec.rb:2580971307": [ - [3, 1, 14786, "Metrics/BlockLength: Block has too many lines. [344/25]", 2925587076], - [4, 3, 1940, "Metrics/BlockLength: Block has too many lines. [50/25]", 3362429388], - [67, 3, 3684, "Metrics/BlockLength: Block has too many lines. [96/25]", 3864076664], - [120, 5, 1998, "Metrics/BlockLength: Block has too many lines. [50/25]", 411620722], - [183, 3, 1415, "Metrics/BlockLength: Block has too many lines. [37/25]", 3323012675], - [192, 5, 1124, "Metrics/BlockLength: Block has too many lines. [28/25]", 966216762], - [229, 3, 1610, "Metrics/BlockLength: Block has too many lines. [38/25]", 1499957007], - [229, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 1025596574], - [279, 3, 4437, "Metrics/BlockLength: Block has too many lines. [80/25]", 423587151], - [356, 36, 23, "Style/SymbolProc: Pass `&:unclassified?` as an argument to `find` instead of a block.", 563945984], - [369, 36, 23, "Style/SymbolProc: Pass `&:unclassified?` as an argument to `find` instead of a block.", 563945984], - [375, 3, 1630, "Metrics/BlockLength: Block has too many lines. [31/25]", 1675144727] - ], - "spec/ast/merge/smart_merger_base_spec.rb:1904727390": [ - [3, 1, 13253, "Metrics/BlockLength: Block has too many lines. [398/25]", 3611753358], - [30, 9, 10, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 1099697163], - [87, 3, 1851, "Metrics/BlockLength: Block has too many lines. [40/25]", 3729571903], - [210, 3, 925, "Metrics/BlockLength: Block has too many lines. [35/25]", 2001100899], - [344, 3, 709, "Metrics/BlockLength: Block has too many lines. [27/25]", 3041950416], - [415, 3, 1074, "Metrics/BlockLength: Block has too many lines. [35/25]", 956635689], - [416, 5, 1026, "Metrics/BlockLength: Block has too many lines. [33/25]", 1993879652], - [461, 3, 1031, "Metrics/BlockLength: Block has too many lines. [31/25]", 35315996] - ], - "spec/ast/merge/structural_edit/boundary_support_spec.rb:863387845": [ - [3, 1, 4226, "Metrics/BlockLength: Block has too many lines. [86/25]", 1889771490], - [16, 9, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1304492024], - [22, 9, 41, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3828424401], - [59, 3, 1294, "Metrics/BlockLength: Block has too many lines. [26/25]", 3038774774] - ], - "spec/ast/merge/structural_edit/plan_set_spec.rb:3633263362": [ - [3, 1, 5945, "Metrics/BlockLength: Block has too many lines. [180/25]", 3883285271], - [14, 3, 2139, "Metrics/BlockLength: Block has too many lines. [72/25]", 3558415255], - [128, 3, 1412, "Metrics/BlockLength: Block has too many lines. [39/25]", 1216754705] - ], - "spec/ast/merge/structural_edit/remove_plan_spec.rb:3569534665": [ - [3, 1, 6442, "Metrics/BlockLength: Block has too many lines. [134/25]", 3440814588], - [39, 3, 3768, "Metrics/BlockLength: Block has too many lines. [75/25]", 876721813], - [127, 3, 1439, "Metrics/BlockLength: Block has too many lines. [29/25]", 3378195351] - ], - "spec/ast/merge/structural_edit/remove_plan_support_spec.rb:800158061": [ - [3, 1, 2893, "Metrics/BlockLength: Block has too many lines. [62/25]", 3748446914], - [16, 9, 43, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3196404056], - [22, 9, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 4116824817], - [29, 3, 2091, "Metrics/BlockLength: Block has too many lines. [39/25]", 1684933040], - [30, 5, 1653, "Metrics/BlockLength: Block has too many lines. [27/25]", 2456404305] - ], - "spec/ast/merge/structural_edit/splice_plan_spec.rb:3331205681": [ - [3, 1, 3159, "Metrics/BlockLength: Block has too many lines. [83/25]", 2234926397], - [16, 3, 1837, "Metrics/BlockLength: Block has too many lines. [46/25]", 2935991482], - [42, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860750] - ], - "spec/ast/merge/text/conflict_resolver_spec.rb:3810004132": [ - [5, 1, 9102, "Metrics/BlockLength: Block has too many lines. [218/25]", 672115618], - [33, 3, 8206, "Metrics/BlockLength: Block has too many lines. [194/25]", 259803246], - [78, 5, 1920, "Metrics/BlockLength: Block has too many lines. [45/25]", 3965182334], - [139, 5, 1918, "Metrics/BlockLength: Block has too many lines. [44/25]", 3707046125] - ], - "spec/ast/merge/text/file_analysis_spec.rb:3430380445": [ - [5, 1, 8842, "Metrics/BlockLength: Block has too many lines. [205/25]", 4255187284], - [6, 3, 1323, "Metrics/BlockLength: Block has too many lines. [29/25]", 2518912953], - [47, 3, 1830, "Metrics/BlockLength: Block has too many lines. [43/25]", 3685770590], - [135, 3, 1620, "Metrics/BlockLength: Block has too many lines. [35/25]", 3089951119] - ], - "spec/ast/merge/text/line_node_spec.rb:1757790485": [ - [5, 1, 4739, "Metrics/BlockLength: Block has too many lines. [131/25]", 1487875238] - ], - "spec/ast/merge/text/merge_result_spec.rb:589380024": [ - [5, 1, 1541, "Metrics/BlockLength: Block has too many lines. [40/25]", 2828087992] - ], - "spec/ast/merge/text/section_splitter_spec.rb:804308722": [ - [4, 1, 5705, "Metrics/BlockLength: Block has too many lines. [209/25]", 4175363685], - [5, 3, 794, "Metrics/BlockLength: Block has too many lines. [28/25]", 2386862842], - [42, 3, 1126, "Metrics/BlockLength: Block has too many lines. [45/25]", 1507887296], - [95, 3, 746, "Metrics/BlockLength: Block has too many lines. [30/25]", 1759029412], - [131, 3, 1169, "Metrics/BlockLength: Block has too many lines. [45/25]", 1412318991], - [184, 3, 754, "Metrics/BlockLength: Block has too many lines. [30/25]", 2717556691], - [246, 1, 16648, "Metrics/BlockLength: Block has too many lines. [428/25]", 3166834694], - [370, 3, 1640, "Metrics/BlockLength: Block has too many lines. [46/25]", 2049342960], - [424, 3, 3237, "Metrics/BlockLength: Block has too many lines. [102/25]", 2357275144], - [540, 3, 3505, "Metrics/BlockLength: Block has too many lines. [67/25]", 2112469350], - [619, 3, 3586, "Metrics/BlockLength: Block has too many lines. [90/25]", 3866409298], - [620, 5, 1650, "Metrics/BlockLength: Block has too many lines. [48/25]", 289235626], - [622, 9, 1474, "Metrics/AbcSize: Assignment Branch Condition size for `split` is too high. [<8, 21, 7> 23.54/17]", 557655357], - [622, 9, 1474, "Metrics/MethodLength: Method has too many lines. [41/10]", 557655357], - [622, 9, 1474, "Metrics/PerceivedComplexity: Perceived complexity for `split` is too high. [9/8]", 557655357], - [628, 11, 1237, "Metrics/BlockLength: Block has too many lines. [33/25]", 1134667672], - [717, 29, 44, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 2169354946], - [723, 29, 44, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 2169354946], - [751, 1, 3128, "Metrics/BlockLength: Block has too many lines. [85/25]", 2082776744], - [769, 3, 1744, "Metrics/BlockLength: Block has too many lines. [46/25]", 223880162], - [770, 5, 1258, "Metrics/BlockLength: Block has too many lines. [31/25]", 2245422869] - ], - "spec/ast/merge/text/smart_merger_spec.rb:4128732567": [ - [3, 1, 8057, "Metrics/BlockLength: Block has too many lines. [210/25]", 1690443322], - [4, 3, 1135, "Metrics/BlockLength: Block has too many lines. [28/25]", 3788979655], - [58, 3, 4438, "Metrics/BlockLength: Block has too many lines. [106/25]", 2613192474], - [187, 3, 1053, "Metrics/BlockLength: Block has too many lines. [26/25]", 803567817], - [220, 3, 892, "Metrics/BlockLength: Block has too many lines. [28/25]", 2001100899] - ], - "spec/ast/merge/text/word_node_spec.rb:1457011521": [ - [5, 1, 3264, "Metrics/BlockLength: Block has too many lines. [74/25]", 677733430] - ], - "spec/ast/merge/token_match_refiner_spec.rb:3180314913": [ - [3, 1, 4000, "Metrics/BlockLength: Block has too many lines. [80/25]", 1630791278], - [8, 3, 2912, "Metrics/BlockLength: Block has too many lines. [60/25]", 529772148] - ], - "spec/ast/merge/trailing_groups/alignment_sort_spec.rb:1594915480": [ - [5, 1, 4710, "Metrics/BlockLength: Block has too many lines. [114/25]", 2499296583], - [14, 3, 2140, "Metrics/BlockLength: Block has too many lines. [47/25]", 3871799493], - [95, 3, 1482, "Metrics/BlockLength: Block has too many lines. [35/25]", 1088314263] - ], - "spec/ast/merge/trailing_groups/core_spec.rb:2651131504": [ - [5, 1, 9601, "Metrics/BlockLength: Block has too many lines. [242/25]", 598045669], - [22, 3, 3728, "Metrics/BlockLength: Block has too many lines. [87/25]", 1304580063], - [119, 3, 3931, "Metrics/BlockLength: Block has too many lines. [99/25]", 2464218479], - [186, 5, 1322, "Metrics/BlockLength: Block has too many lines. [30/25]", 427915501], - [187, 7, 1267, "Metrics/BlockLength: Block has too many lines. [28/25]", 861882691], - [245, 3, 1306, "Metrics/BlockLength: Block has too many lines. [34/25]", 86572459] - ], - "spec/ast/merge/trailing_groups/dest_iterate_spec.rb:3632880085": [ - [5, 1, 5523, "Metrics/BlockLength: Block has too many lines. [131/25]", 3077369183], - [19, 3, 3990, "Metrics/BlockLength: Block has too many lines. [91/25]", 593259616], - [39, 35, 12, "Style/SymbolProc: Pass `&:sig` as an argument to `lambda` instead of a block.", 3587754320], - [54, 33, 23, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 384283629], - [89, 35, 13, "Style/SymbolProc: Pass `&:name` as an argument to `lambda` instead of a block.", 3561384234], - [98, 35, 12, "Style/SymbolProc: Pass `&:sig` as an argument to `lambda` instead of a block.", 3587754320], - [113, 35, 12, "Style/SymbolProc: Pass `&:sig` as an argument to `lambda` instead of a block.", 3587754320] - ], - "spec/ast/merge/unresolved_policy_spec.rb:2561713656": [ - [3, 1, 1333, "Metrics/BlockLength: Block has too many lines. [33/25]", 4109547889] - ], - "spec/ast/merge/unresolved_review_state_spec.rb:3186871217": [ - [3, 1, 1038, "Metrics/BlockLength: Block has too many lines. [31/25]", 1325553035] - ], - "spec/ast/merge_spec.rb:664670069": [ - [3, 1, 3113, "Metrics/BlockLength: Block has too many lines. [74/25]", 4034649501], - [9, 3, 2227, "Metrics/BlockLength: Block has too many lines. [51/25]", 578300230], - [10, 5, 2182, "Metrics/BlockLength: Block has too many lines. [49/25]", 2758871265] - ], - "spec/base_substrate_spec.rb:2864492094": [ - [5, 1, 5800, "Metrics/BlockLength: Block has too many lines. [143/25]", 784801982], - [6, 3, 192, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 680981873], - [13, 3, 378, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1223797442], - [31, 3, 628, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 2123191050], - [53, 3, 429, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3536712197], - [69, 3, 24, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 2280792512], - [70, 3, 78, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 604224776], - [72, 3, 146, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3315091322] - ], - "spec/fixtures_integration_spec.rb:1145500459": [ - [595, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859109], - [758, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 576909008], - [881, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087900170], - [1806, 3, 816, "Metrics/MethodLength: Method has too many lines. [13/10]", 170960660], - [1806, 39, 213, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 635200700], - [1807, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3976306097], - [1831, 38, 80, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3297939075], - [1916, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1745553512], - [1917, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 118067488], - [1918, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 196190368], - [1919, 121, 41, "Layout/LineLength: Line is too long. [161/120]", 3371256193], - [2090, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3241114703], - [2428, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], - [2567, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], - [2991, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3697593604], - [2992, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], - [3113, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179435314], - [3122, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1182194285], - [3124, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 3886107031], - [3151, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1751849111], - [3152, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1519587684], - [3153, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 4086262880], - [3170, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3568081822], - [3171, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1776876782], - [3173, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [3174, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1751849111], - [3176, 121, 73, "Layout/LineLength: Line is too long. [193/120]", 3322243646], - [3178, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1715153206], - [3179, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [3180, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 504997180], - [3181, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 1146860021], - [3182, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 2312101607], - [3183, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1423779161], - [3184, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1900897138], - [3185, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 1689840383], - [3186, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 1589056236], - [3188, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 763176550], - [3194, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3957871310], - [3196, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 763176550], - [3198, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 919916608], - [3199, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 919916608], - [3200, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3957871310], - [3201, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 4073040612], - [3202, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 763176550], - [3203, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 667593075], - [3205, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1310972770], - [3206, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 311387795], - [3207, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 724840266], - [3208, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 2555878310], - [3209, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1781078972], - [3210, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [3213, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [3214, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1658060570], - [3215, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 3085728851], - [3216, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3129400559], - [3217, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3197516464], - [3218, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087771520], - [3219, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3837194228], - [3220, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1312323543], - [3221, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 2356847623], - [3222, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [3223, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3428073441], - [3224, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 2891080552], - [3225, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3080737172], - [3226, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 170445026], - [3227, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3240051869], - [3228, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 4266052680], - [3229, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3376297786], - [3230, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 398435913], - [3231, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 4134940256], - [3232, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 30370035], - [3233, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 2862546359], - [3234, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1901388514], - [3235, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 838864274], - [3236, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 3437460384], - [3237, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1567003152], - [3238, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2609066305], - [3239, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 4043187090], - [3240, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3866430009], - [3241, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 2182699083], - [3242, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 3958792129], - [3243, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3449926560], - [3244, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 399774089], - [3245, 121, 68, "Layout/LineLength: Line is too long. [188/120]", 2119246799], - [3247, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3592658842], - [3248, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2905723409], - [3249, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 3930305198], - [3250, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 4186230052], - [3251, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [3252, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2700200720], - [3253, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 1630526402], - [3254, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3669244926], - [3255, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2814234644], - [3256, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3109415933], - [3257, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3643275044], - [3258, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 3825290660], - [3259, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1751849111], - [3260, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 4112285398], - [3261, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 1684279672], - [3262, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 1616506266], - [3264, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [3265, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1330093223], - [3266, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 4084555566], - [3267, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 2466867154], - [3268, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 4088314613], - [3269, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 2416893689], - [3270, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 683312682], - [3271, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 2516517934], - [3272, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2414563355], - [3273, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 2232595211], - [3274, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 2940789369], - [3275, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 941259913], - [3276, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2133508098], - [3277, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1621975014], - [3278, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 35985461], - [3279, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 746016305], - [3280, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 435488100], - [3281, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 2581129172], - [3282, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 3495900774], - [3283, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1413120342], - [3284, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [3285, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2333800791], - [3286, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 2576906206], - [3287, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 2986659874], - [3288, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2811932564], - [3289, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 1970813291], - [3290, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 2904941246], - [3291, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3745922508], - [3292, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 735247237], - [3293, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3731320885], - [3294, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 3896022034], - [3295, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 2827048584], - [3296, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 2548596663], - [3297, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 3812352018], - [3298, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 1280243910], - [3299, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 1742643292], - [3300, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 3056442430], - [3301, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 3144363287], - [3302, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 477297993], - [3303, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 3657857971], - [3304, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3913984414], - [3305, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 336201058], - [3306, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 485418789], - [3307, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 453253839], - [3308, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3673833034], - [3309, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 1552836890], - [3310, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 2714635965], - [3311, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 9336999], - [3312, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 584857208], - [3313, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1394865213], - [3314, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 3973222761], - [3315, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 2020040051], - [3316, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 3060994335], - [3317, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 196286917], - [3318, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 4168514178], - [3319, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 810581246], - [3320, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 1473417372], - [3321, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 3008376885], - [3322, 121, 84, "Layout/LineLength: Line is too long. [204/120]", 454816400], - [3323, 121, 88, "Layout/LineLength: Line is too long. [208/120]", 1416223705], - [3324, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 2896813919], - [3325, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 957293983], - [3326, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 2118117430], - [3327, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 1367404612], - [3328, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 2459902188], - [3329, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 461483815], - [3330, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 2791596520], - [3331, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 203085787], - [3332, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 2942095139], - [3333, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 131861965], - [3334, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 3340827551], - [3335, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 102582610], - [3336, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 762789354], - [3337, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 3478337442], - [3338, 121, 112, "Layout/LineLength: Line is too long. [232/120]", 4010607435], - [3339, 121, 132, "Layout/LineLength: Line is too long. [252/120]", 3754747587], - [3340, 121, 136, "Layout/LineLength: Line is too long. [256/120]", 379336923], - [3341, 121, 108, "Layout/LineLength: Line is too long. [228/120]", 3366353902], - [3342, 121, 128, "Layout/LineLength: Line is too long. [248/120]", 1686898289], - [3343, 121, 132, "Layout/LineLength: Line is too long. [252/120]", 2005192241], - [3344, 121, 104, "Layout/LineLength: Line is too long. [224/120]", 1868634464], - [3345, 121, 124, "Layout/LineLength: Line is too long. [244/120]", 3939743614], - [3346, 121, 128, "Layout/LineLength: Line is too long. [248/120]", 2978506702], - [3347, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 3909866928], - [3348, 121, 118, "Layout/LineLength: Line is too long. [238/120]", 2853032177], - [3349, 121, 122, "Layout/LineLength: Line is too long. [242/120]", 2968366309], - [3350, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 1753663643], - [3351, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 3387619436], - [3352, 121, 106, "Layout/LineLength: Line is too long. [226/120]", 197895496], - [3353, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 576181861], - [3354, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 2809313444], - [3355, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 3963067112], - [3356, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 1121380327], - [3357, 121, 100, "Layout/LineLength: Line is too long. [220/120]", 31591211], - [3358, 121, 104, "Layout/LineLength: Line is too long. [224/120]", 1946129497], - [3359, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 767185096], - [3360, 121, 100, "Layout/LineLength: Line is too long. [220/120]", 1092646020], - [3361, 121, 104, "Layout/LineLength: Line is too long. [224/120]", 1328841270], - [3362, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 2663749624], - [3363, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 430318647], - [3364, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 1650234037], - [3365, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 1082269805], - [3366, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 316397809], - [3367, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 3145391348], - [3368, 121, 112, "Layout/LineLength: Line is too long. [232/120]", 2808088654], - [3369, 121, 116, "Layout/LineLength: Line is too long. [236/120]", 1035513748], - [3370, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 2552800539], - [3371, 121, 112, "Layout/LineLength: Line is too long. [232/120]", 1727699169], - [3372, 121, 116, "Layout/LineLength: Line is too long. [236/120]", 1171566267], - [3373, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 2994775049], - [3374, 121, 110, "Layout/LineLength: Line is too long. [230/120]", 3860489151], - [3375, 121, 114, "Layout/LineLength: Line is too long. [234/120]", 959496607], - [3376, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 1694222439], - [3377, 121, 114, "Layout/LineLength: Line is too long. [234/120]", 1501186331], - [3378, 121, 118, "Layout/LineLength: Line is too long. [238/120]", 4059659418], - [3379, 121, 110, "Layout/LineLength: Line is too long. [230/120]", 1899868779], - [3380, 121, 130, "Layout/LineLength: Line is too long. [250/120]", 323324279], - [3381, 121, 134, "Layout/LineLength: Line is too long. [254/120]", 3956414359], - [3382, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 3506644741], - [3383, 121, 116, "Layout/LineLength: Line is too long. [236/120]", 936139074], - [3384, 121, 136, "Layout/LineLength: Line is too long. [256/120]", 4153213512], - [3385, 121, 140, "Layout/LineLength: Line is too long. [260/120]", 1491976338], - [3386, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 4061753206], - [3387, 121, 106, "Layout/LineLength: Line is too long. [226/120]", 2410434304], - [3388, 121, 124, "Layout/LineLength: Line is too long. [244/120]", 3518300264], - [3389, 121, 144, "Layout/LineLength: Line is too long. [264/120]", 1040696046], - [3390, 121, 148, "Layout/LineLength: Line is too long. [268/120]", 139604188], - [3391, 121, 120, "Layout/LineLength: Line is too long. [240/120]", 231937793], - [3392, 121, 140, "Layout/LineLength: Line is too long. [260/120]", 1835509805], - [3393, 121, 144, "Layout/LineLength: Line is too long. [264/120]", 1629218396], - [3394, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 2312875700], - [3395, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 2933374083], - [3396, 121, 106, "Layout/LineLength: Line is too long. [226/120]", 1719349671], - [3397, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 2555579810], - [3398, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 2023551624], - [3399, 121, 114, "Layout/LineLength: Line is too long. [234/120]", 955231924], - [3400, 121, 118, "Layout/LineLength: Line is too long. [238/120]", 4232993781], - [3401, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 3472954835], - [3402, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 3211922285], - [3403, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 2874956332], - [3404, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 1360335840], - [3405, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2135379556], - [3406, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3242768475], - [3407, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 2789115918], - [3408, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3346448124], - [3409, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1538469817], - [3410, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1543041113], - [3411, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 3344741438], - [3412, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2188404009], - [3413, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1330398779], - [3414, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 332468826], - [3415, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 1905397598], - [3416, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 438831062], - [3417, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 3377667334], - [3418, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3232541734], - [3420, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2130930429], - [3421, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 3684939371], - [3423, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2361951097], - [3424, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 1211447462], - [3425, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3309872691], - [3426, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 360053761], - [3427, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 1310136493], - [3428, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1950686342], - [3429, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 1397845826], - [3430, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 4191304724], - [3431, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2354128498], - [3432, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 1865717453], - [3433, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 24220542], - [3434, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 2618612673], - [3437, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3422918867], - [3438, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3689431739], - [3482, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 4093564799], - [3488, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1662653970], - [3489, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3967501655], - [3490, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2178516622], - [3491, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 1345346561], - [3505, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193466072], - [3625, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 3612393276], - [3626, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 797303985], - [3629, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1606320605], - [3649, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1776876782], - [3653, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 828742791], - [3673, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3294617581], - [3683, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3519842846], - [3693, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1966440909], - [3694, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053864], - [3700, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1606320605], - [3723, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 1340744311], - [3742, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1741893077], - [3743, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053865], - [3747, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193405204], - [3761, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1401226501], - [3764, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085352569], - [3767, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 696523922], - [3782, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], - [3792, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2746826653], - [4208, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1138870161], - [4770, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], - [4781, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 2132299307], - [4828, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087775098], - [4839, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 757851079], - [4875, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], - [4886, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 441649198], - [4909, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087903295], - [4921, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 170442008], - [4930, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], - [4932, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1888875443], - [4969, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 398433651], - [4980, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3921367744], - [5003, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2422819473], - [5009, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 194583095], - [5015, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1901385496], - [5024, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 490810486], - [5026, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 586287746], - [5030, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1310969752], - [5050, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087389205], - [5062, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2609063547], - [5071, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], - [5073, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1370761696], - [5096, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 2208661169], - [5102, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1862604658], - [5108, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 3958789371], - [5117, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3449594464], - [5119, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 692050524], - [5123, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 802172558], - [5193, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2406691660], - [5228, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], - [5239, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1811982742], - [5266, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2562189319], - [5272, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193430346], - [5278, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2814237166], - [5287, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2189106693], - [5289, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 3874870868], - [5293, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179474914], - [5326, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1751845165], - [5337, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2617230371], - [5341, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], - [5382, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], - [5393, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3793790598], - [5428, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 4088312783], - [5439, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3220724736], - [5443, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087899888], - [5462, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2552888401], - [5468, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 194583095], - [5474, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2414559905], - [5483, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 626762179], - [5485, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3969284923], - [5489, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 1893261414], - [5521, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2133507320], - [5532, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 2101353476], - [5536, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087685705], - [5555, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2431380437], - [5561, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 194583095], - [5567, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 435489438], - [5576, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 1520878209], - [5578, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 2238995076], - [5582, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 2789405913], - [5615, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], - [5626, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3409328196], - [5649, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087858069], - [5661, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2811935086], - [5670, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], - [5672, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1113346693], - [5676, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3227128786], - [5696, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 48793812], - [5702, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 338440584], - [5708, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 735248703], - [5717, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 927473097], - [5719, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 1394536741], - [5723, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3134012967], - [5742, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 2967615316], - [5748, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 2810710931], - [5754, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 2548594701], - [5757, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860796], - [5759, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], - [5763, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3549194295], - [5765, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 1074004741], - [5769, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 2874423564], - [5772, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087576526], - [5774, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], - [5789, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 1696848307], - [5795, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 2883501659], - [5801, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 3056443076], - [5806, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193405204], - [5810, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 1487412605], - [5812, 121, 51, "Layout/LineLength: Line is too long. [171/120]", 2021571284], - [5816, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1975782995], - [5819, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860796], - [5821, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193405204], - [5826, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 183236849], - [5835, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 856018753], - [5838, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], - [5841, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 2146546324], - [5847, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3913983076], - [5850, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 3491931666], - [5852, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3536323546], - [5856, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 356581191], - [5858, 121, 63, "Layout/LineLength: Line is too long. [183/120]", 4144657639], - [5862, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 1478616653], - [5865, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1774852021], - [5867, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3536323546], - [5882, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3884289787], - [5888, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 1001503687], - [5894, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3673836976], - [5903, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 3164908550], - [5905, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 1134300778], - [5909, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1797165224], - [5928, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 2508143995], - [5934, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 3002532188], - [5940, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 584857986], - [5943, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860796], - [5945, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], - [5949, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 749691384], - [5951, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 3389354954], - [5955, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 3402045699], - [5958, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087576526], - [5960, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], - [5974, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 2447716612], - [5980, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3201685099], - [5986, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 3060990885], - [5995, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 29396315], - [5997, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 1228645365], - [6001, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1436742837], - [6020, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 716917214], - [6026, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 2175814211], - [6032, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 1473420390], - [6035, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193433391], - [6037, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1422839111], - [6041, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 1571170198], - [6043, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 2175059093], - [6047, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3886666417], - [6050, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 176753677], - [6052, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1422839111], - [6068, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 3471319495], - [6074, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 1274038477], - [6080, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 2896814693], - [6083, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087576526], - [6085, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114086530], - [6089, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 250433828], - [6091, 121, 59, "Layout/LineLength: Line is too long. [179/120]", 3910556848], - [6095, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4002014976], - [6098, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 3491931666], - [6100, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114086530], - [6194, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861664], - [6208, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087932582], - [6222, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861664], - [6238, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 876012844], - [6240, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1756764194], - [6241, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 4173216735], - [6244, 121, 75, "Layout/LineLength: Line is too long. [195/120]", 911964425], - [6245, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 173266907], - [6246, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1412705933], - [6249, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1756764194], - [6250, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 2605683750], - [6253, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 3182252139], - [6255, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1652557742], - [6259, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 2240437058], - [6260, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 173266907], - [6261, 121, 101, "Layout/LineLength: Line is too long. [221/120]", 3694598076], - [6263, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861152], - [6264, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179079542], - [6265, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 3528944411], - [6268, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3020159378], - [6270, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1652557742], - [6276, 121, 84, "Layout/LineLength: Line is too long. [204/120]", 420843234], - [6278, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1401226501], - [6279, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 442915368], - [6282, 121, 79, "Layout/LineLength: Line is too long. [199/120]", 4212444955], - [6283, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053864], - [6284, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1373660924], - [6287, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1401226501], - [6288, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 1539225758], - [6291, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3020159378], - [6293, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 4240691845], - [6297, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 674553335], - [6298, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053864], - [6299, 121, 105, "Layout/LineLength: Line is too long. [225/120]", 4163432287], - [6301, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2089555761], - [6302, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2034687276], - [6303, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 3710905302], - [6306, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 4204667212], - [6308, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 4240691845], - [6314, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 2071493433], - [6316, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085352569], - [6317, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 2853066942], - [6320, 121, 71, "Layout/LineLength: Line is too long. [191/120]", 2771467828], - [6321, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193425976], - [6322, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3025157142], - [6325, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085352569], - [6326, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 3340824101], - [6329, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 3999804761], - [6331, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1999310973], - [6335, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 835016333], - [6336, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193425976], - [6337, 121, 97, "Layout/LineLength: Line is too long. [217/120]", 3575893945], - [6340, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193405945], - [6341, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 1755858308], - [6344, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 3182252139], - [6346, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1999310973], - [6352, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 3033080032], - [6354, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177549], - [6355, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 2720985203], - [6358, 121, 65, "Layout/LineLength: Line is too long. [185/120]", 3233424320], - [6360, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873483], - [6363, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177549], - [6364, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 131859703], - [6367, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1943494546], - [6369, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 4016166830], - [6373, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 1350760977], - [6375, 121, 91, "Layout/LineLength: Line is too long. [211/120]", 4098706554], - [6379, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 4059724765], - [6382, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1651955548], - [6384, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 4016166830], - [6390, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 1057495720], - [6393, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1621971220], - [6396, 121, 49, "Layout/LineLength: Line is too long. [169/120]", 1585717593], - [6402, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 2942094233], - [6405, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2624667704], - [6407, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2317051977], - [6411, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 1321610634], - [6413, 121, 75, "Layout/LineLength: Line is too long. [195/120]", 2854688831], - [6417, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 4185465554], - [6420, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1169781875], - [6422, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2317051977], - [6428, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 1916545020], - [6431, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1422839111], - [6434, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 910134593], - [6440, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 203086561], - [6443, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2939363812], - [6445, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3155638331], - [6449, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 1955758062], - [6451, 121, 71, "Layout/LineLength: Line is too long. [191/120]", 3737424359], - [6455, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 3597620692], - [6458, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2624667704], - [6460, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3155638331], - [6466, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 1036052399], - [6469, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114086530], - [6472, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 1268266488], - [6478, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 2791598354], - [6481, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1302589368], - [6483, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3533902728], - [6487, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 3942276897], - [6489, 121, 73, "Layout/LineLength: Line is too long. [193/120]", 1175941460], - [6493, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 679697318], - [6496, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 28126263], - [6498, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3533902728], - [6499, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 181895237], - [6504, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 4057848448], - [6507, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114086530], - [6510, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 4067769399], - [6516, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 461482909], - [6519, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1302589368], - [6521, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3533902728], - [6525, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 3561204590], - [6527, 121, 73, "Layout/LineLength: Line is too long. [193/120]", 880160795], - [6531, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 1614719145], - [6534, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 28126263], - [6536, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3533902728], - [6537, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 181895237], - [6584, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193432306], - [6598, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 1645945966], - [6601, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3212740609], - [6604, 121, 59, "Layout/LineLength: Line is too long. [179/120]", 3982698123], - [6606, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193425997], - [6610, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 2663750402], - [6613, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2420297272], - [6615, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1164389943], - [6619, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 3483121581], - [6621, 121, 85, "Layout/LineLength: Line is too long. [205/120]", 2271668600], - [6625, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 804794365], - [6628, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3659367004], - [6630, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1164389943], - [6631, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 561395486], - [6636, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 1251661057], - [6639, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3212740609], - [6642, 121, 59, "Layout/LineLength: Line is too long. [179/120]", 3210109508], - [6644, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193425997], - [6648, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 430316685], - [6651, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2420297272], - [6653, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1164389943], - [6657, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 2428160226], - [6659, 121, 85, "Layout/LineLength: Line is too long. [205/120]", 2663295671], - [6663, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 2822109938], - [6666, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3659367004], - [6668, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1164389943], - [6669, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 561395486], - [6674, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 857639785], - [6677, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3669622788], - [6680, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 140453799], - [6682, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860765], - [6686, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 1650236431], - [6689, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 150699323], - [6691, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 50618962], - [6695, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 4205571164], - [6697, 121, 83, "Layout/LineLength: Line is too long. [203/120]", 1549528021], - [6701, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 1325488145], - [6704, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1510711065], - [6706, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 50618962], - [6712, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 3043205563], - [6715, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2381137493], - [6718, 121, 61, "Layout/LineLength: Line is too long. [181/120]", 2200345195], - [6720, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087926498], - [6724, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 1082269527], - [6727, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1510711065], - [6729, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1104064739], - [6733, 121, 68, "Layout/LineLength: Line is too long. [188/120]", 1652941658], - [6735, 121, 87, "Layout/LineLength: Line is too long. [207/120]", 1440323819], - [6739, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 802896260], - [6742, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1943494546], - [6744, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1104064739], - [6750, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 788730815], - [6752, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2034687276], - [6753, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 4226330106], - [6756, 121, 77, "Layout/LineLength: Line is too long. [197/120]", 2414796320], - [6757, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873470], - [6758, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3090817832], - [6761, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2034687276], - [6762, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 2839148677], - [6765, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 2393983240], - [6767, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 2581936864], - [6771, 121, 84, "Layout/LineLength: Line is too long. [204/120]", 3923254945], - [6772, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873470], - [6773, 121, 103, "Layout/LineLength: Line is too long. [223/120]", 580639726], - [6775, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193419246], - [6776, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1756764194], - [6777, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 3202758044], - [6780, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 912651721], - [6782, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 2581936864], - [6786, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1164293389], - [6799, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860840], - [6800, 121, 88, "Layout/LineLength: Line is too long. [208/120]", 574552570], - [6802, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3845073641], - [6803, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 543375177], - [6806, 121, 83, "Layout/LineLength: Line is too long. [203/120]", 222410330], - [6807, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3025157219], - [6808, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1904561434], - [6811, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 489872984], - [6812, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 97325617], - [6815, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 4204667212], - [6817, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 4062673070], - [6821, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 1451915960], - [6822, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3025157219], - [6823, 121, 109, "Layout/LineLength: Line is too long. [229/120]", 4200529758], - [6825, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1497831350], - [6826, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 4214367244], - [6827, 121, 84, "Layout/LineLength: Line is too long. [204/120]", 399603517], - [6830, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3423548875], - [6832, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 4062673070], - [6836, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3279830097], - [6848, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 659167322], - [6860, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087926423], - [6861, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 3300294193], - [6863, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3172850966], - [6864, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 2396187736], - [6867, 121, 87, "Layout/LineLength: Line is too long. [207/120]", 1991888901], - [6868, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1954380402], - [6869, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2589970962], - [6872, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 42340644], - [6873, 121, 67, "Layout/LineLength: Line is too long. [187/120]", 479235996], - [6876, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3423548875], - [6878, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1462541970], - [6882, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 1373978781], - [6883, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1954380402], - [6884, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 280641011], - [6886, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1664110553], - [6887, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1009650381], - [6888, 121, 88, "Layout/LineLength: Line is too long. [208/120]", 909329343], - [6891, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 2977589831], - [6893, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1462541970], - [6898, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873470], - [6899, 121, 61, "Layout/LineLength: Line is too long. [181/120]", 1904101094], - [6901, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2229256255], - [6902, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 1839090017], - [6905, 121, 91, "Layout/LineLength: Line is too long. [211/120]", 4260980907], - [6906, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 4253118453], - [6907, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1536690221], - [6909, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861152], - [6910, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 209824656], - [6911, 121, 71, "Layout/LineLength: Line is too long. [191/120]", 1530496074], - [6914, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 2977589831], - [6916, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3261436902], - [6920, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 3762694917], - [6921, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 4253118453], - [6922, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 3196230010], - [6924, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3165598659], - [6925, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 4264469493], - [6926, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 3140690958], - [6929, 121, 35, "Layout/LineLength: Line is too long. [155/120]", 2999583208], - [6931, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3261436902], - [6937, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 326070599], - [6940, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1621971220], - [6943, 121, 49, "Layout/LineLength: Line is too long. [169/120]", 1689000214], - [6949, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 2459904022], - [6952, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2624667704], - [6954, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2317051977], - [6958, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 2842872837], - [6960, 121, 75, "Layout/LineLength: Line is too long. [195/120]", 423884656], - [6964, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 2673769885], - [6967, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1169781875], - [6969, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2317051977], - [6970, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2126253911], - [6986, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 2388292564], - [6989, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2381137493], - [6992, 121, 61, "Layout/LineLength: Line is too long. [181/120]", 1136762660], - [6994, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087926498], - [6998, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 2555581016], - [7001, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1510711065], - [7003, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1104064739], - [7007, 121, 68, "Layout/LineLength: Line is too long. [188/120]", 1986812885], - [7009, 121, 87, "Layout/LineLength: Line is too long. [207/120]", 1864036132], - [7013, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 3590180043], - [7016, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1943494546], - [7018, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1104064739], - [7019, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2382712010], - [7029, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1791534645], - [7034, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 2403815412], - [7037, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1422839111], - [7040, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 4046048864], - [7046, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 3472955113], - [7049, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2939363812], - [7051, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3155638331], - [7055, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3911469720], - [7057, 121, 71, "Layout/LineLength: Line is too long. [191/120]", 272433263], - [7061, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 634420444], - [7064, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2624667704], - [7066, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3155638331], - [7067, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2088324682], - [7080, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087906711], - [7092, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2135380894], - [7101, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], - [7103, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 4280757685], - [7107, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 161599970], - [7141, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053789], - [7176, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2188407955], - [7187, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3692322233], - [7191, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087557694], - [7214, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3197512522], - [7223, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858840], - [7225, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 85298067], - [7282, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193418403], - [7288, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193418403], - [7311, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087432474], - [7323, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2361949763], - [7332, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], - [7334, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 581045160], - [7338, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 4235011647], - [7357, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1898147766], - [7363, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177560], - [7369, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 1310140439], - [7378, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 681770239], - [7380, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3821940657], - [7384, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], - [7404, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861292], - [7416, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2354124424], - [7425, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087922021], - [7427, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 3921370162], - [8020, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 4083054536], - [8048, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 4083054536], - [8077, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 4083054536], - [8135, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 632953222], - [8164, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 732995265], - [8214, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 1886249927], - [8376, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 578751979], - [8377, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3803540269], - [8386, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2238403955], - [8387, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1028441932], - [8388, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 1975950909], - [8443, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1244043798] - ], - "spec/integration/freeze_node_edge_cases_spec.rb:3416491031": [ - [6, 1, 28959, "Metrics/BlockLength: Block has too many lines. [663/25]", 3473768018], - [7, 3, 2985, "Metrics/BlockLength: Block has too many lines. [57/25]", 436154415], - [8, 5, 2934, "Metrics/BlockLength: Block has too many lines. [55/25]", 1963918102], - [78, 3, 6091, "Metrics/BlockLength: Block has too many lines. [136/25]", 232153494], - [98, 5, 3053, "Metrics/BlockLength: Block has too many lines. [69/25]", 1442974101], - [202, 5, 1691, "Metrics/BlockLength: Block has too many lines. [29/25]", 985654389], - [241, 3, 8515, "Metrics/BlockLength: Block has too many lines. [176/25]", 2776676526], - [473, 3, 2024, "Metrics/BlockLength: Block has too many lines. [55/25]", 1048101963], - [474, 5, 890, "Metrics/BlockLength: Block has too many lines. [26/25]", 753961540], - [543, 3, 4511, "Metrics/BlockLength: Block has too many lines. [116/25]", 1227615145], - [693, 3, 1660, "Metrics/BlockLength: Block has too many lines. [43/25]", 1881888061], - [694, 5, 1107, "Metrics/BlockLength: Block has too many lines. [26/25]", 368095693] - ], - "spec/integration/gem_family_section_merge_spec.rb:1744383089": [ - [164, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 93655697] - ], - "spec/integration/integration_spec.rb:2239247043": [ - [14, 1, 4488, "Metrics/BlockLength: Block has too many lines. [88/25]", 206207480], - [15, 3, 3267, "Metrics/BlockLength: Block has too many lines. [62/25]", 1323899085], - [40, 5, 2263, "Metrics/BlockLength: Block has too many lines. [48/25]", 3172595581] - ], - "spec/integration/link_reference_preservation_spec.rb:3764298162": [ - [6, 1, 2646, "Metrics/BlockLength: Block has too many lines. [48/25]", 3396410609], - [19, 3, 2058, "Metrics/BlockLength: Block has too many lines. [33/25]", 163363949] - ], - "spec/integration/markly_merge_spec.rb:3076950975": [ - [3, 1, 22886, "Metrics/BlockLength: Block has too many lines. [670/25]", 1408138744], - [62, 3, 7192, "Metrics/BlockLength: Block has too many lines. [189/25]", 1890889324], - [63, 5, 1678, "Metrics/BlockLength: Block has too many lines. [41/25]", 2587582896], - [115, 5, 1808, "Metrics/BlockLength: Block has too many lines. [48/25]", 3381172795], - [147, 46, 21, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 451071547], - [171, 5, 1134, "Metrics/BlockLength: Block has too many lines. [30/25]", 2526618199], - [220, 5, 1335, "Metrics/BlockLength: Block has too many lines. [32/25]", 2790596215], - [311, 3, 2008, "Metrics/BlockLength: Block has too many lines. [66/25]", 2640155627], - [394, 3, 1052, "Metrics/BlockLength: Block has too many lines. [27/25]", 3988836255], - [440, 3, 2950, "Metrics/BlockLength: Block has too many lines. [89/25]", 961031348], - [441, 5, 1352, "Metrics/BlockLength: Block has too many lines. [37/25]", 1952365669], - [495, 5, 1550, "Metrics/BlockLength: Block has too many lines. [48/25]", 2400197001], - [561, 3, 1665, "Metrics/BlockLength: Block has too many lines. [52/25]", 3884776329], - [650, 3, 1919, "Metrics/BlockLength: Block has too many lines. [57/25]", 2594646583], - [725, 3, 1644, "Metrics/BlockLength: Block has too many lines. [45/25]", 2348710811], - [791, 3, 1600, "Metrics/BlockLength: Block has too many lines. [46/25]", 3683503747] - ], - "spec/integration/partial_template_merger_table_merge_spec.rb:3504046892": [ - [7, 1, 7402, "Metrics/BlockLength: Block has too many lines. [164/25]", 3368892126], - [9, 3, 2986, "Metrics/BlockLength: Block has too many lines. [67/25]", 2267114449], - [65, 5, 1359, "Metrics/BlockLength: Block has too many lines. [28/25]", 3145143002], - [102, 3, 997, "Metrics/BlockLength: Block has too many lines. [26/25]", 3156068215], - [147, 3, 3009, "Metrics/BlockLength: Block has too many lines. [65/25]", 994160212], - [202, 5, 1401, "Metrics/BlockLength: Block has too many lines. [28/25]", 3038951618] - ], - "spec/integration/table_formatting_preservation_spec.rb:3943985446": [ - [6, 1, 3086, "Metrics/BlockLength: Block has too many lines. [56/25]", 2210897849], - [19, 3, 2374, "Metrics/BlockLength: Block has too many lines. [40/25]", 668961519], - [33, 5, 1847, "Metrics/BlockLength: Block has too many lines. [28/25]", 3433318963] - ], - "spec/integration/text_merge_spec.rb:884566200": [ - [6, 1, 7747, "Metrics/BlockLength: Block has too many lines. [204/25]", 2372984305], - [60, 3, 1113, "Metrics/BlockLength: Block has too many lines. [34/25]", 3399970957], - [67, 5, 860, "Metrics/BlockLength: Block has too many lines. [27/25]", 2337191560], - [103, 3, 916, "Metrics/BlockLength: Block has too many lines. [28/25]", 4082963348], - [149, 3, 3001, "Metrics/BlockLength: Block has too many lines. [74/25]", 7776854] - ], - "spec/support/fictive_language_harness.rb:1770581700": [ - [85, 7, 733, "Metrics/AbcSize: Assignment Branch Condition size for `extract_comments` is too high. [<5, 16, 5> 17.49/17]", 1127096515], - [85, 7, 733, "Metrics/MethodLength: Method has too many lines. [22/10]", 1127096515], - [117, 21, 129, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 681912759], - [182, 7, 1084, "Metrics/AbcSize: Assignment Branch Condition size for `parse_statements` is too high. [<9, 28, 7> 30.23/17]", 3123785685], - [182, 7, 1084, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_statements` is too high. [8/7]", 3123785685], - [182, 7, 1084, "Metrics/MethodLength: Method has too many lines. [24/10]", 3123785685], - [233, 5, 9879, "Metrics/ClassLength: Class has too many lines. [228/100]", 3231256134], - [236, 21, 208, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2970487173], - [257, 7, 1981, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_batch` is too high. [<16, 32, 4> 36/17]", 4125392918], - [257, 7, 1981, "Metrics/MethodLength: Method has too many lines. [42/10]", 4125392918], - [342, 7, 778, "Metrics/MethodLength: Method has too many lines. [18/10]", 4189873983], - [364, 7, 844, "Metrics/MethodLength: Method has too many lines. [19/10]", 526186683], - [449, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087956942], - [464, 7, 1065, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_template_preamble_prefix_region` is too high. [<6, 24, 11> 27.07/17]", 2332280467], - [464, 7, 1065, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collapse_template_preamble_prefix_region` is too high. [10/7]", 2332280467], - [464, 7, 1065, "Metrics/MethodLength: Method has too many lines. [20/10]", 2332280467], - [464, 7, 1065, "Metrics/PerceivedComplexity: Perceived complexity for `collapse_template_preamble_prefix_region` is too high. [10/8]", 2332280467] - ], - "spec/support/testable_node.rb:1110514732": [ - [10, 7, 573, "Metrics/MethodLength: Method has too many lines. [12/10]", 798847435], - [10, 22, 226, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 2319398994], - [40, 7, 642, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<11, 14, 6> 18.79/17]", 2249578474], - [40, 21, 131, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 1786967686] - ] -} diff --git a/gems/ast-merge/Gemfile.lock b/gems/ast-merge/Gemfile.lock index b418a067c..40333e45c 100644 --- a/gems/ast-merge/Gemfile.lock +++ b/gems/ast-merge/Gemfile.lock @@ -275,6 +275,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -308,7 +324,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -363,18 +378,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -538,22 +542,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -659,9 +659,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -739,7 +739,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -760,10 +759,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -838,13 +837,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/ast-merge/README.md b/gems/ast-merge/README.md index f4089c7d5..19257e522 100644 --- a/gems/ast-merge/README.md +++ b/gems/ast-merge/README.md @@ -576,7 +576,6 @@ If none of the available licenses suit your use case, please [contact us](mailto [🖐contrib-rocks]: https://contrib.rocks [🖐contributors]: https://github.com/structuredmerge/structuredmerge-ruby/graphs/contributors [🖐contributors-img]: https://contrib.rocks/image?repo=structuredmerge/structuredmerge-ruby -[🚎contributors-gl]: https://gitlab.com/structuredmerge/structuredmerge-ruby/-/graphs/main [🪇conduct]: https://github.com/structuredmerge/structuredmerge-ruby/blob/main/CODE_OF_CONDUCT.md [🪇conduct-img]: https://img.shields.io/badge/Contributor_Covenant-2.1-259D6C.svg [📌pvc]: http://guides.rubygems.org/patterns/#pessimistic-version-constraint diff --git a/gems/ast-merge/bin/yard b/gems/ast-merge/bin/yard index 5d516ad6f..a7e8b6eed 100755 --- a/gems/ast-merge/bin/yard +++ b/gems/ast-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec('bundle', 'exec', 'rake', 'yard') +exec("bundle", "exec", "rake", "yard") diff --git a/gems/tree_haver/.rubocop_gradual.lock b/gems/tree_haver/.rubocop_gradual.lock new file mode 100644 index 000000000..2a04c6a43 --- /dev/null +++ b/gems/tree_haver/.rubocop_gradual.lock @@ -0,0 +1,467 @@ +{ + ".simplecov:3575099246": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Gemfile:31081928": [ + [28, 1, 59, "Lint/EmptyConditionalBody: Avoid `if` branches without a body.", 4279378582] + ], + "Rakefile:1868927885": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/tree_haver.rb:2762889207": [ + [49, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465], + [49, 1, 15892, "Metrics/ModuleLength: Module has too many lines. [421/100]", 2307494458], + [67, 3, 566, "Metrics/MethodLength: Method has too many lines. [12/10]", 1536513137], + [124, 3, 272, "Metrics/MethodLength: Method has too many lines. [11/10]", 505877912], + [156, 3, 543, "Metrics/MethodLength: Method has too many lines. [14/10]", 3733215372], + [221, 3, 458, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `backend_module` is too high. [9/7]", 73937708], + [221, 3, 458, "Metrics/MethodLength: Method has too many lines. [12/10]", 73937708], + [221, 3, 458, "Metrics/PerceivedComplexity: Perceived complexity for `backend_module` is too high. [9/8]", 73937708], + [257, 3, 1024, "Metrics/AbcSize: Assignment Branch Condition size for `register_language` is too high. [<0, 20, 10> 22.36/17]", 53014028], + [257, 3, 1024, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `register_language` is too high. [11/7]", 53014028], + [257, 3, 1024, "Metrics/MethodLength: Method has too many lines. [12/10]", 53014028], + [257, 3, 1024, "Metrics/PerceivedComplexity: Perceived complexity for `register_language` is too high. [11/8]", 53014028], + [257, 24, 150, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 893242366], + [282, 3, 1521, "Metrics/AbcSize: Assignment Branch Condition size for `parser_for` is too high. [<12, 27, 14> 32.7/17]", 498764853], + [282, 3, 1521, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parser_for` is too high. [15/7]", 498764853], + [282, 3, 1521, "Metrics/MethodLength: Method has too many lines. [30/10]", 498764853], + [282, 3, 1521, "Metrics/PerceivedComplexity: Perceived complexity for `parser_for` is too high. [15/8]", 498764853], + [325, 3, 2089, "Metrics/MethodLength: Method has too many lines. [51/10]", 2791676388], + [379, 3, 704, "Metrics/AbcSize: Assignment Branch Condition size for `requested_backend_type` is too high. [<4, 17, 9> 19.65/17]", 3087691662], + [379, 3, 704, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `requested_backend_type` is too high. [8/7]", 3087691662], + [379, 3, 704, "Metrics/MethodLength: Method has too many lines. [14/10]", 3087691662], + [379, 3, 704, "Metrics/PerceivedComplexity: Perceived complexity for `requested_backend_type` is too high. [9/8]", 3087691662], + [409, 3, 696, "Metrics/MethodLength: Method has too many lines. [14/10]", 307274721], + [502, 3, 489, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `backend_module_for` is too high. [10/7]", 3448932255], + [502, 3, 489, "Metrics/MethodLength: Method has too many lines. [22/10]", 3448932255] + ], + "lib/tree_haver/backend_api.rb:3354059061": [ + [30, 3, 12181, "Metrics/ModuleLength: Module has too many lines. [243/100]", 205645546], + [139, 5, 8882, "Metrics/ClassLength: Class has too many lines. [180/100]", 4281605197], + [145, 7, 1502, "Metrics/AbcSize: Assignment Branch Condition size for `validate` is too high. [<4, 22, 10> 24.49/17]", 747017743], + [145, 7, 1502, "Metrics/MethodLength: Method has too many lines. [31/10]", 747017743], + [145, 7, 1502, "Metrics/PerceivedComplexity: Perceived complexity for `validate` is too high. [11/8]", 747017743], + [213, 7, 903, "Metrics/MethodLength: Method has too many lines. [24/10]", 3041411230], + [261, 7, 1271, "Metrics/AbcSize: Assignment Branch Condition size for `validate_capabilities_hash` is too high. [<7, 27, 7> 28.76/17]", 3965262932], + [261, 7, 1271, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_capabilities_hash` is too high. [8/7]", 3965262932], + [261, 7, 1271, "Metrics/MethodLength: Method has too many lines. [25/10]", 3965262932], + [277, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2253399502], + [296, 7, 908, "Metrics/AbcSize: Assignment Branch Condition size for `validate_language` is too high. [<6, 17, 4> 18.47/17]", 733551867], + [315, 7, 797, "Metrics/AbcSize: Assignment Branch Condition size for `validate_parser` is too high. [<5, 16, 7> 18.17/17]", 1229041751], + [315, 7, 797, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_parser` is too high. [8/7]", 1229041751], + [315, 7, 797, "Metrics/MethodLength: Method has too many lines. [15/10]", 1229041751], + [349, 7, 862, "Metrics/AbcSize: Assignment Branch Condition size for `validate_node_class` is too high. [<8, 18, 8> 21.26/17]", 1873188195], + [349, 7, 862, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_node_class` is too high. [8/7]", 1873188195], + [349, 7, 862, "Metrics/MethodLength: Method has too many lines. [20/10]", 1873188195], + [349, 7, 862, "Metrics/PerceivedComplexity: Perceived complexity for `validate_node_class` is too high. [9/8]", 1873188195], + [375, 11, 20, "Naming/PredicatePrefix: Rename `has_method_or_alias?` to `method_or_alias?`.", 285116235] + ], + "lib/tree_haver/backend_context.rb:159197618": [ + [3, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465] + ], + "lib/tree_haver/backend_registry.rb:4046212912": [ + [4, 3, 22, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver::BackendRegistry`.", 733935278], + [4, 3, 5121, "Metrics/ModuleLength: Module has too many lines. [152/100]", 1483988260], + [39, 5, 382, "Metrics/MethodLength: Method has too many lines. [11/10]", 2000730238], + [48, 16, 1, "Style/DoubleNegation: Avoid the use of double negation (`!!`).", 177540], + [55, 5, 889, "Metrics/AbcSize: Assignment Branch Condition size for `register_tag` is too high. [<5, 20, 5> 21.21/17]", 2276764069], + [55, 5, 889, "Metrics/MethodLength: Method has too many lines. [18/10]", 2276764069], + [105, 5, 397, "Metrics/MethodLength: Method has too many lines. [11/10]", 4007185633] + ], + "lib/tree_haver/backends/citrus.rb:3181984499": [ + [40, 9, 449, "Metrics/MethodLength: Method has too many lines. [11/10]", 1138819533], + [173, 11, 1133, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [11/7]", 2613019266], + [173, 11, 1133, "Metrics/MethodLength: Method has too many lines. [16/10]", 2613019266], + [173, 11, 1133, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [11/8]", 2613019266], + [230, 9, 597, "Metrics/MethodLength: Method has too many lines. [12/10]", 3923424594], + [403, 9, 810, "Metrics/AbcSize: Assignment Branch Condition size for `structural?` is too high. [<3, 19, 8> 20.83/17]", 3166173256], + [403, 9, 810, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structural?` is too high. [9/7]", 3166173256], + [403, 9, 810, "Metrics/MethodLength: Method has too many lines. [12/10]", 3166173256], + [403, 9, 810, "Metrics/PerceivedComplexity: Perceived complexity for `structural?` is too high. [9/8]", 3166173256], + [436, 9, 1272, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_type_from_event` is too high. [9/7]", 2022108773], + [436, 9, 1272, "Metrics/MethodLength: Method has too many lines. [16/10]", 2022108773], + [436, 9, 1272, "Metrics/PerceivedComplexity: Perceived complexity for `extract_type_from_event` is too high. [10/8]", 2022108773], + [460, 11, 207, "Style/CaseLikeIf: Convert `if-elsif` to `case-when`.", 1995588659], + [476, 61, 10, "Style/NumericPredicate: Use `offset.positive?` instead of `offset > 0`.", 2454414278] + ], + "lib/tree_haver/backends/ffi.rb:691415497": [ + [83, 9, 853, "Metrics/MethodLength: Method has too many lines. [15/10]", 1876257977], + [147, 7, 7352, "Metrics/ModuleLength: Module has too many lines. [111/100]", 4125377349], + [148, 9, 7320, "Metrics/ClassLength: Class has too many lines. [109/100]", 1130902814], + [183, 11, 559, "Metrics/MethodLength: Method has too many lines. [11/10]", 678018999], + [232, 11, 4265, "Metrics/AbcSize: Assignment Branch Condition size for `try_load!` is too high. [<11, 40, 10> 42.67/17]", 2312962113], + [232, 11, 4265, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `try_load!` is too high. [10/7]", 2312962113], + [232, 11, 4265, "Metrics/MethodLength: Method has too many lines. [58/10]", 2312962113], + [232, 11, 4265, "Metrics/PerceivedComplexity: Perceived complexity for `try_load!` is too high. [11/8]", 2312962113], + [260, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2086221887], + [262, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2163360042], + [367, 9, 312, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `<=>` is too high. [8/7]", 2433292528], + [437, 11, 4377, "Metrics/AbcSize: Assignment Branch Condition size for `from_library` is too high. [<16, 30, 18> 38.47/17]", 3403850855], + [437, 11, 4377, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [17/7]", 3403850855], + [437, 11, 4377, "Metrics/MethodLength: Method has too many lines. [43/10]", 3403850855], + [437, 11, 4377, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [19/8]", 3403850855], + [437, 47, 4, "Lint/UnusedMethodArgument: Unused method argument - `name`.", 2087876002], + [502, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2415433817], + [554, 9, 3159, "Metrics/AbcSize: Assignment Branch Condition size for `language=` is too high. [<4, 44, 11> 45.53/17]", 1815427493], + [554, 9, 3159, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `language=` is too high. [10/7]", 1815427493], + [554, 9, 3159, "Metrics/MethodLength: Method has too many lines. [40/10]", 1815427493], + [554, 9, 3159, "Metrics/PerceivedComplexity: Perceived complexity for `language=` is too high. [10/8]", 1815427493], + [715, 7, 10494, "Metrics/ClassLength: Class has too many lines. [129/100]", 3710916551], + [744, 45, 9, "Style/NumericPredicate: Use `index.negative?` instead of `index < 0`.", 4215255415], + [807, 13, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183], + [889, 21, 9, "Style/NumericPredicate: Use `index.negative?` instead of `index < 0`.", 4215255415], + [933, 9, 694, "Metrics/AbcSize: Assignment Branch Condition size for `descendant_for_point_range` is too high. [<7, 21, 5> 22.69/17]", 979329510], + [953, 9, 706, "Metrics/AbcSize: Assignment Branch Condition size for `named_descendant_for_point_range` is too high. [<7, 21, 5> 22.69/17]", 2494446138] + ], + "lib/tree_haver/backends/java.rb:3360169733": [ + [134, 7, 815, "Metrics/AbcSize: Assignment Branch Condition size for `configure_native_library_path!` is too high. [<4, 17, 6> 18.47/17]", 1362415302], + [227, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3409700051], + [260, 7, 9885, "Metrics/ClassLength: Class has too many lines. [114/100]", 136252046], + [292, 9, 312, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `<=>` is too high. [8/7]", 2433292528], + [340, 11, 4098, "Metrics/AbcSize: Assignment Branch Condition size for `from_library` is too high. [<19, 32, 14> 39.76/17]", 3050250526], + [340, 11, 4098, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [14/7]", 3050250526], + [340, 11, 4098, "Metrics/MethodLength: Method has too many lines. [48/10]", 3050250526], + [340, 11, 4098, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [16/8]", 3050250526], + [426, 11, 2084, "Metrics/AbcSize: Assignment Branch Condition size for `load_by_name` is too high. [<11, 17, 6> 21.12/17]", 226213748], + [426, 11, 2084, "Metrics/MethodLength: Method has too many lines. [35/10]", 226213748], + [542, 9, 1016, "Metrics/MethodLength: Method has too many lines. [17/10]", 4123264427], + [649, 9, 702, "Metrics/MethodLength: Method has too many lines. [14/10]", 1334016319], + [649, 17, 89, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3152137646], + [728, 9, 583, "Metrics/MethodLength: Method has too many lines. [11/10]", 2457478600], + [816, 13, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183] + ], + "lib/tree_haver/backends/mri.rb:863330290": [ + [59, 9, 916, "Metrics/MethodLength: Method has too many lines. [15/10]", 749971754], + [179, 9, 312, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `<=>` is too high. [8/7]", 2433292528], + [232, 11, 1562, "Metrics/MethodLength: Method has too many lines. [11/10]", 3858647816] + ], + "lib/tree_haver/backends/parslet.rb:4170691266": [ + [41, 9, 323, "Metrics/MethodLength: Method has too many lines. [11/10]", 694290592], + [108, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193340030], + [172, 11, 1133, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [11/7]", 2613019266], + [172, 11, 1133, "Metrics/MethodLength: Method has too many lines. [16/10]", 2613019266], + [172, 11, 1133, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [11/8]", 2613019266], + [246, 9, 591, "Metrics/MethodLength: Method has too many lines. [12/10]", 3007454066], + [335, 7, 6287, "Metrics/ClassLength: Class has too many lines. [155/100]", 3100555518], + [362, 9, 452, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `start_byte` is too high. [8/7]", 2663206926], + [362, 9, 452, "Metrics/MethodLength: Method has too many lines. [12/10]", 2663206926], + [380, 9, 557, "Metrics/MethodLength: Method has too many lines. [12/10]", 2982914846], + [443, 9, 404, "Metrics/MethodLength: Method has too many lines. [11/10]", 1111982079], + [495, 61, 10, "Style/NumericPredicate: Use `offset.positive?` instead of `offset > 0`.", 2454414278], + [501, 9, 313, "Metrics/MethodLength: Method has too many lines. [13/10]", 1927903077], + [519, 9, 448, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_first_slice` is too high. [8/7]", 229178429], + [519, 9, 448, "Metrics/MethodLength: Method has too many lines. [16/10]", 229178429], + [524, 17, 11, "Style/HashEachMethods: Use `each_value` instead of `values.each`.", 236538172], + [539, 9, 461, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_last_slice` is too high. [8/7]", 3960808114], + [539, 9, 461, "Metrics/MethodLength: Method has too many lines. [16/10]", 3960808114] + ], + "lib/tree_haver/backends/prism.rb:265399087": [ + [39, 9, 448, "Metrics/MethodLength: Method has too many lines. [11/10]", 2383415890], + [70, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 721867551], + [71, 9, 712, "Metrics/MethodLength: Method has too many lines. [12/10]", 1576927704], + [145, 41, 6, "Lint/UnusedMethodArgument: Unused method argument - `symbol`.", 2153517219], + [182, 9, 554, "Metrics/MethodLength: Method has too many lines. [16/10]", 3452414947], + [250, 13, 11, "Naming/PredicatePrefix: Rename `has_errors?` to `errors?`.", 1181419252], + [275, 69, 27, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1979346241], + [301, 13, 64, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1942915391], + [305, 9, 519, "Metrics/AbcSize: Assignment Branch Condition size for `classify_comment_hint` is too high. [<5, 20, 5> 21.21/17]", 869270335], + [485, 13, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183], + [554, 24, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] + ], + "lib/tree_haver/backends/psych.rb:1528613408": [ + [30, 9, 448, "Metrics/MethodLength: Method has too many lines. [11/10]", 2367418678], + [59, 9, 601, "Metrics/MethodLength: Method has too many lines. [11/10]", 2824278890], + [342, 9, 901, "Metrics/AbcSize: Assignment Branch Condition size for `extract_text_from_location` is too high. [<8, 23, 18> 30.28/17]", 1252700264], + [342, 9, 901, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_text_from_location` is too high. [14/7]", 1252700264], + [342, 9, 901, "Metrics/MethodLength: Method has too many lines. [22/10]", 1252700264], + [342, 9, 901, "Metrics/PerceivedComplexity: Perceived complexity for `extract_text_from_location` is too high. [16/8]", 1252700264] + ], + "lib/tree_haver/backends/rust.rb:3784474048": [ + [52, 9, 548, "Metrics/MethodLength: Method has too many lines. [15/10]", 3791803966], + [156, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548] + ], + "lib/tree_haver/backends/tslp.rb:1702759733": [ + [18, 9, 559, "Metrics/MethodLength: Method has too many lines. [14/10]", 1306507697], + [68, 7, 14, "Style/Documentation: Missing top-level documentation comment for `class TreeHaver::Backends::Tslp::Language`.", 3674592793], + [80, 7, 12, "Style/Documentation: Missing top-level documentation comment for `class TreeHaver::Backends::Tslp::Parser`.", 2485220908], + [81, 9, 582, "Metrics/AbcSize: Assignment Branch Condition size for `parse` is too high. [<2, 17, 4> 17.58/17]", 103430155], + [103, 7, 10, "Style/Documentation: Missing top-level documentation comment for `class TreeHaver::Backends::Tslp::Tree`.", 3516465773], + [109, 7, 10, "Style/Documentation: Missing top-level documentation comment for `class TreeHaver::Backends::Tslp::Node`.", 3515419275], + [143, 13, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183] + ], + "lib/tree_haver/base/comment.rb:699160654": [ + [10, 5, 8183, "Metrics/ClassLength: Class has too many lines. [152/100]", 4001235397] + ], + "lib/tree_haver/base/node.rb:586469776": [ + [36, 5, 7668, "Metrics/ClassLength: Class has too many lines. [156/100]", 171773185], + [162, 11, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183], + [208, 27, 8, "Style/NumericPredicate: Use `cmp.zero?` instead of `cmp == 0`.", 736104011], + [239, 7, 888, "Metrics/AbcSize: Assignment Branch Condition size for `source_position` is too high. [<6, 20, 12> 24.08/17]", 3968023659], + [239, 7, 888, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `source_position` is too high. [9/7]", 3968023659], + [239, 7, 888, "Metrics/MethodLength: Method has too many lines. [28/10]", 3968023659], + [239, 7, 888, "Metrics/PerceivedComplexity: Perceived complexity for `source_position` is too high. [13/8]", 3968023659], + [306, 7, 355, "Metrics/MethodLength: Method has too many lines. [11/10]", 1012295608] + ], + "lib/tree_haver/base/tree.rb:3081630142": [ + [89, 15, 145, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1155535733], + [103, 11, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183] + ], + "lib/tree_haver/citrus_grammar_finder.rb:2540014236": [ + [31, 3, 7013, "Metrics/ClassLength: Class has too many lines. [102/100]", 245808593], + [66, 5, 3770, "Metrics/AbcSize: Assignment Branch Condition size for `available?` is too high. [<16, 52, 21> 58.32/17]", 3886463212], + [66, 5, 3770, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `available?` is too high. [22/7]", 3886463212], + [66, 5, 3770, "Metrics/MethodLength: Method has too many lines. [50/10]", 3886463212], + [66, 5, 3770, "Metrics/PerceivedComplexity: Perceived complexity for `available?` is too high. [22/8]", 3886463212], + [94, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858894] + ], + "lib/tree_haver/contracts.rb:1571706604": [ + [3, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465], + [3, 1, 28139, "Metrics/ModuleLength: Module has too many lines. [924/100]", 3701899480], + [91, 5, 732, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 18, 2> 18.11/17]", 3031678572], + [91, 5, 732, "Metrics/MethodLength: Method has too many lines. [17/10]", 3031678572], + [170, 5, 697, "Metrics/MethodLength: Method has too many lines. [18/10]", 389212725], + [231, 5, 507, "Metrics/MethodLength: Method has too many lines. [13/10]", 2631332781], + [329, 5, 580, "Metrics/MethodLength: Method has too many lines. [13/10]", 2166080747], + [558, 5, 558, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 17, 4> 17.46/17]", 2109105399], + [558, 5, 558, "Metrics/MethodLength: Method has too many lines. [18/10]", 2109105399], + [610, 3, 780, "Metrics/AbcSize: Assignment Branch Condition size for `library_path_errors` is too high. [<3, 20, 10> 22.56/17]", 1003454820], + [610, 3, 780, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `library_path_errors` is too high. [10/7]", 1003454820], + [610, 3, 780, "Metrics/MethodLength: Method has too many lines. [14/10]", 1003454820], + [610, 3, 780, "Metrics/PerceivedComplexity: Perceived complexity for `library_path_errors` is too high. [10/8]", 1003454820], + [652, 3, 686, "Metrics/MethodLength: Method has too many lines. [16/10]", 2530945134], + [674, 3, 483, "Metrics/MethodLength: Method has too many lines. [15/10]", 3654427448], + [693, 3, 511, "Metrics/MethodLength: Method has too many lines. [16/10]", 145071639], + [770, 5, 384, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 19, 6> 19.92/17]", 1287649270], + [841, 5, 449, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [10/7]", 1722332092], + [841, 5, 449, "Metrics/PerceivedComplexity: Perceived complexity for `to_h` is too high. [10/8]", 1722332092], + [873, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177610], + [874, 5, 420, "Metrics/MethodLength: Method has too many lines. [12/10]", 722580369], + [914, 42, 8, "Lint/StructNewOverride: `:entries` member overrides `Struct#entries` and it may be unexpected.", 999966509], + [937, 3, 473, "Metrics/MethodLength: Method has too many lines. [18/10]", 1284459726], + [958, 3, 655, "Metrics/AbcSize: Assignment Branch Condition size for `byte_offset_for_point` is too high. [<7, 25, 14> 29.5/17]", 1278853347], + [958, 3, 655, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `byte_offset_for_point` is too high. [9/7]", 1278853347], + [958, 3, 655, "Metrics/MethodLength: Method has too many lines. [17/10]", 1278853347], + [958, 3, 655, "Metrics/PerceivedComplexity: Perceived complexity for `byte_offset_for_point` is too high. [10/8]", 1278853347] + ], + "lib/tree_haver/grammar_finder.rb:3107533528": [ + [55, 3, 13660, "Metrics/ClassLength: Class has too many lines. [200/100]", 1847629568], + [155, 5, 1710, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_library_path` is too high. [8/7]", 4164717952], + [155, 5, 1710, "Metrics/MethodLength: Method has too many lines. [25/10]", 4164717952], + [269, 7, 845, "Metrics/MethodLength: Method has too many lines. [12/10]", 916567473], + [315, 5, 577, "Metrics/MethodLength: Method has too many lines. [16/10]", 651056353], + [340, 5, 623, "Metrics/MethodLength: Method has too many lines. [14/10]", 1438381615], + [360, 5, 846, "Metrics/MethodLength: Method has too many lines. [12/10]", 667615068], + [398, 5, 653, "Metrics/MethodLength: Method has too many lines. [12/10]", 1765172995] + ], + "lib/tree_haver/kaitai_backend.rb:335397596": [ + [3, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465] + ], + "lib/tree_haver/language.rb:2775049278": [ + [39, 3, 12087, "Metrics/ModuleLength: Module has too many lines. [115/100]", 221887443], + [40, 5, 12061, "Metrics/ClassLength: Class has too many lines. [113/100]", 309443185], + [89, 7, 1966, "Metrics/AbcSize: Assignment Branch Condition size for `from_library` is too high. [<4, 20, 10> 22.72/17]", 980659500], + [89, 7, 1966, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [9/7]", 980659500], + [89, 7, 1966, "Metrics/MethodLength: Method has too many lines. [31/10]", 980659500], + [89, 7, 1966, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [11/8]", 980659500], + [114, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177538], + [156, 7, 4289, "Metrics/AbcSize: Assignment Branch Condition size for `method_missing` is too high. [<10, 39, 30> 50.21/17]", 1314689525], + [156, 7, 4289, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `method_missing` is too high. [24/7]", 1314689525], + [156, 7, 4289, "Metrics/MethodLength: Method has too many lines. [56/10]", 1314689525], + [156, 7, 4289, "Metrics/PerceivedComplexity: Perceived complexity for `method_missing` is too high. [26/8]", 1314689525], + [274, 7, 786, "Metrics/MethodLength: Method has too many lines. [12/10]", 3697766033] + ], + "lib/tree_haver/language_pack.rb:3024861237": [ + [3, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465] + ], + "lib/tree_haver/language_registry.rb:3950096220": [ + [83, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861089] + ], + "lib/tree_haver/library_path_utils.rb:1552423902": [ + [32, 5, 861, "Metrics/MethodLength: Method has too many lines. [12/10]", 1638068630] + ], + "lib/tree_haver/node.rb:715762930": [ + [62, 3, 16601, "Metrics/ClassLength: Class has too many lines. [237/100]", 2290466920], + [136, 5, 708, "Metrics/AbcSize: Assignment Branch Condition size for `start_point` is too high. [<2, 19, 7> 20.35/17]", 2066418249], + [136, 5, 708, "Metrics/MethodLength: Method has too many lines. [17/10]", 2066418249], + [161, 5, 694, "Metrics/AbcSize: Assignment Branch Condition size for `end_point` is too high. [<2, 19, 7> 20.35/17]", 2127773446], + [161, 5, 694, "Metrics/MethodLength: Method has too many lines. [17/10]", 2127773446], + [232, 5, 948, "Metrics/AbcSize: Assignment Branch Condition size for `text` is too high. [<1, 14, 11> 17.83/17]", 748349201], + [232, 5, 948, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `text` is too high. [9/7]", 748349201], + [232, 5, 948, "Metrics/MethodLength: Method has too many lines. [16/10]", 748349201], + [232, 5, 948, "Metrics/PerceivedComplexity: Perceived complexity for `text` is too high. [11/8]", 748349201], + [259, 9, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183], + [328, 5, 994, "Metrics/AbcSize: Assignment Branch Condition size for `named_child` is too high. [<6, 13, 10> 17.46/17]", 3449163117], + [328, 5, 994, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `named_child` is too high. [9/7]", 3449163117], + [328, 5, 994, "Metrics/MethodLength: Method has too many lines. [21/10]", 3449163117], + [328, 5, 994, "Metrics/PerceivedComplexity: Perceived complexity for `named_child` is too high. [10/8]", 3449163117], + [366, 5, 734, "Metrics/MethodLength: Method has too many lines. [15/10]", 3099919150], + [425, 7, 4, "Style/EmptyElse: Redundant `else`-clause.", 2087423834] + ], + "lib/tree_haver/parser.rb:1959976510": [ + [71, 3, 15231, "Metrics/ClassLength: Class has too many lines. [181/100]", 2262931609], + [84, 5, 938, "Metrics/MethodLength: Method has too many lines. [13/10]", 569209133], + [116, 5, 844, "Metrics/MethodLength: Method has too many lines. [11/10]", 3700471369], + [141, 5, 583, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `backend` is too high. [9/7]", 942469984], + [141, 5, 583, "Metrics/MethodLength: Method has too many lines. [20/10]", 942469984], + [237, 5, 1114, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_string` is too high. [8/7]", 2146281390], + [237, 5, 1114, "Metrics/MethodLength: Method has too many lines. [16/10]", 2146281390], + [237, 5, 1114, "Metrics/PerceivedComplexity: Perceived complexity for `parse_string` is too high. [10/8]", 2146281390], + [273, 5, 1162, "Metrics/AbcSize: Assignment Branch Condition size for `switch_backend_for_language` is too high. [<10, 11, 11> 18.49/17]", 3918477333], + [273, 5, 1162, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `switch_backend_for_language` is too high. [11/7]", 3918477333], + [273, 5, 1162, "Metrics/MethodLength: Method has too many lines. [26/10]", 3918477333], + [273, 5, 1162, "Metrics/PerceivedComplexity: Perceived complexity for `switch_backend_for_language` is too high. [9/8]", 3918477333], + [320, 5, 3598, "Metrics/AbcSize: Assignment Branch Condition size for `unwrap_language` is too high. [<4, 32, 32> 45.43/17]", 2683894777], + [320, 5, 3598, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `unwrap_language` is too high. [29/7]", 2683894777], + [320, 5, 3598, "Metrics/MethodLength: Method has too many lines. [55/10]", 2683894777], + [320, 5, 3598, "Metrics/PerceivedComplexity: Perceived complexity for `unwrap_language` is too high. [23/8]", 2683894777], + [414, 5, 892, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `try_reload_language_for_backend` is too high. [9/7]", 1872419716], + [414, 5, 892, "Metrics/MethodLength: Method has too many lines. [14/10]", 1872419716], + [414, 5, 892, "Metrics/PerceivedComplexity: Perceived complexity for `try_reload_language_for_backend` is too high. [9/8]", 1872419716] + ], + "lib/tree_haver/parslet_grammar_finder.rb:756779364": [ + [32, 3, 6418, "Metrics/ClassLength: Class has too many lines. [105/100]", 2916347470], + [67, 5, 2630, "Metrics/AbcSize: Assignment Branch Condition size for `available?` is too high. [<14, 39, 19> 45.59/17]", 1827795944], + [67, 5, 2630, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `available?` is too high. [20/7]", 1827795944], + [67, 5, 2630, "Metrics/MethodLength: Method has too many lines. [43/10]", 1827795944], + [67, 5, 2630, "Metrics/PerceivedComplexity: Perceived complexity for `available?` is too high. [20/8]", 1827795944] + ], + "lib/tree_haver/path_validator.rb:1827441298": [ + [31, 3, 11571, "Metrics/ModuleLength: Module has too many lines. [133/100]", 3916793077], + [71, 5, 1048, "Metrics/AbcSize: Assignment Branch Condition size for `trusted_directories` is too high. [<4, 16, 5> 17.23/17]", 2683168069], + [71, 5, 1048, "Metrics/MethodLength: Method has too many lines. [13/10]", 2683168069], + [182, 5, 1000, "Metrics/AbcSize: Assignment Branch Condition size for `safe_library_path?` is too high. [<1, 15, 15> 21.24/17]", 3331427816], + [182, 5, 1000, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `safe_library_path?` is too high. [15/7]", 3331427816], + [182, 5, 1000, "Metrics/MethodLength: Method has too many lines. [11/10]", 3331427816], + [182, 5, 1000, "Metrics/PerceivedComplexity: Perceived complexity for `safe_library_path?` is too high. [15/8]", 3331427816], + [314, 5, 911, "Metrics/AbcSize: Assignment Branch Condition size for `validation_errors` is too high. [<2, 21, 13> 24.78/17]", 1249065882], + [314, 5, 911, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validation_errors` is too high. [13/7]", 1249065882], + [314, 5, 911, "Metrics/MethodLength: Method has too many lines. [14/10]", 1249065882], + [314, 5, 911, "Metrics/PerceivedComplexity: Perceived complexity for `validation_errors` is too high. [13/8]", 1249065882], + [345, 9, 20, "Naming/PredicatePrefix: Rename `has_valid_extension?` to `valid_extension?`.", 2041908655] + ], + "lib/tree_haver/peg_backends.rb:2882446693": [ + [3, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465], + [37, 3, 611, "Metrics/MethodLength: Method has too many lines. [21/10]", 2394303132], + [39, 11, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [61, 3, 377, "Metrics/MethodLength: Method has too many lines. [13/10]", 1137341195] + ], + "lib/tree_haver/rspec/dependency_tags.rb:2954930617": [ + [7, 5, 21, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver::RSpec::DependencyTags`.", 2626933713] + ], + "lib/tree_haver/tree.rb:3332079774": [ + [129, 5, 1443, "Metrics/AbcSize: Assignment Branch Condition size for `edit` is too high. [<8, 18, 7> 20.9/17]", 4208399016], + [129, 5, 1443, "Metrics/MethodLength: Method has too many lines. [24/10]", 4208399016], + [129, 13, 89, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3152137646] + ], + "spec/backend_registry_spec.rb:229950927": [ + [5, 1, 3102, "Metrics/BlockLength: Block has too many lines. [62/25]", 3416335650] + ], + "spec/backends/tslp_spec.rb:1444201405": [ + [5, 1, 5497, "Metrics/BlockLength: Block has too many lines. [121/25]", 4279461260], + [30, 3, 1477, "Metrics/BlockLength: Block has too many lines. [32/25]", 2492475187], + [112, 3, 1352, "Metrics/BlockLength: Block has too many lines. [29/25]", 2972556266] + ], + "spec/fixtures_integration_spec.rb:3457821347": [ + [3, 1, 48556, "Metrics/BlockLength: Block has too many lines. [1006/25]", 2138474637], + [108, 3, 1282, "Metrics/BlockLength: Block has too many lines. [29/25]", 505243730], + [141, 3, 1840, "Metrics/BlockLength: Block has too many lines. [35/25]", 1365684528], + [180, 3, 1365, "Metrics/BlockLength: Block has too many lines. [33/25]", 1597100003], + [247, 3, 2110, "Metrics/BlockLength: Block has too many lines. [41/25]", 219204301], + [294, 3, 2166, "Metrics/BlockLength: Block has too many lines. [27/25]", 2219571348], + [354, 3, 1786, "Metrics/BlockLength: Block has too many lines. [30/25]", 1655451032], + [432, 3, 1345, "Metrics/BlockLength: Block has too many lines. [26/25]", 1188499098], + [534, 3, 3250, "Metrics/BlockLength: Block has too many lines. [64/25]", 2852118886], + [589, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 2115564430], + [602, 3, 752, "Metrics/AbcSize: Assignment Branch Condition size for `normalized_tree_node` is too high. [<0, 19, 4> 19.42/17]", 1725197185], + [602, 3, 752, "Metrics/MethodLength: Method has too many lines. [18/10]", 1725197185], + [623, 3, 850, "Metrics/AbcSize: Assignment Branch Condition size for `backend_capability` is too high. [<0, 20, 0> 20/17]", 3278569026], + [623, 3, 850, "Metrics/MethodLength: Method has too many lines. [14/10]", 3278569026], + [640, 3, 744, "Metrics/MethodLength: Method has too many lines. [13/10]", 1675624229], + [679, 3, 492, "Metrics/MethodLength: Method has too many lines. [11/10]", 4123526878], + [714, 3, 566, "Metrics/AbcSize: Assignment Branch Condition size for `parse_error_tolerance` is too high. [<1, 17, 1> 17.06/17]", 933590597], + [714, 3, 566, "Metrics/MethodLength: Method has too many lines. [14/10]", 933590597], + [739, 3, 2652, "Metrics/BlockLength: Block has too many lines. [47/25]", 214520278], + [1039, 7, 87, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3860036845], + [1045, 7, 60, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1411318317], + [1063, 3, 1334, "Metrics/BlockLength: Block has too many lines. [41/25]", 1427111445], + [1069, 7, 134, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1166944291], + [1075, 7, 60, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1411318317], + [1085, 7, 134, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1166944291], + [1091, 7, 60, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1411318317] + ], + "tree_haver.gemspec:665267582": [ + [16, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1512975621], + [129, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [146, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [147, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [154, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ] +} diff --git a/gems/tree_haver/Gemfile.lock b/gems/tree_haver/Gemfile.lock index 7191bd2b0..8e744e1af 100644 --- a/gems/tree_haver/Gemfile.lock +++ b/gems/tree_haver/Gemfile.lock @@ -7,304 +7,59 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /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) + ansi (1.6.0) + appraisal2 (3.2.0) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + ast (2.4.3) + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) ast-crispr-markdown-markly (7.1.0) ast-crispr (= 7.1.0) markly-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) prism (>= 1.0) version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: ast-merge (7.1.0) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: + backports (3.25.3) bash-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - -GEM - remote: https://gem.coop/ - specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - ansi (1.6.0) - appraisal2 (3.2.0) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - 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) citrus (3.0.2) + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) cmdparse (3.0.7) commonmarker (2.9.0-aarch64-linux) commonmarker (2.9.0-aarch64-linux-musl) commonmarker (2.9.0-arm64-darwin) commonmarker (2.9.0-x86_64-linux) commonmarker (2.9.0-x86_64-linux-musl) + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -313,6 +68,11 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -362,12 +122,52 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -381,12 +181,24 @@ GEM turbo_tests2 (~> 3.1, >= 3.1.12) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) 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.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -412,9 +224,18 @@ GEM prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) psych (5.4.0) date stringio + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -423,6 +244,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) rdoc (6.17.0) erb psych (>= 4.0.0) @@ -518,6 +344,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -526,18 +356,22 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -573,6 +407,10 @@ GEM version_gem (~> 1.1, >= 1.1.13) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) @@ -596,6 +434,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.13) + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) yard (0.9.45) yard-fence (0.9.6) rdoc (>= 6.11, < 8) @@ -628,45 +470,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem (>= 7.0) + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -675,27 +496,20 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml (~> 0.3) - toml-merge! toml-rb (~> 4.1) tree_haver! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -706,13 +520,10 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) @@ -729,6 +540,7 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -742,17 +554,16 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -776,8 +587,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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 @@ -821,15 +630,15 @@ 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -852,7 +661,6 @@ CHECKSUMS tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) sha256=ad6743a373eeac954c1b659b17af3aff1c82918b3ce9c9dc572a7c70ff843cdd tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -865,7 +673,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/tree_haver/lib/tree_haver/grammar_finder.rb b/gems/tree_haver/lib/tree_haver/grammar_finder.rb index 34e8c0769..510be84f7 100644 --- a/gems/tree_haver/lib/tree_haver/grammar_finder.rb +++ b/gems/tree_haver/lib/tree_haver/grammar_finder.rb @@ -371,7 +371,7 @@ def not_found_message " Searched: #{search_paths.join(', ')}." end - msg + " Register the grammar, install tree_sitter_language_pack with parser API support, " \ + msg + ' Register the grammar, install tree_sitter_language_pack with parser API support, ' \ "or set #{env_var_name} to a valid path." end diff --git a/gems/tree_haver/lib/tree_haver/version.rb b/gems/tree_haver/lib/tree_haver/version.rb index 9bd0db819..43365bf4e 100644 --- a/gems/tree_haver/lib/tree_haver/version.rb +++ b/gems/tree_haver/lib/tree_haver/version.rb @@ -2,7 +2,7 @@ module TreeHaver module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/tree_haver/spec/backends/tslp_spec.rb b/gems/tree_haver/spec/backends/tslp_spec.rb index af93e8caf..8c55d2c71 100644 --- a/gems/tree_haver/spec/backends/tslp_spec.rb +++ b/gems/tree_haver/spec/backends/tslp_spec.rb @@ -72,7 +72,9 @@ def parse(_source) end described_class.reset! - skip described_class.unavailable_reason || 'tree_sitter_language_pack parser API is unavailable' unless described_class.available? + unless described_class.available? + skip described_class.unavailable_reason || 'tree_sitter_language_pack parser API is unavailable' + end skip 'tree_sitter_language_pack does not publish json' unless TreeSitterLanguagePack.has_language('json') tree_haver_parser = described_class::Parser.new @@ -91,7 +93,9 @@ def parse(_source) end described_class.reset! - skip described_class.unavailable_reason || 'tree_sitter_language_pack parser API is unavailable' unless described_class.available? + unless described_class.available? + skip described_class.unavailable_reason || 'tree_sitter_language_pack parser API is unavailable' + end skip 'tree_sitter_language_pack does not publish json' unless TreeSitterLanguagePack.has_language('json') tree_haver_parser = described_class::Parser.new @@ -113,7 +117,9 @@ def parse(_source) end described_class.reset! - skip described_class.unavailable_reason || 'tree_sitter_language_pack parser API is unavailable' unless described_class.available? + unless described_class.available? + skip described_class.unavailable_reason || 'tree_sitter_language_pack parser API is unavailable' + end fixtures = { json: ['{"a":1}', 'document'], @@ -128,7 +134,9 @@ def parse(_source) } fixtures.each do |language, (source, expected_root)| - skip "tree_sitter_language_pack does not publish #{language}" unless TreeSitterLanguagePack.has_language(language.to_s) + unless TreeSitterLanguagePack.has_language(language.to_s) + skip "tree_sitter_language_pack does not publish #{language}" + end TreeHaver::GrammarFinder.new(language).register!(raise_on_missing: true) tree = TreeHaver.with_backend('tslp') { TreeHaver.parser_for(language).parse(source) } From b13ce0df20e22ceb81d129d7dd4daaedad9c8e3e Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:22:00 -0600 Subject: [PATCH 155/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../.kettle-drift.lock | 60 ++- .../.rubocop_gradual.lock | 137 ------ gems/ast-crispr-markdown-markly/Gemfile | 40 ++ gems/ast-crispr-markdown-markly/Gemfile.lock | 59 ++- gems/ast-merge/Gemfile.lock | 399 ++---------------- gems/markdown-merge/.kettle-drift.lock | 60 ++- gems/markdown-merge/.rubocop_gradual.lock | 110 ++--- gems/markdown-merge/Gemfile | 40 ++ gems/markdown-merge/Gemfile.lock | 59 ++- gems/markdown-merge/lib/markdown/merge.rb | 5 +- .../lib/markdown/merge/file_analysis.rb | 4 +- gems/markly-merge/.kettle-drift.lock | 60 ++- gems/markly-merge/.rubocop_gradual.lock | 6 +- gems/markly-merge/Gemfile | 40 ++ gems/markly-merge/Gemfile.lock | 343 +-------------- gems/tree_haver/Gemfile.lock | 386 ++++++++++++----- 16 files changed, 696 insertions(+), 1112 deletions(-) delete mode 100644 gems/ast-crispr-markdown-markly/.rubocop_gradual.lock diff --git a/gems/ast-crispr-markdown-markly/.kettle-drift.lock b/gems/ast-crispr-markdown-markly/.kettle-drift.lock index 628aa923c..0161251a7 100644 --- a/gems/ast-crispr-markdown-markly/.kettle-drift.lock +++ b/gems/ast-crispr-markdown-markly/.kettle-drift.lock @@ -5,7 +5,8 @@ "lines": [ 80, 120, - 160 + 160, + 200 ] } ], @@ -15,7 +16,8 @@ "lines": [ 91, 131, - 171 + 171, + 211 ] } ], @@ -25,7 +27,8 @@ "lines": [ 81, 121, - 161 + 161, + 201 ] } ], @@ -35,7 +38,8 @@ "lines": [ 93, 133, - 173 + 173, + 213 ] } ], @@ -45,7 +49,8 @@ "lines": [ 96, 136, - 176 + 176, + 216 ] } ], @@ -55,7 +60,8 @@ "lines": [ 82, 122, - 162 + 162, + 202 ] } ], @@ -66,7 +72,8 @@ 60, 100, 140, - 180 + 180, + 220 ] } ], @@ -76,7 +83,8 @@ "lines": [ 101, 141, - 181 + 181, + 221 ] } ], @@ -87,7 +95,8 @@ 43, 87, 127, - 167 + 167, + 207 ] } ], @@ -97,7 +106,8 @@ "lines": [ 110, 150, - 190 + 190, + 230 ] } ], @@ -108,7 +118,8 @@ 35, 79, 119, - 159 + 159, + 199 ] } ], @@ -119,7 +130,8 @@ 69, 109, 149, - 189 + 189, + 229 ] } ], @@ -129,7 +141,8 @@ "lines": [ 85, 125, - 165 + 165, + 205 ] } ], @@ -140,7 +153,8 @@ 48, 92, 132, - 172 + 172, + 212 ] } ], @@ -151,7 +165,8 @@ 44, 88, 128, - 168 + 168, + 208 ] } ], @@ -161,7 +176,8 @@ "lines": [ 86, 126, - 166 + 166, + 206 ] } ], @@ -171,7 +187,8 @@ "lines": [ 103, 143, - 183 + 183, + 223 ] } ], @@ -181,7 +198,8 @@ "lines": [ 102, 142, - 182 + 182, + 222 ] } ], @@ -191,7 +209,8 @@ "lines": [ 97, 137, - 177 + 177, + 217 ] } ], @@ -201,7 +220,8 @@ "lines": [ 106, 146, - 186 + 186, + 226 ] } ], diff --git a/gems/ast-crispr-markdown-markly/.rubocop_gradual.lock b/gems/ast-crispr-markdown-markly/.rubocop_gradual.lock deleted file mode 100644 index 67ec8026a..000000000 --- a/gems/ast-crispr-markdown-markly/.rubocop_gradual.lock +++ /dev/null @@ -1,137 +0,0 @@ -{ - ".simplecov:971555246": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:4085821453": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "ast-crispr-markdown-markly.gemspec:1188642188": [ - [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/ast-crispr-markdown-markly.rb:374208510": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`ast-crispr-markdown-markly.rb`) should use snake_case.", 5381] - ], - "lib/ast/crispr/markdown/markly.rb:2564514831": [ - [11, 7, 13, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::Markdown::Markly`.", 95841343], - [14, 9, 13, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Markdown::Markly::Adapter`.", 2579377404], - [14, 9, 13970, "Metrics/ClassLength: Class has too many lines. [335/100]", 429557235], - [64, 11, 700, "Metrics/MethodLength: Method has too many lines. [15/10]", 196504356], - [90, 13, 87, "Style/RaiseArgs: Provide an exception class and message as arguments to `raise`.", 1878059440], - [93, 11, 1781, "Metrics/MethodLength: Method has too many lines. [39/10]", 2020253431], - [137, 11, 739, "Metrics/AbcSize: Assignment Branch Condition size for `build_heading_sections` is too high. [<5, 16, 3> 17.03/17]", 3186655060], - [137, 11, 739, "Metrics/MethodLength: Method has too many lines. [14/10]", 3186655060], - [156, 11, 915, "Metrics/AbcSize: Assignment Branch Condition size for `build_link_definitions` is too high. [<2, 19, 7> 20.35/17]", 2943708156], - [156, 11, 915, "Metrics/MethodLength: Method has too many lines. [18/10]", 2943708156], - [195, 11, 1750, "Metrics/AbcSize: Assignment Branch Condition size for `build_table_rows` is too high. [<16, 44, 17> 49.81/17]", 3931509409], - [195, 11, 1750, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_table_rows` is too high. [16/7]", 3931509409], - [195, 11, 1750, "Metrics/MethodLength: Method has too many lines. [34/10]", 3931509409], - [195, 11, 1750, "Metrics/PerceivedComplexity: Perceived complexity for `build_table_rows` is too high. [16/8]", 3931509409], - [253, 11, 768, "Metrics/MethodLength: Method has too many lines. [14/10]", 737914131], - [297, 11, 622, "Metrics/MethodLength: Method has too many lines. [18/10]", 1706283245], - [320, 11, 717, "Metrics/MethodLength: Method has too many lines. [15/10]", 1919892283], - [341, 11, 977, "Metrics/AbcSize: Assignment Branch Condition size for `inline_link_reference_at` is too high. [<6, 17, 11> 21.12/17]", 2987695093], - [341, 11, 977, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `inline_link_reference_at` is too high. [8/7]", 2987695093], - [341, 11, 977, "Metrics/MethodLength: Method has too many lines. [19/10]", 2987695093], - [366, 37, 83, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2884863618], - [379, 11, 404, "Metrics/MethodLength: Method has too many lines. [13/10]", 427422621], - [396, 9, 16, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::Markdown::Markly::Selectors`.", 2133324825], - [396, 9, 8840, "Metrics/ModuleLength: Module has too many lines. [186/100]", 1134016796], - [399, 11, 1452, "Metrics/AbcSize: Assignment Branch Condition size for `heading_section` is too high. [<2, 21, 7> 22.23/17]", 1578141243], - [399, 11, 1452, "Metrics/MethodLength: Method has too many lines. [30/10]", 1578141243], - [399, 30, 73, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 515735878], - [433, 11, 1397, "Metrics/AbcSize: Assignment Branch Condition size for `link_definition` is too high. [<2, 22, 8> 23.49/17]", 2035221200], - [433, 11, 1397, "Metrics/MethodLength: Method has too many lines. [29/10]", 2035221200], - [433, 30, 68, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2927391196], - [466, 11, 1236, "Metrics/MethodLength: Method has too many lines. [27/10]", 2705412671], - [497, 11, 1632, "Metrics/AbcSize: Assignment Branch Condition size for `inline_reference` is too high. [<2, 25, 7> 26.04/17]", 2822954343], - [497, 11, 1632, "Metrics/MethodLength: Method has too many lines. [32/10]", 2822954343], - [497, 31, 79, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 871966347], - [533, 11, 3009, "Metrics/AbcSize: Assignment Branch Condition size for `html_comment_block` is too high. [<14, 43, 23> 50.73/17]", 1757586727], - [533, 11, 3009, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `html_comment_block` is too high. [18/7]", 1757586727], - [533, 11, 3009, "Metrics/MethodLength: Method has too many lines. [56/10]", 1757586727], - [533, 11, 3009, "Metrics/PerceivedComplexity: Perceived complexity for `html_comment_block` is too high. [18/8]", 1757586727], - [533, 33, 148, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 4247948333], - [545, 23, 2311, "Metrics/BlockLength: Block has too many lines. [43/25]", 3166751632], - [550, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 236074548] - ], - "spec/ast/crispr/markdown/markly_spec.rb:4192197438": [ - [3, 1, 13013, "Metrics/BlockLength: Block has too many lines. [238/25]", 467937705], - [28, 3, 10302, "Metrics/BlockLength: Block has too many lines. [182/25]", 3591393606], - [132, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 2063489827], - [134, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 2916348790], - [152, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 3082451518], - [154, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 3021964175], - [267, 3, 1687, "Metrics/BlockLength: Block has too many lines. [33/25]", 4221412326] - ] -} diff --git a/gems/ast-crispr-markdown-markly/Gemfile b/gems/ast-crispr-markdown-markly/Gemfile index 3e2e6fc33..32c5785f2 100644 --- a/gems/ast-crispr-markdown-markly/Gemfile +++ b/gems/ast-crispr-markdown-markly/Gemfile @@ -192,6 +192,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/ast-crispr-markdown-markly/Gemfile.lock b/gems/ast-crispr-markdown-markly/Gemfile.lock index 0e9612d0a..69b980543 100644 --- a/gems/ast-crispr-markdown-markly/Gemfile.lock +++ b/gems/ast-crispr-markdown-markly/Gemfile.lock @@ -275,6 +275,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -308,7 +324,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -363,18 +378,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -538,22 +542,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -659,9 +659,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -739,7 +739,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -760,10 +759,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -838,13 +837,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/ast-merge/Gemfile.lock b/gems/ast-merge/Gemfile.lock index 40333e45c..6f76f0a95 100644 --- a/gems/ast-merge/Gemfile.lock +++ b/gems/ast-merge/Gemfile.lock @@ -17,280 +17,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -310,12 +36,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -324,6 +44,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -379,6 +100,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -397,7 +127,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -537,23 +266,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -587,11 +318,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +369,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,61 +394,38 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +438,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +465,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +476,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,19 +503,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,19 +527,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +542,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/markdown-merge/.kettle-drift.lock b/gems/markdown-merge/.kettle-drift.lock index 628aa923c..0161251a7 100644 --- a/gems/markdown-merge/.kettle-drift.lock +++ b/gems/markdown-merge/.kettle-drift.lock @@ -5,7 +5,8 @@ "lines": [ 80, 120, - 160 + 160, + 200 ] } ], @@ -15,7 +16,8 @@ "lines": [ 91, 131, - 171 + 171, + 211 ] } ], @@ -25,7 +27,8 @@ "lines": [ 81, 121, - 161 + 161, + 201 ] } ], @@ -35,7 +38,8 @@ "lines": [ 93, 133, - 173 + 173, + 213 ] } ], @@ -45,7 +49,8 @@ "lines": [ 96, 136, - 176 + 176, + 216 ] } ], @@ -55,7 +60,8 @@ "lines": [ 82, 122, - 162 + 162, + 202 ] } ], @@ -66,7 +72,8 @@ 60, 100, 140, - 180 + 180, + 220 ] } ], @@ -76,7 +83,8 @@ "lines": [ 101, 141, - 181 + 181, + 221 ] } ], @@ -87,7 +95,8 @@ 43, 87, 127, - 167 + 167, + 207 ] } ], @@ -97,7 +106,8 @@ "lines": [ 110, 150, - 190 + 190, + 230 ] } ], @@ -108,7 +118,8 @@ 35, 79, 119, - 159 + 159, + 199 ] } ], @@ -119,7 +130,8 @@ 69, 109, 149, - 189 + 189, + 229 ] } ], @@ -129,7 +141,8 @@ "lines": [ 85, 125, - 165 + 165, + 205 ] } ], @@ -140,7 +153,8 @@ 48, 92, 132, - 172 + 172, + 212 ] } ], @@ -151,7 +165,8 @@ 44, 88, 128, - 168 + 168, + 208 ] } ], @@ -161,7 +176,8 @@ "lines": [ 86, 126, - 166 + 166, + 206 ] } ], @@ -171,7 +187,8 @@ "lines": [ 103, 143, - 183 + 183, + 223 ] } ], @@ -181,7 +198,8 @@ "lines": [ 102, 142, - 182 + 182, + 222 ] } ], @@ -191,7 +209,8 @@ "lines": [ 97, 137, - 177 + 177, + 217 ] } ], @@ -201,7 +220,8 @@ "lines": [ 106, 146, - 186 + 186, + 226 ] } ], diff --git a/gems/markdown-merge/.rubocop_gradual.lock b/gems/markdown-merge/.rubocop_gradual.lock index a6b6711d3..4f8201218 100644 --- a/gems/markdown-merge/.rubocop_gradual.lock +++ b/gems/markdown-merge/.rubocop_gradual.lock @@ -76,54 +76,55 @@ "lib/markdown-merge.rb:1671676898": [ [1, 1, 0, "Naming/FileName: The name of this source file (`markdown-merge.rb`) should use snake_case.", 5381] ], - "lib/markdown/merge.rb:1153546526": [ + "lib/markdown/merge.rb:3835020687": [ [11, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Markdown::Merge`.", 2866359175], - [11, 3, 22021, "Metrics/ModuleLength: Module has too many lines. [533/100]", 519247419], - [19, 5, 16, "Style/Documentation: Missing top-level documentation comment for `class Markdown::Merge::ParseError`.", 362242086], - [101, 5, 1171, "Metrics/MethodLength: Method has too many lines. [28/10]", 2687169043], - [135, 5, 678, "Metrics/AbcSize: Assignment Branch Condition size for `match_markdown_owners` is too high. [<10, 23, 8> 26.32/17]", 2124140148], - [135, 5, 678, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `match_markdown_owners` is too high. [9/7]", 2124140148], - [135, 5, 678, "Metrics/PerceivedComplexity: Perceived complexity for `match_markdown_owners` is too high. [9/8]", 2124140148], - [148, 5, 1188, "Metrics/AbcSize: Assignment Branch Condition size for `merge_markdown` is too high. [<10, 25, 8> 28.09/17]", 3592129796], - [148, 5, 1188, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_markdown` is too high. [9/7]", 3592129796], - [148, 5, 1188, "Metrics/MethodLength: Method has too many lines. [23/10]", 3592129796], - [148, 5, 1188, "Metrics/PerceivedComplexity: Perceived complexity for `merge_markdown` is too high. [9/8]", 3592129796], - [177, 5, 513, "Metrics/MethodLength: Method has too many lines. [13/10]", 912081106], - [195, 5, 747, "Metrics/MethodLength: Method has too many lines. [16/10]", 3172863125], - [226, 5, 1513, "Metrics/AbcSize: Assignment Branch Condition size for `apply_markdown_delegated_child_outputs` is too high. [<16, 37, 9> 41.3/17]", 3320736661], - [226, 5, 1513, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_markdown_delegated_child_outputs` is too high. [10/7]", 3320736661], - [226, 5, 1513, "Metrics/MethodLength: Method has too many lines. [30/10]", 3320736661], - [226, 5, 1513, "Metrics/PerceivedComplexity: Perceived complexity for `apply_markdown_delegated_child_outputs` is too high. [10/8]", 3320736661], - [264, 5, 1058, "Metrics/MethodLength: Method has too many lines. [23/10]", 2000305522], - [291, 5, 1103, "Metrics/MethodLength: Method has too many lines. [23/10]", 2615729942], - [291, 52, 144, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3050457682], - [319, 5, 817, "Metrics/MethodLength: Method has too many lines. [13/10]", 322304706], - [324, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 2378183959], - [337, 5, 805, "Metrics/MethodLength: Method has too many lines. [13/10]", 935244360], - [342, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 2974266470], - [355, 5, 722, "Metrics/MethodLength: Method has too many lines. [12/10]", 1758487766], - [360, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 3013228499], - [372, 5, 730, "Metrics/MethodLength: Method has too many lines. [12/10]", 3297037131], - [377, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 3013228499], - [403, 5, 1584, "Metrics/AbcSize: Assignment Branch Condition size for `collect_markdown_owners` is too high. [<21, 32, 13> 40.42/17]", 572024212], - [403, 5, 1584, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_markdown_owners` is too high. [11/7]", 572024212], - [403, 5, 1584, "Metrics/MethodLength: Method has too many lines. [45/10]", 572024212], - [403, 5, 1584, "Metrics/PerceivedComplexity: Perceived complexity for `collect_markdown_owners` is too high. [11/8]", 572024212], - [457, 5, 1147, "Metrics/AbcSize: Assignment Branch Condition size for `markdown_owner_start_indices` is too high. [<21, 22, 11> 32.34/17]", 12516264], - [457, 5, 1147, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `markdown_owner_start_indices` is too high. [9/7]", 12516264], - [457, 5, 1147, "Metrics/MethodLength: Method has too many lines. [33/10]", 12516264], - [457, 5, 1147, "Metrics/PerceivedComplexity: Perceived complexity for `markdown_owner_start_indices` is too high. [9/8]", 12516264], - [498, 5, 602, "Metrics/AbcSize: Assignment Branch Condition size for `collect_markdown_sections` is too high. [<9, 20, 6> 22.74/17]", 1946206422], - [498, 5, 602, "Metrics/MethodLength: Method has too many lines. [14/10]", 1946206422], - [506, 7, 11, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 848344986], - [517, 5, 1097, "Metrics/AbcSize: Assignment Branch Condition size for `markdown_fence_ranges` is too high. [<19, 21, 11> 30.38/17]", 2035260313], - [517, 5, 1097, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `markdown_fence_ranges` is too high. [8/7]", 2035260313], - [517, 5, 1097, "Metrics/MethodLength: Method has too many lines. [31/10]", 2035260313], - [533, 13, 227, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 1054958538], - [555, 5, 323, "Metrics/MethodLength: Method has too many lines. [14/10]", 2041170985] - ], - "lib/markdown/merge/backend_support.rb:2705430333": [ - [6, 5, 6534, "Metrics/ModuleLength: Module has too many lines. [148/100]", 1497234257], + [11, 3, 23539, "Metrics/ModuleLength: Module has too many lines. [564/100]", 3838590514], + [22, 5, 16, "Style/Documentation: Missing top-level documentation comment for `class Markdown::Merge::ParseError`.", 362242086], + [104, 5, 990, "Metrics/MethodLength: Method has too many lines. [23/10]", 650805533], + [133, 5, 678, "Metrics/AbcSize: Assignment Branch Condition size for `match_markdown_owners` is too high. [<10, 23, 8> 26.32/17]", 2124140148], + [133, 5, 678, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `match_markdown_owners` is too high. [9/7]", 2124140148], + [133, 5, 678, "Metrics/PerceivedComplexity: Perceived complexity for `match_markdown_owners` is too high. [9/8]", 2124140148], + [146, 5, 1188, "Metrics/AbcSize: Assignment Branch Condition size for `merge_markdown` is too high. [<10, 25, 8> 28.09/17]", 3592129796], + [146, 5, 1188, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_markdown` is too high. [9/7]", 3592129796], + [146, 5, 1188, "Metrics/MethodLength: Method has too many lines. [23/10]", 3592129796], + [146, 5, 1188, "Metrics/PerceivedComplexity: Perceived complexity for `merge_markdown` is too high. [9/8]", 3592129796], + [175, 5, 513, "Metrics/MethodLength: Method has too many lines. [13/10]", 912081106], + [193, 5, 747, "Metrics/MethodLength: Method has too many lines. [16/10]", 3172863125], + [224, 5, 1513, "Metrics/AbcSize: Assignment Branch Condition size for `apply_markdown_delegated_child_outputs` is too high. [<16, 37, 9> 41.3/17]", 3320736661], + [224, 5, 1513, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_markdown_delegated_child_outputs` is too high. [10/7]", 3320736661], + [224, 5, 1513, "Metrics/MethodLength: Method has too many lines. [30/10]", 3320736661], + [224, 5, 1513, "Metrics/PerceivedComplexity: Perceived complexity for `apply_markdown_delegated_child_outputs` is too high. [10/8]", 3320736661], + [262, 5, 1058, "Metrics/MethodLength: Method has too many lines. [23/10]", 2000305522], + [289, 5, 1103, "Metrics/MethodLength: Method has too many lines. [23/10]", 2615729942], + [289, 52, 144, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3050457682], + [317, 5, 817, "Metrics/MethodLength: Method has too many lines. [13/10]", 322304706], + [322, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 2378183959], + [335, 5, 805, "Metrics/MethodLength: Method has too many lines. [13/10]", 935244360], + [340, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 2974266470], + [353, 5, 722, "Metrics/MethodLength: Method has too many lines. [12/10]", 1758487766], + [358, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 3013228499], + [370, 5, 730, "Metrics/MethodLength: Method has too many lines. [12/10]", 3297037131], + [375, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 3013228499], + [401, 5, 1584, "Metrics/AbcSize: Assignment Branch Condition size for `collect_markdown_owners` is too high. [<21, 32, 13> 40.42/17]", 572024212], + [401, 5, 1584, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_markdown_owners` is too high. [11/7]", 572024212], + [401, 5, 1584, "Metrics/MethodLength: Method has too many lines. [45/10]", 572024212], + [401, 5, 1584, "Metrics/PerceivedComplexity: Perceived complexity for `collect_markdown_owners` is too high. [11/8]", 572024212], + [455, 5, 1147, "Metrics/AbcSize: Assignment Branch Condition size for `markdown_owner_start_indices` is too high. [<21, 22, 11> 32.34/17]", 12516264], + [455, 5, 1147, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `markdown_owner_start_indices` is too high. [9/7]", 12516264], + [455, 5, 1147, "Metrics/MethodLength: Method has too many lines. [33/10]", 12516264], + [455, 5, 1147, "Metrics/PerceivedComplexity: Perceived complexity for `markdown_owner_start_indices` is too high. [9/8]", 12516264], + [496, 5, 602, "Metrics/AbcSize: Assignment Branch Condition size for `collect_markdown_sections` is too high. [<9, 20, 6> 22.74/17]", 1946206422], + [496, 5, 602, "Metrics/MethodLength: Method has too many lines. [14/10]", 1946206422], + [504, 7, 11, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 848344986], + [515, 5, 1097, "Metrics/AbcSize: Assignment Branch Condition size for `markdown_fence_ranges` is too high. [<19, 21, 11> 30.38/17]", 2035260313], + [515, 5, 1097, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `markdown_fence_ranges` is too high. [8/7]", 2035260313], + [515, 5, 1097, "Metrics/MethodLength: Method has too many lines. [31/10]", 2035260313], + [531, 13, 227, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 1054958538], + [553, 5, 323, "Metrics/MethodLength: Method has too many lines. [14/10]", 2041170985], + [589, 5, 525, "Metrics/MethodLength: Method has too many lines. [11/10]", 1507618315] + ], + "lib/markdown/merge/backend_support.rb:1723133349": [ + [6, 5, 6677, "Metrics/ModuleLength: Module has too many lines. [151/100]", 1497234257], [18, 7, 524, "Metrics/MethodLength: Method has too many lines. [13/10]", 2550700841], [34, 7, 913, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `configure_markdown_only_language_class!` is too high. [9/7]", 2175633707], [34, 7, 913, "Metrics/MethodLength: Method has too many lines. [14/10]", 2175633707], @@ -135,7 +136,7 @@ [54, 7, 1263, "Metrics/MethodLength: Method has too many lines. [20/10]", 122101535], [98, 7, 976, "Metrics/MethodLength: Method has too many lines. [24/10]", 2694447150], [132, 7, 618, "Metrics/MethodLength: Method has too many lines. [11/10]", 2027069469], - [150, 7, 745, "Metrics/MethodLength: Method has too many lines. [18/10]", 3512214017] + [150, 7, 888, "Metrics/MethodLength: Method has too many lines. [21/10]", 3721642530] ], "lib/markdown/merge/cleanse/block_spacing.rb:2917446564": [ [32, 7, 7186, "Metrics/ClassLength: Class has too many lines. [138/100]", 1732896955], @@ -258,13 +259,14 @@ [466, 7, 879, "Metrics/MethodLength: Method has too many lines. [21/10]", 1144304252], [466, 7, 879, "Metrics/PerceivedComplexity: Perceived complexity for `first_list_item_anchor` is too high. [10/8]", 1144304252] ], - "lib/markdown/merge/file_analysis.rb:3254360574": [ - [41, 5, 12519, "Metrics/ClassLength: Class has too many lines. [183/100]", 4132960115], + "lib/markdown/merge/file_analysis.rb:1169434297": [ + [41, 5, 12695, "Metrics/ClassLength: Class has too many lines. [183/100]", 3122418242], [168, 7, 2960, "Metrics/AbcSize: Assignment Branch Condition size for `compute_parser_signature` is too high. [<13, 36, 18> 42.3/17]", 1002271909], [168, 7, 2960, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_parser_signature` is too high. [17/7]", 1002271909], [168, 7, 2960, "Metrics/MethodLength: Method has too many lines. [42/10]", 1002271909], [168, 7, 2960, "Metrics/PerceivedComplexity: Perceived complexity for `compute_parser_signature` is too high. [11/8]", 1002271909], - [290, 7, 777, "Metrics/MethodLength: Method has too many lines. [14/10]", 1287754637] + [290, 7, 777, "Metrics/MethodLength: Method has too many lines. [14/10]", 1287754637], + [328, 7, 558, "Metrics/MethodLength: Method has too many lines. [15/10]", 3417342515] ], "lib/markdown/merge/file_analysis_base.rb:678024820": [ [37, 5, 26494, "Metrics/ClassLength: Class has too many lines. [405/100]", 2769422452], @@ -417,8 +419,8 @@ [224, 7, 878, "Metrics/MethodLength: Method has too many lines. [13/10]", 227721314], [224, 7, 878, "Metrics/PerceivedComplexity: Perceived complexity for `extract_parser_node_source` is too high. [11/8]", 227721314] ], - "lib/markdown/merge/partial_template_merger.rb:2021024147": [ - [32, 5, 20682, "Metrics/ClassLength: Class has too many lines. [336/100]", 2506387030], + "lib/markdown/merge/partial_template_merger.rb:3110525012": [ + [32, 5, 20691, "Metrics/ClassLength: Class has too many lines. [336/100]", 496419120], [71, 7, 1040, "Metrics/MethodLength: Method has too many lines. [17/10]", 2144648319], [71, 21, 417, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 1226086326], [109, 7, 1065, "Metrics/AbcSize: Assignment Branch Condition size for `merge` is too high. [<7, 19, 6> 21.12/17]", 3976180000], @@ -464,7 +466,7 @@ [271, 7, 704, "Metrics/MethodLength: Method has too many lines. [13/10]", 2605835865], [271, 52, 139, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1766111143] ], - "lib/markdown/merge/smart_merger.rb:2962410240": [ + "lib/markdown/merge/smart_merger.rb:1245982439": [ [151, 7, 1405, "Metrics/MethodLength: Method has too many lines. [19/10]", 2830703815], [151, 21, 501, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [13/5]", 1104874368], [229, 7, 1140, "Metrics/AbcSize: Assignment Branch Condition size for `node_to_source` is too high. [<5, 15, 9> 18.19/17]", 1515173572], diff --git a/gems/markdown-merge/Gemfile b/gems/markdown-merge/Gemfile index 59e0ca9e8..fbf163308 100644 --- a/gems/markdown-merge/Gemfile +++ b/gems/markdown-merge/Gemfile @@ -192,6 +192,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/markdown-merge/Gemfile.lock b/gems/markdown-merge/Gemfile.lock index f39d8ddab..754580c70 100644 --- a/gems/markdown-merge/Gemfile.lock +++ b/gems/markdown-merge/Gemfile.lock @@ -275,6 +275,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -308,7 +324,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -363,18 +378,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -538,22 +542,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -659,9 +659,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -739,7 +739,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -760,10 +759,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -838,13 +837,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/markdown-merge/lib/markdown/merge.rb b/gems/markdown-merge/lib/markdown/merge.rb index bcd78590a..a98e0ad73 100644 --- a/gems/markdown-merge/lib/markdown/merge.rb +++ b/gems/markdown-merge/lib/markdown/merge.rb @@ -602,7 +602,10 @@ def markdown_backend_available_for_analysis?(backend_id) def collect_parse_errors(node) raise TreeHaver::NotAvailable, 'Markdown parse returned no root node' unless node - raise TreeHaver::NotAvailable, 'Markdown parse contains syntax errors' if node.respond_to?(:has_error?) && node.has_error? + return unless node.respond_to?(:has_error?) && node.has_error? + + raise TreeHaver::NotAvailable, + 'Markdown parse contains syntax errors' end def parse_failure_result(error) diff --git a/gems/markdown-merge/lib/markdown/merge/file_analysis.rb b/gems/markdown-merge/lib/markdown/merge/file_analysis.rb index 66753c964..648afbf6c 100644 --- a/gems/markdown-merge/lib/markdown/merge/file_analysis.rb +++ b/gems/markdown-merge/lib/markdown/merge/file_analysis.rb @@ -326,7 +326,9 @@ def resolve_backend(backend) # # @return [Object] tree_haver parser instance def create_parser - raise ArgumentError, "Unknown backend: #{@backend}" unless Markdown::Merge::BACKEND_REFERENCES.key?(@backend.to_s) + unless Markdown::Merge::BACKEND_REFERENCES.key?(@backend.to_s) + raise ArgumentError, "Unknown backend: #{@backend}" + end parser = TreeHaver.with_backend(@backend) { TreeHaver.parser_for(:markdown) } diff --git a/gems/markly-merge/.kettle-drift.lock b/gems/markly-merge/.kettle-drift.lock index 9878fb8f5..508d631d8 100644 --- a/gems/markly-merge/.kettle-drift.lock +++ b/gems/markly-merge/.kettle-drift.lock @@ -5,7 +5,8 @@ "lines": [ 79, 119, - 159 + 159, + 199 ] } ], @@ -15,7 +16,8 @@ "lines": [ 90, 130, - 170 + 170, + 210 ] } ], @@ -25,7 +27,8 @@ "lines": [ 80, 120, - 160 + 160, + 200 ] } ], @@ -35,7 +38,8 @@ "lines": [ 92, 132, - 172 + 172, + 212 ] } ], @@ -45,7 +49,8 @@ "lines": [ 95, 135, - 175 + 175, + 215 ] } ], @@ -55,7 +60,8 @@ "lines": [ 81, 121, - 161 + 161, + 201 ] } ], @@ -66,7 +72,8 @@ 59, 99, 139, - 179 + 179, + 219 ] } ], @@ -76,7 +83,8 @@ "lines": [ 100, 140, - 180 + 180, + 220 ] } ], @@ -87,7 +95,8 @@ 42, 86, 126, - 166 + 166, + 206 ] } ], @@ -97,7 +106,8 @@ "lines": [ 109, 149, - 189 + 189, + 229 ] } ], @@ -108,7 +118,8 @@ 34, 78, 118, - 158 + 158, + 198 ] } ], @@ -119,7 +130,8 @@ 68, 108, 148, - 188 + 188, + 228 ] } ], @@ -129,7 +141,8 @@ "lines": [ 84, 124, - 164 + 164, + 204 ] } ], @@ -140,7 +153,8 @@ 47, 91, 131, - 171 + 171, + 211 ] } ], @@ -151,7 +165,8 @@ 43, 87, 127, - 167 + 167, + 207 ] } ], @@ -161,7 +176,8 @@ "lines": [ 85, 125, - 165 + 165, + 205 ] } ], @@ -171,7 +187,8 @@ "lines": [ 102, 142, - 182 + 182, + 222 ] } ], @@ -181,7 +198,8 @@ "lines": [ 101, 141, - 181 + 181, + 221 ] } ], @@ -191,7 +209,8 @@ "lines": [ 96, 136, - 176 + 176, + 216 ] } ], @@ -201,7 +220,8 @@ "lines": [ 105, 145, - 185 + 185, + 225 ] } ], diff --git a/gems/markly-merge/.rubocop_gradual.lock b/gems/markly-merge/.rubocop_gradual.lock index 42ea6fd31..7b6a96fee 100644 --- a/gems/markly-merge/.rubocop_gradual.lock +++ b/gems/markly-merge/.rubocop_gradual.lock @@ -76,9 +76,9 @@ "lib/markly-merge.rb:2425755333": [ [1, 1, 0, "Naming/FileName: The name of this source file (`markly-merge.rb`) should use snake_case.", 5381] ], - "lib/markly/merge.rb:2040353384": [ + "lib/markly/merge.rb:2367262886": [ [10, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Markly::Merge`.", 2866359175], - [10, 3, 22662, "Metrics/ModuleLength: Module has too many lines. [484/100]", 3039251951], + [10, 3, 22686, "Metrics/ModuleLength: Module has too many lines. [484/100]", 3039251951], [11, 5, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631], [56, 5, 1957, "Metrics/MethodLength: Method has too many lines. [42/10]", 2638032592], [101, 5, 1815, "Metrics/MethodLength: Method has too many lines. [37/10]", 421864374], @@ -91,7 +91,7 @@ [234, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2184804663], [253, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 4247938618], [291, 121, 69, "Layout/LineLength: Line is too long. [189/120]", 713082266], - [375, 5, 904, "Metrics/MethodLength: Method has too many lines. [24/10]", 2523239963], + [375, 5, 928, "Metrics/MethodLength: Method has too many lines. [24/10]", 2523239963], [416, 5, 613, "Metrics/MethodLength: Method has too many lines. [11/10]", 2967276583], [416, 52, 144, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3050457682] ], diff --git a/gems/markly-merge/Gemfile b/gems/markly-merge/Gemfile index 21be9633c..3d1cc291f 100644 --- a/gems/markly-merge/Gemfile +++ b/gems/markly-merge/Gemfile @@ -191,6 +191,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/markly-merge/Gemfile.lock b/gems/markly-merge/Gemfile.lock index 0e38a0a14..e32016aaf 100644 --- a/gems/markly-merge/Gemfile.lock +++ b/gems/markly-merge/Gemfile.lock @@ -17,264 +17,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +35,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +48,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +111,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -533,8 +279,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +331,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +382,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +408,31 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +440,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,20 +452,15 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 @@ -788,14 +482,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +493,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +520,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +531,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +544,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +559,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/tree_haver/Gemfile.lock b/gems/tree_haver/Gemfile.lock index 8e744e1af..7ac4910fb 100644 --- a/gems/tree_haver/Gemfile.lock +++ b/gems/tree_haver/Gemfile.lock @@ -7,59 +7,288 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -GEM - remote: https://gem.coop/ +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - ansi (1.6.0) - appraisal2 (3.2.0) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - ast (2.4.3) - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) ast-crispr-markdown-markly (7.1.0) ast-crispr (= 7.1.0) markly-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) prism (>= 1.0) version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: ast-merge (7.1.0) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) - backports (3.25.3) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: bash-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +GEM + remote: https://gem.coop/ + specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + ansi (1.6.0) + appraisal2 (3.2.0) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + 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) citrus (3.0.2) - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) cmdparse (3.0.7) commonmarker (2.9.0-aarch64-linux) commonmarker (2.9.0-aarch64-linux-musl) commonmarker (2.9.0-arm64-darwin) commonmarker (2.9.0-x86_64-linux) commonmarker (2.9.0-x86_64-linux-musl) - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -69,10 +298,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docile (1.4.1) - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -122,10 +347,6 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) @@ -133,31 +354,6 @@ GEM ruby-progressbar (~> 1.13) kettle-drift (1.0.5) version_gem (~> 1.1, >= 1.1.13) - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -181,24 +377,12 @@ GEM turbo_tests2 (~> 3.1, >= 3.1.12) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) 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.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -224,18 +408,9 @@ GEM prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) psych (5.4.0) date stringio - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -244,11 +419,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) rdoc (6.17.0) erb psych (>= 4.0.0) @@ -344,10 +514,6 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -407,10 +573,6 @@ GEM version_gem (~> 1.1, >= 1.1.13) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) @@ -434,10 +596,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.13) - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) yard (0.9.45) yard-fence (0.9.6) rdoc (>= 6.11, < 8) @@ -470,24 +628,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem (>= 7.0) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -496,20 +675,27 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml (~> 0.3) + toml-merge! toml-rb (~> 4.1) tree_haver! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -520,10 +706,13 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) @@ -554,6 +743,7 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 @@ -587,6 +777,8 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 @@ -630,6 +822,7 @@ 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -639,6 +832,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -661,6 +855,7 @@ CHECKSUMS tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) sha256=ad6743a373eeac954c1b659b17af3aff1c82918b3ce9c9dc572a7c70ff843cdd tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -673,6 +868,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From c089e70c8370b54892414f22441cfe3834120d02 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:22:02 -0600 Subject: [PATCH 156/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../.rubocop_gradual.lock | 137 +++++++ gems/markdown-merge/Gemfile.lock | 378 ++---------------- 2 files changed, 166 insertions(+), 349 deletions(-) create mode 100644 gems/ast-crispr-markdown-markly/.rubocop_gradual.lock diff --git a/gems/ast-crispr-markdown-markly/.rubocop_gradual.lock b/gems/ast-crispr-markdown-markly/.rubocop_gradual.lock new file mode 100644 index 000000000..67ec8026a --- /dev/null +++ b/gems/ast-crispr-markdown-markly/.rubocop_gradual.lock @@ -0,0 +1,137 @@ +{ + ".simplecov:971555246": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:4085821453": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "ast-crispr-markdown-markly.gemspec:1188642188": [ + [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/ast-crispr-markdown-markly.rb:374208510": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`ast-crispr-markdown-markly.rb`) should use snake_case.", 5381] + ], + "lib/ast/crispr/markdown/markly.rb:2564514831": [ + [11, 7, 13, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::Markdown::Markly`.", 95841343], + [14, 9, 13, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Markdown::Markly::Adapter`.", 2579377404], + [14, 9, 13970, "Metrics/ClassLength: Class has too many lines. [335/100]", 429557235], + [64, 11, 700, "Metrics/MethodLength: Method has too many lines. [15/10]", 196504356], + [90, 13, 87, "Style/RaiseArgs: Provide an exception class and message as arguments to `raise`.", 1878059440], + [93, 11, 1781, "Metrics/MethodLength: Method has too many lines. [39/10]", 2020253431], + [137, 11, 739, "Metrics/AbcSize: Assignment Branch Condition size for `build_heading_sections` is too high. [<5, 16, 3> 17.03/17]", 3186655060], + [137, 11, 739, "Metrics/MethodLength: Method has too many lines. [14/10]", 3186655060], + [156, 11, 915, "Metrics/AbcSize: Assignment Branch Condition size for `build_link_definitions` is too high. [<2, 19, 7> 20.35/17]", 2943708156], + [156, 11, 915, "Metrics/MethodLength: Method has too many lines. [18/10]", 2943708156], + [195, 11, 1750, "Metrics/AbcSize: Assignment Branch Condition size for `build_table_rows` is too high. [<16, 44, 17> 49.81/17]", 3931509409], + [195, 11, 1750, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_table_rows` is too high. [16/7]", 3931509409], + [195, 11, 1750, "Metrics/MethodLength: Method has too many lines. [34/10]", 3931509409], + [195, 11, 1750, "Metrics/PerceivedComplexity: Perceived complexity for `build_table_rows` is too high. [16/8]", 3931509409], + [253, 11, 768, "Metrics/MethodLength: Method has too many lines. [14/10]", 737914131], + [297, 11, 622, "Metrics/MethodLength: Method has too many lines. [18/10]", 1706283245], + [320, 11, 717, "Metrics/MethodLength: Method has too many lines. [15/10]", 1919892283], + [341, 11, 977, "Metrics/AbcSize: Assignment Branch Condition size for `inline_link_reference_at` is too high. [<6, 17, 11> 21.12/17]", 2987695093], + [341, 11, 977, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `inline_link_reference_at` is too high. [8/7]", 2987695093], + [341, 11, 977, "Metrics/MethodLength: Method has too many lines. [19/10]", 2987695093], + [366, 37, 83, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2884863618], + [379, 11, 404, "Metrics/MethodLength: Method has too many lines. [13/10]", 427422621], + [396, 9, 16, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::Markdown::Markly::Selectors`.", 2133324825], + [396, 9, 8840, "Metrics/ModuleLength: Module has too many lines. [186/100]", 1134016796], + [399, 11, 1452, "Metrics/AbcSize: Assignment Branch Condition size for `heading_section` is too high. [<2, 21, 7> 22.23/17]", 1578141243], + [399, 11, 1452, "Metrics/MethodLength: Method has too many lines. [30/10]", 1578141243], + [399, 30, 73, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 515735878], + [433, 11, 1397, "Metrics/AbcSize: Assignment Branch Condition size for `link_definition` is too high. [<2, 22, 8> 23.49/17]", 2035221200], + [433, 11, 1397, "Metrics/MethodLength: Method has too many lines. [29/10]", 2035221200], + [433, 30, 68, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2927391196], + [466, 11, 1236, "Metrics/MethodLength: Method has too many lines. [27/10]", 2705412671], + [497, 11, 1632, "Metrics/AbcSize: Assignment Branch Condition size for `inline_reference` is too high. [<2, 25, 7> 26.04/17]", 2822954343], + [497, 11, 1632, "Metrics/MethodLength: Method has too many lines. [32/10]", 2822954343], + [497, 31, 79, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 871966347], + [533, 11, 3009, "Metrics/AbcSize: Assignment Branch Condition size for `html_comment_block` is too high. [<14, 43, 23> 50.73/17]", 1757586727], + [533, 11, 3009, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `html_comment_block` is too high. [18/7]", 1757586727], + [533, 11, 3009, "Metrics/MethodLength: Method has too many lines. [56/10]", 1757586727], + [533, 11, 3009, "Metrics/PerceivedComplexity: Perceived complexity for `html_comment_block` is too high. [18/8]", 1757586727], + [533, 33, 148, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 4247948333], + [545, 23, 2311, "Metrics/BlockLength: Block has too many lines. [43/25]", 3166751632], + [550, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 236074548] + ], + "spec/ast/crispr/markdown/markly_spec.rb:4192197438": [ + [3, 1, 13013, "Metrics/BlockLength: Block has too many lines. [238/25]", 467937705], + [28, 3, 10302, "Metrics/BlockLength: Block has too many lines. [182/25]", 3591393606], + [132, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 2063489827], + [134, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 2916348790], + [152, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 3082451518], + [154, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 3021964175], + [267, 3, 1687, "Metrics/BlockLength: Block has too many lines. [33/25]", 4221412326] + ] +} diff --git a/gems/markdown-merge/Gemfile.lock b/gems/markdown-merge/Gemfile.lock index 754580c70..f7a60e363 100644 --- a/gems/markdown-merge/Gemfile.lock +++ b/gems/markdown-merge/Gemfile.lock @@ -17,39 +17,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -58,193 +26,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -252,45 +34,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -310,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -324,6 +61,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -379,6 +117,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -397,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -537,23 +283,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -587,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +381,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,61 +407,39 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +452,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +480,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +491,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,19 +518,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,19 +542,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +557,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From c5f2bb5ddc904e96287f30aaa63ff611adecbea6 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:22:03 -0600 Subject: [PATCH 157/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-crispr-markdown-markly/Gemfile.lock | 386 +++---------------- 1 file changed, 43 insertions(+), 343 deletions(-) diff --git a/gems/ast-crispr-markdown-markly/Gemfile.lock b/gems/ast-crispr-markdown-markly/Gemfile.lock index 69b980543..29a2558b5 100644 --- a/gems/ast-crispr-markdown-markly/Gemfile.lock +++ b/gems/ast-crispr-markdown-markly/Gemfile.lock @@ -17,15 +17,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) ast-merge (= 7.1.0) @@ -33,264 +25,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) markdown-merge (= 7.1.0) markly (~> 0.9) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -302,6 +43,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -310,12 +56,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -324,6 +64,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -379,6 +120,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -397,6 +147,10 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) @@ -542,18 +296,22 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -587,11 +345,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -640,43 +398,23 @@ DEPENDENCIES appraisal2 (~> 3.0, >= 3.0.6) 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,26 +423,18 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -713,33 +443,20 @@ CHECKSUMS ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,20 +469,15 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 @@ -787,14 +499,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +510,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,19 +537,18 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,19 +562,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +577,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 212fd55b1d1d4d75380c2014010c07c520722d07 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:22:37 -0600 Subject: [PATCH 158/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-crispr-markdown-markly/Gemfile.lock | 335 ++++++++++++++++- gems/ast-merge-git/.kettle-drift.lock | 152 ++++---- gems/ast-merge-git/.rubocop_gradual.lock | 84 ++--- gems/ast-merge-git/Gemfile | 41 ++- gems/ast-merge-git/Gemfile.lock | 332 +---------------- .../spec/fixtures_integration_spec.rb | 4 +- gems/ast-merge/Gemfile | 68 ++-- gems/ast-merge/Rakefile | 18 +- gems/ast-merge/bin/yard | 2 +- .../ast/merge/rspec/conformance_fixtures.rb | 4 +- gems/ast-merge/lib/ast/merge/version.rb | 2 +- gems/json-merge/.kettle-drift.lock | 60 ++- gems/json-merge/.rubocop_gradual.lock | 302 --------------- gems/json-merge/Gemfile | 40 ++ gems/json-merge/Gemfile.lock | 59 ++- gems/json-merge/lib/json/merge.rb | 16 +- gems/markdown-merge/Gemfile.lock | 327 ++++++++++++++++- gems/markly-merge/Gemfile.lock | 343 +++++++++++++++++- gems/plain-merge/.kettle-drift.lock | 60 ++- gems/plain-merge/.rubocop_gradual.lock | 106 ------ gems/plain-merge/Gemfile | 40 ++ gems/plain-merge/Gemfile.lock | 59 ++- gems/plain-merge/lib/plain/merge/version.rb | 2 +- 23 files changed, 1416 insertions(+), 1040 deletions(-) delete mode 100644 gems/json-merge/.rubocop_gradual.lock delete mode 100644 gems/plain-merge/.rubocop_gradual.lock diff --git a/gems/ast-crispr-markdown-markly/Gemfile.lock b/gems/ast-crispr-markdown-markly/Gemfile.lock index 29a2558b5..0e9612d0a 100644 --- a/gems/ast-crispr-markdown-markly/Gemfile.lock +++ b/gems/ast-crispr-markdown-markly/Gemfile.lock @@ -17,7 +17,15 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: ast-crispr (7.1.0) ast-merge (= 7.1.0) @@ -25,13 +33,248 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: markly-merge (7.1.0) markdown-merge (= 7.1.0) markly (~> 0.9) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -43,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -56,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -119,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -147,10 +393,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) @@ -345,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -398,23 +640,43 @@ DEPENDENCIES appraisal2 (~> 3.0, >= 3.0.6) 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -423,18 +685,26 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -443,13 +713,26 @@ CHECKSUMS ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -457,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -469,15 +753,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 @@ -499,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -510,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -537,9 +831,11 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -549,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -562,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -577,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ast-merge-git/.kettle-drift.lock b/gems/ast-merge-git/.kettle-drift.lock index 9878fb8f5..0161251a7 100644 --- a/gems/ast-merge-git/.kettle-drift.lock +++ b/gems/ast-merge-git/.kettle-drift.lock @@ -3,9 +3,10 @@ { "file": "Gemfile", "lines": [ - 79, - 119, - 159 + 80, + 120, + 160, + 200 ] } ], @@ -13,9 +14,10 @@ { "file": "Gemfile", "lines": [ - 90, - 130, - 170 + 91, + 131, + 171, + 211 ] } ], @@ -23,9 +25,10 @@ { "file": "Gemfile", "lines": [ - 80, - 120, - 160 + 81, + 121, + 161, + 201 ] } ], @@ -33,9 +36,10 @@ { "file": "Gemfile", "lines": [ - 92, - 132, - 172 + 93, + 133, + 173, + 213 ] } ], @@ -43,9 +47,10 @@ { "file": "Gemfile", "lines": [ - 95, - 135, - 175 + 96, + 136, + 176, + 216 ] } ], @@ -53,9 +58,10 @@ { "file": "Gemfile", "lines": [ - 81, - 121, - 161 + 82, + 122, + 162, + 202 ] } ], @@ -63,10 +69,11 @@ { "file": "Gemfile", "lines": [ - 59, - 99, - 139, - 179 + 60, + 100, + 140, + 180, + 220 ] } ], @@ -74,9 +81,10 @@ { "file": "Gemfile", "lines": [ - 100, - 140, - 180 + 101, + 141, + 181, + 221 ] } ], @@ -84,10 +92,11 @@ { "file": "Gemfile", "lines": [ - 42, - 86, - 126, - 166 + 43, + 87, + 127, + 167, + 207 ] } ], @@ -95,9 +104,10 @@ { "file": "Gemfile", "lines": [ - 109, - 149, - 189 + 110, + 150, + 190, + 230 ] } ], @@ -105,10 +115,11 @@ { "file": "Gemfile", "lines": [ - 34, - 78, - 118, - 158 + 35, + 79, + 119, + 159, + 199 ] } ], @@ -116,10 +127,11 @@ { "file": "Gemfile", "lines": [ - 68, - 108, - 148, - 188 + 69, + 109, + 149, + 189, + 229 ] } ], @@ -127,9 +139,10 @@ { "file": "Gemfile", "lines": [ - 84, - 124, - 164 + 85, + 125, + 165, + 205 ] } ], @@ -137,10 +150,11 @@ { "file": "Gemfile", "lines": [ - 47, - 91, - 131, - 171 + 48, + 92, + 132, + 172, + 212 ] } ], @@ -148,10 +162,11 @@ { "file": "Gemfile", "lines": [ - 43, - 87, - 127, - 167 + 44, + 88, + 128, + 168, + 208 ] } ], @@ -159,9 +174,10 @@ { "file": "Gemfile", "lines": [ - 85, - 125, - 165 + 86, + 126, + 166, + 206 ] } ], @@ -169,9 +185,10 @@ { "file": "Gemfile", "lines": [ - 102, - 142, - 182 + 103, + 143, + 183, + 223 ] } ], @@ -179,9 +196,10 @@ { "file": "Gemfile", "lines": [ - 101, - 141, - 181 + 102, + 142, + 182, + 222 ] } ], @@ -189,9 +207,10 @@ { "file": "Gemfile", "lines": [ - 96, - 136, - 176 + 97, + 137, + 177, + 217 ] } ], @@ -199,9 +218,10 @@ { "file": "Gemfile", "lines": [ - 105, - 145, - 185 + 106, + 146, + 186, + 226 ] } ], diff --git a/gems/ast-merge-git/.rubocop_gradual.lock b/gems/ast-merge-git/.rubocop_gradual.lock index bc438def4..ff0066794 100644 --- a/gems/ast-merge-git/.rubocop_gradual.lock +++ b/gems/ast-merge-git/.rubocop_gradual.lock @@ -8,11 +8,11 @@ [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] ], - "ast-merge-git.gemspec:646301195": [ - [127, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [142, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [143, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [150, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + "ast-merge-git.gemspec:151757427": [ + [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] ], "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] @@ -82,46 +82,38 @@ "lib/ast-merge-git.rb:2225160157": [ [1, 1, 0, "Naming/FileName: The name of this source file (`ast-merge-git.rb`) should use snake_case.", 5381] ], - "lib/ast/merge/git.rb:1842264944": [ - [11, 5, 10, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::Git`.", 3851934373], - [11, 5, 16583, "Metrics/ModuleLength: Module has too many lines. [376/100]", 1524969990], - [17, 7, 487, "Metrics/MethodLength: Method has too many lines. [15/10]", 186495496], - [35, 7, 2131, "Metrics/AbcSize: Assignment Branch Condition size for `merge3_json` is too high. [<10, 21, 5> 23.79/17]", 4226122829], - [35, 7, 2131, "Metrics/MethodLength: Method has too many lines. [49/10]", 4226122829], - [92, 7, 1030, "Metrics/MethodLength: Method has too many lines. [23/10]", 3760313662], - [119, 7, 1773, "Metrics/AbcSize: Assignment Branch Condition size for `response` is too high. [<0, 20, 6> 20.88/17]", 2729446571], - [119, 7, 1773, "Metrics/MethodLength: Method has too many lines. [33/10]", 2729446571], - [119, 19, 285, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [13/5]", 1214652168], - [119, 20, 2, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 5861217], - [120, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 198321059], - [136, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2089543276], - [143, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1756879393], - [150, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3825289243], - [156, 7, 1545, "Metrics/MethodLength: Method has too many lines. [22/10]", 3913227083], - [158, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 3143802438], - [182, 7, 633, "Metrics/MethodLength: Method has too many lines. [17/10]", 1596017211], - [211, 7, 580, "Metrics/MethodLength: Method has too many lines. [14/10]", 806995714], - [228, 7, 1207, "Metrics/AbcSize: Assignment Branch Condition size for `render_json_owned_region_conflict_source` is too high. [<11, 31, 9> 34.1/17]", 3379641138], - [228, 7, 1207, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `render_json_owned_region_conflict_source` is too high. [9/7]", 3379641138], - [228, 7, 1207, "Metrics/MethodLength: Method has too many lines. [22/10]", 3379641138], - [228, 7, 1207, "Metrics/PerceivedComplexity: Perceived complexity for `render_json_owned_region_conflict_source` is too high. [9/8]", 3379641138], - [267, 7, 1003, "Metrics/MethodLength: Method has too many lines. [21/10]", 3925322740], - [322, 7, 647, "Metrics/AbcSize: Assignment Branch Condition size for `merge_json_objects` is too high. [<9, 19, 8> 22.49/17]", 3282600463], - [322, 7, 647, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_json_objects` is too high. [9/7]", 3282600463], - [322, 7, 647, "Metrics/MethodLength: Method has too many lines. [14/10]", 3282600463], - [322, 7, 647, "Metrics/PerceivedComplexity: Perceived complexity for `merge_json_objects` is too high. [9/8]", 3282600463], - [339, 7, 1225, "Metrics/AbcSize: Assignment Branch Condition size for `classify_json_changes` is too high. [<9, 26, 19> 33.44/17]", 1184093629], - [339, 7, 1225, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `classify_json_changes` is too high. [16/7]", 1184093629], - [339, 7, 1225, "Metrics/MethodLength: Method has too many lines. [18/10]", 1184093629], - [339, 7, 1225, "Metrics/PerceivedComplexity: Perceived complexity for `classify_json_changes` is too high. [16/8]", 1184093629], - [372, 7, 1204, "Metrics/AbcSize: Assignment Branch Condition size for `merge_json_entry` is too high. [<3, 4, 24> 24.52/17]", 4167732292], - [372, 7, 1204, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_json_entry` is too high. [19/7]", 4167732292], - [372, 7, 1204, "Metrics/MethodLength: Method has too many lines. [23/10]", 4167732292], - [372, 7, 1204, "Metrics/PerceivedComplexity: Perceived complexity for `merge_json_entry` is too high. [19/8]", 4167732292] - ], - "spec/fixtures_integration_spec.rb:3913389885": [ - [5, 1, 4397, "Metrics/BlockLength: Block has too many lines. [76/25]", 3987365418], - [14, 3, 2790, "Metrics/BlockLength: Block has too many lines. [44/25]", 1864930381], - [19, 5, 2476, "Metrics/BlockLength: Block has too many lines. [39/25]", 2685930561] + "lib/ast/merge/git.rb:1420427255": [ + [12, 5, 10, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::Git`.", 3851934373], + [12, 5, 14569, "Metrics/ModuleLength: Module has too many lines. [364/100]", 863629740], + [19, 7, 487, "Metrics/MethodLength: Method has too many lines. [15/10]", 186495496], + [37, 7, 892, "Metrics/MethodLength: Method has too many lines. [23/10]", 4223005176], + [66, 7, 813, "Metrics/MethodLength: Method has too many lines. [18/10]", 1966785319], + [96, 7, 771, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_json_values` is too high. [8/7]", 3825199411], + [96, 7, 771, "Metrics/MethodLength: Method has too many lines. [16/10]", 3825199411], + [96, 7, 771, "Metrics/PerceivedComplexity: Perceived complexity for `merge_json_values` is too high. [9/8]", 3825199411], + [117, 7, 791, "Metrics/MethodLength: Method has too many lines. [20/10]", 3551257045], + [173, 7, 578, "Metrics/MethodLength: Method has too many lines. [16/10]", 3163340030], + [192, 7, 1178, "Metrics/MethodLength: Method has too many lines. [22/10]", 4051400949], + [217, 7, 678, "Metrics/AbcSize: Assignment Branch Condition size for `render_owned_json_conflict_source` is too high. [<3, 20, 1> 20.25/17]", 3860921953], + [217, 7, 678, "Metrics/MethodLength: Method has too many lines. [15/10]", 3860921953], + [235, 7, 470, "Metrics/MethodLength: Method has too many lines. [12/10]", 962148087], + [261, 7, 1030, "Metrics/MethodLength: Method has too many lines. [23/10]", 3760313662], + [288, 7, 1773, "Metrics/AbcSize: Assignment Branch Condition size for `response` is too high. [<0, 20, 6> 20.88/17]", 2729446571], + [288, 7, 1773, "Metrics/MethodLength: Method has too many lines. [33/10]", 2729446571], + [288, 19, 285, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [13/5]", 1214652168], + [288, 20, 2, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 5861217], + [289, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 198321059], + [305, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2089543276], + [312, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1756879393], + [319, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3825289243], + [325, 7, 1545, "Metrics/MethodLength: Method has too many lines. [22/10]", 3913227083], + [327, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 3143802438], + [351, 7, 633, "Metrics/MethodLength: Method has too many lines. [17/10]", 1596017211], + [380, 7, 580, "Metrics/MethodLength: Method has too many lines. [14/10]", 806995714] + ], + "spec/fixtures_integration_spec.rb:2251743409": [ + [5, 1, 4009, "Metrics/BlockLength: Block has too many lines. [66/25]", 2498851053], + [14, 3, 2402, "Metrics/BlockLength: Block has too many lines. [34/25]", 3612522178], + [19, 5, 2088, "Metrics/BlockLength: Block has too many lines. [29/25]", 113456270] ] } diff --git a/gems/ast-merge-git/Gemfile b/gems/ast-merge-git/Gemfile index dcce682dc..b33678050 100644 --- a/gems/ast-merge-git/Gemfile +++ b/gems/ast-merge-git/Gemfile @@ -26,7 +26,6 @@ gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 direct_sibling_gems = %w[ ast-merge json-merge - tree_haver ] direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') direct_sibling_local = @@ -193,6 +192,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/ast-merge-git/Gemfile.lock b/gems/ast-merge-git/Gemfile.lock index 4df4417ad..863f65ef6 100644 --- a/gems/ast-merge-git/Gemfile.lock +++ b/gems/ast-merge-git/Gemfile.lock @@ -17,31 +17,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -50,231 +26,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: json-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -294,12 +52,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +115,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +143,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +282,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +334,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +385,25 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +412,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +445,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +457,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +485,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +496,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +523,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +534,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +547,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +562,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ast-merge-git/spec/fixtures_integration_spec.rb b/gems/ast-merge-git/spec/fixtures_integration_spec.rb index 8255fb702..8d48358a6 100644 --- a/gems/ast-merge-git/spec/fixtures_integration_spec.rb +++ b/gems/ast-merge-git/spec/fixtures_integration_spec.rb @@ -30,10 +30,10 @@ def read_json(path) expect(result.fetch(:reparse_after_render)).to eq(expected.fetch(:reparse_after_render)), test_case.fetch(:case_id) expect(result.fetch(:render_report).fetch(:strategy)).to eq(expected.dig(:render_report, :strategy)), - test_case.fetch(:case_id) + test_case.fetch(:case_id) if expected[:merged_json] expect(JSON.parse(result.fetch(:merged_source), symbolize_names: true)).to eq(expected.fetch(:merged_json)), - test_case.fetch(:case_id) + test_case.fetch(:case_id) end expected.fetch(:conflict_categories, []).each_with_index do |category, index| expect(result.dig(:conflicts, index, :category)).to eq(category), test_case.fetch(:case_id) diff --git a/gems/ast-merge/Gemfile b/gems/ast-merge/Gemfile index 7c71edd7c..aa6f7e698 100644 --- a/gems/ast-merge/Gemfile +++ b/gems/ast-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source "https://gem.coop" +source 'https://gem.coop' git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,57 +19,53 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ["~> 1.0", ">= 1.0.8"] -gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ['~> 1.0', '>= 1.0.8'] +gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ tree_haver ] -direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") +direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? if direct_sibling_gems.any? && - (direct_sibling_local || - ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) - direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") - direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) begin nomono_activation_requirements = nomono_requirements - nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) if File.file?(nomono_lockfile) nomono_locked_spec = Bundler::LockfileParser - .new(Bundler.read_file(nomono_lockfile)) - .specs - .find { |spec| spec.name == "nomono" } + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } nomono_locked = nomono_locked_spec && - Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) - if nomono_locked - nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] - end - end - Kernel.send(:gem, "nomono", *nomono_activation_requirements) - require "nomono/bundler" - if direct_sibling_templating && !direct_sibling_local - ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local eval_nomono_gems( gems: direct_sibling_gems, - prefix: "STRUCTUREDMERGE", - path_env: "STRUCTUREDMERGE_DEV", - root: ["src", "my", "structuredmerge"] + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] ) rescue LoadError - warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' ensure if direct_sibling_templating && !direct_sibling_local if direct_sibling_dev_was_set - ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original else - ENV.delete("STRUCTUREDMERGE_DEV") + ENV.delete('STRUCTUREDMERGE_DEV') end end end @@ -253,25 +249,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging -eval_gemfile "gemfiles/modular/debug.gemfile" +eval_gemfile 'gemfiles/modular/debug.gemfile' # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile "gemfiles/modular/coverage.gemfile" +eval_gemfile 'gemfiles/modular/coverage.gemfile' # Linting -eval_gemfile "gemfiles/modular/style.gemfile" +eval_gemfile 'gemfiles/modular/style.gemfile' # Documentation -eval_gemfile "gemfiles/modular/documentation.gemfile" +eval_gemfile 'gemfiles/modular/documentation.gemfile' # Optional -eval_gemfile "gemfiles/modular/optional.gemfile" +eval_gemfile 'gemfiles/modular/optional.gemfile' ### Std Lib Extracted Gems -eval_gemfile "gemfiles/modular/x_std_libs.gemfile" +eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' # See unlocked_deps appraisal for more details on irb inclusion -gem "irb", "~> 1.17" # ruby >= 2.7 +gem 'irb', '~> 1.17' # ruby >= 2.7 diff --git a/gems/ast-merge/Rakefile b/gems/ast-merge/Rakefile index 6b4e21dec..339c9a3cb 100644 --- a/gems/ast-merge/Rakefile +++ b/gems/ast-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require "kettle/drift" + require 'kettle/drift' Kettle::Drift.install_tasks rescue LoadError - desc("(stub) kettle:drift:check is unavailable") - task("kettle:drift:check") do + desc('(stub) kettle:drift:check is unavailable') + task('kettle:drift:check') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:update is unavailable") - task("kettle:drift:update") do + desc('(stub) kettle:drift:update is unavailable') + task('kettle:drift:update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:force_update is unavailable") - task("kettle:drift:force_update") do + desc('(stub) kettle:drift:force_update is unavailable') + task('kettle:drift:force_update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift is unavailable") - task("kettle:drift" => "kettle:drift:update") + desc('(stub) kettle:drift is unavailable') + task('kettle:drift' => 'kettle:drift:update') end ### TEMPLATING TASKS diff --git a/gems/ast-merge/bin/yard b/gems/ast-merge/bin/yard index a7e8b6eed..5d516ad6f 100755 --- a/gems/ast-merge/bin/yard +++ b/gems/ast-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec("bundle", "exec", "rake", "yard") +exec('bundle', 'exec', 'rake', 'yard') diff --git a/gems/ast-merge/lib/ast/merge/rspec/conformance_fixtures.rb b/gems/ast-merge/lib/ast/merge/rspec/conformance_fixtures.rb index c758f321d..4fb6da375 100644 --- a/gems/ast-merge/lib/ast/merge/rspec/conformance_fixtures.rb +++ b/gems/ast-merge/lib/ast/merge/rspec/conformance_fixtures.rb @@ -34,8 +34,6 @@ def normalize_conformance_fixture_support(value = nil, default_status: nil, **ke metadata[:reason] = reason if reason metadata[:category] = support[:category] || support['category'] if support[:category] || support['category'] metadata - else - nil end end @@ -56,7 +54,7 @@ def apply_conformance_fixture_support!(support) def role_support(roles, role, default_status:) value = if roles.is_a?(Array) - roles.map(&:to_s).include?(role.to_s) ? true : nil + roles.map(&:to_s).include?(role.to_s) || nil elsif roles roles[role.to_sym] || roles[role.to_s] end diff --git a/gems/ast-merge/lib/ast/merge/version.rb b/gems/ast-merge/lib/ast/merge/version.rb index 3ef823f4d..6e7dc90f7 100644 --- a/gems/ast-merge/lib/ast/merge/version.rb +++ b/gems/ast-merge/lib/ast/merge/version.rb @@ -3,7 +3,7 @@ module Ast module Merge module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/json-merge/.kettle-drift.lock b/gems/json-merge/.kettle-drift.lock index 628aa923c..0161251a7 100644 --- a/gems/json-merge/.kettle-drift.lock +++ b/gems/json-merge/.kettle-drift.lock @@ -5,7 +5,8 @@ "lines": [ 80, 120, - 160 + 160, + 200 ] } ], @@ -15,7 +16,8 @@ "lines": [ 91, 131, - 171 + 171, + 211 ] } ], @@ -25,7 +27,8 @@ "lines": [ 81, 121, - 161 + 161, + 201 ] } ], @@ -35,7 +38,8 @@ "lines": [ 93, 133, - 173 + 173, + 213 ] } ], @@ -45,7 +49,8 @@ "lines": [ 96, 136, - 176 + 176, + 216 ] } ], @@ -55,7 +60,8 @@ "lines": [ 82, 122, - 162 + 162, + 202 ] } ], @@ -66,7 +72,8 @@ 60, 100, 140, - 180 + 180, + 220 ] } ], @@ -76,7 +83,8 @@ "lines": [ 101, 141, - 181 + 181, + 221 ] } ], @@ -87,7 +95,8 @@ 43, 87, 127, - 167 + 167, + 207 ] } ], @@ -97,7 +106,8 @@ "lines": [ 110, 150, - 190 + 190, + 230 ] } ], @@ -108,7 +118,8 @@ 35, 79, 119, - 159 + 159, + 199 ] } ], @@ -119,7 +130,8 @@ 69, 109, 149, - 189 + 189, + 229 ] } ], @@ -129,7 +141,8 @@ "lines": [ 85, 125, - 165 + 165, + 205 ] } ], @@ -140,7 +153,8 @@ 48, 92, 132, - 172 + 172, + 212 ] } ], @@ -151,7 +165,8 @@ 44, 88, 128, - 168 + 168, + 208 ] } ], @@ -161,7 +176,8 @@ "lines": [ 86, 126, - 166 + 166, + 206 ] } ], @@ -171,7 +187,8 @@ "lines": [ 103, 143, - 183 + 183, + 223 ] } ], @@ -181,7 +198,8 @@ "lines": [ 102, 142, - 182 + 182, + 222 ] } ], @@ -191,7 +209,8 @@ "lines": [ 97, 137, - 177 + 177, + 217 ] } ], @@ -201,7 +220,8 @@ "lines": [ 106, 146, - 186 + 186, + 226 ] } ], diff --git a/gems/json-merge/.rubocop_gradual.lock b/gems/json-merge/.rubocop_gradual.lock deleted file mode 100644 index 66c67ae3a..000000000 --- a/gems/json-merge/.rubocop_gradual.lock +++ /dev/null @@ -1,302 +0,0 @@ -{ - ".simplecov:3644224046": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:2931360525": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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:1457364349": [ - [16, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1168797721], - [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ], - "lib/json-merge.rb:4173905501": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`json-merge.rb`) should use snake_case.", 5381] - ], - "lib/json/merge.rb:984073198": [ - [11, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Json::Merge`.", 2866359175], - [11, 3, 12377, "Metrics/ModuleLength: Module has too many lines. [362/100]", 2468008325], - [25, 5, 16, "Style/Documentation: Missing top-level documentation comment for `class Json::Merge::ParseError`.", 362242086], - [83, 5, 787, "Metrics/MethodLength: Method has too many lines. [22/10]", 2499199177], - [113, 5, 1350, "Metrics/AbcSize: Assignment Branch Condition size for `merge_json` is too high. [<5, 15, 7> 17.29/17]", 1290833963], - [113, 5, 1350, "Metrics/MethodLength: Method has too many lines. [31/10]", 1290833963], - [202, 5, 550, "Metrics/MethodLength: Method has too many lines. [13/10]", 1442850587], - [219, 5, 567, "Metrics/MethodLength: Method has too many lines. [13/10]", 4162148585], - [241, 5, 528, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_trailing_comma` is too high. [8/7]", 4057979016], - [241, 5, 528, "Metrics/MethodLength: Method has too many lines. [13/10]", 4057979016], - [260, 5, 1404, "Metrics/AbcSize: Assignment Branch Condition size for `strip_json_comments` is too high. [<21, 22, 26> 40.01/17]", 1652324937], - [260, 5, 1404, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `strip_json_comments` is too high. [16/7]", 1652324937], - [260, 5, 1404, "Metrics/MethodLength: Method has too many lines. [55/10]", 1652324937], - [260, 5, 1404, "Metrics/PerceivedComplexity: Perceived complexity for `strip_json_comments` is too high. [17/8]", 1652324937], - [334, 5, 1439, "Metrics/AbcSize: Assignment Branch Condition size for `strip_trailing_commas` is too high. [<15, 30, 30> 45/17]", 4287439644], - [334, 5, 1439, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `strip_trailing_commas` is too high. [20/7]", 4287439644], - [334, 5, 1439, "Metrics/MethodLength: Method has too many lines. [51/10]", 4287439644], - [334, 5, 1439, "Metrics/PerceivedComplexity: Perceived complexity for `strip_trailing_commas` is too high. [21/8]", 4287439644], - [337, 7, 1331, "Metrics/BlockLength: Block has too many lines. [46/25]", 1267867017], - [407, 5, 787, "Metrics/AbcSize: Assignment Branch Condition size for `advance_scanner_state` is too high. [<8, 12, 24> 28/17]", 2437181548], - [407, 5, 787, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `advance_scanner_state` is too high. [15/7]", 2437181548], - [407, 5, 787, "Metrics/MethodLength: Method has too many lines. [25/10]", 2437181548], - [407, 5, 787, "Metrics/PerceivedComplexity: Perceived complexity for `advance_scanner_state` is too high. [17/8]", 2437181548] - ], - "lib/json/merge/comment_tracker.rb:3472563198": [ - [19, 48, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] - ], - "lib/json/merge/conflict_resolver.rb:301712181": [ - [11, 5, 55081, "Metrics/ClassLength: Class has too many lines. [1053/100]", 4044265605], - [33, 7, 998, "Metrics/MethodLength: Method has too many lines. [16/10]", 2622185411], - [33, 21, 308, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [12/5]", 958959236], - [34, 121, 95, "Layout/LineLength: Line is too long. [215/120]", 3448296820], - [58, 7, 1143, "Metrics/MethodLength: Method has too many lines. [21/10]", 2302471255], - [107, 7, 4969, "Metrics/AbcSize: Assignment Branch Condition size for `merge_node_lists_to_emitter` is too high. [<29, 62, 22> 71.9/17]", 3145241362], - [107, 7, 4969, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_node_lists_to_emitter` is too high. [20/7]", 3145241362], - [107, 7, 4969, "Metrics/MethodLength: Method has too many lines. [82/10]", 3145241362], - [107, 7, 4969, "Metrics/PerceivedComplexity: Perceived complexity for `merge_node_lists_to_emitter` is too high. [22/8]", 3145241362], - [146, 9, 2759, "Metrics/BlockLength: Block has too many lines. [50/25]", 385678694], - [239, 7, 5585, "Metrics/AbcSize: Assignment Branch Condition size for `merge_matched_nodes_to_emitter` is too high. [<15, 45, 20> 51.48/17]", 3947285535], - [239, 7, 5585, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_matched_nodes_to_emitter` is too high. [17/7]", 3947285535], - [239, 7, 5585, "Metrics/MethodLength: Method has too many lines. [102/10]", 3947285535], - [239, 7, 5585, "Metrics/PerceivedComplexity: Perceived complexity for `merge_matched_nodes_to_emitter` is too high. [21/8]", 3947285535], - [277, 13, 1934, "Metrics/BlockLength: Block has too many lines. [31/25]", 884303795], - [306, 17, 181, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 898629436], - [363, 7, 895, "Metrics/MethodLength: Method has too many lines. [23/10]", 2982353847], - [392, 7, 718, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preference_for_pair` is too high. [8/7]", 3339910669], - [392, 7, 718, "Metrics/MethodLength: Method has too many lines. [12/10]", 3339910669], - [418, 7, 1636, "Metrics/MethodLength: Method has too many lines. [37/10]", 514235298], - [473, 25, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [493, 7, 5501, "Metrics/AbcSize: Assignment Branch Condition size for `emit_node` is too high. [<18, 82, 31> 89.49/17]", 1826498333], - [493, 7, 5501, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_node` is too high. [29/7]", 1826498333], - [493, 7, 5501, "Metrics/MethodLength: Method has too many lines. [109/10]", 1826498333], - [493, 7, 5501, "Metrics/PerceivedComplexity: Perceived complexity for `emit_node` is too high. [36/8]", 1826498333], - [522, 15, 1572, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 3256756034], - [554, 15, 654, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 3730688879], - [569, 17, 287, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 3369588943], - [618, 7, 1424, "Metrics/AbcSize: Assignment Branch Condition size for `emit_atomic_node` is too high. [<7, 14, 7> 17.15/17]", 776263089], - [618, 7, 1424, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_atomic_node` is too high. [8/7]", 776263089], - [618, 7, 1424, "Metrics/MethodLength: Method has too many lines. [22/10]", 776263089], - [666, 7, 242, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `recursively_merge_pair_values?` is too high. [8/7]", 3319997574], - [682, 7, 1642, "Metrics/AbcSize: Assignment Branch Condition size for `preferred_available_inline_attachment` is too high. [<14, 14, 14> 24.25/17]", 1854381957], - [682, 7, 1642, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preferred_available_inline_attachment` is too high. [13/7]", 1854381957], - [682, 7, 1642, "Metrics/MethodLength: Method has too many lines. [27/10]", 1854381957], - [682, 7, 1642, "Metrics/PerceivedComplexity: Perceived complexity for `preferred_available_inline_attachment` is too high. [14/8]", 1854381957], - [682, 48, 154, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 358586640], - [687, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 4196003793], - [719, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], - [725, 33, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [730, 7, 1761, "Metrics/AbcSize: Assignment Branch Condition size for `emit_preferred_leading_comments_for` is too high. [<4, 39, 16> 42.34/17]", 1923098835], - [730, 7, 1761, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_preferred_leading_comments_for` is too high. [16/7]", 1923098835], - [730, 7, 1761, "Metrics/MethodLength: Method has too many lines. [26/10]", 1923098835], - [730, 7, 1761, "Metrics/PerceivedComplexity: Perceived complexity for `emit_preferred_leading_comments_for` is too high. [17/8]", 1923098835], - [764, 7, 1600, "Metrics/AbcSize: Assignment Branch Condition size for `emit_leading_comments_for` is too high. [<5, 37, 10> 38.65/17]", 2686936477], - [764, 7, 1600, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_leading_comments_for` is too high. [11/7]", 2686936477], - [764, 7, 1600, "Metrics/MethodLength: Method has too many lines. [26/10]", 2686936477], - [764, 7, 1600, "Metrics/PerceivedComplexity: Perceived complexity for `emit_leading_comments_for` is too high. [11/8]", 2686936477], - [765, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [799, 7, 1573, "Metrics/AbcSize: Assignment Branch Condition size for `canonical_leading_comment_region` is too high. [<8, 28, 14> 32.31/17]", 151098026], - [799, 7, 1573, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonical_leading_comment_region` is too high. [12/7]", 151098026], - [799, 7, 1573, "Metrics/MethodLength: Method has too many lines. [29/10]", 151098026], - [799, 7, 1573, "Metrics/PerceivedComplexity: Perceived complexity for `canonical_leading_comment_region` is too high. [12/8]", 151098026], - [837, 7, 1315, "Metrics/AbcSize: Assignment Branch Condition size for `canonical_tracked_leading_comments` is too high. [<8, 21, 12> 25.48/17]", 3806475230], - [837, 7, 1315, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonical_tracked_leading_comments` is too high. [11/7]", 3806475230], - [837, 7, 1315, "Metrics/MethodLength: Method has too many lines. [21/10]", 3806475230], - [837, 7, 1315, "Metrics/PerceivedComplexity: Perceived complexity for `canonical_tracked_leading_comments` is too high. [11/8]", 3806475230], - [867, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [872, 7, 574, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `dedup_warning_context` is too high. [9/7]", 840557709], - [872, 7, 574, "Metrics/PerceivedComplexity: Perceived complexity for `dedup_warning_context` is too high. [9/8]", 840557709], - [875, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [876, 48, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [877, 48, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [917, 7, 687, "Metrics/AbcSize: Assignment Branch Condition size for `equivalent_owner?` is too high. [<0, 17, 19> 25.5/17]", 1122406222], - [917, 7, 687, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `equivalent_owner?` is too high. [15/7]", 1122406222], - [917, 7, 687, "Metrics/MethodLength: Method has too many lines. [14/10]", 1122406222], - [917, 7, 687, "Metrics/PerceivedComplexity: Perceived complexity for `equivalent_owner?` is too high. [16/8]", 1122406222], - [957, 7, 762, "Metrics/MethodLength: Method has too many lines. [13/10]", 341822255], - [976, 7, 701, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `shared_line_comment_attachment_for` is too high. [9/7]", 2431043907], - [976, 7, 701, "Metrics/MethodLength: Method has too many lines. [13/10]", 2431043907], - [976, 7, 701, "Metrics/PerceivedComplexity: Perceived complexity for `shared_line_comment_attachment_for` is too high. [9/8]", 2431043907], - [1018, 7, 617, "Metrics/AbcSize: Assignment Branch Condition size for `emit_container_trailing_lines` is too high. [<2, 17, 3> 17.38/17]", 2119480325], - [1043, 7, 723, "Metrics/AbcSize: Assignment Branch Condition size for `trailing_container_line_range` is too high. [<4, 15, 11> 19.03/17]", 3162486186], - [1043, 7, 723, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trailing_container_line_range` is too high. [10/7]", 3162486186], - [1043, 7, 723, "Metrics/MethodLength: Method has too many lines. [13/10]", 3162486186], - [1043, 7, 723, "Metrics/PerceivedComplexity: Perceived complexity for `trailing_container_line_range` is too high. [11/8]", 3162486186], - [1061, 7, 503, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_comment_and_blank_lines_in_range` is too high. [9/7]", 2774366077], - [1061, 7, 503, "Metrics/MethodLength: Method has too many lines. [11/10]", 2774366077], - [1061, 7, 503, "Metrics/PerceivedComplexity: Perceived complexity for `emit_comment_and_blank_lines_in_range` is too high. [9/8]", 2774366077], - [1108, 7, 945, "Metrics/MethodLength: Method has too many lines. [14/10]", 1167897124], - [1155, 7, 832, "Metrics/AbcSize: Assignment Branch Condition size for `removed_inline_block_comment_at` is too high. [<6, 26, 7> 27.59/17]", 890096863], - [1155, 7, 832, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `removed_inline_block_comment_at` is too high. [8/7]", 890096863], - [1155, 7, 832, "Metrics/MethodLength: Method has too many lines. [19/10]", 890096863], - [1212, 7, 1587, "Metrics/AbcSize: Assignment Branch Condition size for `emit_document_prelude` is too high. [<12, 40, 22> 47.2/17]", 1354199117], - [1212, 7, 1587, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_document_prelude` is too high. [21/7]", 1354199117], - [1212, 7, 1587, "Metrics/MethodLength: Method has too many lines. [35/10]", 1354199117], - [1212, 7, 1587, "Metrics/PerceivedComplexity: Perceived complexity for `emit_document_prelude` is too high. [22/8]", 1354199117], - [1256, 7, 1281, "Metrics/AbcSize: Assignment Branch Condition size for `emit_document_postlude` is too high. [<9, 31, 21> 38.51/17]", 1869501446], - [1256, 7, 1281, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_document_postlude` is too high. [20/7]", 1869501446], - [1256, 7, 1281, "Metrics/MethodLength: Method has too many lines. [23/10]", 1869501446], - [1256, 7, 1281, "Metrics/PerceivedComplexity: Perceived complexity for `emit_document_postlude` is too high. [20/8]", 1869501446], - [1276, 121, 104, "Layout/LineLength: Line is too long. [224/120]", 1511565389], - [1288, 9, 48, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2339197345], - [1334, 7, 1002, "Metrics/AbcSize: Assignment Branch Condition size for `build_refined_matches` is too high. [<11, 16, 8> 21/17]", 2274245926], - [1334, 7, 1002, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_refined_matches` is too high. [9/7]", 2274245926], - [1334, 7, 1002, "Metrics/MethodLength: Method has too many lines. [18/10]", 2274245926], - [1334, 7, 1002, "Metrics/PerceivedComplexity: Perceived complexity for `build_refined_matches` is too high. [9/8]", 2274245926] - ], - "lib/json/merge/emitter.rb:3208422098": [ - [16, 5, 6329, "Metrics/ClassLength: Class has too many lines. [140/100]", 1868859478], - [183, 7, 586, "Metrics/MethodLength: Method has too many lines. [14/10]", 4015595961] - ], - "lib/json/merge/file_analysis.rb:2697782814": [ - [7, 5, 8991, "Metrics/ClassLength: Class has too many lines. [236/100]", 3226543082], - [20, 7, 928, "Metrics/MethodLength: Method has too many lines. [16/10]", 2945813957], - [83, 9, 6, "Naming/MemoizedInstanceVariableName: Memoized variable `@nodes` does not match method name `statements`. Use `@statements` instead.", 2756313398], - [182, 7, 530, "Metrics/MethodLength: Method has too many lines. [12/10]", 2217856870], - [227, 7, 603, "Metrics/AbcSize: Assignment Branch Condition size for `collect_parse_errors` is too high. [<1, 17, 9> 19.26/17]", 2603010736], - [227, 7, 603, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_parse_errors` is too high. [9/7]", 2603010736], - [227, 7, 603, "Metrics/MethodLength: Method has too many lines. [11/10]", 2603010736], - [227, 7, 603, "Metrics/PerceivedComplexity: Perceived complexity for `collect_parse_errors` is too high. [9/8]", 2603010736], - [242, 7, 1373, "Metrics/AbcSize: Assignment Branch Condition size for `extract_freeze_blocks` is too high. [<16, 23, 14> 31.32/17]", 2629976180], - [242, 7, 1373, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_freeze_blocks` is too high. [12/7]", 2629976180], - [242, 7, 1373, "Metrics/MethodLength: Method has too many lines. [33/10]", 2629976180], - [242, 7, 1373, "Metrics/PerceivedComplexity: Perceived complexity for `extract_freeze_blocks` is too high. [14/8]", 2629976180], - [286, 7, 575, "Metrics/AbcSize: Assignment Branch Condition size for `integrate_nodes_and_freeze_blocks` is too high. [<8, 19, 10> 22.91/17]", 1313409663], - [286, 7, 575, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `integrate_nodes_and_freeze_blocks` is too high. [11/7]", 1313409663], - [286, 7, 575, "Metrics/MethodLength: Method has too many lines. [13/10]", 1313409663], - [286, 7, 575, "Metrics/PerceivedComplexity: Perceived complexity for `integrate_nodes_and_freeze_blocks` is too high. [11/8]", 1313409663] - ], - "lib/json/merge/freeze_node.rb:340454761": [ - [11, 21, 97, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 4181995290] - ], - "lib/json/merge/merge_result.rb:1135594830": [ - [140, 7, 421, "Metrics/MethodLength: Method has too many lines. [11/10]", 2459390040] - ], - "lib/json/merge/node_wrapper.rb:691907272": [ - [7, 5, 5378, "Metrics/ClassLength: Class has too many lines. [181/100]", 4019681646], - [71, 7, 397, "Metrics/MethodLength: Method has too many lines. [11/10]", 3404369104], - [162, 7, 1322, "Metrics/AbcSize: Assignment Branch Condition size for `compute_signature` is too high. [<10, 26, 24> 36.77/17]", 2934899487], - [162, 7, 1322, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_signature` is too high. [22/7]", 2934899487], - [162, 7, 1322, "Metrics/MethodLength: Method has too many lines. [41/10]", 2934899487], - [162, 7, 1322, "Metrics/PerceivedComplexity: Perceived complexity for `compute_signature` is too high. [18/8]", 2934899487], - [209, 7, 831, "Metrics/AbcSize: Assignment Branch Condition size for `extract_object_keys` is too high. [<8, 13, 10> 18.25/17]", 4156563372], - [209, 7, 831, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_object_keys` is too high. [10/7]", 4156563372], - [209, 7, 831, "Metrics/MethodLength: Method has too many lines. [22/10]", 4156563372], - [209, 7, 831, "Metrics/PerceivedComplexity: Perceived complexity for `extract_object_keys` is too high. [10/8]", 4156563372] - ], - "lib/json/merge/object_match_refiner.rb:337747923": [ - [29, 5, 10245, "Metrics/ClassLength: Class has too many lines. [143/100]", 1652456083], - [148, 7, 652, "Metrics/AbcSize: Assignment Branch Condition size for `compute_object_similarity` is too high. [<6, 18, 4> 19.39/17]", 1704835547], - [172, 7, 382, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_fuzzy_key_matches` is too high. [8/7]", 1938411487], - [226, 7, 709, "Metrics/MethodLength: Method has too many lines. [13/10]", 1853541937], - [277, 23, 9, "Style/NumericPredicate: Use `len1.zero?` instead of `len1 == 0`.", 913205219], - [277, 36, 9, "Style/NumericPredicate: Use `len2.zero?` instead of `len2 == 0`.", 871697920], - [278, 23, 9, "Style/NumericPredicate: Use `len1.zero?` instead of `len1 == 0`.", 913205219], - [278, 36, 9, "Style/NumericPredicate: Use `len2.zero?` instead of `len2 == 0`.", 871697920], - [305, 7, 854, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<13, 29, 8> 32.77/17]", 2946547420], - [305, 7, 854, "Metrics/MethodLength: Method has too many lines. [20/10]", 2946547420] - ], - "lib/json/merge/smart_merger.rb:1431245415": [ - [24, 5, 8706, "Metrics/ClassLength: Class has too many lines. [183/100]", 745649819], - [44, 7, 1369, "Metrics/MethodLength: Method has too many lines. [20/10]", 1509468182], - [44, 21, 472, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [15/5]", 700498762], - [117, 7, 1318, "Metrics/AbcSize: Assignment Branch Condition size for `merge_with_debug` is too high. [<3, 24, 7> 25.18/17]", 1535809936], - [117, 7, 1318, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_with_debug` is too high. [8/7]", 1535809936], - [117, 7, 1318, "Metrics/MethodLength: Method has too many lines. [30/10]", 1535809936], - [188, 7, 574, "Metrics/MethodLength: Method has too many lines. [13/10]", 1857730257], - [221, 7, 1053, "Metrics/MethodLength: Method has too many lines. [24/10]", 3329630813] - ], - "lib/json/merge/synthetic_parser.rb:3124639485": [ - [5, 5, 21, "Style/Documentation: Missing top-level documentation comment for `class Json::Merge::SyntheticParser`.", 2779770543], - [5, 5, 5193, "Metrics/ClassLength: Class has too many lines. [136/100]", 3292004474], - [12, 7, 10, "Style/Documentation: Missing top-level documentation comment for `class Json::Merge::SyntheticParser::Tree`.", 3516465773], - [20, 7, 10, "Style/Documentation: Missing top-level documentation comment for `class Json::Merge::SyntheticParser::Node`.", 3515419275], - [24, 23, 65, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1496529946], - [62, 13, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183], - [89, 7, 387, "Metrics/MethodLength: Method has too many lines. [17/10]", 3659356164], - [109, 7, 348, "Metrics/MethodLength: Method has too many lines. [11/10]", 509572752], - [124, 7, 370, "Metrics/MethodLength: Method has too many lines. [13/10]", 3743579817], - [140, 7, 356, "Metrics/MethodLength: Method has too many lines. [11/10]", 1421409352], - [155, 7, 443, "Metrics/MethodLength: Method has too many lines. [15/10]", 676344296], - [185, 7, 547, "Metrics/AbcSize: Assignment Branch Condition size for `skip_ignored` is too high. [<5, 13, 20> 24.37/17]", 2602765621], - [185, 7, 547, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `skip_ignored` is too high. [11/7]", 2602765621], - [185, 7, 547, "Metrics/MethodLength: Method has too many lines. [15/10]", 2602765621], - [185, 7, 547, "Metrics/PerceivedComplexity: Perceived complexity for `skip_ignored` is too high. [11/8]", 2602765621] - ], - "spec/fixtures_integration_spec.rb:4034888844": [ - [3, 1, 7912, "Metrics/BlockLength: Block has too many lines. [163/25]", 4258553307], - [75, 60, 25, "Style/SymbolProc: Pass `&:compact` as an argument to `map` instead of a block.", 2107480170], - [83, 59, 25, "Style/SymbolProc: Pass `&:compact` as an argument to `map` instead of a block.", 2107480170], - [148, 3, 801, "Metrics/BlockLength: Block has too many lines. [27/25]", 716259872], - [189, 12, 1, "Layout/BlockAlignment: `}` at 189, 11 is not aligned with `test_case.dig(:expected, :diagnostics).map { |diagnostic|` at 187, 25 or `).to eq(json_ready(test_case.dig(:expected, :diagnostics).map { |diagnostic|` at 187, 6.", 177624] - ], - "spec/reproducible_merge_spec.rb:133932627": [ - [5, 1, 1854, "Metrics/BlockLength: Block has too many lines. [40/25]", 671932104] - ] -} diff --git a/gems/json-merge/Gemfile b/gems/json-merge/Gemfile index 3f394ea24..211f8ef0e 100644 --- a/gems/json-merge/Gemfile +++ b/gems/json-merge/Gemfile @@ -192,6 +192,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/json-merge/Gemfile.lock b/gems/json-merge/Gemfile.lock index 3271a7758..6807fdca5 100644 --- a/gems/json-merge/Gemfile.lock +++ b/gems/json-merge/Gemfile.lock @@ -275,6 +275,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -308,7 +324,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -363,18 +378,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -538,22 +542,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -659,9 +659,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -739,7 +739,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -760,10 +759,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -838,13 +837,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/json-merge/lib/json/merge.rb b/gems/json-merge/lib/json/merge.rb index 87a35530d..6a757e4dc 100644 --- a/gems/json-merge/lib/json/merge.rb +++ b/gems/json-merge/lib/json/merge.rb @@ -63,9 +63,7 @@ def json_feature_profile end def parse_json(source, dialect) - if detect_trailing_comma(source) - return parse_failure("Trailing commas are not supported for #{dialect}.") - end + return parse_failure("Trailing commas are not supported for #{dialect}.") if detect_trailing_comma(source) if dialect.to_s != 'jsonc' && detect_json_comments(source) return parse_failure("Comments are not supported for #{dialect}.") end @@ -73,7 +71,9 @@ def parse_json(source, dialect) register_backend! analysis = FileAnalysis.new(source) unless analysis.valid? - return parse_failure(analysis.errors.map { |error| error.respond_to?(:message) ? error.message : error.inspect }.join(', ')) + return parse_failure(analysis.errors.map do |error| + error.respond_to?(:message) ? error.message : error.inspect + end.join(', ')) end { @@ -129,9 +129,7 @@ def merge_json_sources(template_source, destination_source) private_class_method :merge_json_sources def json_value_for_source(source, dialect: 'json') - if detect_trailing_comma(source) - raise ParseError, "Trailing commas are not supported for #{dialect}." - end + raise ParseError, "Trailing commas are not supported for #{dialect}." if detect_trailing_comma(source) if dialect.to_s != 'jsonc' && detect_json_comments(source) raise ParseError, "Comments are not supported for #{dialect}." end @@ -170,15 +168,13 @@ def json_value_for_node(node) false when 'null' nil - else - nil end end def decode_json_string_literal(text) literal = text.to_s literal = literal[1...-1] if literal.start_with?('"') && literal.end_with?('"') - literal.gsub(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/) do |escape| + literal.gsub(%r{\\(?:["\\/bfnrt]|u[0-9a-fA-F]{4})}) do |escape| case escape when '\\"' then '"' when '\\\\' then '\\' diff --git a/gems/markdown-merge/Gemfile.lock b/gems/markdown-merge/Gemfile.lock index f7a60e363..f39d8ddab 100644 --- a/gems/markdown-merge/Gemfile.lock +++ b/gems/markdown-merge/Gemfile.lock @@ -17,7 +17,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -26,7 +58,193 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -34,6 +252,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -53,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,24 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -407,32 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,20 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -480,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -491,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -518,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -529,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -542,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/markly-merge/Gemfile.lock b/gems/markly-merge/Gemfile.lock index e32016aaf..0e38a0a14 100644 --- a/gems/markly-merge/Gemfile.lock +++ b/gems/markly-merge/Gemfile.lock @@ -17,13 +17,264 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: markdown-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -35,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -48,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -111,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -279,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -331,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -382,24 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -408,31 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,15 +753,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 @@ -482,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -493,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -520,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -531,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -544,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -559,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/plain-merge/.kettle-drift.lock b/gems/plain-merge/.kettle-drift.lock index 628aa923c..0161251a7 100644 --- a/gems/plain-merge/.kettle-drift.lock +++ b/gems/plain-merge/.kettle-drift.lock @@ -5,7 +5,8 @@ "lines": [ 80, 120, - 160 + 160, + 200 ] } ], @@ -15,7 +16,8 @@ "lines": [ 91, 131, - 171 + 171, + 211 ] } ], @@ -25,7 +27,8 @@ "lines": [ 81, 121, - 161 + 161, + 201 ] } ], @@ -35,7 +38,8 @@ "lines": [ 93, 133, - 173 + 173, + 213 ] } ], @@ -45,7 +49,8 @@ "lines": [ 96, 136, - 176 + 176, + 216 ] } ], @@ -55,7 +60,8 @@ "lines": [ 82, 122, - 162 + 162, + 202 ] } ], @@ -66,7 +72,8 @@ 60, 100, 140, - 180 + 180, + 220 ] } ], @@ -76,7 +83,8 @@ "lines": [ 101, 141, - 181 + 181, + 221 ] } ], @@ -87,7 +95,8 @@ 43, 87, 127, - 167 + 167, + 207 ] } ], @@ -97,7 +106,8 @@ "lines": [ 110, 150, - 190 + 190, + 230 ] } ], @@ -108,7 +118,8 @@ 35, 79, 119, - 159 + 159, + 199 ] } ], @@ -119,7 +130,8 @@ 69, 109, 149, - 189 + 189, + 229 ] } ], @@ -129,7 +141,8 @@ "lines": [ 85, 125, - 165 + 165, + 205 ] } ], @@ -140,7 +153,8 @@ 48, 92, 132, - 172 + 172, + 212 ] } ], @@ -151,7 +165,8 @@ 44, 88, 128, - 168 + 168, + 208 ] } ], @@ -161,7 +176,8 @@ "lines": [ 86, 126, - 166 + 166, + 206 ] } ], @@ -171,7 +187,8 @@ "lines": [ 103, 143, - 183 + 183, + 223 ] } ], @@ -181,7 +198,8 @@ "lines": [ 102, 142, - 182 + 182, + 222 ] } ], @@ -191,7 +209,8 @@ "lines": [ 97, 137, - 177 + 177, + 217 ] } ], @@ -201,7 +220,8 @@ "lines": [ 106, 146, - 186 + 186, + 226 ] } ], diff --git a/gems/plain-merge/.rubocop_gradual.lock b/gems/plain-merge/.rubocop_gradual.lock deleted file mode 100644 index 2200cf1b9..000000000 --- a/gems/plain-merge/.rubocop_gradual.lock +++ /dev/null @@ -1,106 +0,0 @@ -{ - ".simplecov:3133826638": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:4149951629": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/plain-merge.rb:619298015": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`plain-merge.rb`) should use snake_case.", 5381] - ], - "lib/plain/merge.rb:3584995729": [ - [9, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Plain::Merge`.", 2866359175], - [9, 3, 7932, "Metrics/ModuleLength: Module has too many lines. [211/100]", 719656966], - [42, 5, 645, "Metrics/MethodLength: Method has too many lines. [21/10]", 3773389417], - [69, 5, 513, "Metrics/AbcSize: Assignment Branch Condition size for `similarity_score` is too high. [<9, 17, 3> 19.47/17]", 594433443], - [69, 5, 513, "Metrics/MethodLength: Method has too many lines. [12/10]", 594433443], - [87, 9, 10, "Naming/PredicatePrefix: Rename `is_similar` to `similar?`.", 1730577729], - [96, 5, 2163, "Metrics/AbcSize: Assignment Branch Condition size for `match_text_blocks` is too high. [<25, 36, 16> 46.66/17]", 1824707567], - [96, 5, 2163, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `match_text_blocks` is too high. [14/7]", 1824707567], - [96, 5, 2163, "Metrics/MethodLength: Method has too many lines. [50/10]", 1824707567], - [96, 5, 2163, "Metrics/PerceivedComplexity: Perceived complexity for `match_text_blocks` is too high. [14/8]", 1824707567], - [119, 7, 1032, "Style/CombinableLoops: Combine this loop with the previous loop.", 2654397768], - [158, 5, 683, "Metrics/AbcSize: Assignment Branch Condition size for `merge_text` is too high. [<11, 16, 4> 19.82/17]", 3448903566], - [158, 5, 683, "Metrics/MethodLength: Method has too many lines. [14/10]", 3448903566], - [178, 5, 633, "Metrics/AbcSize: Assignment Branch Condition size for `refined_text_similarity` is too high. [<3, 17, 0> 17.26/17]", 2185070085], - [208, 5, 700, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<8, 31, 8> 33/17]", 1827550752], - [208, 5, 700, "Metrics/MethodLength: Method has too many lines. [18/10]", 1827550752] - ], - "plain-merge.gemspec:3762840848": [ - [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ], - "spec/fixtures_integration_spec.rb:922433761": [ - [3, 1, 3550, "Metrics/BlockLength: Block has too many lines. [77/25]", 4225834063] - ] -} diff --git a/gems/plain-merge/Gemfile b/gems/plain-merge/Gemfile index 02c2c3c6c..c0992188e 100644 --- a/gems/plain-merge/Gemfile +++ b/gems/plain-merge/Gemfile @@ -192,6 +192,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/plain-merge/Gemfile.lock b/gems/plain-merge/Gemfile.lock index c020666f7..4f8595887 100644 --- a/gems/plain-merge/Gemfile.lock +++ b/gems/plain-merge/Gemfile.lock @@ -275,6 +275,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -308,7 +324,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -363,18 +378,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -538,22 +542,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -659,9 +659,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -739,7 +739,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -760,10 +759,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -838,13 +837,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/plain-merge/lib/plain/merge/version.rb b/gems/plain-merge/lib/plain/merge/version.rb index e6b3a5844..aab4f67c1 100644 --- a/gems/plain-merge/lib/plain/merge/version.rb +++ b/gems/plain-merge/lib/plain/merge/version.rb @@ -3,7 +3,7 @@ module Plain module Merge module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end From 845aab2d01a1778ef743080a173ffae2cd859213 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:22:40 -0600 Subject: [PATCH 159/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/json-merge/.rubocop_gradual.lock | 283 +++++++++++++++ gems/plain-merge/.rubocop_gradual.lock | 106 ++++++ gems/plain-merge/Gemfile.lock | 378 ++------------------ gems/plain-merge/lib/plain/merge/version.rb | 2 +- 4 files changed, 419 insertions(+), 350 deletions(-) create mode 100644 gems/json-merge/.rubocop_gradual.lock create mode 100644 gems/plain-merge/.rubocop_gradual.lock diff --git a/gems/json-merge/.rubocop_gradual.lock b/gems/json-merge/.rubocop_gradual.lock new file mode 100644 index 000000000..1f13b2bf6 --- /dev/null +++ b/gems/json-merge/.rubocop_gradual.lock @@ -0,0 +1,283 @@ +{ + ".simplecov:3644224046": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:2931360525": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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:1457364349": [ + [16, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1168797721], + [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ], + "lib/json-merge.rb:4173905501": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`json-merge.rb`) should use snake_case.", 5381] + ], + "lib/json/merge.rb:2128431218": [ + [11, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Json::Merge`.", 2866359175], + [11, 3, 9848, "Metrics/ModuleLength: Module has too many lines. [271/100]", 4082365503], + [21, 5, 16, "Style/Documentation: Missing top-level documentation comment for `class Json::Merge::ParseError`.", 362242086], + [65, 5, 941, "Metrics/AbcSize: Assignment Branch Condition size for `parse_json` is too high. [<3, 19, 9> 21.24/17]", 2519832432], + [65, 5, 941, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_json` is too high. [8/7]", 2519832432], + [65, 5, 941, "Metrics/MethodLength: Method has too many lines. [24/10]", 2519832432], + [98, 5, 780, "Metrics/MethodLength: Method has too many lines. [17/10]", 3747710599], + [131, 5, 621, "Metrics/AbcSize: Assignment Branch Condition size for `json_value_for_source` is too high. [<3, 17, 7> 18.63/17]", 3652201615], + [131, 5, 621, "Metrics/MethodLength: Method has too many lines. [11/10]", 3652201615], + [147, 5, 759, "Metrics/AbcSize: Assignment Branch Condition size for `json_value_for_node` is too high. [<6, 21, 12> 24.92/17]", 2618715974], + [147, 5, 759, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `json_value_for_node` is too high. [13/7]", 2618715974], + [147, 5, 759, "Metrics/MethodLength: Method has too many lines. [23/10]", 2618715974], + [174, 5, 555, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `decode_json_string_literal` is too high. [11/7]", 4144578840], + [174, 5, 555, "Metrics/MethodLength: Method has too many lines. [16/10]", 4144578840], + [238, 5, 691, "Metrics/MethodLength: Method has too many lines. [18/10]", 4010630320], + [261, 5, 528, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_trailing_comma` is too high. [8/7]", 4057979016], + [261, 5, 528, "Metrics/MethodLength: Method has too many lines. [13/10]", 4057979016], + [302, 5, 787, "Metrics/AbcSize: Assignment Branch Condition size for `advance_scanner_state` is too high. [<8, 12, 24> 28/17]", 2437181548], + [302, 5, 787, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `advance_scanner_state` is too high. [15/7]", 2437181548], + [302, 5, 787, "Metrics/MethodLength: Method has too many lines. [25/10]", 2437181548], + [302, 5, 787, "Metrics/PerceivedComplexity: Perceived complexity for `advance_scanner_state` is too high. [17/8]", 2437181548] + ], + "lib/json/merge/comment_tracker.rb:3472563198": [ + [19, 48, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] + ], + "lib/json/merge/conflict_resolver.rb:301712181": [ + [11, 5, 55081, "Metrics/ClassLength: Class has too many lines. [1053/100]", 4044265605], + [33, 7, 998, "Metrics/MethodLength: Method has too many lines. [16/10]", 2622185411], + [33, 21, 308, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [12/5]", 958959236], + [34, 121, 95, "Layout/LineLength: Line is too long. [215/120]", 3448296820], + [58, 7, 1143, "Metrics/MethodLength: Method has too many lines. [21/10]", 2302471255], + [107, 7, 4969, "Metrics/AbcSize: Assignment Branch Condition size for `merge_node_lists_to_emitter` is too high. [<29, 62, 22> 71.9/17]", 3145241362], + [107, 7, 4969, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_node_lists_to_emitter` is too high. [20/7]", 3145241362], + [107, 7, 4969, "Metrics/MethodLength: Method has too many lines. [82/10]", 3145241362], + [107, 7, 4969, "Metrics/PerceivedComplexity: Perceived complexity for `merge_node_lists_to_emitter` is too high. [22/8]", 3145241362], + [146, 9, 2759, "Metrics/BlockLength: Block has too many lines. [50/25]", 385678694], + [239, 7, 5585, "Metrics/AbcSize: Assignment Branch Condition size for `merge_matched_nodes_to_emitter` is too high. [<15, 45, 20> 51.48/17]", 3947285535], + [239, 7, 5585, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_matched_nodes_to_emitter` is too high. [17/7]", 3947285535], + [239, 7, 5585, "Metrics/MethodLength: Method has too many lines. [102/10]", 3947285535], + [239, 7, 5585, "Metrics/PerceivedComplexity: Perceived complexity for `merge_matched_nodes_to_emitter` is too high. [21/8]", 3947285535], + [277, 13, 1934, "Metrics/BlockLength: Block has too many lines. [31/25]", 884303795], + [306, 17, 181, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 898629436], + [363, 7, 895, "Metrics/MethodLength: Method has too many lines. [23/10]", 2982353847], + [392, 7, 718, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preference_for_pair` is too high. [8/7]", 3339910669], + [392, 7, 718, "Metrics/MethodLength: Method has too many lines. [12/10]", 3339910669], + [418, 7, 1636, "Metrics/MethodLength: Method has too many lines. [37/10]", 514235298], + [473, 25, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [493, 7, 5501, "Metrics/AbcSize: Assignment Branch Condition size for `emit_node` is too high. [<18, 82, 31> 89.49/17]", 1826498333], + [493, 7, 5501, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_node` is too high. [29/7]", 1826498333], + [493, 7, 5501, "Metrics/MethodLength: Method has too many lines. [109/10]", 1826498333], + [493, 7, 5501, "Metrics/PerceivedComplexity: Perceived complexity for `emit_node` is too high. [36/8]", 1826498333], + [522, 15, 1572, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 3256756034], + [554, 15, 654, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 3730688879], + [569, 17, 287, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 3369588943], + [618, 7, 1424, "Metrics/AbcSize: Assignment Branch Condition size for `emit_atomic_node` is too high. [<7, 14, 7> 17.15/17]", 776263089], + [618, 7, 1424, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_atomic_node` is too high. [8/7]", 776263089], + [618, 7, 1424, "Metrics/MethodLength: Method has too many lines. [22/10]", 776263089], + [666, 7, 242, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `recursively_merge_pair_values?` is too high. [8/7]", 3319997574], + [682, 7, 1642, "Metrics/AbcSize: Assignment Branch Condition size for `preferred_available_inline_attachment` is too high. [<14, 14, 14> 24.25/17]", 1854381957], + [682, 7, 1642, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preferred_available_inline_attachment` is too high. [13/7]", 1854381957], + [682, 7, 1642, "Metrics/MethodLength: Method has too many lines. [27/10]", 1854381957], + [682, 7, 1642, "Metrics/PerceivedComplexity: Perceived complexity for `preferred_available_inline_attachment` is too high. [14/8]", 1854381957], + [682, 48, 154, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 358586640], + [687, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 4196003793], + [719, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], + [725, 33, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [730, 7, 1761, "Metrics/AbcSize: Assignment Branch Condition size for `emit_preferred_leading_comments_for` is too high. [<4, 39, 16> 42.34/17]", 1923098835], + [730, 7, 1761, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_preferred_leading_comments_for` is too high. [16/7]", 1923098835], + [730, 7, 1761, "Metrics/MethodLength: Method has too many lines. [26/10]", 1923098835], + [730, 7, 1761, "Metrics/PerceivedComplexity: Perceived complexity for `emit_preferred_leading_comments_for` is too high. [17/8]", 1923098835], + [764, 7, 1600, "Metrics/AbcSize: Assignment Branch Condition size for `emit_leading_comments_for` is too high. [<5, 37, 10> 38.65/17]", 2686936477], + [764, 7, 1600, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_leading_comments_for` is too high. [11/7]", 2686936477], + [764, 7, 1600, "Metrics/MethodLength: Method has too many lines. [26/10]", 2686936477], + [764, 7, 1600, "Metrics/PerceivedComplexity: Perceived complexity for `emit_leading_comments_for` is too high. [11/8]", 2686936477], + [765, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [799, 7, 1573, "Metrics/AbcSize: Assignment Branch Condition size for `canonical_leading_comment_region` is too high. [<8, 28, 14> 32.31/17]", 151098026], + [799, 7, 1573, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonical_leading_comment_region` is too high. [12/7]", 151098026], + [799, 7, 1573, "Metrics/MethodLength: Method has too many lines. [29/10]", 151098026], + [799, 7, 1573, "Metrics/PerceivedComplexity: Perceived complexity for `canonical_leading_comment_region` is too high. [12/8]", 151098026], + [837, 7, 1315, "Metrics/AbcSize: Assignment Branch Condition size for `canonical_tracked_leading_comments` is too high. [<8, 21, 12> 25.48/17]", 3806475230], + [837, 7, 1315, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonical_tracked_leading_comments` is too high. [11/7]", 3806475230], + [837, 7, 1315, "Metrics/MethodLength: Method has too many lines. [21/10]", 3806475230], + [837, 7, 1315, "Metrics/PerceivedComplexity: Perceived complexity for `canonical_tracked_leading_comments` is too high. [11/8]", 3806475230], + [867, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [872, 7, 574, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `dedup_warning_context` is too high. [9/7]", 840557709], + [872, 7, 574, "Metrics/PerceivedComplexity: Perceived complexity for `dedup_warning_context` is too high. [9/8]", 840557709], + [875, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [876, 48, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [877, 48, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [917, 7, 687, "Metrics/AbcSize: Assignment Branch Condition size for `equivalent_owner?` is too high. [<0, 17, 19> 25.5/17]", 1122406222], + [917, 7, 687, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `equivalent_owner?` is too high. [15/7]", 1122406222], + [917, 7, 687, "Metrics/MethodLength: Method has too many lines. [14/10]", 1122406222], + [917, 7, 687, "Metrics/PerceivedComplexity: Perceived complexity for `equivalent_owner?` is too high. [16/8]", 1122406222], + [957, 7, 762, "Metrics/MethodLength: Method has too many lines. [13/10]", 341822255], + [976, 7, 701, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `shared_line_comment_attachment_for` is too high. [9/7]", 2431043907], + [976, 7, 701, "Metrics/MethodLength: Method has too many lines. [13/10]", 2431043907], + [976, 7, 701, "Metrics/PerceivedComplexity: Perceived complexity for `shared_line_comment_attachment_for` is too high. [9/8]", 2431043907], + [1018, 7, 617, "Metrics/AbcSize: Assignment Branch Condition size for `emit_container_trailing_lines` is too high. [<2, 17, 3> 17.38/17]", 2119480325], + [1043, 7, 723, "Metrics/AbcSize: Assignment Branch Condition size for `trailing_container_line_range` is too high. [<4, 15, 11> 19.03/17]", 3162486186], + [1043, 7, 723, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trailing_container_line_range` is too high. [10/7]", 3162486186], + [1043, 7, 723, "Metrics/MethodLength: Method has too many lines. [13/10]", 3162486186], + [1043, 7, 723, "Metrics/PerceivedComplexity: Perceived complexity for `trailing_container_line_range` is too high. [11/8]", 3162486186], + [1061, 7, 503, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_comment_and_blank_lines_in_range` is too high. [9/7]", 2774366077], + [1061, 7, 503, "Metrics/MethodLength: Method has too many lines. [11/10]", 2774366077], + [1061, 7, 503, "Metrics/PerceivedComplexity: Perceived complexity for `emit_comment_and_blank_lines_in_range` is too high. [9/8]", 2774366077], + [1108, 7, 945, "Metrics/MethodLength: Method has too many lines. [14/10]", 1167897124], + [1155, 7, 832, "Metrics/AbcSize: Assignment Branch Condition size for `removed_inline_block_comment_at` is too high. [<6, 26, 7> 27.59/17]", 890096863], + [1155, 7, 832, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `removed_inline_block_comment_at` is too high. [8/7]", 890096863], + [1155, 7, 832, "Metrics/MethodLength: Method has too many lines. [19/10]", 890096863], + [1212, 7, 1587, "Metrics/AbcSize: Assignment Branch Condition size for `emit_document_prelude` is too high. [<12, 40, 22> 47.2/17]", 1354199117], + [1212, 7, 1587, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_document_prelude` is too high. [21/7]", 1354199117], + [1212, 7, 1587, "Metrics/MethodLength: Method has too many lines. [35/10]", 1354199117], + [1212, 7, 1587, "Metrics/PerceivedComplexity: Perceived complexity for `emit_document_prelude` is too high. [22/8]", 1354199117], + [1256, 7, 1281, "Metrics/AbcSize: Assignment Branch Condition size for `emit_document_postlude` is too high. [<9, 31, 21> 38.51/17]", 1869501446], + [1256, 7, 1281, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_document_postlude` is too high. [20/7]", 1869501446], + [1256, 7, 1281, "Metrics/MethodLength: Method has too many lines. [23/10]", 1869501446], + [1256, 7, 1281, "Metrics/PerceivedComplexity: Perceived complexity for `emit_document_postlude` is too high. [20/8]", 1869501446], + [1276, 121, 104, "Layout/LineLength: Line is too long. [224/120]", 1511565389], + [1288, 9, 48, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2339197345], + [1334, 7, 1002, "Metrics/AbcSize: Assignment Branch Condition size for `build_refined_matches` is too high. [<11, 16, 8> 21/17]", 2274245926], + [1334, 7, 1002, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_refined_matches` is too high. [9/7]", 2274245926], + [1334, 7, 1002, "Metrics/MethodLength: Method has too many lines. [18/10]", 2274245926], + [1334, 7, 1002, "Metrics/PerceivedComplexity: Perceived complexity for `build_refined_matches` is too high. [9/8]", 2274245926] + ], + "lib/json/merge/emitter.rb:3208422098": [ + [16, 5, 6329, "Metrics/ClassLength: Class has too many lines. [140/100]", 1868859478], + [183, 7, 586, "Metrics/MethodLength: Method has too many lines. [14/10]", 4015595961] + ], + "lib/json/merge/file_analysis.rb:1768951794": [ + [7, 5, 8750, "Metrics/ClassLength: Class has too many lines. [234/100]", 3986988439], + [20, 7, 897, "Metrics/MethodLength: Method has too many lines. [16/10]", 2945813957], + [83, 9, 6, "Naming/MemoizedInstanceVariableName: Memoized variable `@nodes` does not match method name `statements`. Use `@statements` instead.", 2756313398], + [182, 7, 530, "Metrics/MethodLength: Method has too many lines. [12/10]", 2217856870], + [202, 7, 601, "Metrics/MethodLength: Method has too many lines. [13/10]", 1694972597], + [222, 7, 679, "Metrics/AbcSize: Assignment Branch Condition size for `collect_parse_errors` is too high. [<1, 19, 11> 21.98/17]", 1780421309], + [222, 7, 679, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_parse_errors` is too high. [11/7]", 1780421309], + [222, 7, 679, "Metrics/MethodLength: Method has too many lines. [13/10]", 1780421309], + [222, 7, 679, "Metrics/PerceivedComplexity: Perceived complexity for `collect_parse_errors` is too high. [11/8]", 1780421309], + [239, 7, 1373, "Metrics/AbcSize: Assignment Branch Condition size for `extract_freeze_blocks` is too high. [<16, 23, 14> 31.32/17]", 2629976180], + [239, 7, 1373, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_freeze_blocks` is too high. [12/7]", 2629976180], + [239, 7, 1373, "Metrics/MethodLength: Method has too many lines. [33/10]", 2629976180], + [239, 7, 1373, "Metrics/PerceivedComplexity: Perceived complexity for `extract_freeze_blocks` is too high. [14/8]", 2629976180], + [283, 7, 575, "Metrics/AbcSize: Assignment Branch Condition size for `integrate_nodes_and_freeze_blocks` is too high. [<8, 19, 10> 22.91/17]", 1313409663], + [283, 7, 575, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `integrate_nodes_and_freeze_blocks` is too high. [11/7]", 1313409663], + [283, 7, 575, "Metrics/MethodLength: Method has too many lines. [13/10]", 1313409663], + [283, 7, 575, "Metrics/PerceivedComplexity: Perceived complexity for `integrate_nodes_and_freeze_blocks` is too high. [11/8]", 1313409663] + ], + "lib/json/merge/freeze_node.rb:340454761": [ + [11, 21, 97, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 4181995290] + ], + "lib/json/merge/merge_result.rb:1135594830": [ + [140, 7, 421, "Metrics/MethodLength: Method has too many lines. [11/10]", 2459390040] + ], + "lib/json/merge/node_wrapper.rb:3026997700": [ + [7, 5, 5691, "Metrics/ClassLength: Class has too many lines. [189/100]", 2496649131], + [71, 7, 397, "Metrics/MethodLength: Method has too many lines. [11/10]", 3404369104], + [173, 7, 1322, "Metrics/AbcSize: Assignment Branch Condition size for `compute_signature` is too high. [<10, 26, 24> 36.77/17]", 2934899487], + [173, 7, 1322, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_signature` is too high. [22/7]", 2934899487], + [173, 7, 1322, "Metrics/MethodLength: Method has too many lines. [41/10]", 2934899487], + [173, 7, 1322, "Metrics/PerceivedComplexity: Perceived complexity for `compute_signature` is too high. [18/8]", 2934899487], + [220, 7, 831, "Metrics/AbcSize: Assignment Branch Condition size for `extract_object_keys` is too high. [<8, 13, 10> 18.25/17]", 4156563372], + [220, 7, 831, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_object_keys` is too high. [10/7]", 4156563372], + [220, 7, 831, "Metrics/MethodLength: Method has too many lines. [22/10]", 4156563372], + [220, 7, 831, "Metrics/PerceivedComplexity: Perceived complexity for `extract_object_keys` is too high. [10/8]", 4156563372] + ], + "lib/json/merge/object_match_refiner.rb:337747923": [ + [29, 5, 10245, "Metrics/ClassLength: Class has too many lines. [143/100]", 1652456083], + [148, 7, 652, "Metrics/AbcSize: Assignment Branch Condition size for `compute_object_similarity` is too high. [<6, 18, 4> 19.39/17]", 1704835547], + [172, 7, 382, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_fuzzy_key_matches` is too high. [8/7]", 1938411487], + [226, 7, 709, "Metrics/MethodLength: Method has too many lines. [13/10]", 1853541937], + [277, 23, 9, "Style/NumericPredicate: Use `len1.zero?` instead of `len1 == 0`.", 913205219], + [277, 36, 9, "Style/NumericPredicate: Use `len2.zero?` instead of `len2 == 0`.", 871697920], + [278, 23, 9, "Style/NumericPredicate: Use `len1.zero?` instead of `len1 == 0`.", 913205219], + [278, 36, 9, "Style/NumericPredicate: Use `len2.zero?` instead of `len2 == 0`.", 871697920], + [305, 7, 854, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<13, 29, 8> 32.77/17]", 2946547420], + [305, 7, 854, "Metrics/MethodLength: Method has too many lines. [20/10]", 2946547420] + ], + "lib/json/merge/smart_merger.rb:1431245415": [ + [24, 5, 8706, "Metrics/ClassLength: Class has too many lines. [183/100]", 745649819], + [44, 7, 1369, "Metrics/MethodLength: Method has too many lines. [20/10]", 1509468182], + [44, 21, 472, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [15/5]", 700498762], + [117, 7, 1318, "Metrics/AbcSize: Assignment Branch Condition size for `merge_with_debug` is too high. [<3, 24, 7> 25.18/17]", 1535809936], + [117, 7, 1318, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_with_debug` is too high. [8/7]", 1535809936], + [117, 7, 1318, "Metrics/MethodLength: Method has too many lines. [30/10]", 1535809936], + [188, 7, 574, "Metrics/MethodLength: Method has too many lines. [13/10]", 1857730257], + [221, 7, 1053, "Metrics/MethodLength: Method has too many lines. [24/10]", 3329630813] + ], + "spec/fixtures_integration_spec.rb:2941021946": [ + [3, 1, 7914, "Metrics/BlockLength: Block has too many lines. [163/25]", 4258553307], + [85, 60, 25, "Style/SymbolProc: Pass `&:compact` as an argument to `map` instead of a block.", 2107480170], + [93, 59, 25, "Style/SymbolProc: Pass `&:compact` as an argument to `map` instead of a block.", 2107480170], + [157, 3, 801, "Metrics/BlockLength: Block has too many lines. [27/25]", 716259872] + ], + "spec/reproducible_merge_spec.rb:133932627": [ + [5, 1, 1854, "Metrics/BlockLength: Block has too many lines. [40/25]", 671932104] + ] +} diff --git a/gems/plain-merge/.rubocop_gradual.lock b/gems/plain-merge/.rubocop_gradual.lock new file mode 100644 index 000000000..2200cf1b9 --- /dev/null +++ b/gems/plain-merge/.rubocop_gradual.lock @@ -0,0 +1,106 @@ +{ + ".simplecov:3133826638": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:4149951629": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/plain-merge.rb:619298015": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`plain-merge.rb`) should use snake_case.", 5381] + ], + "lib/plain/merge.rb:3584995729": [ + [9, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Plain::Merge`.", 2866359175], + [9, 3, 7932, "Metrics/ModuleLength: Module has too many lines. [211/100]", 719656966], + [42, 5, 645, "Metrics/MethodLength: Method has too many lines. [21/10]", 3773389417], + [69, 5, 513, "Metrics/AbcSize: Assignment Branch Condition size for `similarity_score` is too high. [<9, 17, 3> 19.47/17]", 594433443], + [69, 5, 513, "Metrics/MethodLength: Method has too many lines. [12/10]", 594433443], + [87, 9, 10, "Naming/PredicatePrefix: Rename `is_similar` to `similar?`.", 1730577729], + [96, 5, 2163, "Metrics/AbcSize: Assignment Branch Condition size for `match_text_blocks` is too high. [<25, 36, 16> 46.66/17]", 1824707567], + [96, 5, 2163, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `match_text_blocks` is too high. [14/7]", 1824707567], + [96, 5, 2163, "Metrics/MethodLength: Method has too many lines. [50/10]", 1824707567], + [96, 5, 2163, "Metrics/PerceivedComplexity: Perceived complexity for `match_text_blocks` is too high. [14/8]", 1824707567], + [119, 7, 1032, "Style/CombinableLoops: Combine this loop with the previous loop.", 2654397768], + [158, 5, 683, "Metrics/AbcSize: Assignment Branch Condition size for `merge_text` is too high. [<11, 16, 4> 19.82/17]", 3448903566], + [158, 5, 683, "Metrics/MethodLength: Method has too many lines. [14/10]", 3448903566], + [178, 5, 633, "Metrics/AbcSize: Assignment Branch Condition size for `refined_text_similarity` is too high. [<3, 17, 0> 17.26/17]", 2185070085], + [208, 5, 700, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<8, 31, 8> 33/17]", 1827550752], + [208, 5, 700, "Metrics/MethodLength: Method has too many lines. [18/10]", 1827550752] + ], + "plain-merge.gemspec:3762840848": [ + [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ], + "spec/fixtures_integration_spec.rb:922433761": [ + [3, 1, 3550, "Metrics/BlockLength: Block has too many lines. [77/25]", 4225834063] + ] +} diff --git a/gems/plain-merge/Gemfile.lock b/gems/plain-merge/Gemfile.lock index 4f8595887..fcd1b5f4a 100644 --- a/gems/plain-merge/Gemfile.lock +++ b/gems/plain-merge/Gemfile.lock @@ -17,39 +17,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -58,193 +26,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -252,45 +34,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -310,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -324,6 +61,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -379,6 +117,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -397,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -537,23 +283,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -587,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +381,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,61 +407,39 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +452,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +479,11 @@ 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.0) plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +491,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,19 +518,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,19 +542,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +557,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/plain-merge/lib/plain/merge/version.rb b/gems/plain-merge/lib/plain/merge/version.rb index aab4f67c1..e6b3a5844 100644 --- a/gems/plain-merge/lib/plain/merge/version.rb +++ b/gems/plain-merge/lib/plain/merge/version.rb @@ -3,7 +3,7 @@ module Plain module Merge module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end From 3380efc8251fb1d36119472746624d8c84f5bda9 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:22:44 -0600 Subject: [PATCH 160/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-merge-git/Gemfile.lock | 332 +++++++++++++++++++++++++++- gems/json-merge/Gemfile.lock | 378 +++----------------------------- gems/plain-merge/Gemfile.lock | 327 ++++++++++++++++++++++++++- 3 files changed, 679 insertions(+), 358 deletions(-) diff --git a/gems/ast-merge-git/Gemfile.lock b/gems/ast-merge-git/Gemfile.lock index 863f65ef6..4df4417ad 100644 --- a/gems/ast-merge-git/Gemfile.lock +++ b/gems/ast-merge-git/Gemfile.lock @@ -17,7 +17,31 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -26,13 +50,231 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: json-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -52,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -115,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -143,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -282,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -334,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -385,25 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -412,32 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -445,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -457,20 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -485,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -496,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -523,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -534,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -547,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -562,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/json-merge/Gemfile.lock b/gems/json-merge/Gemfile.lock index 6807fdca5..2998cff4c 100644 --- a/gems/json-merge/Gemfile.lock +++ b/gems/json-merge/Gemfile.lock @@ -17,39 +17,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -58,193 +26,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -252,45 +34,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -310,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -324,6 +61,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -379,6 +117,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -397,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -537,23 +283,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -587,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +381,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,61 +407,39 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +452,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +480,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +491,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,19 +518,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,19 +542,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +557,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/plain-merge/Gemfile.lock b/gems/plain-merge/Gemfile.lock index fcd1b5f4a..c020666f7 100644 --- a/gems/plain-merge/Gemfile.lock +++ b/gems/plain-merge/Gemfile.lock @@ -17,7 +17,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -26,7 +58,193 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -34,6 +252,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -53,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,24 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -407,32 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -479,11 +788,14 @@ 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.0) plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -491,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -518,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -529,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -542,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 28e8eb20208587a3d285c4d890b09df6934d9060 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:23:19 -0600 Subject: [PATCH 161/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-crispr-markdown-markly/Gemfile.lock | 357 +--------------- gems/ast-merge-git/Gemfile.lock | 356 +--------------- gems/bash-merge/.kettle-drift.lock | 60 ++- gems/bash-merge/.rubocop_gradual.lock | 9 +- gems/bash-merge/Gemfile | 40 ++ gems/bash-merge/Gemfile.lock | 59 ++- gems/dotenv-merge/.kettle-drift.lock | 60 ++- gems/dotenv-merge/Gemfile | 40 ++ gems/dotenv-merge/Gemfile.lock | 327 +-------------- gems/json-merge/Gemfile.lock | 30 +- gems/markdown-merge/Gemfile.lock | 353 +--------------- gems/markly-merge/Gemfile.lock | 354 +--------------- gems/plain-merge/Gemfile.lock | 353 +--------------- gems/rbs-merge/.kettle-drift.lock | 60 ++- gems/rbs-merge/.rubocop_gradual.lock | 402 ------------------- gems/rbs-merge/Gemfile | 40 ++ gems/rbs-merge/Gemfile.lock | 73 ++-- gems/rbs-merge/lib/rbs/merge/version.rb | 2 +- gems/rbs-merge/rbs-merge.gemspec | 85 ++-- 19 files changed, 438 insertions(+), 2622 deletions(-) delete mode 100644 gems/rbs-merge/.rubocop_gradual.lock diff --git a/gems/ast-crispr-markdown-markly/Gemfile.lock b/gems/ast-crispr-markdown-markly/Gemfile.lock index 0e9612d0a..83c0b9108 100644 --- a/gems/ast-crispr-markdown-markly/Gemfile.lock +++ b/gems/ast-crispr-markdown-markly/Gemfile.lock @@ -16,265 +16,6 @@ PATH markly-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +27,15 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +44,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +107,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +135,15 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -587,11 +337,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +388,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,26 +413,18 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -713,26 +433,13 @@ CHECKSUMS ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +447,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,20 +459,15 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 @@ -788,14 +489,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +500,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,11 +527,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -845,7 +539,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +552,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +567,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) 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 4df4417ad..4681158d7 100644 --- a/gems/ast-merge-git/Gemfile.lock +++ b/gems/ast-merge-git/Gemfile.lock @@ -16,265 +16,6 @@ PATH json-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +40,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -358,13 +98,15 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +135,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +274,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +326,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +377,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +402,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +435,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +447,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +475,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +486,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +513,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +524,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +537,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +552,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/bash-merge/.kettle-drift.lock b/gems/bash-merge/.kettle-drift.lock index 628aa923c..0161251a7 100644 --- a/gems/bash-merge/.kettle-drift.lock +++ b/gems/bash-merge/.kettle-drift.lock @@ -5,7 +5,8 @@ "lines": [ 80, 120, - 160 + 160, + 200 ] } ], @@ -15,7 +16,8 @@ "lines": [ 91, 131, - 171 + 171, + 211 ] } ], @@ -25,7 +27,8 @@ "lines": [ 81, 121, - 161 + 161, + 201 ] } ], @@ -35,7 +38,8 @@ "lines": [ 93, 133, - 173 + 173, + 213 ] } ], @@ -45,7 +49,8 @@ "lines": [ 96, 136, - 176 + 176, + 216 ] } ], @@ -55,7 +60,8 @@ "lines": [ 82, 122, - 162 + 162, + 202 ] } ], @@ -66,7 +72,8 @@ 60, 100, 140, - 180 + 180, + 220 ] } ], @@ -76,7 +83,8 @@ "lines": [ 101, 141, - 181 + 181, + 221 ] } ], @@ -87,7 +95,8 @@ 43, 87, 127, - 167 + 167, + 207 ] } ], @@ -97,7 +106,8 @@ "lines": [ 110, 150, - 190 + 190, + 230 ] } ], @@ -108,7 +118,8 @@ 35, 79, 119, - 159 + 159, + 199 ] } ], @@ -119,7 +130,8 @@ 69, 109, 149, - 189 + 189, + 229 ] } ], @@ -129,7 +141,8 @@ "lines": [ 85, 125, - 165 + 165, + 205 ] } ], @@ -140,7 +153,8 @@ 48, 92, 132, - 172 + 172, + 212 ] } ], @@ -151,7 +165,8 @@ 44, 88, 128, - 168 + 168, + 208 ] } ], @@ -161,7 +176,8 @@ "lines": [ 86, 126, - 166 + 166, + 206 ] } ], @@ -171,7 +187,8 @@ "lines": [ 103, 143, - 183 + 183, + 223 ] } ], @@ -181,7 +198,8 @@ "lines": [ 102, 142, - 182 + 182, + 222 ] } ], @@ -191,7 +209,8 @@ "lines": [ 97, 137, - 177 + 177, + 217 ] } ], @@ -201,7 +220,8 @@ "lines": [ 106, 146, - 186 + 186, + 226 ] } ], diff --git a/gems/bash-merge/.rubocop_gradual.lock b/gems/bash-merge/.rubocop_gradual.lock index 4fcdee95e..33bcb2c09 100644 --- a/gems/bash-merge/.rubocop_gradual.lock +++ b/gems/bash-merge/.rubocop_gradual.lock @@ -81,6 +81,9 @@ "lib/bash-merge.rb:2115710001": [ [1, 1, 0, "Naming/FileName: The name of this source file (`bash-merge.rb`) should use snake_case.", 5381] ], + "lib/bash/merge.rb:4206734161": [ + [160, 7, 615, "Metrics/MethodLength: Method has too many lines. [13/10]", 1174626529] + ], "lib/bash/merge/comment_tracker.rb:2891158123": [ [54, 7, 773, "Metrics/MethodLength: Method has too many lines. [25/10]", 729186432] ], @@ -202,9 +205,9 @@ [266, 3, 1249, "Metrics/BlockLength: Block has too many lines. [37/25]", 546398620], [316, 3, 1101, "Metrics/BlockLength: Block has too many lines. [26/25]", 3599684932] ], - "spec/bash/merge_spec.rb:3012823876": [ - [5, 1, 4323, "Metrics/BlockLength: Block has too many lines. [109/25]", 2384192474], - [86, 3, 1146, "Metrics/BlockLength: Block has too many lines. [26/25]", 3618532423] + "spec/bash/merge_spec.rb:4280322597": [ + [5, 1, 4187, "Metrics/BlockLength: Block has too many lines. [108/25]", 2384192474], + [85, 3, 1146, "Metrics/BlockLength: Block has too many lines. [26/25]", 3618532423] ], "spec/support/shared_examples/file_analysis_examples.rb:3893834393": [ [8, 1, 1573, "Metrics/BlockLength: Block has too many lines. [36/25]", 1729754427], diff --git a/gems/bash-merge/Gemfile b/gems/bash-merge/Gemfile index c53198e8e..53b41c0f6 100644 --- a/gems/bash-merge/Gemfile +++ b/gems/bash-merge/Gemfile @@ -192,6 +192,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/bash-merge/Gemfile.lock b/gems/bash-merge/Gemfile.lock index 95209e787..00735ccec 100644 --- a/gems/bash-merge/Gemfile.lock +++ b/gems/bash-merge/Gemfile.lock @@ -275,6 +275,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -308,7 +324,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -363,18 +378,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -538,22 +542,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -659,9 +659,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.3, >= 2.3.7) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -740,7 +740,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -761,10 +760,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -839,13 +838,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/dotenv-merge/.kettle-drift.lock b/gems/dotenv-merge/.kettle-drift.lock index 628aa923c..0161251a7 100644 --- a/gems/dotenv-merge/.kettle-drift.lock +++ b/gems/dotenv-merge/.kettle-drift.lock @@ -5,7 +5,8 @@ "lines": [ 80, 120, - 160 + 160, + 200 ] } ], @@ -15,7 +16,8 @@ "lines": [ 91, 131, - 171 + 171, + 211 ] } ], @@ -25,7 +27,8 @@ "lines": [ 81, 121, - 161 + 161, + 201 ] } ], @@ -35,7 +38,8 @@ "lines": [ 93, 133, - 173 + 173, + 213 ] } ], @@ -45,7 +49,8 @@ "lines": [ 96, 136, - 176 + 176, + 216 ] } ], @@ -55,7 +60,8 @@ "lines": [ 82, 122, - 162 + 162, + 202 ] } ], @@ -66,7 +72,8 @@ 60, 100, 140, - 180 + 180, + 220 ] } ], @@ -76,7 +83,8 @@ "lines": [ 101, 141, - 181 + 181, + 221 ] } ], @@ -87,7 +95,8 @@ 43, 87, 127, - 167 + 167, + 207 ] } ], @@ -97,7 +106,8 @@ "lines": [ 110, 150, - 190 + 190, + 230 ] } ], @@ -108,7 +118,8 @@ 35, 79, 119, - 159 + 159, + 199 ] } ], @@ -119,7 +130,8 @@ 69, 109, 149, - 189 + 189, + 229 ] } ], @@ -129,7 +141,8 @@ "lines": [ 85, 125, - 165 + 165, + 205 ] } ], @@ -140,7 +153,8 @@ 48, 92, 132, - 172 + 172, + 212 ] } ], @@ -151,7 +165,8 @@ 44, 88, 128, - 168 + 168, + 208 ] } ], @@ -161,7 +176,8 @@ "lines": [ 86, 126, - 166 + 166, + 206 ] } ], @@ -171,7 +187,8 @@ "lines": [ 103, 143, - 183 + 183, + 223 ] } ], @@ -181,7 +198,8 @@ "lines": [ 102, 142, - 182 + 182, + 222 ] } ], @@ -191,7 +209,8 @@ "lines": [ 97, 137, - 177 + 177, + 217 ] } ], @@ -201,7 +220,8 @@ "lines": [ 106, 146, - 186 + 186, + 226 ] } ], diff --git a/gems/dotenv-merge/Gemfile b/gems/dotenv-merge/Gemfile index 7ee76e326..707638a46 100644 --- a/gems/dotenv-merge/Gemfile +++ b/gems/dotenv-merge/Gemfile @@ -192,6 +192,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/dotenv-merge/Gemfile.lock b/gems/dotenv-merge/Gemfile.lock index 191c40b34..15b0c9cc6 100644 --- a/gems/dotenv-merge/Gemfile.lock +++ b/gems/dotenv-merge/Gemfile.lock @@ -17,39 +17,7 @@ PATH version_gem (~> 1.1, >= 1.1.14) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -58,193 +26,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -252,29 +34,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -294,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +116,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +283,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +381,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.1, >= 3.1.4) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.3, >= 2.3.7) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,55 +407,33 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.1, >= 3.1.14) - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -754,27 +454,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -789,14 +481,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -804,7 +492,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -832,12 +519,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -846,7 +530,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -860,19 +543,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -880,7 +558,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/json-merge/Gemfile.lock b/gems/json-merge/Gemfile.lock index 2998cff4c..84c77ede1 100644 --- a/gems/json-merge/Gemfile.lock +++ b/gems/json-merge/Gemfile.lock @@ -16,24 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -45,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -335,6 +322,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,7 +373,6 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - ast-merge! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) debug (>= 1.1) @@ -411,7 +402,6 @@ DEPENDENCIES standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - tree_haver! tree_sitter_language_pack! yaml-converter (~> 0.1) yard (~> 0.9, >= 0.9.44) diff --git a/gems/markdown-merge/Gemfile.lock b/gems/markdown-merge/Gemfile.lock index f39d8ddab..f3d09b5c3 100644 --- a/gems/markdown-merge/Gemfile.lock +++ b/gems/markdown-merge/Gemfile.lock @@ -16,265 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +40,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +103,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +131,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +270,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +322,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +373,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +398,31 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +430,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +442,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +470,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +481,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +508,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +519,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +532,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +547,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/markly-merge/Gemfile.lock b/gems/markly-merge/Gemfile.lock index 0e38a0a14..190fca775 100644 --- a/gems/markly-merge/Gemfile.lock +++ b/gems/markly-merge/Gemfile.lock @@ -16,265 +16,6 @@ PATH markly (~> 0.9) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +40,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +103,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,6 +131,10 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) @@ -533,8 +275,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +327,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +378,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +403,31 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +435,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,20 +447,15 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 @@ -788,14 +477,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +488,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +515,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +526,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +539,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +554,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/plain-merge/Gemfile.lock b/gems/plain-merge/Gemfile.lock index c020666f7..ae3867db7 100644 --- a/gems/plain-merge/Gemfile.lock +++ b/gems/plain-merge/Gemfile.lock @@ -16,265 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +40,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +103,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +131,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +270,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +322,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +373,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +398,31 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +430,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +442,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +469,11 @@ 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.0) plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +481,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +508,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +519,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +532,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +547,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/rbs-merge/.kettle-drift.lock b/gems/rbs-merge/.kettle-drift.lock index 628aa923c..0161251a7 100644 --- a/gems/rbs-merge/.kettle-drift.lock +++ b/gems/rbs-merge/.kettle-drift.lock @@ -5,7 +5,8 @@ "lines": [ 80, 120, - 160 + 160, + 200 ] } ], @@ -15,7 +16,8 @@ "lines": [ 91, 131, - 171 + 171, + 211 ] } ], @@ -25,7 +27,8 @@ "lines": [ 81, 121, - 161 + 161, + 201 ] } ], @@ -35,7 +38,8 @@ "lines": [ 93, 133, - 173 + 173, + 213 ] } ], @@ -45,7 +49,8 @@ "lines": [ 96, 136, - 176 + 176, + 216 ] } ], @@ -55,7 +60,8 @@ "lines": [ 82, 122, - 162 + 162, + 202 ] } ], @@ -66,7 +72,8 @@ 60, 100, 140, - 180 + 180, + 220 ] } ], @@ -76,7 +83,8 @@ "lines": [ 101, 141, - 181 + 181, + 221 ] } ], @@ -87,7 +95,8 @@ 43, 87, 127, - 167 + 167, + 207 ] } ], @@ -97,7 +106,8 @@ "lines": [ 110, 150, - 190 + 190, + 230 ] } ], @@ -108,7 +118,8 @@ 35, 79, 119, - 159 + 159, + 199 ] } ], @@ -119,7 +130,8 @@ 69, 109, 149, - 189 + 189, + 229 ] } ], @@ -129,7 +141,8 @@ "lines": [ 85, 125, - 165 + 165, + 205 ] } ], @@ -140,7 +153,8 @@ 48, 92, 132, - 172 + 172, + 212 ] } ], @@ -151,7 +165,8 @@ 44, 88, 128, - 168 + 168, + 208 ] } ], @@ -161,7 +176,8 @@ "lines": [ 86, 126, - 166 + 166, + 206 ] } ], @@ -171,7 +187,8 @@ "lines": [ 103, 143, - 183 + 183, + 223 ] } ], @@ -181,7 +198,8 @@ "lines": [ 102, 142, - 182 + 182, + 222 ] } ], @@ -191,7 +209,8 @@ "lines": [ 97, 137, - 177 + 177, + 217 ] } ], @@ -201,7 +220,8 @@ "lines": [ 106, 146, - 186 + 186, + 226 ] } ], diff --git a/gems/rbs-merge/.rubocop_gradual.lock b/gems/rbs-merge/.rubocop_gradual.lock deleted file mode 100644 index 2be38dd67..000000000 --- a/gems/rbs-merge/.rubocop_gradual.lock +++ /dev/null @@ -1,402 +0,0 @@ -{ - ".simplecov:2483172942": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:3295679373": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/rbs-merge.rb:334311121": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`rbs-merge.rb`) should use snake_case.", 5381], - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "lib/rbs/merge.rb:3499390300": [ - [17, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Rbs::Merge`.", 2866359175], - [103, 7, 1203, "Metrics/MethodLength: Method has too many lines. [25/10]", 564456261] - ], - "lib/rbs/merge/backends/rbs_backend.rb:1875248624": [ - [48, 11, 555, "Metrics/MethodLength: Method has too many lines. [13/10]", 2078142514], - [81, 11, 658, "Metrics/MethodLength: Method has too many lines. [11/10]", 324484142], - [172, 11, 527, "Metrics/MethodLength: Method has too many lines. [14/10]", 631898529], - [240, 15, 11, "Naming/PredicatePrefix: Rename `has_errors?` to `errors?`.", 1181419252], - [263, 9, 9332, "Metrics/ClassLength: Class has too many lines. [135/100]", 1906483935], - [290, 11, 1914, "Metrics/AbcSize: Assignment Branch Condition size for `type` is too high. [<0, 9, 23> 24.7/17]", 3636991776], - [290, 11, 1914, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `type` is too high. [24/7]", 3636991776], - [290, 11, 1914, "Metrics/MethodLength: Method has too many lines. [28/10]", 3636991776], - [363, 11, 489, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `end_point` is too high. [8/7]", 844861810], - [504, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] - ], - "lib/rbs/merge/comment_tracker.rb:1938176986": [ - [28, 7, 767, "Metrics/MethodLength: Method has too many lines. [15/10]", 752916075], - [60, 7, 416, "Metrics/MethodLength: Method has too many lines. [12/10]", 2715172162] - ], - "lib/rbs/merge/conflict_resolver.rb:1305396962": [ - [16, 5, 11045, "Metrics/ClassLength: Class has too many lines. [174/100]", 330576807], - [44, 7, 1614, "Metrics/MethodLength: Method has too many lines. [23/10]", 1004723330], - [44, 45, 14, "Lint/UnusedMethodArgument: Unused method argument - `template_index`.", 1809801172], - [44, 62, 10, "Lint/UnusedMethodArgument: Unused method argument - `dest_index`.", 2703999490], - [122, 7, 717, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `resolve_preference` is too high. [8/7]", 2783267415], - [122, 7, 717, "Metrics/MethodLength: Method has too many lines. [12/10]", 2783267415], - [156, 7, 949, "Metrics/AbcSize: Assignment Branch Condition size for `extract_declaration_text` is too high. [<9, 19, 14> 25.26/17]", 4132302840], - [156, 7, 949, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_declaration_text` is too high. [13/7]", 4132302840], - [156, 7, 949, "Metrics/MethodLength: Method has too many lines. [18/10]", 4132302840], - [156, 7, 949, "Metrics/PerceivedComplexity: Perceived complexity for `extract_declaration_text` is too high. [14/8]", 4132302840], - [181, 39, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [279, 7, 565, "Metrics/MethodLength: Method has too many lines. [13/10]", 375776463], - [279, 11, 12, "Naming/PredicatePrefix: Rename `has_members?` to `members?`.", 496913372] - ], - "lib/rbs/merge/file_aligner.rb:157117932": [ - [32, 7, 128, "Lint/UselessMethodDefinition: Useless method definition detected.", 4031328363] - ], - "lib/rbs/merge/file_analysis.rb:4205990536": [ - [23, 5, 20642, "Metrics/ClassLength: Class has too many lines. [403/100]", 3271819659], - [59, 7, 1146, "Metrics/MethodLength: Method has too many lines. [20/10]", 1625645012], - [191, 7, 398, "Metrics/MethodLength: Method has too many lines. [12/10]", 4157341657], - [211, 7, 719, "Metrics/MethodLength: Method has too many lines. [13/10]", 2571132513], - [235, 7, 965, "Metrics/AbcSize: Assignment Branch Condition size for `compute_tree_sitter_signature` is too high. [<3, 5, 21> 21.79/17]", 2963702282], - [235, 7, 965, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_tree_sitter_signature` is too high. [22/7]", 2963702282], - [235, 7, 965, "Metrics/MethodLength: Method has too many lines. [26/10]", 2963702282], - [235, 7, 965, "Metrics/PerceivedComplexity: Perceived complexity for `compute_tree_sitter_signature` is too high. [16/8]", 2963702282], - [269, 7, 996, "Metrics/AbcSize: Assignment Branch Condition size for `extract_tree_sitter_node_name` is too high. [<5, 16, 10> 19.52/17]", 300940102], - [269, 7, 996, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_tree_sitter_node_name` is too high. [11/7]", 300940102], - [269, 7, 996, "Metrics/MethodLength: Method has too many lines. [24/10]", 300940102], - [269, 7, 996, "Metrics/PerceivedComplexity: Perceived complexity for `extract_tree_sitter_node_name` is too high. [11/8]", 300940102], - [320, 7, 834, "Metrics/MethodLength: Method has too many lines. [16/10]", 658496547], - [380, 7, 1612, "Metrics/AbcSize: Assignment Branch Condition size for `extract_tree_sitter_declarations` is too high. [<8, 18, 11> 22.56/17]", 1899595676], - [380, 7, 1612, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_tree_sitter_declarations` is too high. [10/7]", 1899595676], - [380, 7, 1612, "Metrics/MethodLength: Method has too many lines. [23/10]", 1899595676], - [380, 7, 1612, "Metrics/PerceivedComplexity: Perceived complexity for `extract_tree_sitter_declarations` is too high. [11/8]", 1899595676], - [449, 7, 569, "Metrics/MethodLength: Method has too many lines. [13/10]", 210550095], - [471, 7, 1133, "Metrics/AbcSize: Assignment Branch Condition size for `build_freeze_blocks` is too high. [<7, 22, 6> 23.85/17]", 4016218974], - [471, 7, 1133, "Metrics/MethodLength: Method has too many lines. [29/10]", 4016218974], - [528, 7, 486, "Metrics/MethodLength: Method has too many lines. [12/10]", 618123864], - [528, 7, 486, "Metrics/PerceivedComplexity: Perceived complexity for `node_start_line` is too high. [9/8]", 618123864], - [545, 7, 472, "Metrics/MethodLength: Method has too many lines. [12/10]", 1339916888], - [545, 7, 472, "Metrics/PerceivedComplexity: Perceived complexity for `node_end_line` is too high. [9/8]", 1339916888], - [579, 7, 1868, "Metrics/AbcSize: Assignment Branch Condition size for `compute_rbs_gem_signature` is too high. [<0, 45, 23> 50.54/17]", 2652509672], - [579, 7, 1868, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_rbs_gem_signature` is too high. [23/7]", 2652509672], - [579, 7, 1868, "Metrics/MethodLength: Method has too many lines. [43/10]", 2652509672], - [579, 7, 1868, "Metrics/PerceivedComplexity: Perceived complexity for `compute_rbs_gem_signature` is too high. [9/8]", 2652509672] - ], - "lib/rbs/merge/freeze_node.rb:2942544870": [ - [34, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 201145846], - [39, 7, 577, "Metrics/MethodLength: Method has too many lines. [11/10]", 2189574632], - [39, 21, 186, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1006469938], - [78, 7, 1506, "Metrics/AbcSize: Assignment Branch Condition size for `validate_structure!` is too high. [<12, 12, 17> 24.02/17]", 1543687562], - [78, 7, 1506, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_structure!` is too high. [12/7]", 1543687562], - [78, 7, 1506, "Metrics/MethodLength: Method has too many lines. [25/10]", 1543687562], - [78, 7, 1506, "Metrics/PerceivedComplexity: Perceived complexity for `validate_structure!` is too high. [12/8]", 1543687562], - [150, 7, 891, "Metrics/AbcSize: Assignment Branch Condition size for `extract_node_name` is too high. [<4, 21, 12> 24.52/17]", 1223188123], - [150, 7, 891, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_node_name` is too high. [13/7]", 1223188123], - [150, 7, 891, "Metrics/MethodLength: Method has too many lines. [18/10]", 1223188123], - [150, 7, 891, "Metrics/PerceivedComplexity: Perceived complexity for `extract_node_name` is too high. [13/8]", 1223188123], - [162, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861336] - ], - "lib/rbs/merge/merge_result.rb:1707720872": [ - [18, 5, 15586, "Metrics/ClassLength: Class has too many lines. [276/100]", 817348545], - [89, 7, 966, "Metrics/MethodLength: Method has too many lines. [14/10]", 3349669346], - [176, 7, 1770, "Metrics/AbcSize: Assignment Branch Condition size for `extract_lines` is too high. [<15, 21, 16> 30.36/17]", 3951991352], - [176, 7, 1770, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_lines` is too high. [15/7]", 3951991352], - [176, 7, 1770, "Metrics/MethodLength: Method has too many lines. [29/10]", 3951991352], - [176, 7, 1770, "Metrics/PerceivedComplexity: Perceived complexity for `extract_lines` is too high. [16/8]", 3951991352], - [226, 44, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [232, 7, 606, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trailing_lines_for` is too high. [9/7]", 518209980], - [232, 7, 606, "Metrics/MethodLength: Method has too many lines. [13/10]", 518209980], - [232, 7, 606, "Metrics/PerceivedComplexity: Perceived complexity for `trailing_lines_for` is too high. [10/8]", 518209980], - [233, 47, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [266, 33, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [271, 7, 682, "Metrics/AbcSize: Assignment Branch Condition size for `deduplicate_leading_comment_overlap` is too high. [<4, 15, 9> 17.94/17]", 4227245480], - [271, 7, 682, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `deduplicate_leading_comment_overlap` is too high. [8/7]", 4227245480], - [271, 7, 682, "Metrics/MethodLength: Method has too many lines. [11/10]", 4227245480], - [335, 23, 24, "Style/SafeNavigation: Use safe navigation (`&.`) instead of checking if an object exists before calling the method.", 1487466207], - [371, 7, 893, "Metrics/MethodLength: Method has too many lines. [11/10]", 1066420963], - [371, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 2582953496] - ], - "lib/rbs/merge/node_type_normalizer.rb:2788764230": [ - [65, 5, 10747, "Metrics/ModuleLength: Module has too many lines. [199/100]", 63560324], - [250, 9, 693, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonical_type_for_node` is too high. [9/7]", 908800634], - [250, 9, 693, "Metrics/MethodLength: Method has too many lines. [16/10]", 908800634], - [250, 9, 693, "Metrics/PerceivedComplexity: Perceived complexity for `canonical_type_for_node` is too high. [9/8]", 908800634], - [323, 9, 689, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `refine_tree_sitter_attribute_type` is too high. [9/7]", 2340352499], - [323, 9, 689, "Metrics/MethodLength: Method has too many lines. [13/10]", 2340352499], - [323, 9, 689, "Metrics/PerceivedComplexity: Perceived complexity for `refine_tree_sitter_attribute_type` is too high. [9/8]", 2340352499], - [343, 9, 475, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `refine_tree_sitter_variable_type` is too high. [8/7]", 536330497], - [343, 9, 475, "Metrics/MethodLength: Method has too many lines. [14/10]", 536330497] - ], - "lib/rbs/merge/node_wrapper.rb:1434186839": [ - [26, 5, 14933, "Metrics/ClassLength: Class has too many lines. [344/100]", 4139761414], - [37, 17, 84, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 366036293], - [264, 7, 831, "Metrics/AbcSize: Assignment Branch Condition size for `text` is too high. [<3, 32, 20> 37.85/17]", 980238327], - [264, 7, 831, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `text` is too high. [18/7]", 980238327], - [264, 7, 831, "Metrics/MethodLength: Method has too many lines. [18/10]", 980238327], - [264, 7, 831, "Metrics/PerceivedComplexity: Perceived complexity for `text` is too high. [20/8]", 980238327], - [268, 47, 2, "Lint/SafeNavigationConsistency: Use `.` instead of unnecessary `&.`.", 5858765], - [280, 22, 14, "Style/NumericPredicate: Use `start_line.positive?` instead of `start_line > 0`.", 792111162], - [301, 7, 1209, "Metrics/AbcSize: Assignment Branch Condition size for `signature` is too high. [<1, 25, 20> 32.03/17]", 4281557215], - [301, 7, 1209, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `signature` is too high. [21/7]", 4281557215], - [301, 7, 1209, "Metrics/MethodLength: Method has too many lines. [45/10]", 4281557215], - [351, 7, 384, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `method_kind` is too high. [8/7]", 563626808], - [351, 7, 384, "Metrics/PerceivedComplexity: Perceived complexity for `method_kind` is too high. [9/8]", 563626808], - [423, 7, 935, "Metrics/MethodLength: Method has too many lines. [21/10]", 3557799127], - [469, 7, 667, "Metrics/AbcSize: Assignment Branch Condition size for `extract_child_texts` is too high. [<6, 16, 8> 18.87/17]", 1979652559], - [469, 7, 667, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_child_texts` is too high. [9/7]", 1979652559], - [469, 7, 667, "Metrics/MethodLength: Method has too many lines. [12/10]", 1979652559], - [469, 7, 667, "Metrics/PerceivedComplexity: Perceived complexity for `extract_child_texts` is too high. [9/8]", 1979652559], - [487, 7, 583, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_tree_sitter_visibility_kind` is too high. [9/7]", 2002684122], - [487, 7, 583, "Metrics/MethodLength: Method has too many lines. [13/10]", 2002684122], - [487, 7, 583, "Metrics/PerceivedComplexity: Perceived complexity for `extract_tree_sitter_visibility_kind` is too high. [9/8]", 2002684122], - [532, 7, 557, "Metrics/MethodLength: Method has too many lines. [14/10]", 1753294094] - ], - "lib/rbs/merge/smart_merger.rb:4114819804": [ - [43, 5, 38956, "Metrics/ClassLength: Class has too many lines. [785/100]", 3732361716], - [85, 7, 1188, "Metrics/MethodLength: Method has too many lines. [17/10]", 2908064588], - [85, 21, 447, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 1344979847], - [181, 7, 805, "Metrics/AbcSize: Assignment Branch Condition size for `perform_merge` is too high. [<6, 15, 8> 18.03/17]", 1638854701], - [181, 7, 805, "Metrics/MethodLength: Method has too many lines. [14/10]", 1638854701], - [207, 7, 572, "Metrics/MethodLength: Method has too many lines. [15/10]", 3471574631], - [290, 7, 621, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `root_boundary_lines_for` is too high. [9/7]", 354795708], - [290, 7, 621, "Metrics/PerceivedComplexity: Perceived complexity for `root_boundary_lines_for` is too high. [9/8]", 354795708], - [291, 34, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [323, 9, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 748374760], - [326, 7, 794, "Metrics/AbcSize: Assignment Branch Condition size for `root_boundary_range` is too high. [<4, 22, 11> 24.92/17]", 2546634651], - [326, 7, 794, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `root_boundary_range` is too high. [10/7]", 2546634651], - [326, 7, 794, "Metrics/MethodLength: Method has too many lines. [19/10]", 2546634651], - [326, 7, 794, "Metrics/PerceivedComplexity: Perceived complexity for `root_boundary_range` is too high. [11/8]", 2546634651], - [365, 7, 1030, "Metrics/AbcSize: Assignment Branch Condition size for `process_match` is too high. [<1, 22, 7> 23.11/17]", 333057092], - [365, 7, 1030, "Metrics/MethodLength: Method has too many lines. [27/10]", 333057092], - [428, 7, 1830, "Metrics/AbcSize: Assignment Branch Condition size for `removed_declaration_comment_lines` is too high. [<13, 31, 25> 41.89/17]", 276966259], - [428, 7, 1830, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `removed_declaration_comment_lines` is too high. [21/7]", 276966259], - [428, 7, 1830, "Metrics/MethodLength: Method has too many lines. [38/10]", 276966259], - [428, 7, 1830, "Metrics/PerceivedComplexity: Perceived complexity for `removed_declaration_comment_lines` is too high. [24/8]", 276966259], - [476, 7, 675, "Metrics/MethodLength: Method has too many lines. [13/10]", 1415352570], - [502, 7, 2604, "Metrics/AbcSize: Assignment Branch Condition size for `reconstruct_declaration_with_merged_members` is too high. [<19, 23, 22> 37.07/17]", 1250076424], - [502, 7, 2604, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `reconstruct_declaration_with_merged_members` is too high. [17/7]", 1250076424], - [502, 7, 2604, "Metrics/MethodLength: Method has too many lines. [49/10]", 1250076424], - [502, 7, 2604, "Metrics/PerceivedComplexity: Perceived complexity for `reconstruct_declaration_with_merged_members` is too high. [17/8]", 1250076424], - [540, 20, 46, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 1375387925], - [555, 9, 210, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 3589424565], - [565, 7, 1271, "Metrics/AbcSize: Assignment Branch Condition size for `recursive_body_lines_for_declaration` is too high. [<8, 23, 9> 25.96/17]", 2123349984], - [565, 7, 1271, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `recursive_body_lines_for_declaration` is too high. [10/7]", 2123349984], - [565, 7, 1271, "Metrics/MethodLength: Method has too many lines. [18/10]", 2123349984], - [565, 7, 1271, "Metrics/PerceivedComplexity: Perceived complexity for `recursive_body_lines_for_declaration` is too high. [10/8]", 2123349984], - [565, 47, 139, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 652517575], - [591, 7, 1910, "Metrics/AbcSize: Assignment Branch Condition size for `merge_member_lines` is too high. [<4, 35, 12> 37.22/17]", 1631109354], - [591, 7, 1910, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_member_lines` is too high. [11/7]", 1631109354], - [591, 7, 1910, "Metrics/MethodLength: Method has too many lines. [42/10]", 1631109354], - [592, 9, 1837, "Metrics/BlockLength: Block has too many lines. [40/25]", 3339652106], - [638, 7, 1779, "Metrics/AbcSize: Assignment Branch Condition size for `align_member_lists` is too high. [<14, 26, 14> 32.68/17]", 3585753868], - [638, 7, 1779, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `align_member_lists` is too high. [14/7]", 3585753868], - [638, 7, 1779, "Metrics/MethodLength: Method has too many lines. [49/10]", 3585753868], - [638, 7, 1779, "Metrics/PerceivedComplexity: Perceived complexity for `align_member_lists` is too high. [15/8]", 3585753868], - [745, 7, 605, "Metrics/AbcSize: Assignment Branch Condition size for `split_top_level_return_type` is too high. [<7, 14, 10> 18.57/17]", 1731525207], - [745, 7, 605, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split_top_level_return_type` is too high. [8/7]", 1731525207], - [745, 7, 605, "Metrics/MethodLength: Method has too many lines. [17/10]", 1731525207], - [782, 7, 1684, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_statement_lines_with_leading_comments` is too high. [8/7]", 3625004207], - [782, 7, 1684, "Metrics/MethodLength: Method has too many lines. [29/10]", 3625004207], - [782, 7, 1684, "Metrics/PerceivedComplexity: Perceived complexity for `extract_statement_lines_with_leading_comments` is too high. [10/8]", 3625004207], - [869, 33, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [874, 7, 840, "Metrics/MethodLength: Method has too many lines. [15/10]", 3400690599], - [895, 39, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [982, 23, 24, "Style/SafeNavigation: Use safe navigation (`&.`) instead of checking if an object exists before calling the method.", 1487466207], - [998, 7, 1788, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_cross_source_preamble_prefixes` is too high. [<14, 21, 9> 26.8/17]", 3130187278], - [998, 7, 1788, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collapse_cross_source_preamble_prefixes` is too high. [9/7]", 3130187278], - [998, 7, 1788, "Metrics/MethodLength: Method has too many lines. [31/10]", 3130187278], - [998, 7, 1788, "Metrics/PerceivedComplexity: Perceived complexity for `collapse_cross_source_preamble_prefixes` is too high. [9/8]", 3130187278], - [1038, 7, 533, "Metrics/MethodLength: Method has too many lines. [15/10]", 4188914818] - ], - "rbs-merge.gemspec:395192785": [ - [126, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [128, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2105564149], - [134, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949] - ], - "spec/integration/reproducible_merge_spec.rb:4124333249": [ - [9, 1, 6937, "Metrics/BlockLength: Block has too many lines. [155/25]", 1482304086], - [14, 3, 4384, "Metrics/BlockLength: Block has too many lines. [85/25]", 628655161], - [15, 5, 3507, "Metrics/BlockLength: Block has too many lines. [65/25]", 2935184196], - [56, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858910], - [62, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 50415752], - [87, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1546684737] - ], - "spec/rbs/merge/comment_behavior_matrix_spec.rb:2666227529": [ - [14, 45, 6, "Lint/UnusedBlockArgument: Unused block argument - `inline`. If it's necessary, use `_` or `_inline` as an argument name to indicate that it won't be used.", 1605470060], - [18, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 253885993], - [19, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 1702591521] - ], - "spec/rbs/merge/comment_tracker_spec.rb:1831412931": [ - [5, 1, 14574, "Metrics/BlockLength: Block has too many lines. [306/25]", 1598998757], - [8, 3, 3272, "Metrics/BlockLength: Block has too many lines. [67/25]", 935176133], - [95, 3, 1130, "Metrics/BlockLength: Block has too many lines. [28/25]", 204252301], - [143, 3, 1704, "Metrics/BlockLength: Block has too many lines. [32/25]", 1579622084], - [209, 3, 5815, "Metrics/BlockLength: Block has too many lines. [112/25]", 433112678] - ], - "spec/rbs/merge/conflict_resolver_spec.rb:999961156": [ - [8, 1, 19854, "Metrics/BlockLength: Block has too many lines. [491/25]", 3942921818], - [9, 3, 1428, "Metrics/BlockLength: Block has too many lines. [36/25]", 529294185], - [56, 3, 1199, "Metrics/BlockLength: Block has too many lines. [28/25]", 73504201], - [93, 3, 1277, "Metrics/BlockLength: Block has too many lines. [29/25]", 595351018], - [190, 3, 7078, "Metrics/BlockLength: Block has too many lines. [149/25]", 3739681265], - [296, 5, 1646, "Metrics/BlockLength: Block has too many lines. [33/25]", 3128279135], - [302, 7, 1292, "Metrics/BlockLength: Block has too many lines. [27/25]", 729602127], - [404, 3, 4548, "Metrics/BlockLength: Block has too many lines. [114/25]", 2619563374], - [420, 5, 922, "Metrics/BlockLength: Block has too many lines. [26/25]", 3893264586], - [452, 5, 960, "Metrics/BlockLength: Block has too many lines. [26/25]", 3053707146] - ], - "spec/rbs/merge/file_aligner_spec.rb:2643720547": [ - [7, 1, 21476, "Metrics/BlockLength: Block has too many lines. [555/25]", 4145069110], - [65, 3, 1123, "Metrics/BlockLength: Block has too many lines. [28/25]", 1358831340], - [188, 3, 1226, "Metrics/BlockLength: Block has too many lines. [34/25]", 1337144492], - [246, 3, 4891, "Metrics/BlockLength: Block has too many lines. [152/25]", 125990895], - [436, 3, 1943, "Metrics/BlockLength: Block has too many lines. [34/25]", 4126970167], - [483, 3, 3944, "Metrics/BlockLength: Block has too many lines. [94/25]", 2604333848], - [565, 5, 1328, "Metrics/BlockLength: Block has too many lines. [27/25]", 1994971578] - ], - "spec/rbs/merge/file_analysis_spec.rb:952231308": [ - [15, 1, 54363, "Metrics/BlockLength: Block has too many lines. [1205/25]", 2485884639], - [16, 3, 1272, "Metrics/BlockLength: Block has too many lines. [38/25]", 1778989479], - [17, 5, 1210, "Metrics/BlockLength: Block has too many lines. [37/25]", 1755177515], - [67, 3, 1152, "Metrics/BlockLength: Block has too many lines. [33/25]", 2931980952], - [68, 5, 1083, "Metrics/BlockLength: Block has too many lines. [32/25]", 3589815947], - [136, 3, 982, "Metrics/BlockLength: Block has too many lines. [30/25]", 1355840781], - [137, 5, 929, "Metrics/BlockLength: Block has too many lines. [29/25]", 3738902933], - [200, 3, 1559, "Metrics/BlockLength: Block has too many lines. [30/25]", 3203356148], - [201, 5, 1493, "Metrics/BlockLength: Block has too many lines. [29/25]", 1389049628], - [860, 3, 2525, "Metrics/BlockLength: Block has too many lines. [42/25]", 2701315631], - [861, 5, 2455, "Metrics/BlockLength: Block has too many lines. [41/25]", 1293659790], - [884, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 193270906], - [919, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 115067835], - [948, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [954, 3, 3548, "Metrics/BlockLength: Block has too many lines. [59/25]", 2573657607], - [955, 5, 3497, "Metrics/BlockLength: Block has too many lines. [58/25]", 14776664], - [982, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085251945], - [1017, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2659900392], - [1038, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2659900392], - [1091, 3, 1750, "Metrics/BlockLength: Block has too many lines. [29/25]", 460836946], - [1092, 5, 1693, "Metrics/BlockLength: Block has too many lines. [28/25]", 1601111212], - [1135, 3, 1948, "Metrics/BlockLength: Block has too many lines. [41/25]", 4061538475], - [1136, 5, 1892, "Metrics/BlockLength: Block has too many lines. [40/25]", 4081702319], - [1195, 3, 2571, "Metrics/BlockLength: Block has too many lines. [55/25]", 3959149994], - [1265, 3, 2440, "Metrics/BlockLength: Block has too many lines. [52/25]", 2164819729], - [1332, 3, 2008, "Metrics/BlockLength: Block has too many lines. [39/25]", 609327574], - [1379, 3, 1938, "Metrics/BlockLength: Block has too many lines. [38/25]", 361672068], - [1425, 3, 1995, "Metrics/BlockLength: Block has too many lines. [39/25]", 4024875480], - [1472, 3, 1992, "Metrics/BlockLength: Block has too many lines. [39/25]", 1156260241] - ], - "spec/rbs/merge/freeze_node_spec.rb:2278400615": [ - [8, 1, 13268, "Metrics/BlockLength: Block has too many lines. [327/25]", 1590692835], - [9, 3, 2116, "Metrics/BlockLength: Block has too many lines. [43/25]", 4215218715], - [98, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3784984989], - [99, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1182436848], - [331, 3, 2919, "Metrics/BlockLength: Block has too many lines. [65/25]", 1415484725] - ], - "spec/rbs/merge/merge_result_spec.rb:2449518259": [ - [8, 1, 20574, "Metrics/BlockLength: Block has too many lines. [454/25]", 736738811], - [53, 3, 1244, "Metrics/BlockLength: Block has too many lines. [31/25]", 3686452170] - ], - "spec/rbs/merge/smart_merger_removal_mode_compliance_spec.rb:3475743041": [ - [7, 1, 1860, "Metrics/BlockLength: Block has too many lines. [66/25]", 3469987127], - [8, 3, 1798, "Metrics/BlockLength: Block has too many lines. [65/25]", 778477682] - ], - "spec/rbs/merge/smart_merger_spec.rb:3451189224": [ - [14, 1, 43498, "Metrics/BlockLength: Block has too many lines. [1190/25]", 1106962], - [149, 3, 10886, "Metrics/BlockLength: Block has too many lines. [286/25]", 1693926280], - [315, 5, 985, "Metrics/BlockLength: Block has too many lines. [26/25]", 3397066157], - [351, 5, 1063, "Metrics/BlockLength: Block has too many lines. [26/25]", 2718784043], - [461, 5, 1135, "Metrics/BlockLength: Block has too many lines. [26/25]", 3797285781], - [497, 5, 1213, "Metrics/BlockLength: Block has too many lines. [26/25]", 3686078390], - [536, 3, 2766, "Metrics/BlockLength: Block has too many lines. [84/25]", 3927490181], - [649, 3, 1714, "Metrics/BlockLength: Block has too many lines. [54/25]", 386494661], - [721, 3, 5393, "Metrics/BlockLength: Block has too many lines. [138/25]", 2457897034], - [925, 3, 4479, "Metrics/BlockLength: Block has too many lines. [134/25]", 3856958364], - [926, 5, 1327, "Metrics/BlockLength: Block has too many lines. [33/25]", 4009192695], - [970, 5, 953, "Metrics/BlockLength: Block has too many lines. [29/25]", 902715698], - [1008, 5, 1147, "Metrics/BlockLength: Block has too many lines. [37/25]", 3544491851], - [1058, 5, 955, "Metrics/BlockLength: Block has too many lines. [27/25]", 2688118410], - [1096, 3, 1031, "Metrics/BlockLength: Block has too many lines. [32/25]", 663517347], - [1097, 5, 970, "Metrics/BlockLength: Block has too many lines. [31/25]", 1575476639], - [1135, 3, 882, "Metrics/BlockLength: Block has too many lines. [27/25]", 3845382500], - [1136, 5, 813, "Metrics/BlockLength: Block has too many lines. [26/25]", 1755501948], - [1171, 3, 805, "Metrics/BlockLength: Block has too many lines. [26/25]", 3413285873], - [1204, 3, 2200, "Metrics/BlockLength: Block has too many lines. [70/25]", 3541894760], - [1205, 5, 1202, "Metrics/BlockLength: Block has too many lines. [38/25]", 3971143978], - [1235, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177610], - [1251, 5, 923, "Metrics/BlockLength: Block has too many lines. [28/25]", 3867507419], - [1288, 3, 1175, "Metrics/BlockLength: Block has too many lines. [36/25]", 1587654554], - [1289, 5, 1103, "Metrics/BlockLength: Block has too many lines. [35/25]", 3885176914], - [1368, 3, 1252, "Metrics/BlockLength: Block has too many lines. [28/25]", 4206068435], - [1407, 3, 1278, "Metrics/BlockLength: Block has too many lines. [28/25]", 1372687996], - [1446, 3, 1265, "Metrics/BlockLength: Block has too many lines. [28/25]", 3208600846], - [1485, 3, 1265, "Metrics/BlockLength: Block has too many lines. [28/25]", 212464082], - [1524, 3, 1262, "Metrics/BlockLength: Block has too many lines. [28/25]", 4277366491] - ], - "spec/rbs/merge_spec.rb:3352331478": [ - [5, 1, 1389, "Metrics/BlockLength: Block has too many lines. [37/25]", 373922011], - [10, 3, 1270, "Metrics/BlockLength: Block has too many lines. [32/25]", 2567886247] - ] -} diff --git a/gems/rbs-merge/Gemfile b/gems/rbs-merge/Gemfile index 6adb7645e..83096ab88 100644 --- a/gems/rbs-merge/Gemfile +++ b/gems/rbs-merge/Gemfile @@ -192,6 +192,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/rbs-merge/Gemfile.lock b/gems/rbs-merge/Gemfile.lock index 2c04bf5a1..d5b6f3b7d 100644 --- a/gems/rbs-merge/Gemfile.lock +++ b/gems/rbs-merge/Gemfile.lock @@ -275,6 +275,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -294,6 +310,9 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) commonmarker (2.9.0-x86_64-linux) concurrent-ruby (1.3.7) date (3.5.1) @@ -303,7 +322,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -358,18 +376,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -531,22 +538,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -652,9 +655,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.3, >= 2.3.7) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -720,7 +723,10 @@ CHECKSUMS citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 @@ -728,7 +734,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -752,7 +757,7 @@ CHECKSUMS kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -761,7 +766,7 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.0) - markly (0.16.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f @@ -824,15 +829,13 @@ CHECKSUMS ruby_engine (2.0.3) sha256=ca2ae7def8cfcdc2bfb6a186d36d5d59c8b403245dc0256c3802b767fa278aaa ruby_version (1.0.3) sha256=5930f9950746b7e6c973184398ee364ee7440b170fef7922b9f5cdf317f1ccb5 rust-merge (7.1.0) - service_actor (3.9.4) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 @@ -847,9 +850,9 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) - toml-rb (4.2.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f diff --git a/gems/rbs-merge/lib/rbs/merge/version.rb b/gems/rbs-merge/lib/rbs/merge/version.rb index a96a21ddc..8e09fbec5 100644 --- a/gems/rbs-merge/lib/rbs/merge/version.rb +++ b/gems/rbs-merge/lib/rbs/merge/version.rb @@ -3,7 +3,7 @@ module Rbs module Merge module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/rbs-merge/rbs-merge.gemspec b/gems/rbs-merge/rbs-merge.gemspec index 0f7a1c47f..90f0b88ab 100644 --- a/gems/rbs-merge/rbs-merge.gemspec +++ b/gems/rbs-merge/rbs-merge.gemspec @@ -9,47 +9,47 @@ Gem::Specification.new do |spec| spec.name = 'rbs-merge' spec.version = Module.new.tap { |mod| Kernel.load("#{__dir__}/lib/rbs/merge/version.rb", mod) }::Rbs::Merge::Version::VERSION - spec.authors = ['Peter H. Boling'] - spec.email = ['floss@galtzo.com'] + spec.authors = ["Peter H. Boling"] + spec.email = ["floss@galtzo.com"] spec.summary = '☯️ Structured Merge RBS analysis and merge for Ruby' spec.description = '☯️ RBS declaration, comment, freeze-block, and template merge behavior for Structured Merge.' spec.homepage = 'https://github.com/structuredmerge/structuredmerge-ruby' - spec.licenses = ['AGPL-3.0-only', 'PolyForm-Small-Business-1.0.0'] - spec.required_ruby_version = '>= 4.0.0' + spec.licenses = ["AGPL-3.0-only", "PolyForm-Small-Business-1.0.0"] + spec.required_ruby_version = ">= 4.0.0" # 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') - user_cert = "certs/#{ENV.fetch('GEM_CERT_USER', ENV['USER'])}.pem" + unless ENV.include?("SKIP_GEM_SIGNING") + user_cert = "certs/#{ENV.fetch("GEM_CERT_USER", ENV["USER"])}.pem" cert_file_path = File.join(__dir__, user_cert) - cert_chain = cert_file_path.split(',') + cert_chain = cert_file_path.split(",") cert_chain.select! { |fp| File.exist?(fp) } if cert_file_path && cert_chain.any? spec.cert_chain = cert_chain - if $PROGRAM_NAME.end_with?('gem') && ARGV[0] == 'build' - spec.signing_key = File.join(Gem.user_home, '.ssh', 'gem-private_key.pem') + if $PROGRAM_NAME.end_with?("gem") && ARGV[0] == "build" + spec.signing_key = File.join(Gem.user_home, ".ssh", "gem-private_key.pem") end end end - spec.metadata['homepage_uri'] = 'https://structuredmerge.org' - spec.metadata['source_code_uri'] = "#{spec.homepage}/tree/v#{spec.version}" - spec.metadata['changelog_uri'] = "#{spec.homepage}/blob/v#{spec.version}/CHANGELOG.md" - spec.metadata['bug_tracker_uri'] = "#{spec.homepage}/issues" - spec.metadata['documentation_uri'] = "https://www.rubydoc.info/gems/#{spec.name}/#{spec.version}" - spec.metadata['funding_uri'] = 'https://github.com/sponsors/pboling' - spec.metadata['wiki_uri'] = "#{spec.homepage}/wiki" - spec.metadata['news_uri'] = "https://www.railsbling.com/tags/#{spec.name}" - spec.metadata['discord_uri'] = 'https://discord.gg/3qme4XHNKN' - spec.metadata['rubygems_mfa_required'] = 'true' + spec.metadata["homepage_uri"] = "https://structuredmerge.org" + spec.metadata["source_code_uri"] = "#{spec.homepage}/tree/v#{spec.version}" + spec.metadata["changelog_uri"] = "#{spec.homepage}/blob/v#{spec.version}/CHANGELOG.md" + spec.metadata["bug_tracker_uri"] = "#{spec.homepage}/issues" + spec.metadata["documentation_uri"] = "https://www.rubydoc.info/gems/#{spec.name}/#{spec.version}" + spec.metadata["funding_uri"] = "https://github.com/sponsors/pboling" + spec.metadata["wiki_uri"] = "#{spec.homepage}/wiki" + spec.metadata["news_uri"] = "https://www.railsbling.com/tags/#{spec.name}" + spec.metadata["discord_uri"] = "https://discord.gg/3qme4XHNKN" + spec.metadata["rubygems_mfa_required"] = "true" enumerate_package_files = lambda do |root| - Dir.glob(File.join(root, '**', '*'), File::FNM_DOTMATCH).select do |path| - File.file?(path) && !['.', '..'].include?(File.basename(path)) + Dir.glob(File.join(root, "**", "*"), File::FNM_DOTMATCH).select do |path| + File.file?(path) && ![".", ".."].include?(File.basename(path)) end end package_metadata_files = %w[ @@ -69,17 +69,17 @@ Gem::Specification.new do |spec| *enumerate_package_files.call('exe') ] spec.rdoc_options += [ - '--title', + "--title", "#{spec.name} - #{spec.summary}", - '--main', - 'README.md', - '--exclude', - '^sig/', - '--line-numbers', - '--inline-source', - '--quiet' + "--main", + "README.md", + "--exclude", + "^sig/", + "--line-numbers", + "--inline-source", + "--quiet" ] - spec.bindir = 'exe' + spec.bindir = "exe" # Listed files are the relative paths from bindir above. spec.executables = [] @@ -89,13 +89,13 @@ Gem::Specification.new do |spec| # rbs-merge will then preserve content between those markers across template runs. # kettle-jem:unfreeze - spec.require_paths = ['lib'] + spec.require_paths = ["lib"] # Utilities spec.add_dependency 'ast-merge', "= #{spec.version}" spec.add_dependency 'rbs', '>= 3.10' spec.add_dependency 'tree_haver', "= #{spec.version}" - spec.add_dependency('version_gem', '~> 1.1', '>= 1.1.14') # ruby >= 2.2.0 + spec.add_dependency("version_gem", "~> 1.1", ">= 1.1.14") # ruby >= 2.2.0 # NOTE: It is preferable to list development dependencies in the gemspec due to increased # visibility and discoverability. @@ -111,26 +111,27 @@ Gem::Specification.new do |spec| # and preferably a modular one (see gemfiles/modular/*.gemfile). # Dev, Test, & Release Tasks - spec.add_development_dependency('kettle-dev', '~> 2.3', '>= 2.3.7') # ruby >= 4.0.0 + spec.add_development_dependency("kettle-dev", "~> 2.3", ">= 2.3.7") # ruby >= 4.0.0 # Security - spec.add_development_dependency('bundler-audit', '~> 0.9.3') # ruby >= 2.0.0 + spec.add_development_dependency("bundler-audit", "~> 0.9.3") # ruby >= 2.0.0 # Tasks - spec.add_development_dependency('rake', '~> 13.0') # ruby >= 2.2.0 + spec.add_development_dependency("rake", "~> 13.0") # ruby >= 2.2.0 # Debugging - spec.add_development_dependency('require_bench', '~> 1.0', '>= 1.0.4') # ruby >= 2.2.0 + spec.add_development_dependency("require_bench", "~> 1.0", ">= 1.0.4") # ruby >= 2.2.0 # Testing - spec.add_development_dependency('appraisal2', '~> 3.1', '>= 3.1.4') # ruby >= 1.8.7, for testing against multiple versions of dependencies - spec.add_development_dependency('kettle-test', '~> 2.0', '>= 2.0.11') # ruby >= 4.0.0 - spec.add_development_dependency('turbo_tests2', '~> 3.1', '>= 3.1.14') # ruby >= 2.4.0, default kettle-test runner + spec.add_development_dependency("appraisal2", "~> 3.1", ">= 3.1.4") # ruby >= 1.8.7, for testing against multiple versions of dependencies + spec.add_development_dependency("kettle-test", "~> 2.0", ">= 2.0.11") # ruby >= 4.0.0 + spec.add_development_dependency("turbo_tests2", "~> 3.1", ">= 3.1.14") # ruby >= 2.4.0, default kettle-test runner # Releasing - spec.add_development_dependency('ruby-progressbar', '~> 1.13') # ruby >= 0 - spec.add_development_dependency('stone_checksums', '~> 1.0', '>= 1.0.6') # ruby >= 2.2.0 + spec.add_development_dependency("ruby-progressbar", "~> 1.13") # ruby >= 0 + spec.add_development_dependency("stone_checksums", "~> 1.0", ">= 1.0.6") # ruby >= 2.2.0 # 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.4') # ruby >= 2.4 + spec.add_development_dependency("gitmoji-regex", "~> 2.0", ">= 2.0.4") # ruby >= 2.4 + end From a4ec5359bf56237e010b2c7dd248ebded0918b1d Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:23:21 -0600 Subject: [PATCH 162/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/bash-merge/Gemfile.lock | 378 ++---------------------- gems/rbs-merge/lib/rbs/merge/version.rb | 2 +- gems/rbs-merge/rbs-merge.gemspec | 85 +++--- 3 files changed, 72 insertions(+), 393 deletions(-) diff --git a/gems/bash-merge/Gemfile.lock b/gems/bash-merge/Gemfile.lock index 00735ccec..e955f4ae1 100644 --- a/gems/bash-merge/Gemfile.lock +++ b/gems/bash-merge/Gemfile.lock @@ -17,39 +17,7 @@ PATH version_gem (~> 1.1, >= 1.1.14) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -58,193 +26,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -252,45 +34,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -310,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -324,6 +61,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -379,6 +117,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -397,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -537,23 +283,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -587,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +381,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.1, >= 3.1.4) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.3, >= 2.3.7) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,62 +407,41 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.1, >= 3.1.14) - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +454,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +481,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +492,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,19 +519,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -857,19 +543,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -877,7 +558,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/rbs-merge/lib/rbs/merge/version.rb b/gems/rbs-merge/lib/rbs/merge/version.rb index 8e09fbec5..a96a21ddc 100644 --- a/gems/rbs-merge/lib/rbs/merge/version.rb +++ b/gems/rbs-merge/lib/rbs/merge/version.rb @@ -3,7 +3,7 @@ module Rbs module Merge module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/rbs-merge/rbs-merge.gemspec b/gems/rbs-merge/rbs-merge.gemspec index 90f0b88ab..0f7a1c47f 100644 --- a/gems/rbs-merge/rbs-merge.gemspec +++ b/gems/rbs-merge/rbs-merge.gemspec @@ -9,47 +9,47 @@ Gem::Specification.new do |spec| spec.name = 'rbs-merge' spec.version = Module.new.tap { |mod| Kernel.load("#{__dir__}/lib/rbs/merge/version.rb", mod) }::Rbs::Merge::Version::VERSION - spec.authors = ["Peter H. Boling"] - spec.email = ["floss@galtzo.com"] + spec.authors = ['Peter H. Boling'] + spec.email = ['floss@galtzo.com'] spec.summary = '☯️ Structured Merge RBS analysis and merge for Ruby' spec.description = '☯️ RBS declaration, comment, freeze-block, and template merge behavior for Structured Merge.' spec.homepage = 'https://github.com/structuredmerge/structuredmerge-ruby' - spec.licenses = ["AGPL-3.0-only", "PolyForm-Small-Business-1.0.0"] - spec.required_ruby_version = ">= 4.0.0" + spec.licenses = ['AGPL-3.0-only', 'PolyForm-Small-Business-1.0.0'] + spec.required_ruby_version = '>= 4.0.0' # 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") - user_cert = "certs/#{ENV.fetch("GEM_CERT_USER", ENV["USER"])}.pem" + unless ENV.include?('SKIP_GEM_SIGNING') + user_cert = "certs/#{ENV.fetch('GEM_CERT_USER', ENV['USER'])}.pem" cert_file_path = File.join(__dir__, user_cert) - cert_chain = cert_file_path.split(",") + cert_chain = cert_file_path.split(',') cert_chain.select! { |fp| File.exist?(fp) } if cert_file_path && cert_chain.any? spec.cert_chain = cert_chain - if $PROGRAM_NAME.end_with?("gem") && ARGV[0] == "build" - spec.signing_key = File.join(Gem.user_home, ".ssh", "gem-private_key.pem") + if $PROGRAM_NAME.end_with?('gem') && ARGV[0] == 'build' + spec.signing_key = File.join(Gem.user_home, '.ssh', 'gem-private_key.pem') end end end - spec.metadata["homepage_uri"] = "https://structuredmerge.org" - spec.metadata["source_code_uri"] = "#{spec.homepage}/tree/v#{spec.version}" - spec.metadata["changelog_uri"] = "#{spec.homepage}/blob/v#{spec.version}/CHANGELOG.md" - spec.metadata["bug_tracker_uri"] = "#{spec.homepage}/issues" - spec.metadata["documentation_uri"] = "https://www.rubydoc.info/gems/#{spec.name}/#{spec.version}" - spec.metadata["funding_uri"] = "https://github.com/sponsors/pboling" - spec.metadata["wiki_uri"] = "#{spec.homepage}/wiki" - spec.metadata["news_uri"] = "https://www.railsbling.com/tags/#{spec.name}" - spec.metadata["discord_uri"] = "https://discord.gg/3qme4XHNKN" - spec.metadata["rubygems_mfa_required"] = "true" + spec.metadata['homepage_uri'] = 'https://structuredmerge.org' + spec.metadata['source_code_uri'] = "#{spec.homepage}/tree/v#{spec.version}" + spec.metadata['changelog_uri'] = "#{spec.homepage}/blob/v#{spec.version}/CHANGELOG.md" + spec.metadata['bug_tracker_uri'] = "#{spec.homepage}/issues" + spec.metadata['documentation_uri'] = "https://www.rubydoc.info/gems/#{spec.name}/#{spec.version}" + spec.metadata['funding_uri'] = 'https://github.com/sponsors/pboling' + spec.metadata['wiki_uri'] = "#{spec.homepage}/wiki" + spec.metadata['news_uri'] = "https://www.railsbling.com/tags/#{spec.name}" + spec.metadata['discord_uri'] = 'https://discord.gg/3qme4XHNKN' + spec.metadata['rubygems_mfa_required'] = 'true' enumerate_package_files = lambda do |root| - Dir.glob(File.join(root, "**", "*"), File::FNM_DOTMATCH).select do |path| - File.file?(path) && ![".", ".."].include?(File.basename(path)) + Dir.glob(File.join(root, '**', '*'), File::FNM_DOTMATCH).select do |path| + File.file?(path) && !['.', '..'].include?(File.basename(path)) end end package_metadata_files = %w[ @@ -69,17 +69,17 @@ Gem::Specification.new do |spec| *enumerate_package_files.call('exe') ] spec.rdoc_options += [ - "--title", + '--title', "#{spec.name} - #{spec.summary}", - "--main", - "README.md", - "--exclude", - "^sig/", - "--line-numbers", - "--inline-source", - "--quiet" + '--main', + 'README.md', + '--exclude', + '^sig/', + '--line-numbers', + '--inline-source', + '--quiet' ] - spec.bindir = "exe" + spec.bindir = 'exe' # Listed files are the relative paths from bindir above. spec.executables = [] @@ -89,13 +89,13 @@ Gem::Specification.new do |spec| # rbs-merge will then preserve content between those markers across template runs. # kettle-jem:unfreeze - spec.require_paths = ["lib"] + spec.require_paths = ['lib'] # Utilities spec.add_dependency 'ast-merge', "= #{spec.version}" spec.add_dependency 'rbs', '>= 3.10' spec.add_dependency 'tree_haver', "= #{spec.version}" - spec.add_dependency("version_gem", "~> 1.1", ">= 1.1.14") # ruby >= 2.2.0 + spec.add_dependency('version_gem', '~> 1.1', '>= 1.1.14') # ruby >= 2.2.0 # NOTE: It is preferable to list development dependencies in the gemspec due to increased # visibility and discoverability. @@ -111,27 +111,26 @@ Gem::Specification.new do |spec| # and preferably a modular one (see gemfiles/modular/*.gemfile). # Dev, Test, & Release Tasks - spec.add_development_dependency("kettle-dev", "~> 2.3", ">= 2.3.7") # ruby >= 4.0.0 + spec.add_development_dependency('kettle-dev', '~> 2.3', '>= 2.3.7') # ruby >= 4.0.0 # Security - spec.add_development_dependency("bundler-audit", "~> 0.9.3") # ruby >= 2.0.0 + spec.add_development_dependency('bundler-audit', '~> 0.9.3') # ruby >= 2.0.0 # Tasks - spec.add_development_dependency("rake", "~> 13.0") # ruby >= 2.2.0 + spec.add_development_dependency('rake', '~> 13.0') # ruby >= 2.2.0 # Debugging - spec.add_development_dependency("require_bench", "~> 1.0", ">= 1.0.4") # ruby >= 2.2.0 + spec.add_development_dependency('require_bench', '~> 1.0', '>= 1.0.4') # ruby >= 2.2.0 # Testing - spec.add_development_dependency("appraisal2", "~> 3.1", ">= 3.1.4") # ruby >= 1.8.7, for testing against multiple versions of dependencies - spec.add_development_dependency("kettle-test", "~> 2.0", ">= 2.0.11") # ruby >= 4.0.0 - spec.add_development_dependency("turbo_tests2", "~> 3.1", ">= 3.1.14") # ruby >= 2.4.0, default kettle-test runner + spec.add_development_dependency('appraisal2', '~> 3.1', '>= 3.1.4') # ruby >= 1.8.7, for testing against multiple versions of dependencies + spec.add_development_dependency('kettle-test', '~> 2.0', '>= 2.0.11') # ruby >= 4.0.0 + spec.add_development_dependency('turbo_tests2', '~> 3.1', '>= 3.1.14') # ruby >= 2.4.0, default kettle-test runner # Releasing - spec.add_development_dependency("ruby-progressbar", "~> 1.13") # ruby >= 0 - spec.add_development_dependency("stone_checksums", "~> 1.0", ">= 1.0.6") # ruby >= 2.2.0 + spec.add_development_dependency('ruby-progressbar', '~> 1.13') # ruby >= 0 + spec.add_development_dependency('stone_checksums', '~> 1.0', '>= 1.0.6') # ruby >= 2.2.0 # 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.4") # ruby >= 2.4 - + spec.add_development_dependency('gitmoji-regex', '~> 2.0', '>= 2.0.4') # ruby >= 2.4 end From facc68820a9868552f8b5d3008e72f85a8224cb5 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:23:29 -0600 Subject: [PATCH 163/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/bash-merge/Gemfile.lock | 30 +- gems/dotenv-merge/Gemfile.lock | 30 +- gems/rbs-merge/.rubocop_gradual.lock | 402 +++++++++++++++++++++++++++ gems/rbs-merge/Gemfile.lock | 373 ++----------------------- 4 files changed, 451 insertions(+), 384 deletions(-) create mode 100644 gems/rbs-merge/.rubocop_gradual.lock diff --git a/gems/bash-merge/Gemfile.lock b/gems/bash-merge/Gemfile.lock index e955f4ae1..6fdf80d44 100644 --- a/gems/bash-merge/Gemfile.lock +++ b/gems/bash-merge/Gemfile.lock @@ -16,24 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -45,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -335,6 +322,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,7 +373,6 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.1, >= 3.1.4) - ast-merge! bash-merge! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) @@ -411,7 +402,6 @@ DEPENDENCIES standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) - tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.1, >= 3.1.14) yaml-converter (~> 0.1) diff --git a/gems/dotenv-merge/Gemfile.lock b/gems/dotenv-merge/Gemfile.lock index 15b0c9cc6..a05c429e9 100644 --- a/gems/dotenv-merge/Gemfile.lock +++ b/gems/dotenv-merge/Gemfile.lock @@ -16,24 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -45,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -335,6 +322,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,7 +373,6 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.1, >= 3.1.4) - ast-merge! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) debug (>= 1.1) @@ -411,7 +402,6 @@ DEPENDENCIES standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) - tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.1, >= 3.1.14) yaml-converter (~> 0.1) diff --git a/gems/rbs-merge/.rubocop_gradual.lock b/gems/rbs-merge/.rubocop_gradual.lock new file mode 100644 index 000000000..3d9c5b1c7 --- /dev/null +++ b/gems/rbs-merge/.rubocop_gradual.lock @@ -0,0 +1,402 @@ +{ + ".simplecov:2483172942": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:3295679373": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/rbs-merge.rb:334311121": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`rbs-merge.rb`) should use snake_case.", 5381], + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "lib/rbs/merge.rb:1873081658": [ + [17, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Rbs::Merge`.", 2866359175], + [103, 7, 1197, "Metrics/MethodLength: Method has too many lines. [22/10]", 564456261] + ], + "lib/rbs/merge/backends/rbs_backend.rb:2885387755": [ + [48, 11, 555, "Metrics/MethodLength: Method has too many lines. [13/10]", 2078142514], + [81, 11, 658, "Metrics/MethodLength: Method has too many lines. [11/10]", 324484142], + [172, 11, 527, "Metrics/MethodLength: Method has too many lines. [14/10]", 631898529], + [240, 15, 11, "Naming/PredicatePrefix: Rename `has_errors?` to `errors?`.", 1181419252], + [263, 9, 9332, "Metrics/ClassLength: Class has too many lines. [135/100]", 1906483935], + [290, 11, 1914, "Metrics/AbcSize: Assignment Branch Condition size for `type` is too high. [<0, 9, 23> 24.7/17]", 3636991776], + [290, 11, 1914, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `type` is too high. [24/7]", 3636991776], + [290, 11, 1914, "Metrics/MethodLength: Method has too many lines. [28/10]", 3636991776], + [363, 11, 489, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `end_point` is too high. [8/7]", 844861810], + [504, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] + ], + "lib/rbs/merge/comment_tracker.rb:1938176986": [ + [28, 7, 767, "Metrics/MethodLength: Method has too many lines. [15/10]", 752916075], + [60, 7, 416, "Metrics/MethodLength: Method has too many lines. [12/10]", 2715172162] + ], + "lib/rbs/merge/conflict_resolver.rb:1305396962": [ + [16, 5, 11045, "Metrics/ClassLength: Class has too many lines. [174/100]", 330576807], + [44, 7, 1614, "Metrics/MethodLength: Method has too many lines. [23/10]", 1004723330], + [44, 45, 14, "Lint/UnusedMethodArgument: Unused method argument - `template_index`.", 1809801172], + [44, 62, 10, "Lint/UnusedMethodArgument: Unused method argument - `dest_index`.", 2703999490], + [122, 7, 717, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `resolve_preference` is too high. [8/7]", 2783267415], + [122, 7, 717, "Metrics/MethodLength: Method has too many lines. [12/10]", 2783267415], + [156, 7, 949, "Metrics/AbcSize: Assignment Branch Condition size for `extract_declaration_text` is too high. [<9, 19, 14> 25.26/17]", 4132302840], + [156, 7, 949, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_declaration_text` is too high. [13/7]", 4132302840], + [156, 7, 949, "Metrics/MethodLength: Method has too many lines. [18/10]", 4132302840], + [156, 7, 949, "Metrics/PerceivedComplexity: Perceived complexity for `extract_declaration_text` is too high. [14/8]", 4132302840], + [181, 39, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [279, 7, 565, "Metrics/MethodLength: Method has too many lines. [13/10]", 375776463], + [279, 11, 12, "Naming/PredicatePrefix: Rename `has_members?` to `members?`.", 496913372] + ], + "lib/rbs/merge/file_aligner.rb:157117932": [ + [32, 7, 128, "Lint/UselessMethodDefinition: Useless method definition detected.", 4031328363] + ], + "lib/rbs/merge/file_analysis.rb:4205990536": [ + [23, 5, 20642, "Metrics/ClassLength: Class has too many lines. [403/100]", 3271819659], + [59, 7, 1146, "Metrics/MethodLength: Method has too many lines. [20/10]", 1625645012], + [191, 7, 398, "Metrics/MethodLength: Method has too many lines. [12/10]", 4157341657], + [211, 7, 719, "Metrics/MethodLength: Method has too many lines. [13/10]", 2571132513], + [235, 7, 965, "Metrics/AbcSize: Assignment Branch Condition size for `compute_tree_sitter_signature` is too high. [<3, 5, 21> 21.79/17]", 2963702282], + [235, 7, 965, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_tree_sitter_signature` is too high. [22/7]", 2963702282], + [235, 7, 965, "Metrics/MethodLength: Method has too many lines. [26/10]", 2963702282], + [235, 7, 965, "Metrics/PerceivedComplexity: Perceived complexity for `compute_tree_sitter_signature` is too high. [16/8]", 2963702282], + [269, 7, 996, "Metrics/AbcSize: Assignment Branch Condition size for `extract_tree_sitter_node_name` is too high. [<5, 16, 10> 19.52/17]", 300940102], + [269, 7, 996, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_tree_sitter_node_name` is too high. [11/7]", 300940102], + [269, 7, 996, "Metrics/MethodLength: Method has too many lines. [24/10]", 300940102], + [269, 7, 996, "Metrics/PerceivedComplexity: Perceived complexity for `extract_tree_sitter_node_name` is too high. [11/8]", 300940102], + [320, 7, 834, "Metrics/MethodLength: Method has too many lines. [16/10]", 658496547], + [380, 7, 1612, "Metrics/AbcSize: Assignment Branch Condition size for `extract_tree_sitter_declarations` is too high. [<8, 18, 11> 22.56/17]", 1899595676], + [380, 7, 1612, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_tree_sitter_declarations` is too high. [10/7]", 1899595676], + [380, 7, 1612, "Metrics/MethodLength: Method has too many lines. [23/10]", 1899595676], + [380, 7, 1612, "Metrics/PerceivedComplexity: Perceived complexity for `extract_tree_sitter_declarations` is too high. [11/8]", 1899595676], + [449, 7, 569, "Metrics/MethodLength: Method has too many lines. [13/10]", 210550095], + [471, 7, 1133, "Metrics/AbcSize: Assignment Branch Condition size for `build_freeze_blocks` is too high. [<7, 22, 6> 23.85/17]", 4016218974], + [471, 7, 1133, "Metrics/MethodLength: Method has too many lines. [29/10]", 4016218974], + [528, 7, 486, "Metrics/MethodLength: Method has too many lines. [12/10]", 618123864], + [528, 7, 486, "Metrics/PerceivedComplexity: Perceived complexity for `node_start_line` is too high. [9/8]", 618123864], + [545, 7, 472, "Metrics/MethodLength: Method has too many lines. [12/10]", 1339916888], + [545, 7, 472, "Metrics/PerceivedComplexity: Perceived complexity for `node_end_line` is too high. [9/8]", 1339916888], + [579, 7, 1868, "Metrics/AbcSize: Assignment Branch Condition size for `compute_rbs_gem_signature` is too high. [<0, 45, 23> 50.54/17]", 2652509672], + [579, 7, 1868, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_rbs_gem_signature` is too high. [23/7]", 2652509672], + [579, 7, 1868, "Metrics/MethodLength: Method has too many lines. [43/10]", 2652509672], + [579, 7, 1868, "Metrics/PerceivedComplexity: Perceived complexity for `compute_rbs_gem_signature` is too high. [9/8]", 2652509672] + ], + "lib/rbs/merge/freeze_node.rb:2942544870": [ + [34, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 201145846], + [39, 7, 577, "Metrics/MethodLength: Method has too many lines. [11/10]", 2189574632], + [39, 21, 186, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1006469938], + [78, 7, 1506, "Metrics/AbcSize: Assignment Branch Condition size for `validate_structure!` is too high. [<12, 12, 17> 24.02/17]", 1543687562], + [78, 7, 1506, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_structure!` is too high. [12/7]", 1543687562], + [78, 7, 1506, "Metrics/MethodLength: Method has too many lines. [25/10]", 1543687562], + [78, 7, 1506, "Metrics/PerceivedComplexity: Perceived complexity for `validate_structure!` is too high. [12/8]", 1543687562], + [150, 7, 891, "Metrics/AbcSize: Assignment Branch Condition size for `extract_node_name` is too high. [<4, 21, 12> 24.52/17]", 1223188123], + [150, 7, 891, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_node_name` is too high. [13/7]", 1223188123], + [150, 7, 891, "Metrics/MethodLength: Method has too many lines. [18/10]", 1223188123], + [150, 7, 891, "Metrics/PerceivedComplexity: Perceived complexity for `extract_node_name` is too high. [13/8]", 1223188123], + [162, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861336] + ], + "lib/rbs/merge/merge_result.rb:1707720872": [ + [18, 5, 15586, "Metrics/ClassLength: Class has too many lines. [276/100]", 817348545], + [89, 7, 966, "Metrics/MethodLength: Method has too many lines. [14/10]", 3349669346], + [176, 7, 1770, "Metrics/AbcSize: Assignment Branch Condition size for `extract_lines` is too high. [<15, 21, 16> 30.36/17]", 3951991352], + [176, 7, 1770, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_lines` is too high. [15/7]", 3951991352], + [176, 7, 1770, "Metrics/MethodLength: Method has too many lines. [29/10]", 3951991352], + [176, 7, 1770, "Metrics/PerceivedComplexity: Perceived complexity for `extract_lines` is too high. [16/8]", 3951991352], + [226, 44, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [232, 7, 606, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trailing_lines_for` is too high. [9/7]", 518209980], + [232, 7, 606, "Metrics/MethodLength: Method has too many lines. [13/10]", 518209980], + [232, 7, 606, "Metrics/PerceivedComplexity: Perceived complexity for `trailing_lines_for` is too high. [10/8]", 518209980], + [233, 47, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [266, 33, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [271, 7, 682, "Metrics/AbcSize: Assignment Branch Condition size for `deduplicate_leading_comment_overlap` is too high. [<4, 15, 9> 17.94/17]", 4227245480], + [271, 7, 682, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `deduplicate_leading_comment_overlap` is too high. [8/7]", 4227245480], + [271, 7, 682, "Metrics/MethodLength: Method has too many lines. [11/10]", 4227245480], + [335, 23, 24, "Style/SafeNavigation: Use safe navigation (`&.`) instead of checking if an object exists before calling the method.", 1487466207], + [371, 7, 893, "Metrics/MethodLength: Method has too many lines. [11/10]", 1066420963], + [371, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 2582953496] + ], + "lib/rbs/merge/node_type_normalizer.rb:2788764230": [ + [65, 5, 10747, "Metrics/ModuleLength: Module has too many lines. [199/100]", 63560324], + [250, 9, 693, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonical_type_for_node` is too high. [9/7]", 908800634], + [250, 9, 693, "Metrics/MethodLength: Method has too many lines. [16/10]", 908800634], + [250, 9, 693, "Metrics/PerceivedComplexity: Perceived complexity for `canonical_type_for_node` is too high. [9/8]", 908800634], + [323, 9, 689, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `refine_tree_sitter_attribute_type` is too high. [9/7]", 2340352499], + [323, 9, 689, "Metrics/MethodLength: Method has too many lines. [13/10]", 2340352499], + [323, 9, 689, "Metrics/PerceivedComplexity: Perceived complexity for `refine_tree_sitter_attribute_type` is too high. [9/8]", 2340352499], + [343, 9, 475, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `refine_tree_sitter_variable_type` is too high. [8/7]", 536330497], + [343, 9, 475, "Metrics/MethodLength: Method has too many lines. [14/10]", 536330497] + ], + "lib/rbs/merge/node_wrapper.rb:1434186839": [ + [26, 5, 14933, "Metrics/ClassLength: Class has too many lines. [344/100]", 4139761414], + [37, 17, 84, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 366036293], + [264, 7, 831, "Metrics/AbcSize: Assignment Branch Condition size for `text` is too high. [<3, 32, 20> 37.85/17]", 980238327], + [264, 7, 831, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `text` is too high. [18/7]", 980238327], + [264, 7, 831, "Metrics/MethodLength: Method has too many lines. [18/10]", 980238327], + [264, 7, 831, "Metrics/PerceivedComplexity: Perceived complexity for `text` is too high. [20/8]", 980238327], + [268, 47, 2, "Lint/SafeNavigationConsistency: Use `.` instead of unnecessary `&.`.", 5858765], + [280, 22, 14, "Style/NumericPredicate: Use `start_line.positive?` instead of `start_line > 0`.", 792111162], + [301, 7, 1209, "Metrics/AbcSize: Assignment Branch Condition size for `signature` is too high. [<1, 25, 20> 32.03/17]", 4281557215], + [301, 7, 1209, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `signature` is too high. [21/7]", 4281557215], + [301, 7, 1209, "Metrics/MethodLength: Method has too many lines. [45/10]", 4281557215], + [351, 7, 384, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `method_kind` is too high. [8/7]", 563626808], + [351, 7, 384, "Metrics/PerceivedComplexity: Perceived complexity for `method_kind` is too high. [9/8]", 563626808], + [423, 7, 935, "Metrics/MethodLength: Method has too many lines. [21/10]", 3557799127], + [469, 7, 667, "Metrics/AbcSize: Assignment Branch Condition size for `extract_child_texts` is too high. [<6, 16, 8> 18.87/17]", 1979652559], + [469, 7, 667, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_child_texts` is too high. [9/7]", 1979652559], + [469, 7, 667, "Metrics/MethodLength: Method has too many lines. [12/10]", 1979652559], + [469, 7, 667, "Metrics/PerceivedComplexity: Perceived complexity for `extract_child_texts` is too high. [9/8]", 1979652559], + [487, 7, 583, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_tree_sitter_visibility_kind` is too high. [9/7]", 2002684122], + [487, 7, 583, "Metrics/MethodLength: Method has too many lines. [13/10]", 2002684122], + [487, 7, 583, "Metrics/PerceivedComplexity: Perceived complexity for `extract_tree_sitter_visibility_kind` is too high. [9/8]", 2002684122], + [532, 7, 557, "Metrics/MethodLength: Method has too many lines. [14/10]", 1753294094] + ], + "lib/rbs/merge/smart_merger.rb:4114819804": [ + [43, 5, 38956, "Metrics/ClassLength: Class has too many lines. [785/100]", 3732361716], + [85, 7, 1188, "Metrics/MethodLength: Method has too many lines. [17/10]", 2908064588], + [85, 21, 447, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 1344979847], + [181, 7, 805, "Metrics/AbcSize: Assignment Branch Condition size for `perform_merge` is too high. [<6, 15, 8> 18.03/17]", 1638854701], + [181, 7, 805, "Metrics/MethodLength: Method has too many lines. [14/10]", 1638854701], + [207, 7, 572, "Metrics/MethodLength: Method has too many lines. [15/10]", 3471574631], + [290, 7, 621, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `root_boundary_lines_for` is too high. [9/7]", 354795708], + [290, 7, 621, "Metrics/PerceivedComplexity: Perceived complexity for `root_boundary_lines_for` is too high. [9/8]", 354795708], + [291, 34, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [323, 9, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 748374760], + [326, 7, 794, "Metrics/AbcSize: Assignment Branch Condition size for `root_boundary_range` is too high. [<4, 22, 11> 24.92/17]", 2546634651], + [326, 7, 794, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `root_boundary_range` is too high. [10/7]", 2546634651], + [326, 7, 794, "Metrics/MethodLength: Method has too many lines. [19/10]", 2546634651], + [326, 7, 794, "Metrics/PerceivedComplexity: Perceived complexity for `root_boundary_range` is too high. [11/8]", 2546634651], + [365, 7, 1030, "Metrics/AbcSize: Assignment Branch Condition size for `process_match` is too high. [<1, 22, 7> 23.11/17]", 333057092], + [365, 7, 1030, "Metrics/MethodLength: Method has too many lines. [27/10]", 333057092], + [428, 7, 1830, "Metrics/AbcSize: Assignment Branch Condition size for `removed_declaration_comment_lines` is too high. [<13, 31, 25> 41.89/17]", 276966259], + [428, 7, 1830, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `removed_declaration_comment_lines` is too high. [21/7]", 276966259], + [428, 7, 1830, "Metrics/MethodLength: Method has too many lines. [38/10]", 276966259], + [428, 7, 1830, "Metrics/PerceivedComplexity: Perceived complexity for `removed_declaration_comment_lines` is too high. [24/8]", 276966259], + [476, 7, 675, "Metrics/MethodLength: Method has too many lines. [13/10]", 1415352570], + [502, 7, 2604, "Metrics/AbcSize: Assignment Branch Condition size for `reconstruct_declaration_with_merged_members` is too high. [<19, 23, 22> 37.07/17]", 1250076424], + [502, 7, 2604, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `reconstruct_declaration_with_merged_members` is too high. [17/7]", 1250076424], + [502, 7, 2604, "Metrics/MethodLength: Method has too many lines. [49/10]", 1250076424], + [502, 7, 2604, "Metrics/PerceivedComplexity: Perceived complexity for `reconstruct_declaration_with_merged_members` is too high. [17/8]", 1250076424], + [540, 20, 46, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 1375387925], + [555, 9, 210, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 3589424565], + [565, 7, 1271, "Metrics/AbcSize: Assignment Branch Condition size for `recursive_body_lines_for_declaration` is too high. [<8, 23, 9> 25.96/17]", 2123349984], + [565, 7, 1271, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `recursive_body_lines_for_declaration` is too high. [10/7]", 2123349984], + [565, 7, 1271, "Metrics/MethodLength: Method has too many lines. [18/10]", 2123349984], + [565, 7, 1271, "Metrics/PerceivedComplexity: Perceived complexity for `recursive_body_lines_for_declaration` is too high. [10/8]", 2123349984], + [565, 47, 139, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 652517575], + [591, 7, 1910, "Metrics/AbcSize: Assignment Branch Condition size for `merge_member_lines` is too high. [<4, 35, 12> 37.22/17]", 1631109354], + [591, 7, 1910, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_member_lines` is too high. [11/7]", 1631109354], + [591, 7, 1910, "Metrics/MethodLength: Method has too many lines. [42/10]", 1631109354], + [592, 9, 1837, "Metrics/BlockLength: Block has too many lines. [40/25]", 3339652106], + [638, 7, 1779, "Metrics/AbcSize: Assignment Branch Condition size for `align_member_lists` is too high. [<14, 26, 14> 32.68/17]", 3585753868], + [638, 7, 1779, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `align_member_lists` is too high. [14/7]", 3585753868], + [638, 7, 1779, "Metrics/MethodLength: Method has too many lines. [49/10]", 3585753868], + [638, 7, 1779, "Metrics/PerceivedComplexity: Perceived complexity for `align_member_lists` is too high. [15/8]", 3585753868], + [745, 7, 605, "Metrics/AbcSize: Assignment Branch Condition size for `split_top_level_return_type` is too high. [<7, 14, 10> 18.57/17]", 1731525207], + [745, 7, 605, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split_top_level_return_type` is too high. [8/7]", 1731525207], + [745, 7, 605, "Metrics/MethodLength: Method has too many lines. [17/10]", 1731525207], + [782, 7, 1684, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_statement_lines_with_leading_comments` is too high. [8/7]", 3625004207], + [782, 7, 1684, "Metrics/MethodLength: Method has too many lines. [29/10]", 3625004207], + [782, 7, 1684, "Metrics/PerceivedComplexity: Perceived complexity for `extract_statement_lines_with_leading_comments` is too high. [10/8]", 3625004207], + [869, 33, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [874, 7, 840, "Metrics/MethodLength: Method has too many lines. [15/10]", 3400690599], + [895, 39, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [982, 23, 24, "Style/SafeNavigation: Use safe navigation (`&.`) instead of checking if an object exists before calling the method.", 1487466207], + [998, 7, 1788, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_cross_source_preamble_prefixes` is too high. [<14, 21, 9> 26.8/17]", 3130187278], + [998, 7, 1788, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collapse_cross_source_preamble_prefixes` is too high. [9/7]", 3130187278], + [998, 7, 1788, "Metrics/MethodLength: Method has too many lines. [31/10]", 3130187278], + [998, 7, 1788, "Metrics/PerceivedComplexity: Perceived complexity for `collapse_cross_source_preamble_prefixes` is too high. [9/8]", 3130187278], + [1038, 7, 533, "Metrics/MethodLength: Method has too many lines. [15/10]", 4188914818] + ], + "rbs-merge.gemspec:395192785": [ + [126, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [128, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2105564149], + [134, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949] + ], + "spec/integration/reproducible_merge_spec.rb:4124333249": [ + [9, 1, 6937, "Metrics/BlockLength: Block has too many lines. [155/25]", 1482304086], + [14, 3, 4384, "Metrics/BlockLength: Block has too many lines. [85/25]", 628655161], + [15, 5, 3507, "Metrics/BlockLength: Block has too many lines. [65/25]", 2935184196], + [56, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858910], + [62, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 50415752], + [87, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1546684737] + ], + "spec/rbs/merge/comment_behavior_matrix_spec.rb:2666227529": [ + [14, 45, 6, "Lint/UnusedBlockArgument: Unused block argument - `inline`. If it's necessary, use `_` or `_inline` as an argument name to indicate that it won't be used.", 1605470060], + [18, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 253885993], + [19, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 1702591521] + ], + "spec/rbs/merge/comment_tracker_spec.rb:1831412931": [ + [5, 1, 14574, "Metrics/BlockLength: Block has too many lines. [306/25]", 1598998757], + [8, 3, 3272, "Metrics/BlockLength: Block has too many lines. [67/25]", 935176133], + [95, 3, 1130, "Metrics/BlockLength: Block has too many lines. [28/25]", 204252301], + [143, 3, 1704, "Metrics/BlockLength: Block has too many lines. [32/25]", 1579622084], + [209, 3, 5815, "Metrics/BlockLength: Block has too many lines. [112/25]", 433112678] + ], + "spec/rbs/merge/conflict_resolver_spec.rb:999961156": [ + [8, 1, 19854, "Metrics/BlockLength: Block has too many lines. [491/25]", 3942921818], + [9, 3, 1428, "Metrics/BlockLength: Block has too many lines. [36/25]", 529294185], + [56, 3, 1199, "Metrics/BlockLength: Block has too many lines. [28/25]", 73504201], + [93, 3, 1277, "Metrics/BlockLength: Block has too many lines. [29/25]", 595351018], + [190, 3, 7078, "Metrics/BlockLength: Block has too many lines. [149/25]", 3739681265], + [296, 5, 1646, "Metrics/BlockLength: Block has too many lines. [33/25]", 3128279135], + [302, 7, 1292, "Metrics/BlockLength: Block has too many lines. [27/25]", 729602127], + [404, 3, 4548, "Metrics/BlockLength: Block has too many lines. [114/25]", 2619563374], + [420, 5, 922, "Metrics/BlockLength: Block has too many lines. [26/25]", 3893264586], + [452, 5, 960, "Metrics/BlockLength: Block has too many lines. [26/25]", 3053707146] + ], + "spec/rbs/merge/file_aligner_spec.rb:2643720547": [ + [7, 1, 21476, "Metrics/BlockLength: Block has too many lines. [555/25]", 4145069110], + [65, 3, 1123, "Metrics/BlockLength: Block has too many lines. [28/25]", 1358831340], + [188, 3, 1226, "Metrics/BlockLength: Block has too many lines. [34/25]", 1337144492], + [246, 3, 4891, "Metrics/BlockLength: Block has too many lines. [152/25]", 125990895], + [436, 3, 1943, "Metrics/BlockLength: Block has too many lines. [34/25]", 4126970167], + [483, 3, 3944, "Metrics/BlockLength: Block has too many lines. [94/25]", 2604333848], + [565, 5, 1328, "Metrics/BlockLength: Block has too many lines. [27/25]", 1994971578] + ], + "spec/rbs/merge/file_analysis_spec.rb:952231308": [ + [15, 1, 54363, "Metrics/BlockLength: Block has too many lines. [1205/25]", 2485884639], + [16, 3, 1272, "Metrics/BlockLength: Block has too many lines. [38/25]", 1778989479], + [17, 5, 1210, "Metrics/BlockLength: Block has too many lines. [37/25]", 1755177515], + [67, 3, 1152, "Metrics/BlockLength: Block has too many lines. [33/25]", 2931980952], + [68, 5, 1083, "Metrics/BlockLength: Block has too many lines. [32/25]", 3589815947], + [136, 3, 982, "Metrics/BlockLength: Block has too many lines. [30/25]", 1355840781], + [137, 5, 929, "Metrics/BlockLength: Block has too many lines. [29/25]", 3738902933], + [200, 3, 1559, "Metrics/BlockLength: Block has too many lines. [30/25]", 3203356148], + [201, 5, 1493, "Metrics/BlockLength: Block has too many lines. [29/25]", 1389049628], + [860, 3, 2525, "Metrics/BlockLength: Block has too many lines. [42/25]", 2701315631], + [861, 5, 2455, "Metrics/BlockLength: Block has too many lines. [41/25]", 1293659790], + [884, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 193270906], + [919, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 115067835], + [948, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [954, 3, 3548, "Metrics/BlockLength: Block has too many lines. [59/25]", 2573657607], + [955, 5, 3497, "Metrics/BlockLength: Block has too many lines. [58/25]", 14776664], + [982, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085251945], + [1017, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2659900392], + [1038, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2659900392], + [1091, 3, 1750, "Metrics/BlockLength: Block has too many lines. [29/25]", 460836946], + [1092, 5, 1693, "Metrics/BlockLength: Block has too many lines. [28/25]", 1601111212], + [1135, 3, 1948, "Metrics/BlockLength: Block has too many lines. [41/25]", 4061538475], + [1136, 5, 1892, "Metrics/BlockLength: Block has too many lines. [40/25]", 4081702319], + [1195, 3, 2571, "Metrics/BlockLength: Block has too many lines. [55/25]", 3959149994], + [1265, 3, 2440, "Metrics/BlockLength: Block has too many lines. [52/25]", 2164819729], + [1332, 3, 2008, "Metrics/BlockLength: Block has too many lines. [39/25]", 609327574], + [1379, 3, 1938, "Metrics/BlockLength: Block has too many lines. [38/25]", 361672068], + [1425, 3, 1995, "Metrics/BlockLength: Block has too many lines. [39/25]", 4024875480], + [1472, 3, 1992, "Metrics/BlockLength: Block has too many lines. [39/25]", 1156260241] + ], + "spec/rbs/merge/freeze_node_spec.rb:2278400615": [ + [8, 1, 13268, "Metrics/BlockLength: Block has too many lines. [327/25]", 1590692835], + [9, 3, 2116, "Metrics/BlockLength: Block has too many lines. [43/25]", 4215218715], + [98, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3784984989], + [99, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1182436848], + [331, 3, 2919, "Metrics/BlockLength: Block has too many lines. [65/25]", 1415484725] + ], + "spec/rbs/merge/merge_result_spec.rb:2449518259": [ + [8, 1, 20574, "Metrics/BlockLength: Block has too many lines. [454/25]", 736738811], + [53, 3, 1244, "Metrics/BlockLength: Block has too many lines. [31/25]", 3686452170] + ], + "spec/rbs/merge/smart_merger_removal_mode_compliance_spec.rb:3475743041": [ + [7, 1, 1860, "Metrics/BlockLength: Block has too many lines. [66/25]", 3469987127], + [8, 3, 1798, "Metrics/BlockLength: Block has too many lines. [65/25]", 778477682] + ], + "spec/rbs/merge/smart_merger_spec.rb:3451189224": [ + [14, 1, 43498, "Metrics/BlockLength: Block has too many lines. [1190/25]", 1106962], + [149, 3, 10886, "Metrics/BlockLength: Block has too many lines. [286/25]", 1693926280], + [315, 5, 985, "Metrics/BlockLength: Block has too many lines. [26/25]", 3397066157], + [351, 5, 1063, "Metrics/BlockLength: Block has too many lines. [26/25]", 2718784043], + [461, 5, 1135, "Metrics/BlockLength: Block has too many lines. [26/25]", 3797285781], + [497, 5, 1213, "Metrics/BlockLength: Block has too many lines. [26/25]", 3686078390], + [536, 3, 2766, "Metrics/BlockLength: Block has too many lines. [84/25]", 3927490181], + [649, 3, 1714, "Metrics/BlockLength: Block has too many lines. [54/25]", 386494661], + [721, 3, 5393, "Metrics/BlockLength: Block has too many lines. [138/25]", 2457897034], + [925, 3, 4479, "Metrics/BlockLength: Block has too many lines. [134/25]", 3856958364], + [926, 5, 1327, "Metrics/BlockLength: Block has too many lines. [33/25]", 4009192695], + [970, 5, 953, "Metrics/BlockLength: Block has too many lines. [29/25]", 902715698], + [1008, 5, 1147, "Metrics/BlockLength: Block has too many lines. [37/25]", 3544491851], + [1058, 5, 955, "Metrics/BlockLength: Block has too many lines. [27/25]", 2688118410], + [1096, 3, 1031, "Metrics/BlockLength: Block has too many lines. [32/25]", 663517347], + [1097, 5, 970, "Metrics/BlockLength: Block has too many lines. [31/25]", 1575476639], + [1135, 3, 882, "Metrics/BlockLength: Block has too many lines. [27/25]", 3845382500], + [1136, 5, 813, "Metrics/BlockLength: Block has too many lines. [26/25]", 1755501948], + [1171, 3, 805, "Metrics/BlockLength: Block has too many lines. [26/25]", 3413285873], + [1204, 3, 2200, "Metrics/BlockLength: Block has too many lines. [70/25]", 3541894760], + [1205, 5, 1202, "Metrics/BlockLength: Block has too many lines. [38/25]", 3971143978], + [1235, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177610], + [1251, 5, 923, "Metrics/BlockLength: Block has too many lines. [28/25]", 3867507419], + [1288, 3, 1175, "Metrics/BlockLength: Block has too many lines. [36/25]", 1587654554], + [1289, 5, 1103, "Metrics/BlockLength: Block has too many lines. [35/25]", 3885176914], + [1368, 3, 1252, "Metrics/BlockLength: Block has too many lines. [28/25]", 4206068435], + [1407, 3, 1278, "Metrics/BlockLength: Block has too many lines. [28/25]", 1372687996], + [1446, 3, 1265, "Metrics/BlockLength: Block has too many lines. [28/25]", 3208600846], + [1485, 3, 1265, "Metrics/BlockLength: Block has too many lines. [28/25]", 212464082], + [1524, 3, 1262, "Metrics/BlockLength: Block has too many lines. [28/25]", 4277366491] + ], + "spec/rbs/merge_spec.rb:3352331478": [ + [5, 1, 1389, "Metrics/BlockLength: Block has too many lines. [37/25]", 373922011], + [10, 3, 1270, "Metrics/BlockLength: Block has too many lines. [32/25]", 2567886247] + ] +} diff --git a/gems/rbs-merge/Gemfile.lock b/gems/rbs-merge/Gemfile.lock index d5b6f3b7d..36af7f55d 100644 --- a/gems/rbs-merge/Gemfile.lock +++ b/gems/rbs-merge/Gemfile.lock @@ -18,39 +18,7 @@ PATH version_gem (~> 1.1, >= 1.1.14) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -59,192 +27,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -252,45 +35,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -310,10 +54,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-linux) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -322,6 +62,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -377,6 +118,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -395,7 +145,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,23 +282,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -583,11 +334,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -634,42 +380,21 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.1, >= 3.1.4) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.3, >= 2.3.7) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) rbs-merge! @@ -681,60 +406,40 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.1, >= 3.1.14) - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -747,27 +452,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -781,14 +478,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -824,19 +517,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -850,19 +541,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -870,7 +556,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 33c6910350b4c38f9c16bc0028d9bfd8552c0c06 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:23:37 -0600 Subject: [PATCH 164/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-merge/.rubocop_gradual.lock | 2838 ++++++++++++++++++++++++++ gems/ast-merge/Gemfile.lock | 15 +- gems/rbs-merge/Gemfile.lock | 324 ++- 3 files changed, 3170 insertions(+), 7 deletions(-) create mode 100644 gems/ast-merge/.rubocop_gradual.lock diff --git a/gems/ast-merge/.rubocop_gradual.lock b/gems/ast-merge/.rubocop_gradual.lock new file mode 100644 index 000000000..f8391bc5b --- /dev/null +++ b/gems/ast-merge/.rubocop_gradual.lock @@ -0,0 +1,2838 @@ +{ + ".simplecov:3463276878": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:429706125": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "ast-merge.gemspec:1182320030": [ + [16, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1168797721], + [129, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [144, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [145, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [152, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/ast-merge.rb:3005639624": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`ast-merge.rb`) should use snake_case.", 5381] + ], + "lib/ast/merge.rb:3429747270": [ + [11, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge`.", 2866359175], + [11, 3, 270037, "Metrics/ModuleLength: Module has too many lines. [5702/100]", 2847709439], + [22, 5, 16, "Style/Documentation: Missing top-level documentation comment for `class Ast::Merge::ParseError`.", 362242086], + [33, 7, 362, "Metrics/AbcSize: Assignment Branch Condition size for `build_message` is too high. [<2, 16, 6> 17.2/17]", 3988736327], + [47, 5, 31, "Style/Documentation: Missing top-level documentation comment for `class Ast::Merge::PlaceholderCollisionError`.", 218924302], + [161, 7, 337, "Metrics/MethodLength: Method has too many lines. [11/10]", 2388996629], + [178, 7, 327, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [8/7]", 979795121], + [309, 7, 383, "Metrics/MethodLength: Method has too many lines. [11/10]", 634650261], + [473, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 3450568485], + [474, 7, 461, "Metrics/MethodLength: Method has too many lines. [12/10]", 43929779], + [491, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1299979089], + [492, 7, 377, "Metrics/MethodLength: Method has too many lines. [11/10]", 3704151253], + [508, 121, 39, "Layout/LineLength: Line is too long. [159/120]", 85503958], + [509, 7, 447, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [8/7]", 298553749], + [509, 7, 447, "Metrics/MethodLength: Method has too many lines. [12/10]", 298553749], + [538, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1441148616], + [539, 7, 453, "Metrics/MethodLength: Method has too many lines. [14/10]", 1899007021], + [558, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193342990], + [559, 7, 400, "Metrics/MethodLength: Method has too many lines. [11/10]", 298553749], + [588, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860750], + [589, 7, 411, "Metrics/MethodLength: Method has too many lines. [12/10]", 2893925621], + [606, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3137791633], + [607, 7, 454, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [8/7]", 298553749], + [607, 7, 454, "Metrics/MethodLength: Method has too many lines. [12/10]", 298553749], + [666, 7, 385, "Metrics/MethodLength: Method has too many lines. [11/10]", 794265461], + [703, 7, 419, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [10/7]", 3313546353], + [703, 7, 419, "Metrics/PerceivedComplexity: Perceived complexity for `to_h` is too high. [10/8]", 3313546353], + [753, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 398187770], + [765, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 2746783933], + [812, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860841], + [820, 121, 156, "Layout/LineLength: Line is too long. [276/120]", 1149525480], + [825, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 2538424426], + [837, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 2285382915], + [847, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3962419360], + [860, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 398187770], + [862, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3195178507], + [866, 121, 85, "Layout/LineLength: Line is too long. [205/120]", 4238980637], + [868, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 2678411233], + [870, 121, 39, "Layout/LineLength: Line is too long. [159/120]", 4028520110], + [881, 121, 110, "Layout/LineLength: Line is too long. [230/120]", 3837814921], + [895, 5, 2283, "Metrics/MethodLength: Method has too many lines. [57/10]", 2282416447], + [955, 5, 2654, "Metrics/MethodLength: Method has too many lines. [63/10]", 2491520565], + [1006, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1823519875], + [1015, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1874311968], + [1021, 5, 10660, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_downstream_merge_gem_feature_matrix` is too high. [<0, 21, 0> 21/17]", 2277322577], + [1021, 5, 10660, "Metrics/MethodLength: Method has too many lines. [248/10]", 2277322577], + [1272, 5, 1546, "Metrics/MethodLength: Method has too many lines. [37/10]", 208933754], + [1306, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 2658452668], + [1312, 5, 4206, "Metrics/MethodLength: Method has too many lines. [96/10]", 1997530776], + [1389, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 183246985], + [1405, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 3268438356], + [1411, 5, 1598, "Metrics/MethodLength: Method has too many lines. [46/10]", 849757258], + [1454, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1323237892], + [1460, 5, 1164, "Metrics/MethodLength: Method has too many lines. [36/10]", 1477831421], + [1493, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 931876829], + [1499, 5, 1699, "Metrics/MethodLength: Method has too many lines. [43/10]", 1125544678], + [1545, 5, 1016, "Metrics/MethodLength: Method has too many lines. [27/10]", 2194427985], + [1575, 5, 1058, "Metrics/MethodLength: Method has too many lines. [30/10]", 47860722], + [1608, 5, 1186, "Metrics/MethodLength: Method has too many lines. [31/10]", 676863486], + [1636, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 2689509078], + [1642, 5, 1517, "Metrics/MethodLength: Method has too many lines. [41/10]", 3855445172], + [1655, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 817380904], + [1680, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 409671963], + [1686, 5, 2116, "Metrics/MethodLength: Method has too many lines. [61/10]", 524104794], + [1750, 5, 820, "Metrics/MethodLength: Method has too many lines. [12/10]", 1888457180], + [1750, 37, 298, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 789483382], + [1751, 121, 100, "Layout/LineLength: Line is too long. [220/120]", 3288750271], + [1766, 5, 3595, "Metrics/AbcSize: Assignment Branch Condition size for `initial_profile_promotion_policy` is too high. [<9, 20, 0> 21.93/17]", 83685787], + [1766, 5, 3595, "Metrics/MethodLength: Method has too many lines. [77/10]", 83685787], + [1846, 5, 768, "Metrics/MethodLength: Method has too many lines. [17/10]", 314059802], + [1867, 5, 1493, "Metrics/AbcSize: Assignment Branch Condition size for `evaluate_profile_selection_requirement` is too high. [<7, 23, 9> 25.67/17]", 3177555163], + [1867, 5, 1493, "Metrics/MethodLength: Method has too many lines. [29/10]", 3177555163], + [1868, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2145168012], + [1875, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 683002336], + [1909, 5, 985, "Metrics/AbcSize: Assignment Branch Condition size for `profile_promotion_blocking_reasons` is too high. [<4, 25, 13> 28.46/17]", 1146627465], + [1909, 5, 985, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `profile_promotion_blocking_reasons` is too high. [10/7]", 1146627465], + [1909, 5, 985, "Metrics/MethodLength: Method has too many lines. [18/10]", 1146627465], + [1909, 5, 985, "Metrics/PerceivedComplexity: Perceived complexity for `profile_promotion_blocking_reasons` is too high. [10/8]", 1146627465], + [1930, 5, 3173, "Metrics/AbcSize: Assignment Branch Condition size for `validate_language_backend_profile` is too high. [<25, 68, 20> 75.16/17]", 2100389324], + [1930, 5, 3173, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_language_backend_profile` is too high. [21/7]", 2100389324], + [1930, 5, 3173, "Metrics/MethodLength: Method has too many lines. [60/10]", 2100389324], + [1930, 5, 3173, "Metrics/PerceivedComplexity: Perceived complexity for `validate_language_backend_profile` is too high. [23/8]", 2100389324], + [2002, 5, 1523, "Metrics/AbcSize: Assignment Branch Condition size for `validate_backend_inventory` is too high. [<13, 38, 13> 42.21/17]", 1899037537], + [2002, 5, 1523, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_backend_inventory` is too high. [13/7]", 1899037537], + [2002, 5, 1523, "Metrics/MethodLength: Method has too many lines. [25/10]", 1899037537], + [2002, 5, 1523, "Metrics/PerceivedComplexity: Perceived complexity for `validate_backend_inventory` is too high. [13/8]", 1899037537], + [2045, 5, 906, "Metrics/MethodLength: Method has too many lines. [20/10]", 3137959843], + [2068, 5, 2744, "Metrics/AbcSize: Assignment Branch Condition size for `detect_raw_merge_inconsistencies` is too high. [<8, 43, 21> 48.52/17]", 3717440692], + [2068, 5, 2744, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_raw_merge_inconsistencies` is too high. [17/7]", 3717440692], + [2068, 5, 2744, "Metrics/MethodLength: Method has too many lines. [53/10]", 3717440692], + [2068, 5, 2744, "Metrics/PerceivedComplexity: Perceived complexity for `detect_raw_merge_inconsistencies` is too high. [17/8]", 3717440692], + [2083, 7, 1894, "Metrics/BlockLength: Block has too many lines. [33/25]", 758887611], + [2129, 5, 762, "Metrics/MethodLength: Method has too many lines. [11/10]", 3021402342], + [2143, 5, 490, "Metrics/MethodLength: Method has too many lines. [11/10]", 578473475], + [2157, 5, 881, "Metrics/AbcSize: Assignment Branch Condition size for `execute_independent_commutative_insertions` is too high. [<6, 16, 7> 18.47/17]", 259417386], + [2157, 5, 881, "Metrics/MethodLength: Method has too many lines. [21/10]", 259417386], + [2184, 5, 1107, "Metrics/AbcSize: Assignment Branch Condition size for `execute_independent_keyed_member_edits` is too high. [<10, 31, 15> 35.86/17]", 4271501385], + [2184, 5, 1107, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `execute_independent_keyed_member_edits` is too high. [14/7]", 4271501385], + [2184, 5, 1107, "Metrics/MethodLength: Method has too many lines. [24/10]", 4271501385], + [2184, 5, 1107, "Metrics/PerceivedComplexity: Perceived complexity for `execute_independent_keyed_member_edits` is too high. [14/8]", 4271501385], + [2228, 5, 3149, "Metrics/AbcSize: Assignment Branch Condition size for `parse_compact_ruleset` is too high. [<16, 68, 24> 73.86/17]", 3149098803], + [2228, 5, 3149, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_compact_ruleset` is too high. [22/7]", 3149098803], + [2228, 5, 3149, "Metrics/MethodLength: Method has too many lines. [67/10]", 3149098803], + [2228, 5, 3149, "Metrics/PerceivedComplexity: Perceived complexity for `parse_compact_ruleset` is too high. [23/8]", 3149098803], + [2234, 7, 2544, "Metrics/BlockLength: Block has too many lines. [50/25]", 2484860466], + [2261, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193420054], + [2307, 5, 2658, "Metrics/AbcSize: Assignment Branch Condition size for `compact_ruleset_feature_profile` is too high. [<11, 67, 38> 77.81/17]", 4022599673], + [2307, 5, 2658, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compact_ruleset_feature_profile` is too high. [29/7]", 4022599673], + [2307, 5, 2658, "Metrics/MethodLength: Method has too many lines. [66/10]", 4022599673], + [2307, 5, 2658, "Metrics/PerceivedComplexity: Perceived complexity for `compact_ruleset_feature_profile` is too high. [16/8]", 4022599673], + [2325, 7, 2243, "Metrics/BlockLength: Block has too many lines. [47/25]", 965041772], + [2392, 5, 2733, "Metrics/AbcSize: Assignment Branch Condition size for `classify_template_target_path` is too high. [<4, 36, 23> 42.91/17]", 3661828596], + [2392, 5, 2733, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `classify_template_target_path` is too high. [21/7]", 3661828596], + [2392, 5, 2733, "Metrics/MethodLength: Method has too many lines. [39/10]", 3661828596], + [2392, 5, 2733, "Metrics/PerceivedComplexity: Perceived complexity for `classify_template_target_path` is too high. [17/8]", 3661828596], + [2424, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [2438, 5, 416, "Metrics/MethodLength: Method has too many lines. [12/10]", 1388641773], + [2481, 5, 388, "Metrics/MethodLength: Method has too many lines. [12/10]", 2360583514], + [2510, 5, 820, "Metrics/MethodLength: Method has too many lines. [13/10]", 354674808], + [2526, 5, 929, "Metrics/AbcSize: Assignment Branch Condition size for `enrich_template_plan_entries` is too high. [<9, 12, 10> 18.03/17]", 2666747528], + [2526, 5, 929, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `enrich_template_plan_entries` is too high. [9/7]", 2666747528], + [2526, 5, 929, "Metrics/MethodLength: Method has too many lines. [19/10]", 2666747528], + [2526, 5, 929, "Metrics/PerceivedComplexity: Perceived complexity for `enrich_template_plan_entries` is too high. [10/8]", 2666747528], + [2549, 5, 1245, "Metrics/AbcSize: Assignment Branch Condition size for `enrich_template_plan_entries_with_token_state` is too high. [<11, 23, 14> 29.09/17]", 1507113977], + [2549, 5, 1245, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `enrich_template_plan_entries_with_token_state` is too high. [13/7]", 1507113977], + [2549, 5, 1245, "Metrics/MethodLength: Method has too many lines. [19/10]", 1507113977], + [2549, 5, 1245, "Metrics/PerceivedComplexity: Perceived complexity for `enrich_template_plan_entries_with_token_state` is too high. [13/8]", 1507113977], + [2573, 5, 1353, "Metrics/AbcSize: Assignment Branch Condition size for `prepare_template_entries` is too high. [<6, 18, 11> 21.93/17]", 2774310942], + [2573, 5, 1353, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `prepare_template_entries` is too high. [11/7]", 2774310942], + [2573, 5, 1353, "Metrics/MethodLength: Method has too many lines. [24/10]", 2774310942], + [2573, 5, 1353, "Metrics/PerceivedComplexity: Perceived complexity for `prepare_template_entries` is too high. [12/8]", 2774310942], + [2603, 5, 1494, "Metrics/AbcSize: Assignment Branch Condition size for `plan_template_execution` is too high. [<8, 22, 17> 28.93/17]", 3876421385], + [2603, 5, 1494, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `plan_template_execution` is too high. [14/7]", 3876421385], + [2603, 5, 1494, "Metrics/MethodLength: Method has too many lines. [29/10]", 3876421385], + [2603, 5, 1494, "Metrics/PerceivedComplexity: Perceived complexity for `plan_template_execution` is too high. [15/8]", 3876421385], + [2604, 7, 1421, "Metrics/BlockLength: Block has too many lines. [27/25]", 2887810383], + [2637, 5, 822, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 2749235529], + [2637, 37, 220, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 447165880], + [2638, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 518382509], + [2652, 5, 2060, "Metrics/AbcSize: Assignment Branch Condition size for `preview_template_execution` is too high. [<11, 42, 26> 50.61/17]", 2270817206], + [2652, 5, 2060, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preview_template_execution` is too high. [25/7]", 2270817206], + [2652, 5, 2060, "Metrics/MethodLength: Method has too many lines. [39/10]", 2270817206], + [2652, 5, 2060, "Metrics/PerceivedComplexity: Perceived complexity for `preview_template_execution` is too high. [23/8]", 2270817206], + [2662, 7, 1809, "Metrics/BlockLength: Block has too many lines. [28/25]", 310337564], + [2700, 5, 2513, "Metrics/AbcSize: Assignment Branch Condition size for `apply_template_execution` is too high. [<14, 50, 25> 57.63/17]", 177708331], + [2700, 5, 2513, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_template_execution` is too high. [26/7]", 177708331], + [2700, 5, 2513, "Metrics/MethodLength: Method has too many lines. [50/10]", 177708331], + [2700, 5, 2513, "Metrics/PerceivedComplexity: Perceived complexity for `apply_template_execution` is too high. [23/8]", 177708331], + [2711, 7, 2239, "Metrics/BlockLength: Block has too many lines. [38/25]", 1651205014], + [2761, 5, 1696, "Metrics/AbcSize: Assignment Branch Condition size for `evaluate_template_tree_convergence` is too high. [<11, 29, 17> 35.37/17]", 2507998041], + [2761, 5, 1696, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `evaluate_template_tree_convergence` is too high. [17/7]", 2507998041], + [2761, 5, 1696, "Metrics/MethodLength: Method has too many lines. [35/10]", 2507998041], + [2761, 5, 1696, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 2507998041], + [2761, 5, 1696, "Metrics/PerceivedComplexity: Perceived complexity for `evaluate_template_tree_convergence` is too high. [17/8]", 2507998041], + [2761, 43, 198, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 4214374277], + [2762, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 2983874608], + [2804, 5, 688, "Metrics/MethodLength: Method has too many lines. [15/10]", 3064253784], + [2804, 5, 688, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 3064253784], + [2804, 36, 216, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 448029307], + [2805, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3840139076], + [2848, 5, 664, "Metrics/MethodLength: Method has too many lines. [13/10]", 995637868], + [2848, 5, 664, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 995637868], + [2848, 53, 202, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 4227116196], + [2849, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 418683952], + [2866, 5, 649, "Metrics/MethodLength: Method has too many lines. [13/10]", 1831524792], + [2866, 5, 649, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 1831524792], + [2866, 54, 178, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2962381850], + [2867, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 3690915627], + [2884, 5, 1280, "Metrics/AbcSize: Assignment Branch Condition size for `apply_template_tree_execution_to_directory` is too high. [<6, 16, 6> 18.11/17]", 305449363], + [2884, 5, 1280, "Metrics/MethodLength: Method has too many lines. [23/10]", 305449363], + [2884, 5, 1280, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 305449363], + [2884, 51, 200, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1352434212], + [2885, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 1139621482], + [2913, 5, 2199, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_tree_run` is too high. [<15, 42, 31> 54.31/17]", 975627723], + [2913, 5, 2199, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_tree_run` is too high. [25/7]", 975627723], + [2913, 5, 2199, "Metrics/MethodLength: Method has too many lines. [38/10]", 975627723], + [2913, 5, 2199, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_tree_run` is too high. [26/8]", 975627723], + [2957, 5, 1515, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_apply` is too high. [<13, 35, 21> 42.84/17]", 3710254295], + [2957, 5, 1515, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_directory_apply` is too high. [17/7]", 3710254295], + [2957, 5, 1515, "Metrics/MethodLength: Method has too many lines. [26/10]", 3710254295], + [2957, 5, 1515, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_directory_apply` is too high. [17/8]", 3710254295], + [2972, 20, 1, "Style/DoubleNegation: Avoid the use of double negation (`!!`).", 177540], + [2989, 5, 1656, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_plan` is too high. [<11, 24, 25> 36.36/17]", 2946319293], + [2989, 5, 1656, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_directory_plan` is too high. [18/7]", 2946319293], + [2989, 5, 1656, "Metrics/MethodLength: Method has too many lines. [36/10]", 2946319293], + [2989, 5, 1656, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_directory_plan` is too high. [16/8]", 2946319293], + [3061, 7, 9, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 3648222389], + [3082, 5, 410, "Metrics/MethodLength: Method has too many lines. [12/10]", 248324428], + [3088, 7, 11, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 848344986], + [3132, 5, 712, "Metrics/MethodLength: Method has too many lines. [12/10]", 2500743043], + [3132, 27, 178, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 873705194], + [3132, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3023611470], + [3158, 42, 167, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2002181571], + [3171, 5, 1097, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structured_edit_selection_profile` is too high. [8/7]", 1149325233], + [3171, 5, 1097, "Metrics/MethodLength: Method has too many lines. [14/10]", 1149325233], + [3171, 42, 311, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 3814063337], + [3172, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 198450264], + [3185, 34, 47, "Style/SafeNavigation: Use safe navigation (`&.`) instead of checking if an object exists before calling the method.", 3204815976], + [3190, 5, 869, "Metrics/MethodLength: Method has too many lines. [11/10]", 83957392], + [3190, 41, 250, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1486072775], + [3191, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1967186495], + [3201, 36, 47, "Style/SafeNavigation: Use safe navigation (`&.`) instead of checking if an object exists before calling the method.", 3204815976], + [3206, 5, 1156, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structured_edit_match_profile` is too high. [10/7]", 4112674787], + [3206, 5, 1156, "Metrics/MethodLength: Method has too many lines. [15/10]", 4112674787], + [3206, 5, 1156, "Metrics/PerceivedComplexity: Perceived complexity for `structured_edit_match_profile` is too high. [10/8]", 4112674787], + [3206, 38, 321, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [12/5]", 823565876], + [3207, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859667], + [3208, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3673982236], + [3226, 5, 933, "Metrics/MethodLength: Method has too many lines. [14/10]", 2099388915], + [3226, 37, 319, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [12/5]", 250907892], + [3227, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177545], + [3228, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 4154814685], + [3245, 5, 907, "Metrics/MethodLength: Method has too many lines. [12/10]", 2242846328], + [3245, 42, 275, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 246196330], + [3246, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1439117336], + [3262, 5, 1057, "Metrics/MethodLength: Method has too many lines. [14/10]", 2891607970], + [3262, 44, 323, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 1386547750], + [3263, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1676243675], + [3264, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 4154814685], + [3281, 5, 1375, "Metrics/AbcSize: Assignment Branch Condition size for `structured_edit_request` is too high. [<11, 25, 10> 29.09/17]", 4153786554], + [3281, 5, 1375, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structured_edit_request` is too high. [11/7]", 4153786554], + [3281, 5, 1375, "Metrics/MethodLength: Method has too many lines. [16/10]", 4153786554], + [3281, 5, 1375, "Metrics/PerceivedComplexity: Perceived complexity for `structured_edit_request` is too high. [11/8]", 4153786554], + [3281, 32, 370, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [13/5]", 2381882467], + [3282, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177545], + [3303, 5, 728, "Metrics/MethodLength: Method has too many lines. [11/10]", 4026157473], + [3303, 31, 175, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 773121544], + [3335, 5, 597, "Metrics/MethodLength: Method has too many lines. [11/10]", 4143495860], + [3374, 5, 577, "Metrics/MethodLength: Method has too many lines. [11/10]", 4169131743], + [3389, 5, 1011, "Metrics/AbcSize: Assignment Branch Condition size for `structured_edit_execution_report` is too high. [<7, 16, 7> 18.81/17]", 876221899], + [3389, 5, 1011, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structured_edit_execution_report` is too high. [8/7]", 876221899], + [3389, 5, 1011, "Metrics/MethodLength: Method has too many lines. [12/10]", 876221899], + [3389, 41, 245, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 2484440861], + [3390, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 4036992717], + [3415, 55, 170, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 668161765], + [3438, 5, 819, "Metrics/MethodLength: Method has too many lines. [12/10]", 2287133436], + [3438, 56, 217, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3198032135], + [3439, 121, 51, "Layout/LineLength: Line is too long. [171/120]", 3526181051], + [3472, 5, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 1853778635], + [3481, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], + [3513, 5, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 1132214891], + [3522, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], + [3544, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 556747511], + [3553, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1808630920], + [3575, 5, 708, "Metrics/MethodLength: Method has too many lines. [11/10]", 3590891170], + [3584, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1367166441], + [3607, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 689748855], + [3616, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1808630920], + [3638, 5, 708, "Metrics/MethodLength: Method has too many lines. [11/10]", 1478642210], + [3647, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1367166441], + [3671, 5, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 239506091], + [3680, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], + [3702, 5, 693, "Metrics/MethodLength: Method has too many lines. [11/10]", 3803476550], + [3711, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], + [3734, 5, 728, "Metrics/MethodLength: Method has too many lines. [11/10]", 748161230], + [3743, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 2807086497], + [3765, 5, 758, "Metrics/MethodLength: Method has too many lines. [11/10]", 3900524558], + [3774, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3463884836], + [3798, 5, 748, "Metrics/MethodLength: Method has too many lines. [11/10]", 2076716686], + [3807, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 609414023], + [3829, 5, 778, "Metrics/MethodLength: Method has too many lines. [11/10]", 867958318], + [3833, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193343749], + [3838, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 1202823007], + [3862, 5, 728, "Metrics/MethodLength: Method has too many lines. [11/10]", 2078323790], + [3871, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 2807086497], + [3893, 5, 758, "Metrics/MethodLength: Method has too many lines. [11/10]", 121025422], + [3902, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3463884836], + [3924, 5, 733, "Metrics/MethodLength: Method has too many lines. [11/10]", 1216456558], + [3933, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 145839927], + [3955, 5, 763, "Metrics/MethodLength: Method has too many lines. [11/10]", 2946525998], + [3964, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 275709226], + [3988, 5, 768, "Metrics/MethodLength: Method has too many lines. [11/10]", 3281402414], + [3992, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177656], + [3997, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 1427340581], + [4034, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3673982236], + [4091, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193417070], + [4102, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2768444], + [4109, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3833204035], + [4117, 5, 863, "Metrics/MethodLength: Method has too many lines. [11/10]", 3731153486], + [4121, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 4054494590], + [4126, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 2084326338], + [4132, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 4201858364], + [4136, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861122], + [4140, 5, 873, "Metrics/MethodLength: Method has too many lines. [11/10]", 1866057614], + [4144, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3893180930], + [4149, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 863421408], + [4155, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 3247130491], + [4159, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1171438608], + [4163, 5, 883, "Metrics/MethodLength: Method has too many lines. [11/10]", 2352924462], + [4163, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860841], + [4164, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861334], + [4167, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 465221046], + [4172, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 1922522532], + [4188, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 4067226670], + [4192, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2033573170], + [4196, 5, 893, "Metrics/MethodLength: Method has too many lines. [11/10]", 1633175534], + [4196, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087926422], + [4197, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087421565], + [4200, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 615151909], + [4205, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 884393597], + [4231, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 417844693], + [4235, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1233681340], + [4239, 5, 903, "Metrics/MethodLength: Method has too many lines. [11/10]", 3964877742], + [4239, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873471], + [4240, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1322899615], + [4243, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 3471008807], + [4248, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 627945471], + [4254, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 2960084092], + [4258, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2148514258], + [4262, 5, 913, "Metrics/MethodLength: Method has too many lines. [11/10]", 385546958], + [4262, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2970472935], + [4263, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3808956371], + [4266, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 3412499338], + [4271, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 3274208144], + [4277, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 4275923717], + [4285, 5, 848, "Metrics/MethodLength: Method has too many lines. [11/10]", 457851502], + [4289, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 413805135], + [4294, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 951908917], + [4300, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 1859200227], + [4308, 5, 808, "Metrics/MethodLength: Method has too many lines. [11/10]", 884695726], + [4312, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 2011807620], + [4317, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 384138219], + [4323, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1176320663], + [4331, 5, 798, "Metrics/MethodLength: Method has too many lines. [11/10]", 1422521838], + [4335, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3247420006], + [4340, 121, 35, "Layout/LineLength: Line is too long. [155/120]", 1408316702], + [4346, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 938465266], + [4354, 5, 803, "Metrics/MethodLength: Method has too many lines. [11/10]", 2370839950], + [4358, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 74128911], + [4363, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 1364659899], + [4369, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2059517661], + [4377, 5, 803, "Metrics/MethodLength: Method has too many lines. [11/10]", 3379336814], + [4381, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 74128911], + [4386, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 1364659899], + [4434, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 4281772560], + [4442, 5, 833, "Metrics/MethodLength: Method has too many lines. [11/10]", 3245498510], + [4446, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3542644754], + [4451, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1916814773], + [4457, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 859690879], + [4465, 5, 833, "Metrics/MethodLength: Method has too many lines. [11/10]", 4138830126], + [4469, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3542644754], + [4474, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1916814773], + [4480, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3880141603], + [4488, 5, 828, "Metrics/MethodLength: Method has too many lines. [11/10]", 3621010990], + [4492, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3917260126], + [4497, 121, 41, "Layout/LineLength: Line is too long. [161/120]", 1879260859], + [4503, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1776611011], + [4511, 5, 838, "Metrics/MethodLength: Method has too many lines. [11/10]", 514585454], + [4515, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1353518231], + [4520, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 1228459824], + [4526, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 3932349968], + [4530, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087903307], + [4534, 5, 878, "Metrics/MethodLength: Method has too many lines. [11/10]", 1525737454], + [4534, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], + [4535, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177538], + [4538, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 2895681070], + [4543, 121, 51, "Layout/LineLength: Line is too long. [171/120]", 4040662298], + [4549, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 66929045], + [4557, 5, 808, "Metrics/MethodLength: Method has too many lines. [11/10]", 1626746606], + [4561, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 2011807620], + [4566, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 384138219], + [4580, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 849230508], + [4588, 5, 838, "Metrics/MethodLength: Method has too many lines. [11/10]", 3531122670], + [4592, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1353518231], + [4597, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 1228459824], + [4612, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1176320663], + [4620, 5, 798, "Metrics/MethodLength: Method has too many lines. [11/10]", 1118421486], + [4624, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3247420006], + [4629, 121, 35, "Layout/LineLength: Line is too long. [155/120]", 1408316702], + [4651, 5, 693, "Metrics/MethodLength: Method has too many lines. [11/10]", 1668406662], + [4660, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], + [4674, 5, 648, "Metrics/MethodLength: Method has too many lines. [11/10]", 3479836893], + [4683, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193343749], + [4705, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 3147549879], + [4714, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1808630920], + [4749, 5, 677, "Metrics/MethodLength: Method has too many lines. [11/10]", 1206941784], + [4758, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3937819337], + [4781, 5, 672, "Metrics/MethodLength: Method has too many lines. [11/10]", 3634903061], + [4790, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], + [4812, 5, 683, "Metrics/MethodLength: Method has too many lines. [11/10]", 3417053461], + [4821, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], + [4845, 5, 668, "Metrics/MethodLength: Method has too many lines. [11/10]", 1540762726], + [4854, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1808630920], + [4876, 5, 698, "Metrics/MethodLength: Method has too many lines. [11/10]", 2804825893], + [4885, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1367166441], + [4908, 5, 683, "Metrics/MethodLength: Method has too many lines. [11/10]", 3165010613], + [4917, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], + [4939, 5, 713, "Metrics/MethodLength: Method has too many lines. [11/10]", 2795628035], + [4948, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 497133415], + [4954, 5, 864, "Metrics/MethodLength: Method has too many lines. [12/10]", 1086224878], + [4954, 50, 268, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 4022739767], + [4955, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1607400384], + [4979, 5, 658, "Metrics/MethodLength: Method has too many lines. [11/10]", 3999796489], + [4988, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 102058825], + [5002, 59, 179, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1569981428], + [5003, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 1515849732], + [5034, 5, 694, "Metrics/MethodLength: Method has too many lines. [11/10]", 3830236120], + [5043, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2250857971], + [5057, 5, 673, "Metrics/MethodLength: Method has too many lines. [11/10]", 2413908653], + [5066, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1225026887], + [5080, 5, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 3935895659], + [5089, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], + [5103, 5, 692, "Metrics/MethodLength: Method has too many lines. [11/10]", 3660669627], + [5112, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3558241761], + [5126, 5, 612, "Metrics/MethodLength: Method has too many lines. [11/10]", 100391811], + [5165, 5, 693, "Metrics/MethodLength: Method has too many lines. [11/10]", 3138587622], + [5174, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], + [5196, 5, 688, "Metrics/MethodLength: Method has too many lines. [11/10]", 2736088861], + [5205, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1992103013], + [5228, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 2275602867], + [5237, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3598350322], + [5260, 5, 602, "Metrics/MethodLength: Method has too many lines. [11/10]", 3023166371], + [5275, 36, 181, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1071580945], + [5288, 5, 787, "Metrics/AbcSize: Assignment Branch Condition size for `group_projected_child_review_cases` is too high. [<4, 17, 4> 17.92/17]", 3391527151], + [5288, 5, 787, "Metrics/MethodLength: Method has too many lines. [18/10]", 3391527151], + [5312, 5, 705, "Metrics/MethodLength: Method has too many lines. [13/10]", 2629923275], + [5339, 5, 547, "Metrics/MethodLength: Method has too many lines. [12/10]", 1911190850], + [5364, 5, 1516, "Metrics/AbcSize: Assignment Branch Condition size for `review_projected_child_groups` is too high. [<11, 21, 9> 25.36/17]", 3333110579], + [5364, 5, 1516, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `review_projected_child_groups` is too high. [8/7]", 3333110579], + [5364, 5, 1516, "Metrics/MethodLength: Method has too many lines. [39/10]", 3333110579], + [5364, 5, 1516, "Metrics/PerceivedComplexity: Perceived complexity for `review_projected_child_groups` is too high. [9/8]", 3333110579], + [5398, 7, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], + [5410, 5, 562, "Metrics/MethodLength: Method has too many lines. [14/10]", 3083915102], + [5429, 5, 1898, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_delegated_child_outputs` is too high. [<11, 21, 6> 24.45/17]", 2739722546], + [5429, 5, 1898, "Metrics/MethodLength: Method has too many lines. [49/10]", 2739722546], + [5484, 5, 942, "Metrics/AbcSize: Assignment Branch Condition size for `execute_nested_merge` is too high. [<3, 17, 6> 18.28/17]", 766157172], + [5484, 5, 942, "Metrics/MethodLength: Method has too many lines. [20/10]", 766157172], + [5484, 29, 144, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1404367793], + [5511, 5, 652, "Metrics/MethodLength: Method has too many lines. [13/10]", 2105803856], + [5530, 38, 140, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1682835820], + [5560, 5, 577, "Metrics/MethodLength: Method has too many lines. [12/10]", 2659610443], + [5629, 5, 569, "Metrics/MethodLength: Method has too many lines. [14/10]", 20616641], + [5657, 5, 772, "Metrics/AbcSize: Assignment Branch Condition size for `conformance_manifest_review_request_ids` is too high. [<7, 16, 8> 19.21/17]", 3577418475], + [5657, 5, 772, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `conformance_manifest_review_request_ids` is too high. [9/7]", 3577418475], + [5657, 5, 772, "Metrics/MethodLength: Method has too many lines. [14/10]", 3577418475], + [5657, 5, 772, "Metrics/PerceivedComplexity: Perceived complexity for `conformance_manifest_review_request_ids` is too high. [9/8]", 3577418475], + [5711, 5, 606, "Metrics/MethodLength: Method has too many lines. [11/10]", 2675086662], + [5726, 5, 562, "Metrics/MethodLength: Method has too many lines. [11/10]", 3811715870], + [5741, 5, 578, "Metrics/MethodLength: Method has too many lines. [11/10]", 1776197415], + [5756, 5, 1298, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_conformance_family_context` is too high. [<7, 28, 9> 30.23/17]", 4265202259], + [5756, 5, 1298, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `resolve_conformance_family_context` is too high. [10/7]", 4265202259], + [5756, 5, 1298, "Metrics/MethodLength: Method has too many lines. [23/10]", 4265202259], + [5756, 5, 1298, "Metrics/PerceivedComplexity: Perceived complexity for `resolve_conformance_family_context` is too high. [10/8]", 4265202259], + [5785, 5, 1994, "Metrics/AbcSize: Assignment Branch Condition size for `review_conformance_family_context` is too high. [<12, 24, 10> 28.64/17]", 2834851944], + [5785, 5, 1994, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `review_conformance_family_context` is too high. [10/7]", 2834851944], + [5785, 5, 1994, "Metrics/MethodLength: Method has too many lines. [41/10]", 2834851944], + [5785, 5, 1994, "Metrics/PerceivedComplexity: Perceived complexity for `review_conformance_family_context` is too high. [11/8]", 2834851944], + [5808, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 641612328], + [5845, 5, 1844, "Metrics/AbcSize: Assignment Branch Condition size for `select_conformance_case` is too high. [<2, 43, 14> 45.27/17]", 670673209], + [5845, 5, 1844, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `select_conformance_case` is too high. [14/7]", 670673209], + [5845, 5, 1844, "Metrics/MethodLength: Method has too many lines. [30/10]", 670673209], + [5845, 5, 1844, "Metrics/PerceivedComplexity: Perceived complexity for `select_conformance_case` is too high. [16/8]", 670673209], + [5850, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 2135503892], + [5852, 121, 41, "Layout/LineLength: Line is too long. [161/120]", 3932054828], + [5861, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 3169124957], + [5883, 5, 509, "Metrics/MethodLength: Method has too many lines. [11/10]", 3552283123], + [5972, 5, 4195, "Metrics/AbcSize: Assignment Branch Condition size for `review_conformance_manifest` is too high. [<37, 63, 16> 74.79/17]", 2166560528], + [5972, 5, 4195, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `review_conformance_manifest` is too high. [14/7]", 2166560528], + [5972, 5, 4195, "Metrics/MethodLength: Method has too many lines. [89/10]", 2166560528], + [5972, 5, 4195, "Metrics/PerceivedComplexity: Perceived complexity for `review_conformance_manifest` is too high. [17/8]", 2166560528], + [6037, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2746826653], + [6053, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 3035993839], + [6075, 5, 676, "Metrics/MethodLength: Method has too many lines. [15/10]", 3048335475], + [6098, 5, 1054, "Metrics/AbcSize: Assignment Branch Condition size for `plan_conformance_suite` is too high. [<11, 18, 8> 22.56/17]", 1855254788], + [6098, 5, 1054, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `plan_conformance_suite` is too high. [8/7]", 1855254788], + [6098, 5, 1054, "Metrics/MethodLength: Method has too many lines. [25/10]", 1855254788], + [6098, 31, 84, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 172854173], + [6163, 5, 1274, "Metrics/AbcSize: Assignment Branch Condition size for `plan_named_conformance_suites_with_diagnostics` is too high. [<11, 21, 7> 24.72/17]", 3991300730], + [6163, 5, 1274, "Metrics/MethodLength: Method has too many lines. [27/10]", 3991300730], + [6190, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 3035993839], + [6255, 5, 2071, "Metrics/AbcSize: Assignment Branch Condition size for `review_decision_for_family_context` is too high. [<7, 22, 16> 28.09/17]", 4245377184], + [6255, 5, 2071, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `review_decision_for_family_context` is too high. [12/7]", 4245377184], + [6255, 5, 2071, "Metrics/MethodLength: Method has too many lines. [46/10]", 4245377184], + [6255, 5, 2071, "Metrics/PerceivedComplexity: Perceived complexity for `review_decision_for_family_context` is too high. [12/8]", 4245377184], + [6260, 7, 1766, "Metrics/BlockLength: Block has too many lines. [40/25]", 65448241], + [6312, 5, 686, "Metrics/MethodLength: Method has too many lines. [13/10]", 4030291682] + ], + "lib/ast/merge/ast_node.rb:2037773320": [ + [44, 5, 7086, "Metrics/ClassLength: Class has too many lines. [114/100]", 201314721], + [220, 11, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183] + ], + "lib/ast/merge/comment/attachment.rb:2388154769": [ + [42, 23, 180, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3775370530], + [75, 24, 2, "Lint/SafeNavigationConsistency: Use `.` instead of unnecessary `&.`.", 5858765], + [81, 25, 2, "Lint/SafeNavigationConsistency: Use `.` instead of unnecessary `&.`.", 5858765], + [114, 9, 410, "Metrics/AbcSize: Assignment Branch Condition size for `inspect` is too high. [<1, 17, 4> 17.49/17]", 605978105], + [115, 32, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] + ], + "lib/ast/merge/comment/augmenter.rb:633395157": [ + [12, 7, 13967, "Metrics/ClassLength: Class has too many lines. [291/100]", 2806660144], + [33, 9, 721, "Metrics/MethodLength: Method has too many lines. [16/10]", 200402816], + [33, 23, 91, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2938734913], + [64, 9, 1335, "Metrics/AbcSize: Assignment Branch Condition size for `build!` is too high. [<12, 29, 6> 31.95/17]", 3904283188], + [64, 9, 1335, "Metrics/MethodLength: Method has too many lines. [22/10]", 3904283188], + [94, 9, 867, "Metrics/AbcSize: Assignment Branch Condition size for `infer_leading_comments` is too high. [<8, 19, 14> 24.92/17]", 1941464872], + [94, 9, 867, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_leading_comments` is too high. [11/7]", 1941464872], + [94, 9, 867, "Metrics/MethodLength: Method has too many lines. [20/10]", 1941464872], + [94, 9, 867, "Metrics/PerceivedComplexity: Perceived complexity for `infer_leading_comments` is too high. [12/8]", 1941464872], + [122, 9, 429, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_inline_comments` is too high. [8/7]", 2688935834], + [133, 9, 934, "Metrics/AbcSize: Assignment Branch Condition size for `infer_trailing_comments` is too high. [<8, 21, 18> 28.79/17]", 1551855281], + [133, 9, 934, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_trailing_comments` is too high. [15/7]", 1551855281], + [133, 9, 934, "Metrics/MethodLength: Method has too many lines. [20/10]", 1551855281], + [133, 9, 934, "Metrics/PerceivedComplexity: Perceived complexity for `infer_trailing_comments` is too high. [15/8]", 1551855281], + [160, 9, 488, "Metrics/AbcSize: Assignment Branch Condition size for `infer_postlude!` is too high. [<5, 17, 8> 19.44/17]", 2562637949], + [160, 9, 488, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_postlude!` is too high. [8/7]", 2562637949], + [173, 9, 1529, "Metrics/AbcSize: Assignment Branch Condition size for `infer_remaining_regions!` is too high. [<12, 27, 23> 37.44/17]", 3911657050], + [173, 9, 1529, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_remaining_regions!` is too high. [18/7]", 3911657050], + [173, 9, 1529, "Metrics/MethodLength: Method has too many lines. [28/10]", 3911657050], + [173, 9, 1529, "Metrics/PerceivedComplexity: Perceived complexity for `infer_remaining_regions!` is too high. [20/8]", 3911657050], + [216, 9, 507, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split_preamble_group` is too high. [8/7]", 336784898], + [231, 9, 588, "Metrics/MethodLength: Method has too many lines. [17/10]", 3445626532], + [274, 9, 965, "Metrics/AbcSize: Assignment Branch Condition size for `build_region` is too high. [<6, 17, 7> 19.34/17]", 344809006], + [274, 9, 965, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_region` is too high. [8/7]", 344809006], + [274, 9, 965, "Metrics/MethodLength: Method has too many lines. [24/10]", 344809006] + ], + "lib/ast/merge/comment/block.rb:3806757604": [ + [31, 7, 6754, "Metrics/ClassLength: Class has too many lines. [106/100]", 2308582303], + [57, 9, 1059, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<12, 13, 14> 22.56/17]", 2656171724], + [57, 9, 1059, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `initialize` is too high. [14/7]", 2656171724], + [57, 9, 1059, "Metrics/MethodLength: Method has too many lines. [21/10]", 2656171724], + [57, 9, 1059, "Metrics/PerceivedComplexity: Perceived complexity for `initialize` is too high. [15/8]", 2656171724], + [113, 9, 511, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `freeze_action` is too high. [9/7]", 55014877], + [113, 9, 511, "Metrics/MethodLength: Method has too many lines. [12/10]", 55014877], + [113, 9, 511, "Metrics/PerceivedComplexity: Perceived complexity for `freeze_action` is too high. [9/8]", 55014877], + [181, 9, 439, "Metrics/AbcSize: Assignment Branch Condition size for `first_meaningful_content` is too high. [<2, 16, 11> 19.52/17]", 680479883], + [181, 9, 439, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `first_meaningful_content` is too high. [11/7]", 680479883], + [181, 9, 439, "Metrics/PerceivedComplexity: Perceived complexity for `first_meaningful_content` is too high. [12/8]", 680479883], + [197, 9, 765, "Metrics/AbcSize: Assignment Branch Condition size for `extract_block_content` is too high. [<7, 24, 9> 26.57/17]", 621871624], + [197, 9, 765, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_block_content` is too high. [9/7]", 621871624], + [197, 9, 765, "Metrics/PerceivedComplexity: Perceived complexity for `extract_block_content` is too high. [9/8]", 621871624] + ], + "lib/ast/merge/comment/c_style_tracker_base.rb:1569556520": [ + [22, 7, 15053, "Metrics/ClassLength: Class has too many lines. [284/100]", 3599183270], + [83, 9, 509, "Metrics/MethodLength: Method has too many lines. [11/10]", 1639553915], + [102, 9, 492, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `leading_comments_before` is too high. [8/7]", 3127043491], + [102, 9, 492, "Metrics/MethodLength: Method has too many lines. [11/10]", 3127043491], + [124, 9, 487, "Metrics/MethodLength: Method has too many lines. [11/10]", 1869933531], + [176, 9, 713, "Metrics/AbcSize: Assignment Branch Condition size for `trailing_comments_after` is too high. [<6, 12, 13> 18.68/17]", 543703521], + [176, 9, 713, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trailing_comments_after` is too high. [11/7]", 543703521], + [176, 9, 713, "Metrics/MethodLength: Method has too many lines. [14/10]", 543703521], + [176, 9, 713, "Metrics/PerceivedComplexity: Perceived complexity for `trailing_comments_after` is too high. [11/8]", 543703521], + [184, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177549], + [202, 9, 598, "Metrics/MethodLength: Method has too many lines. [12/10]", 1628921093], + [222, 9, 1271, "Metrics/MethodLength: Method has too many lines. [21/10]", 612335469], + [222, 35, 137, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1823300034], + [329, 35, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [348, 9, 2271, "Metrics/AbcSize: Assignment Branch Condition size for `extract_comments` is too high. [<17, 32, 13> 38.5/17]", 2751274968], + [348, 9, 2271, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_comments` is too high. [14/7]", 2751274968], + [348, 9, 2271, "Metrics/MethodLength: Method has too many lines. [59/10]", 2751274968], + [348, 9, 2271, "Metrics/PerceivedComplexity: Perceived complexity for `extract_comments` is too high. [14/8]", 2751274968], + [353, 11, 2045, "Metrics/BlockLength: Block has too many lines. [52/25]", 575665179], + [418, 9, 659, "Metrics/MethodLength: Method has too many lines. [15/10]", 177254901], + [439, 71, 4, "Lint/UnusedMethodArgument: Unused method argument - `line`.", 2087656651], + [439, 78, 8, "Lint/UnusedMethodArgument: Unused method argument - `line_num`.", 622661090] + ], + "lib/ast/merge/comment/hash_tracker_base.rb:861186417": [ + [32, 7, 19362, "Metrics/ClassLength: Class has too many lines. [221/100]", 1031055222], + [118, 9, 444, "Metrics/MethodLength: Method has too many lines. [11/10]", 3347260807], + [142, 9, 921, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `leading_comments_before` is too high. [8/7]", 415734636], + [142, 9, 921, "Metrics/MethodLength: Method has too many lines. [11/10]", 415734636], + [172, 9, 440, "Metrics/MethodLength: Method has too many lines. [11/10]", 2464474004], + [225, 9, 623, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trailing_comments_after` is too high. [10/7]", 543703521], + [225, 9, 623, "Metrics/MethodLength: Method has too many lines. [12/10]", 543703521], + [225, 9, 623, "Metrics/PerceivedComplexity: Perceived complexity for `trailing_comments_after` is too high. [10/8]", 543703521], + [249, 9, 551, "Metrics/MethodLength: Method has too many lines. [12/10]", 2783654570], + [278, 9, 1271, "Metrics/MethodLength: Method has too many lines. [21/10]", 612335469], + [278, 35, 137, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1823300034], + [374, 35, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [439, 9, 826, "Metrics/MethodLength: Method has too many lines. [12/10]", 1706632542] + ], + "lib/ast/merge/comment/parser.rb:2674748021": [ + [34, 7, 8372, "Metrics/ClassLength: Class has too many lines. [141/100]", 2541983664], + [84, 9, 357, "Metrics/MethodLength: Method has too many lines. [12/10]", 2265493710], + [104, 9, 545, "Metrics/AbcSize: Assignment Branch Condition size for `auto_detect_style` is too high. [<5, 17, 7> 19.05/17]", 868366444], + [104, 9, 545, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `auto_detect_style` is too high. [8/7]", 868366444], + [125, 9, 1650, "Metrics/AbcSize: Assignment Branch Condition size for `parse_line_comments` is too high. [<8, 28, 7> 29.95/17]", 1511562163], + [125, 9, 1650, "Metrics/MethodLength: Method has too many lines. [31/10]", 1511562163], + [176, 9, 2670, "Metrics/AbcSize: Assignment Branch Condition size for `parse_with_block_comments` is too high. [<15, 47, 15> 51.57/17]", 2963765048], + [176, 9, 2670, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_with_block_comments` is too high. [15/7]", 2963765048], + [176, 9, 2670, "Metrics/MethodLength: Method has too many lines. [47/10]", 2963765048], + [176, 9, 2670, "Metrics/PerceivedComplexity: Perceived complexity for `parse_with_block_comments` is too high. [16/8]", 2963765048], + [181, 11, 2390, "Metrics/BlockLength: Block has too many lines. [40/25]", 3720582340] + ], + "lib/ast/merge/comment/quoted_hash_line_parser.rb:2878420841": [ + [74, 9, 458, "Metrics/MethodLength: Method has too many lines. [11/10]", 1526360697], + [91, 9, 620, "Metrics/AbcSize: Assignment Branch Condition size for `inline_result` is too high. [<3, 16, 6> 17.35/17]", 2706755447], + [91, 9, 620, "Metrics/MethodLength: Method has too many lines. [14/10]", 2706755447] + ], + "lib/ast/merge/comment/region_merge_policy.rb:176745155": [ + [23, 23, 98, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1029631546], + [55, 9, 423, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `freeze_sensitive?` is too high. [8/7]", 4102661282], + [61, 41, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [61, 85, 2, "Lint/SafeNavigationConsistency: Use `.` instead of unnecessary `&.`.", 5858765], + [96, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3491399903] + ], + "lib/ast/merge/comment/style.rb:3045051983": [ + [27, 7, 9109, "Metrics/ClassLength: Class has too many lines. [143/100]", 131723516], + [142, 11, 911, "Metrics/MethodLength: Method has too many lines. [17/10]", 355862493], + [142, 23, 164, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 668558018], + [203, 23, 164, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 668558018] + ], + "lib/ast/merge/comment/tracked_hash_adapter.rb:3235547929": [ + [99, 11, 553, "Metrics/AbcSize: Assignment Branch Condition size for `line_text_from` is too high. [<4, 20, 4> 20.78/17]", 2680273536], + [99, 11, 553, "Metrics/MethodLength: Method has too many lines. [13/10]", 2680273536] + ], + "lib/ast/merge/composite_match_refiner.rb:1718969703": [ + [58, 7, 668, "Metrics/MethodLength: Method has too many lines. [14/10]", 2649148714] + ], + "lib/ast/merge/conflict_resolver_base.rb:765343263": [ + [69, 5, 14959, "Metrics/ClassLength: Class has too many lines. [170/100]", 633092728], + [156, 7, 919, "Metrics/MethodLength: Method has too many lines. [13/10]", 1701319380], + [156, 21, 200, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3369976202], + [367, 7, 972, "Metrics/MethodLength: Method has too many lines. [22/10]", 2870739148], + [434, 47, 13, "Style/NumericPredicate: Use `recursive.positive?` instead of `recursive > 0`.", 462999281], + [436, 99, 14, "Style/NumericPredicate: Use `recursive.zero?` instead of `recursive == 0`.", 2394069519] + ], + "lib/ast/merge/content_match_refiner.rb:3628272158": [ + [47, 5, 7719, "Metrics/ClassLength: Class has too many lines. [108/100]", 651494487], + [87, 7, 750, "Metrics/MethodLength: Method has too many lines. [17/10]", 3624290009], + [165, 37, 48, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 953994744], + [232, 7, 846, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<13, 29, 8> 32.77/17]", 3597737347], + [232, 7, 846, "Metrics/MethodLength: Method has too many lines. [20/10]", 3597737347] + ], + "lib/ast/merge/debug_logger.rb:1783610128": [ + [72, 5, 7614, "Metrics/ModuleLength: Module has too many lines. [118/100]", 736598454], + [85, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 941621], + [206, 7, 584, "Metrics/AbcSize: Assignment Branch Condition size for `time` is too high. [<3, 17, 2> 17.38/17]", 3468868523], + [206, 7, 584, "Metrics/MethodLength: Method has too many lines. [14/10]", 3468868523], + [269, 7, 450, "Metrics/PerceivedComplexity: Perceived complexity for `extract_lines` is too high. [9/8]", 680738666], + [287, 7, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631] + ], + "lib/ast/merge/detector/base.rb:343830240": [ + [175, 25, 73, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2991095115] + ], + "lib/ast/merge/detector/fenced_code_block.rb:3555142063": [ + [36, 7, 6302, "Metrics/ClassLength: Class has too many lines. [116/100]", 852968953], + [71, 9, 2492, "Metrics/AbcSize: Assignment Branch Condition size for `detect_all` is too high. [<31, 28, 12> 43.46/17]", 3575218793], + [71, 9, 2492, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_all` is too high. [11/7]", 3575218793], + [71, 9, 2492, "Metrics/MethodLength: Method has too many lines. [54/10]", 3575218793], + [71, 9, 2492, "Metrics/PerceivedComplexity: Perceived complexity for `detect_all` is too high. [13/8]", 3575218793], + [84, 11, 2060, "Metrics/BlockLength: Block has too many lines. [41/25]", 1744553779] + ], + "lib/ast/merge/detector/mergeable.rb:354817747": [ + [54, 7, 11933, "Metrics/ModuleLength: Module has too many lines. [140/100]", 1453034870], + [162, 9, 601, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_region_configs` is too high. [8/7]", 1278024890], + [162, 9, 601, "Metrics/MethodLength: Method has too many lines. [16/10]", 1278024890], + [189, 9, 1054, "Metrics/AbcSize: Assignment Branch Condition size for `extract_regions` is too high. [<11, 16, 3> 19.65/17]", 663241096], + [189, 9, 1054, "Metrics/MethodLength: Method has too many lines. [20/10]", 663241096], + [285, 9, 1005, "Metrics/AbcSize: Assignment Branch Condition size for `merge_and_substitute_regions` is too high. [<16, 19, 4> 25.16/17]", 4123525156], + [285, 9, 1005, "Metrics/MethodLength: Method has too many lines. [16/10]", 4123525156], + [318, 9, 1369, "Metrics/AbcSize: Assignment Branch Condition size for `merge_region` is too high. [<11, 20, 14> 26.78/17]", 746321843], + [318, 9, 1369, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_region` is too high. [15/7]", 746321843], + [318, 9, 1369, "Metrics/MethodLength: Method has too many lines. [16/10]", 746321843], + [318, 9, 1369, "Metrics/PerceivedComplexity: Perceived complexity for `merge_region` is too high. [15/8]", 746321843] + ], + "lib/ast/merge/detector/toml_frontmatter.rb:3255696517": [ + [50, 9, 892, "Metrics/MethodLength: Method has too many lines. [20/10]", 3132005303] + ], + "lib/ast/merge/detector/yaml_frontmatter.rb:2551474823": [ + [49, 9, 958, "Metrics/MethodLength: Method has too many lines. [20/10]", 3132005303] + ], + "lib/ast/merge/diff_mapper_base.rb:3204989377": [ + [22, 5, 7793, "Metrics/ClassLength: Class has too many lines. [141/100]", 2217731166], + [80, 7, 2598, "Metrics/AbcSize: Assignment Branch Condition size for `parse_diff` is too high. [<21, 31, 15> 40.34/17]", 939898835], + [80, 7, 2598, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_diff` is too high. [16/7]", 939898835], + [80, 7, 2598, "Metrics/MethodLength: Method has too many lines. [65/10]", 939898835], + [80, 7, 2598, "Metrics/PerceivedComplexity: Perceived complexity for `parse_diff` is too high. [12/8]", 939898835], + [90, 9, 2162, "Metrics/BlockLength: Block has too many lines. [50/25]", 3403609416], + [169, 7, 394, "Metrics/MethodLength: Method has too many lines. [11/10]", 2028641628] + ], + "lib/ast/merge/emitter_base.rb:655463559": [ + [26, 5, 14449, "Metrics/ClassLength: Class has too many lines. [226/100]", 2015391034], + [95, 7, 653, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_comment_region` is too high. [9/7]", 24580929], + [95, 7, 653, "Metrics/MethodLength: Method has too many lines. [12/10]", 24580929], + [95, 7, 653, "Metrics/PerceivedComplexity: Perceived complexity for `emit_comment_region` is too high. [9/8]", 24580929], + [120, 7, 1311, "Metrics/AbcSize: Assignment Branch Condition size for `emit_comment_attachment` is too high. [<5, 25, 16> 30.1/17]", 964928813], + [120, 7, 1311, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_comment_attachment` is too high. [17/7]", 964928813], + [120, 7, 1311, "Metrics/MethodLength: Method has too many lines. [17/10]", 964928813], + [120, 7, 1311, "Metrics/PerceivedComplexity: Perceived complexity for `emit_comment_attachment` is too high. [17/8]", 964928813], + [120, 34, 127, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 628879795], + [152, 7, 984, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_layout_gap` is too high. [8/7]", 1954418889], + [152, 7, 984, "Metrics/MethodLength: Method has too many lines. [13/10]", 1954418889], + [152, 7, 984, "Metrics/PerceivedComplexity: Perceived complexity for `emit_layout_gap` is too high. [9/8]", 1954418889], + [152, 26, 136, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3839882587], + [183, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861198], + [184, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087656651], + [186, 7, 1307, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_layout_attachment` is too high. [9/7]", 708408665], + [186, 7, 1307, "Metrics/MethodLength: Method has too many lines. [26/10]", 708408665], + [186, 7, 1307, "Metrics/PerceivedComplexity: Perceived complexity for `emit_layout_attachment` is too high. [9/8]", 708408665], + [186, 33, 218, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1552587384], + [187, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 1763090185], + [189, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1371312610], + [256, 31, 17, "Style/NumericPredicate: Use `@indent_level.positive?` instead of `@indent_level > 0`.", 1892475678], + [302, 56, 12, "Lint/UnusedMethodArgument: Unused method argument - `current_line`. You can also write as `inline_comment_region_target_column(*)` if you want the method to accept any arguments but don't care about them.", 2091263933], + [306, 42, 6, "Lint/UnusedMethodArgument: Unused method argument - `region`.", 2124512157], + [306, 51, 13, "Lint/UnusedMethodArgument: Unused method argument - `target_column`.", 3246375805], + [321, 7, 1141, "Metrics/AbcSize: Assignment Branch Condition size for `inline_comment_node_text` is too high. [<6, 29, 8> 30.68/17]", 2583471562], + [321, 7, 1141, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `inline_comment_node_text` is too high. [9/7]", 2583471562], + [321, 7, 1141, "Metrics/MethodLength: Method has too many lines. [22/10]", 2583471562], + [321, 7, 1141, "Metrics/PerceivedComplexity: Perceived complexity for `inline_comment_node_text` is too high. [9/8]", 2583471562], + [339, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861626], + [350, 7, 510, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_region_gap_lines` is too high. [8/7]", 1999747697], + [350, 7, 510, "Metrics/PerceivedComplexity: Perceived complexity for `emit_region_gap_lines` is too high. [9/8]", 1999747697] + ], + "lib/ast/merge/emitter_line_metadata_support.rb:3153033769": [ + [5, 5, 33, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::EmitterLineMetadataSupport`.", 2926748997], + [23, 7, 541, "Metrics/MethodLength: Method has too many lines. [12/10]", 2407359355] + ], + "lib/ast/merge/file_aligner_base.rb:4032045257": [ + [13, 5, 7473, "Metrics/ClassLength: Class has too many lines. [187/100]", 1391880441], + [27, 7, 2244, "Metrics/AbcSize: Assignment Branch Condition size for `align` is too high. [<19, 37, 12> 43.29/17]", 1243937217], + [27, 7, 2244, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `align` is too high. [12/7]", 1243937217], + [27, 7, 2244, "Metrics/MethodLength: Method has too many lines. [55/10]", 1243937217], + [27, 7, 2244, "Metrics/PerceivedComplexity: Perceived complexity for `align` is too high. [12/8]", 1243937217], + [148, 7, 655, "Metrics/MethodLength: Method has too many lines. [14/10]", 2468821688], + [180, 7, 455, "Metrics/MethodLength: Method has too many lines. [13/10]", 2361153066], + [199, 7, 1557, "Metrics/AbcSize: Assignment Branch Condition size for `apply_match_refiner!` is too high. [<10, 28, 12> 32.06/17]", 2386945712], + [199, 7, 1557, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_match_refiner!` is too high. [13/7]", 2386945712], + [199, 7, 1557, "Metrics/MethodLength: Method has too many lines. [31/10]", 2386945712], + [199, 7, 1557, "Metrics/PerceivedComplexity: Perceived complexity for `apply_match_refiner!` is too high. [13/8]", 2386945712] + ], + "lib/ast/merge/file_analyzable.rb:607555963": [ + [36, 5, 31229, "Metrics/ModuleLength: Module has too many lines. [316/100]", 1247752256], + [99, 19, 9, "Style/NumericPredicate: Use `index.negative?` instead of `index < 0`.", 4215255415], + [148, 7, 793, "Metrics/MethodLength: Method has too many lines. [22/10]", 1467470910], + [202, 7, 771, "Metrics/MethodLength: Method has too many lines. [16/10]", 1412317163], + [344, 7, 844, "Metrics/MethodLength: Method has too many lines. [12/10]", 2335919661], + [369, 7, 730, "Metrics/MethodLength: Method has too many lines. [11/10]", 1047958652], + [431, 7, 863, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_layout_owned_comment_attachment` is too high. [<0, 20, 4> 20.4/17]", 3284843691], + [431, 7, 863, "Metrics/MethodLength: Method has too many lines. [17/10]", 3284843691], + [481, 7, 683, "Metrics/MethodLength: Method has too many lines. [15/10]", 241044926], + [520, 14, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [614, 7, 6095, "Metrics/AbcSize: Assignment Branch Condition size for `generate_signature` is too high. [<4, 21, 13> 25.02/17]", 2828809875], + [614, 7, 6095, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `generate_signature` is too high. [11/7]", 2828809875], + [614, 7, 6095, "Metrics/MethodLength: Method has too many lines. [30/10]", 2828809875], + [614, 7, 6095, "Metrics/PerceivedComplexity: Perceived complexity for `generate_signature` is too high. [14/8]", 2828809875], + [676, 24, 390, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 3279112483] + ], + "lib/ast/merge/freeze_node_base.rb:2110274026": [ + [59, 5, 14572, "Metrics/ClassLength: Class has too many lines. [171/100]", 3038607603], + [108, 25, 545, "Style/MutableConstant: Freeze mutable objects assigned to constants.", 2366014160], + [186, 9, 1100, "Metrics/MethodLength: Method has too many lines. [15/10]", 2506841532], + [288, 7, 758, "Metrics/MethodLength: Method has too many lines. [11/10]", 136868205], + [288, 21, 276, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 1720059801], + [335, 7, 660, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `reason` is too high. [8/7]", 3127566048], + [418, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] + ], + "lib/ast/merge/healer.rb:3642412735": [ + [18, 7, 588, "Metrics/MethodLength: Method has too many lines. [15/10]", 3172269921], + [18, 17, 84, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1781025196], + [41, 7, 687, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `filter_items` is too high. [8/7]", 1200842691], + [41, 7, 687, "Metrics/MethodLength: Method has too many lines. [17/10]", 1200842691], + [41, 7, 687, "Metrics/PerceivedComplexity: Perceived complexity for `filter_items` is too high. [9/8]", 1200842691], + [41, 23, 130, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 33939503] + ], + "lib/ast/merge/jaccard_similarity.rb:678558736": [ + [87, 19, 1, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 177604], + [87, 22, 1, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 177607] + ], + "lib/ast/merge/key_path_partial_template_merger_base.rb:1818613864": [ + [22, 5, 6114, "Metrics/ClassLength: Class has too many lines. [155/100]", 1269962119], + [43, 21, 214, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 3637591635], + [68, 7, 489, "Metrics/MethodLength: Method has too many lines. [12/10]", 3170411580], + [118, 7, 640, "Metrics/AbcSize: Assignment Branch Condition size for `find_key_path` is too high. [<8, 14, 10> 18.97/17]", 2613403604], + [118, 7, 640, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_key_path` is too high. [8/7]", 2613403604], + [118, 7, 640, "Metrics/MethodLength: Method has too many lines. [16/10]", 2613403604], + [118, 7, 640, "Metrics/PerceivedComplexity: Perceived complexity for `find_key_path` is too high. [9/8]", 2613403604], + [140, 7, 536, "Metrics/MethodLength: Method has too many lines. [17/10]", 3598062652], + [168, 7, 804, "Metrics/MethodLength: Method has too many lines. [19/10]", 2773364183] + ], + "lib/ast/merge/layout.rb:3670500101": [ + [23, 36, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] + ], + "lib/ast/merge/layout/augmenter.rb:2556116722": [ + [8, 7, 5498, "Metrics/ClassLength: Class has too many lines. [129/100]", 3693754698], + [21, 23, 125, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 3395039982], + [53, 9, 1795, "Metrics/AbcSize: Assignment Branch Condition size for `build!` is too high. [<20, 32, 17> 41.39/17]", 3542913254], + [53, 9, 1795, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build!` is too high. [15/7]", 3542913254], + [53, 9, 1795, "Metrics/MethodLength: Method has too many lines. [43/10]", 3542913254], + [53, 9, 1795, "Metrics/PerceivedComplexity: Perceived complexity for `build!` is too high. [15/8]", 3542913254], + [58, 11, 1227, "Metrics/BlockLength: Block has too many lines. [29/25]", 55360131], + [105, 9, 504, "Metrics/MethodLength: Method has too many lines. [16/10]", 1953725517] + ], + "lib/ast/merge/layout/gap.rb:1678106201": [ + [11, 7, 7558, "Metrics/ClassLength: Class has too many lines. [151/100]", 2254377349], + [23, 9, 655, "Metrics/MethodLength: Method has too many lines. [11/10]", 3584854768], + [23, 23, 146, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 361396001], + [157, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859545], + [162, 9, 303, "Metrics/MethodLength: Method has too many lines. [12/10]", 2236444774], + [203, 9, 688, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_adjacency!` is too high. [10/7]", 1112786311], + [203, 9, 688, "Metrics/MethodLength: Method has too many lines. [13/10]", 1112786311] + ], + "lib/ast/merge/match_refiner_base.rb:1760054866": [ + [248, 7, 503, "Metrics/MethodLength: Method has too many lines. [11/10]", 2844230268], + [275, 7, 1056, "Metrics/AbcSize: Assignment Branch Condition size for `greedy_match` is too high. [<9, 24, 8> 26.85/17]", 2497617815], + [275, 7, 1056, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `greedy_match` is too high. [8/7]", 2497617815], + [275, 7, 1056, "Metrics/MethodLength: Method has too many lines. [24/10]", 2497617815] + ], + "lib/ast/merge/merge_result_base.rb:764500297": [ + [17, 5, 18646, "Metrics/ClassLength: Class has too many lines. [335/100]", 314460772], + [88, 21, 187, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1067369198], + [187, 7, 843, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_blank_line_runs!` is too high. [<12, 12, 10> 19.7/17]", 2347011594], + [187, 7, 843, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_blank_line_runs!` is too high. [9/7]", 2347011594], + [187, 7, 843, "Metrics/MethodLength: Method has too many lines. [22/10]", 2347011594], + [187, 7, 843, "Metrics/PerceivedComplexity: Perceived complexity for `normalize_blank_line_runs!` is too high. [10/8]", 2347011594], + [227, 7, 1004, "Metrics/MethodLength: Method has too many lines. [21/10]", 59539336], + [227, 35, 211, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 709487711], + [266, 7, 602, "Metrics/MethodLength: Method has too many lines. [13/10]", 320027623], + [341, 7, 927, "Metrics/AbcSize: Assignment Branch Condition size for `validate_review_state_compatibility!` is too high. [<8, 15, 4> 17.46/17]", 1596840080], + [341, 7, 927, "Metrics/MethodLength: Method has too many lines. [16/10]", 1596840080], + [403, 7, 936, "Metrics/AbcSize: Assignment Branch Condition size for `review_state_metadata` is too high. [<7, 18, 4> 19.72/17]", 4128292066], + [403, 7, 936, "Metrics/MethodLength: Method has too many lines. [14/10]", 4128292066], + [413, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 20421901], + [438, 7, 1194, "Metrics/MethodLength: Method has too many lines. [21/10]", 4289697646], + [448, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3342583337] + ], + "lib/ast/merge/merger_config.rb:3582657829": [ + [46, 5, 10581, "Metrics/ClassLength: Class has too many lines. [148/100]", 1598770872], + [96, 21, 234, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 720509970] + ], + "lib/ast/merge/navigable/injection_point_finder.rb:4117743218": [ + [45, 9, 1707, "Metrics/AbcSize: Assignment Branch Condition size for `find` is too high. [<9, 18, 17> 26.34/17]", 1445381162], + [45, 9, 1707, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find` is too high. [15/7]", 1445381162], + [45, 9, 1707, "Metrics/MethodLength: Method has too many lines. [28/10]", 1445381162], + [45, 9, 1707, "Metrics/PerceivedComplexity: Perceived complexity for `find` is too high. [16/8]", 1445381162], + [45, 17, 156, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 3876813166] + ], + "lib/ast/merge/navigable/statement.rb:3050515622": [ + [42, 7, 11078, "Metrics/ClassLength: Class has too many lines. [179/100]", 2550894515], + [96, 11, 550, "Metrics/AbcSize: Assignment Branch Condition size for `find_matching` is too high. [<7, 16, 12> 21.19/17]", 3492534565], + [96, 11, 550, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_matching` is too high. [12/7]", 3492534565], + [96, 11, 550, "Metrics/PerceivedComplexity: Perceived complexity for `find_matching` is too high. [12/8]", 3492534565], + [222, 13, 20, "Naming/PredicatePrefix: Rename `has_tree_navigation?` to `tree_navigation?`.", 733442156] + ], + "lib/ast/merge/node_typing.rb:4008165135": [ + [175, 9, 694, "Metrics/MethodLength: Method has too many lines. [12/10]", 777909930], + [213, 9, 891, "Metrics/AbcSize: Assignment Branch Condition size for `find_typing_callable` is too high. [<3, 23, 13> 26.59/17]", 3835052858], + [213, 9, 891, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_typing_callable` is too high. [14/7]", 3835052858], + [213, 9, 891, "Metrics/PerceivedComplexity: Perceived complexity for `find_typing_callable` is too high. [14/8]", 3835052858] + ], + "lib/ast/merge/node_wrapper_base.rb:3796877358": [ + [62, 5, 10228, "Metrics/ClassLength: Class has too many lines. [135/100]", 3832956007], + [92, 21, 81, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 4261369704] + ], + "lib/ast/merge/owner_selection.rb:2568070127": [ + [9, 7, 757, "Metrics/MethodLength: Method has too many lines. [13/10]", 2069564552] + ], + "lib/ast/merge/partial_template_merger_base.rb:2252899061": [ + [27, 5, 16780, "Metrics/ClassLength: Class has too many lines. [266/100]", 2205844189], + [48, 23, 81, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2112244807], + [106, 7, 757, "Metrics/MethodLength: Method has too many lines. [11/10]", 571708764], + [106, 21, 293, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 871709580], + [135, 7, 788, "Metrics/AbcSize: Assignment Branch Condition size for `merge` is too high. [<4, 19, 5> 20.05/17]", 467674580], + [135, 7, 788, "Metrics/MethodLength: Method has too many lines. [13/10]", 467674580], + [213, 7, 533, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_matcher` is too high. [<7, 20, 6> 22.02/17]", 1798972396], + [238, 7, 922, "Metrics/MethodLength: Method has too many lines. [25/10]", 1846154069], + [242, 25, 37, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 939456830], + [251, 25, 31, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 1024894473], + [268, 7, 1905, "Metrics/AbcSize: Assignment Branch Condition size for `perform_section_merge` is too high. [<13, 15, 2> 19.95/17]", 2711014340], + [268, 7, 1905, "Metrics/MethodLength: Method has too many lines. [34/10]", 2711014340], + [316, 50, 15, "Lint/UnusedMethodArgument: Unused method argument - `section_context`.", 2872123372], + [334, 7, 690, "Metrics/MethodLength: Method has too many lines. [14/10]", 1807124523], + [367, 7, 1122, "Metrics/AbcSize: Assignment Branch Condition size for `build_merged_content` is too high. [<1, 29, 14> 32.22/17]", 3938410418], + [367, 7, 1122, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_merged_content` is too high. [15/7]", 3938410418], + [367, 7, 1122, "Metrics/MethodLength: Method has too many lines. [18/10]", 3938410418], + [367, 7, 1122, "Metrics/PerceivedComplexity: Perceived complexity for `build_merged_content` is too high. [15/8]", 3938410418], + [397, 7, 596, "Metrics/MethodLength: Method has too many lines. [12/10]", 2602121883], + [397, 32, 144, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1463491208], + [414, 7, 1589, "Metrics/AbcSize: Assignment Branch Condition size for `source_splice_plan_for` is too high. [<6, 18, 9> 21/17]", 2889667289], + [414, 7, 1589, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `source_splice_plan_for` is too high. [9/7]", 2889667289], + [414, 7, 1589, "Metrics/MethodLength: Method has too many lines. [30/10]", 2889667289], + [414, 7, 1589, "Metrics/PerceivedComplexity: Perceived complexity for `source_splice_plan_for` is too high. [9/8]", 2889667289] + ], + "lib/ast/merge/recipe/config.rb:3990762705": [ + [54, 7, 14970, "Metrics/ClassLength: Class has too many lines. [296/100]", 2492031021], + [142, 9, 673, "Metrics/MethodLength: Method has too many lines. [12/10]", 3011978845], + [170, 9, 484, "Metrics/MethodLength: Method has too many lines. [15/10]", 183356432], + [246, 9, 710, "Metrics/AbcSize: Assignment Branch Condition size for `parse_injection` is too high. [<8, 13, 8> 17.23/17]", 641239814], + [246, 9, 710, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_injection` is too high. [9/7]", 641239814], + [246, 9, 710, "Metrics/MethodLength: Method has too many lines. [16/10]", 641239814], + [246, 9, 710, "Metrics/PerceivedComplexity: Perceived complexity for `parse_injection` is too high. [9/8]", 641239814], + [278, 9, 871, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_step` is too high. [8/7]", 3989307721], + [278, 9, 871, "Metrics/MethodLength: Method has too many lines. [20/10]", 3989307721], + [338, 9, 1758, "Metrics/AbcSize: Assignment Branch Condition size for `parse_step_merge_overrides` is too high. [<11, 43, 25> 50.94/17]", 806370438], + [338, 9, 1758, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_step_merge_overrides` is too high. [22/7]", 806370438], + [338, 9, 1758, "Metrics/MethodLength: Method has too many lines. [30/10]", 806370438], + [338, 9, 1758, "Metrics/PerceivedComplexity: Perceived complexity for `parse_step_merge_overrides` is too high. [22/8]", 806370438], + [373, 9, 566, "Metrics/MethodLength: Method has too many lines. [14/10]", 3671206955], + [391, 9, 547, "Metrics/MethodLength: Method has too many lines. [16/10]", 3273587697], + [459, 9, 799, "Metrics/AbcSize: Assignment Branch Condition size for `validate_injection!` is too high. [<2, 15, 12> 19.31/17]", 1665903587], + [459, 9, 799, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_injection!` is too high. [13/7]", 1665903587], + [459, 9, 799, "Metrics/MethodLength: Method has too many lines. [11/10]", 1665903587], + [459, 9, 799, "Metrics/PerceivedComplexity: Perceived complexity for `validate_injection!` is too high. [13/8]", 1665903587] + ], + "lib/ast/merge/recipe/preset.rb:2311326866": [ + [195, 9, 662, "Metrics/MethodLength: Method has too many lines. [12/10]", 1640897447] + ], + "lib/ast/merge/recipe/runner.rb:2243867806": [ + [27, 7, 28612, "Metrics/ClassLength: Class has too many lines. [547/100]", 79000832], + [73, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1411864995], + [77, 23, 136, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1636278032], + [92, 9, 849, "Metrics/MethodLength: Method has too many lines. [14/10]", 3083064345], + [128, 24, 129, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2642826282], + [210, 9, 788, "Metrics/MethodLength: Method has too many lines. [23/10]", 743008161], + [241, 9, 3397, "Metrics/AbcSize: Assignment Branch Condition size for `create_partial_template_merger` is too high. [<3, 52, 16> 54.49/17]", 2086180075], + [241, 9, 3397, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `create_partial_template_merger` is too high. [14/7]", 2086180075], + [241, 9, 3397, "Metrics/MethodLength: Method has too many lines. [63/10]", 2086180075], + [241, 9, 3397, "Metrics/PerceivedComplexity: Perceived complexity for `create_partial_template_merger` is too high. [13/8]", 2086180075], + [250, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2857356312], + [274, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177538], + [312, 9, 2210, "Metrics/AbcSize: Assignment Branch Condition size for `create_smart_merger` is too high. [<1, 39, 7> 39.64/17]", 1694660188], + [312, 9, 2210, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `create_smart_merger` is too high. [8/7]", 1694660188], + [312, 9, 2210, "Metrics/MethodLength: Method has too many lines. [45/10]", 1694660188], + [357, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 195423462], + [370, 9, 1087, "Metrics/MethodLength: Method has too many lines. [24/10]", 3850049530], + [370, 31, 124, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3466458723], + [401, 9, 1008, "Metrics/MethodLength: Method has too many lines. [19/10]", 2010895303], + [401, 25, 143, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2360959504], + [424, 9, 1263, "Metrics/AbcSize: Assignment Branch Condition size for `execute_partial_merge_step` is too high. [<3, 22, 1> 22.23/17]", 2850918453], + [424, 9, 1263, "Metrics/MethodLength: Method has too many lines. [25/10]", 2850918453], + [453, 9, 835, "Metrics/MethodLength: Method has too many lines. [14/10]", 1478843287], + [471, 9, 808, "Metrics/MethodLength: Method has too many lines. [15/10]", 1127254660], + [471, 37, 155, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 838578768], + [491, 9, 1126, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_smart_merge_result` is too high. [<8, 17, 12> 22.29/17]", 1786697339], + [491, 9, 1126, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_smart_merge_result` is too high. [9/7]", 1786697339], + [491, 9, 1126, "Metrics/MethodLength: Method has too many lines. [23/10]", 1786697339], + [491, 9, 1126, "Metrics/PerceivedComplexity: Perceived complexity for `normalize_smart_merge_result` is too high. [11/8]", 1786697339], + [518, 9, 2523, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_script_step_result` is too high. [<5, 40, 32> 51.47/17]", 2162420067], + [518, 9, 2523, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_script_step_result` is too high. [26/7]", 2162420067], + [518, 9, 2523, "Metrics/MethodLength: Method has too many lines. [48/10]", 2162420067], + [518, 9, 2523, "Metrics/PerceivedComplexity: Perceived complexity for `normalize_script_step_result` is too high. [29/8]", 2162420067], + [547, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 93872446], + [556, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 1527250939], + [586, 11, 155, "Style/HashTransformKeys: Prefer `transform_keys` over `each_with_object`.", 837503672], + [591, 9, 698, "Metrics/MethodLength: Method has too many lines. [11/10]", 1116310304], + [635, 9, 2582, "Metrics/AbcSize: Assignment Branch Condition size for `create_result_from_steps` is too high. [<8, 30, 31> 43.87/17]", 2040042265], + [635, 9, 2582, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `create_result_from_steps` is too high. [23/7]", 2040042265], + [635, 9, 2582, "Metrics/MethodLength: Method has too many lines. [60/10]", 2040042265], + [635, 9, 2582, "Metrics/PerceivedComplexity: Perceived complexity for `create_result_from_steps` is too high. [27/8]", 2040042265], + [635, 37, 133, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 789257106], + [649, 42, 40, "Style/SymbolProc: Pass `&:has_anchor` as an argument to `any?` instead of a block.", 4233626321] + ], + "lib/ast/merge/recipe/script_loader.rb:1397873218": [ + [145, 9, 1126, "Metrics/AbcSize: Assignment Branch Condition size for `load_script_file` is too high. [<6, 19, 4> 20.32/17]", 3417625171], + [145, 9, 1126, "Metrics/MethodLength: Method has too many lines. [17/10]", 3417625171] + ], + "lib/ast/merge/rspec/comment_behavior_matrix_adapters.rb:3429217018": [ + [9, 46, 341, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 532439002], + [31, 9, 901, "Metrics/MethodLength: Method has too many lines. [11/10]", 584608092], + [31, 59, 308, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 883491898], + [54, 9, 1269, "Metrics/MethodLength: Method has too many lines. [20/10]", 1021031182], + [65, 51, 6, "Lint/UnusedBlockArgument: Unused block argument - `inline`. If it's necessary, use `_` or `_inline` as an argument name to indicate that it won't be used.", 1605470060], + [69, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 4226982364], + [70, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1440420861] + ], + "lib/ast/merge/rspec/conformance_fixtures.rb:1295759615": [ + [6, 7, 26, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::RSpec::ConformanceFixtures`.", 90066768], + [9, 9, 1432, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_conformance_fixture_support` is too high. [<10, 30, 33> 45.71/17]", 518714108], + [9, 9, 1432, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_conformance_fixture_support` is too high. [33/7]", 518714108], + [9, 9, 1432, "Metrics/MethodLength: Method has too many lines. [25/10]", 518714108], + [9, 9, 1432, "Metrics/PerceivedComplexity: Perceived complexity for `normalize_conformance_fixture_support` is too high. [31/8]", 518714108] + ], + "lib/ast/merge/rspec/dependency_tags_config.rb:3604516304": [ + [30, 1, 2102, "Metrics/BlockLength: Block has too many lines. [26/25]", 113766065] + ], + "lib/ast/merge/rspec/merge_gem_registry.rb:3009576030": [ + [58, 7, 12129, "Metrics/ModuleLength: Module has too many lines. [158/100]", 335549747], + [90, 9, 780, "Metrics/MethodLength: Method has too many lines. [14/10]", 978965737], + [90, 21, 99, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3580433546], + [118, 9, 650, "Metrics/MethodLength: Method has too many lines. [12/10]", 3143160805], + [118, 31, 130, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2575863904], + [143, 9, 823, "Metrics/MethodLength: Method has too many lines. [17/10]", 4033116153], + [200, 9, 765, "Metrics/AbcSize: Assignment Branch Condition size for `register_known_gems` is too high. [<3, 17, 3> 17.52/17]", 1367620151], + [200, 9, 765, "Metrics/MethodLength: Method has too many lines. [17/10]", 1367620151] + ], + "lib/ast/merge/rspec/shared_examples.rb:2878318351": [ + [29, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 330577472] + ], + "lib/ast/merge/rspec/shared_examples/comment_behavior_matrix.rb:3695671858": [ + [36, 1, 27847, "Metrics/BlockLength: Block has too many lines. [540/25]", 3796645407], + [38, 55, 15, "Style/SymbolProc: Pass `&:value` as an argument to `lambda` instead of a block.", 1808354951], + [42, 64, 23, "Style/SymbolProc: Pass `&:statements` as an argument to `lambda` instead of a block.", 277221641], + [69, 3, 4455, "Metrics/BlockLength: Block has too many lines. [82/25]", 3672334777], + [72, 5, 1763, "Metrics/BlockLength: Block has too many lines. [34/25]", 164750821], + [165, 3, 22093, "Metrics/BlockLength: Block has too many lines. [429/25]", 229312375], + [292, 5, 1918, "Metrics/BlockLength: Block has too many lines. [29/25]", 1312741055], + [323, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1902517440], + [325, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 173482512], + [328, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 167607404], + [476, 5, 1605, "Metrics/BlockLength: Block has too many lines. [35/25]", 1943633697], + [677, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1902517440] + ], + "lib/ast/merge/rspec/shared_examples/conflict_resolver_base.rb:624045197": [ + [30, 1, 7893, "Metrics/BlockLength: Block has too many lines. [197/25]", 3450672926], + [37, 3, 1372, "Metrics/BlockLength: Block has too many lines. [33/25]", 3389152504], + [83, 3, 1206, "Metrics/BlockLength: Block has too many lines. [35/25]", 1580202348], + [128, 3, 1177, "Metrics/BlockLength: Block has too many lines. [33/25]", 2178974049], + [215, 3, 2443, "Metrics/BlockLength: Block has too many lines. [51/25]", 2538475273], + [219, 5, 1909, "Metrics/BlockLength: Block has too many lines. [35/25]", 880175101], + [279, 1, 2518, "Metrics/BlockLength: Block has too many lines. [74/25]", 958151448], + [286, 3, 2235, "Metrics/BlockLength: Block has too many lines. [70/25]", 2123260684], + [391, 1, 1317, "Metrics/BlockLength: Block has too many lines. [37/25]", 2321517041], + [439, 1, 1639, "Metrics/BlockLength: Block has too many lines. [37/25]", 276150366] + ], + "lib/ast/merge/rspec/shared_examples/debug_logger.rb:2747003588": [ + [23, 1, 4741, "Metrics/BlockLength: Block has too many lines. [121/25]", 3341338388], + [47, 3, 976, "Metrics/BlockLength: Block has too many lines. [27/25]", 2640321404], + [85, 3, 1452, "Metrics/BlockLength: Block has too many lines. [34/25]", 554663062] + ], + "lib/ast/merge/rspec/shared_examples/feature_profile.rb:4172143324": [ + [30, 1, 4249, "Metrics/BlockLength: Block has too many lines. [53/25]", 3787230403] + ], + "lib/ast/merge/rspec/shared_examples/file_analyzable.rb:2391547213": [ + [44, 1, 6468, "Metrics/BlockLength: Block has too many lines. [145/25]", 3744642916] + ], + "lib/ast/merge/rspec/shared_examples/freeze_node_base.rb:1711126715": [ + [23, 1, 5952, "Metrics/BlockLength: Block has too many lines. [157/25]", 3152271039], + [29, 3, 2836, "Metrics/BlockLength: Block has too many lines. [69/25]", 2082270913], + [115, 3, 1552, "Metrics/BlockLength: Block has too many lines. [46/25]", 4180117745] + ], + "lib/ast/merge/rspec/shared_examples/layout_attachment.rb:4130619694": [ + [30, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 1263574869], + [31, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 4282300883] + ], + "lib/ast/merge/rspec/shared_examples/layout_augmenter.rb:1928277603": [ + [18, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1311107624], + [19, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1311107624] + ], + "lib/ast/merge/rspec/shared_examples/merge_result_base.rb:2962043558": [ + [18, 1, 2330, "Metrics/BlockLength: Block has too many lines. [67/25]", 3496673178], + [53, 3, 1271, "Metrics/BlockLength: Block has too many lines. [42/25]", 2278976858] + ], + "lib/ast/merge/rspec/shared_examples/merger_config.rb:2413785902": [ + [18, 1, 8240, "Metrics/BlockLength: Block has too many lines. [193/25]", 3665443345], + [57, 3, 1628, "Metrics/BlockLength: Block has too many lines. [32/25]", 7828299], + [98, 3, 1266, "Metrics/BlockLength: Block has too many lines. [28/25]", 317929439], + [159, 3, 1740, "Metrics/BlockLength: Block has too many lines. [42/25]", 1736487820], + [217, 3, 1373, "Metrics/BlockLength: Block has too many lines. [30/25]", 442933563] + ], + "lib/ast/merge/rspec/shared_examples/recipe_preset_contract.rb:1495545061": [ + [7, 1, 2558, "Metrics/BlockLength: Block has too many lines. [51/25]", 4091815632] + ], + "lib/ast/merge/rspec/shared_examples/removal_mode_compliance.rb:3645548199": [ + [24, 1, 1860, "Metrics/BlockLength: Block has too many lines. [33/25]", 1115825136] + ], + "lib/ast/merge/rspec/shared_examples/reproducible_merge.rb:2276592459": [ + [51, 1, 2030, "Metrics/BlockLength: Block has too many lines. [52/25]", 563553381] + ], + "lib/ast/merge/rspec/shared_examples/reproducible_partial_merge.rb:524436129": [ + [3, 1, 2321, "Metrics/BlockLength: Block has too many lines. [44/25]", 3206099540] + ], + "lib/ast/merge/rspec/shared_examples/runtime_debug_contract.rb:4244040583": [ + [8, 1, 2808, "Metrics/BlockLength: Block has too many lines. [48/25]", 3274492878] + ], + "lib/ast/merge/rspec/shared_examples/unresolved_helper_contract.rb:2916431464": [ + [9, 1, 5998, "Metrics/BlockLength: Block has too many lines. [126/25]", 4174562424], + [94, 3, 1515, "Metrics/BlockLength: Block has too many lines. [32/25]", 1928238376] + ], + "lib/ast/merge/rspec/shared_examples/unresolved_review_state_transport_contract.rb:3368966854": [ + [14, 1, 3386, "Metrics/BlockLength: Block has too many lines. [68/25]", 2910343214], + [65, 3, 317, "Metrics/MethodLength: Method has too many lines. [12/10]", 2653897690] + ], + "lib/ast/merge/rspec/shared_examples/unresolved_runtime_contract.rb:1424234700": [ + [10, 1, 2652, "Metrics/BlockLength: Block has too many lines. [42/25]", 960283638], + [31, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2892620242], + [46, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193437756] + ], + "lib/ast/merge/rspec/shared_examples/unresolved_runtime_debug_contract.rb:2897026147": [ + [25, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2418171787], + [26, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 235635831] + ], + "lib/ast/merge/ruleset/config.rb:4242726919": [ + [7, 7, 3664, "Metrics/ClassLength: Class has too many lines. [101/100]", 1968929597], + [36, 9, 933, "Metrics/MethodLength: Method has too many lines. [15/10]", 3334511209], + [36, 23, 319, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [15/5]", 1652945408], + [65, 9, 515, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 18, 3> 18.25/17]", 2614325513], + [65, 9, 515, "Metrics/MethodLength: Method has too many lines. [14/10]", 2614325513] + ], + "lib/ast/merge/ruleset/feature_profile.rb:3980745364": [ + [12, 7, 6054, "Metrics/ClassLength: Class has too many lines. [155/100]", 2818730231], + [29, 9, 1351, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<17, 18, 7> 25.73/17]", 2248702332], + [29, 9, 1351, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `initialize` is too high. [8/7]", 2248702332], + [29, 9, 1351, "Metrics/MethodLength: Method has too many lines. [17/10]", 2248702332], + [29, 23, 422, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 1415781648], + [138, 9, 1509, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 36, 6> 36.5/17]", 3793816437], + [138, 9, 1509, "Metrics/MethodLength: Method has too many lines. [31/10]", 3793816437] + ], + "lib/ast/merge/ruleset/parser.rb:698282871": [ + [7, 7, 9396, "Metrics/ClassLength: Class has too many lines. [199/100]", 1305123525], + [43, 9, 473, "Metrics/AbcSize: Assignment Branch Condition size for `parse` is too high. [<0, 17, 2> 17.12/17]", 1400394586], + [43, 9, 473, "Metrics/MethodLength: Method has too many lines. [12/10]", 1400394586], + [71, 9, 1053, "Metrics/MethodLength: Method has too many lines. [24/10]", 1569959910], + [101, 9, 1123, "Metrics/AbcSize: Assignment Branch Condition size for `parse_single_value_directive!` is too high. [<7, 13, 10> 17.83/17]", 706129883], + [101, 9, 1123, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_single_value_directive!` is too high. [8/7]", 706129883], + [101, 9, 1123, "Metrics/MethodLength: Method has too many lines. [24/10]", 706129883], + [170, 9, 605, "Metrics/MethodLength: Method has too many lines. [11/10]", 336127382], + [186, 9, 687, "Metrics/MethodLength: Method has too many lines. [11/10]", 2962844982] + ], + "lib/ast/merge/ruleset/profile_vocabulary.rb:2359837647": [ + [7, 7, 3956, "Metrics/ModuleLength: Module has too many lines. [107/100]", 1680256705] + ], + "lib/ast/merge/ruleset/runtime_declaration.rb:1016848190": [ + [18, 9, 819, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<11, 13, 5> 17.75/17]", 4043304883], + [18, 9, 819, "Metrics/MethodLength: Method has too many lines. [11/10]", 4043304883], + [18, 23, 240, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 3868000276], + [49, 9, 551, "Metrics/MethodLength: Method has too many lines. [13/10]", 448215861] + ], + "lib/ast/merge/ruleset/runtime_translator.rb:3255492631": [ + [9, 11, 816, "Metrics/MethodLength: Method has too many lines. [19/10]", 225301385], + [31, 11, 986, "Metrics/AbcSize: Assignment Branch Condition size for `feature_profile` is too high. [<1, 17, 0> 17.03/17]", 1395467476], + [31, 11, 986, "Metrics/MethodLength: Method has too many lines. [19/10]", 1395467476] + ], + "lib/ast/merge/ruleset/support_style_resolver.rb:508975884": [ + [9, 11, 864, "Metrics/MethodLength: Method has too many lines. [22/10]", 3902551296] + ], + "lib/ast/merge/runtime/child_result.rb:4083710804": [ + [16, 9, 698, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<7, 16, 2> 17.58/17]", 2208366179], + [16, 23, 227, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 3688358290], + [38, 9, 584, "Metrics/MethodLength: Method has too many lines. [11/10]", 3113479157], + [55, 11, 106, "Style/HashTransformKeys: Prefer `transform_keys` over `each_with_object`.", 4262612225] + ], + "lib/ast/merge/runtime/delegate.rb:3607371286": [ + [17, 23, 285, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 2793452069] + ], + "lib/ast/merge/runtime/diagnostic.rb:805162185": [ + [10, 23, 72, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1875462867] + ], + "lib/ast/merge/runtime/operation.rb:1030261783": [ + [20, 9, 767, "Metrics/MethodLength: Method has too many lines. [11/10]", 2728174753], + [20, 23, 278, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 694444911], + [100, 9, 617, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<2, 24, 6> 24.82/17]", 1175382849], + [100, 9, 617, "Metrics/MethodLength: Method has too many lines. [11/10]", 1175382849] + ], + "lib/ast/merge/runtime/resolution_case.rb:250040454": [ + [8, 9, 707, "Metrics/AbcSize: Assignment Branch Condition size for `from_h` is too high. [<1, 19, 6> 19.95/17]", 2592154170], + [29, 23, 189, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 818714714], + [81, 11, 111, "Style/HashTransformKeys: Prefer `transform_keys` over `each_with_object`.", 2712537644] + ], + "lib/ast/merge/runtime/root_session_support.rb:1917388966": [ + [10, 9, 2153, "Metrics/AbcSize: Assignment Branch Condition size for `start_runtime_root_session!` is too high. [<5, 20, 3> 20.83/17]", 1888056651], + [10, 9, 2153, "Metrics/MethodLength: Method has too many lines. [41/10]", 1888056651], + [10, 40, 421, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 2297301282], + [60, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2312419928], + [68, 9, 771, "Metrics/MethodLength: Method has too many lines. [13/10]", 1787620786], + [68, 43, 191, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3635875424] + ], + "lib/ast/merge/runtime/session.rb:628419040": [ + [66, 9, 1203, "Metrics/AbcSize: Assignment Branch Condition size for `summary` is too high. [<5, 43, 13> 45.2/17]", 550888870], + [66, 9, 1203, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `summary` is too high. [14/7]", 550888870], + [66, 9, 1203, "Metrics/MethodLength: Method has too many lines. [20/10]", 550888870], + [66, 9, 1203, "Metrics/PerceivedComplexity: Perceived complexity for `summary` is too high. [14/8]", 550888870] + ], + "lib/ast/merge/runtime/surface.rb:3684795905": [ + [17, 23, 230, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 469229117], + [44, 9, 418, "Metrics/MethodLength: Method has too many lines. [11/10]", 998969973] + ], + "lib/ast/merge/section_typing.rb:4261989256": [ + [112, 9, 710, "Metrics/MethodLength: Method has too many lines. [15/10]", 3600335459], + [176, 9, 67, "Lint/MissingSuper: Call `super` to initialize state of the parent class.", 4077537758], + [216, 9, 85, "Lint/MissingSuper: Call `super` to initialize state of the parent class.", 3648782014], + [245, 9, 1446, "Metrics/AbcSize: Assignment Branch Condition size for `merge_sections` is too high. [<13, 20, 12> 26.7/17]", 525095633], + [245, 9, 1446, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_sections` is too high. [12/7]", 525095633], + [245, 9, 1446, "Metrics/MethodLength: Method has too many lines. [28/10]", 525095633], + [245, 9, 1446, "Metrics/PerceivedComplexity: Perceived complexity for `merge_sections` is too high. [13/8]", 525095633] + ], + "lib/ast/merge/smart_merger_base.rb:4189972287": [ + [109, 5, 15324, "Metrics/ClassLength: Class has too many lines. [172/100]", 3547407870], + [214, 7, 1974, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<20, 14, 5> 24.92/17]", 2211610736], + [214, 7, 1974, "Metrics/MethodLength: Method has too many lines. [23/10]", 2211610736], + [214, 21, 443, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [15/5]", 1530523783], + [424, 7, 1312, "Metrics/AbcSize: Assignment Branch Condition size for `parse_and_analyze` is too high. [<7, 25, 11> 28.2/17]", 1640248187], + [424, 7, 1312, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_and_analyze` is too high. [10/7]", 1640248187], + [424, 7, 1312, "Metrics/MethodLength: Method has too many lines. [15/10]", 1640248187], + [424, 7, 1312, "Metrics/PerceivedComplexity: Perceived complexity for `parse_and_analyze` is too high. [10/8]", 1640248187], + [517, 12, 52, "Style/NumericPredicate: Use `result_class.instance_method(:initialize).arity.zero?` instead of `result_class.instance_method(:initialize).arity == 0`.", 1312375552] + ], + "lib/ast/merge/structural_edit/boundary.rb:2838060197": [ + [20, 23, 93, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3901214537], + [41, 38, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [51, 38, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [60, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087440865] + ], + "lib/ast/merge/structural_edit/boundary_support.rb:2036464761": [ + [31, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861061], + [32, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 97596930] + ], + "lib/ast/merge/structural_edit/plan_set.rb:538463647": [ + [116, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 2855200692] + ], + "lib/ast/merge/structural_edit/rehome_plan.rb:2152178780": [ + [23, 23, 123, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3433617242], + [100, 9, 519, "Metrics/MethodLength: Method has too many lines. [11/10]", 318006380], + [136, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 2367140872] + ], + "lib/ast/merge/structural_edit/remove_plan.rb:1189569486": [ + [11, 7, 9717, "Metrics/ClassLength: Class has too many lines. [160/100]", 3652701475], + [25, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861091], + [27, 9, 1409, "Metrics/MethodLength: Method has too many lines. [22/10]", 3344870777], + [27, 23, 255, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 3970946607], + [28, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 1637059282], + [36, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859104], + [196, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 1617827253], + [224, 9, 1032, "Metrics/MethodLength: Method has too many lines. [20/10]", 968444047] + ], + "lib/ast/merge/structural_edit/remove_plan_support.rb:877461974": [ + [9, 9, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631], + [19, 9, 1429, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_remove_plan` is too high. [8/7]", 4091314919], + [19, 9, 1429, "Metrics/MethodLength: Method has too many lines. [32/10]", 4091314919] + ], + "lib/ast/merge/structural_edit/splice_plan.rb:2675806114": [ + [39, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1683893295], + [42, 23, 203, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3653221702], + [113, 9, 517, "Metrics/MethodLength: Method has too many lines. [11/10]", 634912361] + ], + "lib/ast/merge/structured_emitter_provenance_support.rb:445323365": [ + [5, 5, 41, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::StructuredEmitterProvenanceSupport`.", 3548518830] + ], + "lib/ast/merge/structured_review_apply_support.rb:3649736380": [ + [5, 5, 35, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::StructuredReviewApplySupport`.", 1282380463], + [22, 7, 782, "Metrics/AbcSize: Assignment Branch Condition size for `current_output_span_for` is too high. [<6, 19, 11> 22.76/17]", 4137750179], + [22, 7, 782, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `current_output_span_for` is too high. [8/7]", 4137750179], + [22, 7, 782, "Metrics/MethodLength: Method has too many lines. [14/10]", 4137750179], + [42, 7, 595, "Metrics/MethodLength: Method has too many lines. [12/10]", 2080934521], + [60, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3151172498] + ], + "lib/ast/merge/text/conflict_resolver.rb:989169286": [ + [19, 7, 9182, "Metrics/ClassLength: Class has too many lines. [159/100]", 1070563745], + [28, 23, 211, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2639535499], + [53, 9, 2507, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_batch` is too high. [<15, 34, 5> 37.5/17]", 825130797], + [53, 9, 2507, "Metrics/MethodLength: Method has too many lines. [44/10]", 825130797], + [196, 9, 2458, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_matched_pair` is too high. [<2, 30, 11> 32.02/17]", 4037214978], + [196, 9, 2458, "Metrics/MethodLength: Method has too many lines. [46/10]", 4037214978] + ], + "lib/ast/merge/text/file_analysis.rb:1530312707": [ + [106, 9, 1484, "Metrics/AbcSize: Assignment Branch Condition size for `parse_statements` is too high. [<11, 15, 6> 19.54/17]", 1858083071], + [106, 9, 1484, "Metrics/MethodLength: Method has too many lines. [34/10]", 1858083071], + [160, 9, 449, "Metrics/MethodLength: Method has too many lines. [11/10]", 1902035813] + ], + "lib/ast/merge/text/line_node.rb:3385927013": [ + [145, 9, 699, "Metrics/MethodLength: Method has too many lines. [17/10]", 2201872249] + ], + "lib/ast/merge/text/section_splitter.rb:129704488": [ + [141, 9, 1442, "Metrics/AbcSize: Assignment Branch Condition size for `merge_section_lists` is too high. [<13, 20, 6> 24.6/17]", 3551729170], + [141, 9, 1442, "Metrics/MethodLength: Method has too many lines. [23/10]", 3551729170], + [322, 9, 1767, "Metrics/AbcSize: Assignment Branch Condition size for `split` is too high. [<11, 29, 10> 32.59/17]", 2207922758], + [322, 9, 1767, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split` is too high. [10/7]", 2207922758], + [322, 9, 1767, "Metrics/MethodLength: Method has too many lines. [46/10]", 2207922758], + [322, 9, 1767, "Metrics/PerceivedComplexity: Perceived complexity for `split` is too high. [13/8]", 2207922758], + [328, 11, 1019, "Metrics/BlockLength: Block has too many lines. [26/25]", 1561634792] + ], + "lib/ast/merge/text/smart_merger.rb:2405807903": [ + [67, 9, 831, "Metrics/MethodLength: Method has too many lines. [12/10]", 584426022], + [67, 23, 350, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 3074172637] + ], + "lib/ast/merge/trailing_groups/alignment_sort.rb:2593404330": [ + [40, 9, 513, "Metrics/MethodLength: Method has too many lines. [12/10]", 89360683] + ], + "lib/ast/merge/trailing_groups/core.rb:4231959665": [ + [61, 9, 812, "Metrics/MethodLength: Method has too many lines. [17/10]", 1777526069], + [101, 9, 998, "Metrics/AbcSize: Assignment Branch Condition size for `flush_ready_trailing_groups` is too high. [<8, 18, 15> 24.76/17]", 2397698441], + [101, 9, 998, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `flush_ready_trailing_groups` is too high. [13/7]", 2397698441], + [101, 9, 998, "Metrics/MethodLength: Method has too many lines. [17/10]", 2397698441], + [101, 9, 998, "Metrics/PerceivedComplexity: Perceived complexity for `flush_ready_trailing_groups` is too high. [13/8]", 2397698441] + ], + "lib/ast/merge/trailing_groups/dest_iterate.rb:3897205087": [ + [69, 9, 751, "Metrics/MethodLength: Method has too many lines. [12/10]", 3915657972], + [69, 47, 199, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2545849044] + ], + "lib/ast/merge/unresolved_support.rb:2881272494": [ + [7, 5, 24, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::UnresolvedSupport`.", 990281691], + [7, 5, 4392, "Metrics/ModuleLength: Module has too many lines. [116/100]", 3475162940], + [32, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [67, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [85, 7, 1038, "Metrics/MethodLength: Method has too many lines. [14/10]", 3139619197], + [85, 40, 338, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 71164914] + ], + "spec/ast/merge/ast_node_spec.rb:1362065144": [ + [3, 1, 8199, "Metrics/BlockLength: Block has too many lines. [254/25]", 1649868231], + [18, 3, 1030, "Metrics/BlockLength: Block has too many lines. [33/25]", 1409835577] + ], + "spec/ast/merge/block_directive_spec.rb:2305756581": [ + [3, 1, 5181, "Metrics/BlockLength: Block has too many lines. [138/25]", 1887900896], + [128, 3, 1391, "Metrics/BlockLength: Block has too many lines. [39/25]", 3626371694] + ], + "spec/ast/merge/comment/attachment_spec.rb:2571833836": [ + [3, 1, 5536, "Metrics/BlockLength: Block has too many lines. [150/25]", 1841571757], + [93, 3, 1639, "Metrics/BlockLength: Block has too many lines. [37/25]", 212730671] + ], + "spec/ast/merge/comment/augmenter_spec.rb:4266625483": [ + [3, 1, 9141, "Metrics/BlockLength: Block has too many lines. [212/25]", 530365996], + [16, 3, 6849, "Metrics/BlockLength: Block has too many lines. [154/25]", 503152628], + [200, 3, 1244, "Metrics/BlockLength: Block has too many lines. [33/25]", 3565041107] + ], + "spec/ast/merge/comment/block_spec.rb:4138473890": [ + [3, 1, 9021, "Metrics/BlockLength: Block has too many lines. [250/25]", 1617505173], + [8, 3, 1115, "Metrics/BlockLength: Block has too many lines. [27/25]", 2958989619], + [93, 3, 1127, "Metrics/BlockLength: Block has too many lines. [33/25]", 196340527], + [123, 45, 16, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 155572628], + [159, 3, 1432, "Metrics/BlockLength: Block has too many lines. [35/25]", 281400319] + ], + "spec/ast/merge/comment/c_style_tracker_base_spec.rb:3154319400": [ + [3, 1, 5816, "Metrics/BlockLength: Block has too many lines. [133/25]", 680831933], + [100, 3, 1450, "Metrics/BlockLength: Block has too many lines. [35/25]", 4153882185] + ], + "spec/ast/merge/comment/capability_spec.rb:2763521225": [ + [3, 1, 3522, "Metrics/BlockLength: Block has too many lines. [89/25]", 1487980773], + [4, 3, 1954, "Metrics/BlockLength: Block has too many lines. [41/25]", 160187362] + ], + "spec/ast/merge/comment/empty_spec.rb:1801324640": [ + [3, 1, 2584, "Metrics/BlockLength: Block has too many lines. [70/25]", 270179899], + [4, 3, 1047, "Metrics/BlockLength: Block has too many lines. [27/25]", 3056449816] + ], + "spec/ast/merge/comment/hash_tracker_base_spec.rb:3624528747": [ + [3, 1, 9653, "Metrics/BlockLength: Block has too many lines. [271/25]", 3748659406], + [8, 3, 1210, "Metrics/BlockLength: Block has too many lines. [37/25]", 2566766302], + [21, 7, 872, "Metrics/AbcSize: Assignment Branch Condition size for `extract_comments` is too high. [<7, 24, 5> 25.5/17]", 1213080161], + [21, 7, 872, "Metrics/MethodLength: Method has too many lines. [25/10]", 1213080161], + [275, 3, 1171, "Metrics/BlockLength: Block has too many lines. [29/25]", 1425466742] + ], + "spec/ast/merge/comment/line_spec.rb:1487829548": [ + [3, 1, 5291, "Metrics/BlockLength: Block has too many lines. [128/25]", 587604747], + [6, 3, 1573, "Metrics/BlockLength: Block has too many lines. [37/25]", 4105920006] + ], + "spec/ast/merge/comment/parser_spec.rb:2443973508": [ + [3, 1, 9855, "Metrics/BlockLength: Block has too many lines. [237/25]", 404174977], + [4, 3, 1013, "Metrics/BlockLength: Block has too many lines. [26/25]", 182655397], + [38, 3, 1282, "Metrics/BlockLength: Block has too many lines. [28/25]", 2303702609] + ], + "spec/ast/merge/comment/quoted_hash_line_parser_spec.rb:3795390831": [ + [3, 1, 1810, "Metrics/BlockLength: Block has too many lines. [44/25]", 2575838586], + [6, 3, 1700, "Metrics/BlockLength: Block has too many lines. [41/25]", 1553834548] + ], + "spec/ast/merge/comment/region_merge_policy_spec.rb:4175996936": [ + [3, 1, 3618, "Metrics/BlockLength: Block has too many lines. [75/25]", 4006378358], + [11, 3, 2752, "Metrics/BlockLength: Block has too many lines. [52/25]", 494211987] + ], + "spec/ast/merge/comment/region_spec.rb:2674736508": [ + [3, 1, 4033, "Metrics/BlockLength: Block has too many lines. [91/25]", 1828104331] + ], + "spec/ast/merge/comment/style_spec.rb:1875195890": [ + [3, 1, 4040, "Metrics/BlockLength: Block has too many lines. [101/25]", 2759361650] + ], + "spec/ast/merge/comment/support_style_spec.rb:1350169032": [ + [3, 1, 1577, "Metrics/BlockLength: Block has too many lines. [39/25]", 3414039011] + ], + "spec/ast/merge/comment/tracked_hash_adapter_spec.rb:1256807736": [ + [3, 1, 4482, "Metrics/BlockLength: Block has too many lines. [97/25]", 264417763], + [4, 3, 3101, "Metrics/BlockLength: Block has too many lines. [63/25]", 1050939978], + [81, 3, 1313, "Metrics/BlockLength: Block has too many lines. [30/25]", 515655104] + ], + "spec/ast/merge/comment_spec.rb:81945459": [ + [3, 1, 15888, "Metrics/BlockLength: Block has too many lines. [384/25]", 2229554982], + [4, 3, 3957, "Metrics/BlockLength: Block has too many lines. [84/25]", 660667217], + [5, 5, 1187, "Metrics/BlockLength: Block has too many lines. [26/25]", 241562105], + [105, 3, 1371, "Metrics/BlockLength: Block has too many lines. [30/25]", 1901983597], + [159, 3, 1296, "Metrics/BlockLength: Block has too many lines. [30/25]", 1749880380], + [239, 3, 1151, "Metrics/BlockLength: Block has too many lines. [28/25]", 183967322], + [272, 3, 2004, "Metrics/BlockLength: Block has too many lines. [45/25]", 2594323837], + [349, 3, 3220, "Metrics/BlockLength: Block has too many lines. [83/25]", 790417809], + [350, 5, 2347, "Metrics/BlockLength: Block has too many lines. [60/25]", 4016801881] + ], + "spec/ast/merge/composite_match_refiner_spec.rb:2888297870": [ + [3, 1, 6152, "Metrics/BlockLength: Block has too many lines. [143/25]", 3308692548], + [55, 3, 4118, "Metrics/BlockLength: Block has too many lines. [87/25]", 1405655464] + ], + "spec/ast/merge/conflict_resolver_base_spec.rb:3331938447": [ + [5, 1, 20643, "Metrics/BlockLength: Block has too many lines. [516/25]", 3129196558], + [14, 59, 14, "Lint/UnusedMethodArgument: Unused method argument - `template_index`.", 1809801172], + [14, 76, 10, "Lint/UnusedMethodArgument: Unused method argument - `dest_index`.", 2703999490], + [47, 61, 14, "Lint/UnusedMethodArgument: Unused method argument - `template_index`. You can also write as `resolve_node_pair(*)` if you want the method to accept any arguments but don't care about them.", 1809801172], + [47, 78, 10, "Lint/UnusedMethodArgument: Unused method argument - `dest_index`. You can also write as `resolve_node_pair(*)` if you want the method to accept any arguments but don't care about them.", 2703999490], + [105, 3, 17203, "Metrics/BlockLength: Block has too many lines. [425/25]", 1114912980], + [154, 5, 1797, "Metrics/BlockLength: Block has too many lines. [37/25]", 515146940], + [203, 5, 1373, "Metrics/BlockLength: Block has too many lines. [32/25]", 603210832], + [292, 5, 2874, "Metrics/BlockLength: Block has too many lines. [77/25]", 3918129775], + [341, 7, 1292, "Metrics/BlockLength: Block has too many lines. [34/25]", 1769555944], + [402, 5, 1857, "Metrics/BlockLength: Block has too many lines. [44/25]", 1516406612], + [456, 5, 1209, "Metrics/BlockLength: Block has too many lines. [31/25]", 430489898], + [514, 5, 2021, "Metrics/BlockLength: Block has too many lines. [37/25]", 144128170], + [515, 7, 1953, "Metrics/BlockLength: Block has too many lines. [35/25]", 1574966248], + [567, 5, 1500, "Metrics/BlockLength: Block has too many lines. [40/25]", 2509466150] + ], + "spec/ast/merge/content_match_refiner_spec.rb:4058001158": [ + [3, 1, 14348, "Metrics/BlockLength: Block has too many lines. [318/25]", 1171164704], + [25, 3, 1238, "Metrics/BlockLength: Block has too many lines. [29/25]", 2139810386], + [63, 3, 4077, "Metrics/BlockLength: Block has too many lines. [95/25]", 3471153375], + [325, 3, 2213, "Metrics/BlockLength: Block has too many lines. [37/25]", 3370370915] + ], + "spec/ast/merge/debug_logger_spec.rb:429510168": [ + [3, 1, 17306, "Metrics/BlockLength: Block has too many lines. [358/25]", 2287792973], + [251, 3, 1598, "Metrics/BlockLength: Block has too many lines. [27/25]", 3227542816], + [358, 3, 5118, "Metrics/BlockLength: Block has too many lines. [77/25]", 1759761803] + ], + "spec/ast/merge/detector/base_spec.rb:4157102211": [ + [3, 1, 3172, "Metrics/BlockLength: Block has too many lines. [100/25]", 3745104028], + [11, 7, 498, "Metrics/MethodLength: Method has too many lines. [13/10]", 3178368155], + [49, 3, 900, "Metrics/BlockLength: Block has too many lines. [28/25]", 2333048204] + ], + "spec/ast/merge/detector/fenced_code_block_spec.rb:495797689": [ + [3, 1, 11589, "Metrics/BlockLength: Block has too many lines. [363/25]", 3764545134], + [38, 3, 4467, "Metrics/BlockLength: Block has too many lines. [150/25]", 1597401000], + [41, 5, 1077, "Metrics/BlockLength: Block has too many lines. [31/25]", 2269642514], + [115, 5, 848, "Metrics/BlockLength: Block has too many lines. [27/25]", 1704866975], + [220, 3, 4815, "Metrics/BlockLength: Block has too many lines. [146/25]", 3797214474] + ], + "spec/ast/merge/detector/mergeable_spec.rb:1307688846": [ + [3, 1, 23175, "Metrics/BlockLength: Block has too many lines. [654/25]", 2932391114], + [77, 3, 2079, "Metrics/BlockLength: Block has too many lines. [53/25]", 1093085347], + [177, 3, 2217, "Metrics/BlockLength: Block has too many lines. [69/25]", 926985871], + [188, 5, 948, "Metrics/BlockLength: Block has too many lines. [26/25]", 4186135901], + [225, 5, 898, "Metrics/BlockLength: Block has too many lines. [31/25]", 513446836], + [266, 3, 1168, "Metrics/BlockLength: Block has too many lines. [29/25]", 774699411], + [304, 3, 1188, "Metrics/BlockLength: Block has too many lines. [27/25]", 4282853126], + [339, 3, 918, "Metrics/BlockLength: Block has too many lines. [28/25]", 1759590109], + [372, 3, 870, "Metrics/BlockLength: Block has too many lines. [28/25]", 131542026], + [410, 3, 3768, "Metrics/BlockLength: Block has too many lines. [111/25]", 181819560], + [483, 5, 1536, "Metrics/BlockLength: Block has too many lines. [47/25]", 385085357], + [540, 3, 1891, "Metrics/BlockLength: Block has too many lines. [52/25]", 602757329], + [664, 3, 1927, "Metrics/BlockLength: Block has too many lines. [56/25]", 48062261], + [691, 5, 1146, "Metrics/BlockLength: Block has too many lines. [31/25]", 1961728737], + [721, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3104497040], + [729, 3, 1625, "Metrics/BlockLength: Block has too many lines. [46/25]", 1570579215] + ], + "spec/ast/merge/detector/region_spec.rb:594725562": [ + [3, 1, 8128, "Metrics/BlockLength: Block has too many lines. [290/25]", 1984713692], + [4, 3, 806, "Metrics/BlockLength: Block has too many lines. [28/25]", 1515087192], + [58, 3, 1236, "Metrics/BlockLength: Block has too many lines. [45/25]", 2464968707], + [128, 3, 1063, "Metrics/BlockLength: Block has too many lines. [33/25]", 239148700], + [250, 3, 2010, "Metrics/BlockLength: Block has too many lines. [76/25]", 2595033382] + ], + "spec/ast/merge/detector/toml_frontmatter_spec.rb:1135160129": [ + [3, 1, 6717, "Metrics/BlockLength: Block has too many lines. [218/25]", 2273975625], + [12, 3, 5534, "Metrics/BlockLength: Block has too many lines. [187/25]", 538920673], + [13, 5, 1456, "Metrics/BlockLength: Block has too many lines. [38/25]", 3113759139] + ], + "spec/ast/merge/detector/yaml_frontmatter_spec.rb:2467934365": [ + [3, 1, 6702, "Metrics/BlockLength: Block has too many lines. [213/25]", 3083039982], + [12, 3, 5056, "Metrics/BlockLength: Block has too many lines. [170/25]", 1889948780], + [13, 5, 1438, "Metrics/BlockLength: Block has too many lines. [38/25]", 1736912391], + [219, 3, 1396, "Metrics/BlockLength: Block has too many lines. [33/25]", 2446467851] + ], + "spec/ast/merge/diff_mapper_base_spec.rb:1771546518": [ + [5, 1, 8521, "Metrics/BlockLength: Block has too many lines. [248/25]", 1057580573], + [22, 9, 44, "Style/InverseMethods: Use `reject` instead of inverting `select`.", 3063843489], + [46, 3, 3878, "Metrics/BlockLength: Block has too many lines. [116/25]", 2874032080], + [47, 5, 1938, "Metrics/BlockLength: Block has too many lines. [48/25]", 1904497583], + [191, 3, 1488, "Metrics/BlockLength: Block has too many lines. [43/25]", 1632956840] + ], + "spec/ast/merge/emitter_base_spec.rb:4197360291": [ + [3, 1, 11215, "Metrics/BlockLength: Block has too many lines. [282/25]", 4254840781], + [30, 3, 4393, "Metrics/BlockLength: Block has too many lines. [102/25]", 3992142376], + [134, 58, 12, "Lint/UnusedMethodArgument: Unused method argument - `current_line`. You can also write as `inline_comment_region_target_column(*)` if you want the method to accept any arguments but don't care about them.", 2091263933], + [138, 44, 6, "Lint/UnusedMethodArgument: Unused method argument - `region`.", 2124512157], + [159, 3, 1815, "Metrics/BlockLength: Block has too many lines. [39/25]", 719023387], + [206, 3, 2233, "Metrics/BlockLength: Block has too many lines. [62/25]", 3754339775], + [312, 3, 1059, "Metrics/BlockLength: Block has too many lines. [26/25]", 375007123] + ], + "spec/ast/merge/fictive_language_harness_spec.rb:1179155480": [ + [6, 1, 6693, "Metrics/BlockLength: Block has too many lines. [143/25]", 245088433], + [7, 3, 1968, "Metrics/BlockLength: Block has too many lines. [36/25]", 4161580169], + [58, 3, 1230, "Metrics/BlockLength: Block has too many lines. [34/25]", 990452676], + [103, 3, 2668, "Metrics/BlockLength: Block has too many lines. [51/25]", 1755027956] + ], + "spec/ast/merge/file_aligner_base_spec.rb:610089304": [ + [5, 1, 7287, "Metrics/BlockLength: Block has too many lines. [164/25]", 597898988], + [6, 3, 1237, "Metrics/BlockLength: Block has too many lines. [37/25]", 1284505259], + [86, 3, 5087, "Metrics/BlockLength: Block has too many lines. [84/25]", 119873771], + [94, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3749416415] + ], + "spec/ast/merge/file_analyzable_spec.rb:3816965829": [ + [3, 1, 12458, "Metrics/BlockLength: Block has too many lines. [272/25]", 216138965], + [25, 3, 9603, "Metrics/BlockLength: Block has too many lines. [202/25]", 2508188172], + [297, 3, 1214, "Metrics/BlockLength: Block has too many lines. [30/25]", 777182624] + ], + "spec/ast/merge/freezable_spec.rb:559280324": [ + [5, 1, 5033, "Metrics/BlockLength: Block has too many lines. [123/25]", 3070666859], + [6, 3, 1199, "Metrics/BlockLength: Block has too many lines. [34/25]", 4058875636], + [66, 3, 1530, "Metrics/BlockLength: Block has too many lines. [31/25]", 1670675428] + ], + "spec/ast/merge/freeze_node_base_spec.rb:2962962931": [ + [3, 1, 21887, "Metrics/BlockLength: Block has too many lines. [560/25]", 567315021], + [48, 3, 1369, "Metrics/BlockLength: Block has too many lines. [38/25]", 3363160391], + [131, 3, 2739, "Metrics/BlockLength: Block has too many lines. [56/25]", 2008289622], + [205, 3, 1586, "Metrics/BlockLength: Block has too many lines. [35/25]", 4179606047], + [251, 3, 977, "Metrics/BlockLength: Block has too many lines. [26/25]", 1240612851], + [287, 3, 1130, "Metrics/BlockLength: Block has too many lines. [28/25]", 2511265379], + [322, 3, 5029, "Metrics/BlockLength: Block has too many lines. [126/25]", 739537566], + [598, 3, 3055, "Metrics/BlockLength: Block has too many lines. [81/25]", 145217296] + ], + "spec/ast/merge/healer_spec.rb:877829793": [ + [3, 1, 4896, "Metrics/BlockLength: Block has too many lines. [148/25]", 1074378773], + [19, 3, 1333, "Metrics/BlockLength: Block has too many lines. [38/25]", 2940878263], + [24, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193432399], + [61, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085379023], + [67, 3, 2985, "Metrics/BlockLength: Block has too many lines. [93/25]", 4032786576] + ], + "spec/ast/merge/jaccard_similarity_spec.rb:3984307047": [ + [3, 1, 2659, "Metrics/BlockLength: Block has too many lines. [71/25]", 1122516612], + [6, 3, 1484, "Metrics/BlockLength: Block has too many lines. [38/25]", 3367914637], + [55, 3, 1090, "Metrics/BlockLength: Block has too many lines. [28/25]", 2629339264] + ], + "spec/ast/merge/key_path_partial_template_merger_base_spec.rb:2189485360": [ + [5, 1, 5955, "Metrics/BlockLength: Block has too many lines. [138/25]", 91542958], + [35, 3, 1217, "Metrics/BlockLength: Block has too many lines. [33/25]", 2663081123], + [97, 3, 3019, "Metrics/BlockLength: Block has too many lines. [54/25]", 1411952192] + ], + "spec/ast/merge/layout/attachment_spec.rb:3814294426": [ + [3, 1, 1799, "Metrics/BlockLength: Block has too many lines. [34/25]", 1283153367] + ], + "spec/ast/merge/layout/augmenter_spec.rb:3633045915": [ + [3, 1, 4412, "Metrics/BlockLength: Block has too many lines. [92/25]", 2690553031], + [20, 3, 2725, "Metrics/BlockLength: Block has too many lines. [54/25]", 3645203819] + ], + "spec/ast/merge/layout/gap_spec.rb:4232058283": [ + [3, 1, 2758, "Metrics/BlockLength: Block has too many lines. [72/25]", 2052697931], + [9, 3, 1290, "Metrics/BlockLength: Block has too many lines. [28/25]", 3175967312] + ], + "spec/ast/merge/match_refiner_base_spec.rb:3961767223": [ + [3, 1, 10604, "Metrics/BlockLength: Block has too many lines. [301/25]", 4290485382], + [4, 3, 1146, "Metrics/BlockLength: Block has too many lines. [37/25]", 108051658], + [50, 3, 1005, "Metrics/BlockLength: Block has too many lines. [28/25]", 3807648246], + [125, 3, 1026, "Metrics/BlockLength: Block has too many lines. [27/25]", 2896086726], + [162, 3, 4464, "Metrics/BlockLength: Block has too many lines. [114/25]", 2878217135], + [218, 5, 1112, "Metrics/BlockLength: Block has too many lines. [30/25]", 1605825436], + [224, 11, 104, "Style/HashLikeCase: Consider replacing `case-when` with a hash lookup.", 4220899731], + [247, 11, 132, "Style/HashLikeCase: Consider replacing `case-when` with a hash lookup.", 3401820780], + [258, 5, 1642, "Metrics/BlockLength: Block has too many lines. [35/25]", 1288881729], + [337, 3, 1108, "Metrics/BlockLength: Block has too many lines. [33/25]", 2139263963] + ], + "spec/ast/merge/match_score_base_spec.rb:2340739872": [ + [3, 1, 15213, "Metrics/BlockLength: Block has too many lines. [372/25]", 1512747000], + [4, 3, 1553, "Metrics/BlockLength: Block has too many lines. [41/25]", 2789289940], + [43, 20, 2, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 5862747], + [43, 24, 2, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 5862744], + [56, 3, 1041, "Metrics/BlockLength: Block has too many lines. [29/25]", 3729310115], + [152, 3, 3259, "Metrics/BlockLength: Block has too many lines. [82/25]", 1438003770], + [258, 3, 2199, "Metrics/BlockLength: Block has too many lines. [43/25]", 3386602801], + [320, 3, 1684, "Metrics/BlockLength: Block has too many lines. [35/25]", 3807719546], + [365, 14, 16, "Lint/FloatComparison: Avoid equality comparisons of floats as they are unreliable.", 3787748956], + [369, 3, 1696, "Metrics/BlockLength: Block has too many lines. [36/25]", 3172214426], + [417, 3, 1792, "Metrics/BlockLength: Block has too many lines. [45/25]", 3557977606], + [438, 5, 1121, "Metrics/BlockLength: Block has too many lines. [26/25]", 4236927298] + ], + "spec/ast/merge/merge_result_base_spec.rb:2262708492": [ + [3, 1, 19471, "Metrics/BlockLength: Block has too many lines. [529/25]", 4106058751], + [38, 3, 2735, "Metrics/BlockLength: Block has too many lines. [80/25]", 1103243845], + [279, 3, 1611, "Metrics/BlockLength: Block has too many lines. [39/25]", 1928511417], + [280, 5, 1203, "Metrics/BlockLength: Block has too many lines. [26/25]", 857223227], + [326, 3, 2070, "Metrics/BlockLength: Block has too many lines. [48/25]", 2552826824], + [385, 3, 5769, "Metrics/BlockLength: Block has too many lines. [140/25]", 1457747735], + [511, 5, 1306, "Metrics/BlockLength: Block has too many lines. [29/25]", 2980786372], + [574, 3, 1308, "Metrics/BlockLength: Block has too many lines. [32/25]", 1342704008] + ], + "spec/ast/merge/merger_config_spec.rb:663896662": [ + [5, 1, 7314, "Metrics/BlockLength: Block has too many lines. [189/25]", 1279589310], + [11, 3, 1180, "Metrics/BlockLength: Block has too many lines. [26/25]", 1014009176], + [45, 3, 1151, "Metrics/BlockLength: Block has too many lines. [26/25]", 785276703], + [79, 3, 3574, "Metrics/BlockLength: Block has too many lines. [97/25]", 969726064], + [126, 5, 1158, "Metrics/BlockLength: Block has too many lines. [29/25]", 389808524] + ], + "spec/ast/merge/navigable/injection_point_finder_spec.rb:3693754765": [ + [3, 1, 5152, "Metrics/BlockLength: Block has too many lines. [123/25]", 3265221808], + [15, 3, 4026, "Metrics/BlockLength: Block has too many lines. [96/25]", 1482695302], + [63, 5, 2337, "Metrics/BlockLength: Block has too many lines. [54/25]", 2678200297] + ], + "spec/ast/merge/navigable/injection_point_spec.rb:3295717447": [ + [3, 1, 6032, "Metrics/BlockLength: Block has too many lines. [161/25]", 805025024], + [77, 3, 1083, "Metrics/BlockLength: Block has too many lines. [28/25]", 3091139104] + ], + "spec/ast/merge/navigable/statement_spec.rb:2965726260": [ + [3, 1, 18289, "Metrics/BlockLength: Block has too many lines. [510/25]", 4119203121], + [102, 3, 3570, "Metrics/BlockLength: Block has too many lines. [97/25]", 3287535168], + [156, 5, 2030, "Metrics/BlockLength: Block has too many lines. [51/25]", 3299963733], + [251, 3, 1338, "Metrics/BlockLength: Block has too many lines. [37/25]", 844559624], + [411, 3, 1550, "Metrics/BlockLength: Block has too many lines. [42/25]", 3851790429], + [465, 3, 1372, "Metrics/BlockLength: Block has too many lines. [41/25]", 3782869383] + ], + "spec/ast/merge/node_typing/frozen_wrapper_spec.rb:3823345520": [ + [3, 1, 4532, "Metrics/BlockLength: Block has too many lines. [117/25]", 3944573785] + ], + "spec/ast/merge/node_typing/normalizer_spec.rb:1976431423": [ + [4, 1, 8679, "Metrics/BlockLength: Block has too many lines. [219/25]", 938207310], + [65, 3, 1137, "Metrics/BlockLength: Block has too many lines. [26/25]", 3180807289], + [101, 3, 1404, "Metrics/BlockLength: Block has too many lines. [28/25]", 1094334251], + [216, 3, 875, "Metrics/BlockLength: Block has too many lines. [26/25]", 2755551247] + ], + "spec/ast/merge/node_typing/wrapper_spec.rb:3211588263": [ + [3, 1, 3469, "Metrics/BlockLength: Block has too many lines. [92/25]", 638644563] + ], + "spec/ast/merge/node_typing_spec.rb:4080661389": [ + [3, 1, 12728, "Metrics/BlockLength: Block has too many lines. [333/25]", 3927571381], + [132, 3, 3704, "Metrics/BlockLength: Block has too many lines. [98/25]", 2130243754], + [208, 5, 1267, "Metrics/BlockLength: Block has too many lines. [31/25]", 2816753725], + [265, 3, 1298, "Metrics/BlockLength: Block has too many lines. [33/25]", 3320876250], + [311, 3, 3803, "Metrics/BlockLength: Block has too many lines. [100/25]", 2743470911] + ], + "spec/ast/merge/node_wrapper_base_spec.rb:2252820285": [ + [3, 1, 11681, "Metrics/BlockLength: Block has too many lines. [307/25]", 1698593962], + [32, 3, 2341, "Metrics/BlockLength: Block has too many lines. [68/25]", 1594381363], + [179, 3, 2568, "Metrics/BlockLength: Block has too many lines. [51/25]", 1269052990], + [294, 3, 1252, "Metrics/BlockLength: Block has too many lines. [26/25]", 4220822180], + [329, 3, 1963, "Metrics/BlockLength: Block has too many lines. [39/25]", 1623030031] + ], + "spec/ast/merge/owner_selection_spec.rb:1894901093": [ + [3, 1, 1356, "Metrics/BlockLength: Block has too many lines. [35/25]", 1030003775] + ], + "spec/ast/merge/partial_template_merger_base_spec.rb:3412991027": [ + [3, 1, 7073, "Metrics/BlockLength: Block has too many lines. [145/25]", 3415302240], + [16, 9, 43, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3196404056], + [22, 9, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 4116824817], + [48, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [96, 3, 4220, "Metrics/BlockLength: Block has too many lines. [68/25]", 3464417459], + [97, 5, 2029, "Metrics/BlockLength: Block has too many lines. [27/25]", 3297854360], + [138, 5, 2122, "Metrics/BlockLength: Block has too many lines. [37/25]", 1592076374] + ], + "spec/ast/merge/recipe/config_spec.rb:3917288551": [ + [3, 1, 21041, "Metrics/BlockLength: Block has too many lines. [611/25]", 2431235923], + [72, 3, 1653, "Metrics/BlockLength: Block has too many lines. [36/25]", 2702780755], + [174, 3, 1465, "Metrics/BlockLength: Block has too many lines. [44/25]", 2326126933], + [226, 3, 3419, "Metrics/BlockLength: Block has too many lines. [89/25]", 798604841], + [327, 3, 1398, "Metrics/BlockLength: Block has too many lines. [34/25]", 3113267700], + [474, 3, 1184, "Metrics/BlockLength: Block has too many lines. [39/25]", 2599756030], + [519, 3, 4630, "Metrics/BlockLength: Block has too many lines. [147/25]", 1245526575] + ], + "spec/ast/merge/recipe/preset_spec.rb:818394232": [ + [3, 1, 6696, "Metrics/BlockLength: Block has too many lines. [173/25]", 3205615892] + ], + "spec/ast/merge/recipe/runner_spec.rb:3689194117": [ + [3, 1, 46798, "Metrics/BlockLength: Block has too many lines. [1104/25]", 3220015076], + [48, 3, 1128, "Metrics/BlockLength: Block has too many lines. [26/25]", 910457645], + [108, 3, 3036, "Metrics/BlockLength: Block has too many lines. [92/25]", 2112378918], + [132, 5, 881, "Metrics/BlockLength: Block has too many lines. [27/25]", 3842010356], + [177, 5, 918, "Metrics/BlockLength: Block has too many lines. [27/25]", 2152367239], + [295, 3, 1383, "Metrics/BlockLength: Block has too many lines. [41/25]", 2141027559], + [362, 3, 1653, "Metrics/BlockLength: Block has too many lines. [33/25]", 1536472295], + [449, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3960802027], + [497, 3, 7959, "Metrics/BlockLength: Block has too many lines. [200/25]", 3739116912], + [556, 5, 1225, "Metrics/BlockLength: Block has too many lines. [31/25]", 195497726], + [740, 3, 6977, "Metrics/BlockLength: Block has too many lines. [145/25]", 2805535296], + [748, 5, 2241, "Metrics/BlockLength: Block has too many lines. [49/25]", 2552233173], + [805, 5, 3007, "Metrics/BlockLength: Block has too many lines. [59/25]", 708771722], + [877, 5, 1444, "Metrics/BlockLength: Block has too many lines. [26/25]", 3274225022], + [911, 3, 3258, "Metrics/BlockLength: Block has too many lines. [85/25]", 2346849758], + [1012, 3, 2710, "Metrics/BlockLength: Block has too many lines. [71/25]", 3801821877], + [1029, 5, 1547, "Metrics/BlockLength: Block has too many lines. [42/25]", 2962020615], + [1109, 3, 2240, "Metrics/BlockLength: Block has too many lines. [35/25]", 1139957345], + [1115, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], + [1117, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], + [1119, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1801369636], + [1121, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2652710920], + [1123, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1375785821], + [1125, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 632755459], + [1160, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], + [1162, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], + [1164, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1375785821], + [1176, 3, 1472, "Metrics/BlockLength: Block has too many lines. [31/25]", 844153987], + [1181, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1239303812], + [1183, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1251336963], + [1216, 3, 2277, "Metrics/BlockLength: Block has too many lines. [43/25]", 4287127386], + [1221, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], + [1223, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2652710920], + [1225, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1375785821], + [1227, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 632755459], + [1274, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3420615328] + ], + "spec/ast/merge/recipe/script_loader_spec.rb:2136892097": [ + [3, 1, 8554, "Metrics/BlockLength: Block has too many lines. [237/25]", 2314425369], + [45, 3, 2842, "Metrics/BlockLength: Block has too many lines. [75/25]", 168902852], + [155, 3, 1400, "Metrics/BlockLength: Block has too many lines. [39/25]", 1611123964] + ], + "spec/ast/merge/rspec/shared_examples/feature_profile_spec.rb:2654837708": [ + [5, 1, 1140, "Metrics/BlockLength: Block has too many lines. [31/25]", 678325840] + ], + "spec/ast/merge/rspec/shared_examples/file_analyzable_spec.rb:1833922303": [ + [58, 3, 970, "Metrics/AbcSize: Assignment Branch Condition size for `detect_freeze_blocks` is too high. [<16, 9, 5> 19.03/17]", 1533823667], + [58, 3, 970, "Metrics/MethodLength: Method has too many lines. [31/10]", 1533823667], + [104, 1, 1216, "Metrics/BlockLength: Block has too many lines. [39/25]", 1009012120], + [105, 3, 1159, "Metrics/BlockLength: Block has too many lines. [38/25]", 1361521205] + ], + "spec/ast/merge/rspec/shared_examples/layout_attachment_spec.rb:714796658": [ + [8, 1, 957, "Metrics/BlockLength: Block has too many lines. [28/25]", 3738990548] + ], + "spec/ast/merge/rspec/shared_examples/recipe_preset_contract_spec.rb:669158728": [ + [6, 1, 1577, "Metrics/BlockLength: Block has too many lines. [41/25]", 2157464290], + [7, 3, 1512, "Metrics/BlockLength: Block has too many lines. [39/25]", 1968160370], + [44, 5, 401, "Metrics/AbcSize: Assignment Branch Condition size for `run_verify_loaded_preset` is too high. [<0, 26, 0> 26/17]", 2960760840] + ], + "spec/ast/merge/rspec/shared_examples/removal_mode_compliance_spec.rb:31388352": [ + [6, 22, 2, "Style/MutableConstant: Freeze mutable objects assigned to constants.", 5861859], + [44, 1, 2546, "Metrics/BlockLength: Block has too many lines. [77/25]", 3740028971], + [45, 3, 1350, "Metrics/BlockLength: Block has too many lines. [41/25]", 2793151667], + [94, 3, 1128, "Metrics/BlockLength: Block has too many lines. [32/25]", 2527000512], + [95, 5, 1081, "Metrics/BlockLength: Block has too many lines. [30/25]", 3825359844] + ], + "spec/ast/merge/rspec/shared_examples/reproducible_partial_merge_spec.rb:2862326360": [ + [19, 3, 600, "Metrics/MethodLength: Method has too many lines. [13/10]", 1542875905] + ], + "spec/ast/merge/ruleset/config_spec.rb:1860949041": [ + [3, 1, 9431, "Metrics/BlockLength: Block has too many lines. [236/25]", 4015119559], + [24, 3, 5341, "Metrics/BlockLength: Block has too many lines. [149/25]", 2361087446], + [25, 5, 1064, "Metrics/BlockLength: Block has too many lines. [26/25]", 603056104], + [226, 3, 2125, "Metrics/BlockLength: Block has too many lines. [36/25]", 1640873170] + ], + "spec/ast/merge/ruleset/declaration_objects_spec.rb:3827892270": [ + [3, 1, 1881, "Metrics/BlockLength: Block has too many lines. [47/25]", 1770376910] + ], + "spec/ast/merge/ruleset/feature_profile_spec.rb:2241111096": [ + [3, 1, 4189, "Metrics/BlockLength: Block has too many lines. [86/25]", 1116963550], + [4, 3, 4129, "Metrics/BlockLength: Block has too many lines. [84/25]", 117079811], + [5, 5, 2391, "Metrics/BlockLength: Block has too many lines. [45/25]", 1800077283] + ], + "spec/ast/merge/ruleset/parser_spec.rb:386407767": [ + [3, 1, 5670, "Metrics/BlockLength: Block has too many lines. [144/25]", 3425850453], + [4, 3, 5618, "Metrics/BlockLength: Block has too many lines. [143/25]", 246633759] + ], + "spec/ast/merge/ruleset/profile_vocabulary_spec.rb:2570869276": [ + [3, 1, 2095, "Metrics/BlockLength: Block has too many lines. [46/25]", 3214342662] + ], + "spec/ast/merge/ruleset/support_style_resolver_spec.rb:640167644": [ + [3, 1, 1625, "Metrics/BlockLength: Block has too many lines. [49/25]", 2066834885], + [4, 3, 1559, "Metrics/BlockLength: Block has too many lines. [47/25]", 1169495477] + ], + "spec/ast/merge/runtime_spec.rb:3962589694": [ + [5, 1, 24649, "Metrics/BlockLength: Block has too many lines. [664/25]", 2634021188], + [76, 3, 1459, "Metrics/BlockLength: Block has too many lines. [41/25]", 3744002593], + [125, 3, 1417, "Metrics/BlockLength: Block has too many lines. [33/25]", 4087615381], + [166, 3, 2549, "Metrics/BlockLength: Block has too many lines. [69/25]", 3150260095], + [175, 5, 1068, "Metrics/BlockLength: Block has too many lines. [26/25]", 2933114685], + [247, 3, 1668, "Metrics/BlockLength: Block has too many lines. [39/25]", 2386637993], + [259, 5, 1265, "Metrics/BlockLength: Block has too many lines. [27/25]", 3157806167], + [321, 3, 10884, "Metrics/BlockLength: Block has too many lines. [295/25]", 1889265918], + [322, 5, 1879, "Metrics/BlockLength: Block has too many lines. [46/25]", 2536583521], + [373, 5, 3938, "Metrics/BlockLength: Block has too many lines. [108/25]", 340276027], + [486, 5, 1270, "Metrics/BlockLength: Block has too many lines. [38/25]", 3844174392], + [528, 5, 3728, "Metrics/BlockLength: Block has too many lines. [95/25]", 3779381786], + [630, 3, 3240, "Metrics/BlockLength: Block has too many lines. [84/25]", 3856725067], + [656, 5, 1649, "Metrics/BlockLength: Block has too many lines. [40/25]", 3713662683] + ], + "spec/ast/merge/section_typing_spec.rb:2580971307": [ + [3, 1, 14786, "Metrics/BlockLength: Block has too many lines. [344/25]", 2925587076], + [4, 3, 1940, "Metrics/BlockLength: Block has too many lines. [50/25]", 3362429388], + [67, 3, 3684, "Metrics/BlockLength: Block has too many lines. [96/25]", 3864076664], + [120, 5, 1998, "Metrics/BlockLength: Block has too many lines. [50/25]", 411620722], + [183, 3, 1415, "Metrics/BlockLength: Block has too many lines. [37/25]", 3323012675], + [192, 5, 1124, "Metrics/BlockLength: Block has too many lines. [28/25]", 966216762], + [229, 3, 1610, "Metrics/BlockLength: Block has too many lines. [38/25]", 1499957007], + [229, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 1025596574], + [279, 3, 4437, "Metrics/BlockLength: Block has too many lines. [80/25]", 423587151], + [356, 36, 23, "Style/SymbolProc: Pass `&:unclassified?` as an argument to `find` instead of a block.", 563945984], + [369, 36, 23, "Style/SymbolProc: Pass `&:unclassified?` as an argument to `find` instead of a block.", 563945984], + [375, 3, 1630, "Metrics/BlockLength: Block has too many lines. [31/25]", 1675144727] + ], + "spec/ast/merge/smart_merger_base_spec.rb:1904727390": [ + [3, 1, 13253, "Metrics/BlockLength: Block has too many lines. [398/25]", 3611753358], + [30, 9, 10, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 1099697163], + [87, 3, 1851, "Metrics/BlockLength: Block has too many lines. [40/25]", 3729571903], + [210, 3, 925, "Metrics/BlockLength: Block has too many lines. [35/25]", 2001100899], + [344, 3, 709, "Metrics/BlockLength: Block has too many lines. [27/25]", 3041950416], + [415, 3, 1074, "Metrics/BlockLength: Block has too many lines. [35/25]", 956635689], + [416, 5, 1026, "Metrics/BlockLength: Block has too many lines. [33/25]", 1993879652], + [461, 3, 1031, "Metrics/BlockLength: Block has too many lines. [31/25]", 35315996] + ], + "spec/ast/merge/structural_edit/boundary_support_spec.rb:863387845": [ + [3, 1, 4226, "Metrics/BlockLength: Block has too many lines. [86/25]", 1889771490], + [16, 9, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1304492024], + [22, 9, 41, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3828424401], + [59, 3, 1294, "Metrics/BlockLength: Block has too many lines. [26/25]", 3038774774] + ], + "spec/ast/merge/structural_edit/plan_set_spec.rb:3633263362": [ + [3, 1, 5945, "Metrics/BlockLength: Block has too many lines. [180/25]", 3883285271], + [14, 3, 2139, "Metrics/BlockLength: Block has too many lines. [72/25]", 3558415255], + [128, 3, 1412, "Metrics/BlockLength: Block has too many lines. [39/25]", 1216754705] + ], + "spec/ast/merge/structural_edit/remove_plan_spec.rb:3569534665": [ + [3, 1, 6442, "Metrics/BlockLength: Block has too many lines. [134/25]", 3440814588], + [39, 3, 3768, "Metrics/BlockLength: Block has too many lines. [75/25]", 876721813], + [127, 3, 1439, "Metrics/BlockLength: Block has too many lines. [29/25]", 3378195351] + ], + "spec/ast/merge/structural_edit/remove_plan_support_spec.rb:800158061": [ + [3, 1, 2893, "Metrics/BlockLength: Block has too many lines. [62/25]", 3748446914], + [16, 9, 43, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3196404056], + [22, 9, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 4116824817], + [29, 3, 2091, "Metrics/BlockLength: Block has too many lines. [39/25]", 1684933040], + [30, 5, 1653, "Metrics/BlockLength: Block has too many lines. [27/25]", 2456404305] + ], + "spec/ast/merge/structural_edit/splice_plan_spec.rb:3331205681": [ + [3, 1, 3159, "Metrics/BlockLength: Block has too many lines. [83/25]", 2234926397], + [16, 3, 1837, "Metrics/BlockLength: Block has too many lines. [46/25]", 2935991482], + [42, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860750] + ], + "spec/ast/merge/text/conflict_resolver_spec.rb:3810004132": [ + [5, 1, 9102, "Metrics/BlockLength: Block has too many lines. [218/25]", 672115618], + [33, 3, 8206, "Metrics/BlockLength: Block has too many lines. [194/25]", 259803246], + [78, 5, 1920, "Metrics/BlockLength: Block has too many lines. [45/25]", 3965182334], + [139, 5, 1918, "Metrics/BlockLength: Block has too many lines. [44/25]", 3707046125] + ], + "spec/ast/merge/text/file_analysis_spec.rb:3430380445": [ + [5, 1, 8842, "Metrics/BlockLength: Block has too many lines. [205/25]", 4255187284], + [6, 3, 1323, "Metrics/BlockLength: Block has too many lines. [29/25]", 2518912953], + [47, 3, 1830, "Metrics/BlockLength: Block has too many lines. [43/25]", 3685770590], + [135, 3, 1620, "Metrics/BlockLength: Block has too many lines. [35/25]", 3089951119] + ], + "spec/ast/merge/text/line_node_spec.rb:1757790485": [ + [5, 1, 4739, "Metrics/BlockLength: Block has too many lines. [131/25]", 1487875238] + ], + "spec/ast/merge/text/merge_result_spec.rb:589380024": [ + [5, 1, 1541, "Metrics/BlockLength: Block has too many lines. [40/25]", 2828087992] + ], + "spec/ast/merge/text/section_splitter_spec.rb:804308722": [ + [4, 1, 5705, "Metrics/BlockLength: Block has too many lines. [209/25]", 4175363685], + [5, 3, 794, "Metrics/BlockLength: Block has too many lines. [28/25]", 2386862842], + [42, 3, 1126, "Metrics/BlockLength: Block has too many lines. [45/25]", 1507887296], + [95, 3, 746, "Metrics/BlockLength: Block has too many lines. [30/25]", 1759029412], + [131, 3, 1169, "Metrics/BlockLength: Block has too many lines. [45/25]", 1412318991], + [184, 3, 754, "Metrics/BlockLength: Block has too many lines. [30/25]", 2717556691], + [246, 1, 16648, "Metrics/BlockLength: Block has too many lines. [428/25]", 3166834694], + [370, 3, 1640, "Metrics/BlockLength: Block has too many lines. [46/25]", 2049342960], + [424, 3, 3237, "Metrics/BlockLength: Block has too many lines. [102/25]", 2357275144], + [540, 3, 3505, "Metrics/BlockLength: Block has too many lines. [67/25]", 2112469350], + [619, 3, 3586, "Metrics/BlockLength: Block has too many lines. [90/25]", 3866409298], + [620, 5, 1650, "Metrics/BlockLength: Block has too many lines. [48/25]", 289235626], + [622, 9, 1474, "Metrics/AbcSize: Assignment Branch Condition size for `split` is too high. [<8, 21, 7> 23.54/17]", 557655357], + [622, 9, 1474, "Metrics/MethodLength: Method has too many lines. [41/10]", 557655357], + [622, 9, 1474, "Metrics/PerceivedComplexity: Perceived complexity for `split` is too high. [9/8]", 557655357], + [628, 11, 1237, "Metrics/BlockLength: Block has too many lines. [33/25]", 1134667672], + [717, 29, 44, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 2169354946], + [723, 29, 44, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 2169354946], + [751, 1, 3128, "Metrics/BlockLength: Block has too many lines. [85/25]", 2082776744], + [769, 3, 1744, "Metrics/BlockLength: Block has too many lines. [46/25]", 223880162], + [770, 5, 1258, "Metrics/BlockLength: Block has too many lines. [31/25]", 2245422869] + ], + "spec/ast/merge/text/smart_merger_spec.rb:4128732567": [ + [3, 1, 8057, "Metrics/BlockLength: Block has too many lines. [210/25]", 1690443322], + [4, 3, 1135, "Metrics/BlockLength: Block has too many lines. [28/25]", 3788979655], + [58, 3, 4438, "Metrics/BlockLength: Block has too many lines. [106/25]", 2613192474], + [187, 3, 1053, "Metrics/BlockLength: Block has too many lines. [26/25]", 803567817], + [220, 3, 892, "Metrics/BlockLength: Block has too many lines. [28/25]", 2001100899] + ], + "spec/ast/merge/text/word_node_spec.rb:1457011521": [ + [5, 1, 3264, "Metrics/BlockLength: Block has too many lines. [74/25]", 677733430] + ], + "spec/ast/merge/token_match_refiner_spec.rb:3180314913": [ + [3, 1, 4000, "Metrics/BlockLength: Block has too many lines. [80/25]", 1630791278], + [8, 3, 2912, "Metrics/BlockLength: Block has too many lines. [60/25]", 529772148] + ], + "spec/ast/merge/trailing_groups/alignment_sort_spec.rb:1594915480": [ + [5, 1, 4710, "Metrics/BlockLength: Block has too many lines. [114/25]", 2499296583], + [14, 3, 2140, "Metrics/BlockLength: Block has too many lines. [47/25]", 3871799493], + [95, 3, 1482, "Metrics/BlockLength: Block has too many lines. [35/25]", 1088314263] + ], + "spec/ast/merge/trailing_groups/core_spec.rb:2651131504": [ + [5, 1, 9601, "Metrics/BlockLength: Block has too many lines. [242/25]", 598045669], + [22, 3, 3728, "Metrics/BlockLength: Block has too many lines. [87/25]", 1304580063], + [119, 3, 3931, "Metrics/BlockLength: Block has too many lines. [99/25]", 2464218479], + [186, 5, 1322, "Metrics/BlockLength: Block has too many lines. [30/25]", 427915501], + [187, 7, 1267, "Metrics/BlockLength: Block has too many lines. [28/25]", 861882691], + [245, 3, 1306, "Metrics/BlockLength: Block has too many lines. [34/25]", 86572459] + ], + "spec/ast/merge/trailing_groups/dest_iterate_spec.rb:3632880085": [ + [5, 1, 5523, "Metrics/BlockLength: Block has too many lines. [131/25]", 3077369183], + [19, 3, 3990, "Metrics/BlockLength: Block has too many lines. [91/25]", 593259616], + [39, 35, 12, "Style/SymbolProc: Pass `&:sig` as an argument to `lambda` instead of a block.", 3587754320], + [54, 33, 23, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 384283629], + [89, 35, 13, "Style/SymbolProc: Pass `&:name` as an argument to `lambda` instead of a block.", 3561384234], + [98, 35, 12, "Style/SymbolProc: Pass `&:sig` as an argument to `lambda` instead of a block.", 3587754320], + [113, 35, 12, "Style/SymbolProc: Pass `&:sig` as an argument to `lambda` instead of a block.", 3587754320] + ], + "spec/ast/merge/unresolved_policy_spec.rb:2561713656": [ + [3, 1, 1333, "Metrics/BlockLength: Block has too many lines. [33/25]", 4109547889] + ], + "spec/ast/merge/unresolved_review_state_spec.rb:3186871217": [ + [3, 1, 1038, "Metrics/BlockLength: Block has too many lines. [31/25]", 1325553035] + ], + "spec/ast/merge_rspec_conformance_fixtures_spec.rb:251774004": [ + [5, 1, 2119, "Metrics/BlockLength: Block has too many lines. [55/25]", 1724925683], + [6, 3, 1203, "Metrics/BlockLength: Block has too many lines. [29/25]", 3306863581] + ], + "spec/ast/merge_spec.rb:664670069": [ + [3, 1, 3113, "Metrics/BlockLength: Block has too many lines. [74/25]", 4034649501], + [9, 3, 2227, "Metrics/BlockLength: Block has too many lines. [51/25]", 578300230], + [10, 5, 2182, "Metrics/BlockLength: Block has too many lines. [49/25]", 2758871265] + ], + "spec/base_substrate_spec.rb:2864492094": [ + [5, 1, 5800, "Metrics/BlockLength: Block has too many lines. [143/25]", 784801982], + [6, 3, 192, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 680981873], + [13, 3, 378, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1223797442], + [31, 3, 628, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 2123191050], + [53, 3, 429, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3536712197], + [69, 3, 24, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 2280792512], + [70, 3, 78, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 604224776], + [72, 3, 146, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3315091322] + ], + "spec/fixtures_integration_spec.rb:1145500459": [ + [595, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859109], + [758, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 576909008], + [881, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087900170], + [1806, 3, 816, "Metrics/MethodLength: Method has too many lines. [13/10]", 170960660], + [1806, 39, 213, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 635200700], + [1807, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3976306097], + [1831, 38, 80, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3297939075], + [1916, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1745553512], + [1917, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 118067488], + [1918, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 196190368], + [1919, 121, 41, "Layout/LineLength: Line is too long. [161/120]", 3371256193], + [2090, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3241114703], + [2428, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], + [2567, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], + [2991, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3697593604], + [2992, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], + [3113, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179435314], + [3122, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1182194285], + [3124, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 3886107031], + [3151, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1751849111], + [3152, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1519587684], + [3153, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 4086262880], + [3170, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3568081822], + [3171, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1776876782], + [3173, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [3174, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1751849111], + [3176, 121, 73, "Layout/LineLength: Line is too long. [193/120]", 3322243646], + [3178, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1715153206], + [3179, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [3180, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 504997180], + [3181, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 1146860021], + [3182, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 2312101607], + [3183, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1423779161], + [3184, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1900897138], + [3185, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 1689840383], + [3186, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 1589056236], + [3188, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 763176550], + [3194, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3957871310], + [3196, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 763176550], + [3198, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 919916608], + [3199, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 919916608], + [3200, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3957871310], + [3201, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 4073040612], + [3202, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 763176550], + [3203, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 667593075], + [3205, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1310972770], + [3206, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 311387795], + [3207, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 724840266], + [3208, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 2555878310], + [3209, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1781078972], + [3210, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [3213, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [3214, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1658060570], + [3215, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 3085728851], + [3216, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3129400559], + [3217, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3197516464], + [3218, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087771520], + [3219, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3837194228], + [3220, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1312323543], + [3221, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 2356847623], + [3222, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [3223, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3428073441], + [3224, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 2891080552], + [3225, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3080737172], + [3226, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 170445026], + [3227, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3240051869], + [3228, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 4266052680], + [3229, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3376297786], + [3230, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 398435913], + [3231, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 4134940256], + [3232, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 30370035], + [3233, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 2862546359], + [3234, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1901388514], + [3235, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 838864274], + [3236, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 3437460384], + [3237, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1567003152], + [3238, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2609066305], + [3239, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 4043187090], + [3240, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3866430009], + [3241, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 2182699083], + [3242, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 3958792129], + [3243, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3449926560], + [3244, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 399774089], + [3245, 121, 68, "Layout/LineLength: Line is too long. [188/120]", 2119246799], + [3247, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3592658842], + [3248, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2905723409], + [3249, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 3930305198], + [3250, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 4186230052], + [3251, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [3252, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2700200720], + [3253, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 1630526402], + [3254, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3669244926], + [3255, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2814234644], + [3256, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3109415933], + [3257, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3643275044], + [3258, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 3825290660], + [3259, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1751849111], + [3260, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 4112285398], + [3261, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 1684279672], + [3262, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 1616506266], + [3264, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [3265, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1330093223], + [3266, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 4084555566], + [3267, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 2466867154], + [3268, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 4088314613], + [3269, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 2416893689], + [3270, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 683312682], + [3271, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 2516517934], + [3272, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2414563355], + [3273, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 2232595211], + [3274, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 2940789369], + [3275, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 941259913], + [3276, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2133508098], + [3277, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1621975014], + [3278, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 35985461], + [3279, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 746016305], + [3280, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 435488100], + [3281, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 2581129172], + [3282, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 3495900774], + [3283, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1413120342], + [3284, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [3285, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2333800791], + [3286, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 2576906206], + [3287, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 2986659874], + [3288, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2811932564], + [3289, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 1970813291], + [3290, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 2904941246], + [3291, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3745922508], + [3292, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 735247237], + [3293, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3731320885], + [3294, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 3896022034], + [3295, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 2827048584], + [3296, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 2548596663], + [3297, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 3812352018], + [3298, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 1280243910], + [3299, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 1742643292], + [3300, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 3056442430], + [3301, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 3144363287], + [3302, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 477297993], + [3303, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 3657857971], + [3304, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3913984414], + [3305, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 336201058], + [3306, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 485418789], + [3307, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 453253839], + [3308, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3673833034], + [3309, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 1552836890], + [3310, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 2714635965], + [3311, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 9336999], + [3312, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 584857208], + [3313, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1394865213], + [3314, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 3973222761], + [3315, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 2020040051], + [3316, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 3060994335], + [3317, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 196286917], + [3318, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 4168514178], + [3319, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 810581246], + [3320, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 1473417372], + [3321, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 3008376885], + [3322, 121, 84, "Layout/LineLength: Line is too long. [204/120]", 454816400], + [3323, 121, 88, "Layout/LineLength: Line is too long. [208/120]", 1416223705], + [3324, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 2896813919], + [3325, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 957293983], + [3326, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 2118117430], + [3327, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 1367404612], + [3328, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 2459902188], + [3329, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 461483815], + [3330, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 2791596520], + [3331, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 203085787], + [3332, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 2942095139], + [3333, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 131861965], + [3334, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 3340827551], + [3335, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 102582610], + [3336, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 762789354], + [3337, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 3478337442], + [3338, 121, 112, "Layout/LineLength: Line is too long. [232/120]", 4010607435], + [3339, 121, 132, "Layout/LineLength: Line is too long. [252/120]", 3754747587], + [3340, 121, 136, "Layout/LineLength: Line is too long. [256/120]", 379336923], + [3341, 121, 108, "Layout/LineLength: Line is too long. [228/120]", 3366353902], + [3342, 121, 128, "Layout/LineLength: Line is too long. [248/120]", 1686898289], + [3343, 121, 132, "Layout/LineLength: Line is too long. [252/120]", 2005192241], + [3344, 121, 104, "Layout/LineLength: Line is too long. [224/120]", 1868634464], + [3345, 121, 124, "Layout/LineLength: Line is too long. [244/120]", 3939743614], + [3346, 121, 128, "Layout/LineLength: Line is too long. [248/120]", 2978506702], + [3347, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 3909866928], + [3348, 121, 118, "Layout/LineLength: Line is too long. [238/120]", 2853032177], + [3349, 121, 122, "Layout/LineLength: Line is too long. [242/120]", 2968366309], + [3350, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 1753663643], + [3351, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 3387619436], + [3352, 121, 106, "Layout/LineLength: Line is too long. [226/120]", 197895496], + [3353, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 576181861], + [3354, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 2809313444], + [3355, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 3963067112], + [3356, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 1121380327], + [3357, 121, 100, "Layout/LineLength: Line is too long. [220/120]", 31591211], + [3358, 121, 104, "Layout/LineLength: Line is too long. [224/120]", 1946129497], + [3359, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 767185096], + [3360, 121, 100, "Layout/LineLength: Line is too long. [220/120]", 1092646020], + [3361, 121, 104, "Layout/LineLength: Line is too long. [224/120]", 1328841270], + [3362, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 2663749624], + [3363, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 430318647], + [3364, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 1650234037], + [3365, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 1082269805], + [3366, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 316397809], + [3367, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 3145391348], + [3368, 121, 112, "Layout/LineLength: Line is too long. [232/120]", 2808088654], + [3369, 121, 116, "Layout/LineLength: Line is too long. [236/120]", 1035513748], + [3370, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 2552800539], + [3371, 121, 112, "Layout/LineLength: Line is too long. [232/120]", 1727699169], + [3372, 121, 116, "Layout/LineLength: Line is too long. [236/120]", 1171566267], + [3373, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 2994775049], + [3374, 121, 110, "Layout/LineLength: Line is too long. [230/120]", 3860489151], + [3375, 121, 114, "Layout/LineLength: Line is too long. [234/120]", 959496607], + [3376, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 1694222439], + [3377, 121, 114, "Layout/LineLength: Line is too long. [234/120]", 1501186331], + [3378, 121, 118, "Layout/LineLength: Line is too long. [238/120]", 4059659418], + [3379, 121, 110, "Layout/LineLength: Line is too long. [230/120]", 1899868779], + [3380, 121, 130, "Layout/LineLength: Line is too long. [250/120]", 323324279], + [3381, 121, 134, "Layout/LineLength: Line is too long. [254/120]", 3956414359], + [3382, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 3506644741], + [3383, 121, 116, "Layout/LineLength: Line is too long. [236/120]", 936139074], + [3384, 121, 136, "Layout/LineLength: Line is too long. [256/120]", 4153213512], + [3385, 121, 140, "Layout/LineLength: Line is too long. [260/120]", 1491976338], + [3386, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 4061753206], + [3387, 121, 106, "Layout/LineLength: Line is too long. [226/120]", 2410434304], + [3388, 121, 124, "Layout/LineLength: Line is too long. [244/120]", 3518300264], + [3389, 121, 144, "Layout/LineLength: Line is too long. [264/120]", 1040696046], + [3390, 121, 148, "Layout/LineLength: Line is too long. [268/120]", 139604188], + [3391, 121, 120, "Layout/LineLength: Line is too long. [240/120]", 231937793], + [3392, 121, 140, "Layout/LineLength: Line is too long. [260/120]", 1835509805], + [3393, 121, 144, "Layout/LineLength: Line is too long. [264/120]", 1629218396], + [3394, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 2312875700], + [3395, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 2933374083], + [3396, 121, 106, "Layout/LineLength: Line is too long. [226/120]", 1719349671], + [3397, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 2555579810], + [3398, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 2023551624], + [3399, 121, 114, "Layout/LineLength: Line is too long. [234/120]", 955231924], + [3400, 121, 118, "Layout/LineLength: Line is too long. [238/120]", 4232993781], + [3401, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 3472954835], + [3402, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 3211922285], + [3403, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 2874956332], + [3404, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 1360335840], + [3405, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2135379556], + [3406, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3242768475], + [3407, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 2789115918], + [3408, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3346448124], + [3409, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1538469817], + [3410, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1543041113], + [3411, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 3344741438], + [3412, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2188404009], + [3413, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1330398779], + [3414, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 332468826], + [3415, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 1905397598], + [3416, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 438831062], + [3417, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 3377667334], + [3418, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3232541734], + [3420, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2130930429], + [3421, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 3684939371], + [3423, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2361951097], + [3424, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 1211447462], + [3425, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3309872691], + [3426, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 360053761], + [3427, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 1310136493], + [3428, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1950686342], + [3429, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 1397845826], + [3430, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 4191304724], + [3431, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2354128498], + [3432, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 1865717453], + [3433, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 24220542], + [3434, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 2618612673], + [3437, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3422918867], + [3438, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3689431739], + [3482, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 4093564799], + [3488, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1662653970], + [3489, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3967501655], + [3490, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2178516622], + [3491, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 1345346561], + [3505, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193466072], + [3625, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 3612393276], + [3626, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 797303985], + [3629, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1606320605], + [3649, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1776876782], + [3653, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 828742791], + [3673, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3294617581], + [3683, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3519842846], + [3693, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1966440909], + [3694, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053864], + [3700, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1606320605], + [3723, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 1340744311], + [3742, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1741893077], + [3743, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053865], + [3747, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193405204], + [3761, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1401226501], + [3764, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085352569], + [3767, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 696523922], + [3782, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], + [3792, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2746826653], + [4208, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1138870161], + [4770, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], + [4781, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 2132299307], + [4828, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087775098], + [4839, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 757851079], + [4875, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], + [4886, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 441649198], + [4909, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087903295], + [4921, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 170442008], + [4930, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], + [4932, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1888875443], + [4969, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 398433651], + [4980, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3921367744], + [5003, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2422819473], + [5009, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 194583095], + [5015, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1901385496], + [5024, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 490810486], + [5026, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 586287746], + [5030, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1310969752], + [5050, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087389205], + [5062, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2609063547], + [5071, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], + [5073, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1370761696], + [5096, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 2208661169], + [5102, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1862604658], + [5108, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 3958789371], + [5117, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3449594464], + [5119, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 692050524], + [5123, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 802172558], + [5193, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2406691660], + [5228, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], + [5239, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1811982742], + [5266, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2562189319], + [5272, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193430346], + [5278, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2814237166], + [5287, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2189106693], + [5289, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 3874870868], + [5293, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179474914], + [5326, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1751845165], + [5337, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2617230371], + [5341, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], + [5382, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], + [5393, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3793790598], + [5428, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 4088312783], + [5439, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3220724736], + [5443, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087899888], + [5462, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2552888401], + [5468, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 194583095], + [5474, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2414559905], + [5483, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 626762179], + [5485, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3969284923], + [5489, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 1893261414], + [5521, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2133507320], + [5532, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 2101353476], + [5536, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087685705], + [5555, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2431380437], + [5561, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 194583095], + [5567, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 435489438], + [5576, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 1520878209], + [5578, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 2238995076], + [5582, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 2789405913], + [5615, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], + [5626, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3409328196], + [5649, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087858069], + [5661, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2811935086], + [5670, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], + [5672, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1113346693], + [5676, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3227128786], + [5696, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 48793812], + [5702, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 338440584], + [5708, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 735248703], + [5717, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 927473097], + [5719, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 1394536741], + [5723, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3134012967], + [5742, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 2967615316], + [5748, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 2810710931], + [5754, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 2548594701], + [5757, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860796], + [5759, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], + [5763, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3549194295], + [5765, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 1074004741], + [5769, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 2874423564], + [5772, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087576526], + [5774, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], + [5789, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 1696848307], + [5795, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 2883501659], + [5801, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 3056443076], + [5806, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193405204], + [5810, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 1487412605], + [5812, 121, 51, "Layout/LineLength: Line is too long. [171/120]", 2021571284], + [5816, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1975782995], + [5819, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860796], + [5821, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193405204], + [5826, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 183236849], + [5835, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 856018753], + [5838, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], + [5841, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 2146546324], + [5847, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3913983076], + [5850, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 3491931666], + [5852, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3536323546], + [5856, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 356581191], + [5858, 121, 63, "Layout/LineLength: Line is too long. [183/120]", 4144657639], + [5862, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 1478616653], + [5865, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1774852021], + [5867, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3536323546], + [5882, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3884289787], + [5888, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 1001503687], + [5894, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3673836976], + [5903, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 3164908550], + [5905, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 1134300778], + [5909, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1797165224], + [5928, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 2508143995], + [5934, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 3002532188], + [5940, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 584857986], + [5943, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860796], + [5945, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], + [5949, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 749691384], + [5951, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 3389354954], + [5955, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 3402045699], + [5958, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087576526], + [5960, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], + [5974, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 2447716612], + [5980, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3201685099], + [5986, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 3060990885], + [5995, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 29396315], + [5997, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 1228645365], + [6001, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1436742837], + [6020, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 716917214], + [6026, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 2175814211], + [6032, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 1473420390], + [6035, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193433391], + [6037, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1422839111], + [6041, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 1571170198], + [6043, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 2175059093], + [6047, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3886666417], + [6050, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 176753677], + [6052, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1422839111], + [6068, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 3471319495], + [6074, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 1274038477], + [6080, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 2896814693], + [6083, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087576526], + [6085, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114086530], + [6089, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 250433828], + [6091, 121, 59, "Layout/LineLength: Line is too long. [179/120]", 3910556848], + [6095, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4002014976], + [6098, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 3491931666], + [6100, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114086530], + [6194, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861664], + [6208, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087932582], + [6222, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861664], + [6238, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 876012844], + [6240, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1756764194], + [6241, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 4173216735], + [6244, 121, 75, "Layout/LineLength: Line is too long. [195/120]", 911964425], + [6245, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 173266907], + [6246, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1412705933], + [6249, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1756764194], + [6250, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 2605683750], + [6253, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 3182252139], + [6255, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1652557742], + [6259, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 2240437058], + [6260, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 173266907], + [6261, 121, 101, "Layout/LineLength: Line is too long. [221/120]", 3694598076], + [6263, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861152], + [6264, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179079542], + [6265, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 3528944411], + [6268, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3020159378], + [6270, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1652557742], + [6276, 121, 84, "Layout/LineLength: Line is too long. [204/120]", 420843234], + [6278, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1401226501], + [6279, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 442915368], + [6282, 121, 79, "Layout/LineLength: Line is too long. [199/120]", 4212444955], + [6283, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053864], + [6284, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1373660924], + [6287, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1401226501], + [6288, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 1539225758], + [6291, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3020159378], + [6293, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 4240691845], + [6297, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 674553335], + [6298, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053864], + [6299, 121, 105, "Layout/LineLength: Line is too long. [225/120]", 4163432287], + [6301, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2089555761], + [6302, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2034687276], + [6303, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 3710905302], + [6306, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 4204667212], + [6308, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 4240691845], + [6314, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 2071493433], + [6316, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085352569], + [6317, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 2853066942], + [6320, 121, 71, "Layout/LineLength: Line is too long. [191/120]", 2771467828], + [6321, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193425976], + [6322, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3025157142], + [6325, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085352569], + [6326, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 3340824101], + [6329, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 3999804761], + [6331, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1999310973], + [6335, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 835016333], + [6336, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193425976], + [6337, 121, 97, "Layout/LineLength: Line is too long. [217/120]", 3575893945], + [6340, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193405945], + [6341, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 1755858308], + [6344, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 3182252139], + [6346, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1999310973], + [6352, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 3033080032], + [6354, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177549], + [6355, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 2720985203], + [6358, 121, 65, "Layout/LineLength: Line is too long. [185/120]", 3233424320], + [6360, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873483], + [6363, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177549], + [6364, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 131859703], + [6367, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1943494546], + [6369, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 4016166830], + [6373, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 1350760977], + [6375, 121, 91, "Layout/LineLength: Line is too long. [211/120]", 4098706554], + [6379, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 4059724765], + [6382, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1651955548], + [6384, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 4016166830], + [6390, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 1057495720], + [6393, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1621971220], + [6396, 121, 49, "Layout/LineLength: Line is too long. [169/120]", 1585717593], + [6402, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 2942094233], + [6405, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2624667704], + [6407, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2317051977], + [6411, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 1321610634], + [6413, 121, 75, "Layout/LineLength: Line is too long. [195/120]", 2854688831], + [6417, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 4185465554], + [6420, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1169781875], + [6422, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2317051977], + [6428, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 1916545020], + [6431, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1422839111], + [6434, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 910134593], + [6440, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 203086561], + [6443, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2939363812], + [6445, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3155638331], + [6449, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 1955758062], + [6451, 121, 71, "Layout/LineLength: Line is too long. [191/120]", 3737424359], + [6455, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 3597620692], + [6458, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2624667704], + [6460, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3155638331], + [6466, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 1036052399], + [6469, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114086530], + [6472, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 1268266488], + [6478, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 2791598354], + [6481, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1302589368], + [6483, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3533902728], + [6487, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 3942276897], + [6489, 121, 73, "Layout/LineLength: Line is too long. [193/120]", 1175941460], + [6493, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 679697318], + [6496, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 28126263], + [6498, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3533902728], + [6499, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 181895237], + [6504, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 4057848448], + [6507, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114086530], + [6510, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 4067769399], + [6516, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 461482909], + [6519, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1302589368], + [6521, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3533902728], + [6525, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 3561204590], + [6527, 121, 73, "Layout/LineLength: Line is too long. [193/120]", 880160795], + [6531, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 1614719145], + [6534, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 28126263], + [6536, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3533902728], + [6537, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 181895237], + [6584, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193432306], + [6598, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 1645945966], + [6601, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3212740609], + [6604, 121, 59, "Layout/LineLength: Line is too long. [179/120]", 3982698123], + [6606, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193425997], + [6610, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 2663750402], + [6613, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2420297272], + [6615, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1164389943], + [6619, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 3483121581], + [6621, 121, 85, "Layout/LineLength: Line is too long. [205/120]", 2271668600], + [6625, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 804794365], + [6628, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3659367004], + [6630, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1164389943], + [6631, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 561395486], + [6636, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 1251661057], + [6639, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3212740609], + [6642, 121, 59, "Layout/LineLength: Line is too long. [179/120]", 3210109508], + [6644, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193425997], + [6648, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 430316685], + [6651, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2420297272], + [6653, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1164389943], + [6657, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 2428160226], + [6659, 121, 85, "Layout/LineLength: Line is too long. [205/120]", 2663295671], + [6663, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 2822109938], + [6666, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3659367004], + [6668, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1164389943], + [6669, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 561395486], + [6674, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 857639785], + [6677, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3669622788], + [6680, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 140453799], + [6682, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860765], + [6686, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 1650236431], + [6689, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 150699323], + [6691, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 50618962], + [6695, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 4205571164], + [6697, 121, 83, "Layout/LineLength: Line is too long. [203/120]", 1549528021], + [6701, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 1325488145], + [6704, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1510711065], + [6706, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 50618962], + [6712, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 3043205563], + [6715, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2381137493], + [6718, 121, 61, "Layout/LineLength: Line is too long. [181/120]", 2200345195], + [6720, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087926498], + [6724, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 1082269527], + [6727, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1510711065], + [6729, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1104064739], + [6733, 121, 68, "Layout/LineLength: Line is too long. [188/120]", 1652941658], + [6735, 121, 87, "Layout/LineLength: Line is too long. [207/120]", 1440323819], + [6739, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 802896260], + [6742, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1943494546], + [6744, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1104064739], + [6750, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 788730815], + [6752, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2034687276], + [6753, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 4226330106], + [6756, 121, 77, "Layout/LineLength: Line is too long. [197/120]", 2414796320], + [6757, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873470], + [6758, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3090817832], + [6761, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2034687276], + [6762, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 2839148677], + [6765, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 2393983240], + [6767, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 2581936864], + [6771, 121, 84, "Layout/LineLength: Line is too long. [204/120]", 3923254945], + [6772, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873470], + [6773, 121, 103, "Layout/LineLength: Line is too long. [223/120]", 580639726], + [6775, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193419246], + [6776, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1756764194], + [6777, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 3202758044], + [6780, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 912651721], + [6782, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 2581936864], + [6786, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1164293389], + [6799, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860840], + [6800, 121, 88, "Layout/LineLength: Line is too long. [208/120]", 574552570], + [6802, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3845073641], + [6803, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 543375177], + [6806, 121, 83, "Layout/LineLength: Line is too long. [203/120]", 222410330], + [6807, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3025157219], + [6808, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1904561434], + [6811, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 489872984], + [6812, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 97325617], + [6815, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 4204667212], + [6817, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 4062673070], + [6821, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 1451915960], + [6822, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3025157219], + [6823, 121, 109, "Layout/LineLength: Line is too long. [229/120]", 4200529758], + [6825, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1497831350], + [6826, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 4214367244], + [6827, 121, 84, "Layout/LineLength: Line is too long. [204/120]", 399603517], + [6830, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3423548875], + [6832, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 4062673070], + [6836, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3279830097], + [6848, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 659167322], + [6860, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087926423], + [6861, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 3300294193], + [6863, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3172850966], + [6864, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 2396187736], + [6867, 121, 87, "Layout/LineLength: Line is too long. [207/120]", 1991888901], + [6868, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1954380402], + [6869, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2589970962], + [6872, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 42340644], + [6873, 121, 67, "Layout/LineLength: Line is too long. [187/120]", 479235996], + [6876, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3423548875], + [6878, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1462541970], + [6882, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 1373978781], + [6883, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1954380402], + [6884, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 280641011], + [6886, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1664110553], + [6887, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1009650381], + [6888, 121, 88, "Layout/LineLength: Line is too long. [208/120]", 909329343], + [6891, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 2977589831], + [6893, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1462541970], + [6898, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873470], + [6899, 121, 61, "Layout/LineLength: Line is too long. [181/120]", 1904101094], + [6901, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2229256255], + [6902, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 1839090017], + [6905, 121, 91, "Layout/LineLength: Line is too long. [211/120]", 4260980907], + [6906, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 4253118453], + [6907, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1536690221], + [6909, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861152], + [6910, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 209824656], + [6911, 121, 71, "Layout/LineLength: Line is too long. [191/120]", 1530496074], + [6914, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 2977589831], + [6916, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3261436902], + [6920, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 3762694917], + [6921, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 4253118453], + [6922, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 3196230010], + [6924, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3165598659], + [6925, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 4264469493], + [6926, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 3140690958], + [6929, 121, 35, "Layout/LineLength: Line is too long. [155/120]", 2999583208], + [6931, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3261436902], + [6937, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 326070599], + [6940, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1621971220], + [6943, 121, 49, "Layout/LineLength: Line is too long. [169/120]", 1689000214], + [6949, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 2459904022], + [6952, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2624667704], + [6954, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2317051977], + [6958, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 2842872837], + [6960, 121, 75, "Layout/LineLength: Line is too long. [195/120]", 423884656], + [6964, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 2673769885], + [6967, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1169781875], + [6969, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2317051977], + [6970, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2126253911], + [6986, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 2388292564], + [6989, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2381137493], + [6992, 121, 61, "Layout/LineLength: Line is too long. [181/120]", 1136762660], + [6994, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087926498], + [6998, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 2555581016], + [7001, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1510711065], + [7003, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1104064739], + [7007, 121, 68, "Layout/LineLength: Line is too long. [188/120]", 1986812885], + [7009, 121, 87, "Layout/LineLength: Line is too long. [207/120]", 1864036132], + [7013, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 3590180043], + [7016, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1943494546], + [7018, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1104064739], + [7019, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2382712010], + [7029, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1791534645], + [7034, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 2403815412], + [7037, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1422839111], + [7040, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 4046048864], + [7046, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 3472955113], + [7049, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2939363812], + [7051, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3155638331], + [7055, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3911469720], + [7057, 121, 71, "Layout/LineLength: Line is too long. [191/120]", 272433263], + [7061, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 634420444], + [7064, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2624667704], + [7066, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3155638331], + [7067, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2088324682], + [7080, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087906711], + [7092, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2135380894], + [7101, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], + [7103, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 4280757685], + [7107, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 161599970], + [7141, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053789], + [7176, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2188407955], + [7187, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3692322233], + [7191, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087557694], + [7214, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3197512522], + [7223, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858840], + [7225, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 85298067], + [7282, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193418403], + [7288, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193418403], + [7311, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087432474], + [7323, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2361949763], + [7332, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], + [7334, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 581045160], + [7338, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 4235011647], + [7357, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1898147766], + [7363, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177560], + [7369, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 1310140439], + [7378, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 681770239], + [7380, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3821940657], + [7384, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], + [7404, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861292], + [7416, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2354124424], + [7425, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087922021], + [7427, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 3921370162], + [8020, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 4083054536], + [8048, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 4083054536], + [8077, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 4083054536], + [8135, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 632953222], + [8164, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 732995265], + [8214, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 1886249927], + [8376, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 578751979], + [8377, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3803540269], + [8386, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2238403955], + [8387, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1028441932], + [8388, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 1975950909], + [8443, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1244043798] + ], + "spec/integration/freeze_node_edge_cases_spec.rb:3416491031": [ + [6, 1, 28959, "Metrics/BlockLength: Block has too many lines. [663/25]", 3473768018], + [7, 3, 2985, "Metrics/BlockLength: Block has too many lines. [57/25]", 436154415], + [8, 5, 2934, "Metrics/BlockLength: Block has too many lines. [55/25]", 1963918102], + [78, 3, 6091, "Metrics/BlockLength: Block has too many lines. [136/25]", 232153494], + [98, 5, 3053, "Metrics/BlockLength: Block has too many lines. [69/25]", 1442974101], + [202, 5, 1691, "Metrics/BlockLength: Block has too many lines. [29/25]", 985654389], + [241, 3, 8515, "Metrics/BlockLength: Block has too many lines. [176/25]", 2776676526], + [473, 3, 2024, "Metrics/BlockLength: Block has too many lines. [55/25]", 1048101963], + [474, 5, 890, "Metrics/BlockLength: Block has too many lines. [26/25]", 753961540], + [543, 3, 4511, "Metrics/BlockLength: Block has too many lines. [116/25]", 1227615145], + [693, 3, 1660, "Metrics/BlockLength: Block has too many lines. [43/25]", 1881888061], + [694, 5, 1107, "Metrics/BlockLength: Block has too many lines. [26/25]", 368095693] + ], + "spec/integration/gem_family_section_merge_spec.rb:1744383089": [ + [164, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 93655697] + ], + "spec/integration/integration_spec.rb:2239247043": [ + [14, 1, 4488, "Metrics/BlockLength: Block has too many lines. [88/25]", 206207480], + [15, 3, 3267, "Metrics/BlockLength: Block has too many lines. [62/25]", 1323899085], + [40, 5, 2263, "Metrics/BlockLength: Block has too many lines. [48/25]", 3172595581] + ], + "spec/integration/link_reference_preservation_spec.rb:3764298162": [ + [6, 1, 2646, "Metrics/BlockLength: Block has too many lines. [48/25]", 3396410609], + [19, 3, 2058, "Metrics/BlockLength: Block has too many lines. [33/25]", 163363949] + ], + "spec/integration/markly_merge_spec.rb:3076950975": [ + [3, 1, 22886, "Metrics/BlockLength: Block has too many lines. [670/25]", 1408138744], + [62, 3, 7192, "Metrics/BlockLength: Block has too many lines. [189/25]", 1890889324], + [63, 5, 1678, "Metrics/BlockLength: Block has too many lines. [41/25]", 2587582896], + [115, 5, 1808, "Metrics/BlockLength: Block has too many lines. [48/25]", 3381172795], + [147, 46, 21, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 451071547], + [171, 5, 1134, "Metrics/BlockLength: Block has too many lines. [30/25]", 2526618199], + [220, 5, 1335, "Metrics/BlockLength: Block has too many lines. [32/25]", 2790596215], + [311, 3, 2008, "Metrics/BlockLength: Block has too many lines. [66/25]", 2640155627], + [394, 3, 1052, "Metrics/BlockLength: Block has too many lines. [27/25]", 3988836255], + [440, 3, 2950, "Metrics/BlockLength: Block has too many lines. [89/25]", 961031348], + [441, 5, 1352, "Metrics/BlockLength: Block has too many lines. [37/25]", 1952365669], + [495, 5, 1550, "Metrics/BlockLength: Block has too many lines. [48/25]", 2400197001], + [561, 3, 1665, "Metrics/BlockLength: Block has too many lines. [52/25]", 3884776329], + [650, 3, 1919, "Metrics/BlockLength: Block has too many lines. [57/25]", 2594646583], + [725, 3, 1644, "Metrics/BlockLength: Block has too many lines. [45/25]", 2348710811], + [791, 3, 1600, "Metrics/BlockLength: Block has too many lines. [46/25]", 3683503747] + ], + "spec/integration/partial_template_merger_table_merge_spec.rb:3504046892": [ + [7, 1, 7402, "Metrics/BlockLength: Block has too many lines. [164/25]", 3368892126], + [9, 3, 2986, "Metrics/BlockLength: Block has too many lines. [67/25]", 2267114449], + [65, 5, 1359, "Metrics/BlockLength: Block has too many lines. [28/25]", 3145143002], + [102, 3, 997, "Metrics/BlockLength: Block has too many lines. [26/25]", 3156068215], + [147, 3, 3009, "Metrics/BlockLength: Block has too many lines. [65/25]", 994160212], + [202, 5, 1401, "Metrics/BlockLength: Block has too many lines. [28/25]", 3038951618] + ], + "spec/integration/table_formatting_preservation_spec.rb:3943985446": [ + [6, 1, 3086, "Metrics/BlockLength: Block has too many lines. [56/25]", 2210897849], + [19, 3, 2374, "Metrics/BlockLength: Block has too many lines. [40/25]", 668961519], + [33, 5, 1847, "Metrics/BlockLength: Block has too many lines. [28/25]", 3433318963] + ], + "spec/integration/text_merge_spec.rb:884566200": [ + [6, 1, 7747, "Metrics/BlockLength: Block has too many lines. [204/25]", 2372984305], + [60, 3, 1113, "Metrics/BlockLength: Block has too many lines. [34/25]", 3399970957], + [67, 5, 860, "Metrics/BlockLength: Block has too many lines. [27/25]", 2337191560], + [103, 3, 916, "Metrics/BlockLength: Block has too many lines. [28/25]", 4082963348], + [149, 3, 3001, "Metrics/BlockLength: Block has too many lines. [74/25]", 7776854] + ], + "spec/support/fictive_language_harness.rb:1770581700": [ + [85, 7, 733, "Metrics/AbcSize: Assignment Branch Condition size for `extract_comments` is too high. [<5, 16, 5> 17.49/17]", 1127096515], + [85, 7, 733, "Metrics/MethodLength: Method has too many lines. [22/10]", 1127096515], + [117, 21, 129, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 681912759], + [182, 7, 1084, "Metrics/AbcSize: Assignment Branch Condition size for `parse_statements` is too high. [<9, 28, 7> 30.23/17]", 3123785685], + [182, 7, 1084, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_statements` is too high. [8/7]", 3123785685], + [182, 7, 1084, "Metrics/MethodLength: Method has too many lines. [24/10]", 3123785685], + [233, 5, 9879, "Metrics/ClassLength: Class has too many lines. [228/100]", 3231256134], + [236, 21, 208, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2970487173], + [257, 7, 1981, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_batch` is too high. [<16, 32, 4> 36/17]", 4125392918], + [257, 7, 1981, "Metrics/MethodLength: Method has too many lines. [42/10]", 4125392918], + [342, 7, 778, "Metrics/MethodLength: Method has too many lines. [18/10]", 4189873983], + [364, 7, 844, "Metrics/MethodLength: Method has too many lines. [19/10]", 526186683], + [449, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087956942], + [464, 7, 1065, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_template_preamble_prefix_region` is too high. [<6, 24, 11> 27.07/17]", 2332280467], + [464, 7, 1065, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collapse_template_preamble_prefix_region` is too high. [10/7]", 2332280467], + [464, 7, 1065, "Metrics/MethodLength: Method has too many lines. [20/10]", 2332280467], + [464, 7, 1065, "Metrics/PerceivedComplexity: Perceived complexity for `collapse_template_preamble_prefix_region` is too high. [10/8]", 2332280467] + ], + "spec/support/testable_node.rb:1110514732": [ + [10, 7, 573, "Metrics/MethodLength: Method has too many lines. [12/10]", 798847435], + [10, 22, 226, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 2319398994], + [40, 7, 642, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<11, 14, 6> 18.79/17]", 2249578474], + [40, 21, 131, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 1786967686] + ] +} diff --git a/gems/ast-merge/Gemfile.lock b/gems/ast-merge/Gemfile.lock index 6f76f0a95..c806f79bf 100644 --- a/gems/ast-merge/Gemfile.lock +++ b/gems/ast-merge/Gemfile.lock @@ -17,6 +17,15 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -318,11 +327,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -398,6 +402,7 @@ DEPENDENCIES standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + tree_haver! tree_sitter_language_pack! yaml-converter (~> 0.1) yard (~> 0.9, >= 0.9.44) diff --git a/gems/rbs-merge/Gemfile.lock b/gems/rbs-merge/Gemfile.lock index 36af7f55d..78f88aa8f 100644 --- a/gems/rbs-merge/Gemfile.lock +++ b/gems/rbs-merge/Gemfile.lock @@ -18,7 +18,39 @@ PATH version_gem (~> 1.1, >= 1.1.14) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -27,7 +59,192 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -35,6 +252,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -54,6 +294,11 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -117,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -145,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -282,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -334,6 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -380,21 +635,42 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.1, >= 3.1.4) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.3, >= 2.3.7) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) rbs-merge! @@ -406,33 +682,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.1, >= 3.1.14) + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,19 +750,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -478,10 +784,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -517,9 +827,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -528,6 +841,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -541,14 +855,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -556,6 +875,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From c20d536416b4d53b086cea01bc35ed09c9855e8a Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:24:12 -0600 Subject: [PATCH 165/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-merge/Gemfile.lock | 335 +- .../docs/Kettle/Jem/Tasks/InstallTask.html | 4324 ++++++++--------- gems/kettle-jem/docs/file.CHANGELOG.html | 16 +- gems/ruby-merge/.kettle-drift.lock | 60 +- gems/ruby-merge/.rubocop_gradual.lock | 316 -- gems/ruby-merge/Gemfile | 70 +- gems/ruby-merge/Gemfile.lock | 59 +- gems/ruby-merge/Rakefile | 18 +- gems/ruby-merge/bin/yard | 2 +- gems/ruby-merge/lib/ruby/merge/version.rb | 2 +- gems/toml-merge/.kettle-drift.lock | 60 +- gems/toml-merge/.rubocop_gradual.lock | 278 -- gems/toml-merge/Gemfile | 40 + gems/toml-merge/Gemfile.lock | 59 +- gems/yaml-merge/.kettle-drift.lock | 60 +- gems/yaml-merge/.rubocop_gradual.lock | 47 +- gems/yaml-merge/Gemfile | 40 + gems/yaml-merge/Gemfile.lock | 327 +- gems/yaml-merge/lib/yaml/merge.rb | 13 +- 19 files changed, 2866 insertions(+), 3260 deletions(-) delete mode 100644 gems/ruby-merge/.rubocop_gradual.lock delete mode 100644 gems/toml-merge/.rubocop_gradual.lock diff --git a/gems/ast-merge/Gemfile.lock b/gems/ast-merge/Gemfile.lock index c806f79bf..b418a067c 100644 --- a/gems/ast-merge/Gemfile.lock +++ b/gems/ast-merge/Gemfile.lock @@ -18,7 +18,233 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -26,6 +252,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -45,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -108,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -136,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -275,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -327,6 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -373,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -398,32 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -431,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -443,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -470,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -481,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -508,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -519,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -532,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -547,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/kettle-jem/docs/Kettle/Jem/Tasks/InstallTask.html b/gems/kettle-jem/docs/Kettle/Jem/Tasks/InstallTask.html index 7f01e3838..e0fdd8a19 100644 --- a/gems/kettle-jem/docs/Kettle/Jem/Tasks/InstallTask.html +++ b/gems/kettle-jem/docs/Kettle/Jem/Tasks/InstallTask.html @@ -5,9 +5,9 @@ Module: Kettle::Jem::Tasks::InstallTask - + — Documentation by YARD 0.9.44 - + @@ -37,16 +37,16 @@

Module: Kettle::Jem::Tasks::InstallTask - - - + + +

- - - - - - - - + + + + + + + +
Defined in:
lib/kettle/jem/tasks/install_task.rb
- +
- +

Constant Summary collapse

- +
CURATED_BINSTUB_GEMS = - + 
%w[appraisal2 rake rbs rspec-core yard kettle-dev kettle-test kettle-soup-cover stone_checksums].freeze
- +
CURATED_BINSTUB_DISCRETE_EXECUTABLES = - + 
%w[
   kettle-drift
   yard
 ].freeze
- +
DEFAULT_GIT_DRIVER_DEFINITIONS = - + 
[
   {
@@ -137,23 +137,22 @@ 

     merge_command: "smorg-rs merge-driver %O %A %B %P"
   }
 ].freeze
- +
GIT_DRIVER_LANGUAGE_REGISTRY = - + 
DEFAULT_GIT_DRIVER_DEFINITIONS.to_h { |definition| [definition.fetch(:language), definition] }.freeze
- +
BUILTIN_GIT_DIFF_ATTRIBUTES = - + 
[
   {path: ".gitattributes", pattern: "*.rb", attributes: {"diff" => "ruby"}},
   {path: ".gitattributes", pattern: "*.go", attributes: {"diff" => "golang"}},
   {path: ".gitattributes", pattern: "*.rs", attributes: {"diff" => "rust"}}
 ].freeze
- +
- @@ -161,2310 +160,2311 @@

- + +

Class Method Summary collapse

- - + +

Class Method Details

- +

- - .bin_setup_command(project_root, quiet:) ⇒ Object - - + .bin_setup_command(project_root, quiet:) ⇒ Object + + + + -

@@ -2489,16 +2489,16 @@

- +

- - .binstub_files(bin_dir) ⇒ Object - - + .binstub_files(bin_dir) ⇒ Object + + + + -

@@ -2539,16 +2539,16 @@

- +

- - .bootstrap_commit_step(project_root, run_options:) ⇒ Object - - + .bootstrap_commit_step(project_root, run_options:) ⇒ Object + + + + -

@@ -2637,16 +2637,16 @@

- +

- - .bundle_binstubs_command ⇒ Object - - + .bundle_binstubs_command ⇒ Object + + + + -

@@ -2667,16 +2667,16 @@

- +

- - .bundled_handoff_step(project_root:, env:, run_options:) ⇒ Object - - + .bundled_handoff_step(project_root:, env:, run_options:) ⇒ Object + + + + -

@@ -2743,16 +2743,16 @@

- +

- - .bundler_binstub_gem_name(path) ⇒ Object - - + .bundler_binstub_gem_name(path) ⇒ Object + + + + -

@@ -2797,37 +2797,37 @@

- +

- - .bundler_generated_binstub?(path) ⇒ Boolean - - + .bundler_generated_binstub?(path) ⇒ Boolean + + + + -

- +
- +

Returns:

    - +
  • - - + + (Boolean) - - - + + +
    • - +
@@ -2854,16 +2854,16 @@

- +

- - .cleanup_legacy_ruby_version_files(project_root) ⇒ Object - - + .cleanup_legacy_ruby_version_files(project_root) ⇒ Object + + + + -

@@ -2910,37 +2910,37 @@

- +

- - .config_bootstrap_changed?(report) ⇒ Boolean - - + .config_bootstrap_changed?(report) ⇒ Boolean + + + + -

- +
- +

Returns:

    - +
  • - - + + (Boolean) - - - + + +
    • - +
@@ -2971,16 +2971,16 @@

- +

- - .configured_project_grapheme(project_root, env) ⇒ Object - - + .configured_project_grapheme(project_root, env) ⇒ Object + + + + -

@@ -3021,16 +3021,16 @@

- +

- - .conflicting_git_attribute_diagnostics(content, updates, managed_block:) ⇒ Object - - + .conflicting_git_attribute_diagnostics(content, updates, managed_block:) ⇒ Object + + + + -

@@ -3077,37 +3077,37 @@

- +

- - .curated_binstub?(path) ⇒ Boolean - - + .curated_binstub?(path) ⇒ Boolean + + + + -

- +
- +

Returns:

    - +
  • - - + + (Boolean) - - - + + +
    • - +
@@ -3138,37 +3138,37 @@

- +

- - .decorative_grapheme?(grapheme) ⇒ Boolean - - + .decorative_grapheme?(grapheme) ⇒ Boolean + + + + -

- +
- +

Returns:

    - +
  • - - + + (Boolean) - - - + + +
    • - +
@@ -3197,16 +3197,16 @@

- +

- - .default_git_driver_global_commands ⇒ Object - - + .default_git_driver_global_commands ⇒ Object + + + + -

@@ -3239,16 +3239,16 @@

- +

- - .development_dependency_names(content) ⇒ Object - - + .development_dependency_names(content) ⇒ Object + + + + -

@@ -3275,37 +3275,37 @@

- +

- - .dirty_git_attribute_managed_block?(content, managed_block) ⇒ Boolean - - + .dirty_git_attribute_managed_block?(content, managed_block) ⇒ Boolean + + + + -

- +
- +

Returns:

    - +
  • - - + + (Boolean) - - - + + +
    • - +
@@ -3334,16 +3334,16 @@

- +

- - .ensure_bin_setup_executable(project_root) ⇒ Object - - + .ensure_bin_setup_executable(project_root) ⇒ Object + + + + -

@@ -3384,16 +3384,16 @@

- +

- - .ensure_curated_binstubs_executable(project_root) ⇒ Object - - + .ensure_curated_binstubs_executable(project_root) ⇒ Object + + + + -

@@ -3444,16 +3444,16 @@

- +

- - .ensure_env_local_gitignore(project_root) ⇒ Object - - + .ensure_env_local_gitignore(project_root) ⇒ Object + + + + -

@@ -3522,37 +3522,37 @@

- +

- - .execute_git_drivers_check_step(step, project_root:, env:, quiet:, command_runner:) ⇒ Object - - + .execute_git_drivers_check_step(step, project_root:, env:, quiet:, command_runner:) ⇒ Object + + + + -

- +
- +

Raises:

@@ -3609,16 +3609,16 @@

- +

- - .execute_git_drivers_step(step, project_root:, env:, quiet:, command_runner:) ⇒ Object - - + .execute_git_drivers_step(step, project_root:, env:, quiet:, command_runner:) ⇒ Object + + + + -

@@ -3729,16 +3729,16 @@

- +

- - .execute_hook_templates_step(step, project_root:, env:, quiet:, command_runner:) ⇒ Object - - + .execute_hook_templates_step(step, project_root:, env:, quiet:, command_runner:) ⇒ Object + + + + -

@@ -3787,16 +3787,16 @@

- +

- - .execute_orchestration_steps(install_steps, project_root:, env:, run_options:, command_runner:) ⇒ Object - - + .execute_orchestration_steps(install_steps, project_root:, env:, run_options:, command_runner:) ⇒ Object + + + + -

@@ -3853,37 +3853,37 @@

- +

- - .execute_ready_command_step(step, project_root:, env:, quiet:, command_runner:) ⇒ Object - - + .execute_ready_command_step(step, project_root:, env:, quiet:, command_runner:) ⇒ Object + + + + -

- +
- +

Raises:

@@ -3930,16 +3930,16 @@

- +

- - .execute_ready_commands_step(step, project_root:, env:, quiet:, command_runner:) ⇒ Object - - + .execute_ready_commands_step(step, project_root:, env:, quiet:, command_runner:) ⇒ Object + + + + -

@@ -3994,16 +3994,16 @@

- +

- - .first_grapheme(text) ⇒ Object - - + .first_grapheme(text) ⇒ Object + + + + -

@@ -4024,16 +4024,16 @@

- +

- - .followup_apply_after_config_bootstrap(project_root, env:, run_options:, report:) ⇒ Object - - + .followup_apply_after_config_bootstrap(project_root, env:, run_options:, report:) ⇒ Object + + + + -

@@ -4070,16 +4070,16 @@

- +

- - .gemspec_dependency_sync_step(report) ⇒ Object - - + .gemspec_dependency_sync_step(report) ⇒ Object + + + + -

@@ -4132,16 +4132,16 @@

- +

- - .gemspec_grapheme_assignment_replacements(content, grapheme) ⇒ Object - - + .gemspec_grapheme_assignment_replacements(content, grapheme) ⇒ Object + + + + -

@@ -4188,16 +4188,16 @@

- - .gemspec_name(content, gemspec_path) ⇒ Object - - + .gemspec_name(content, gemspec_path) ⇒ Object + + + + -

@@ -4224,16 +4224,16 @@

- +

- - .git_attribute_block_end(managed_block) ⇒ Object - - + .git_attribute_block_end(managed_block) ⇒ Object + + + + -

@@ -4254,16 +4254,16 @@

- +

- - .git_attribute_block_start(managed_block) ⇒ Object - - + .git_attribute_block_start(managed_block) ⇒ Object + + + + -

@@ -4284,37 +4284,37 @@

- +

- - .git_attribute_line_conflicts?(line, update) ⇒ Boolean - - + .git_attribute_line_conflicts?(line, update) ⇒ Boolean + + + + -

- +
- +

Returns:

    - +
  • - - + + (Boolean) - - - + + +
    • - +
@@ -4353,16 +4353,16 @@

- +

- - .git_driver_attribute_diagnostics(project_root, updates, managed_block:) ⇒ Object - - + .git_driver_attribute_diagnostics(project_root, updates, managed_block:) ⇒ Object + + + + -

@@ -4413,16 +4413,16 @@

- +

- - .git_driver_attribute_reason(diagnostics, dry_run:, ready:) ⇒ Object - - + .git_driver_attribute_reason(diagnostics, dry_run:, ready:) ⇒ Object + + + + -

@@ -4449,16 +4449,16 @@

- +

- - .git_driver_attribute_status(diagnostics, dry_run:) ⇒ Object - - + .git_driver_attribute_status(diagnostics, dry_run:) ⇒ Object + + + + -

@@ -4483,16 +4483,16 @@

- +

- - .git_driver_attribute_updates(manifest, profile) ⇒ Object - - + .git_driver_attribute_updates(manifest, profile) ⇒ Object + + + + -

@@ -4527,16 +4527,16 @@

- +

- - .git_driver_forge_warning_diagnostic ⇒ Object - - + .git_driver_forge_warning_diagnostic ⇒ Object + + + + -

@@ -4567,16 +4567,16 @@

- +

- - .git_driver_global_commands(manifest = nil, profile = "semantic-diff") ⇒ Object - - + .git_driver_global_commands(manifest = nil, profile = "semantic-diff") ⇒ Object + + + + -

@@ -4607,16 +4607,16 @@

- +

- - .git_driver_global_config_checks(manifest = nil, profile = "semantic-diff") ⇒ Object - - + .git_driver_global_config_checks(manifest = nil, profile = "semantic-diff") ⇒ Object + + + + -

@@ -4641,16 +4641,16 @@

- +

- - .git_driver_global_unset_commands ⇒ Object - - + .git_driver_global_unset_commands ⇒ Object + + + + -

@@ -4683,16 +4683,16 @@

- +

- - .git_driver_local_commands(manifest = nil, profile = "semantic-diff") ⇒ Object - - + .git_driver_local_commands(manifest = nil, profile = "semantic-diff") ⇒ Object + + + + -

@@ -4717,16 +4717,16 @@

- +

- - .git_driver_local_config_checks(manifest = nil, profile = "semantic-diff") ⇒ Object - - + .git_driver_local_config_checks(manifest = nil, profile = "semantic-diff") ⇒ Object + + + + -

@@ -4751,16 +4751,16 @@

- +

- - .git_driver_manifest(project_root) ⇒ Object - - + .git_driver_manifest(project_root) ⇒ Object + + + + -

@@ -4795,16 +4795,16 @@

- +

- - .git_driver_manifest_profile(manifest, profile) ⇒ Object - - + .git_driver_manifest_profile(manifest, profile) ⇒ Object + + + + -

@@ -4829,16 +4829,16 @@

- +

- - .git_drivers_step(project_root, run_options) ⇒ Object - - + .git_drivers_step(project_root, run_options) ⇒ Object + + + + -

@@ -5043,16 +5043,16 @@

- +

- - .git_output(project_root, *args) ⇒ Object - - + .git_output(project_root, *args) ⇒ Object + + + + -

@@ -5075,37 +5075,37 @@

- +

- - .git_success?(project_root, *args) ⇒ Boolean - - + .git_success?(project_root, *args) ⇒ Boolean + + + + -

- +
- +

Returns:

    - +
  • - - + + (Boolean) - - - + + +
    • - +
@@ -5130,16 +5130,16 @@

- +

- - .git_toplevel(project_root) ⇒ Object - - + .git_toplevel(project_root) ⇒ Object + + + + -

@@ -5162,16 +5162,16 @@

- +

- - .github_org_from_env(env) ⇒ Object - - + .github_org_from_env(env) ⇒ Object + + + + -

@@ -5200,16 +5200,16 @@

- +

- - .github_org_from_origin(project_root) ⇒ Object - - + .github_org_from_origin(project_root) ⇒ Object + + + + -

@@ -5258,16 +5258,16 @@

- +

- - .github_workflow_paths(project_root) ⇒ Object - - + .github_workflow_paths(project_root) ⇒ Object + + + + -

@@ -5298,16 +5298,16 @@

- +

- - .handoff_argv(run_options) ⇒ Object - - + .handoff_argv(run_options) ⇒ Object + + + + -

@@ -5360,16 +5360,16 @@

- +

- - .hook_templates_step(project_root, run_options) ⇒ Object - - + .hook_templates_step(project_root, run_options) ⇒ Object + + + + -

@@ -5460,16 +5460,16 @@

- +

- - .install_phase_reports(install_steps) ⇒ Object - - + .install_phase_reports(install_steps) ⇒ Object + + + + -

@@ -5550,16 +5550,16 @@

- +

- - .install_run_options(env, run_options) ⇒ Object - - + .install_run_options(env, run_options) ⇒ Object + + + + -

@@ -5580,16 +5580,16 @@

- +

- - .install_step_summary(install_steps) ⇒ Object - - + .install_step_summary(install_steps) ⇒ Object + + + + -

@@ -5624,16 +5624,16 @@

- +

- - .kettle_config_migration_step(project_root) ⇒ Object - - + .kettle_config_migration_step(project_root) ⇒ Object + + + + -

@@ -5718,16 +5718,16 @@

- +

- - .list_arg(flag, value) ⇒ Object - - + .list_arg(flag, value) ⇒ Object + + + + -

@@ -5750,37 +5750,37 @@

- +

- - .literal_github_homepage?(assigned) ⇒ Boolean - - + .literal_github_homepage?(assigned) ⇒ Boolean + + + + -

- +
- +

Returns:

    - +
  • - - + + (Boolean) - - - + + +
    • - +
@@ -5823,16 +5823,16 @@

- +

- - .lockfile_normalization_command ⇒ Object - - + .lockfile_normalization_command ⇒ Object + + + + -

@@ -5853,16 +5853,16 @@

- +

- - .merge_apply_reports(initial, followup) ⇒ Object - - + .merge_apply_reports(initial, followup) ⇒ Object + + + + -

@@ -5897,37 +5897,37 @@

- +

- - .mise_installed?(env) ⇒ Boolean - - + .mise_installed?(env) ⇒ Boolean + + + + -

- +
- +

Returns:

    - +
  • - - + + (Boolean) - - - + + +
    • - +
@@ -5960,16 +5960,16 @@

- +

- - .mise_trust_step(project_root, report, env:) ⇒ Object - - + .mise_trust_step(project_root, report, env:) ⇒ Object + + + + -

@@ -6036,16 +6036,16 @@

- +

- - .normal_lockfile_env(env) ⇒ Object - - + .normal_lockfile_env(env) ⇒ Object + + + + -

@@ -6080,7 +6080,7 @@

def normal_lockfile_env(env) command_env = (env || {}).to_h.dup command_env["K_JEM_TEMPLATING"] = "false" - %w[KETTLE_RB_DEV GALTZO_FLOSS_DEV SMORG_RB_DEV].each do |key| + %w[KETTLE_RB_DEV GALTZO_FLOSS_DEV STRUCTUREDMERGE_DEV].each do |key| command_env[key] = "false" if command_env.key?(key) end %w[ @@ -6102,16 +6102,16 @@

- +

- - .normalize_gemspec_grapheme(content, grapheme) ⇒ Object - - + .normalize_gemspec_grapheme(content, grapheme) ⇒ Object + + + + -

@@ -6134,16 +6134,16 @@

- +

- - .normalize_git_drivers_mode(value) ⇒ Object - - + .normalize_git_drivers_mode(value) ⇒ Object + + + + -

@@ -6184,16 +6184,16 @@

- +

- - .normalize_hook_templates_mode(value) ⇒ Object - - + .normalize_hook_templates_mode(value) ⇒ Object + + + + -

@@ -6226,16 +6226,16 @@

- +

- - .normalize_lockfile_step(project_root, env:, run_options: {}) ⇒ Object - - + .normalize_lockfile_step(project_root, env:, run_options: {}) ⇒ Object + + + + -

@@ -6300,16 +6300,16 @@

- +

- - .normalize_readme_h1_grapheme(content, grapheme) ⇒ Object - - + .normalize_readme_h1_grapheme(content, grapheme) ⇒ Object + + + + -

@@ -6344,16 +6344,16 @@

- +

- - .post_template_project_fix_steps(project_root, report, env:) ⇒ Object - - + .post_template_project_fix_steps(project_root, report, env:) ⇒ Object + + + + -

@@ -6386,16 +6386,16 @@

- +

- - .prune_unwanted_bundler_binstubs(project_root) ⇒ Object - - + .prune_unwanted_bundler_binstubs(project_root) ⇒ Object + + + + -

@@ -6446,16 +6446,16 @@

- +

- - .readme_h1_grapheme(content) ⇒ Object - - + .readme_h1_grapheme(content) ⇒ Object + + + + -

@@ -6484,16 +6484,16 @@

- +

- - .relative_or_absolute_path(path, project_root) ⇒ Object - - + .relative_or_absolute_path(path, project_root) ⇒ Object + + + + -

@@ -6524,16 +6524,16 @@

- +

- - .remove_git_attribute_managed_block(content, managed_block:) ⇒ Object - - + .remove_git_attribute_managed_block(content, managed_block:) ⇒ Object + + + + -

@@ -6588,16 +6588,16 @@

- +

- - .render_git_attribute_line(update) ⇒ Object - - + .render_git_attribute_line(update) ⇒ Object + + + + -

@@ -6620,16 +6620,16 @@

- +

- - .render_git_attributes(content, updates, managed_block:) ⇒ Object - - + .render_git_attributes(content, updates, managed_block:) ⇒ Object + + + + -

@@ -6660,16 +6660,16 @@

- +

- - .render_git_driver_include_config(config_entries) ⇒ Object - - + .render_git_driver_include_config(config_entries) ⇒ Object + + + + -

@@ -6704,16 +6704,16 @@

- +

- - .repair_gemspec_homepage(project_root, env) ⇒ Object - - + .repair_gemspec_homepage(project_root, env) ⇒ Object + + + + -

@@ -6834,16 +6834,16 @@

- +

- - .replace_character_ranges(content, replacements) ⇒ Object - - + .replace_character_ranges(content, replacements) ⇒ Object + + + + -

@@ -6868,16 +6868,16 @@

- +

- - .rewrite_yard_binstub(project_root) ⇒ Object - - + .rewrite_yard_binstub(project_root) ⇒ Object + + + + -

@@ -6954,16 +6954,16 @@

- +

- - .ruby_string_literal_content(value, quote) ⇒ Object - - + .ruby_string_literal_content(value, quote) ⇒ Object + + + + -

@@ -6986,16 +6986,16 @@

- +

- - .run(project_root: Dir.pwd, env: ENV, run_options: {}, command_runner: method(:run_system_command)) ⇒ Object - - + .run(project_root: Dir.pwd, env: ENV, run_options: {}, command_runner: method(:run_system_command)) ⇒ Object + + + + -

@@ -7080,16 +7080,16 @@

- +

- - .run_bundle_setup_commands(project_root, env:, run_options:, command_runner:) ⇒ Object - - + .run_bundle_setup_commands(project_root, env:, run_options:, command_runner:) ⇒ Object + + + + -

@@ -7160,37 +7160,37 @@

- +

- - .run_command_step(name, command, project_root:, env:, quiet:, command_runner:) ⇒ Object - - + .run_command_step(name, command, project_root:, env:, quiet:, command_runner:) ⇒ Object + + + + -

- +
- +

Raises:

@@ -7253,16 +7253,16 @@

- +

- - .run_system_command(command, chdir:, env:, quiet:) ⇒ Object - - + .run_system_command(command, chdir:, env:, quiet:) ⇒ Object + + + + -

@@ -7299,16 +7299,16 @@

- +

- - .semantic_git_driver_attribute_updates ⇒ Object - - + .semantic_git_driver_attribute_updates ⇒ Object + + + + -

@@ -7341,16 +7341,16 @@

- +

- - .setup_command_env(project_root, env) ⇒ Object - - + .setup_command_env(project_root, env) ⇒ Object + + + + -

@@ -7379,16 +7379,16 @@

- +

- - .strip_inherited_bundler_activation!(command_env) ⇒ Object - - + .strip_inherited_bundler_activation!(command_env) ⇒ Object + + + + -

@@ -7427,16 +7427,16 @@

- +

- - .strip_leading_decorative_graphemes(text) ⇒ Object - - + .strip_leading_decorative_graphemes(text) ⇒ Object + + + + -

@@ -7471,16 +7471,16 @@

- +

- - .sync_readme_gemspec_grapheme(project_root, env) ⇒ Object - - + .sync_readme_gemspec_grapheme(project_root, env) ⇒ Object + + + + -

@@ -7561,16 +7561,16 @@

- +

- - .trim_readme_compatibility_badges(project_root, report) ⇒ Object - - + .trim_readme_compatibility_badges(project_root, report) ⇒ Object + + + + -

@@ -7653,37 +7653,37 @@

- +

- - .unsafe_git_driver_command_value?(value) ⇒ Boolean - - + .unsafe_git_driver_command_value?(value) ⇒ Boolean + + + + -

- +
- +

Returns:

    - +
  • - - + + (Boolean) - - - + + +
    • - +
@@ -7706,16 +7706,16 @@

- +

- - .validate_bundle_binstub_location(project_root) ⇒ Object - - + .validate_bundle_binstub_location(project_root) ⇒ Object + + + + -

@@ -7788,37 +7788,37 @@

- +

- - .validate_git_driver_manifest!(manifest) ⇒ Object - - + .validate_git_driver_manifest!(manifest) ⇒ Object + + + + -

- +
- +

Raises:

@@ -7857,37 +7857,37 @@

- +

- - .validate_git_driver_profile!(profile_name, profile) ⇒ Object - - + .validate_git_driver_profile!(profile_name, profile) ⇒ Object + + + + -

- +
- +

Raises:

@@ -7938,16 +7938,16 @@

- +

- - .value_arg(flag, value) ⇒ Object - - + .value_arg(flag, value) ⇒ Object + + + + -

@@ -7968,16 +7968,16 @@

- +

- - .version_gem_bootstrap_step(project_root, report) ⇒ Object - - + .version_gem_bootstrap_step(project_root, report) ⇒ Object + + + + -

@@ -8000,16 +8000,16 @@

- +

- - .yard_binstub_rake_handoff_content ⇒ Object - - + .yard_binstub_rake_handoff_content ⇒ Object + + + + -

@@ -8062,7 +8062,7 @@

- + diff --git a/gems/kettle-jem/docs/file.CHANGELOG.html b/gems/kettle-jem/docs/file.CHANGELOG.html index 6487a50d3..029c954cf 100644 --- a/gems/kettle-jem/docs/file.CHANGELOG.html +++ b/gems/kettle-jem/docs/file.CHANGELOG.html @@ -5,9 +5,9 @@ File: CHANGELOG - + — Documentation by YARD 0.9.44 - + @@ -37,14 +37,14 @@
@@ -475,7 +475,7 @@

Fixed

without requiring unreleased kettle-drift in every generated gemspec.
  • Added kettle-drift to generated templating Gemfiles, resolved remotely in
    templating mode and via KETTLE_RB_DEV locally, separate from the
    -SMORG_RB_DEV StructuredMerge local gem set.
    • +STRUCTUREDMERGE_DEV StructuredMerge local gem set.
  • Refreshed generated README metadata blocks after template README merging so
    version-derived gemspec metadata such as source_code_uri does not stay stale.
  • Added yard-yaml to generated local documentation Gemfiles so local
    diff --git a/gems/ruby-merge/.kettle-drift.lock b/gems/ruby-merge/.kettle-drift.lock index 628aa923c..0161251a7 100644 --- a/gems/ruby-merge/.kettle-drift.lock +++ b/gems/ruby-merge/.kettle-drift.lock @@ -5,7 +5,8 @@ "lines": [ 80, 120, - 160 + 160, + 200 ] } ], @@ -15,7 +16,8 @@ "lines": [ 91, 131, - 171 + 171, + 211 ] } ], @@ -25,7 +27,8 @@ "lines": [ 81, 121, - 161 + 161, + 201 ] } ], @@ -35,7 +38,8 @@ "lines": [ 93, 133, - 173 + 173, + 213 ] } ], @@ -45,7 +49,8 @@ "lines": [ 96, 136, - 176 + 176, + 216 ] } ], @@ -55,7 +60,8 @@ "lines": [ 82, 122, - 162 + 162, + 202 ] } ], @@ -66,7 +72,8 @@ 60, 100, 140, - 180 + 180, + 220 ] } ], @@ -76,7 +83,8 @@ "lines": [ 101, 141, - 181 + 181, + 221 ] } ], @@ -87,7 +95,8 @@ 43, 87, 127, - 167 + 167, + 207 ] } ], @@ -97,7 +106,8 @@ "lines": [ 110, 150, - 190 + 190, + 230 ] } ], @@ -108,7 +118,8 @@ 35, 79, 119, - 159 + 159, + 199 ] } ], @@ -119,7 +130,8 @@ 69, 109, 149, - 189 + 189, + 229 ] } ], @@ -129,7 +141,8 @@ "lines": [ 85, 125, - 165 + 165, + 205 ] } ], @@ -140,7 +153,8 @@ 48, 92, 132, - 172 + 172, + 212 ] } ], @@ -151,7 +165,8 @@ 44, 88, 128, - 168 + 168, + 208 ] } ], @@ -161,7 +176,8 @@ "lines": [ 86, 126, - 166 + 166, + 206 ] } ], @@ -171,7 +187,8 @@ "lines": [ 103, 143, - 183 + 183, + 223 ] } ], @@ -181,7 +198,8 @@ "lines": [ 102, 142, - 182 + 182, + 222 ] } ], @@ -191,7 +209,8 @@ "lines": [ 97, 137, - 177 + 177, + 217 ] } ], @@ -201,7 +220,8 @@ "lines": [ 106, 146, - 186 + 186, + 226 ] } ], diff --git a/gems/ruby-merge/.rubocop_gradual.lock b/gems/ruby-merge/.rubocop_gradual.lock deleted file mode 100644 index fff670117..000000000 --- a/gems/ruby-merge/.rubocop_gradual.lock +++ /dev/null @@ -1,316 +0,0 @@ -{ - ".simplecov:3590623278": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:2768890125": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/ruby-merge.rb:2992445753": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`ruby-merge.rb`) should use snake_case.", 5381] - ], - "lib/ruby/merge.rb:1877719734": [ - [11, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Ruby::Merge`.", 2866359175], - [11, 3, 109110, "Metrics/ModuleLength: Module has too many lines. [2519/100]", 662788489], - [29, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3061257365], - [81, 5, 959, "Metrics/AbcSize: Assignment Branch Condition size for `parse_ruby` is too high. [<4, 16, 7> 17.92/17]", 1071201699], - [81, 5, 959, "Metrics/MethodLength: Method has too many lines. [16/10]", 1071201699], - [107, 5, 2656, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_method_move_detection` is too high. [<17, 40, 18> 47.04/17]", 3779436399], - [107, 5, 2656, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_method_move_detection` is too high. [16/7]", 3779436399], - [107, 5, 2656, "Metrics/MethodLength: Method has too many lines. [45/10]", 3779436399], - [107, 5, 2656, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_method_move_detection` is too high. [16/8]", 3779436399], - [119, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 727785047], - [132, 121, 51, "Layout/LineLength: Line is too long. [171/120]", 3259664538], - [151, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], - [154, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], - [155, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 1976354608], - [159, 5, 4395, "Metrics/AbcSize: Assignment Branch Condition size for `merge_ruby` is too high. [<31, 64, 24> 75.05/17]", 2749692967], - [159, 5, 4395, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_ruby` is too high. [21/7]", 2749692967], - [159, 5, 4395, "Metrics/MethodLength: Method has too many lines. [83/10]", 2749692967], - [159, 5, 4395, "Metrics/PerceivedComplexity: Perceived complexity for `merge_ruby` is too high. [22/8]", 2749692967], - [218, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], - [257, 5, 1312, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_delegated_child_operations` is too high. [<10, 15, 6> 19/17]", 2246428949], - [257, 5, 1312, "Metrics/MethodLength: Method has too many lines. [28/10]", 2246428949], - [303, 5, 861, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_source_owner_identity_profile` is too high. [<5, 17, 2> 17.83/17]", 4129925341], - [303, 5, 861, "Metrics/MethodLength: Method has too many lines. [20/10]", 4129925341], - [326, 5, 2064, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_source_owner_identity_matches` is too high. [<17, 31, 11> 37.03/17]", 2780319153], - [326, 5, 2064, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_source_owner_identity_matches` is too high. [11/7]", 2780319153], - [326, 5, 2064, "Metrics/MethodLength: Method has too many lines. [37/10]", 2780319153], - [326, 5, 2064, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_source_owner_identity_matches` is too high. [11/8]", 2780319153], - [355, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], - [358, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], - [363, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1001816794], - [369, 5, 1314, "Metrics/MethodLength: Method has too many lines. [28/10]", 4183124680], - [402, 5, 786, "Metrics/MethodLength: Method has too many lines. [24/10]", 3631640245], - [429, 5, 916, "Metrics/MethodLength: Method has too many lines. [18/10]", 631485532], - [450, 5, 662, "Metrics/MethodLength: Method has too many lines. [15/10]", 2231086183], - [469, 5, 777, "Metrics/MethodLength: Method has too many lines. [18/10]", 895030114], - [490, 5, 727, "Metrics/MethodLength: Method has too many lines. [19/10]", 776483642], - [512, 5, 861, "Metrics/MethodLength: Method has too many lines. [29/10]", 537340961], - [544, 5, 655, "Metrics/MethodLength: Method has too many lines. [16/10]", 3756601977], - [563, 5, 1592, "Metrics/MethodLength: Method has too many lines. [25/10]", 3521052904], - [587, 121, 106, "Layout/LineLength: Line is too long. [226/120]", 2104286058], - [593, 5, 777, "Metrics/MethodLength: Method has too many lines. [14/10]", 2821246515], - [610, 5, 1429, "Metrics/MethodLength: Method has too many lines. [26/10]", 244346226], - [633, 121, 124, "Layout/LineLength: Line is too long. [244/120]", 13261232], - [639, 5, 1367, "Metrics/MethodLength: Method has too many lines. [41/10]", 3883814121], - [683, 5, 750, "Metrics/MethodLength: Method has too many lines. [22/10]", 764028624], - [709, 5, 1315, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_silent_data_loss_validation_report` is too high. [<8, 14, 7> 17.58/17]", 2039399818], - [709, 5, 1315, "Metrics/MethodLength: Method has too many lines. [31/10]", 2039399818], - [744, 5, 724, "Metrics/MethodLength: Method has too many lines. [14/10]", 1741779676], - [755, 121, 67, "Layout/LineLength: Line is too long. [187/120]", 1996508131], - [761, 5, 752, "Metrics/MethodLength: Method has too many lines. [21/10]", 3870096101], - [785, 5, 1052, "Metrics/MethodLength: Method has too many lines. [32/10]", 119279638], - [820, 5, 1588, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_interstitial_comment_attachment_report` is too high. [<11, 34, 17> 39.57/17]", 4112280260], - [820, 5, 1588, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_interstitial_comment_attachment_report` is too high. [14/7]", 4112280260], - [820, 5, 1588, "Metrics/MethodLength: Method has too many lines. [30/10]", 4112280260], - [820, 5, 1588, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_interstitial_comment_attachment_report` is too high. [15/8]", 4112280260], - [834, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 180543822], - [862, 5, 536, "Metrics/MethodLength: Method has too many lines. [13/10]", 245509059], - [878, 5, 2252, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_rename_detection` is too high. [<14, 32, 11> 36.62/17]", 2574664763], - [878, 5, 2252, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_rename_detection` is too high. [10/7]", 2574664763], - [878, 5, 2252, "Metrics/MethodLength: Method has too many lines. [46/10]", 2574664763], - [878, 5, 2252, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_rename_detection` is too high. [11/8]", 2574664763], - [921, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 4074688513], - [927, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], - [931, 5, 2254, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_rename_plus_edit_conflicts` is too high. [<15, 30, 13> 35.97/17]", 3664513828], - [931, 5, 2254, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_rename_plus_edit_conflicts` is too high. [10/7]", 3664513828], - [931, 5, 2254, "Metrics/MethodLength: Method has too many lines. [45/10]", 3664513828], - [931, 5, 2254, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_rename_plus_edit_conflicts` is too high. [11/8]", 3664513828], - [983, 5, 1926, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_cross_container_method_move_detection` is too high. [<8, 18, 7> 20.9/17]", 1401333972], - [983, 5, 1926, "Metrics/MethodLength: Method has too many lines. [44/10]", 1401333972], - [1026, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3474944396], - [1033, 5, 1488, "Metrics/AbcSize: Assignment Branch Condition size for `apply_ruby_delegated_child_outputs` is too high. [<16, 39, 12> 43.83/17]", 842348215], - [1033, 5, 1488, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_ruby_delegated_child_outputs` is too high. [12/7]", 842348215], - [1033, 5, 1488, "Metrics/MethodLength: Method has too many lines. [27/10]", 842348215], - [1033, 5, 1488, "Metrics/PerceivedComplexity: Perceived complexity for `apply_ruby_delegated_child_outputs` is too high. [13/8]", 842348215], - [1067, 5, 980, "Metrics/MethodLength: Method has too many lines. [23/10]", 1425119613], - [1094, 5, 1025, "Metrics/MethodLength: Method has too many lines. [23/10]", 2179557432], - [1122, 5, 757, "Metrics/MethodLength: Method has too many lines. [12/10]", 3975431355], - [1127, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 1956194284], - [1139, 5, 745, "Metrics/MethodLength: Method has too many lines. [12/10]", 1051086033], - [1144, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1636990749], - [1156, 5, 670, "Metrics/MethodLength: Method has too many lines. [11/10]", 3552666292], - [1161, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 3013228499], - [1172, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 1356230953], - [1177, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 3013228499], - [1188, 5, 2093, "Metrics/AbcSize: Assignment Branch Condition size for `analyze_ruby_document` is too high. [<21, 31, 12> 39.32/17]", 3298966582], - [1188, 5, 2093, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `analyze_ruby_document` is too high. [13/7]", 3298966582], - [1188, 5, 2093, "Metrics/MethodLength: Method has too many lines. [53/10]", 3298966582], - [1188, 5, 2093, "Metrics/PerceivedComplexity: Perceived complexity for `analyze_ruby_document` is too high. [13/8]", 3298966582], - [1194, 7, 1035, "Metrics/BlockLength: Block has too many lines. [27/25]", 2081528636], - [1263, 5, 427, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_file_footer_text` is too high. [<5, 17, 8> 19.44/17]", 1703748308], - [1301, 5, 941, "Metrics/MethodLength: Method has too many lines. [15/10]", 1317835917], - [1307, 121, 173, "Layout/LineLength: Line is too long. [293/120]", 225499532], - [1333, 5, 518, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_tslp_claimed_line_indexes` is too high. [<6, 19, 5> 20.54/17]", 1455439838], - [1356, 5, 443, "Metrics/MethodLength: Method has too many lines. [12/10]", 4230588206], - [1373, 5, 363, "Metrics/MethodLength: Method has too many lines. [11/10]", 3068065572], - [1421, 5, 1849, "Metrics/AbcSize: Assignment Branch Condition size for `legacy_collect_ruby_declaration_entries` is too high. [<24, 26, 13> 37.7/17]", 3187770326], - [1421, 5, 1849, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `legacy_collect_ruby_declaration_entries` is too high. [11/7]", 3187770326], - [1421, 5, 1849, "Metrics/MethodLength: Method has too many lines. [54/10]", 3187770326], - [1421, 5, 1849, "Metrics/PerceivedComplexity: Perceived complexity for `legacy_collect_ruby_declaration_entries` is too high. [11/8]", 3187770326], - [1468, 13, 76, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 1356567820], - [1504, 5, 396, "Metrics/MethodLength: Method has too many lines. [11/10]", 1239008881], - [1519, 5, 681, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_process_declaration_entries` is too high. [<7, 17, 2> 18.49/17]", 2675999354], - [1519, 5, 681, "Metrics/MethodLength: Method has too many lines. [16/10]", 2675999354], - [1539, 5, 634, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_top_level_process_structure_items` is too high. [<5, 32, 14> 35.28/17]", 1120707166], - [1539, 5, 634, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_top_level_process_structure_items` is too high. [11/7]", 1120707166], - [1539, 5, 634, "Metrics/MethodLength: Method has too many lines. [11/10]", 1120707166], - [1539, 5, 634, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_top_level_process_structure_items` is too high. [11/8]", 1120707166], - [1551, 7, 11, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 848344986], - [1558, 7, 9, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 3648222389], - [1603, 5, 1284, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_intra_owner_merge_plan` is too high. [<8, 24, 9> 26.85/17]", 2388567699], - [1603, 5, 1284, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_intra_owner_merge_plan` is too high. [9/7]", 2388567699], - [1603, 5, 1284, "Metrics/MethodLength: Method has too many lines. [22/10]", 2388567699], - [1603, 5, 1284, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_intra_owner_merge_plan` is too high. [9/8]", 2388567699], - [1644, 5, 557, "Metrics/MethodLength: Method has too many lines. [11/10]", 3178341030], - [1702, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 895013151], - [1707, 5, 593, "Metrics/MethodLength: Method has too many lines. [13/10]", 2850316611], - [1708, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177625], - [1725, 5, 609, "Metrics/MethodLength: Method has too many lines. [12/10]", 784855730], - [1740, 5, 695, "Metrics/MethodLength: Method has too many lines. [14/10]", 3942458504], - [1777, 5, 1110, "Metrics/AbcSize: Assignment Branch Condition size for `merge_declaration_hash_constants` is too high. [<11, 22, 6> 25.32/17]", 3861922947], - [1777, 5, 1110, "Metrics/MethodLength: Method has too many lines. [17/10]", 3861922947], - [1799, 5, 794, "Metrics/AbcSize: Assignment Branch Condition size for `merge_declaration_body_constants` is too high. [<9, 14, 6> 17.69/17]", 1882117166], - [1829, 5, 1138, "Metrics/AbcSize: Assignment Branch Condition size for `merge_array_constant_text` is too high. [<9, 18, 7> 21.31/17]", 1448081799], - [1829, 5, 1138, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_array_constant_text` is too high. [8/7]", 1448081799], - [1829, 5, 1138, "Metrics/MethodLength: Method has too many lines. [15/10]", 1448081799], - [1835, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193434112], - [1842, 7, 8, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 359846632], - [1849, 5, 774, "Metrics/AbcSize: Assignment Branch Condition size for `merge_percent_array_constant_text` is too high. [<8, 16, 7> 19.21/17]", 625509828], - [1849, 5, 774, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_percent_array_constant_text` is too high. [8/7]", 625509828], - [1878, 5, 1060, "Metrics/AbcSize: Assignment Branch Condition size for `merge_multiline_array_constant_text` is too high. [<11, 23, 10> 27.39/17]", 2672751288], - [1878, 5, 1060, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_multiline_array_constant_text` is too high. [11/7]", 2672751288], - [1878, 5, 1060, "Metrics/MethodLength: Method has too many lines. [13/10]", 2672751288], - [1878, 5, 1060, "Metrics/PerceivedComplexity: Perceived complexity for `merge_multiline_array_constant_text` is too high. [11/8]", 2672751288], - [1887, 7, 8, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 359846632], - [1896, 5, 1605, "Metrics/AbcSize: Assignment Branch Condition size for `merge_declaration_body_methods` is too high. [<21, 28, 15> 38.08/17]", 2740924329], - [1896, 5, 1605, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_declaration_body_methods` is too high. [14/7]", 2740924329], - [1896, 5, 1605, "Metrics/MethodLength: Method has too many lines. [29/10]", 2740924329], - [1896, 5, 1605, "Metrics/PerceivedComplexity: Perceived complexity for `merge_declaration_body_methods` is too high. [15/8]", 2740924329], - [1903, 7, 8, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 359846632], - [1930, 5, 1076, "Metrics/AbcSize: Assignment Branch Condition size for `merge_nested_body_declarations` is too high. [<14, 24, 10> 29.53/17]", 1397199527], - [1930, 5, 1076, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_nested_body_declarations` is too high. [11/7]", 1397199527], - [1930, 5, 1076, "Metrics/MethodLength: Method has too many lines. [14/10]", 1397199527], - [1930, 5, 1076, "Metrics/PerceivedComplexity: Perceived complexity for `merge_nested_body_declarations` is too high. [11/8]", 1397199527], - [1969, 5, 2549, "Metrics/AbcSize: Assignment Branch Condition size for `top_level_source_region_owners` is too high. [<24, 33, 13> 42.83/17]", 1909271685], - [1969, 5, 2549, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `top_level_source_region_owners` is too high. [11/7]", 1909271685], - [1969, 5, 2549, "Metrics/MethodLength: Method has too many lines. [64/10]", 1909271685], - [1969, 5, 2549, "Metrics/PerceivedComplexity: Perceived complexity for `top_level_source_region_owners` is too high. [11/8]", 1909271685], - [2012, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861626], - [2027, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1695648499], - [2043, 5, 2126, "Metrics/AbcSize: Assignment Branch Condition size for `container_child_source_regions` is too high. [<23, 28, 11> 37.87/17]", 4031983731], - [2043, 5, 2126, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `container_child_source_regions` is too high. [10/7]", 4031983731], - [2043, 5, 2126, "Metrics/MethodLength: Method has too many lines. [56/10]", 4031983731], - [2043, 5, 2126, "Metrics/PerceivedComplexity: Perceived complexity for `container_child_source_regions` is too high. [10/8]", 4031983731], - [2109, 5, 996, "Metrics/AbcSize: Assignment Branch Condition size for `interleave_source_regions` is too high. [<8, 14, 6> 17.2/17]", 796443872], - [2109, 5, 996, "Metrics/MethodLength: Method has too many lines. [30/10]", 796443872], - [2147, 5, 1323, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `source_interstitial_region` is too high. [13/7]", 1970451685], - [2147, 5, 1323, "Metrics/MethodLength: Method has too many lines. [30/10]", 1970451685], - [2147, 5, 1323, "Metrics/PerceivedComplexity: Perceived complexity for `source_interstitial_region` is too high. [12/8]", 1970451685], - [2147, 35, 80, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2143999554], - [2182, 5, 396, "Metrics/MethodLength: Method has too many lines. [12/10]", 663734283], - [2198, 5, 890, "Metrics/AbcSize: Assignment Branch Condition size for `collect_blank_line_regions` is too high. [<4, 18, 7> 19.72/17]", 3362926457], - [2198, 5, 890, "Metrics/MethodLength: Method has too many lines. [20/10]", 3362926457], - [2257, 5, 27, "Style/Documentation: Missing top-level documentation comment for `class Ruby::Merge::RubyHashLiteralParser`.", 2589782793], - [2257, 5, 3304, "Metrics/ClassLength: Class has too many lines. [103/100]", 2782733473], - [2274, 7, 868, "Metrics/AbcSize: Assignment Branch Condition size for `parse_hash` is too high. [<6, 23, 6> 24.52/17]", 2331230410], - [2274, 7, 868, "Metrics/MethodLength: Method has too many lines. [28/10]", 2331230410], - [2314, 7, 911, "Metrics/AbcSize: Assignment Branch Condition size for `parse_hash_key` is too high. [<13, 26, 4> 29.34/17]", 2403379393], - [2314, 7, 911, "Metrics/MethodLength: Method has too many lines. [18/10]", 2403379393], - [2339, 7, 644, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_scalar_source` is too high. [8/7]", 2447980390], - [2339, 7, 644, "Metrics/MethodLength: Method has too many lines. [21/10]", 2447980390], - [2339, 7, 644, "Metrics/PerceivedComplexity: Perceived complexity for `parse_scalar_source` is too high. [9/8]", 2447980390], - [2384, 5, 1202, "Metrics/AbcSize: Assignment Branch Condition size for `constant_hash_blocks` is too high. [<19, 25, 6> 31.97/17]", 399214756], - [2384, 5, 1202, "Metrics/MethodLength: Method has too many lines. [36/10]", 399214756], - [2425, 5, 727, "Metrics/AbcSize: Assignment Branch Condition size for `hash_assignment_finish_line` is too high. [<11, 7, 12> 17.72/17]", 1215874404], - [2425, 5, 727, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `hash_assignment_finish_line` is too high. [9/7]", 1215874404], - [2425, 5, 727, "Metrics/MethodLength: Method has too many lines. [26/10]", 1215874404], - [2425, 5, 727, "Metrics/PerceivedComplexity: Perceived complexity for `hash_assignment_finish_line` is too high. [11/8]", 1215874404], - [2455, 5, 1970, "Metrics/AbcSize: Assignment Branch Condition size for `direct_body_method_entries` is too high. [<28, 32, 13> 44.46/17]", 2589282610], - [2455, 5, 1970, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `direct_body_method_entries` is too high. [12/7]", 2589282610], - [2455, 5, 1970, "Metrics/MethodLength: Method has too many lines. [56/10]", 2589282610], - [2455, 5, 1970, "Metrics/PerceivedComplexity: Perceived complexity for `direct_body_method_entries` is too high. [12/8]", 2589282610], - [2520, 5, 1221, "Metrics/AbcSize: Assignment Branch Condition size for `direct_body_constant_entries` is too high. [<16, 34, 10> 38.88/17]", 1588885504], - [2520, 5, 1221, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `direct_body_constant_entries` is too high. [9/7]", 1588885504], - [2520, 5, 1221, "Metrics/MethodLength: Method has too many lines. [35/10]", 1588885504], - [2520, 5, 1221, "Metrics/PerceivedComplexity: Perceived complexity for `direct_body_constant_entries` is too high. [9/8]", 1588885504], - [2563, 5, 708, "Metrics/AbcSize: Assignment Branch Condition size for `split_ruby_array_elements` is too high. [<11, 12, 11> 19.65/17]", 1344003748], - [2563, 5, 708, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split_ruby_array_elements` is too high. [9/7]", 1344003748], - [2563, 5, 708, "Metrics/MethodLength: Method has too many lines. [24/10]", 1344003748], - [2563, 5, 708, "Metrics/PerceivedComplexity: Perceived complexity for `split_ruby_array_elements` is too high. [11/8]", 1344003748], - [2607, 5, 977, "Metrics/AbcSize: Assignment Branch Condition size for `append_multiline_array_elements` is too high. [<12, 32, 9> 35.34/17]", 1316332112], - [2607, 5, 977, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `append_multiline_array_elements` is too high. [9/7]", 1316332112], - [2607, 5, 977, "Metrics/MethodLength: Method has too many lines. [16/10]", 1316332112], - [2607, 5, 977, "Metrics/PerceivedComplexity: Perceived complexity for `append_multiline_array_elements` is too high. [9/8]", 1316332112], - [2635, 5, 728, "Metrics/AbcSize: Assignment Branch Condition size for `array_assignment_finish_line` is too high. [<11, 7, 12> 17.72/17]", 1471354607], - [2635, 5, 728, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `array_assignment_finish_line` is too high. [9/7]", 1471354607], - [2635, 5, 728, "Metrics/MethodLength: Method has too many lines. [26/10]", 1471354607], - [2635, 5, 728, "Metrics/PerceivedComplexity: Perceived complexity for `array_assignment_finish_line` is too high. [11/8]", 1471354607], - [2671, 5, 1127, "Metrics/AbcSize: Assignment Branch Condition size for `direct_body_declaration_entries` is too high. [<14, 30, 7> 33.84/17]", 1223661118], - [2671, 5, 1127, "Metrics/MethodLength: Method has too many lines. [30/10]", 1223661118], - [2718, 5, 984, "Metrics/AbcSize: Assignment Branch Condition size for `insert_declaration_body_blocks` is too high. [<4, 23, 12> 26.25/17]", 159690081], - [2718, 5, 984, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `insert_declaration_body_blocks` is too high. [9/7]", 159690081], - [2718, 5, 984, "Metrics/MethodLength: Method has too many lines. [16/10]", 159690081], - [2718, 5, 984, "Metrics/PerceivedComplexity: Perceived complexity for `insert_declaration_body_blocks` is too high. [10/8]", 159690081], - [2763, 5, 1027, "Metrics/AbcSize: Assignment Branch Condition size for `merge_ruby_hash_literals` is too high. [<8, 30, 9> 32.33/17]", 2793745298], - [2763, 5, 1027, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_ruby_hash_literals` is too high. [9/7]", 2793745298], - [2763, 5, 1027, "Metrics/MethodLength: Method has too many lines. [19/10]", 2793745298], - [2763, 5, 1027, "Metrics/PerceivedComplexity: Perceived complexity for `merge_ruby_hash_literals` is too high. [10/8]", 2793745298], - [2785, 5, 636, "Metrics/AbcSize: Assignment Branch Condition size for `render_ruby_hash_literal` is too high. [<5, 19, 6> 20.54/17]", 1834383244], - [2825, 5, 491, "Metrics/MethodLength: Method has too many lines. [11/10]", 1799924605], - [2858, 5, 1125, "Metrics/AbcSize: Assignment Branch Condition size for `surfaces_for_owner` is too high. [<6, 19, 3> 20.15/17]", 4036098594], - [2858, 5, 1125, "Metrics/MethodLength: Method has too many lines. [20/10]", 4036098594], - [2883, 5, 1479, "Metrics/AbcSize: Assignment Branch Condition size for `example_surfaces_for` is too high. [<10, 28, 9> 31.06/17]", 1159322815], - [2883, 5, 1479, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `example_surfaces_for` is too high. [9/7]", 1159322815], - [2883, 5, 1479, "Metrics/MethodLength: Method has too many lines. [28/10]", 1159322815], - [2883, 5, 1479, "Metrics/PerceivedComplexity: Perceived complexity for `example_surfaces_for` is too high. [9/8]", 1159322815] - ], - "ruby-merge.gemspec:503862341": [ - [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ], - "spec/fixtures_integration_spec.rb:943607429": [ - [7, 1, 68962, "Metrics/BlockLength: Block has too many lines. [1586/25]", 1326132038], - [8, 3, 94, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 4224869601], - [9, 3, 80, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3493759864], - [10, 3, 72, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 218819604], - [11, 3, 83, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3957977039], - [56, 3, 1207, "Metrics/BlockLength: Block has too many lines. [27/25]", 2841005266], - [141, 3, 1550, "Metrics/BlockLength: Block has too many lines. [44/25]", 1381861178], - [192, 3, 1209, "Metrics/BlockLength: Block has too many lines. [33/25]", 1745132505], - [232, 3, 61330, "Metrics/BlockLength: Block has too many lines. [1387/25]", 3444780370], - [628, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859109], - [1712, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3355833611], - [1719, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 38619260] - ] -} diff --git a/gems/ruby-merge/Gemfile b/gems/ruby-merge/Gemfile index 32bbd4291..150225d65 100644 --- a/gems/ruby-merge/Gemfile +++ b/gems/ruby-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source 'https://gem.coop' +source "https://gem.coop" git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,18 +19,62 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ['~> 1.0', '>= 1.0.8'] -gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ["~> 1.0", ">= 1.0.8"] +gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ast-merge tree_haver ] -direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') +direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? + +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) + direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") + direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == "nomono" } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + if nomono_locked + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] + end + end + Kernel.send(:gem, "nomono", *nomono_activation_requirements) + require "nomono/bundler" + if direct_sibling_templating && !direct_sibling_local + ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + end + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: "STRUCTUREDMERGE", + path_env: "STRUCTUREDMERGE_DEV", + root: ["src", "my", "structuredmerge"] + ) + rescue LoadError + warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + else + ENV.delete("STRUCTUREDMERGE_DEV") + end + end + end +end if direct_sibling_gems.any? && (direct_sibling_local || @@ -210,25 +254,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? # Debugging -eval_gemfile 'gemfiles/modular/debug.gemfile' +eval_gemfile "gemfiles/modular/debug.gemfile" # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile 'gemfiles/modular/coverage.gemfile' +eval_gemfile "gemfiles/modular/coverage.gemfile" # Linting -eval_gemfile 'gemfiles/modular/style.gemfile' +eval_gemfile "gemfiles/modular/style.gemfile" # Documentation -eval_gemfile 'gemfiles/modular/documentation.gemfile' +eval_gemfile "gemfiles/modular/documentation.gemfile" # Optional -eval_gemfile 'gemfiles/modular/optional.gemfile' +eval_gemfile "gemfiles/modular/optional.gemfile" ### Std Lib Extracted Gems -eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' +eval_gemfile "gemfiles/modular/x_std_libs.gemfile" # See unlocked_deps appraisal for more details on irb inclusion -gem 'irb', '~> 1.17' # ruby >= 2.7 +gem "irb", "~> 1.17" # ruby >= 2.7 diff --git a/gems/ruby-merge/Gemfile.lock b/gems/ruby-merge/Gemfile.lock index 691f91a12..d8758159d 100644 --- a/gems/ruby-merge/Gemfile.lock +++ b/gems/ruby-merge/Gemfile.lock @@ -275,6 +275,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -308,7 +324,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -363,18 +378,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -538,22 +542,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -659,9 +659,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -739,7 +739,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -760,10 +759,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -838,13 +837,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/ruby-merge/Rakefile b/gems/ruby-merge/Rakefile index c528d41ee..c7b8a4b9e 100644 --- a/gems/ruby-merge/Rakefile +++ b/gems/ruby-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require 'kettle/drift' + require "kettle/drift" Kettle::Drift.install_tasks rescue LoadError - desc('(stub) kettle:drift:check is unavailable') - task('kettle:drift:check') do + desc("(stub) kettle:drift:check is unavailable") + task("kettle:drift:check") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:update is unavailable') - task('kettle:drift:update') do + desc("(stub) kettle:drift:update is unavailable") + task("kettle:drift:update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:force_update is unavailable') - task('kettle:drift:force_update') do + desc("(stub) kettle:drift:force_update is unavailable") + task("kettle:drift:force_update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift is unavailable') - task('kettle:drift' => 'kettle:drift:update') + desc("(stub) kettle:drift is unavailable") + task("kettle:drift" => "kettle:drift:update") end ### TEMPLATING TASKS diff --git a/gems/ruby-merge/bin/yard b/gems/ruby-merge/bin/yard index 5d516ad6f..a7e8b6eed 100755 --- a/gems/ruby-merge/bin/yard +++ b/gems/ruby-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec('bundle', 'exec', 'rake', 'yard') +exec("bundle", "exec", "rake", "yard") diff --git a/gems/ruby-merge/lib/ruby/merge/version.rb b/gems/ruby-merge/lib/ruby/merge/version.rb index d88eae0c6..0dcd005a5 100644 --- a/gems/ruby-merge/lib/ruby/merge/version.rb +++ b/gems/ruby-merge/lib/ruby/merge/version.rb @@ -3,7 +3,7 @@ module Ruby module Merge module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/toml-merge/.kettle-drift.lock b/gems/toml-merge/.kettle-drift.lock index 628aa923c..0161251a7 100644 --- a/gems/toml-merge/.kettle-drift.lock +++ b/gems/toml-merge/.kettle-drift.lock @@ -5,7 +5,8 @@ "lines": [ 80, 120, - 160 + 160, + 200 ] } ], @@ -15,7 +16,8 @@ "lines": [ 91, 131, - 171 + 171, + 211 ] } ], @@ -25,7 +27,8 @@ "lines": [ 81, 121, - 161 + 161, + 201 ] } ], @@ -35,7 +38,8 @@ "lines": [ 93, 133, - 173 + 173, + 213 ] } ], @@ -45,7 +49,8 @@ "lines": [ 96, 136, - 176 + 176, + 216 ] } ], @@ -55,7 +60,8 @@ "lines": [ 82, 122, - 162 + 162, + 202 ] } ], @@ -66,7 +72,8 @@ 60, 100, 140, - 180 + 180, + 220 ] } ], @@ -76,7 +83,8 @@ "lines": [ 101, 141, - 181 + 181, + 221 ] } ], @@ -87,7 +95,8 @@ 43, 87, 127, - 167 + 167, + 207 ] } ], @@ -97,7 +106,8 @@ "lines": [ 110, 150, - 190 + 190, + 230 ] } ], @@ -108,7 +118,8 @@ 35, 79, 119, - 159 + 159, + 199 ] } ], @@ -119,7 +130,8 @@ 69, 109, 149, - 189 + 189, + 229 ] } ], @@ -129,7 +141,8 @@ "lines": [ 85, 125, - 165 + 165, + 205 ] } ], @@ -140,7 +153,8 @@ 48, 92, 132, - 172 + 172, + 212 ] } ], @@ -151,7 +165,8 @@ 44, 88, 128, - 168 + 168, + 208 ] } ], @@ -161,7 +176,8 @@ "lines": [ 86, 126, - 166 + 166, + 206 ] } ], @@ -171,7 +187,8 @@ "lines": [ 103, 143, - 183 + 183, + 223 ] } ], @@ -181,7 +198,8 @@ "lines": [ 102, 142, - 182 + 182, + 222 ] } ], @@ -191,7 +209,8 @@ "lines": [ 97, 137, - 177 + 177, + 217 ] } ], @@ -201,7 +220,8 @@ "lines": [ 106, 146, - 186 + 186, + 226 ] } ], diff --git a/gems/toml-merge/.rubocop_gradual.lock b/gems/toml-merge/.rubocop_gradual.lock deleted file mode 100644 index 4b65819de..000000000 --- a/gems/toml-merge/.rubocop_gradual.lock +++ /dev/null @@ -1,278 +0,0 @@ -{ - ".simplecov:3682400110": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:133885645": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/toml-merge.rb:3814390984": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`toml-merge.rb`) should use snake_case.", 5381], - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "lib/toml/merge.rb:114483342": [ - [42, 3, 19743, "Metrics/ModuleLength: Module has too many lines. [449/100]", 3377734762], - [122, 5, 16553, "Metrics/ClassLength: Class has too many lines. [420/100]", 3607675918], - [164, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1773216188], - [173, 7, 594, "Metrics/MethodLength: Method has too many lines. [16/10]", 1049978805], - [197, 7, 1640, "Metrics/AbcSize: Assignment Branch Condition size for `merge_toml` is too high. [<7, 24, 9> 26.57/17]", 478063103], - [197, 7, 1640, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_toml` is too high. [8/7]", 478063103], - [197, 7, 1640, "Metrics/MethodLength: Method has too many lines. [32/10]", 478063103], - [201, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1773216188], - [236, 7, 1795, "Metrics/AbcSize: Assignment Branch Condition size for `merge_toml_with_parser` is too high. [<7, 24, 8> 26.25/17]", 4111497622], - [236, 7, 1795, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_toml_with_parser` is too high. [8/7]", 4111497622], - [236, 7, 1795, "Metrics/MethodLength: Method has too many lines. [33/10]", 4111497622], - [345, 7, 688, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `strip_toml_comment` is too high. [8/7]", 3909397399], - [345, 7, 688, "Metrics/MethodLength: Method has too many lines. [25/10]", 3909397399], - [345, 7, 688, "Metrics/PerceivedComplexity: Perceived complexity for `strip_toml_comment` is too high. [9/8]", 3909397399], - [379, 7, 1087, "Metrics/AbcSize: Assignment Branch Condition size for `split_outside_quotes` is too high. [<13, 16, 15> 25.5/17]", 609465929], - [379, 7, 1087, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split_outside_quotes` is too high. [12/7]", 609465929], - [379, 7, 1087, "Metrics/MethodLength: Method has too many lines. [39/10]", 609465929], - [379, 7, 1087, "Metrics/PerceivedComplexity: Perceived complexity for `split_outside_quotes` is too high. [13/8]", 609465929], - [386, 9, 762, "Metrics/BlockLength: Block has too many lines. [29/25]", 4212946145], - [437, 7, 462, "Metrics/MethodLength: Method has too many lines. [16/10]", 2527564697], - [456, 7, 1018, "Metrics/AbcSize: Assignment Branch Condition size for `parse_toml_value` is too high. [<7, 28, 11> 30.89/17]", 820781705], - [456, 7, 1018, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_toml_value` is too high. [10/7]", 820781705], - [456, 7, 1018, "Metrics/MethodLength: Method has too many lines. [20/10]", 820781705], - [456, 7, 1018, "Metrics/PerceivedComplexity: Perceived complexity for `parse_toml_value` is too high. [11/8]", 820781705], - [484, 7, 458, "Metrics/MethodLength: Method has too many lines. [13/10]", 3674341378], - [511, 7, 877, "Metrics/AbcSize: Assignment Branch Condition size for `parse_toml_document` is too high. [<9, 20, 6> 22.74/17]", 2959395577], - [511, 7, 877, "Metrics/MethodLength: Method has too many lines. [19/10]", 2959395577], - [560, 7, 581, "Metrics/AbcSize: Assignment Branch Condition size for `render_toml_table` is too high. [<8, 22, 6> 24.17/17]", 3078876750], - [560, 7, 581, "Metrics/MethodLength: Method has too many lines. [13/10]", 3078876750], - [581, 7, 619, "Metrics/MethodLength: Method has too many lines. [12/10]", 451848846], - [596, 7, 614, "Metrics/AbcSize: Assignment Branch Condition size for `merge_toml_tables` is too high. [<3, 20, 6> 21.1/17]", 1810526535], - [596, 7, 614, "Metrics/MethodLength: Method has too many lines. [11/10]", 1810526535] - ], - "lib/toml/merge/comment_tracker.rb:743656609": [ - [16, 5, 5242, "Metrics/ClassLength: Class has too many lines. [112/100]", 3014190138], - [28, 7, 990, "Metrics/MethodLength: Method has too many lines. [17/10]", 85804539], - [92, 7, 949, "Metrics/AbcSize: Assignment Branch Condition size for `build_toml_region` is too high. [<7, 21, 9> 23.9/17]", 552845000], - [92, 7, 949, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_toml_region` is too high. [9/7]", 552845000], - [92, 7, 949, "Metrics/MethodLength: Method has too many lines. [23/10]", 552845000], - [92, 7, 949, "Metrics/PerceivedComplexity: Perceived complexity for `build_toml_region` is too high. [9/8]", 552845000] - ], - "lib/toml/merge/conflict_resolver.rb:2699752146": [ - [11, 5, 42658, "Metrics/ClassLength: Class has too many lines. [791/100]", 2931993361], - [30, 7, 788, "Metrics/MethodLength: Method has too many lines. [13/10]", 2218400960], - [30, 21, 235, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 788504679], - [31, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3099130903], - [52, 7, 1676, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_batch` is too high. [<4, 24, 3> 24.52/17]", 623996510], - [52, 7, 1676, "Metrics/MethodLength: Method has too many lines. [29/10]", 623996510], - [53, 9, 1632, "Metrics/BlockLength: Block has too many lines. [27/25]", 3553849414], - [101, 7, 8464, "Metrics/AbcSize: Assignment Branch Condition size for `merge_node_lists_to_emitter` is too high. [<54, 88, 31> 107.8/17]", 3669765511], - [101, 7, 8464, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_node_lists_to_emitter` is too high. [27/7]", 3669765511], - [101, 7, 8464, "Metrics/MethodLength: Method has too many lines. [141/10]", 3669765511], - [101, 7, 8464, "Metrics/PerceivedComplexity: Perceived complexity for `merge_node_lists_to_emitter` is too high. [29/8]", 3669765511], - [146, 9, 5685, "Metrics/BlockLength: Block has too many lines. [102/25]", 464560406], - [286, 7, 2458, "Metrics/AbcSize: Assignment Branch Condition size for `merge_matched_nodes_to_emitter` is too high. [<6, 17, 10> 20.62/17]", 4036358483], - [286, 7, 2458, "Metrics/MethodLength: Method has too many lines. [49/10]", 4036358483], - [286, 7, 2458, "Metrics/PerceivedComplexity: Perceived complexity for `merge_matched_nodes_to_emitter` is too high. [9/8]", 4036358483], - [289, 11, 1647, "Metrics/BlockLength: Block has too many lines. [34/25]", 997955803], - [353, 7, 770, "Metrics/MethodLength: Method has too many lines. [21/10]", 543737609], - [387, 7, 1101, "Metrics/AbcSize: Assignment Branch Condition size for `build_refined_matches` is too high. [<11, 16, 8> 21/17]", 4236016583], - [387, 7, 1101, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_refined_matches` is too high. [9/7]", 4236016583], - [387, 7, 1101, "Metrics/MethodLength: Method has too many lines. [18/10]", 4236016583], - [387, 7, 1101, "Metrics/PerceivedComplexity: Perceived complexity for `build_refined_matches` is too high. [9/8]", 4236016583], - [427, 7, 642, "Metrics/AbcSize: Assignment Branch Condition size for `emit_removed_destination_node_inline_comments` is too high. [<4, 20, 5> 21/17]", 2624953678], - [427, 7, 642, "Metrics/MethodLength: Method has too many lines. [11/10]", 2624953678], - [462, 7, 720, "Metrics/MethodLength: Method has too many lines. [11/10]", 4270722493], - [499, 7, 1022, "Metrics/MethodLength: Method has too many lines. [17/10]", 3216685542], - [584, 7, 1854, "Metrics/AbcSize: Assignment Branch Condition size for `emit_leading_region` is too high. [<8, 28, 9> 30.48/17]", 377203837], - [584, 7, 1854, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_leading_region` is too high. [10/7]", 377203837], - [584, 7, 1854, "Metrics/MethodLength: Method has too many lines. [32/10]", 377203837], - [584, 7, 1854, "Metrics/PerceivedComplexity: Perceived complexity for `emit_leading_region` is too high. [10/8]", 377203837], - [685, 7, 1275, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_template_preamble_prefix_region` is too high. [<7, 24, 9> 26.57/17]", 1754222078], - [685, 7, 1275, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collapse_template_preamble_prefix_region` is too high. [8/7]", 1754222078], - [685, 7, 1275, "Metrics/MethodLength: Method has too many lines. [24/10]", 1754222078], - [716, 7, 662, "Metrics/AbcSize: Assignment Branch Condition size for `root_boundary_lines_for` is too high. [<4, 15, 10> 18.47/17]", 935744348], - [716, 7, 662, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `root_boundary_lines_for` is too high. [9/7]", 935744348], - [716, 7, 662, "Metrics/MethodLength: Method has too many lines. [14/10]", 935744348], - [736, 7, 343, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `region_lines_for` is too high. [8/7]", 399995706], - [753, 7, 614, "Metrics/AbcSize: Assignment Branch Condition size for `dedup_warning_context` is too high. [<0, 20, 10> 22.36/17]", 2011768288], - [753, 7, 614, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `dedup_warning_context` is too high. [11/7]", 2011768288], - [753, 7, 614, "Metrics/PerceivedComplexity: Perceived complexity for `dedup_warning_context` is too high. [11/8]", 2011768288], - [756, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [757, 41, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [757, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 3287405165], - [783, 7, 1426, "Metrics/MethodLength: Method has too many lines. [34/10]", 1351993853], - [849, 7, 955, "Metrics/MethodLength: Method has too many lines. [21/10]", 3080929417], - [877, 7, 1249, "Metrics/AbcSize: Assignment Branch Condition size for `emit_node_lines` is too high. [<6, 21, 6> 22.65/17]", 3195628693], - [877, 7, 1249, "Metrics/MethodLength: Method has too many lines. [21/10]", 3195628693], - [952, 7, 637, "Metrics/AbcSize: Assignment Branch Condition size for `inline_region_separator` is too high. [<5, 18, 7> 19.95/17]", 2029360360], - [952, 7, 637, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `inline_region_separator` is too high. [8/7]", 2029360360], - [952, 7, 637, "Metrics/MethodLength: Method has too many lines. [12/10]", 2029360360], - [969, 7, 465, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_interstitial_blank_lines` is too high. [9/7]", 1640065866], - [969, 7, 465, "Metrics/PerceivedComplexity: Perceived complexity for `emit_interstitial_blank_lines` is too high. [9/8]", 1640065866], - [981, 7, 620, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_gap_before_node` is too high. [12/7]", 2808239642], - [981, 7, 620, "Metrics/PerceivedComplexity: Perceived complexity for `emit_gap_before_node` is too high. [12/8]", 2808239642], - [983, 36, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [998, 7, 526, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_preceding_blank_lines` is too high. [8/7]", 3889743093], - [998, 7, 526, "Metrics/MethodLength: Method has too many lines. [11/10]", 3889743093] - ], - "lib/toml/merge/file_analysis.rb:2689095431": [ - [12, 5, 19523, "Metrics/ClassLength: Class has too many lines. [368/100]", 929433986], - [15, 7, 22, "Style/Documentation: Missing top-level documentation comment for `class Toml::Merge::FileAnalysis::CommentAugmenter`.", 2864244718], - [20, 9, 849, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<11, 13, 1> 17.06/17]", 1333266342], - [20, 9, 849, "Metrics/MethodLength: Method has too many lines. [16/10]", 1333266342], - [72, 7, 869, "Metrics/MethodLength: Method has too many lines. [13/10]", 1683071581], - [228, 7, 959, "Metrics/AbcSize: Assignment Branch Condition size for `root_pairs` is too high. [<10, 13, 16> 22.91/17]", 1481059821], - [228, 7, 959, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `root_pairs` is too high. [15/7]", 1481059821], - [228, 7, 959, "Metrics/MethodLength: Method has too many lines. [21/10]", 1481059821], - [228, 7, 959, "Metrics/PerceivedComplexity: Perceived complexity for `root_pairs` is too high. [15/8]", 1481059821], - [246, 9, 384, "Style/CombinableLoops: Combine this loop with the previous loop.", 2434692315], - [263, 7, 1729, "Metrics/AbcSize: Assignment Branch Condition size for `parse_toml` is too high. [<10, 12, 8> 17.55/17]", 2015178317], - [263, 7, 1729, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_toml` is too high. [9/7]", 2015178317], - [263, 7, 1729, "Metrics/MethodLength: Method has too many lines. [19/10]", 2015178317], - [331, 7, 596, "Metrics/MethodLength: Method has too many lines. [13/10]", 995924372], - [389, 7, 588, "Metrics/AbcSize: Assignment Branch Condition size for `comment_owner_end_line_for_augmenter` is too high. [<1, 20, 13> 23.87/17]", 1972553155], - [389, 7, 588, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `comment_owner_end_line_for_augmenter` is too high. [14/7]", 1972553155], - [389, 7, 588, "Metrics/PerceivedComplexity: Perceived complexity for `comment_owner_end_line_for_augmenter` is too high. [14/8]", 1972553155], - [448, 7, 1255, "Metrics/AbcSize: Assignment Branch Condition size for `scan_line_for_comment` is too high. [<16, 13, 17> 26.72/17]", 622981429], - [448, 7, 1255, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `scan_line_for_comment` is too high. [12/7]", 622981429], - [448, 7, 1255, "Metrics/MethodLength: Method has too many lines. [38/10]", 622981429], - [448, 7, 1255, "Metrics/PerceivedComplexity: Perceived complexity for `scan_line_for_comment` is too high. [13/8]", 622981429], - [496, 7, 319, "Metrics/MethodLength: Method has too many lines. [11/10]", 2890996257], - [535, 7, 416, "Metrics/MethodLength: Method has too many lines. [11/10]", 2416972242], - [576, 7, 464, "Metrics/AbcSize: Assignment Branch Condition size for `node_text` is too high. [<3, 16, 8> 18.14/17]", 2138809005], - [576, 7, 464, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `node_text` is too high. [8/7]", 2138809005] - ], - "lib/toml/merge/key_sorter.rb:829731466": [ - [59, 7, 1787, "Metrics/AbcSize: Assignment Branch Condition size for `partition_into_blocks` is too high. [<11, 23, 8> 26.72/17]", 3324132918], - [59, 7, 1787, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `partition_into_blocks` is too high. [8/7]", 3324132918], - [59, 7, 1787, "Metrics/MethodLength: Method has too many lines. [38/10]", 3324132918], - [59, 7, 1787, "Metrics/PerceivedComplexity: Perceived complexity for `partition_into_blocks` is too high. [9/8]", 3324132918] - ], - "lib/toml/merge/node_type_normalizer.rb:2171981470": [ - [67, 5, 7844, "Metrics/ModuleLength: Module has too many lines. [134/100]", 828548837], - [159, 11, 4, "Lint/BooleanSymbol: Symbol with a boolean name - you probably meant to use `true`.", 2087932467], - [160, 11, 5, "Lint/BooleanSymbol: Symbol with a boolean name - you probably meant to use `false`.", 170962968], - [215, 11, 4, "Lint/BooleanSymbol: Symbol with a boolean name - you probably meant to use `true`.", 2087932467], - [216, 11, 5, "Lint/BooleanSymbol: Symbol with a boolean name - you probably meant to use `false`.", 170962968] - ], - "lib/toml/merge/node_wrapper.rb:2123561241": [ - [26, 5, 23635, "Metrics/ClassLength: Class has too many lines. [417/100]", 111672250], - [37, 9, 517, "Metrics/MethodLength: Method has too many lines. [11/10]", 3513234297], - [37, 17, 154, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2431837951], - [54, 7, 503, "Metrics/MethodLength: Method has too many lines. [12/10]", 2647031658], - [54, 21, 82, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2652802373], - [229, 7, 1380, "Metrics/AbcSize: Assignment Branch Condition size for `value_node` is too high. [<5, 16, 10> 19.52/17]", 1398903082], - [229, 7, 1380, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `value_node` is too high. [9/7]", 1398903082], - [229, 7, 1380, "Metrics/MethodLength: Method has too many lines. [32/10]", 1398903082], - [229, 7, 1380, "Metrics/PerceivedComplexity: Perceived complexity for `value_node` is too high. [9/8]", 1398903082], - [232, 9, 1306, "Metrics/BlockLength: Block has too many lines. [28/25]", 3342818997], - [286, 7, 496, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `pairs` is too high. [9/7]", 2741436417], - [286, 7, 496, "Metrics/PerceivedComplexity: Perceived complexity for `pairs` is too high. [9/8]", 2741436417], - [319, 7, 706, "Metrics/MethodLength: Method has too many lines. [22/10]", 2032215880], - [390, 7, 553, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `effective_end_line` is too high. [8/7]", 2426868004], - [412, 7, 2225, "Metrics/AbcSize: Assignment Branch Condition size for `compute_signature` is too high. [<9, 32, 24> 41/17]", 1299303855], - [412, 7, 2225, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_signature` is too high. [25/7]", 1299303855], - [412, 7, 2225, "Metrics/MethodLength: Method has too many lines. [39/10]", 1299303855], - [412, 7, 2225, "Metrics/PerceivedComplexity: Perceived complexity for `compute_signature` is too high. [16/8]", 1299303855], - [511, 7, 487, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `raw_pair_value_text` is too high. [8/7]", 3177077098], - [535, 7, 1503, "Metrics/AbcSize: Assignment Branch Condition size for `collect_inline_table_keys_recursive` is too high. [<7, 25, 18> 31.59/17]", 3778857543], - [535, 7, 1503, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_inline_table_keys_recursive` is too high. [17/7]", 3778857543], - [535, 7, 1503, "Metrics/MethodLength: Method has too many lines. [24/10]", 3778857543], - [535, 7, 1503, "Metrics/PerceivedComplexity: Perceived complexity for `collect_inline_table_keys_recursive` is too high. [18/8]", 3778857543], - [593, 7, 855, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_sibling_pairs_for_table` is too high. [8/7]", 3160731503], - [593, 7, 855, "Metrics/MethodLength: Method has too many lines. [14/10]", 3160731503], - [624, 7, 655, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_next_table_start_line` is too high. [9/7]", 1465728116], - [624, 7, 655, "Metrics/MethodLength: Method has too many lines. [12/10]", 1465728116], - [624, 7, 655, "Metrics/PerceivedComplexity: Perceived complexity for `find_next_table_start_line` is too high. [9/8]", 1465728116], - [653, 7, 861, "Metrics/MethodLength: Method has too many lines. [12/10]", 4202205110] - ], - "lib/toml/merge/smart_merger.rb:3624815957": [ - [39, 5, 9573, "Metrics/ClassLength: Class has too many lines. [190/100]", 1615610584], - [72, 7, 1283, "Metrics/MethodLength: Method has too many lines. [18/10]", 2597249100], - [72, 21, 427, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 1661881927], - [144, 7, 1347, "Metrics/AbcSize: Assignment Branch Condition size for `merge_with_debug` is too high. [<3, 20, 7> 21.4/17]", 2015540458], - [144, 7, 1347, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_with_debug` is too high. [8/7]", 2015540458], - [144, 7, 1347, "Metrics/MethodLength: Method has too many lines. [31/10]", 2015540458], - [248, 7, 1161, "Metrics/MethodLength: Method has too many lines. [26/10]", 1453116447] - ], - "lib/toml/merge/table_match_refiner.rb:1590173808": [ - [32, 5, 7338, "Metrics/ClassLength: Class has too many lines. [108/100]", 3006106276], - [113, 35, 50, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1492696344], - [147, 7, 410, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_table_name` is too high. [8/7]", 2032455294], - [217, 7, 659, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<11, 38, 8> 40.36/17]", 2658150371], - [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:168123572": [ - [6, 1, 11947, "Metrics/BlockLength: Block has too many lines. [266/25]", 2102318823], - [228, 3, 1368, "Metrics/BlockLength: Block has too many lines. [34/25]", 3324165298] - ], - "toml-merge.gemspec:2519299257": [ - [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ] -} diff --git a/gems/toml-merge/Gemfile b/gems/toml-merge/Gemfile index 54be336cf..62597239a 100644 --- a/gems/toml-merge/Gemfile +++ b/gems/toml-merge/Gemfile @@ -192,6 +192,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/toml-merge/Gemfile.lock b/gems/toml-merge/Gemfile.lock index 87531476e..fef01f4f8 100644 --- a/gems/toml-merge/Gemfile.lock +++ b/gems/toml-merge/Gemfile.lock @@ -275,6 +275,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -308,7 +324,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -363,18 +378,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -538,22 +542,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -659,9 +659,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -739,7 +739,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -760,10 +759,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -838,13 +837,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/yaml-merge/.kettle-drift.lock b/gems/yaml-merge/.kettle-drift.lock index 628aa923c..0161251a7 100644 --- a/gems/yaml-merge/.kettle-drift.lock +++ b/gems/yaml-merge/.kettle-drift.lock @@ -5,7 +5,8 @@ "lines": [ 80, 120, - 160 + 160, + 200 ] } ], @@ -15,7 +16,8 @@ "lines": [ 91, 131, - 171 + 171, + 211 ] } ], @@ -25,7 +27,8 @@ "lines": [ 81, 121, - 161 + 161, + 201 ] } ], @@ -35,7 +38,8 @@ "lines": [ 93, 133, - 173 + 173, + 213 ] } ], @@ -45,7 +49,8 @@ "lines": [ 96, 136, - 176 + 176, + 216 ] } ], @@ -55,7 +60,8 @@ "lines": [ 82, 122, - 162 + 162, + 202 ] } ], @@ -66,7 +72,8 @@ 60, 100, 140, - 180 + 180, + 220 ] } ], @@ -76,7 +83,8 @@ "lines": [ 101, 141, - 181 + 181, + 221 ] } ], @@ -87,7 +95,8 @@ 43, 87, 127, - 167 + 167, + 207 ] } ], @@ -97,7 +106,8 @@ "lines": [ 110, 150, - 190 + 190, + 230 ] } ], @@ -108,7 +118,8 @@ 35, 79, 119, - 159 + 159, + 199 ] } ], @@ -119,7 +130,8 @@ 69, 109, 149, - 189 + 189, + 229 ] } ], @@ -129,7 +141,8 @@ "lines": [ 85, 125, - 165 + 165, + 205 ] } ], @@ -140,7 +153,8 @@ 48, 92, 132, - 172 + 172, + 212 ] } ], @@ -151,7 +165,8 @@ 44, 88, 128, - 168 + 168, + 208 ] } ], @@ -161,7 +176,8 @@ "lines": [ 86, 126, - 166 + 166, + 206 ] } ], @@ -171,7 +187,8 @@ "lines": [ 103, 143, - 183 + 183, + 223 ] } ], @@ -181,7 +198,8 @@ "lines": [ 102, 142, - 182 + 182, + 222 ] } ], @@ -191,7 +209,8 @@ "lines": [ 97, 137, - 177 + 177, + 217 ] } ], @@ -201,7 +220,8 @@ "lines": [ 106, 146, - 186 + 186, + 226 ] } ], diff --git a/gems/yaml-merge/.rubocop_gradual.lock b/gems/yaml-merge/.rubocop_gradual.lock index afe31b140..c264c3689 100644 --- a/gems/yaml-merge/.rubocop_gradual.lock +++ b/gems/yaml-merge/.rubocop_gradual.lock @@ -76,26 +76,33 @@ "lib/yaml-merge.rb:2387720316": [ [1, 1, 0, "Naming/FileName: The name of this source file (`yaml-merge.rb`) should use snake_case.", 5381] ], - "lib/yaml/merge.rb:4205598808": [ - [11, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Yaml::Merge`.", 2866359175], - [11, 3, 11361, "Metrics/ModuleLength: Module has too many lines. [266/100]", 2351644433], - [59, 5, 812, "Metrics/MethodLength: Method has too many lines. [13/10]", 3270754177], - [78, 5, 735, "Metrics/MethodLength: Method has too many lines. [16/10]", 1550073549], - [99, 5, 674, "Metrics/AbcSize: Assignment Branch Condition size for `match_yaml_owners` is too high. [<10, 23, 8> 26.32/17]", 2258573674], - [99, 5, 674, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `match_yaml_owners` is too high. [9/7]", 2258573674], - [99, 5, 674, "Metrics/PerceivedComplexity: Perceived complexity for `match_yaml_owners` is too high. [9/8]", 2258573674], - [123, 5, 1604, "Metrics/AbcSize: Assignment Branch Condition size for `merge_yaml_with_parser` is too high. [<6, 19, 8> 21.47/17]", 1557726711], - [123, 5, 1604, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_yaml_with_parser` is too high. [8/7]", 1557726711], - [123, 5, 1604, "Metrics/MethodLength: Method has too many lines. [31/10]", 1557726711], - [165, 5, 857, "Metrics/AbcSize: Assignment Branch Condition size for `validate_yaml_node` is too high. [<8, 20, 8> 22.98/17]", 1513454330], - [165, 5, 857, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_yaml_node` is too high. [8/7]", 1513454330], - [165, 5, 857, "Metrics/MethodLength: Method has too many lines. [17/10]", 1513454330], - [165, 5, 857, "Metrics/PerceivedComplexity: Perceived complexity for `validate_yaml_node` is too high. [9/8]", 1513454330], - [183, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 223655047], - [232, 5, 472, "Metrics/MethodLength: Method has too many lines. [12/10]", 3240975354], - [253, 5, 773, "Metrics/MethodLength: Method has too many lines. [16/10]", 3727949237], - [273, 5, 582, "Metrics/AbcSize: Assignment Branch Condition size for `merge_yaml_mappings` is too high. [<3, 17, 6> 18.28/17]", 3352000353], - [273, 5, 582, "Metrics/MethodLength: Method has too many lines. [11/10]", 3352000353] + "lib/yaml/merge.rb:1796884563": [ + [10, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Yaml::Merge`.", 2866359175], + [10, 3, 14840, "Metrics/ModuleLength: Module has too many lines. [356/100]", 2006289345], + [86, 5, 774, "Metrics/MethodLength: Method has too many lines. [17/10]", 3937655844], + [108, 5, 674, "Metrics/AbcSize: Assignment Branch Condition size for `match_yaml_owners` is too high. [<10, 23, 8> 26.32/17]", 2258573674], + [108, 5, 674, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `match_yaml_owners` is too high. [9/7]", 2258573674], + [108, 5, 674, "Metrics/PerceivedComplexity: Perceived complexity for `match_yaml_owners` is too high. [9/8]", 2258573674], + [132, 5, 1298, "Metrics/AbcSize: Assignment Branch Condition size for `merge_yaml_with_parser` is too high. [<6, 17, 8> 19.72/17]", 3115490450], + [132, 5, 1298, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_yaml_with_parser` is too high. [8/7]", 3115490450], + [132, 5, 1298, "Metrics/MethodLength: Method has too many lines. [29/10]", 3115490450], + [181, 5, 925, "Metrics/AbcSize: Assignment Branch Condition size for `yaml_value_from_tree` is too high. [<2, 20, 10> 22.45/17]", 787182706], + [181, 5, 925, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `yaml_value_from_tree` is too high. [9/7]", 787182706], + [181, 5, 925, "Metrics/MethodLength: Method has too many lines. [21/10]", 787182706], + [238, 5, 685, "Metrics/AbcSize: Assignment Branch Condition size for `yaml_scalar_from_text` is too high. [<1, 21, 12> 24.21/17]", 3123350773], + [238, 5, 685, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `yaml_scalar_from_text` is too high. [12/7]", 3123350773], + [238, 5, 685, "Metrics/MethodLength: Method has too many lines. [11/10]", 3123350773], + [238, 5, 685, "Metrics/PerceivedComplexity: Perceived complexity for `yaml_scalar_from_text` is too high. [12/8]", 3123350773], + [255, 5, 334, "Metrics/MethodLength: Method has too many lines. [12/10]", 732082977], + [271, 5, 857, "Metrics/AbcSize: Assignment Branch Condition size for `validate_yaml_node` is too high. [<8, 20, 8> 22.98/17]", 1513454330], + [271, 5, 857, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_yaml_node` is too high. [8/7]", 1513454330], + [271, 5, 857, "Metrics/MethodLength: Method has too many lines. [17/10]", 1513454330], + [271, 5, 857, "Metrics/PerceivedComplexity: Perceived complexity for `validate_yaml_node` is too high. [9/8]", 1513454330], + [289, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 223655047], + [338, 5, 472, "Metrics/MethodLength: Method has too many lines. [12/10]", 3240975354], + [359, 5, 773, "Metrics/MethodLength: Method has too many lines. [16/10]", 3727949237], + [379, 5, 582, "Metrics/AbcSize: Assignment Branch Condition size for `merge_yaml_mappings` is too high. [<3, 17, 6> 18.28/17]", 3352000353], + [379, 5, 582, "Metrics/MethodLength: Method has too many lines. [11/10]", 3352000353] ], "spec/fixtures_integration_spec.rb:679605696": [ [3, 1, 9328, "Metrics/BlockLength: Block has too many lines. [217/25]", 4279594244], diff --git a/gems/yaml-merge/Gemfile b/gems/yaml-merge/Gemfile index efa4bc24c..a73be4685 100644 --- a/gems/yaml-merge/Gemfile +++ b/gems/yaml-merge/Gemfile @@ -192,6 +192,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/yaml-merge/Gemfile.lock b/gems/yaml-merge/Gemfile.lock index 5ea0feeed..89d153c1b 100644 --- a/gems/yaml-merge/Gemfile.lock +++ b/gems/yaml-merge/Gemfile.lock @@ -17,39 +17,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -58,201 +26,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -260,21 +34,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -294,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +116,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +283,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +381,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,17 +406,12 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) yaml-merge! yard (~> 0.9, >= 0.9.44) @@ -704,35 +420,19 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +440,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +452,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +479,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +490,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +517,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +528,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,14 +541,10 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -879,7 +557,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/yaml-merge/lib/yaml/merge.rb b/gems/yaml-merge/lib/yaml/merge.rb index 8a628684a..bf903394a 100644 --- a/gems/yaml-merge/lib/yaml/merge.rb +++ b/gems/yaml-merge/lib/yaml/merge.rb @@ -171,7 +171,10 @@ def resolve_backend(backend) def collect_parse_errors(node) raise TreeHaver::NotAvailable, 'YAML parse returned no root node' unless node - raise TreeHaver::NotAvailable, 'YAML parse contains syntax errors' if node.respond_to?(:has_error?) && node.has_error? + return unless node.respond_to?(:has_error?) && node.has_error? + + raise TreeHaver::NotAvailable, + 'YAML parse contains syntax errors' end private_class_method :collect_parse_errors @@ -218,7 +221,7 @@ def yaml_mapping_from_node(node, source) def yaml_sequence_from_node(node, source) yaml_named_children(node).filter_map do |child| - next unless child.type == 'block_sequence_item' || child.type == 'flow_node' + next unless %w[block_sequence_item flow_node].include?(child.type) yaml_value_from_tree(child, source) end @@ -240,7 +243,9 @@ def yaml_scalar_from_text(text) return stripped.to_i if stripped.match?(/\A[-+]?\d+\z/) return stripped.to_f if stripped.match?(/\A[-+]?(?:\d+\.\d*|\d*\.\d+)(?:[eE][-+]?\d+)?\z/) - return unescape_yaml_double_quoted_scalar(stripped[1...-1]) if stripped.start_with?('"') && stripped.end_with?('"') + if stripped.start_with?('"') && stripped.end_with?('"') + return unescape_yaml_double_quoted_scalar(stripped[1...-1]) + end return stripped[1...-1].gsub("''", "'") if stripped.start_with?("'") && stripped.end_with?("'") stripped @@ -248,7 +253,7 @@ def yaml_scalar_from_text(text) private_class_method :yaml_scalar_from_text def unescape_yaml_double_quoted_scalar(value) - value.gsub(/\\(["\\\/bfnrt])/) do + value.gsub(%r{\\(["\\/bfnrt])}) do { '"' => '"', '\\' => '\\', From afeb16e14f2cbc1c98bc62d9008d924ad8c0a66b Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:24:16 -0600 Subject: [PATCH 166/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/go-merge/.kettle-drift.lock | 60 ++-- gems/go-merge/Gemfile | 70 ++++- gems/go-merge/README.md | 1 + gems/go-merge/Rakefile | 18 +- gems/go-merge/lib/go/merge/version.rb | 2 +- gems/ruby-merge/Gemfile | 68 ++--- gems/ruby-merge/Gemfile.lock | 404 +++----------------------- gems/ruby-merge/Rakefile | 18 +- gems/ruby-merge/bin/yard | 2 +- gems/toml-merge/.rubocop_gradual.lock | 258 ++++++++++++++++ gems/toml-merge/Gemfile.lock | 378 ++---------------------- gems/yaml-merge/Gemfile.lock | 30 +- 12 files changed, 484 insertions(+), 825 deletions(-) create mode 100644 gems/toml-merge/.rubocop_gradual.lock diff --git a/gems/go-merge/.kettle-drift.lock b/gems/go-merge/.kettle-drift.lock index 628aa923c..0161251a7 100644 --- a/gems/go-merge/.kettle-drift.lock +++ b/gems/go-merge/.kettle-drift.lock @@ -5,7 +5,8 @@ "lines": [ 80, 120, - 160 + 160, + 200 ] } ], @@ -15,7 +16,8 @@ "lines": [ 91, 131, - 171 + 171, + 211 ] } ], @@ -25,7 +27,8 @@ "lines": [ 81, 121, - 161 + 161, + 201 ] } ], @@ -35,7 +38,8 @@ "lines": [ 93, 133, - 173 + 173, + 213 ] } ], @@ -45,7 +49,8 @@ "lines": [ 96, 136, - 176 + 176, + 216 ] } ], @@ -55,7 +60,8 @@ "lines": [ 82, 122, - 162 + 162, + 202 ] } ], @@ -66,7 +72,8 @@ 60, 100, 140, - 180 + 180, + 220 ] } ], @@ -76,7 +83,8 @@ "lines": [ 101, 141, - 181 + 181, + 221 ] } ], @@ -87,7 +95,8 @@ 43, 87, 127, - 167 + 167, + 207 ] } ], @@ -97,7 +106,8 @@ "lines": [ 110, 150, - 190 + 190, + 230 ] } ], @@ -108,7 +118,8 @@ 35, 79, 119, - 159 + 159, + 199 ] } ], @@ -119,7 +130,8 @@ 69, 109, 149, - 189 + 189, + 229 ] } ], @@ -129,7 +141,8 @@ "lines": [ 85, 125, - 165 + 165, + 205 ] } ], @@ -140,7 +153,8 @@ 48, 92, 132, - 172 + 172, + 212 ] } ], @@ -151,7 +165,8 @@ 44, 88, 128, - 168 + 168, + 208 ] } ], @@ -161,7 +176,8 @@ "lines": [ 86, 126, - 166 + 166, + 206 ] } ], @@ -171,7 +187,8 @@ "lines": [ 103, 143, - 183 + 183, + 223 ] } ], @@ -181,7 +198,8 @@ "lines": [ 102, 142, - 182 + 182, + 222 ] } ], @@ -191,7 +209,8 @@ "lines": [ 97, 137, - 177 + 177, + 217 ] } ], @@ -201,7 +220,8 @@ "lines": [ 106, 146, - 186 + 186, + 226 ] } ], diff --git a/gems/go-merge/Gemfile b/gems/go-merge/Gemfile index df33fdf3d..ac4955e01 100644 --- a/gems/go-merge/Gemfile +++ b/gems/go-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source 'https://gem.coop' +source "https://gem.coop" git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,18 +19,62 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ['~> 1.0', '>= 1.0.8'] -gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ["~> 1.0", ">= 1.0.8"] +gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ast-merge tree_haver ] -direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') +direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? + +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) + direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") + direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == "nomono" } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + if nomono_locked + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] + end + end + Kernel.send(:gem, "nomono", *nomono_activation_requirements) + require "nomono/bundler" + if direct_sibling_templating && !direct_sibling_local + ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + end + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: "STRUCTUREDMERGE", + path_env: "STRUCTUREDMERGE_DEV", + root: ["src", "my", "structuredmerge"] + ) + rescue LoadError + warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + else + ENV.delete("STRUCTUREDMERGE_DEV") + end + end + end +end if direct_sibling_gems.any? && (direct_sibling_local || @@ -210,25 +254,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? # Debugging -eval_gemfile 'gemfiles/modular/debug.gemfile' +eval_gemfile "gemfiles/modular/debug.gemfile" # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile 'gemfiles/modular/coverage.gemfile' +eval_gemfile "gemfiles/modular/coverage.gemfile" # Linting -eval_gemfile 'gemfiles/modular/style.gemfile' +eval_gemfile "gemfiles/modular/style.gemfile" # Documentation -eval_gemfile 'gemfiles/modular/documentation.gemfile' +eval_gemfile "gemfiles/modular/documentation.gemfile" # Optional -eval_gemfile 'gemfiles/modular/optional.gemfile' +eval_gemfile "gemfiles/modular/optional.gemfile" ### Std Lib Extracted Gems -eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' +eval_gemfile "gemfiles/modular/x_std_libs.gemfile" # See unlocked_deps appraisal for more details on irb inclusion -gem 'irb', '~> 1.17' # ruby >= 2.7 +gem "irb", "~> 1.17" # ruby >= 2.7 diff --git a/gems/go-merge/README.md b/gems/go-merge/README.md index 46fa466cc..35aa0cd8b 100644 --- a/gems/go-merge/README.md +++ b/gems/go-merge/README.md @@ -251,6 +251,7 @@ If none of the available licenses suit your use case, please [contact us](mailto [🖐contrib-rocks]: https://contrib.rocks [🖐contributors]: https://github.com/structuredmerge/structuredmerge-ruby/graphs/contributors [🖐contributors-img]: https://contrib.rocks/image?repo=structuredmerge/structuredmerge-ruby +[🚎contributors-gl]: https://gitlab.com/structuredmerge/structuredmerge-ruby/-/graphs/main [🪇conduct]: https://github.com/structuredmerge/structuredmerge-ruby/blob/main/CODE_OF_CONDUCT.md [🪇conduct-img]: https://img.shields.io/badge/Contributor_Covenant-2.1-259D6C.svg [📌pvc]: http://guides.rubygems.org/patterns/#pessimistic-version-constraint diff --git a/gems/go-merge/Rakefile b/gems/go-merge/Rakefile index f0aa98d5f..f7fe74fab 100644 --- a/gems/go-merge/Rakefile +++ b/gems/go-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require 'kettle/drift' + require "kettle/drift" Kettle::Drift.install_tasks rescue LoadError - desc('(stub) kettle:drift:check is unavailable') - task('kettle:drift:check') do + desc("(stub) kettle:drift:check is unavailable") + task("kettle:drift:check") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:update is unavailable') - task('kettle:drift:update') do + desc("(stub) kettle:drift:update is unavailable") + task("kettle:drift:update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:force_update is unavailable') - task('kettle:drift:force_update') do + desc("(stub) kettle:drift:force_update is unavailable") + task("kettle:drift:force_update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift is unavailable') - task('kettle:drift' => 'kettle:drift:update') + desc("(stub) kettle:drift is unavailable") + task("kettle:drift" => "kettle:drift:update") end ### TEMPLATING TASKS diff --git a/gems/go-merge/lib/go/merge/version.rb b/gems/go-merge/lib/go/merge/version.rb index d576fba8a..7a12d28aa 100644 --- a/gems/go-merge/lib/go/merge/version.rb +++ b/gems/go-merge/lib/go/merge/version.rb @@ -3,7 +3,7 @@ module Go module Merge module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/ruby-merge/Gemfile b/gems/ruby-merge/Gemfile index 150225d65..fe0a045a7 100644 --- a/gems/ruby-merge/Gemfile +++ b/gems/ruby-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source "https://gem.coop" +source 'https://gem.coop' git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,58 +19,54 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ["~> 1.0", ">= 1.0.8"] -gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ['~> 1.0', '>= 1.0.8'] +gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ast-merge tree_haver ] -direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") +direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? if direct_sibling_gems.any? && - (direct_sibling_local || - ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) - direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") - direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) begin nomono_activation_requirements = nomono_requirements - nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) if File.file?(nomono_lockfile) nomono_locked_spec = Bundler::LockfileParser - .new(Bundler.read_file(nomono_lockfile)) - .specs - .find { |spec| spec.name == "nomono" } + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } nomono_locked = nomono_locked_spec && - Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) - if nomono_locked - nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] - end - end - Kernel.send(:gem, "nomono", *nomono_activation_requirements) - require "nomono/bundler" - if direct_sibling_templating && !direct_sibling_local - ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local eval_nomono_gems( gems: direct_sibling_gems, - prefix: "STRUCTUREDMERGE", - path_env: "STRUCTUREDMERGE_DEV", - root: ["src", "my", "structuredmerge"] + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] ) rescue LoadError - warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' ensure if direct_sibling_templating && !direct_sibling_local if direct_sibling_dev_was_set - ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original else - ENV.delete("STRUCTUREDMERGE_DEV") + ENV.delete('STRUCTUREDMERGE_DEV') end end end @@ -254,25 +250,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging -eval_gemfile "gemfiles/modular/debug.gemfile" +eval_gemfile 'gemfiles/modular/debug.gemfile' # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile "gemfiles/modular/coverage.gemfile" +eval_gemfile 'gemfiles/modular/coverage.gemfile' # Linting -eval_gemfile "gemfiles/modular/style.gemfile" +eval_gemfile 'gemfiles/modular/style.gemfile' # Documentation -eval_gemfile "gemfiles/modular/documentation.gemfile" +eval_gemfile 'gemfiles/modular/documentation.gemfile' # Optional -eval_gemfile "gemfiles/modular/optional.gemfile" +eval_gemfile 'gemfiles/modular/optional.gemfile' ### Std Lib Extracted Gems -eval_gemfile "gemfiles/modular/x_std_libs.gemfile" +eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' # See unlocked_deps appraisal for more details on irb inclusion -gem "irb", "~> 1.17" # ruby >= 2.7 +gem 'irb', '~> 1.17' # ruby >= 2.7 diff --git a/gems/ruby-merge/Gemfile.lock b/gems/ruby-merge/Gemfile.lock index d8758159d..fb5b38919 100644 --- a/gems/ruby-merge/Gemfile.lock +++ b/gems/ruby-merge/Gemfile.lock @@ -16,281 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -302,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -310,12 +40,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -324,6 +48,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -379,6 +104,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -397,7 +131,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -537,23 +270,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -587,11 +322,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +373,22 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -687,59 +399,37 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0.0) ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +442,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +469,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +480,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -834,15 +511,14 @@ 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,19 +532,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +547,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ruby-merge/Rakefile b/gems/ruby-merge/Rakefile index c7b8a4b9e..c528d41ee 100644 --- a/gems/ruby-merge/Rakefile +++ b/gems/ruby-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require "kettle/drift" + require 'kettle/drift' Kettle::Drift.install_tasks rescue LoadError - desc("(stub) kettle:drift:check is unavailable") - task("kettle:drift:check") do + desc('(stub) kettle:drift:check is unavailable') + task('kettle:drift:check') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:update is unavailable") - task("kettle:drift:update") do + desc('(stub) kettle:drift:update is unavailable') + task('kettle:drift:update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:force_update is unavailable") - task("kettle:drift:force_update") do + desc('(stub) kettle:drift:force_update is unavailable') + task('kettle:drift:force_update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift is unavailable") - task("kettle:drift" => "kettle:drift:update") + desc('(stub) kettle:drift is unavailable') + task('kettle:drift' => 'kettle:drift:update') end ### TEMPLATING TASKS diff --git a/gems/ruby-merge/bin/yard b/gems/ruby-merge/bin/yard index a7e8b6eed..5d516ad6f 100755 --- a/gems/ruby-merge/bin/yard +++ b/gems/ruby-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec("bundle", "exec", "rake", "yard") +exec('bundle', 'exec', 'rake', 'yard') diff --git a/gems/toml-merge/.rubocop_gradual.lock b/gems/toml-merge/.rubocop_gradual.lock new file mode 100644 index 000000000..918c85d88 --- /dev/null +++ b/gems/toml-merge/.rubocop_gradual.lock @@ -0,0 +1,258 @@ +{ + ".simplecov:3682400110": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:133885645": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/toml-merge.rb:3814390984": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`toml-merge.rb`) should use snake_case.", 5381], + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "lib/toml/merge.rb:3069711497": [ + [39, 3, 12193, "Metrics/ModuleLength: Module has too many lines. [231/100]", 1479901406], + [114, 5, 9241, "Metrics/ClassLength: Class has too many lines. [205/100]", 349141169], + [156, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1773216188], + [165, 7, 709, "Metrics/MethodLength: Method has too many lines. [17/10]", 2355964538], + [191, 7, 1280, "Metrics/AbcSize: Assignment Branch Condition size for `merge_toml` is too high. [<6, 16, 6> 18.11/17]", 2322240506], + [191, 7, 1280, "Metrics/MethodLength: Method has too many lines. [25/10]", 2322240506], + [195, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1773216188], + [222, 7, 1401, "Metrics/AbcSize: Assignment Branch Condition size for `merge_toml_with_parser` is too high. [<6, 18, 6> 19.9/17]", 3118052892], + [222, 7, 1401, "Metrics/MethodLength: Method has too many lines. [24/10]", 3118052892], + [321, 9, 11, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 848344986] + ], + "lib/toml/merge/comment_tracker.rb:743656609": [ + [16, 5, 5242, "Metrics/ClassLength: Class has too many lines. [112/100]", 3014190138], + [28, 7, 990, "Metrics/MethodLength: Method has too many lines. [17/10]", 85804539], + [92, 7, 949, "Metrics/AbcSize: Assignment Branch Condition size for `build_toml_region` is too high. [<7, 21, 9> 23.9/17]", 552845000], + [92, 7, 949, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_toml_region` is too high. [9/7]", 552845000], + [92, 7, 949, "Metrics/MethodLength: Method has too many lines. [23/10]", 552845000], + [92, 7, 949, "Metrics/PerceivedComplexity: Perceived complexity for `build_toml_region` is too high. [9/8]", 552845000] + ], + "lib/toml/merge/conflict_resolver.rb:2699752146": [ + [11, 5, 42658, "Metrics/ClassLength: Class has too many lines. [791/100]", 2931993361], + [30, 7, 788, "Metrics/MethodLength: Method has too many lines. [13/10]", 2218400960], + [30, 21, 235, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 788504679], + [31, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3099130903], + [52, 7, 1676, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_batch` is too high. [<4, 24, 3> 24.52/17]", 623996510], + [52, 7, 1676, "Metrics/MethodLength: Method has too many lines. [29/10]", 623996510], + [53, 9, 1632, "Metrics/BlockLength: Block has too many lines. [27/25]", 3553849414], + [101, 7, 8464, "Metrics/AbcSize: Assignment Branch Condition size for `merge_node_lists_to_emitter` is too high. [<54, 88, 31> 107.8/17]", 3669765511], + [101, 7, 8464, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_node_lists_to_emitter` is too high. [27/7]", 3669765511], + [101, 7, 8464, "Metrics/MethodLength: Method has too many lines. [141/10]", 3669765511], + [101, 7, 8464, "Metrics/PerceivedComplexity: Perceived complexity for `merge_node_lists_to_emitter` is too high. [29/8]", 3669765511], + [146, 9, 5685, "Metrics/BlockLength: Block has too many lines. [102/25]", 464560406], + [286, 7, 2458, "Metrics/AbcSize: Assignment Branch Condition size for `merge_matched_nodes_to_emitter` is too high. [<6, 17, 10> 20.62/17]", 4036358483], + [286, 7, 2458, "Metrics/MethodLength: Method has too many lines. [49/10]", 4036358483], + [286, 7, 2458, "Metrics/PerceivedComplexity: Perceived complexity for `merge_matched_nodes_to_emitter` is too high. [9/8]", 4036358483], + [289, 11, 1647, "Metrics/BlockLength: Block has too many lines. [34/25]", 997955803], + [353, 7, 770, "Metrics/MethodLength: Method has too many lines. [21/10]", 543737609], + [387, 7, 1101, "Metrics/AbcSize: Assignment Branch Condition size for `build_refined_matches` is too high. [<11, 16, 8> 21/17]", 4236016583], + [387, 7, 1101, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_refined_matches` is too high. [9/7]", 4236016583], + [387, 7, 1101, "Metrics/MethodLength: Method has too many lines. [18/10]", 4236016583], + [387, 7, 1101, "Metrics/PerceivedComplexity: Perceived complexity for `build_refined_matches` is too high. [9/8]", 4236016583], + [427, 7, 642, "Metrics/AbcSize: Assignment Branch Condition size for `emit_removed_destination_node_inline_comments` is too high. [<4, 20, 5> 21/17]", 2624953678], + [427, 7, 642, "Metrics/MethodLength: Method has too many lines. [11/10]", 2624953678], + [462, 7, 720, "Metrics/MethodLength: Method has too many lines. [11/10]", 4270722493], + [499, 7, 1022, "Metrics/MethodLength: Method has too many lines. [17/10]", 3216685542], + [584, 7, 1854, "Metrics/AbcSize: Assignment Branch Condition size for `emit_leading_region` is too high. [<8, 28, 9> 30.48/17]", 377203837], + [584, 7, 1854, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_leading_region` is too high. [10/7]", 377203837], + [584, 7, 1854, "Metrics/MethodLength: Method has too many lines. [32/10]", 377203837], + [584, 7, 1854, "Metrics/PerceivedComplexity: Perceived complexity for `emit_leading_region` is too high. [10/8]", 377203837], + [685, 7, 1275, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_template_preamble_prefix_region` is too high. [<7, 24, 9> 26.57/17]", 1754222078], + [685, 7, 1275, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collapse_template_preamble_prefix_region` is too high. [8/7]", 1754222078], + [685, 7, 1275, "Metrics/MethodLength: Method has too many lines. [24/10]", 1754222078], + [716, 7, 662, "Metrics/AbcSize: Assignment Branch Condition size for `root_boundary_lines_for` is too high. [<4, 15, 10> 18.47/17]", 935744348], + [716, 7, 662, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `root_boundary_lines_for` is too high. [9/7]", 935744348], + [716, 7, 662, "Metrics/MethodLength: Method has too many lines. [14/10]", 935744348], + [736, 7, 343, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `region_lines_for` is too high. [8/7]", 399995706], + [753, 7, 614, "Metrics/AbcSize: Assignment Branch Condition size for `dedup_warning_context` is too high. [<0, 20, 10> 22.36/17]", 2011768288], + [753, 7, 614, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `dedup_warning_context` is too high. [11/7]", 2011768288], + [753, 7, 614, "Metrics/PerceivedComplexity: Perceived complexity for `dedup_warning_context` is too high. [11/8]", 2011768288], + [756, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [757, 41, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [757, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 3287405165], + [783, 7, 1426, "Metrics/MethodLength: Method has too many lines. [34/10]", 1351993853], + [849, 7, 955, "Metrics/MethodLength: Method has too many lines. [21/10]", 3080929417], + [877, 7, 1249, "Metrics/AbcSize: Assignment Branch Condition size for `emit_node_lines` is too high. [<6, 21, 6> 22.65/17]", 3195628693], + [877, 7, 1249, "Metrics/MethodLength: Method has too many lines. [21/10]", 3195628693], + [952, 7, 637, "Metrics/AbcSize: Assignment Branch Condition size for `inline_region_separator` is too high. [<5, 18, 7> 19.95/17]", 2029360360], + [952, 7, 637, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `inline_region_separator` is too high. [8/7]", 2029360360], + [952, 7, 637, "Metrics/MethodLength: Method has too many lines. [12/10]", 2029360360], + [969, 7, 465, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_interstitial_blank_lines` is too high. [9/7]", 1640065866], + [969, 7, 465, "Metrics/PerceivedComplexity: Perceived complexity for `emit_interstitial_blank_lines` is too high. [9/8]", 1640065866], + [981, 7, 620, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_gap_before_node` is too high. [12/7]", 2808239642], + [981, 7, 620, "Metrics/PerceivedComplexity: Perceived complexity for `emit_gap_before_node` is too high. [12/8]", 2808239642], + [983, 36, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [998, 7, 526, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_preceding_blank_lines` is too high. [8/7]", 3889743093], + [998, 7, 526, "Metrics/MethodLength: Method has too many lines. [11/10]", 3889743093] + ], + "lib/toml/merge/file_analysis.rb:2630402533": [ + [12, 5, 19537, "Metrics/ClassLength: Class has too many lines. [368/100]", 929433986], + [15, 7, 22, "Style/Documentation: Missing top-level documentation comment for `class Toml::Merge::FileAnalysis::CommentAugmenter`.", 2864244718], + [20, 9, 849, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<11, 13, 1> 17.06/17]", 1333266342], + [20, 9, 849, "Metrics/MethodLength: Method has too many lines. [16/10]", 1333266342], + [72, 7, 869, "Metrics/MethodLength: Method has too many lines. [13/10]", 1683071581], + [228, 7, 959, "Metrics/AbcSize: Assignment Branch Condition size for `root_pairs` is too high. [<10, 13, 16> 22.91/17]", 1481059821], + [228, 7, 959, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `root_pairs` is too high. [15/7]", 1481059821], + [228, 7, 959, "Metrics/MethodLength: Method has too many lines. [21/10]", 1481059821], + [228, 7, 959, "Metrics/PerceivedComplexity: Perceived complexity for `root_pairs` is too high. [15/8]", 1481059821], + [246, 9, 384, "Style/CombinableLoops: Combine this loop with the previous loop.", 2434692315], + [263, 7, 1743, "Metrics/AbcSize: Assignment Branch Condition size for `parse_toml` is too high. [<10, 12, 8> 17.55/17]", 1966830746], + [263, 7, 1743, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_toml` is too high. [9/7]", 1966830746], + [263, 7, 1743, "Metrics/MethodLength: Method has too many lines. [19/10]", 1966830746], + [331, 7, 596, "Metrics/MethodLength: Method has too many lines. [13/10]", 995924372], + [389, 7, 588, "Metrics/AbcSize: Assignment Branch Condition size for `comment_owner_end_line_for_augmenter` is too high. [<1, 20, 13> 23.87/17]", 1972553155], + [389, 7, 588, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `comment_owner_end_line_for_augmenter` is too high. [14/7]", 1972553155], + [389, 7, 588, "Metrics/PerceivedComplexity: Perceived complexity for `comment_owner_end_line_for_augmenter` is too high. [14/8]", 1972553155], + [448, 7, 1255, "Metrics/AbcSize: Assignment Branch Condition size for `scan_line_for_comment` is too high. [<16, 13, 17> 26.72/17]", 622981429], + [448, 7, 1255, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `scan_line_for_comment` is too high. [12/7]", 622981429], + [448, 7, 1255, "Metrics/MethodLength: Method has too many lines. [38/10]", 622981429], + [448, 7, 1255, "Metrics/PerceivedComplexity: Perceived complexity for `scan_line_for_comment` is too high. [13/8]", 622981429], + [496, 7, 319, "Metrics/MethodLength: Method has too many lines. [11/10]", 2890996257], + [535, 7, 416, "Metrics/MethodLength: Method has too many lines. [11/10]", 2416972242], + [576, 7, 464, "Metrics/AbcSize: Assignment Branch Condition size for `node_text` is too high. [<3, 16, 8> 18.14/17]", 2138809005], + [576, 7, 464, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `node_text` is too high. [8/7]", 2138809005] + ], + "lib/toml/merge/key_sorter.rb:829731466": [ + [59, 7, 1787, "Metrics/AbcSize: Assignment Branch Condition size for `partition_into_blocks` is too high. [<11, 23, 8> 26.72/17]", 3324132918], + [59, 7, 1787, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `partition_into_blocks` is too high. [8/7]", 3324132918], + [59, 7, 1787, "Metrics/MethodLength: Method has too many lines. [38/10]", 3324132918], + [59, 7, 1787, "Metrics/PerceivedComplexity: Perceived complexity for `partition_into_blocks` is too high. [9/8]", 3324132918] + ], + "lib/toml/merge/node_type_normalizer.rb:2171981470": [ + [67, 5, 7844, "Metrics/ModuleLength: Module has too many lines. [134/100]", 828548837], + [159, 11, 4, "Lint/BooleanSymbol: Symbol with a boolean name - you probably meant to use `true`.", 2087932467], + [160, 11, 5, "Lint/BooleanSymbol: Symbol with a boolean name - you probably meant to use `false`.", 170962968], + [215, 11, 4, "Lint/BooleanSymbol: Symbol with a boolean name - you probably meant to use `true`.", 2087932467], + [216, 11, 5, "Lint/BooleanSymbol: Symbol with a boolean name - you probably meant to use `false`.", 170962968] + ], + "lib/toml/merge/node_wrapper.rb:975742583": [ + [26, 5, 24084, "Metrics/ClassLength: Class has too many lines. [424/100]", 111672250], + [37, 9, 517, "Metrics/MethodLength: Method has too many lines. [11/10]", 3513234297], + [37, 17, 154, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2431837951], + [54, 7, 503, "Metrics/MethodLength: Method has too many lines. [12/10]", 2647031658], + [54, 21, 82, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2652802373], + [229, 7, 1380, "Metrics/AbcSize: Assignment Branch Condition size for `value_node` is too high. [<5, 16, 10> 19.52/17]", 1398903082], + [229, 7, 1380, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `value_node` is too high. [9/7]", 1398903082], + [229, 7, 1380, "Metrics/MethodLength: Method has too many lines. [32/10]", 1398903082], + [229, 7, 1380, "Metrics/PerceivedComplexity: Perceived complexity for `value_node` is too high. [9/8]", 1398903082], + [232, 9, 1306, "Metrics/BlockLength: Block has too many lines. [28/25]", 3342818997], + [286, 7, 496, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `pairs` is too high. [9/7]", 2741436417], + [286, 7, 496, "Metrics/PerceivedComplexity: Perceived complexity for `pairs` is too high. [9/8]", 2741436417], + [319, 7, 706, "Metrics/MethodLength: Method has too many lines. [22/10]", 2032215880], + [390, 7, 753, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `effective_end_line` is too high. [10/7]", 29395992], + [390, 7, 753, "Metrics/PerceivedComplexity: Perceived complexity for `effective_end_line` is too high. [10/8]", 29395992], + [414, 7, 2225, "Metrics/AbcSize: Assignment Branch Condition size for `compute_signature` is too high. [<9, 32, 24> 41/17]", 1299303855], + [414, 7, 2225, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_signature` is too high. [25/7]", 1299303855], + [414, 7, 2225, "Metrics/MethodLength: Method has too many lines. [39/10]", 1299303855], + [414, 7, 2225, "Metrics/PerceivedComplexity: Perceived complexity for `compute_signature` is too high. [16/8]", 1299303855], + [523, 7, 487, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `raw_pair_value_text` is too high. [8/7]", 3177077098], + [547, 7, 1503, "Metrics/AbcSize: Assignment Branch Condition size for `collect_inline_table_keys_recursive` is too high. [<7, 25, 18> 31.59/17]", 3778857543], + [547, 7, 1503, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_inline_table_keys_recursive` is too high. [17/7]", 3778857543], + [547, 7, 1503, "Metrics/MethodLength: Method has too many lines. [24/10]", 3778857543], + [547, 7, 1503, "Metrics/PerceivedComplexity: Perceived complexity for `collect_inline_table_keys_recursive` is too high. [18/8]", 3778857543], + [605, 7, 855, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_sibling_pairs_for_table` is too high. [8/7]", 3160731503], + [605, 7, 855, "Metrics/MethodLength: Method has too many lines. [14/10]", 3160731503], + [636, 7, 655, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_next_table_start_line` is too high. [9/7]", 1465728116], + [636, 7, 655, "Metrics/MethodLength: Method has too many lines. [12/10]", 1465728116], + [636, 7, 655, "Metrics/PerceivedComplexity: Perceived complexity for `find_next_table_start_line` is too high. [9/8]", 1465728116], + [665, 7, 861, "Metrics/MethodLength: Method has too many lines. [12/10]", 4202205110] + ], + "lib/toml/merge/smart_merger.rb:3624815957": [ + [39, 5, 9573, "Metrics/ClassLength: Class has too many lines. [190/100]", 1615610584], + [72, 7, 1283, "Metrics/MethodLength: Method has too many lines. [18/10]", 2597249100], + [72, 21, 427, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 1661881927], + [144, 7, 1347, "Metrics/AbcSize: Assignment Branch Condition size for `merge_with_debug` is too high. [<3, 20, 7> 21.4/17]", 2015540458], + [144, 7, 1347, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_with_debug` is too high. [8/7]", 2015540458], + [144, 7, 1347, "Metrics/MethodLength: Method has too many lines. [31/10]", 2015540458], + [248, 7, 1161, "Metrics/MethodLength: Method has too many lines. [26/10]", 1453116447] + ], + "lib/toml/merge/table_match_refiner.rb:1590173808": [ + [32, 5, 7338, "Metrics/ClassLength: Class has too many lines. [108/100]", 3006106276], + [113, 35, 50, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1492696344], + [147, 7, 410, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_table_name` is too high. [8/7]", 2032455294], + [217, 7, 659, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<11, 38, 8> 40.36/17]", 2658150371], + [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:3985149016": [ + [3, 1, 12320, "Metrics/BlockLength: Block has too many lines. [273/25]", 2102318823], + [34, 3, 2099, "Metrics/BlockLength: Block has too many lines. [27/25]", 677669008], + [233, 3, 1127, "Metrics/BlockLength: Block has too many lines. [27/25]", 3231986094] + ], + "toml-merge.gemspec:2519299257": [ + [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ] +} diff --git a/gems/toml-merge/Gemfile.lock b/gems/toml-merge/Gemfile.lock index fef01f4f8..f4338c0b4 100644 --- a/gems/toml-merge/Gemfile.lock +++ b/gems/toml-merge/Gemfile.lock @@ -17,39 +17,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -58,193 +26,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -252,45 +34,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -310,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -324,6 +61,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -379,6 +117,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -397,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -537,23 +283,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -587,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +381,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,61 +406,40 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +452,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +479,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +490,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,19 +517,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,19 +541,15 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +557,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/yaml-merge/Gemfile.lock b/gems/yaml-merge/Gemfile.lock index 89d153c1b..8b0e8ac0f 100644 --- a/gems/yaml-merge/Gemfile.lock +++ b/gems/yaml-merge/Gemfile.lock @@ -16,24 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -45,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -335,6 +322,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,7 +373,6 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - ast-merge! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) debug (>= 1.1) @@ -410,7 +401,6 @@ DEPENDENCIES standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - tree_haver! tree_sitter_language_pack! yaml-converter (~> 0.1) yaml-merge! From 6c34643a08ea22118ae747db49de2f57f720de34 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:24:27 -0600 Subject: [PATCH 167/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/go-merge/.rubocop_gradual.lock | 25 +- gems/go-merge/Gemfile | 68 ++- gems/go-merge/Gemfile.lock | 327 +-------------- gems/go-merge/README.md | 1 - gems/go-merge/Rakefile | 18 +- gems/go-merge/lib/go/merge.rb | 5 +- gems/go-merge/lib/go/merge/version.rb | 2 +- gems/ruby-merge/lib/ruby/merge.rb | 7 +- .../ruby/merge/block_directive_detector.rb | 2 - .../lib/ruby/merge/magic_comment_support.rb | 2 - .../lib/ruby/merge/rescue_semantics.rb | 2 - .../lib/ruby/merge/scaffold_chunk_support.rb | 2 - gems/ruby-merge/lib/ruby/merge/version.rb | 2 +- gems/toml-merge/Gemfile.lock | 327 ++++++++++++++- gems/tree_haver/Gemfile.lock | 386 +++++------------- gems/yaml-merge/Gemfile.lock | 353 +++++++++++++++- 16 files changed, 827 insertions(+), 702 deletions(-) diff --git a/gems/go-merge/.rubocop_gradual.lock b/gems/go-merge/.rubocop_gradual.lock index 1108b1b2f..bb6039651 100644 --- a/gems/go-merge/.rubocop_gradual.lock +++ b/gems/go-merge/.rubocop_gradual.lock @@ -82,23 +82,18 @@ "lib/go-merge.rb:1938991181": [ [1, 1, 0, "Naming/FileName: The name of this source file (`go-merge.rb`) should use snake_case.", 5381] ], - "lib/go/merge.rb:3352469315": [ + "lib/go/merge.rb:547557749": [ [10, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Go::Merge`.", 2866359175], - [10, 3, 6135, "Metrics/ModuleLength: Module has too many lines. [124/100]", 2087300327], + [10, 3, 7242, "Metrics/ModuleLength: Module has too many lines. [173/100]", 2713105462], [11, 5, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631], - [60, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1491828652], - [67, 5, 1399, "Metrics/AbcSize: Assignment Branch Condition size for `merge_go` is too high. [<13, 32, 11> 36.25/17]", 3471957286], - [67, 5, 1399, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_go` is too high. [11/7]", 3471957286], - [67, 5, 1399, "Metrics/MethodLength: Method has too many lines. [22/10]", 3471957286], - [67, 5, 1399, "Metrics/PerceivedComplexity: Perceived complexity for `merge_go` is too high. [11/8]", 3471957286], - [86, 34, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], - [94, 5, 1940, "Metrics/AbcSize: Assignment Branch Condition size for `analyze_go_module` is too high. [<17, 44, 12> 48.67/17]", 2068929991], - [94, 5, 1940, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `analyze_go_module` is too high. [12/7]", 2068929991], - [94, 5, 1940, "Metrics/MethodLength: Method has too many lines. [34/10]", 2068929991], - [94, 5, 1940, "Metrics/PerceivedComplexity: Perceived complexity for `analyze_go_module` is too high. [12/8]", 2068929991], - [111, 50, 20, "Style/SymbolProc: Pass `&:name` as an argument to `select` instead of a block.", 2833012298], - [115, 7, 3, "Layout/BlockAlignment: `end` at 115, 6 is not aligned with `processed[:analysis].structure` at 110, 21 or `.map do |item|` at 112, 41.", 193405706], - [115, 7, 53, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 1601274288] + [72, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1491828652], + [79, 5, 1399, "Metrics/AbcSize: Assignment Branch Condition size for `merge_go` is too high. [<13, 32, 11> 36.25/17]", 3471957286], + [79, 5, 1399, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_go` is too high. [11/7]", 3471957286], + [79, 5, 1399, "Metrics/MethodLength: Method has too many lines. [22/10]", 3471957286], + [79, 5, 1399, "Metrics/PerceivedComplexity: Perceived complexity for `merge_go` is too high. [11/8]", 3471957286], + [98, 34, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], + [106, 5, 1419, "Metrics/AbcSize: Assignment Branch Condition size for `analyze_go_module` is too high. [<8, 19, 5> 21.21/17]", 525883462], + [106, 5, 1419, "Metrics/MethodLength: Method has too many lines. [40/10]", 525883462] ], "spec/fixtures_integration_spec.rb:2854818786": [ [3, 1, 4677, "Metrics/BlockLength: Block has too many lines. [66/25]", 420437002], diff --git a/gems/go-merge/Gemfile b/gems/go-merge/Gemfile index ac4955e01..f6d039b30 100644 --- a/gems/go-merge/Gemfile +++ b/gems/go-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source "https://gem.coop" +source 'https://gem.coop' git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,58 +19,54 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ["~> 1.0", ">= 1.0.8"] -gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ['~> 1.0', '>= 1.0.8'] +gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ast-merge tree_haver ] -direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") +direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? if direct_sibling_gems.any? && - (direct_sibling_local || - ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) - direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") - direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) begin nomono_activation_requirements = nomono_requirements - nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) if File.file?(nomono_lockfile) nomono_locked_spec = Bundler::LockfileParser - .new(Bundler.read_file(nomono_lockfile)) - .specs - .find { |spec| spec.name == "nomono" } + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } nomono_locked = nomono_locked_spec && - Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) - if nomono_locked - nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] - end - end - Kernel.send(:gem, "nomono", *nomono_activation_requirements) - require "nomono/bundler" - if direct_sibling_templating && !direct_sibling_local - ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local eval_nomono_gems( gems: direct_sibling_gems, - prefix: "STRUCTUREDMERGE", - path_env: "STRUCTUREDMERGE_DEV", - root: ["src", "my", "structuredmerge"] + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] ) rescue LoadError - warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' ensure if direct_sibling_templating && !direct_sibling_local if direct_sibling_dev_was_set - ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original else - ENV.delete("STRUCTUREDMERGE_DEV") + ENV.delete('STRUCTUREDMERGE_DEV') end end end @@ -254,25 +250,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging -eval_gemfile "gemfiles/modular/debug.gemfile" +eval_gemfile 'gemfiles/modular/debug.gemfile' # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile "gemfiles/modular/coverage.gemfile" +eval_gemfile 'gemfiles/modular/coverage.gemfile' # Linting -eval_gemfile "gemfiles/modular/style.gemfile" +eval_gemfile 'gemfiles/modular/style.gemfile' # Documentation -eval_gemfile "gemfiles/modular/documentation.gemfile" +eval_gemfile 'gemfiles/modular/documentation.gemfile' # Optional -eval_gemfile "gemfiles/modular/optional.gemfile" +eval_gemfile 'gemfiles/modular/optional.gemfile' ### Std Lib Extracted Gems -eval_gemfile "gemfiles/modular/x_std_libs.gemfile" +eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' # See unlocked_deps appraisal for more details on irb inclusion -gem "irb", "~> 1.17" # ruby >= 2.7 +gem 'irb', '~> 1.17' # ruby >= 2.7 diff --git a/gems/go-merge/Gemfile.lock b/gems/go-merge/Gemfile.lock index c35a1d0fa..87487fbe5 100644 --- a/gems/go-merge/Gemfile.lock +++ b/gems/go-merge/Gemfile.lock @@ -17,39 +17,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -58,193 +26,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -252,29 +34,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -294,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +116,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +283,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +381,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +407,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +440,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -758,22 +457,15 @@ CHECKSUMS io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +480,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +491,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +518,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +529,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +542,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +557,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/go-merge/README.md b/gems/go-merge/README.md index 35aa0cd8b..46fa466cc 100644 --- a/gems/go-merge/README.md +++ b/gems/go-merge/README.md @@ -251,7 +251,6 @@ If none of the available licenses suit your use case, please [contact us](mailto [🖐contrib-rocks]: https://contrib.rocks [🖐contributors]: https://github.com/structuredmerge/structuredmerge-ruby/graphs/contributors [🖐contributors-img]: https://contrib.rocks/image?repo=structuredmerge/structuredmerge-ruby -[🚎contributors-gl]: https://gitlab.com/structuredmerge/structuredmerge-ruby/-/graphs/main [🪇conduct]: https://github.com/structuredmerge/structuredmerge-ruby/blob/main/CODE_OF_CONDUCT.md [🪇conduct-img]: https://img.shields.io/badge/Contributor_Covenant-2.1-259D6C.svg [📌pvc]: http://guides.rubygems.org/patterns/#pessimistic-version-constraint diff --git a/gems/go-merge/Rakefile b/gems/go-merge/Rakefile index f7fe74fab..f0aa98d5f 100644 --- a/gems/go-merge/Rakefile +++ b/gems/go-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require "kettle/drift" + require 'kettle/drift' Kettle::Drift.install_tasks rescue LoadError - desc("(stub) kettle:drift:check is unavailable") - task("kettle:drift:check") do + desc('(stub) kettle:drift:check is unavailable') + task('kettle:drift:check') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:update is unavailable") - task("kettle:drift:update") do + desc('(stub) kettle:drift:update is unavailable') + task('kettle:drift:update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:force_update is unavailable") - task("kettle:drift:force_update") do + desc('(stub) kettle:drift:force_update is unavailable') + task('kettle:drift:force_update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift is unavailable") - task("kettle:drift" => "kettle:drift:update") + desc('(stub) kettle:drift is unavailable') + task('kettle:drift' => 'kettle:drift:update') end ### TEMPLATING TASKS diff --git a/gems/go-merge/lib/go/merge.rb b/gems/go-merge/lib/go/merge.rb index a4cbb130d..c1eee4d76 100644 --- a/gems/go-merge/lib/go/merge.rb +++ b/gems/go-merge/lib/go/merge.rb @@ -152,7 +152,10 @@ def analyze_go_module(source) def collect_parse_errors(node) raise TreeHaver::NotAvailable, 'Go parse returned no root node' unless node - raise TreeHaver::NotAvailable, 'Go parse contains syntax errors' if node.respond_to?(:has_error?) && node.has_error? + return unless node.respond_to?(:has_error?) && node.has_error? + + raise TreeHaver::NotAvailable, + 'Go parse contains syntax errors' end private_class_method :collect_parse_errors diff --git a/gems/go-merge/lib/go/merge/version.rb b/gems/go-merge/lib/go/merge/version.rb index 7a12d28aa..d576fba8a 100644 --- a/gems/go-merge/lib/go/merge/version.rb +++ b/gems/go-merge/lib/go/merge/version.rb @@ -3,7 +3,7 @@ module Go module Merge module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/ruby-merge/lib/ruby/merge.rb b/gems/ruby-merge/lib/ruby/merge.rb index d95b1dbcc..3920b6cfa 100644 --- a/gems/ruby-merge/lib/ruby/merge.rb +++ b/gems/ruby-merge/lib/ruby/merge.rb @@ -1294,7 +1294,10 @@ def ruby_file_footer_text(source) def collect_parse_errors(node) raise TreeHaver::NotAvailable, 'Ruby parse returned no root node' unless node - raise TreeHaver::NotAvailable, 'Ruby parse contains syntax errors' if node.respond_to?(:has_error?) && node.has_error? + return unless node.respond_to?(:has_error?) && node.has_error? + + raise TreeHaver::NotAvailable, + 'Ruby parse contains syntax errors' end def parse_failure_result(error) @@ -1338,7 +1341,7 @@ def ruby_import_item_from_node(source, node) return unless %w[require require_relative].include?(name) string_node = ruby_first_descendant(node) do |child| - child.type == 'string_content' || child.type == 'simple_symbol' + %w[string_content simple_symbol].include?(child.type) end return unless string_node diff --git a/gems/ruby-merge/lib/ruby/merge/block_directive_detector.rb b/gems/ruby-merge/lib/ruby/merge/block_directive_detector.rb index 0491dfd5e..e6c006ac2 100644 --- a/gems/ruby-merge/lib/ruby/merge/block_directive_detector.rb +++ b/gems/ruby-merge/lib/ruby/merge/block_directive_detector.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'set' - module Ruby module Merge # Detects Ruby comment block directive pairs in source lines. diff --git a/gems/ruby-merge/lib/ruby/merge/magic_comment_support.rb b/gems/ruby-merge/lib/ruby/merge/magic_comment_support.rb index b5e12ac86..f6b8ecb96 100644 --- a/gems/ruby-merge/lib/ruby/merge/magic_comment_support.rb +++ b/gems/ruby-merge/lib/ruby/merge/magic_comment_support.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'set' - module Ruby module Merge # Ruby magic comment detection and file-header prefix handling. diff --git a/gems/ruby-merge/lib/ruby/merge/rescue_semantics.rb b/gems/ruby-merge/lib/ruby/merge/rescue_semantics.rb index c5e995070..84f9577dd 100644 --- a/gems/ruby-merge/lib/ruby/merge/rescue_semantics.rb +++ b/gems/ruby-merge/lib/ruby/merge/rescue_semantics.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'set' - module Ruby module Merge class RescueSemantics diff --git a/gems/ruby-merge/lib/ruby/merge/scaffold_chunk_support.rb b/gems/ruby-merge/lib/ruby/merge/scaffold_chunk_support.rb index 38efbfd36..09415b013 100644 --- a/gems/ruby-merge/lib/ruby/merge/scaffold_chunk_support.rb +++ b/gems/ruby-merge/lib/ruby/merge/scaffold_chunk_support.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'set' - module Ruby module Merge module ScaffoldChunkSupport diff --git a/gems/ruby-merge/lib/ruby/merge/version.rb b/gems/ruby-merge/lib/ruby/merge/version.rb index 0dcd005a5..d88eae0c6 100644 --- a/gems/ruby-merge/lib/ruby/merge/version.rb +++ b/gems/ruby-merge/lib/ruby/merge/version.rb @@ -3,7 +3,7 @@ module Ruby module Merge module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/toml-merge/Gemfile.lock b/gems/toml-merge/Gemfile.lock index f4338c0b4..87531476e 100644 --- a/gems/toml-merge/Gemfile.lock +++ b/gems/toml-merge/Gemfile.lock @@ -17,7 +17,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -26,7 +58,193 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -34,6 +252,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -53,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -406,33 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -479,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -490,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -517,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -528,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -541,15 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/tree_haver/Gemfile.lock b/gems/tree_haver/Gemfile.lock index 7ac4910fb..8e744e1af 100644 --- a/gems/tree_haver/Gemfile.lock +++ b/gems/tree_haver/Gemfile.lock @@ -7,288 +7,59 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /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) + ansi (1.6.0) + appraisal2 (3.2.0) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + ast (2.4.3) + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) ast-crispr-markdown-markly (7.1.0) ast-crispr (= 7.1.0) markly-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) prism (>= 1.0) version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: ast-merge (7.1.0) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: + backports (3.25.3) bash-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -GEM - remote: https://gem.coop/ - specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - ansi (1.6.0) - appraisal2 (3.2.0) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - 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) citrus (3.0.2) + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) cmdparse (3.0.7) commonmarker (2.9.0-aarch64-linux) commonmarker (2.9.0-aarch64-linux-musl) commonmarker (2.9.0-arm64-darwin) commonmarker (2.9.0-x86_64-linux) commonmarker (2.9.0-x86_64-linux-musl) + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -298,6 +69,10 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docile (1.4.1) + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -347,6 +122,10 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) @@ -354,6 +133,31 @@ GEM ruby-progressbar (~> 1.13) kettle-drift (1.0.5) version_gem (~> 1.1, >= 1.1.13) + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -377,12 +181,24 @@ GEM turbo_tests2 (~> 3.1, >= 3.1.12) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) 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.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -408,9 +224,18 @@ GEM prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) psych (5.4.0) date stringio + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -419,6 +244,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) rdoc (6.17.0) erb psych (>= 4.0.0) @@ -514,6 +344,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -573,6 +407,10 @@ GEM version_gem (~> 1.1, >= 1.1.13) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) @@ -596,6 +434,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.13) + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) yard (0.9.45) yard-fence (0.9.6) rdoc (>= 6.11, < 8) @@ -628,45 +470,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! + kettle-jem (>= 7.0) kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -675,27 +496,20 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml (~> 0.3) - toml-merge! toml-rb (~> 4.1) tree_haver! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -706,13 +520,10 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) @@ -743,7 +554,6 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 @@ -777,8 +587,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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 @@ -822,7 +630,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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -832,7 +639,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -855,7 +661,6 @@ CHECKSUMS tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) sha256=ad6743a373eeac954c1b659b17af3aff1c82918b3ce9c9dc572a7c70ff843cdd tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -868,7 +673,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/yaml-merge/Gemfile.lock b/gems/yaml-merge/Gemfile.lock index 8b0e8ac0f..5ea0feeed 100644 --- a/gems/yaml-merge/Gemfile.lock +++ b/gems/yaml-merge/Gemfile.lock @@ -16,6 +16,265 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -103,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -131,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -322,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -373,22 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -397,11 +685,17 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) yaml-merge! yard (~> 0.9, >= 0.9.44) @@ -410,19 +704,35 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -430,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -442,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -469,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -480,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -507,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -518,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -531,10 +859,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -547,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 7006ae8ba087e9d4a859a37a2e8b45c5335679d6 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:24:38 -0600 Subject: [PATCH 168/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/go-merge/Gemfile.lock | 30 +- gems/ruby-merge/.rubocop_gradual.lock | 390 ++++++++++++++++++ gems/ruby-merge/Gemfile.lock | 30 +- .../spec/fixtures_integration_spec.rb | 4 +- gems/ruby-merge/spec/nocov_node_base_spec.rb | 2 +- .../ruby-merge/spec/signature_support_spec.rb | 4 +- gems/toml-merge/Gemfile.lock | 353 +--------------- 7 files changed, 435 insertions(+), 378 deletions(-) create mode 100644 gems/ruby-merge/.rubocop_gradual.lock diff --git a/gems/go-merge/Gemfile.lock b/gems/go-merge/Gemfile.lock index 87487fbe5..088a2e56c 100644 --- a/gems/go-merge/Gemfile.lock +++ b/gems/go-merge/Gemfile.lock @@ -16,24 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -45,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -335,6 +322,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,7 +373,6 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - ast-merge! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) debug (>= 1.1) @@ -411,7 +402,6 @@ DEPENDENCIES standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - tree_haver! tree_sitter_language_pack! yaml-converter (~> 0.1) yard (~> 0.9, >= 0.9.44) diff --git a/gems/ruby-merge/.rubocop_gradual.lock b/gems/ruby-merge/.rubocop_gradual.lock new file mode 100644 index 000000000..827b7fe9d --- /dev/null +++ b/gems/ruby-merge/.rubocop_gradual.lock @@ -0,0 +1,390 @@ +{ + ".simplecov:3590623278": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:2768890125": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/ruby-merge.rb:2992445753": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`ruby-merge.rb`) should use snake_case.", 5381] + ], + "lib/ruby/merge.rb:1549201317": [ + [21, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Ruby::Merge`.", 2866359175], + [21, 3, 117385, "Metrics/ModuleLength: Module has too many lines. [2664/100]", 3496752980], + [42, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3061257365], + [103, 5, 841, "Metrics/AbcSize: Assignment Branch Condition size for `parse_ruby` is too high. [<4, 16, 6> 17.55/17]", 1071201699], + [103, 5, 841, "Metrics/MethodLength: Method has too many lines. [16/10]", 1071201699], + [128, 5, 2656, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_method_move_detection` is too high. [<17, 40, 18> 47.04/17]", 3779436399], + [128, 5, 2656, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_method_move_detection` is too high. [16/7]", 3779436399], + [128, 5, 2656, "Metrics/MethodLength: Method has too many lines. [45/10]", 3779436399], + [128, 5, 2656, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_method_move_detection` is too high. [16/8]", 3779436399], + [140, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 727785047], + [153, 121, 51, "Layout/LineLength: Line is too long. [171/120]", 3259664538], + [172, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], + [175, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], + [176, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 1976354608], + [180, 5, 4374, "Metrics/AbcSize: Assignment Branch Condition size for `merge_ruby` is too high. [<31, 63, 24> 74.2/17]", 2749692967], + [180, 5, 4374, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_ruby` is too high. [21/7]", 2749692967], + [180, 5, 4374, "Metrics/MethodLength: Method has too many lines. [83/10]", 2749692967], + [180, 5, 4374, "Metrics/PerceivedComplexity: Perceived complexity for `merge_ruby` is too high. [22/8]", 2749692967], + [239, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], + [278, 5, 1312, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_delegated_child_operations` is too high. [<10, 15, 6> 19/17]", 2246428949], + [278, 5, 1312, "Metrics/MethodLength: Method has too many lines. [28/10]", 2246428949], + [324, 5, 861, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_source_owner_identity_profile` is too high. [<5, 17, 2> 17.83/17]", 4129925341], + [324, 5, 861, "Metrics/MethodLength: Method has too many lines. [20/10]", 4129925341], + [347, 5, 2064, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_source_owner_identity_matches` is too high. [<17, 31, 11> 37.03/17]", 2780319153], + [347, 5, 2064, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_source_owner_identity_matches` is too high. [11/7]", 2780319153], + [347, 5, 2064, "Metrics/MethodLength: Method has too many lines. [37/10]", 2780319153], + [347, 5, 2064, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_source_owner_identity_matches` is too high. [11/8]", 2780319153], + [376, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], + [379, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], + [384, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1001816794], + [390, 5, 1314, "Metrics/MethodLength: Method has too many lines. [28/10]", 4183124680], + [423, 5, 786, "Metrics/MethodLength: Method has too many lines. [24/10]", 3631640245], + [450, 5, 916, "Metrics/MethodLength: Method has too many lines. [18/10]", 631485532], + [471, 5, 662, "Metrics/MethodLength: Method has too many lines. [15/10]", 2231086183], + [490, 5, 777, "Metrics/MethodLength: Method has too many lines. [18/10]", 895030114], + [511, 5, 727, "Metrics/MethodLength: Method has too many lines. [19/10]", 776483642], + [533, 5, 861, "Metrics/MethodLength: Method has too many lines. [29/10]", 537340961], + [565, 5, 655, "Metrics/MethodLength: Method has too many lines. [16/10]", 3756601977], + [584, 5, 1592, "Metrics/MethodLength: Method has too many lines. [25/10]", 3521052904], + [608, 121, 106, "Layout/LineLength: Line is too long. [226/120]", 2104286058], + [614, 5, 777, "Metrics/MethodLength: Method has too many lines. [14/10]", 2821246515], + [631, 5, 1429, "Metrics/MethodLength: Method has too many lines. [26/10]", 244346226], + [654, 121, 124, "Layout/LineLength: Line is too long. [244/120]", 13261232], + [660, 5, 1367, "Metrics/MethodLength: Method has too many lines. [41/10]", 3883814121], + [704, 5, 750, "Metrics/MethodLength: Method has too many lines. [22/10]", 764028624], + [730, 5, 1315, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_silent_data_loss_validation_report` is too high. [<8, 14, 7> 17.58/17]", 2039399818], + [730, 5, 1315, "Metrics/MethodLength: Method has too many lines. [31/10]", 2039399818], + [765, 5, 724, "Metrics/MethodLength: Method has too many lines. [14/10]", 1741779676], + [776, 121, 67, "Layout/LineLength: Line is too long. [187/120]", 1996508131], + [782, 5, 752, "Metrics/MethodLength: Method has too many lines. [21/10]", 3870096101], + [806, 5, 1052, "Metrics/MethodLength: Method has too many lines. [32/10]", 119279638], + [841, 5, 1588, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_interstitial_comment_attachment_report` is too high. [<11, 34, 17> 39.57/17]", 4112280260], + [841, 5, 1588, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_interstitial_comment_attachment_report` is too high. [14/7]", 4112280260], + [841, 5, 1588, "Metrics/MethodLength: Method has too many lines. [30/10]", 4112280260], + [841, 5, 1588, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_interstitial_comment_attachment_report` is too high. [15/8]", 4112280260], + [855, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 180543822], + [883, 5, 536, "Metrics/MethodLength: Method has too many lines. [13/10]", 245509059], + [899, 5, 2252, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_rename_detection` is too high. [<14, 32, 11> 36.62/17]", 2574664763], + [899, 5, 2252, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_rename_detection` is too high. [10/7]", 2574664763], + [899, 5, 2252, "Metrics/MethodLength: Method has too many lines. [46/10]", 2574664763], + [899, 5, 2252, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_rename_detection` is too high. [11/8]", 2574664763], + [942, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 4074688513], + [948, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], + [952, 5, 2254, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_rename_plus_edit_conflicts` is too high. [<15, 30, 13> 35.97/17]", 3664513828], + [952, 5, 2254, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_rename_plus_edit_conflicts` is too high. [10/7]", 3664513828], + [952, 5, 2254, "Metrics/MethodLength: Method has too many lines. [45/10]", 3664513828], + [952, 5, 2254, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_rename_plus_edit_conflicts` is too high. [11/8]", 3664513828], + [1004, 5, 1926, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_cross_container_method_move_detection` is too high. [<8, 18, 7> 20.9/17]", 1401333972], + [1004, 5, 1926, "Metrics/MethodLength: Method has too many lines. [44/10]", 1401333972], + [1047, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3474944396], + [1054, 5, 1488, "Metrics/AbcSize: Assignment Branch Condition size for `apply_ruby_delegated_child_outputs` is too high. [<16, 39, 12> 43.83/17]", 842348215], + [1054, 5, 1488, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_ruby_delegated_child_outputs` is too high. [12/7]", 842348215], + [1054, 5, 1488, "Metrics/MethodLength: Method has too many lines. [27/10]", 842348215], + [1054, 5, 1488, "Metrics/PerceivedComplexity: Perceived complexity for `apply_ruby_delegated_child_outputs` is too high. [13/8]", 842348215], + [1088, 5, 980, "Metrics/MethodLength: Method has too many lines. [23/10]", 1425119613], + [1115, 5, 1025, "Metrics/MethodLength: Method has too many lines. [23/10]", 2179557432], + [1143, 5, 757, "Metrics/MethodLength: Method has too many lines. [12/10]", 3975431355], + [1148, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 1956194284], + [1160, 5, 745, "Metrics/MethodLength: Method has too many lines. [12/10]", 1051086033], + [1165, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1636990749], + [1177, 5, 670, "Metrics/MethodLength: Method has too many lines. [11/10]", 3552666292], + [1182, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 3013228499], + [1193, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 1356230953], + [1198, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 3013228499], + [1209, 5, 2093, "Metrics/AbcSize: Assignment Branch Condition size for `analyze_ruby_document` is too high. [<21, 31, 12> 39.32/17]", 3298966582], + [1209, 5, 2093, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `analyze_ruby_document` is too high. [13/7]", 3298966582], + [1209, 5, 2093, "Metrics/MethodLength: Method has too many lines. [53/10]", 3298966582], + [1209, 5, 2093, "Metrics/PerceivedComplexity: Perceived complexity for `analyze_ruby_document` is too high. [13/8]", 3298966582], + [1215, 7, 1035, "Metrics/BlockLength: Block has too many lines. [27/25]", 2081528636], + [1284, 5, 427, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_file_footer_text` is too high. [<5, 17, 8> 19.44/17]", 1703748308], + [1311, 5, 806, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_process_analysis_from_tree` is too high. [10/7]", 1109735749], + [1311, 5, 806, "Metrics/MethodLength: Method has too many lines. [19/10]", 1109735749], + [1361, 5, 533, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_import_item_from_begin_node` is too high. [8/7]", 582163830], + [1383, 5, 487, "Metrics/MethodLength: Method has too many lines. [12/10]", 3257507103], + [1400, 5, 583, "Metrics/MethodLength: Method has too many lines. [15/10]", 4108141408], + [1443, 5, 645, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_import_span_for` is too high. [<6, 22, 9> 24.52/17]", 1779826452], + [1443, 5, 645, "Metrics/MethodLength: Method has too many lines. [12/10]", 1779826452], + [1495, 5, 1015, "Metrics/MethodLength: Method has too many lines. [16/10]", 1317835917], + [1501, 121, 173, "Layout/LineLength: Line is too long. [293/120]", 225499532], + [1528, 5, 518, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_tslp_claimed_line_indexes` is too high. [<6, 19, 5> 20.54/17]", 1455439838], + [1551, 5, 443, "Metrics/MethodLength: Method has too many lines. [12/10]", 4230588206], + [1568, 5, 363, "Metrics/MethodLength: Method has too many lines. [11/10]", 3068065572], + [1629, 5, 1849, "Metrics/AbcSize: Assignment Branch Condition size for `legacy_collect_ruby_declaration_entries` is too high. [<24, 26, 13> 37.7/17]", 3187770326], + [1629, 5, 1849, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `legacy_collect_ruby_declaration_entries` is too high. [11/7]", 3187770326], + [1629, 5, 1849, "Metrics/MethodLength: Method has too many lines. [54/10]", 3187770326], + [1629, 5, 1849, "Metrics/PerceivedComplexity: Perceived complexity for `legacy_collect_ruby_declaration_entries` is too high. [11/8]", 3187770326], + [1676, 13, 76, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 1356567820], + [1712, 5, 396, "Metrics/MethodLength: Method has too many lines. [11/10]", 1239008881], + [1727, 5, 681, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_process_declaration_entries` is too high. [<7, 17, 2> 18.49/17]", 2675999354], + [1727, 5, 681, "Metrics/MethodLength: Method has too many lines. [16/10]", 2675999354], + [1747, 5, 634, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_top_level_process_structure_items` is too high. [<5, 32, 14> 35.28/17]", 1120707166], + [1747, 5, 634, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_top_level_process_structure_items` is too high. [11/7]", 1120707166], + [1747, 5, 634, "Metrics/MethodLength: Method has too many lines. [11/10]", 1120707166], + [1747, 5, 634, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_top_level_process_structure_items` is too high. [11/8]", 1120707166], + [1759, 7, 11, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 848344986], + [1766, 7, 9, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 3648222389], + [1811, 5, 1284, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_intra_owner_merge_plan` is too high. [<8, 24, 9> 26.85/17]", 2388567699], + [1811, 5, 1284, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_intra_owner_merge_plan` is too high. [9/7]", 2388567699], + [1811, 5, 1284, "Metrics/MethodLength: Method has too many lines. [22/10]", 2388567699], + [1811, 5, 1284, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_intra_owner_merge_plan` is too high. [9/8]", 2388567699], + [1852, 5, 557, "Metrics/MethodLength: Method has too many lines. [11/10]", 3178341030], + [1910, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 895013151], + [1915, 5, 593, "Metrics/MethodLength: Method has too many lines. [13/10]", 2850316611], + [1916, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177625], + [1933, 5, 609, "Metrics/MethodLength: Method has too many lines. [12/10]", 784855730], + [1948, 5, 695, "Metrics/MethodLength: Method has too many lines. [14/10]", 3942458504], + [1985, 5, 1114, "Metrics/AbcSize: Assignment Branch Condition size for `merge_declaration_hash_constants` is too high. [<11, 22, 6> 25.32/17]", 3861922947], + [1985, 5, 1114, "Metrics/MethodLength: Method has too many lines. [17/10]", 3861922947], + [2007, 5, 794, "Metrics/AbcSize: Assignment Branch Condition size for `merge_declaration_body_constants` is too high. [<9, 14, 6> 17.69/17]", 1882117166], + [2037, 5, 1138, "Metrics/AbcSize: Assignment Branch Condition size for `merge_array_constant_text` is too high. [<9, 18, 7> 21.31/17]", 1448081799], + [2037, 5, 1138, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_array_constant_text` is too high. [8/7]", 1448081799], + [2037, 5, 1138, "Metrics/MethodLength: Method has too many lines. [15/10]", 1448081799], + [2043, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193434112], + [2050, 7, 8, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 359846632], + [2057, 5, 774, "Metrics/AbcSize: Assignment Branch Condition size for `merge_percent_array_constant_text` is too high. [<8, 16, 7> 19.21/17]", 625509828], + [2057, 5, 774, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_percent_array_constant_text` is too high. [8/7]", 625509828], + [2086, 5, 1060, "Metrics/AbcSize: Assignment Branch Condition size for `merge_multiline_array_constant_text` is too high. [<11, 23, 10> 27.39/17]", 2672751288], + [2086, 5, 1060, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_multiline_array_constant_text` is too high. [11/7]", 2672751288], + [2086, 5, 1060, "Metrics/MethodLength: Method has too many lines. [13/10]", 2672751288], + [2086, 5, 1060, "Metrics/PerceivedComplexity: Perceived complexity for `merge_multiline_array_constant_text` is too high. [11/8]", 2672751288], + [2095, 7, 8, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 359846632], + [2104, 5, 1605, "Metrics/AbcSize: Assignment Branch Condition size for `merge_declaration_body_methods` is too high. [<21, 28, 15> 38.08/17]", 2740924329], + [2104, 5, 1605, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_declaration_body_methods` is too high. [14/7]", 2740924329], + [2104, 5, 1605, "Metrics/MethodLength: Method has too many lines. [29/10]", 2740924329], + [2104, 5, 1605, "Metrics/PerceivedComplexity: Perceived complexity for `merge_declaration_body_methods` is too high. [15/8]", 2740924329], + [2111, 7, 8, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 359846632], + [2138, 5, 1076, "Metrics/AbcSize: Assignment Branch Condition size for `merge_nested_body_declarations` is too high. [<14, 24, 10> 29.53/17]", 1397199527], + [2138, 5, 1076, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_nested_body_declarations` is too high. [11/7]", 1397199527], + [2138, 5, 1076, "Metrics/MethodLength: Method has too many lines. [14/10]", 1397199527], + [2138, 5, 1076, "Metrics/PerceivedComplexity: Perceived complexity for `merge_nested_body_declarations` is too high. [11/8]", 1397199527], + [2177, 5, 2549, "Metrics/AbcSize: Assignment Branch Condition size for `top_level_source_region_owners` is too high. [<24, 33, 13> 42.83/17]", 1909271685], + [2177, 5, 2549, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `top_level_source_region_owners` is too high. [11/7]", 1909271685], + [2177, 5, 2549, "Metrics/MethodLength: Method has too many lines. [64/10]", 1909271685], + [2177, 5, 2549, "Metrics/PerceivedComplexity: Perceived complexity for `top_level_source_region_owners` is too high. [11/8]", 1909271685], + [2220, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861626], + [2235, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1695648499], + [2251, 5, 2126, "Metrics/AbcSize: Assignment Branch Condition size for `container_child_source_regions` is too high. [<23, 28, 11> 37.87/17]", 4031983731], + [2251, 5, 2126, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `container_child_source_regions` is too high. [10/7]", 4031983731], + [2251, 5, 2126, "Metrics/MethodLength: Method has too many lines. [56/10]", 4031983731], + [2251, 5, 2126, "Metrics/PerceivedComplexity: Perceived complexity for `container_child_source_regions` is too high. [10/8]", 4031983731], + [2317, 5, 996, "Metrics/AbcSize: Assignment Branch Condition size for `interleave_source_regions` is too high. [<8, 14, 6> 17.2/17]", 796443872], + [2317, 5, 996, "Metrics/MethodLength: Method has too many lines. [30/10]", 796443872], + [2355, 5, 1323, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `source_interstitial_region` is too high. [13/7]", 1970451685], + [2355, 5, 1323, "Metrics/MethodLength: Method has too many lines. [30/10]", 1970451685], + [2355, 5, 1323, "Metrics/PerceivedComplexity: Perceived complexity for `source_interstitial_region` is too high. [12/8]", 1970451685], + [2355, 35, 80, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2143999554], + [2390, 5, 396, "Metrics/MethodLength: Method has too many lines. [12/10]", 663734283], + [2406, 5, 890, "Metrics/AbcSize: Assignment Branch Condition size for `collect_blank_line_regions` is too high. [<4, 18, 7> 19.72/17]", 3362926457], + [2406, 5, 890, "Metrics/MethodLength: Method has too many lines. [20/10]", 3362926457], + [2465, 5, 30, "Style/Documentation: Missing top-level documentation comment for `class Ruby::Merge::RubyHashLiteralProjector`.", 2586933062], + [2465, 5, 5733, "Metrics/ClassLength: Class has too many lines. [144/100]", 48390292], + [2498, 7, 617, "Metrics/MethodLength: Method has too many lines. [15/10]", 1617225783], + [2522, 7, 943, "Metrics/AbcSize: Assignment Branch Condition size for `project_hash_key` is too high. [<1, 18, 8> 19.72/17]", 3538404248], + [2522, 7, 943, "Metrics/MethodLength: Method has too many lines. [26/10]", 3538404248], + [2580, 7, 616, "Metrics/AbcSize: Assignment Branch Condition size for `trailing_comma?` is too high. [<3, 20, 6> 21.1/17]", 1517912413], + [2645, 5, 1202, "Metrics/AbcSize: Assignment Branch Condition size for `constant_hash_blocks` is too high. [<19, 25, 6> 31.97/17]", 399214756], + [2645, 5, 1202, "Metrics/MethodLength: Method has too many lines. [36/10]", 399214756], + [2686, 5, 727, "Metrics/AbcSize: Assignment Branch Condition size for `hash_assignment_finish_line` is too high. [<11, 7, 12> 17.72/17]", 1215874404], + [2686, 5, 727, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `hash_assignment_finish_line` is too high. [9/7]", 1215874404], + [2686, 5, 727, "Metrics/MethodLength: Method has too many lines. [26/10]", 1215874404], + [2686, 5, 727, "Metrics/PerceivedComplexity: Perceived complexity for `hash_assignment_finish_line` is too high. [11/8]", 1215874404], + [2716, 5, 2007, "Metrics/AbcSize: Assignment Branch Condition size for `direct_body_method_entries` is too high. [<28, 33, 13> 45.19/17]", 2589282610], + [2716, 5, 2007, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `direct_body_method_entries` is too high. [12/7]", 2589282610], + [2716, 5, 2007, "Metrics/MethodLength: Method has too many lines. [56/10]", 2589282610], + [2716, 5, 2007, "Metrics/PerceivedComplexity: Perceived complexity for `direct_body_method_entries` is too high. [12/8]", 2589282610], + [2781, 5, 1221, "Metrics/AbcSize: Assignment Branch Condition size for `direct_body_constant_entries` is too high. [<16, 34, 10> 38.88/17]", 1588885504], + [2781, 5, 1221, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `direct_body_constant_entries` is too high. [9/7]", 1588885504], + [2781, 5, 1221, "Metrics/MethodLength: Method has too many lines. [35/10]", 1588885504], + [2781, 5, 1221, "Metrics/PerceivedComplexity: Perceived complexity for `direct_body_constant_entries` is too high. [9/8]", 1588885504], + [2824, 5, 708, "Metrics/AbcSize: Assignment Branch Condition size for `split_ruby_array_elements` is too high. [<11, 12, 11> 19.65/17]", 1344003748], + [2824, 5, 708, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split_ruby_array_elements` is too high. [9/7]", 1344003748], + [2824, 5, 708, "Metrics/MethodLength: Method has too many lines. [24/10]", 1344003748], + [2824, 5, 708, "Metrics/PerceivedComplexity: Perceived complexity for `split_ruby_array_elements` is too high. [11/8]", 1344003748], + [2868, 5, 977, "Metrics/AbcSize: Assignment Branch Condition size for `append_multiline_array_elements` is too high. [<12, 32, 9> 35.34/17]", 1316332112], + [2868, 5, 977, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `append_multiline_array_elements` is too high. [9/7]", 1316332112], + [2868, 5, 977, "Metrics/MethodLength: Method has too many lines. [16/10]", 1316332112], + [2868, 5, 977, "Metrics/PerceivedComplexity: Perceived complexity for `append_multiline_array_elements` is too high. [9/8]", 1316332112], + [2896, 5, 728, "Metrics/AbcSize: Assignment Branch Condition size for `array_assignment_finish_line` is too high. [<11, 7, 12> 17.72/17]", 1471354607], + [2896, 5, 728, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `array_assignment_finish_line` is too high. [9/7]", 1471354607], + [2896, 5, 728, "Metrics/MethodLength: Method has too many lines. [26/10]", 1471354607], + [2896, 5, 728, "Metrics/PerceivedComplexity: Perceived complexity for `array_assignment_finish_line` is too high. [11/8]", 1471354607], + [2932, 5, 1127, "Metrics/AbcSize: Assignment Branch Condition size for `direct_body_declaration_entries` is too high. [<14, 30, 7> 33.84/17]", 1223661118], + [2932, 5, 1127, "Metrics/MethodLength: Method has too many lines. [30/10]", 1223661118], + [2979, 5, 984, "Metrics/AbcSize: Assignment Branch Condition size for `insert_declaration_body_blocks` is too high. [<4, 23, 12> 26.25/17]", 159690081], + [2979, 5, 984, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `insert_declaration_body_blocks` is too high. [9/7]", 159690081], + [2979, 5, 984, "Metrics/MethodLength: Method has too many lines. [16/10]", 159690081], + [2979, 5, 984, "Metrics/PerceivedComplexity: Perceived complexity for `insert_declaration_body_blocks` is too high. [10/8]", 159690081], + [3024, 5, 1027, "Metrics/AbcSize: Assignment Branch Condition size for `merge_ruby_hash_literals` is too high. [<8, 30, 9> 32.33/17]", 2793745298], + [3024, 5, 1027, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_ruby_hash_literals` is too high. [9/7]", 2793745298], + [3024, 5, 1027, "Metrics/MethodLength: Method has too many lines. [19/10]", 2793745298], + [3024, 5, 1027, "Metrics/PerceivedComplexity: Perceived complexity for `merge_ruby_hash_literals` is too high. [10/8]", 2793745298], + [3046, 5, 636, "Metrics/AbcSize: Assignment Branch Condition size for `render_ruby_hash_literal` is too high. [<5, 19, 6> 20.54/17]", 1834383244], + [3086, 5, 491, "Metrics/MethodLength: Method has too many lines. [11/10]", 1799924605], + [3119, 5, 1125, "Metrics/AbcSize: Assignment Branch Condition size for `surfaces_for_owner` is too high. [<6, 19, 3> 20.15/17]", 4036098594], + [3119, 5, 1125, "Metrics/MethodLength: Method has too many lines. [20/10]", 4036098594], + [3144, 5, 1126, "Metrics/AbcSize: Assignment Branch Condition size for `example_surfaces_for` is too high. [<4, 20, 2> 20.49/17]", 757808110], + [3144, 5, 1126, "Metrics/MethodLength: Method has too many lines. [21/10]", 757808110] + ], + "lib/ruby/merge/block_directive_detector.rb:315354690": [ + [10, 5, 6220, "Metrics/ClassLength: Class has too many lines. [161/100]", 3182117306], + [83, 7, 1085, "Metrics/AbcSize: Assignment Branch Condition size for `detect_freeze_spans` is too high. [<10, 18, 6> 21.45/17]", 3827147306], + [83, 7, 1085, "Metrics/MethodLength: Method has too many lines. [27/10]", 3827147306], + [117, 7, 1508, "Metrics/AbcSize: Assignment Branch Condition size for `detect_nocov_spans` is too high. [<10, 30, 10> 33.17/17]", 3750116369], + [117, 7, 1508, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_nocov_spans` is too high. [9/7]", 3750116369], + [117, 7, 1508, "Metrics/MethodLength: Method has too many lines. [40/10]", 3750116369], + [117, 7, 1508, "Metrics/PerceivedComplexity: Perceived complexity for `detect_nocov_spans` is too high. [12/8]", 3750116369], + [125, 9, 1189, "Metrics/BlockLength: Block has too many lines. [30/25]", 431470454], + [165, 7, 921, "Metrics/AbcSize: Assignment Branch Condition size for `validate_no_crossing` is too high. [<8, 16, 8> 19.6/17]", 1072352384], + [165, 7, 921, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_no_crossing` is too high. [8/7]", 1072352384], + [165, 7, 921, "Metrics/MethodLength: Method has too many lines. [19/10]", 1072352384], + [193, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193343749], + [194, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860841] + ], + "lib/ruby/merge/doc_comment_support.rb:11585367": [ + [71, 7, 950, "Metrics/AbcSize: Assignment Branch Condition size for `example_blocks` is too high. [<8, 17, 8> 20.42/17]", 878231540], + [71, 7, 950, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `example_blocks` is too high. [8/7]", 878231540], + [71, 7, 950, "Metrics/MethodLength: Method has too many lines. [19/10]", 878231540] + ], + "lib/ruby/merge/gemspec_support.rb:672395758": [ + [5, 5, 21, "Style/Documentation: Missing top-level documentation comment for `module Ruby::Merge::GemspecSupport`.", 593910650] + ], + "lib/ruby/merge/magic_comment_support.rb:2193186223": [ + [26, 7, 1484, "Metrics/AbcSize: Assignment Branch Condition size for `comment_only_prefix_info` is too high. [<9, 38, 8> 39.86/17]", 1098666313], + [26, 7, 1484, "Metrics/MethodLength: Method has too many lines. [33/10]", 1098666313], + [69, 7, 693, "Metrics/AbcSize: Assignment Branch Condition size for `header_magic_comment_types_for_lines` is too high. [<10, 13, 9> 18.71/17]", 3693768719], + [69, 7, 693, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `header_magic_comment_types_for_lines` is too high. [8/7]", 3693768719], + [69, 7, 693, "Metrics/MethodLength: Method has too many lines. [16/10]", 3693768719], + [93, 7, 747, "Metrics/AbcSize: Assignment Branch Condition size for `prefix_comment_line_numbers_for_comments` is too high. [<10, 12, 7> 17.12/17]", 1181507516], + [93, 7, 747, "Metrics/MethodLength: Method has too many lines. [19/10]", 1181507516] + ], + "lib/ruby/merge/method_similarity.rb:3120642740": [ + [5, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ruby::Merge::MethodSimilarity`.", 3784960433], + [23, 7, 493, "Metrics/AbcSize: Assignment Branch Condition size for `param_similarity` is too high. [<4, 19, 4> 19.82/17]", 1175888813], + [45, 7, 738, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<13, 29, 8> 32.77/17]", 1085087702], + [45, 7, 738, "Metrics/MethodLength: Method has too many lines. [20/10]", 1085087702] + ], + "lib/ruby/merge/nocov_node_base.rb:1713613866": [ + [23, 21, 84, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3439911158], + [51, 7, 353, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `signature` is too high. [8/7]", 3442013923], + [51, 7, 353, "Metrics/PerceivedComplexity: Perceived complexity for `signature` is too high. [9/8]", 3442013923] + ], + "lib/ruby/merge/rescue_semantics.rb:2728370094": [ + [5, 5, 21, "Style/Documentation: Missing top-level documentation comment for `class Ruby::Merge::RescueSemantics`.", 4002082661], + [5, 5, 8140, "Metrics/ClassLength: Class has too many lines. [157/100]", 3302970297], + [10, 7, 812, "Metrics/AbcSize: Assignment Branch Condition size for `merge_ordered_clause_types` is too high. [<9, 17, 8> 20.83/17]", 391537814], + [10, 7, 812, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_ordered_clause_types` is too high. [8/7]", 391537814], + [10, 7, 812, "Metrics/MethodLength: Method has too many lines. [16/10]", 391537814], + [10, 7, 812, "Metrics/PerceivedComplexity: Perceived complexity for `merge_ordered_clause_types` is too high. [9/8]", 391537814], + [33, 7, 1470, "Metrics/AbcSize: Assignment Branch Condition size for `canonicalize_rescue_clause_order` is too high. [<18, 28, 14> 36.11/17]", 570708009], + [33, 7, 1470, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonicalize_rescue_clause_order` is too high. [14/7]", 570708009], + [33, 7, 1470, "Metrics/MethodLength: Method has too many lines. [24/10]", 570708009], + [33, 7, 1470, "Metrics/PerceivedComplexity: Perceived complexity for `canonicalize_rescue_clause_order` is too high. [14/8]", 570708009], + [113, 7, 1080, "Metrics/AbcSize: Assignment Branch Condition size for `source_defined_exception_hierarchy` is too high. [<9, 20, 10> 24.1/17]", 3196945148], + [113, 7, 1080, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `source_defined_exception_hierarchy` is too high. [10/7]", 3196945148], + [113, 7, 1080, "Metrics/MethodLength: Method has too many lines. [15/10]", 3196945148], + [113, 7, 1080, "Metrics/PerceivedComplexity: Perceived complexity for `source_defined_exception_hierarchy` is too high. [11/8]", 3196945148], + [126, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1806710570] + ], + "lib/ruby/merge/scaffold_chunk_support.rb:640658628": [ + [5, 5, 27, "Style/Documentation: Missing top-level documentation comment for `module Ruby::Merge::ScaffoldChunkSupport`.", 2416541725] + ], + "lib/ruby/merge/signature_support.rb:1167161535": [ + [5, 5, 23, "Style/Documentation: Missing top-level documentation comment for `module Ruby::Merge::SignatureSupport`.", 2080470772] + ], + "ruby-merge.gemspec:503862341": [ + [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ], + "spec/fixtures_integration_spec.rb:2791875397": [ + [7, 1, 71426, "Metrics/BlockLength: Block has too many lines. [1643/25]", 1328376978], + [8, 3, 94, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 4224869601], + [9, 3, 80, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3493759864], + [10, 3, 72, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 218819604], + [11, 3, 83, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3957977039], + [125, 3, 1207, "Metrics/BlockLength: Block has too many lines. [27/25]", 2841005266], + [206, 3, 1550, "Metrics/BlockLength: Block has too many lines. [44/25]", 1381861178], + [257, 3, 1209, "Metrics/BlockLength: Block has too many lines. [33/25]", 1745132505], + [297, 3, 61330, "Metrics/BlockLength: Block has too many lines. [1387/25]", 3444780370], + [693, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859109], + [1777, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3355833611], + [1784, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 38619260] + ], + "spec/hash_literal_projector_spec.rb:2425567956": [ + [13, 41, 31, "Lint/PercentStringArray: Within `%w`/`%W`, quotes and ',' are unnecessary and may be unwanted in the resulting strings.", 3214960854] + ], + "spec/rescue_semantics_spec.rb:2518131257": [ + [5, 1, 2150, "Metrics/BlockLength: Block has too many lines. [59/25]", 163524539] + ] +} diff --git a/gems/ruby-merge/Gemfile.lock b/gems/ruby-merge/Gemfile.lock index fb5b38919..5c643046a 100644 --- a/gems/ruby-merge/Gemfile.lock +++ b/gems/ruby-merge/Gemfile.lock @@ -16,6 +16,24 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +45,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -322,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -373,6 +381,7 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + ast-merge! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) debug (>= 1.1) @@ -402,6 +411,7 @@ DEPENDENCIES standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + tree_haver! tree_sitter_language_pack! yaml-converter (~> 0.1) yard (~> 0.9, >= 0.9.44) diff --git a/gems/ruby-merge/spec/fixtures_integration_spec.rb b/gems/ruby-merge/spec/fixtures_integration_spec.rb index b06d87a3c..67f20b0af 100644 --- a/gems/ruby-merge/spec/fixtures_integration_spec.rb +++ b/gems/ruby-merge/spec/fixtures_integration_spec.rb @@ -186,8 +186,8 @@ module LegacyOnly result = RUBY_MERGE.merge_ruby("require \"set\"\n", "require \"json\"\n", 'ruby', merge_template_requires: true) expect(result[:ok]).to be(true) - expect(result[:output]).to include("require \"json\"") - expect(result[:output]).to include("require \"set\"") + expect(result[:output]).to include('require "json"') + expect(result[:output]).to include('require "set"') end it 'exposes missing TSLP top-level call records as an unsupported capability', diff --git a/gems/ruby-merge/spec/nocov_node_base_spec.rb b/gems/ruby-merge/spec/nocov_node_base_spec.rb index 963277822..969d76fb3 100644 --- a/gems/ruby-merge/spec/nocov_node_base_spec.rb +++ b/gems/ruby-merge/spec/nocov_node_base_spec.rb @@ -17,7 +17,7 @@ def generate_signature(node) expect(node.merge_policy).to be_nil expect(node.children).to eq([:method]) expect(node.merge_type).to eq(:nocov_block) - expect(node.signature).to eq([:node, :method]) + expect(node.signature).to eq(%i[node method]) expect(node.slice).to eq("# :nocov:\ndef skipped\nend\n# :nocov:\n") end diff --git a/gems/ruby-merge/spec/signature_support_spec.rb b/gems/ruby-merge/spec/signature_support_spec.rb index 46c022f16..5d036b103 100644 --- a/gems/ruby-merge/spec/signature_support_spec.rb +++ b/gems/ruby-merge/spec/signature_support_spec.rb @@ -18,8 +18,8 @@ end it 'builds canonical Ruby control-flow signatures' do - expect(described_class.super_call(block: false)).to eq([:super, :no_block]) - expect(described_class.forwarding_super_call(block: true)).to eq([:forwarding_super, :with_block]) + expect(described_class.super_call(block: false)).to eq(%i[super no_block]) + expect(described_class.forwarding_super_call(block: true)).to eq(%i[forwarding_super with_block]) expect(described_class.begin_block('do_work')).to eq([:begin, 'do_work']) end diff --git a/gems/toml-merge/Gemfile.lock b/gems/toml-merge/Gemfile.lock index 87531476e..1182f98db 100644 --- a/gems/toml-merge/Gemfile.lock +++ b/gems/toml-merge/Gemfile.lock @@ -16,265 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +40,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +103,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +131,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +270,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +322,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +373,22 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +397,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +430,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +442,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +469,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +480,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +507,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +518,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +531,15 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +547,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From afdd3991f0f07e2bb78305e98c04ff0137836482 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:24:59 -0600 Subject: [PATCH 169/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ruby-merge/Gemfile.lock | 327 +++++++++++++++++- gems/rust-merge/.kettle-drift.lock | 60 ++-- gems/rust-merge/.rubocop_gradual.lock | 25 +- gems/rust-merge/Gemfile | 40 +++ gems/rust-merge/Gemfile.lock | 327 +----------------- gems/rust-merge/lib/rust/merge.rb | 5 +- gems/typescript-merge/.kettle-drift.lock | 60 ++-- gems/typescript-merge/.rubocop_gradual.lock | 107 ------ gems/typescript-merge/Gemfile | 40 +++ gems/typescript-merge/Gemfile.lock | 59 ++-- gems/typescript-merge/bin/yard | 2 +- .../lib/typescript/merge/version.rb | 2 +- 12 files changed, 531 insertions(+), 523 deletions(-) delete mode 100644 gems/typescript-merge/.rubocop_gradual.lock diff --git a/gems/ruby-merge/Gemfile.lock b/gems/ruby-merge/Gemfile.lock index 5c643046a..691f91a12 100644 --- a/gems/ruby-merge/Gemfile.lock +++ b/gems/ruby-merge/Gemfile.lock @@ -17,7 +17,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -26,7 +58,193 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -34,6 +252,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -53,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -408,31 +687,52 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0.0) ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -479,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -490,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -521,6 +835,8 @@ 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -529,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -542,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/rust-merge/.kettle-drift.lock b/gems/rust-merge/.kettle-drift.lock index 628aa923c..0161251a7 100644 --- a/gems/rust-merge/.kettle-drift.lock +++ b/gems/rust-merge/.kettle-drift.lock @@ -5,7 +5,8 @@ "lines": [ 80, 120, - 160 + 160, + 200 ] } ], @@ -15,7 +16,8 @@ "lines": [ 91, 131, - 171 + 171, + 211 ] } ], @@ -25,7 +27,8 @@ "lines": [ 81, 121, - 161 + 161, + 201 ] } ], @@ -35,7 +38,8 @@ "lines": [ 93, 133, - 173 + 173, + 213 ] } ], @@ -45,7 +49,8 @@ "lines": [ 96, 136, - 176 + 176, + 216 ] } ], @@ -55,7 +60,8 @@ "lines": [ 82, 122, - 162 + 162, + 202 ] } ], @@ -66,7 +72,8 @@ 60, 100, 140, - 180 + 180, + 220 ] } ], @@ -76,7 +83,8 @@ "lines": [ 101, 141, - 181 + 181, + 221 ] } ], @@ -87,7 +95,8 @@ 43, 87, 127, - 167 + 167, + 207 ] } ], @@ -97,7 +106,8 @@ "lines": [ 110, 150, - 190 + 190, + 230 ] } ], @@ -108,7 +118,8 @@ 35, 79, 119, - 159 + 159, + 199 ] } ], @@ -119,7 +130,8 @@ 69, 109, 149, - 189 + 189, + 229 ] } ], @@ -129,7 +141,8 @@ "lines": [ 85, 125, - 165 + 165, + 205 ] } ], @@ -140,7 +153,8 @@ 48, 92, 132, - 172 + 172, + 212 ] } ], @@ -151,7 +165,8 @@ 44, 88, 128, - 168 + 168, + 208 ] } ], @@ -161,7 +176,8 @@ "lines": [ 86, 126, - 166 + 166, + 206 ] } ], @@ -171,7 +187,8 @@ "lines": [ 103, 143, - 183 + 183, + 223 ] } ], @@ -181,7 +198,8 @@ "lines": [ 102, 142, - 182 + 182, + 222 ] } ], @@ -191,7 +209,8 @@ "lines": [ 97, 137, - 177 + 177, + 217 ] } ], @@ -201,7 +220,8 @@ "lines": [ 106, 146, - 186 + 186, + 226 ] } ], diff --git a/gems/rust-merge/.rubocop_gradual.lock b/gems/rust-merge/.rubocop_gradual.lock index 946501b02..901628f74 100644 --- a/gems/rust-merge/.rubocop_gradual.lock +++ b/gems/rust-merge/.rubocop_gradual.lock @@ -76,22 +76,17 @@ "lib/rust-merge.rb:3264986437": [ [1, 1, 0, "Naming/FileName: The name of this source file (`rust-merge.rb`) should use snake_case.", 5381] ], - "lib/rust/merge.rb:2035906460": [ + "lib/rust/merge.rb:4179218653": [ [10, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Rust::Merge`.", 2866359175], - [10, 3, 5517, "Metrics/ModuleLength: Module has too many lines. [111/100]", 1654067060], - [56, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1494061343], - [63, 5, 1405, "Metrics/AbcSize: Assignment Branch Condition size for `merge_rust` is too high. [<13, 32, 11> 36.25/17]", 3235979822], - [63, 5, 1405, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_rust` is too high. [11/7]", 3235979822], - [63, 5, 1405, "Metrics/MethodLength: Method has too many lines. [22/10]", 3235979822], - [63, 5, 1405, "Metrics/PerceivedComplexity: Perceived complexity for `merge_rust` is too high. [11/8]", 3235979822], - [82, 34, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], - [90, 5, 1669, "Metrics/AbcSize: Assignment Branch Condition size for `analyze_rust_module` is too high. [<11, 34, 8> 36.62/17]", 284573767], - [90, 5, 1669, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `analyze_rust_module` is too high. [9/7]", 284573767], - [90, 5, 1669, "Metrics/MethodLength: Method has too many lines. [30/10]", 284573767], - [90, 5, 1669, "Metrics/PerceivedComplexity: Perceived complexity for `analyze_rust_module` is too high. [9/8]", 284573767], - [103, 50, 20, "Style/SymbolProc: Pass `&:name` as an argument to `select` instead of a block.", 2833012298], - [107, 7, 3, "Layout/BlockAlignment: `end` at 107, 6 is not aligned with `processed[:analysis].structure` at 102, 21 or `.map do |item|` at 104, 41.", 193405706], - [107, 7, 53, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 1601274288] + [10, 3, 7083, "Metrics/ModuleLength: Module has too many lines. [169/100]", 3787459528], + [68, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1494061343], + [75, 5, 1405, "Metrics/AbcSize: Assignment Branch Condition size for `merge_rust` is too high. [<13, 32, 11> 36.25/17]", 3235979822], + [75, 5, 1405, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_rust` is too high. [11/7]", 3235979822], + [75, 5, 1405, "Metrics/MethodLength: Method has too many lines. [22/10]", 3235979822], + [75, 5, 1405, "Metrics/PerceivedComplexity: Perceived complexity for `merge_rust` is too high. [11/8]", 3235979822], + [94, 34, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], + [102, 5, 1442, "Metrics/AbcSize: Assignment Branch Condition size for `analyze_rust_module` is too high. [<8, 19, 5> 21.21/17]", 1212922264], + [102, 5, 1442, "Metrics/MethodLength: Method has too many lines. [41/10]", 1212922264] ], "rust-merge.gemspec:2965445534": [ [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], diff --git a/gems/rust-merge/Gemfile b/gems/rust-merge/Gemfile index e372af090..7ede34a4f 100644 --- a/gems/rust-merge/Gemfile +++ b/gems/rust-merge/Gemfile @@ -192,6 +192,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/rust-merge/Gemfile.lock b/gems/rust-merge/Gemfile.lock index 53081f8da..6bc7926d0 100644 --- a/gems/rust-merge/Gemfile.lock +++ b/gems/rust-merge/Gemfile.lock @@ -17,39 +17,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -58,193 +26,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -252,29 +34,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -294,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +116,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +283,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +381,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +406,33 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +440,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +452,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +479,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +490,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +517,10 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +529,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +542,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +557,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/rust-merge/lib/rust/merge.rb b/gems/rust-merge/lib/rust/merge.rb index a20cc1af2..b95093c73 100644 --- a/gems/rust-merge/lib/rust/merge.rb +++ b/gems/rust-merge/lib/rust/merge.rb @@ -149,7 +149,10 @@ def analyze_rust_module(source) def collect_parse_errors(node) raise TreeHaver::NotAvailable, 'Rust parse returned no root node' unless node - raise TreeHaver::NotAvailable, 'Rust parse contains syntax errors' if node.respond_to?(:has_error?) && node.has_error? + return unless node.respond_to?(:has_error?) && node.has_error? + + raise TreeHaver::NotAvailable, + 'Rust parse contains syntax errors' end private_class_method :collect_parse_errors diff --git a/gems/typescript-merge/.kettle-drift.lock b/gems/typescript-merge/.kettle-drift.lock index 628aa923c..0161251a7 100644 --- a/gems/typescript-merge/.kettle-drift.lock +++ b/gems/typescript-merge/.kettle-drift.lock @@ -5,7 +5,8 @@ "lines": [ 80, 120, - 160 + 160, + 200 ] } ], @@ -15,7 +16,8 @@ "lines": [ 91, 131, - 171 + 171, + 211 ] } ], @@ -25,7 +27,8 @@ "lines": [ 81, 121, - 161 + 161, + 201 ] } ], @@ -35,7 +38,8 @@ "lines": [ 93, 133, - 173 + 173, + 213 ] } ], @@ -45,7 +49,8 @@ "lines": [ 96, 136, - 176 + 176, + 216 ] } ], @@ -55,7 +60,8 @@ "lines": [ 82, 122, - 162 + 162, + 202 ] } ], @@ -66,7 +72,8 @@ 60, 100, 140, - 180 + 180, + 220 ] } ], @@ -76,7 +83,8 @@ "lines": [ 101, 141, - 181 + 181, + 221 ] } ], @@ -87,7 +95,8 @@ 43, 87, 127, - 167 + 167, + 207 ] } ], @@ -97,7 +106,8 @@ "lines": [ 110, 150, - 190 + 190, + 230 ] } ], @@ -108,7 +118,8 @@ 35, 79, 119, - 159 + 159, + 199 ] } ], @@ -119,7 +130,8 @@ 69, 109, 149, - 189 + 189, + 229 ] } ], @@ -129,7 +141,8 @@ "lines": [ 85, 125, - 165 + 165, + 205 ] } ], @@ -140,7 +153,8 @@ 48, 92, 132, - 172 + 172, + 212 ] } ], @@ -151,7 +165,8 @@ 44, 88, 128, - 168 + 168, + 208 ] } ], @@ -161,7 +176,8 @@ "lines": [ 86, 126, - 166 + 166, + 206 ] } ], @@ -171,7 +187,8 @@ "lines": [ 103, 143, - 183 + 183, + 223 ] } ], @@ -181,7 +198,8 @@ "lines": [ 102, 142, - 182 + 182, + 222 ] } ], @@ -191,7 +209,8 @@ "lines": [ 97, 137, - 177 + 177, + 217 ] } ], @@ -201,7 +220,8 @@ "lines": [ 106, 146, - 186 + 186, + 226 ] } ], diff --git a/gems/typescript-merge/.rubocop_gradual.lock b/gems/typescript-merge/.rubocop_gradual.lock deleted file mode 100644 index 7aa08206d..000000000 --- a/gems/typescript-merge/.rubocop_gradual.lock +++ /dev/null @@ -1,107 +0,0 @@ -{ - ".simplecov:239823694": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:845460973": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/typescript-merge.rb:4058528402": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`typescript-merge.rb`) should use snake_case.", 5381] - ], - "lib/typescript/merge.rb:4009690741": [ - [10, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module TypeScript::Merge`.", 2866359175], - [10, 3, 6018, "Metrics/ModuleLength: Module has too many lines. [124/100]", 3011109954], - [11, 5, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631], - [60, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 3724408137], - [67, 5, 1427, "Metrics/AbcSize: Assignment Branch Condition size for `merge_type_script` is too high. [<13, 32, 11> 36.25/17]", 626793766], - [67, 5, 1427, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_type_script` is too high. [11/7]", 626793766], - [67, 5, 1427, "Metrics/MethodLength: Method has too many lines. [22/10]", 626793766], - [67, 5, 1427, "Metrics/PerceivedComplexity: Perceived complexity for `merge_type_script` is too high. [11/8]", 626793766], - [86, 34, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], - [95, 5, 1753, "Metrics/AbcSize: Assignment Branch Condition size for `analyze_type_script_module` is too high. [<11, 33, 8> 35.69/17]", 4006594753], - [95, 5, 1753, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `analyze_type_script_module` is too high. [9/7]", 4006594753], - [95, 5, 1753, "Metrics/MethodLength: Method has too many lines. [30/10]", 4006594753], - [95, 5, 1753, "Metrics/PerceivedComplexity: Perceived complexity for `analyze_type_script_module` is too high. [9/8]", 4006594753], - [108, 50, 20, "Style/SymbolProc: Pass `&:name` as an argument to `select` instead of a block.", 2833012298], - [112, 7, 3, "Layout/BlockAlignment: `end` at 112, 6 is not aligned with `processed[:analysis].structure` at 107, 21 or `.map do |item|` at 109, 41.", 193405706], - [112, 7, 53, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 1601274288] - ], - "spec/fixtures_integration_spec.rb:2894274721": [ - [3, 1, 5091, "Metrics/BlockLength: Block has too many lines. [67/25]", 332568190], - [8, 3, 4826, "Metrics/BlockLength: Block has too many lines. [62/25]", 3720035714] - ], - "typescript-merge.gemspec:2469503934": [ - [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ] -} diff --git a/gems/typescript-merge/Gemfile b/gems/typescript-merge/Gemfile index a9502283a..e15702a35 100644 --- a/gems/typescript-merge/Gemfile +++ b/gems/typescript-merge/Gemfile @@ -192,6 +192,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/typescript-merge/Gemfile.lock b/gems/typescript-merge/Gemfile.lock index 776990eb1..a6a6dfed3 100644 --- a/gems/typescript-merge/Gemfile.lock +++ b/gems/typescript-merge/Gemfile.lock @@ -275,6 +275,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -308,7 +324,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -363,18 +378,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -538,22 +542,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -659,9 +659,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -739,7 +739,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -760,10 +759,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -838,13 +837,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/typescript-merge/bin/yard b/gems/typescript-merge/bin/yard index 5d516ad6f..a7e8b6eed 100755 --- a/gems/typescript-merge/bin/yard +++ b/gems/typescript-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec('bundle', 'exec', 'rake', 'yard') +exec("bundle", "exec", "rake", "yard") diff --git a/gems/typescript-merge/lib/typescript/merge/version.rb b/gems/typescript-merge/lib/typescript/merge/version.rb index 770779ac0..954f44d95 100644 --- a/gems/typescript-merge/lib/typescript/merge/version.rb +++ b/gems/typescript-merge/lib/typescript/merge/version.rb @@ -3,7 +3,7 @@ module TypeScript module Merge module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end From 7cf35db77f1ac29dd02f721a8ca004a923948384 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:25:04 -0600 Subject: [PATCH 170/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/rust-merge/Gemfile.lock | 327 ++++++++++++++- gems/typescript-merge/.rubocop_gradual.lock | 102 +++++ gems/typescript-merge/Gemfile.lock | 378 ++---------------- gems/typescript-merge/bin/yard | 2 +- gems/typescript-merge/lib/typescript/merge.rb | 5 +- .../lib/typescript/merge/version.rb | 2 +- 6 files changed, 462 insertions(+), 354 deletions(-) create mode 100644 gems/typescript-merge/.rubocop_gradual.lock diff --git a/gems/rust-merge/Gemfile.lock b/gems/rust-merge/Gemfile.lock index 6bc7926d0..53081f8da 100644 --- a/gems/rust-merge/Gemfile.lock +++ b/gems/rust-merge/Gemfile.lock @@ -17,7 +17,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -26,7 +58,193 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -34,6 +252,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -53,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -406,33 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -479,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -490,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -517,10 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -529,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -542,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/typescript-merge/.rubocop_gradual.lock b/gems/typescript-merge/.rubocop_gradual.lock new file mode 100644 index 000000000..d318188a5 --- /dev/null +++ b/gems/typescript-merge/.rubocop_gradual.lock @@ -0,0 +1,102 @@ +{ + ".simplecov:239823694": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:845460973": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/typescript-merge.rb:4058528402": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`typescript-merge.rb`) should use snake_case.", 5381] + ], + "lib/typescript/merge.rb:3369400219": [ + [10, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module TypeScript::Merge`.", 2866359175], + [10, 3, 7859, "Metrics/ModuleLength: Module has too many lines. [184/100]", 3930211313], + [11, 5, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631], + [72, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 3724408137], + [79, 5, 1427, "Metrics/AbcSize: Assignment Branch Condition size for `merge_type_script` is too high. [<13, 32, 11> 36.25/17]", 626793766], + [79, 5, 1427, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_type_script` is too high. [11/7]", 626793766], + [79, 5, 1427, "Metrics/MethodLength: Method has too many lines. [22/10]", 626793766], + [79, 5, 1427, "Metrics/PerceivedComplexity: Perceived complexity for `merge_type_script` is too high. [11/8]", 626793766], + [98, 34, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], + [107, 5, 1486, "Metrics/AbcSize: Assignment Branch Condition size for `analyze_type_script_module` is too high. [<8, 19, 5> 21.21/17]", 961716773], + [107, 5, 1486, "Metrics/MethodLength: Method has too many lines. [41/10]", 961716773] + ], + "spec/fixtures_integration_spec.rb:2894274721": [ + [3, 1, 5091, "Metrics/BlockLength: Block has too many lines. [67/25]", 332568190], + [8, 3, 4826, "Metrics/BlockLength: Block has too many lines. [62/25]", 3720035714] + ], + "typescript-merge.gemspec:2469503934": [ + [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ] +} diff --git a/gems/typescript-merge/Gemfile.lock b/gems/typescript-merge/Gemfile.lock index a6a6dfed3..2e94f97e9 100644 --- a/gems/typescript-merge/Gemfile.lock +++ b/gems/typescript-merge/Gemfile.lock @@ -17,39 +17,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -58,201 +26,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -260,37 +34,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -310,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -324,6 +61,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -379,6 +117,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -397,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -537,23 +283,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -587,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +381,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,61 +406,40 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +452,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +479,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +490,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,19 +517,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,9 +541,6 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f @@ -868,7 +550,6 @@ CHECKSUMS unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +557,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/typescript-merge/bin/yard b/gems/typescript-merge/bin/yard index a7e8b6eed..5d516ad6f 100755 --- a/gems/typescript-merge/bin/yard +++ b/gems/typescript-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec("bundle", "exec", "rake", "yard") +exec('bundle', 'exec', 'rake', 'yard') diff --git a/gems/typescript-merge/lib/typescript/merge.rb b/gems/typescript-merge/lib/typescript/merge.rb index 491ffbc3b..462027220 100644 --- a/gems/typescript-merge/lib/typescript/merge.rb +++ b/gems/typescript-merge/lib/typescript/merge.rb @@ -154,7 +154,10 @@ def analyze_type_script_module(source) def collect_parse_errors(node) raise TreeHaver::NotAvailable, 'TypeScript parse returned no root node' unless node - raise TreeHaver::NotAvailable, 'TypeScript parse contains syntax errors' if node.respond_to?(:has_error?) && node.has_error? + return unless node.respond_to?(:has_error?) && node.has_error? + + raise TreeHaver::NotAvailable, + 'TypeScript parse contains syntax errors' end private_class_method :collect_parse_errors diff --git a/gems/typescript-merge/lib/typescript/merge/version.rb b/gems/typescript-merge/lib/typescript/merge/version.rb index 954f44d95..770779ac0 100644 --- a/gems/typescript-merge/lib/typescript/merge/version.rb +++ b/gems/typescript-merge/lib/typescript/merge/version.rb @@ -3,7 +3,7 @@ module TypeScript module Merge module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end From f65c502ec767f09d7cf388263a7716b612d0d91a Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:25:22 -0600 Subject: [PATCH 171/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-template/.kettle-drift.lock | 60 +++-- gems/ast-template/Gemfile | 40 ++++ gems/ast-template/Gemfile.lock | 59 +++-- gems/binary-merge/.kettle-drift.lock | 60 +++-- gems/binary-merge/Gemfile | 40 ++++ gems/binary-merge/Gemfile.lock | 341 +-------------------------- gems/typescript-merge/Gemfile.lock | 327 ++++++++++++++++++++++++- 7 files changed, 514 insertions(+), 413 deletions(-) diff --git a/gems/ast-template/.kettle-drift.lock b/gems/ast-template/.kettle-drift.lock index 9878fb8f5..508d631d8 100644 --- a/gems/ast-template/.kettle-drift.lock +++ b/gems/ast-template/.kettle-drift.lock @@ -5,7 +5,8 @@ "lines": [ 79, 119, - 159 + 159, + 199 ] } ], @@ -15,7 +16,8 @@ "lines": [ 90, 130, - 170 + 170, + 210 ] } ], @@ -25,7 +27,8 @@ "lines": [ 80, 120, - 160 + 160, + 200 ] } ], @@ -35,7 +38,8 @@ "lines": [ 92, 132, - 172 + 172, + 212 ] } ], @@ -45,7 +49,8 @@ "lines": [ 95, 135, - 175 + 175, + 215 ] } ], @@ -55,7 +60,8 @@ "lines": [ 81, 121, - 161 + 161, + 201 ] } ], @@ -66,7 +72,8 @@ 59, 99, 139, - 179 + 179, + 219 ] } ], @@ -76,7 +83,8 @@ "lines": [ 100, 140, - 180 + 180, + 220 ] } ], @@ -87,7 +95,8 @@ 42, 86, 126, - 166 + 166, + 206 ] } ], @@ -97,7 +106,8 @@ "lines": [ 109, 149, - 189 + 189, + 229 ] } ], @@ -108,7 +118,8 @@ 34, 78, 118, - 158 + 158, + 198 ] } ], @@ -119,7 +130,8 @@ 68, 108, 148, - 188 + 188, + 228 ] } ], @@ -129,7 +141,8 @@ "lines": [ 84, 124, - 164 + 164, + 204 ] } ], @@ -140,7 +153,8 @@ 47, 91, 131, - 171 + 171, + 211 ] } ], @@ -151,7 +165,8 @@ 43, 87, 127, - 167 + 167, + 207 ] } ], @@ -161,7 +176,8 @@ "lines": [ 85, 125, - 165 + 165, + 205 ] } ], @@ -171,7 +187,8 @@ "lines": [ 102, 142, - 182 + 182, + 222 ] } ], @@ -181,7 +198,8 @@ "lines": [ 101, 141, - 181 + 181, + 221 ] } ], @@ -191,7 +209,8 @@ "lines": [ 96, 136, - 176 + 176, + 216 ] } ], @@ -201,7 +220,8 @@ "lines": [ 105, 145, - 185 + 185, + 225 ] } ], diff --git a/gems/ast-template/Gemfile b/gems/ast-template/Gemfile index 13c89702b..17d1d2512 100644 --- a/gems/ast-template/Gemfile +++ b/gems/ast-template/Gemfile @@ -191,6 +191,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/ast-template/Gemfile.lock b/gems/ast-template/Gemfile.lock index 3db99393b..530ee0633 100644 --- a/gems/ast-template/Gemfile.lock +++ b/gems/ast-template/Gemfile.lock @@ -275,6 +275,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -308,7 +324,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -363,18 +378,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -538,22 +542,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -659,9 +659,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -739,7 +739,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -760,10 +759,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -838,13 +837,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/binary-merge/.kettle-drift.lock b/gems/binary-merge/.kettle-drift.lock index 508d631d8..44ac5c29d 100644 --- a/gems/binary-merge/.kettle-drift.lock +++ b/gems/binary-merge/.kettle-drift.lock @@ -6,7 +6,8 @@ 79, 119, 159, - 199 + 199, + 239 ] } ], @@ -17,7 +18,8 @@ 90, 130, 170, - 210 + 210, + 250 ] } ], @@ -28,7 +30,8 @@ 80, 120, 160, - 200 + 200, + 240 ] } ], @@ -39,7 +42,8 @@ 92, 132, 172, - 212 + 212, + 252 ] } ], @@ -50,7 +54,8 @@ 95, 135, 175, - 215 + 215, + 255 ] } ], @@ -61,7 +66,8 @@ 81, 121, 161, - 201 + 201, + 241 ] } ], @@ -73,7 +79,8 @@ 99, 139, 179, - 219 + 219, + 259 ] } ], @@ -84,7 +91,8 @@ 100, 140, 180, - 220 + 220, + 260 ] } ], @@ -96,7 +104,8 @@ 86, 126, 166, - 206 + 206, + 246 ] } ], @@ -107,7 +116,8 @@ 109, 149, 189, - 229 + 229, + 269 ] } ], @@ -119,7 +129,8 @@ 78, 118, 158, - 198 + 198, + 238 ] } ], @@ -131,7 +142,8 @@ 108, 148, 188, - 228 + 228, + 268 ] } ], @@ -142,7 +154,8 @@ 84, 124, 164, - 204 + 204, + 244 ] } ], @@ -154,7 +167,8 @@ 91, 131, 171, - 211 + 211, + 251 ] } ], @@ -166,7 +180,8 @@ 87, 127, 167, - 207 + 207, + 247 ] } ], @@ -177,7 +192,8 @@ 85, 125, 165, - 205 + 205, + 245 ] } ], @@ -188,7 +204,8 @@ 102, 142, 182, - 222 + 222, + 262 ] } ], @@ -199,7 +216,8 @@ 101, 141, 181, - 221 + 221, + 261 ] } ], @@ -210,7 +228,8 @@ 96, 136, 176, - 216 + 216, + 256 ] } ], @@ -221,7 +240,8 @@ 105, 145, 185, - 225 + 225, + 265 ] } ], diff --git a/gems/binary-merge/Gemfile b/gems/binary-merge/Gemfile index b2784809b..e4df68b8d 100644 --- a/gems/binary-merge/Gemfile +++ b/gems/binary-merge/Gemfile @@ -231,6 +231,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/binary-merge/Gemfile.lock b/gems/binary-merge/Gemfile.lock index 3962446a6..98dd1bcd8 100644 --- a/gems/binary-merge/Gemfile.lock +++ b/gems/binary-merge/Gemfile.lock @@ -16,235 +16,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -252,29 +24,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -294,12 +43,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +106,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +134,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +273,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -584,14 +322,6 @@ GEM delegate (~> 0.1) rspec (~> 3.0) timecop (>= 0.7, < 1) - token-resolver (2.0.4) - parslet (~> 2.0) - version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +368,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +393,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) - ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +426,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +438,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +465,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +476,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +503,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +514,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -858,20 +526,14 @@ CHECKSUMS thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73 timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 - token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +541,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/typescript-merge/Gemfile.lock b/gems/typescript-merge/Gemfile.lock index 2e94f97e9..776990eb1 100644 --- a/gems/typescript-merge/Gemfile.lock +++ b/gems/typescript-merge/Gemfile.lock @@ -17,7 +17,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -26,7 +58,201 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -34,6 +260,21 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -53,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -406,33 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -479,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -490,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -517,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -528,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -541,6 +859,9 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f @@ -550,6 +871,7 @@ CHECKSUMS unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 82ae8babbe681e38c0f5b6e6e75e8ff04675dc09 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:25:25 -0600 Subject: [PATCH 172/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-template/Gemfile.lock | 392 +++------------------------------ 1 file changed, 33 insertions(+), 359 deletions(-) diff --git a/gems/ast-template/Gemfile.lock b/gems/ast-template/Gemfile.lock index 530ee0633..f8981d68e 100644 --- a/gems/ast-template/Gemfile.lock +++ b/gems/ast-template/Gemfile.lock @@ -16,39 +16,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -56,241 +24,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -310,12 +43,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -324,6 +51,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -379,6 +107,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -397,7 +134,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -537,23 +273,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -587,11 +325,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +376,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,61 +402,39 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +447,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +474,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +485,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,19 +512,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,19 +536,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +551,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 4eee43fc4e54fd992c62cdc405f4d001ff167bbf Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:25:41 -0600 Subject: [PATCH 173/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-template/Gemfile.lock | 341 +++++++++++++++++- gems/binary-merge/Gemfile.lock | 341 +++++++++++++++++- gems/psych-merge/.kettle-drift.lock | 60 ++-- gems/psych-merge/.rubocop_gradual.lock | 370 -------------------- gems/psych-merge/Gemfile | 70 +++- gems/psych-merge/Gemfile.lock | 59 ++-- gems/psych-merge/Rakefile | 18 +- gems/psych-merge/bin/yard | 2 +- gems/psych-merge/lib/psych/merge/version.rb | 2 +- gems/zip-merge/.kettle-drift.lock | 60 ++-- gems/zip-merge/Gemfile | 40 +++ gems/zip-merge/Gemfile.lock | 341 +----------------- 12 files changed, 892 insertions(+), 812 deletions(-) delete mode 100644 gems/psych-merge/.rubocop_gradual.lock diff --git a/gems/ast-template/Gemfile.lock b/gems/ast-template/Gemfile.lock index f8981d68e..3db99393b 100644 --- a/gems/ast-template/Gemfile.lock +++ b/gems/ast-template/Gemfile.lock @@ -16,7 +16,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -24,6 +56,225 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -43,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -106,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -134,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -273,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -325,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -376,24 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -402,32 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -435,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -447,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -474,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -485,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -512,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -523,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -536,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -551,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/binary-merge/Gemfile.lock b/gems/binary-merge/Gemfile.lock index 98dd1bcd8..3962446a6 100644 --- a/gems/binary-merge/Gemfile.lock +++ b/gems/binary-merge/Gemfile.lock @@ -16,7 +16,235 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -24,6 +252,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -43,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -106,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -134,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -273,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -322,6 +584,14 @@ GEM delegate (~> 0.1) rspec (~> 3.0) timecop (>= 0.7, < 1) + token-resolver (2.0.4) + parslet (~> 2.0) + version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -368,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -393,32 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) + ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -426,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -438,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -465,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -476,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -503,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -514,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -526,14 +858,20 @@ CHECKSUMS thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73 timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 + token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -541,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/psych-merge/.kettle-drift.lock b/gems/psych-merge/.kettle-drift.lock index 8d8e7d74f..dc90e28bc 100644 --- a/gems/psych-merge/.kettle-drift.lock +++ b/gems/psych-merge/.kettle-drift.lock @@ -6,7 +6,8 @@ 81, 121, 161, - 201 + 201, + 241 ] } ], @@ -17,7 +18,8 @@ 92, 132, 172, - 212 + 212, + 252 ] } ], @@ -28,7 +30,8 @@ 82, 122, 162, - 202 + 202, + 242 ] } ], @@ -39,7 +42,8 @@ 94, 134, 174, - 214 + 214, + 254 ] } ], @@ -50,7 +54,8 @@ 97, 137, 177, - 217 + 217, + 257 ] } ], @@ -61,7 +66,8 @@ 83, 123, 163, - 203 + 203, + 243 ] } ], @@ -73,7 +79,8 @@ 101, 141, 181, - 221 + 221, + 261 ] } ], @@ -84,7 +91,8 @@ 102, 142, 182, - 222 + 222, + 262 ] } ], @@ -96,7 +104,8 @@ 88, 128, 168, - 208 + 208, + 248 ] } ], @@ -107,7 +116,8 @@ 111, 151, 191, - 231 + 231, + 271 ] } ], @@ -119,7 +129,8 @@ 80, 120, 160, - 200 + 200, + 240 ] } ], @@ -131,7 +142,8 @@ 110, 150, 190, - 230 + 230, + 270 ] } ], @@ -142,7 +154,8 @@ 86, 126, 166, - 206 + 206, + 246 ] } ], @@ -154,7 +167,8 @@ 93, 133, 173, - 213 + 213, + 253 ] } ], @@ -166,7 +180,8 @@ 89, 129, 169, - 209 + 209, + 249 ] } ], @@ -177,7 +192,8 @@ 87, 127, 167, - 207 + 207, + 247 ] } ], @@ -188,7 +204,8 @@ 104, 144, 184, - 224 + 224, + 264 ] } ], @@ -199,7 +216,8 @@ 103, 143, 183, - 223 + 223, + 263 ] } ], @@ -210,7 +228,8 @@ 98, 138, 178, - 218 + 218, + 258 ] } ], @@ -221,7 +240,8 @@ 107, 147, 187, - 227 + 227, + 267 ] } ], diff --git a/gems/psych-merge/.rubocop_gradual.lock b/gems/psych-merge/.rubocop_gradual.lock deleted file mode 100644 index 85fd85e00..000000000 --- a/gems/psych-merge/.rubocop_gradual.lock +++ /dev/null @@ -1,370 +0,0 @@ -{ - ".simplecov:2102217422": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:1368539789": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/psych-merge.rb:1330894360": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`psych-merge.rb`) should use snake_case.", 5381] - ], - "lib/psych/merge.rb:2376745441": [ - [38, 3, 7721, "Metrics/ModuleLength: Module has too many lines. [141/100]", 4253043091], - [115, 5, 4676, "Metrics/ClassLength: Class has too many lines. [113/100]", 2004153105], - [171, 7, 1593, "Metrics/MethodLength: Method has too many lines. [26/10]", 162695378], - [171, 21, 295, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 2742902791], - [212, 7, 440, "Metrics/MethodLength: Method has too many lines. [11/10]", 4238054657] - ], - "lib/psych/merge/comment_tracker.rb:109829813": [ - [33, 7, 711, "Metrics/MethodLength: Method has too many lines. [24/10]", 4175176008], - [65, 48, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] - ], - "lib/psych/merge/conflict_resolver.rb:1439336560": [ - [24, 5, 98551, "Metrics/ClassLength: Class has too many lines. [1730/100]", 3470480790], - [48, 7, 1257, "Metrics/MethodLength: Method has too many lines. [18/10]", 2709727248], - [48, 21, 354, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [13/5]", 1127138839], - [49, 121, 141, "Layout/LineLength: Line is too long. [261/120]", 84971754], - [63, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1411495206], - [75, 7, 1316, "Metrics/MethodLength: Method has too many lines. [22/10]", 841707991], - [121, 7, 1128, "Metrics/AbcSize: Assignment Branch Condition size for `build_refined_matches` is too high. [<11, 16, 8> 21/17]", 4214539560], - [121, 7, 1128, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_refined_matches` is too high. [9/7]", 4214539560], - [121, 7, 1128, "Metrics/MethodLength: Method has too many lines. [18/10]", 4214539560], - [121, 7, 1128, "Metrics/PerceivedComplexity: Perceived complexity for `build_refined_matches` is too high. [9/8]", 4214539560], - [149, 7, 11524, "Metrics/AbcSize: Assignment Branch Condition size for `merge_nodes_to_emitter` is too high. [<57, 120, 50> 142/17]", 2474480422], - [149, 7, 11524, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_nodes_to_emitter` is too high. [43/7]", 2474480422], - [149, 7, 11524, "Metrics/MethodLength: Method has too many lines. [194/10]", 2474480422], - [149, 7, 11524, "Metrics/PerceivedComplexity: Perceived complexity for `merge_nodes_to_emitter` is too high. [49/8]", 2474480422], - [149, 33, 186, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 421356977], - [150, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 97621789], - [193, 24, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2944491302], - [204, 9, 7819, "Metrics/BlockLength: Block has too many lines. [136/25]", 519912312], - [205, 28, 36, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 345161915], - [263, 39, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3425527675], - [270, 39, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3425527675], - [286, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2818803335], - [330, 37, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3425527675], - [337, 37, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3425527675], - [376, 26, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2944491302], - [391, 24, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2944491302], - [436, 7, 1049, "Metrics/MethodLength: Method has too many lines. [14/10]", 2563450827], - [455, 7, 1990, "Metrics/AbcSize: Assignment Branch Condition size for `emit_supplemental_document_postlude` is too high. [<8, 20, 6> 22.36/17]", 1604415261], - [455, 7, 1990, "Metrics/MethodLength: Method has too many lines. [24/10]", 1604415261], - [501, 7, 982, "Metrics/AbcSize: Assignment Branch Condition size for `emit_nonpreferred_document_postlude_regions` is too high. [<5, 20, 10> 22.91/17]", 7588338], - [501, 7, 982, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_nonpreferred_document_postlude_regions` is too high. [10/7]", 7588338], - [501, 7, 982, "Metrics/MethodLength: Method has too many lines. [17/10]", 7588338], - [501, 7, 982, "Metrics/PerceivedComplexity: Perceived complexity for `emit_nonpreferred_document_postlude_regions` is too high. [11/8]", 7588338], - [523, 7, 429, "Metrics/MethodLength: Method has too many lines. [11/10]", 2317545285], - [551, 7, 1153, "Metrics/MethodLength: Method has too many lines. [27/10]", 2050460902], - [581, 7, 1164, "Metrics/MethodLength: Method has too many lines. [16/10]", 293708573], - [602, 7, 1132, "Metrics/MethodLength: Method has too many lines. [15/10]", 2657257420], - [610, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193417991], - [624, 68, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [627, 19, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [630, 7, 718, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preference_for_pair` is too high. [8/7]", 3339910669], - [630, 7, 718, "Metrics/MethodLength: Method has too many lines. [12/10]", 3339910669], - [656, 7, 1442, "Metrics/MethodLength: Method has too many lines. [34/10]", 3775627321], - [723, 7, 1439, "Metrics/AbcSize: Assignment Branch Condition size for `can_merge_recursively?` is too high. [<0, 18, 13> 22.2/17]", 3986446452], - [723, 7, 1439, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `can_merge_recursively?` is too high. [13/7]", 3986446452], - [723, 7, 1439, "Metrics/MethodLength: Method has too many lines. [11/10]", 3986446452], - [723, 7, 1439, "Metrics/PerceivedComplexity: Perceived complexity for `can_merge_recursively?` is too high. [14/8]", 3986446452], - [754, 7, 368, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `flow_sequence?` is too high. [9/7]", 13791150], - [754, 7, 368, "Metrics/PerceivedComplexity: Perceived complexity for `flow_sequence?` is too high. [9/8]", 13791150], - [765, 7, 452, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `flow_mapping?` is too high. [11/7]", 4104291177], - [765, 7, 452, "Metrics/PerceivedComplexity: Perceived complexity for `flow_mapping?` is too high. [11/8]", 4104291177], - [802, 7, 705, "Metrics/AbcSize: Assignment Branch Condition size for `bare_dash_sequence_item_mapping?` is too high. [<5, 18, 8> 20.32/17]", 625586302], - [802, 7, 705, "Metrics/MethodLength: Method has too many lines. [11/10]", 625586302], - [829, 7, 2511, "Metrics/AbcSize: Assignment Branch Condition size for `emit_recursive_merge` is too high. [<0, 19, 10> 21.47/17]", 3873511358], - [829, 7, 2511, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_recursive_merge` is too high. [9/7]", 3873511358], - [829, 7, 2511, "Metrics/MethodLength: Method has too many lines. [49/10]", 3873511358], - [829, 7, 2511, "Metrics/PerceivedComplexity: Perceived complexity for `emit_recursive_merge` is too high. [11/8]", 3873511358], - [830, 9, 2388, "Metrics/BlockLength: Block has too many lines. [47/25]", 1655278799], - [906, 7, 2400, "Metrics/AbcSize: Assignment Branch Condition size for `emit_recursive_mapping_merge` is too high. [<15, 29, 14> 35.52/17]", 1648233163], - [906, 7, 2400, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_recursive_mapping_merge` is too high. [15/7]", 1648233163], - [906, 7, 2400, "Metrics/MethodLength: Method has too many lines. [44/10]", 1648233163], - [906, 7, 2400, "Metrics/PerceivedComplexity: Perceived complexity for `emit_recursive_mapping_merge` is too high. [17/8]", 1648233163], - [974, 7, 6966, "Metrics/AbcSize: Assignment Branch Condition size for `emit_recursive_sequence_merge` is too high. [<35, 84, 35> 97.5/17]", 2427419647], - [974, 7, 6966, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_recursive_sequence_merge` is too high. [30/7]", 2427419647], - [974, 7, 6966, "Metrics/MethodLength: Method has too many lines. [113/10]", 2427419647], - [974, 7, 6966, "Metrics/PerceivedComplexity: Perceived complexity for `emit_recursive_sequence_merge` is too high. [37/8]", 2427419647], - [1020, 74, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2678193523], - [1023, 9, 3871, "Metrics/BlockLength: Block has too many lines. [72/25]", 4174342864], - [1036, 28, 31, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1010804247], - [1048, 37, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2630532814], - [1064, 28, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2630532814], - [1077, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2582359665], - [1102, 76, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2678193523], - [1111, 74, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2678193523], - [1115, 7, 1262, "Metrics/AbcSize: Assignment Branch Condition size for `build_sequence_item_matches` is too high. [<11, 13, 2> 17.15/17]", 3127840652], - [1115, 7, 1262, "Metrics/MethodLength: Method has too many lines. [21/10]", 3127840652], - [1146, 7, 3065, "Metrics/AbcSize: Assignment Branch Condition size for `build_refined_sequence_observation_matches` is too high. [<19, 51, 17> 57.02/17]", 2950540403], - [1146, 7, 3065, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_refined_sequence_observation_matches` is too high. [18/7]", 2950540403], - [1146, 7, 3065, "Metrics/MethodLength: Method has too many lines. [55/10]", 2950540403], - [1146, 7, 3065, "Metrics/PerceivedComplexity: Perceived complexity for `build_refined_sequence_observation_matches` is too high. [18/8]", 2950540403], - [1209, 9, 24, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 32301403], - [1261, 7, 901, "Metrics/MethodLength: Method has too many lines. [14/10]", 3298193773], - [1261, 29, 147, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3718416672], - [1285, 7, 1642, "Metrics/AbcSize: Assignment Branch Condition size for `emit_node` is too high. [<4, 22, 10> 24.49/17]", 518692521], - [1285, 7, 1642, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_node` is too high. [11/7]", 518692521], - [1285, 7, 1642, "Metrics/MethodLength: Method has too many lines. [32/10]", 518692521], - [1285, 7, 1642, "Metrics/PerceivedComplexity: Perceived complexity for `emit_node` is too high. [11/8]", 518692521], - [1285, 20, 138, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 109777589], - [1331, 7, 1577, "Metrics/AbcSize: Assignment Branch Condition size for `emit_mapping_entry` is too high. [<6, 17, 15> 23.45/17]", 3927797439], - [1331, 7, 1577, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_mapping_entry` is too high. [13/7]", 3927797439], - [1331, 7, 1577, "Metrics/MethodLength: Method has too many lines. [28/10]", 3927797439], - [1331, 7, 1577, "Metrics/PerceivedComplexity: Perceived complexity for `emit_mapping_entry` is too high. [13/8]", 3927797439], - [1331, 29, 148, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2283756321], - [1375, 7, 1975, "Metrics/AbcSize: Assignment Branch Condition size for `emit_mapping_entry_prelude` is too high. [<9, 26, 16> 31.83/17]", 3449491730], - [1375, 7, 1975, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_mapping_entry_prelude` is too high. [16/7]", 3449491730], - [1375, 7, 1975, "Metrics/MethodLength: Method has too many lines. [35/10]", 3449491730], - [1375, 7, 1975, "Metrics/PerceivedComplexity: Perceived complexity for `emit_mapping_entry_prelude` is too high. [16/8]", 3449491730], - [1419, 7, 1550, "Metrics/AbcSize: Assignment Branch Condition size for `emit_node_prelude` is too high. [<6, 17, 9> 20.15/17]", 4132652846], - [1419, 7, 1550, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_node_prelude` is too high. [10/7]", 4132652846], - [1419, 7, 1550, "Metrics/MethodLength: Method has too many lines. [26/10]", 4132652846], - [1419, 7, 1550, "Metrics/PerceivedComplexity: Perceived complexity for `emit_node_prelude` is too high. [10/8]", 4132652846], - [1463, 7, 1256, "Metrics/AbcSize: Assignment Branch Condition size for `emit_node_first_line` is too high. [<3, 16, 5> 17.03/17]", 809936874], - [1463, 7, 1256, "Metrics/MethodLength: Method has too many lines. [24/10]", 809936874], - [1492, 7, 838, "Metrics/AbcSize: Assignment Branch Condition size for `emit_removed_destination_node_comments` is too high. [<3, 16, 7> 17.72/17]", 1801654574], - [1492, 7, 838, "Metrics/MethodLength: Method has too many lines. [13/10]", 1801654574], - [1531, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2088091358], - [1551, 7, 587, "Metrics/MethodLength: Method has too many lines. [14/10]", 1778584112], - [1594, 7, 1089, "Metrics/AbcSize: Assignment Branch Condition size for `canonical_sequence_item_value` is too high. [<7, 20, 8> 22.65/17]", 2923924756], - [1594, 7, 1089, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonical_sequence_item_value` is too high. [9/7]", 2923924756], - [1594, 7, 1089, "Metrics/MethodLength: Method has too many lines. [15/10]", 2923924756], - [1594, 7, 1089, "Metrics/PerceivedComplexity: Perceived complexity for `canonical_sequence_item_value` is too high. [9/8]", 2923924756], - [1621, 7, 918, "Metrics/AbcSize: Assignment Branch Condition size for `sequence_item_observations` is too high. [<7, 26, 9> 28.39/17]", 1736204122], - [1621, 7, 918, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `sequence_item_observations` is too high. [10/7]", 1736204122], - [1621, 7, 918, "Metrics/MethodLength: Method has too many lines. [15/10]", 1736204122], - [1621, 7, 918, "Metrics/PerceivedComplexity: Perceived complexity for `sequence_item_observations` is too high. [10/8]", 1736204122], - [1626, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3762412176], - [1635, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 4096127909], - [1656, 7, 901, "Metrics/AbcSize: Assignment Branch Condition size for `trimmed_sequence_item_lines` is too high. [<11, 26, 10> 29.95/17]", 4091201884], - [1656, 7, 901, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trimmed_sequence_item_lines` is too high. [10/7]", 4091201884], - [1656, 7, 901, "Metrics/MethodLength: Method has too many lines. [15/10]", 4091201884], - [1656, 7, 901, "Metrics/PerceivedComplexity: Perceived complexity for `trimmed_sequence_item_lines` is too high. [10/8]", 4091201884], - [1678, 7, 713, "Metrics/AbcSize: Assignment Branch Condition size for `sequence_item_start_line` is too high. [<5, 22, 8> 23.94/17]", 2061460995], - [1712, 11, 61, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1718502596], - [1718, 7, 629, "Metrics/AbcSize: Assignment Branch Condition size for `effective_end_line` is too high. [<4, 14, 10> 17.66/17]", 2226115349], - [1718, 7, 629, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `effective_end_line` is too high. [10/7]", 2226115349], - [1718, 7, 629, "Metrics/PerceivedComplexity: Perceived complexity for `effective_end_line` is too high. [10/8]", 2226115349], - [1722, 41, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [1764, 7, 1381, "Metrics/AbcSize: Assignment Branch Condition size for `region_already_emitted?` is too high. [<11, 32, 14> 36.62/17]", 2166775868], - [1764, 7, 1381, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `region_already_emitted?` is too high. [13/7]", 2166775868], - [1764, 7, 1381, "Metrics/MethodLength: Method has too many lines. [26/10]", 2166775868], - [1764, 7, 1381, "Metrics/PerceivedComplexity: Perceived complexity for `region_already_emitted?` is too high. [14/8]", 2166775868], - [1804, 7, 2218, "Metrics/AbcSize: Assignment Branch Condition size for `emit_document_postlude` is too high. [<17, 30, 14> 37.22/17]", 1397438331], - [1804, 7, 2218, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_document_postlude` is too high. [15/7]", 1397438331], - [1804, 7, 2218, "Metrics/MethodLength: Method has too many lines. [27/10]", 1397438331], - [1804, 7, 2218, "Metrics/PerceivedComplexity: Perceived complexity for `emit_document_postlude` is too high. [15/8]", 1397438331], - [1848, 7, 1304, "Metrics/AbcSize: Assignment Branch Condition size for `emit_document_prelude` is too high. [<8, 28, 11> 31.13/17]", 325827008], - [1848, 7, 1304, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_document_prelude` is too high. [12/7]", 325827008], - [1848, 7, 1304, "Metrics/MethodLength: Method has too many lines. [24/10]", 325827008], - [1848, 7, 1304, "Metrics/PerceivedComplexity: Perceived complexity for `emit_document_prelude` is too high. [13/8]", 325827008], - [1896, 9, 48, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2339197345], - [1899, 7, 691, "Metrics/AbcSize: Assignment Branch Condition size for `document_leading_regions_for` is too high. [<5, 19, 14> 24.12/17]", 796439642], - [1899, 7, 691, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `document_leading_regions_for` is too high. [14/7]", 796439642], - [1899, 7, 691, "Metrics/MethodLength: Method has too many lines. [12/10]", 796439642], - [1899, 7, 691, "Metrics/PerceivedComplexity: Perceived complexity for `document_leading_regions_for` is too high. [14/8]", 796439642], - [1928, 7, 646, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonical_leading_comment_region` is too high. [10/7]", 1342472091], - [1928, 7, 646, "Metrics/PerceivedComplexity: Perceived complexity for `canonical_leading_comment_region` is too high. [10/8]", 1342472091], - [1942, 7, 1410, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_template_preamble_prefix_region` is too high. [<7, 25, 15> 29.98/17]", 449550851], - [1942, 7, 1410, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collapse_template_preamble_prefix_region` is too high. [11/7]", 449550851], - [1942, 7, 1410, "Metrics/MethodLength: Method has too many lines. [27/10]", 449550851], - [1942, 7, 1410, "Metrics/PerceivedComplexity: Perceived complexity for `collapse_template_preamble_prefix_region` is too high. [11/8]", 449550851], - [1975, 7, 991, "Metrics/AbcSize: Assignment Branch Condition size for `duplicated_template_preamble_prefix_in_first_node_leading_region?` is too high. [<7, 25, 14> 29.5/17]", 4012549279], - [1975, 7, 991, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `duplicated_template_preamble_prefix_in_first_node_leading_region?` is too high. [12/7]", 4012549279], - [1975, 7, 991, "Metrics/MethodLength: Method has too many lines. [13/10]", 4012549279], - [1975, 7, 991, "Metrics/PerceivedComplexity: Perceived complexity for `duplicated_template_preamble_prefix_in_first_node_leading_region?` is too high. [12/8]", 4012549279], - [2030, 7, 956, "Metrics/AbcSize: Assignment Branch Condition size for `document_trailing_regions_for` is too high. [<6, 16, 12> 20.88/17]", 3560026445], - [2030, 7, 956, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `document_trailing_regions_for` is too high. [12/7]", 3560026445], - [2030, 7, 956, "Metrics/PerceivedComplexity: Perceived complexity for `document_trailing_regions_for` is too high. [12/8]", 3560026445], - [2053, 7, 456, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `deflated_content_end_line` is too high. [8/7]", 3297059340], - [2089, 7, 614, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `leading_gap_line_count_for` is too high. [9/7]", 1127644346], - [2089, 7, 614, "Metrics/PerceivedComplexity: Perceived complexity for `leading_gap_line_count_for` is too high. [10/8]", 1127644346], - [2093, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 2290159738], - [2139, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [2168, 31, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [2175, 55, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [2183, 54, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [2191, 56, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [2196, 7, 822, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preferred_leading_comment_region` is too high. [10/7]", 1272157667], - [2196, 7, 822, "Metrics/PerceivedComplexity: Perceived complexity for `preferred_leading_comment_region` is too high. [10/8]", 1272157667], - [2308, 7, 465, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_interstitial_blank_lines` is too high. [9/7]", 1640065866], - [2308, 7, 465, "Metrics/PerceivedComplexity: Perceived complexity for `emit_interstitial_blank_lines` is too high. [9/8]", 1640065866], - [2320, 7, 586, "Metrics/MethodLength: Method has too many lines. [12/10]", 3310131662] - ], - "lib/psych/merge/debug_logger.rb:110646504": [ - [26, 9, 680, "Metrics/MethodLength: Method has too many lines. [12/10]", 1981451425] - ], - "lib/psych/merge/diff_mapper.rb:844380236": [ - [20, 5, 7887, "Metrics/ClassLength: Class has too many lines. [118/100]", 3492547573], - [34, 7, 471, "Metrics/MethodLength: Method has too many lines. [11/10]", 577300188], - [75, 7, 627, "Metrics/MethodLength: Method has too many lines. [12/10]", 2362564224], - [102, 7, 786, "Metrics/MethodLength: Method has too many lines. [11/10]", 1096016446], - [131, 7, 1613, "Metrics/AbcSize: Assignment Branch Condition size for `find_nested_path` is too high. [<12, 27, 20> 35.68/17]", 4005634231], - [131, 7, 1613, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_nested_path` is too high. [17/7]", 4005634231], - [131, 7, 1613, "Metrics/MethodLength: Method has too many lines. [30/10]", 4005634231], - [131, 7, 1613, "Metrics/PerceivedComplexity: Perceived complexity for `find_nested_path` is too high. [18/8]", 4005634231], - [183, 7, 758, "Metrics/MethodLength: Method has too many lines. [13/10]", 2773539171], - [204, 20, 11, "Style/NumericPredicate: Use `indent.zero?` instead of `indent == 0`.", 1189613385] - ], - "lib/psych/merge/emitter.rb:2851865662": [ - [14, 5, 7357, "Metrics/ClassLength: Class has too many lines. [147/100]", 579415518], - [138, 42, 6, "Lint/UnusedMethodArgument: Unused method argument - `region`.", 2124512157], - [151, 55, 12, "Lint/UnusedMethodArgument: Unused method argument - `current_line`.", 2091263933], - [166, 7, 560, "Metrics/AbcSize: Assignment Branch Condition size for `repeated_region_segment_length` is too high. [<6, 14, 8> 17.2/17]", 800046942], - [194, 7, 596, "Metrics/MethodLength: Method has too many lines. [12/10]", 2092207138], - [228, 7, 662, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `needs_quoting?` is too high. [10/7]", 172072954], - [228, 7, 662, "Metrics/PerceivedComplexity: Perceived complexity for `needs_quoting?` is too high. [10/8]", 172072954] - ], - "lib/psych/merge/file_analysis.rb:1868572144": [ - [13, 5, 14981, "Metrics/ClassLength: Class has too many lines. [251/100]", 3755372144], - [37, 7, 1080, "Metrics/MethodLength: Method has too many lines. [15/10]", 4243676919], - [203, 7, 533, "Metrics/MethodLength: Method has too many lines. [11/10]", 2772113363], - [237, 7, 998, "Metrics/AbcSize: Assignment Branch Condition size for `mapping_entry_attachment` is too high. [<5, 23, 7> 24.56/17]", 3001873728], - [237, 7, 998, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `mapping_entry_attachment` is too high. [8/7]", 3001873728], - [237, 7, 998, "Metrics/MethodLength: Method has too many lines. [13/10]", 3001873728], - [267, 7, 809, "Metrics/AbcSize: Assignment Branch Condition size for `full_line_comment_blocks_before` is too high. [<9, 16, 6> 19.31/17]", 2033268754], - [267, 7, 809, "Metrics/MethodLength: Method has too many lines. [22/10]", 2033268754], - [329, 7, 1353, "Metrics/AbcSize: Assignment Branch Condition size for `extract_freeze_blocks` is too high. [<12, 20, 12> 26.23/17]", 4244924302], - [329, 7, 1353, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_freeze_blocks` is too high. [10/7]", 4244924302], - [329, 7, 1353, "Metrics/MethodLength: Method has too many lines. [27/10]", 4244924302], - [329, 7, 1353, "Metrics/PerceivedComplexity: Perceived complexity for `extract_freeze_blocks` is too high. [11/8]", 4244924302], - [370, 7, 1756, "Metrics/AbcSize: Assignment Branch Condition size for `integrate_nodes_and_freeze_blocks` is too high. [<11, 28, 19> 35.58/17]", 1233865722], - [370, 7, 1756, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `integrate_nodes_and_freeze_blocks` is too high. [18/7]", 1233865722], - [370, 7, 1756, "Metrics/MethodLength: Method has too many lines. [31/10]", 1233865722], - [370, 7, 1756, "Metrics/PerceivedComplexity: Perceived complexity for `integrate_nodes_and_freeze_blocks` is too high. [19/8]", 1233865722] - ], - "lib/psych/merge/freeze_node.rb:3007012923": [ - [33, 21, 127, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1948779238] - ], - "lib/psych/merge/mapping_match_refiner.rb:3428808618": [ - [29, 5, 7580, "Metrics/ClassLength: Class has too many lines. [111/100]", 3764504760], - [121, 7, 800, "Metrics/MethodLength: Method has too many lines. [13/10]", 2814728338], - [150, 15, 20, "Style/ClassEqualityComparison: Use `instance_of?(node2.class)` instead of comparing classes.", 1212490233], - [193, 7, 270, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `sequence_similarity` is too high. [9/7]", 724822377], - [193, 7, 270, "Metrics/PerceivedComplexity: Perceived complexity for `sequence_similarity` is too high. [9/8]", 724822377], - [197, 23, 9, "Style/NumericPredicate: Use `len1.zero?` instead of `len1 == 0`.", 913205219], - [197, 36, 9, "Style/NumericPredicate: Use `len2.zero?` instead of `len2 == 0`.", 871697920], - [198, 23, 9, "Style/NumericPredicate: Use `len1.zero?` instead of `len1 == 0`.", 913205219], - [198, 36, 9, "Style/NumericPredicate: Use `len2.zero?` instead of `len2 == 0`.", 871697920], - [225, 7, 854, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<13, 29, 8> 32.77/17]", 2946547420], - [225, 7, 854, "Metrics/MethodLength: Method has too many lines. [20/10]", 2946547420] - ], - "lib/psych/merge/merge_result.rb:4276173304": [ - [140, 7, 421, "Metrics/MethodLength: Method has too many lines. [11/10]", 2459390040] - ], - "lib/psych/merge/node_wrapper.rb:1997974804": [ - [12, 5, 12280, "Metrics/ClassLength: Class has too many lines. [222/100]", 463540785], - [42, 7, 2039, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `initialize` is too high. [8/7]", 338533329], - [42, 21, 274, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 2646089467], - [144, 7, 699, "Metrics/MethodLength: Method has too many lines. [20/10]", 2676695829], - [210, 7, 985, "Metrics/MethodLength: Method has too many lines. [16/10]", 59427073], - [256, 7, 686, "Metrics/AbcSize: Assignment Branch Condition size for `compute_signature` is too high. [<4, 21, 13> 25.02/17]", 2657240579], - [256, 7, 686, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_signature` is too high. [14/7]", 2657240579], - [256, 7, 686, "Metrics/MethodLength: Method has too many lines. [18/10]", 2657240579], - [256, 7, 686, "Metrics/PerceivedComplexity: Perceived complexity for `compute_signature` is too high. [10/8]", 2657240579], - [277, 7, 425, "Metrics/MethodLength: Method has too many lines. [11/10]", 3170039988], - [310, 7, 1150, "Metrics/MethodLength: Method has too many lines. [24/10]", 647387009], - [321, 31, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [340, 7, 484, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `clamp_end_line_to_next_sibling!` is too high. [10/7]", 953824779], - [340, 7, 484, "Metrics/PerceivedComplexity: Perceived complexity for `clamp_end_line_to_next_sibling!` is too high. [10/8]", 953824779] - ], - "lib/psych/merge/smart_merger.rb:1750771088": [ - [45, 5, 10514, "Metrics/ClassLength: Class has too many lines. [192/100]", 4260193581], - [81, 7, 1336, "Metrics/MethodLength: Method has too many lines. [18/10]", 1713606127], - [81, 21, 557, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [16/5]", 1646356108], - [153, 7, 1440, "Metrics/AbcSize: Assignment Branch Condition size for `merge_with_debug` is too high. [<3, 24, 7> 25.18/17]", 695369520], - [153, 7, 1440, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_with_debug` is too high. [8/7]", 695369520], - [153, 7, 1440, "Metrics/MethodLength: Method has too many lines. [32/10]", 695369520], - [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:914772787": [ - [129, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [144, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [145, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [152, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ], - "spec/fixtures_integration_spec.rb:1717446685": [ - [3, 1, 9786, "Metrics/BlockLength: Block has too many lines. [222/25]", 1649396447], - [16, 3, 1302, "Metrics/BlockLength: Block has too many lines. [32/25]", 1546514966], - [52, 3, 2159, "Metrics/BlockLength: Block has too many lines. [28/25]", 270765486], - [109, 3, 1594, "Metrics/BlockLength: Block has too many lines. [41/25]", 568154065], - [227, 3, 1413, "Metrics/BlockLength: Block has too many lines. [29/25]", 1847754351] - ], - "spec/reproducible_merge_spec.rb:2168097366": [ - [3, 1, 5699, "Metrics/BlockLength: Block has too many lines. [107/25]", 3775945048], - [4, 3, 61, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1575360142], - [6, 3, 4847, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3343843514], - [47, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 3440433042], - [53, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3187380084] - ] -} diff --git a/gems/psych-merge/Gemfile b/gems/psych-merge/Gemfile index 02881d303..8f0101b6b 100644 --- a/gems/psych-merge/Gemfile +++ b/gems/psych-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source 'https://gem.coop' +source "https://gem.coop" git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,8 +19,8 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ['~> 1.0', '>= 1.0.8'] -gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ["~> 1.0", ">= 1.0.8"] +gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ @@ -28,10 +28,54 @@ direct_sibling_gems = %w[ tree_haver yaml-merge ] -direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') +direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? + +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) + direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") + direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == "nomono" } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + if nomono_locked + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] + end + end + Kernel.send(:gem, "nomono", *nomono_activation_requirements) + require "nomono/bundler" + if direct_sibling_templating && !direct_sibling_local + ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + end + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: "STRUCTUREDMERGE", + path_env: "STRUCTUREDMERGE_DEV", + root: ["src", "my", "structuredmerge"] + ) + rescue LoadError + warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + else + ENV.delete("STRUCTUREDMERGE_DEV") + end + end + end +end if direct_sibling_gems.any? && (direct_sibling_local || @@ -251,25 +295,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? # Debugging -eval_gemfile 'gemfiles/modular/debug.gemfile' +eval_gemfile "gemfiles/modular/debug.gemfile" # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile 'gemfiles/modular/coverage.gemfile' +eval_gemfile "gemfiles/modular/coverage.gemfile" # Linting -eval_gemfile 'gemfiles/modular/style.gemfile' +eval_gemfile "gemfiles/modular/style.gemfile" # Documentation -eval_gemfile 'gemfiles/modular/documentation.gemfile' +eval_gemfile "gemfiles/modular/documentation.gemfile" # Optional -eval_gemfile 'gemfiles/modular/optional.gemfile' +eval_gemfile "gemfiles/modular/optional.gemfile" ### Std Lib Extracted Gems -eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' +eval_gemfile "gemfiles/modular/x_std_libs.gemfile" # See unlocked_deps appraisal for more details on irb inclusion -gem 'irb', '~> 1.17' # ruby >= 2.7 +gem "irb", "~> 1.17" # ruby >= 2.7 diff --git a/gems/psych-merge/Gemfile.lock b/gems/psych-merge/Gemfile.lock index a12016d3e..9fa08b960 100644 --- a/gems/psych-merge/Gemfile.lock +++ b/gems/psych-merge/Gemfile.lock @@ -275,6 +275,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -308,7 +324,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -363,18 +378,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -538,22 +542,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -659,9 +659,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -739,7 +739,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -760,10 +759,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -838,13 +837,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/psych-merge/Rakefile b/gems/psych-merge/Rakefile index 0796b339a..8914e2104 100644 --- a/gems/psych-merge/Rakefile +++ b/gems/psych-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require 'kettle/drift' + require "kettle/drift" Kettle::Drift.install_tasks rescue LoadError - desc('(stub) kettle:drift:check is unavailable') - task('kettle:drift:check') do + desc("(stub) kettle:drift:check is unavailable") + task("kettle:drift:check") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:update is unavailable') - task('kettle:drift:update') do + desc("(stub) kettle:drift:update is unavailable") + task("kettle:drift:update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:force_update is unavailable') - task('kettle:drift:force_update') do + desc("(stub) kettle:drift:force_update is unavailable") + task("kettle:drift:force_update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift is unavailable') - task('kettle:drift' => 'kettle:drift:update') + desc("(stub) kettle:drift is unavailable") + task("kettle:drift" => "kettle:drift:update") end ### TEMPLATING TASKS diff --git a/gems/psych-merge/bin/yard b/gems/psych-merge/bin/yard index 5d516ad6f..a7e8b6eed 100755 --- a/gems/psych-merge/bin/yard +++ b/gems/psych-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec('bundle', 'exec', 'rake', 'yard') +exec("bundle", "exec", "rake", "yard") diff --git a/gems/psych-merge/lib/psych/merge/version.rb b/gems/psych-merge/lib/psych/merge/version.rb index aa65219d4..518f12da4 100644 --- a/gems/psych-merge/lib/psych/merge/version.rb +++ b/gems/psych-merge/lib/psych/merge/version.rb @@ -3,7 +3,7 @@ module Psych module Merge module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/zip-merge/.kettle-drift.lock b/gems/zip-merge/.kettle-drift.lock index 508d631d8..44ac5c29d 100644 --- a/gems/zip-merge/.kettle-drift.lock +++ b/gems/zip-merge/.kettle-drift.lock @@ -6,7 +6,8 @@ 79, 119, 159, - 199 + 199, + 239 ] } ], @@ -17,7 +18,8 @@ 90, 130, 170, - 210 + 210, + 250 ] } ], @@ -28,7 +30,8 @@ 80, 120, 160, - 200 + 200, + 240 ] } ], @@ -39,7 +42,8 @@ 92, 132, 172, - 212 + 212, + 252 ] } ], @@ -50,7 +54,8 @@ 95, 135, 175, - 215 + 215, + 255 ] } ], @@ -61,7 +66,8 @@ 81, 121, 161, - 201 + 201, + 241 ] } ], @@ -73,7 +79,8 @@ 99, 139, 179, - 219 + 219, + 259 ] } ], @@ -84,7 +91,8 @@ 100, 140, 180, - 220 + 220, + 260 ] } ], @@ -96,7 +104,8 @@ 86, 126, 166, - 206 + 206, + 246 ] } ], @@ -107,7 +116,8 @@ 109, 149, 189, - 229 + 229, + 269 ] } ], @@ -119,7 +129,8 @@ 78, 118, 158, - 198 + 198, + 238 ] } ], @@ -131,7 +142,8 @@ 108, 148, 188, - 228 + 228, + 268 ] } ], @@ -142,7 +154,8 @@ 84, 124, 164, - 204 + 204, + 244 ] } ], @@ -154,7 +167,8 @@ 91, 131, 171, - 211 + 211, + 251 ] } ], @@ -166,7 +180,8 @@ 87, 127, 167, - 207 + 207, + 247 ] } ], @@ -177,7 +192,8 @@ 85, 125, 165, - 205 + 205, + 245 ] } ], @@ -188,7 +204,8 @@ 102, 142, 182, - 222 + 222, + 262 ] } ], @@ -199,7 +216,8 @@ 101, 141, 181, - 221 + 221, + 261 ] } ], @@ -210,7 +228,8 @@ 96, 136, 176, - 216 + 216, + 256 ] } ], @@ -221,7 +240,8 @@ 105, 145, 185, - 225 + 225, + 265 ] } ], diff --git a/gems/zip-merge/Gemfile b/gems/zip-merge/Gemfile index 70063ee66..9a65b793e 100644 --- a/gems/zip-merge/Gemfile +++ b/gems/zip-merge/Gemfile @@ -231,6 +231,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/zip-merge/Gemfile.lock b/gems/zip-merge/Gemfile.lock index 9238afb04..6c7ddf202 100644 --- a/gems/zip-merge/Gemfile.lock +++ b/gems/zip-merge/Gemfile.lock @@ -16,242 +16,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -259,22 +24,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -294,12 +43,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +106,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +134,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +273,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -584,14 +322,6 @@ GEM delegate (~> 0.1) rspec (~> 3.0) timecop (>= 0.7, < 1) - token-resolver (2.0.4) - parslet (~> 2.0) - version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +368,22 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,19 +392,13 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) @@ -711,28 +412,12 @@ CHECKSUMS ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) - ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +425,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +437,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +464,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +475,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +502,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +513,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -858,20 +525,14 @@ CHECKSUMS thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73 timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 - token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd From 86e2fa1a85f6846a0865f0bfd79108b7caf7888a Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:25:49 -0600 Subject: [PATCH 174/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/psych-merge/.rubocop_gradual.lock | 372 ++++++++++++++++++++ gems/psych-merge/Gemfile | 68 ++-- gems/psych-merge/Gemfile.lock | 369 ++----------------- gems/psych-merge/Rakefile | 18 +- gems/psych-merge/bin/yard | 2 +- gems/psych-merge/lib/psych/merge/version.rb | 2 +- gems/zip-merge/Gemfile.lock | 341 +++++++++++++++++- 7 files changed, 785 insertions(+), 387 deletions(-) create mode 100644 gems/psych-merge/.rubocop_gradual.lock diff --git a/gems/psych-merge/.rubocop_gradual.lock b/gems/psych-merge/.rubocop_gradual.lock new file mode 100644 index 000000000..85e814fd4 --- /dev/null +++ b/gems/psych-merge/.rubocop_gradual.lock @@ -0,0 +1,372 @@ +{ + ".simplecov:2102217422": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:1368539789": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/psych-merge.rb:1330894360": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`psych-merge.rb`) should use snake_case.", 5381] + ], + "lib/psych/merge.rb:173660101": [ + [38, 3, 9398, "Metrics/ModuleLength: Module has too many lines. [188/100]", 2155600486], + [115, 5, 6353, "Metrics/ClassLength: Class has too many lines. [160/100]", 2805786752], + [171, 7, 1593, "Metrics/MethodLength: Method has too many lines. [26/10]", 162695378], + [171, 21, 295, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 2742902791], + [212, 7, 440, "Metrics/MethodLength: Method has too many lines. [11/10]", 4238054657], + [252, 7, 417, "Metrics/MethodLength: Method has too many lines. [11/10]", 3661776213], + [275, 7, 458, "Metrics/MethodLength: Method has too many lines. [15/10]", 1125262299] + ], + "lib/psych/merge/comment_tracker.rb:109829813": [ + [33, 7, 711, "Metrics/MethodLength: Method has too many lines. [24/10]", 4175176008], + [65, 48, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] + ], + "lib/psych/merge/conflict_resolver.rb:1439336560": [ + [24, 5, 98551, "Metrics/ClassLength: Class has too many lines. [1730/100]", 3470480790], + [48, 7, 1257, "Metrics/MethodLength: Method has too many lines. [18/10]", 2709727248], + [48, 21, 354, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [13/5]", 1127138839], + [49, 121, 141, "Layout/LineLength: Line is too long. [261/120]", 84971754], + [63, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1411495206], + [75, 7, 1316, "Metrics/MethodLength: Method has too many lines. [22/10]", 841707991], + [121, 7, 1128, "Metrics/AbcSize: Assignment Branch Condition size for `build_refined_matches` is too high. [<11, 16, 8> 21/17]", 4214539560], + [121, 7, 1128, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_refined_matches` is too high. [9/7]", 4214539560], + [121, 7, 1128, "Metrics/MethodLength: Method has too many lines. [18/10]", 4214539560], + [121, 7, 1128, "Metrics/PerceivedComplexity: Perceived complexity for `build_refined_matches` is too high. [9/8]", 4214539560], + [149, 7, 11524, "Metrics/AbcSize: Assignment Branch Condition size for `merge_nodes_to_emitter` is too high. [<57, 120, 50> 142/17]", 2474480422], + [149, 7, 11524, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_nodes_to_emitter` is too high. [43/7]", 2474480422], + [149, 7, 11524, "Metrics/MethodLength: Method has too many lines. [194/10]", 2474480422], + [149, 7, 11524, "Metrics/PerceivedComplexity: Perceived complexity for `merge_nodes_to_emitter` is too high. [49/8]", 2474480422], + [149, 33, 186, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 421356977], + [150, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 97621789], + [193, 24, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2944491302], + [204, 9, 7819, "Metrics/BlockLength: Block has too many lines. [136/25]", 519912312], + [205, 28, 36, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 345161915], + [263, 39, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3425527675], + [270, 39, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3425527675], + [286, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2818803335], + [330, 37, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3425527675], + [337, 37, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3425527675], + [376, 26, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2944491302], + [391, 24, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2944491302], + [436, 7, 1049, "Metrics/MethodLength: Method has too many lines. [14/10]", 2563450827], + [455, 7, 1990, "Metrics/AbcSize: Assignment Branch Condition size for `emit_supplemental_document_postlude` is too high. [<8, 20, 6> 22.36/17]", 1604415261], + [455, 7, 1990, "Metrics/MethodLength: Method has too many lines. [24/10]", 1604415261], + [501, 7, 982, "Metrics/AbcSize: Assignment Branch Condition size for `emit_nonpreferred_document_postlude_regions` is too high. [<5, 20, 10> 22.91/17]", 7588338], + [501, 7, 982, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_nonpreferred_document_postlude_regions` is too high. [10/7]", 7588338], + [501, 7, 982, "Metrics/MethodLength: Method has too many lines. [17/10]", 7588338], + [501, 7, 982, "Metrics/PerceivedComplexity: Perceived complexity for `emit_nonpreferred_document_postlude_regions` is too high. [11/8]", 7588338], + [523, 7, 429, "Metrics/MethodLength: Method has too many lines. [11/10]", 2317545285], + [551, 7, 1153, "Metrics/MethodLength: Method has too many lines. [27/10]", 2050460902], + [581, 7, 1164, "Metrics/MethodLength: Method has too many lines. [16/10]", 293708573], + [602, 7, 1132, "Metrics/MethodLength: Method has too many lines. [15/10]", 2657257420], + [610, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193417991], + [624, 68, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [627, 19, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [630, 7, 718, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preference_for_pair` is too high. [8/7]", 3339910669], + [630, 7, 718, "Metrics/MethodLength: Method has too many lines. [12/10]", 3339910669], + [656, 7, 1442, "Metrics/MethodLength: Method has too many lines. [34/10]", 3775627321], + [723, 7, 1439, "Metrics/AbcSize: Assignment Branch Condition size for `can_merge_recursively?` is too high. [<0, 18, 13> 22.2/17]", 3986446452], + [723, 7, 1439, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `can_merge_recursively?` is too high. [13/7]", 3986446452], + [723, 7, 1439, "Metrics/MethodLength: Method has too many lines. [11/10]", 3986446452], + [723, 7, 1439, "Metrics/PerceivedComplexity: Perceived complexity for `can_merge_recursively?` is too high. [14/8]", 3986446452], + [754, 7, 368, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `flow_sequence?` is too high. [9/7]", 13791150], + [754, 7, 368, "Metrics/PerceivedComplexity: Perceived complexity for `flow_sequence?` is too high. [9/8]", 13791150], + [765, 7, 452, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `flow_mapping?` is too high. [11/7]", 4104291177], + [765, 7, 452, "Metrics/PerceivedComplexity: Perceived complexity for `flow_mapping?` is too high. [11/8]", 4104291177], + [802, 7, 705, "Metrics/AbcSize: Assignment Branch Condition size for `bare_dash_sequence_item_mapping?` is too high. [<5, 18, 8> 20.32/17]", 625586302], + [802, 7, 705, "Metrics/MethodLength: Method has too many lines. [11/10]", 625586302], + [829, 7, 2511, "Metrics/AbcSize: Assignment Branch Condition size for `emit_recursive_merge` is too high. [<0, 19, 10> 21.47/17]", 3873511358], + [829, 7, 2511, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_recursive_merge` is too high. [9/7]", 3873511358], + [829, 7, 2511, "Metrics/MethodLength: Method has too many lines. [49/10]", 3873511358], + [829, 7, 2511, "Metrics/PerceivedComplexity: Perceived complexity for `emit_recursive_merge` is too high. [11/8]", 3873511358], + [830, 9, 2388, "Metrics/BlockLength: Block has too many lines. [47/25]", 1655278799], + [906, 7, 2400, "Metrics/AbcSize: Assignment Branch Condition size for `emit_recursive_mapping_merge` is too high. [<15, 29, 14> 35.52/17]", 1648233163], + [906, 7, 2400, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_recursive_mapping_merge` is too high. [15/7]", 1648233163], + [906, 7, 2400, "Metrics/MethodLength: Method has too many lines. [44/10]", 1648233163], + [906, 7, 2400, "Metrics/PerceivedComplexity: Perceived complexity for `emit_recursive_mapping_merge` is too high. [17/8]", 1648233163], + [974, 7, 6966, "Metrics/AbcSize: Assignment Branch Condition size for `emit_recursive_sequence_merge` is too high. [<35, 84, 35> 97.5/17]", 2427419647], + [974, 7, 6966, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_recursive_sequence_merge` is too high. [30/7]", 2427419647], + [974, 7, 6966, "Metrics/MethodLength: Method has too many lines. [113/10]", 2427419647], + [974, 7, 6966, "Metrics/PerceivedComplexity: Perceived complexity for `emit_recursive_sequence_merge` is too high. [37/8]", 2427419647], + [1020, 74, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2678193523], + [1023, 9, 3871, "Metrics/BlockLength: Block has too many lines. [72/25]", 4174342864], + [1036, 28, 31, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1010804247], + [1048, 37, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2630532814], + [1064, 28, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2630532814], + [1077, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2582359665], + [1102, 76, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2678193523], + [1111, 74, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2678193523], + [1115, 7, 1262, "Metrics/AbcSize: Assignment Branch Condition size for `build_sequence_item_matches` is too high. [<11, 13, 2> 17.15/17]", 3127840652], + [1115, 7, 1262, "Metrics/MethodLength: Method has too many lines. [21/10]", 3127840652], + [1146, 7, 3065, "Metrics/AbcSize: Assignment Branch Condition size for `build_refined_sequence_observation_matches` is too high. [<19, 51, 17> 57.02/17]", 2950540403], + [1146, 7, 3065, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_refined_sequence_observation_matches` is too high. [18/7]", 2950540403], + [1146, 7, 3065, "Metrics/MethodLength: Method has too many lines. [55/10]", 2950540403], + [1146, 7, 3065, "Metrics/PerceivedComplexity: Perceived complexity for `build_refined_sequence_observation_matches` is too high. [18/8]", 2950540403], + [1209, 9, 24, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 32301403], + [1261, 7, 901, "Metrics/MethodLength: Method has too many lines. [14/10]", 3298193773], + [1261, 29, 147, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3718416672], + [1285, 7, 1642, "Metrics/AbcSize: Assignment Branch Condition size for `emit_node` is too high. [<4, 22, 10> 24.49/17]", 518692521], + [1285, 7, 1642, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_node` is too high. [11/7]", 518692521], + [1285, 7, 1642, "Metrics/MethodLength: Method has too many lines. [32/10]", 518692521], + [1285, 7, 1642, "Metrics/PerceivedComplexity: Perceived complexity for `emit_node` is too high. [11/8]", 518692521], + [1285, 20, 138, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 109777589], + [1331, 7, 1577, "Metrics/AbcSize: Assignment Branch Condition size for `emit_mapping_entry` is too high. [<6, 17, 15> 23.45/17]", 3927797439], + [1331, 7, 1577, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_mapping_entry` is too high. [13/7]", 3927797439], + [1331, 7, 1577, "Metrics/MethodLength: Method has too many lines. [28/10]", 3927797439], + [1331, 7, 1577, "Metrics/PerceivedComplexity: Perceived complexity for `emit_mapping_entry` is too high. [13/8]", 3927797439], + [1331, 29, 148, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2283756321], + [1375, 7, 1975, "Metrics/AbcSize: Assignment Branch Condition size for `emit_mapping_entry_prelude` is too high. [<9, 26, 16> 31.83/17]", 3449491730], + [1375, 7, 1975, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_mapping_entry_prelude` is too high. [16/7]", 3449491730], + [1375, 7, 1975, "Metrics/MethodLength: Method has too many lines. [35/10]", 3449491730], + [1375, 7, 1975, "Metrics/PerceivedComplexity: Perceived complexity for `emit_mapping_entry_prelude` is too high. [16/8]", 3449491730], + [1419, 7, 1550, "Metrics/AbcSize: Assignment Branch Condition size for `emit_node_prelude` is too high. [<6, 17, 9> 20.15/17]", 4132652846], + [1419, 7, 1550, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_node_prelude` is too high. [10/7]", 4132652846], + [1419, 7, 1550, "Metrics/MethodLength: Method has too many lines. [26/10]", 4132652846], + [1419, 7, 1550, "Metrics/PerceivedComplexity: Perceived complexity for `emit_node_prelude` is too high. [10/8]", 4132652846], + [1463, 7, 1256, "Metrics/AbcSize: Assignment Branch Condition size for `emit_node_first_line` is too high. [<3, 16, 5> 17.03/17]", 809936874], + [1463, 7, 1256, "Metrics/MethodLength: Method has too many lines. [24/10]", 809936874], + [1492, 7, 838, "Metrics/AbcSize: Assignment Branch Condition size for `emit_removed_destination_node_comments` is too high. [<3, 16, 7> 17.72/17]", 1801654574], + [1492, 7, 838, "Metrics/MethodLength: Method has too many lines. [13/10]", 1801654574], + [1531, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2088091358], + [1551, 7, 587, "Metrics/MethodLength: Method has too many lines. [14/10]", 1778584112], + [1594, 7, 1089, "Metrics/AbcSize: Assignment Branch Condition size for `canonical_sequence_item_value` is too high. [<7, 20, 8> 22.65/17]", 2923924756], + [1594, 7, 1089, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonical_sequence_item_value` is too high. [9/7]", 2923924756], + [1594, 7, 1089, "Metrics/MethodLength: Method has too many lines. [15/10]", 2923924756], + [1594, 7, 1089, "Metrics/PerceivedComplexity: Perceived complexity for `canonical_sequence_item_value` is too high. [9/8]", 2923924756], + [1621, 7, 918, "Metrics/AbcSize: Assignment Branch Condition size for `sequence_item_observations` is too high. [<7, 26, 9> 28.39/17]", 1736204122], + [1621, 7, 918, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `sequence_item_observations` is too high. [10/7]", 1736204122], + [1621, 7, 918, "Metrics/MethodLength: Method has too many lines. [15/10]", 1736204122], + [1621, 7, 918, "Metrics/PerceivedComplexity: Perceived complexity for `sequence_item_observations` is too high. [10/8]", 1736204122], + [1626, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3762412176], + [1635, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 4096127909], + [1656, 7, 901, "Metrics/AbcSize: Assignment Branch Condition size for `trimmed_sequence_item_lines` is too high. [<11, 26, 10> 29.95/17]", 4091201884], + [1656, 7, 901, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trimmed_sequence_item_lines` is too high. [10/7]", 4091201884], + [1656, 7, 901, "Metrics/MethodLength: Method has too many lines. [15/10]", 4091201884], + [1656, 7, 901, "Metrics/PerceivedComplexity: Perceived complexity for `trimmed_sequence_item_lines` is too high. [10/8]", 4091201884], + [1678, 7, 713, "Metrics/AbcSize: Assignment Branch Condition size for `sequence_item_start_line` is too high. [<5, 22, 8> 23.94/17]", 2061460995], + [1712, 11, 61, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1718502596], + [1718, 7, 629, "Metrics/AbcSize: Assignment Branch Condition size for `effective_end_line` is too high. [<4, 14, 10> 17.66/17]", 2226115349], + [1718, 7, 629, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `effective_end_line` is too high. [10/7]", 2226115349], + [1718, 7, 629, "Metrics/PerceivedComplexity: Perceived complexity for `effective_end_line` is too high. [10/8]", 2226115349], + [1722, 41, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [1764, 7, 1381, "Metrics/AbcSize: Assignment Branch Condition size for `region_already_emitted?` is too high. [<11, 32, 14> 36.62/17]", 2166775868], + [1764, 7, 1381, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `region_already_emitted?` is too high. [13/7]", 2166775868], + [1764, 7, 1381, "Metrics/MethodLength: Method has too many lines. [26/10]", 2166775868], + [1764, 7, 1381, "Metrics/PerceivedComplexity: Perceived complexity for `region_already_emitted?` is too high. [14/8]", 2166775868], + [1804, 7, 2218, "Metrics/AbcSize: Assignment Branch Condition size for `emit_document_postlude` is too high. [<17, 30, 14> 37.22/17]", 1397438331], + [1804, 7, 2218, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_document_postlude` is too high. [15/7]", 1397438331], + [1804, 7, 2218, "Metrics/MethodLength: Method has too many lines. [27/10]", 1397438331], + [1804, 7, 2218, "Metrics/PerceivedComplexity: Perceived complexity for `emit_document_postlude` is too high. [15/8]", 1397438331], + [1848, 7, 1304, "Metrics/AbcSize: Assignment Branch Condition size for `emit_document_prelude` is too high. [<8, 28, 11> 31.13/17]", 325827008], + [1848, 7, 1304, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_document_prelude` is too high. [12/7]", 325827008], + [1848, 7, 1304, "Metrics/MethodLength: Method has too many lines. [24/10]", 325827008], + [1848, 7, 1304, "Metrics/PerceivedComplexity: Perceived complexity for `emit_document_prelude` is too high. [13/8]", 325827008], + [1896, 9, 48, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2339197345], + [1899, 7, 691, "Metrics/AbcSize: Assignment Branch Condition size for `document_leading_regions_for` is too high. [<5, 19, 14> 24.12/17]", 796439642], + [1899, 7, 691, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `document_leading_regions_for` is too high. [14/7]", 796439642], + [1899, 7, 691, "Metrics/MethodLength: Method has too many lines. [12/10]", 796439642], + [1899, 7, 691, "Metrics/PerceivedComplexity: Perceived complexity for `document_leading_regions_for` is too high. [14/8]", 796439642], + [1928, 7, 646, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonical_leading_comment_region` is too high. [10/7]", 1342472091], + [1928, 7, 646, "Metrics/PerceivedComplexity: Perceived complexity for `canonical_leading_comment_region` is too high. [10/8]", 1342472091], + [1942, 7, 1410, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_template_preamble_prefix_region` is too high. [<7, 25, 15> 29.98/17]", 449550851], + [1942, 7, 1410, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collapse_template_preamble_prefix_region` is too high. [11/7]", 449550851], + [1942, 7, 1410, "Metrics/MethodLength: Method has too many lines. [27/10]", 449550851], + [1942, 7, 1410, "Metrics/PerceivedComplexity: Perceived complexity for `collapse_template_preamble_prefix_region` is too high. [11/8]", 449550851], + [1975, 7, 991, "Metrics/AbcSize: Assignment Branch Condition size for `duplicated_template_preamble_prefix_in_first_node_leading_region?` is too high. [<7, 25, 14> 29.5/17]", 4012549279], + [1975, 7, 991, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `duplicated_template_preamble_prefix_in_first_node_leading_region?` is too high. [12/7]", 4012549279], + [1975, 7, 991, "Metrics/MethodLength: Method has too many lines. [13/10]", 4012549279], + [1975, 7, 991, "Metrics/PerceivedComplexity: Perceived complexity for `duplicated_template_preamble_prefix_in_first_node_leading_region?` is too high. [12/8]", 4012549279], + [2030, 7, 956, "Metrics/AbcSize: Assignment Branch Condition size for `document_trailing_regions_for` is too high. [<6, 16, 12> 20.88/17]", 3560026445], + [2030, 7, 956, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `document_trailing_regions_for` is too high. [12/7]", 3560026445], + [2030, 7, 956, "Metrics/PerceivedComplexity: Perceived complexity for `document_trailing_regions_for` is too high. [12/8]", 3560026445], + [2053, 7, 456, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `deflated_content_end_line` is too high. [8/7]", 3297059340], + [2089, 7, 614, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `leading_gap_line_count_for` is too high. [9/7]", 1127644346], + [2089, 7, 614, "Metrics/PerceivedComplexity: Perceived complexity for `leading_gap_line_count_for` is too high. [10/8]", 1127644346], + [2093, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 2290159738], + [2139, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [2168, 31, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [2175, 55, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [2183, 54, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [2191, 56, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [2196, 7, 822, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preferred_leading_comment_region` is too high. [10/7]", 1272157667], + [2196, 7, 822, "Metrics/PerceivedComplexity: Perceived complexity for `preferred_leading_comment_region` is too high. [10/8]", 1272157667], + [2308, 7, 465, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_interstitial_blank_lines` is too high. [9/7]", 1640065866], + [2308, 7, 465, "Metrics/PerceivedComplexity: Perceived complexity for `emit_interstitial_blank_lines` is too high. [9/8]", 1640065866], + [2320, 7, 586, "Metrics/MethodLength: Method has too many lines. [12/10]", 3310131662] + ], + "lib/psych/merge/debug_logger.rb:110646504": [ + [26, 9, 680, "Metrics/MethodLength: Method has too many lines. [12/10]", 1981451425] + ], + "lib/psych/merge/diff_mapper.rb:844380236": [ + [20, 5, 7887, "Metrics/ClassLength: Class has too many lines. [118/100]", 3492547573], + [34, 7, 471, "Metrics/MethodLength: Method has too many lines. [11/10]", 577300188], + [75, 7, 627, "Metrics/MethodLength: Method has too many lines. [12/10]", 2362564224], + [102, 7, 786, "Metrics/MethodLength: Method has too many lines. [11/10]", 1096016446], + [131, 7, 1613, "Metrics/AbcSize: Assignment Branch Condition size for `find_nested_path` is too high. [<12, 27, 20> 35.68/17]", 4005634231], + [131, 7, 1613, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_nested_path` is too high. [17/7]", 4005634231], + [131, 7, 1613, "Metrics/MethodLength: Method has too many lines. [30/10]", 4005634231], + [131, 7, 1613, "Metrics/PerceivedComplexity: Perceived complexity for `find_nested_path` is too high. [18/8]", 4005634231], + [183, 7, 758, "Metrics/MethodLength: Method has too many lines. [13/10]", 2773539171], + [204, 20, 11, "Style/NumericPredicate: Use `indent.zero?` instead of `indent == 0`.", 1189613385] + ], + "lib/psych/merge/emitter.rb:2851865662": [ + [14, 5, 7357, "Metrics/ClassLength: Class has too many lines. [147/100]", 579415518], + [138, 42, 6, "Lint/UnusedMethodArgument: Unused method argument - `region`.", 2124512157], + [151, 55, 12, "Lint/UnusedMethodArgument: Unused method argument - `current_line`.", 2091263933], + [166, 7, 560, "Metrics/AbcSize: Assignment Branch Condition size for `repeated_region_segment_length` is too high. [<6, 14, 8> 17.2/17]", 800046942], + [194, 7, 596, "Metrics/MethodLength: Method has too many lines. [12/10]", 2092207138], + [228, 7, 662, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `needs_quoting?` is too high. [10/7]", 172072954], + [228, 7, 662, "Metrics/PerceivedComplexity: Perceived complexity for `needs_quoting?` is too high. [10/8]", 172072954] + ], + "lib/psych/merge/file_analysis.rb:1868572144": [ + [13, 5, 14981, "Metrics/ClassLength: Class has too many lines. [251/100]", 3755372144], + [37, 7, 1080, "Metrics/MethodLength: Method has too many lines. [15/10]", 4243676919], + [203, 7, 533, "Metrics/MethodLength: Method has too many lines. [11/10]", 2772113363], + [237, 7, 998, "Metrics/AbcSize: Assignment Branch Condition size for `mapping_entry_attachment` is too high. [<5, 23, 7> 24.56/17]", 3001873728], + [237, 7, 998, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `mapping_entry_attachment` is too high. [8/7]", 3001873728], + [237, 7, 998, "Metrics/MethodLength: Method has too many lines. [13/10]", 3001873728], + [267, 7, 809, "Metrics/AbcSize: Assignment Branch Condition size for `full_line_comment_blocks_before` is too high. [<9, 16, 6> 19.31/17]", 2033268754], + [267, 7, 809, "Metrics/MethodLength: Method has too many lines. [22/10]", 2033268754], + [329, 7, 1353, "Metrics/AbcSize: Assignment Branch Condition size for `extract_freeze_blocks` is too high. [<12, 20, 12> 26.23/17]", 4244924302], + [329, 7, 1353, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_freeze_blocks` is too high. [10/7]", 4244924302], + [329, 7, 1353, "Metrics/MethodLength: Method has too many lines. [27/10]", 4244924302], + [329, 7, 1353, "Metrics/PerceivedComplexity: Perceived complexity for `extract_freeze_blocks` is too high. [11/8]", 4244924302], + [370, 7, 1756, "Metrics/AbcSize: Assignment Branch Condition size for `integrate_nodes_and_freeze_blocks` is too high. [<11, 28, 19> 35.58/17]", 1233865722], + [370, 7, 1756, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `integrate_nodes_and_freeze_blocks` is too high. [18/7]", 1233865722], + [370, 7, 1756, "Metrics/MethodLength: Method has too many lines. [31/10]", 1233865722], + [370, 7, 1756, "Metrics/PerceivedComplexity: Perceived complexity for `integrate_nodes_and_freeze_blocks` is too high. [19/8]", 1233865722] + ], + "lib/psych/merge/freeze_node.rb:3007012923": [ + [33, 21, 127, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1948779238] + ], + "lib/psych/merge/mapping_match_refiner.rb:3428808618": [ + [29, 5, 7580, "Metrics/ClassLength: Class has too many lines. [111/100]", 3764504760], + [121, 7, 800, "Metrics/MethodLength: Method has too many lines. [13/10]", 2814728338], + [150, 15, 20, "Style/ClassEqualityComparison: Use `instance_of?(node2.class)` instead of comparing classes.", 1212490233], + [193, 7, 270, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `sequence_similarity` is too high. [9/7]", 724822377], + [193, 7, 270, "Metrics/PerceivedComplexity: Perceived complexity for `sequence_similarity` is too high. [9/8]", 724822377], + [197, 23, 9, "Style/NumericPredicate: Use `len1.zero?` instead of `len1 == 0`.", 913205219], + [197, 36, 9, "Style/NumericPredicate: Use `len2.zero?` instead of `len2 == 0`.", 871697920], + [198, 23, 9, "Style/NumericPredicate: Use `len1.zero?` instead of `len1 == 0`.", 913205219], + [198, 36, 9, "Style/NumericPredicate: Use `len2.zero?` instead of `len2 == 0`.", 871697920], + [225, 7, 854, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<13, 29, 8> 32.77/17]", 2946547420], + [225, 7, 854, "Metrics/MethodLength: Method has too many lines. [20/10]", 2946547420] + ], + "lib/psych/merge/merge_result.rb:4276173304": [ + [140, 7, 421, "Metrics/MethodLength: Method has too many lines. [11/10]", 2459390040] + ], + "lib/psych/merge/node_wrapper.rb:1997974804": [ + [12, 5, 12280, "Metrics/ClassLength: Class has too many lines. [222/100]", 463540785], + [42, 7, 2039, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `initialize` is too high. [8/7]", 338533329], + [42, 21, 274, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 2646089467], + [144, 7, 699, "Metrics/MethodLength: Method has too many lines. [20/10]", 2676695829], + [210, 7, 985, "Metrics/MethodLength: Method has too many lines. [16/10]", 59427073], + [256, 7, 686, "Metrics/AbcSize: Assignment Branch Condition size for `compute_signature` is too high. [<4, 21, 13> 25.02/17]", 2657240579], + [256, 7, 686, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_signature` is too high. [14/7]", 2657240579], + [256, 7, 686, "Metrics/MethodLength: Method has too many lines. [18/10]", 2657240579], + [256, 7, 686, "Metrics/PerceivedComplexity: Perceived complexity for `compute_signature` is too high. [10/8]", 2657240579], + [277, 7, 425, "Metrics/MethodLength: Method has too many lines. [11/10]", 3170039988], + [310, 7, 1150, "Metrics/MethodLength: Method has too many lines. [24/10]", 647387009], + [321, 31, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [340, 7, 484, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `clamp_end_line_to_next_sibling!` is too high. [10/7]", 953824779], + [340, 7, 484, "Metrics/PerceivedComplexity: Perceived complexity for `clamp_end_line_to_next_sibling!` is too high. [10/8]", 953824779] + ], + "lib/psych/merge/smart_merger.rb:1750771088": [ + [45, 5, 10514, "Metrics/ClassLength: Class has too many lines. [192/100]", 4260193581], + [81, 7, 1336, "Metrics/MethodLength: Method has too many lines. [18/10]", 1713606127], + [81, 21, 557, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [16/5]", 1646356108], + [153, 7, 1440, "Metrics/AbcSize: Assignment Branch Condition size for `merge_with_debug` is too high. [<3, 24, 7> 25.18/17]", 695369520], + [153, 7, 1440, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_with_debug` is too high. [8/7]", 695369520], + [153, 7, 1440, "Metrics/MethodLength: Method has too many lines. [32/10]", 695369520], + [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:914772787": [ + [129, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [144, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [145, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [152, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ], + "spec/fixtures_integration_spec.rb:1717446685": [ + [3, 1, 9786, "Metrics/BlockLength: Block has too many lines. [222/25]", 1649396447], + [16, 3, 1302, "Metrics/BlockLength: Block has too many lines. [32/25]", 1546514966], + [52, 3, 2159, "Metrics/BlockLength: Block has too many lines. [28/25]", 270765486], + [109, 3, 1594, "Metrics/BlockLength: Block has too many lines. [41/25]", 568154065], + [227, 3, 1413, "Metrics/BlockLength: Block has too many lines. [29/25]", 1847754351] + ], + "spec/reproducible_merge_spec.rb:2168097366": [ + [3, 1, 5699, "Metrics/BlockLength: Block has too many lines. [107/25]", 3775945048], + [4, 3, 61, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1575360142], + [6, 3, 4847, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3343843514], + [47, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 3440433042], + [53, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3187380084] + ] +} diff --git a/gems/psych-merge/Gemfile b/gems/psych-merge/Gemfile index 8f0101b6b..10c6f0b22 100644 --- a/gems/psych-merge/Gemfile +++ b/gems/psych-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source "https://gem.coop" +source 'https://gem.coop' git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,8 +19,8 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ["~> 1.0", ">= 1.0.8"] -gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ['~> 1.0', '>= 1.0.8'] +gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ @@ -28,50 +28,46 @@ direct_sibling_gems = %w[ tree_haver yaml-merge ] -direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") +direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? if direct_sibling_gems.any? && - (direct_sibling_local || - ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) - direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") - direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) begin nomono_activation_requirements = nomono_requirements - nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) if File.file?(nomono_lockfile) nomono_locked_spec = Bundler::LockfileParser - .new(Bundler.read_file(nomono_lockfile)) - .specs - .find { |spec| spec.name == "nomono" } + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } nomono_locked = nomono_locked_spec && - Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) - if nomono_locked - nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] - end - end - Kernel.send(:gem, "nomono", *nomono_activation_requirements) - require "nomono/bundler" - if direct_sibling_templating && !direct_sibling_local - ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local eval_nomono_gems( gems: direct_sibling_gems, - prefix: "STRUCTUREDMERGE", - path_env: "STRUCTUREDMERGE_DEV", - root: ["src", "my", "structuredmerge"] + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] ) rescue LoadError - warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' ensure if direct_sibling_templating && !direct_sibling_local if direct_sibling_dev_was_set - ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original else - ENV.delete("STRUCTUREDMERGE_DEV") + ENV.delete('STRUCTUREDMERGE_DEV') end end end @@ -295,25 +291,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging -eval_gemfile "gemfiles/modular/debug.gemfile" +eval_gemfile 'gemfiles/modular/debug.gemfile' # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile "gemfiles/modular/coverage.gemfile" +eval_gemfile 'gemfiles/modular/coverage.gemfile' # Linting -eval_gemfile "gemfiles/modular/style.gemfile" +eval_gemfile 'gemfiles/modular/style.gemfile' # Documentation -eval_gemfile "gemfiles/modular/documentation.gemfile" +eval_gemfile 'gemfiles/modular/documentation.gemfile' # Optional -eval_gemfile "gemfiles/modular/optional.gemfile" +eval_gemfile 'gemfiles/modular/optional.gemfile' ### Std Lib Extracted Gems -eval_gemfile "gemfiles/modular/x_std_libs.gemfile" +eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' # See unlocked_deps appraisal for more details on irb inclusion -gem "irb", "~> 1.17" # ruby >= 2.7 +gem 'irb', '~> 1.17' # ruby >= 2.7 diff --git a/gems/psych-merge/Gemfile.lock b/gems/psych-merge/Gemfile.lock index 9fa08b960..2a1e618a8 100644 --- a/gems/psych-merge/Gemfile.lock +++ b/gems/psych-merge/Gemfile.lock @@ -18,39 +18,7 @@ PATH yaml-merge (= 7.1.0) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -59,192 +27,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -253,44 +36,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: yaml-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -310,12 +62,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -324,6 +70,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -379,6 +126,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -397,7 +153,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -537,23 +292,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -587,11 +344,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +390,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,17 +416,12 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) yaml-merge! yard (~> 0.9, >= 0.9.44) @@ -704,42 +430,26 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +462,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,12 +489,9 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 @@ -802,7 +501,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,19 +528,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,14 +552,10 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -876,7 +568,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/psych-merge/Rakefile b/gems/psych-merge/Rakefile index 8914e2104..0796b339a 100644 --- a/gems/psych-merge/Rakefile +++ b/gems/psych-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require "kettle/drift" + require 'kettle/drift' Kettle::Drift.install_tasks rescue LoadError - desc("(stub) kettle:drift:check is unavailable") - task("kettle:drift:check") do + desc('(stub) kettle:drift:check is unavailable') + task('kettle:drift:check') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:update is unavailable") - task("kettle:drift:update") do + desc('(stub) kettle:drift:update is unavailable') + task('kettle:drift:update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:force_update is unavailable") - task("kettle:drift:force_update") do + desc('(stub) kettle:drift:force_update is unavailable') + task('kettle:drift:force_update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift is unavailable") - task("kettle:drift" => "kettle:drift:update") + desc('(stub) kettle:drift is unavailable') + task('kettle:drift' => 'kettle:drift:update') end ### TEMPLATING TASKS diff --git a/gems/psych-merge/bin/yard b/gems/psych-merge/bin/yard index a7e8b6eed..5d516ad6f 100755 --- a/gems/psych-merge/bin/yard +++ b/gems/psych-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec("bundle", "exec", "rake", "yard") +exec('bundle', 'exec', 'rake', 'yard') diff --git a/gems/psych-merge/lib/psych/merge/version.rb b/gems/psych-merge/lib/psych/merge/version.rb index 518f12da4..aa65219d4 100644 --- a/gems/psych-merge/lib/psych/merge/version.rb +++ b/gems/psych-merge/lib/psych/merge/version.rb @@ -3,7 +3,7 @@ module Psych module Merge module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/zip-merge/Gemfile.lock b/gems/zip-merge/Gemfile.lock index 6c7ddf202..9238afb04 100644 --- a/gems/zip-merge/Gemfile.lock +++ b/gems/zip-merge/Gemfile.lock @@ -16,7 +16,242 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -24,6 +259,22 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -43,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -106,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -134,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -273,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -322,6 +584,14 @@ GEM delegate (~> 0.1) rspec (~> 3.0) timecop (>= 0.7, < 1) + token-resolver (2.0.4) + parslet (~> 2.0) + version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -368,22 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -392,13 +685,19 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) @@ -412,12 +711,28 @@ CHECKSUMS ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) + ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -425,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -437,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -464,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -475,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -502,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -513,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -525,14 +858,20 @@ CHECKSUMS thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73 timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 + token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd From 0990e9a9bb5e9456fc15cc652981392db5d4c5fd Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:26:04 -0600 Subject: [PATCH 175/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/citrus-toml-merge/.kettle-drift.lock | 60 ++- gems/citrus-toml-merge/.rubocop_gradual.lock | 16 +- gems/citrus-toml-merge/Gemfile | 40 ++ gems/citrus-toml-merge/Gemfile.lock | 59 ++- .../lib/citrus/toml/merge.rb | 6 +- gems/parslet-toml-merge/.kettle-drift.lock | 60 ++- gems/parslet-toml-merge/.rubocop_gradual.lock | 16 +- gems/parslet-toml-merge/Gemfile | 40 ++ gems/parslet-toml-merge/Gemfile.lock | 342 +----------------- .../lib/parslet/toml/merge.rb | 6 +- gems/psych-merge/Gemfile.lock | 318 +++++++++++++++- 11 files changed, 542 insertions(+), 421 deletions(-) diff --git a/gems/citrus-toml-merge/.kettle-drift.lock b/gems/citrus-toml-merge/.kettle-drift.lock index 9878fb8f5..508d631d8 100644 --- a/gems/citrus-toml-merge/.kettle-drift.lock +++ b/gems/citrus-toml-merge/.kettle-drift.lock @@ -5,7 +5,8 @@ "lines": [ 79, 119, - 159 + 159, + 199 ] } ], @@ -15,7 +16,8 @@ "lines": [ 90, 130, - 170 + 170, + 210 ] } ], @@ -25,7 +27,8 @@ "lines": [ 80, 120, - 160 + 160, + 200 ] } ], @@ -35,7 +38,8 @@ "lines": [ 92, 132, - 172 + 172, + 212 ] } ], @@ -45,7 +49,8 @@ "lines": [ 95, 135, - 175 + 175, + 215 ] } ], @@ -55,7 +60,8 @@ "lines": [ 81, 121, - 161 + 161, + 201 ] } ], @@ -66,7 +72,8 @@ 59, 99, 139, - 179 + 179, + 219 ] } ], @@ -76,7 +83,8 @@ "lines": [ 100, 140, - 180 + 180, + 220 ] } ], @@ -87,7 +95,8 @@ 42, 86, 126, - 166 + 166, + 206 ] } ], @@ -97,7 +106,8 @@ "lines": [ 109, 149, - 189 + 189, + 229 ] } ], @@ -108,7 +118,8 @@ 34, 78, 118, - 158 + 158, + 198 ] } ], @@ -119,7 +130,8 @@ 68, 108, 148, - 188 + 188, + 228 ] } ], @@ -129,7 +141,8 @@ "lines": [ 84, 124, - 164 + 164, + 204 ] } ], @@ -140,7 +153,8 @@ 47, 91, 131, - 171 + 171, + 211 ] } ], @@ -151,7 +165,8 @@ 43, 87, 127, - 167 + 167, + 207 ] } ], @@ -161,7 +176,8 @@ "lines": [ 85, 125, - 165 + 165, + 205 ] } ], @@ -171,7 +187,8 @@ "lines": [ 102, 142, - 182 + 182, + 222 ] } ], @@ -181,7 +198,8 @@ "lines": [ 101, 141, - 181 + 181, + 221 ] } ], @@ -191,7 +209,8 @@ "lines": [ 96, 136, - 176 + 176, + 216 ] } ], @@ -201,7 +220,8 @@ "lines": [ 105, 145, - 185 + 185, + 225 ] } ], diff --git a/gems/citrus-toml-merge/.rubocop_gradual.lock b/gems/citrus-toml-merge/.rubocop_gradual.lock index 4af8d888b..6289f37c0 100644 --- a/gems/citrus-toml-merge/.rubocop_gradual.lock +++ b/gems/citrus-toml-merge/.rubocop_gradual.lock @@ -82,15 +82,19 @@ "lib/citrus-toml-merge.rb:1706359962": [ [1, 1, 0, "Naming/FileName: The name of this source file (`citrus-toml-merge.rb`) should use snake_case.", 5381] ], - "lib/citrus/toml/merge.rb:4234713312": [ + "lib/citrus/toml/merge.rb:4256403494": [ [11, 5, 12, "Style/Documentation: Missing top-level documentation comment for `module Citrus::Toml::Merge`.", 2866359175], + [11, 5, 4979, "Metrics/ModuleLength: Module has too many lines. [104/100]", 3343629788], [12, 7, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631], - [92, 7, 17, "Style/Documentation: Missing top-level documentation comment for `class Citrus::Toml::Merge::SmartMerger`.", 497427992] + [76, 7, 1663, "Metrics/AbcSize: Assignment Branch Condition size for `merge_toml` is too high. [<7, 21, 8> 23.54/17]", 3550313116], + [76, 7, 1663, "Metrics/MethodLength: Method has too many lines. [27/10]", 3550313116], + [139, 7, 17, "Style/Documentation: Missing top-level documentation comment for `class Citrus::Toml::Merge::SmartMerger`.", 497427992] ], - "spec/fixtures_integration_spec.rb:673344638": [ - [3, 1, 5553, "Metrics/BlockLength: Block has too many lines. [122/25]", 3226186319], + "spec/fixtures_integration_spec.rb:239117620": [ + [3, 1, 7226, "Metrics/BlockLength: Block has too many lines. [159/25]", 3966119837], [26, 3, 1318, "Metrics/BlockLength: Block has too many lines. [34/25]", 4255752267], - [64, 3, 1804, "Metrics/BlockLength: Block has too many lines. [28/25]", 1255882875], - [106, 3, 1419, "Metrics/BlockLength: Block has too many lines. [29/25]", 944475815] + [64, 3, 2344, "Metrics/BlockLength: Block has too many lines. [36/25]", 228336363], + [114, 3, 1129, "Metrics/BlockLength: Block has too many lines. [27/25]", 2358141919], + [152, 3, 1419, "Metrics/BlockLength: Block has too many lines. [29/25]", 944475815] ] } diff --git a/gems/citrus-toml-merge/Gemfile b/gems/citrus-toml-merge/Gemfile index dcdae32da..582e63162 100644 --- a/gems/citrus-toml-merge/Gemfile +++ b/gems/citrus-toml-merge/Gemfile @@ -191,6 +191,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/citrus-toml-merge/Gemfile.lock b/gems/citrus-toml-merge/Gemfile.lock index 75bc67a58..4078ebd0e 100644 --- a/gems/citrus-toml-merge/Gemfile.lock +++ b/gems/citrus-toml-merge/Gemfile.lock @@ -275,6 +275,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -308,7 +324,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -363,18 +378,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -538,22 +542,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -659,9 +659,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -739,7 +739,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -760,10 +759,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -838,13 +837,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/citrus-toml-merge/lib/citrus/toml/merge.rb b/gems/citrus-toml-merge/lib/citrus/toml/merge.rb index c95f1c772..154717fe2 100644 --- a/gems/citrus-toml-merge/lib/citrus/toml/merge.rb +++ b/gems/citrus-toml-merge/lib/citrus/toml/merge.rb @@ -99,9 +99,11 @@ def merge_toml(template_source, destination_source, dialect, backend: nil) policies: [::Toml::Merge::DESTINATION_WINS_ARRAY_POLICY] } rescue ::Toml::Merge::TemplateParseError => e - { ok: false, diagnostics: [{ severity: 'error', category: 'template_parse_error', message: e.message }], policies: [] } + { ok: false, diagnostics: [{ severity: 'error', category: 'template_parse_error', message: e.message }], + policies: [] } rescue ::Toml::Merge::DestinationParseError => e - { ok: false, diagnostics: [{ severity: 'error', category: 'destination_parse_error', message: e.message }], policies: [] } + { ok: false, diagnostics: [{ severity: 'error', category: 'destination_parse_error', message: e.message }], + policies: [] } rescue StandardError => e { ok: false, diagnostics: [{ severity: 'error', category: 'merge_error', message: e.message }], policies: [] } end diff --git a/gems/parslet-toml-merge/.kettle-drift.lock b/gems/parslet-toml-merge/.kettle-drift.lock index 9878fb8f5..508d631d8 100644 --- a/gems/parslet-toml-merge/.kettle-drift.lock +++ b/gems/parslet-toml-merge/.kettle-drift.lock @@ -5,7 +5,8 @@ "lines": [ 79, 119, - 159 + 159, + 199 ] } ], @@ -15,7 +16,8 @@ "lines": [ 90, 130, - 170 + 170, + 210 ] } ], @@ -25,7 +27,8 @@ "lines": [ 80, 120, - 160 + 160, + 200 ] } ], @@ -35,7 +38,8 @@ "lines": [ 92, 132, - 172 + 172, + 212 ] } ], @@ -45,7 +49,8 @@ "lines": [ 95, 135, - 175 + 175, + 215 ] } ], @@ -55,7 +60,8 @@ "lines": [ 81, 121, - 161 + 161, + 201 ] } ], @@ -66,7 +72,8 @@ 59, 99, 139, - 179 + 179, + 219 ] } ], @@ -76,7 +83,8 @@ "lines": [ 100, 140, - 180 + 180, + 220 ] } ], @@ -87,7 +95,8 @@ 42, 86, 126, - 166 + 166, + 206 ] } ], @@ -97,7 +106,8 @@ "lines": [ 109, 149, - 189 + 189, + 229 ] } ], @@ -108,7 +118,8 @@ 34, 78, 118, - 158 + 158, + 198 ] } ], @@ -119,7 +130,8 @@ 68, 108, 148, - 188 + 188, + 228 ] } ], @@ -129,7 +141,8 @@ "lines": [ 84, 124, - 164 + 164, + 204 ] } ], @@ -140,7 +153,8 @@ 47, 91, 131, - 171 + 171, + 211 ] } ], @@ -151,7 +165,8 @@ 43, 87, 127, - 167 + 167, + 207 ] } ], @@ -161,7 +176,8 @@ "lines": [ 85, 125, - 165 + 165, + 205 ] } ], @@ -171,7 +187,8 @@ "lines": [ 102, 142, - 182 + 182, + 222 ] } ], @@ -181,7 +198,8 @@ "lines": [ 101, 141, - 181 + 181, + 221 ] } ], @@ -191,7 +209,8 @@ "lines": [ 96, 136, - 176 + 176, + 216 ] } ], @@ -201,7 +220,8 @@ "lines": [ 105, 145, - 185 + 185, + 225 ] } ], diff --git a/gems/parslet-toml-merge/.rubocop_gradual.lock b/gems/parslet-toml-merge/.rubocop_gradual.lock index e5c2b0575..8b3a18ec9 100644 --- a/gems/parslet-toml-merge/.rubocop_gradual.lock +++ b/gems/parslet-toml-merge/.rubocop_gradual.lock @@ -76,10 +76,13 @@ "lib/parslet-toml-merge.rb:1861016669": [ [1, 1, 0, "Naming/FileName: The name of this source file (`parslet-toml-merge.rb`) should use snake_case.", 5381] ], - "lib/parslet/toml/merge.rb:1828138684": [ + "lib/parslet/toml/merge.rb:2588564359": [ [11, 5, 12, "Style/Documentation: Missing top-level documentation comment for `module Parslet::Toml::Merge`.", 2866359175], + [11, 5, 4976, "Metrics/ModuleLength: Module has too many lines. [104/100]", 2387409799], [12, 7, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631], - [92, 7, 17, "Style/Documentation: Missing top-level documentation comment for `class Parslet::Toml::Merge::SmartMerger`.", 497427992] + [76, 7, 1663, "Metrics/AbcSize: Assignment Branch Condition size for `merge_toml` is too high. [<7, 21, 8> 23.54/17]", 3550313116], + [76, 7, 1663, "Metrics/MethodLength: Method has too many lines. [27/10]", 3550313116], + [139, 7, 17, "Style/Documentation: Missing top-level documentation comment for `class Parslet::Toml::Merge::SmartMerger`.", 497427992] ], "parslet-toml-merge.gemspec:3820321013": [ [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], @@ -87,10 +90,11 @@ [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] ], - "spec/fixtures_integration_spec.rb:132248057": [ - [3, 1, 5564, "Metrics/BlockLength: Block has too many lines. [122/25]", 871768424], + "spec/fixtures_integration_spec.rb:3425150740": [ + [3, 1, 7238, "Metrics/BlockLength: Block has too many lines. [159/25]", 118357210], [26, 3, 1324, "Metrics/BlockLength: Block has too many lines. [34/25]", 550487180], - [64, 3, 1804, "Metrics/BlockLength: Block has too many lines. [28/25]", 1255882875], - [106, 3, 1425, "Metrics/BlockLength: Block has too many lines. [29/25]", 944475815] + [64, 3, 2344, "Metrics/BlockLength: Block has too many lines. [36/25]", 228336363], + [114, 3, 1130, "Metrics/BlockLength: Block has too many lines. [27/25]", 2320497656], + [152, 3, 1425, "Metrics/BlockLength: Block has too many lines. [29/25]", 944475815] ] } diff --git a/gems/parslet-toml-merge/Gemfile b/gems/parslet-toml-merge/Gemfile index 80faabf44..b3619a3fb 100644 --- a/gems/parslet-toml-merge/Gemfile +++ b/gems/parslet-toml-merge/Gemfile @@ -191,6 +191,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/parslet-toml-merge/Gemfile.lock b/gems/parslet-toml-merge/Gemfile.lock index 3293a63f0..3217bd106 100644 --- a/gems/parslet-toml-merge/Gemfile.lock +++ b/gems/parslet-toml-merge/Gemfile.lock @@ -17,264 +17,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: toml-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +35,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +48,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +111,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +139,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +278,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -589,9 +332,11 @@ GEM version_gem (~> 1.1, >= 1.1.13) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +383,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +408,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +441,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +453,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -789,13 +481,10 @@ CHECKSUMS parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 parslet-toml-merge (7.1.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +492,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +519,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +530,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -861,17 +545,14 @@ CHECKSUMS token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +560,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/parslet-toml-merge/lib/parslet/toml/merge.rb b/gems/parslet-toml-merge/lib/parslet/toml/merge.rb index d49ebc44f..25fa33f1b 100644 --- a/gems/parslet-toml-merge/lib/parslet/toml/merge.rb +++ b/gems/parslet-toml-merge/lib/parslet/toml/merge.rb @@ -99,9 +99,11 @@ def merge_toml(template_source, destination_source, dialect, backend: nil) policies: [::Toml::Merge::DESTINATION_WINS_ARRAY_POLICY] } rescue ::Toml::Merge::TemplateParseError => e - { ok: false, diagnostics: [{ severity: 'error', category: 'template_parse_error', message: e.message }], policies: [] } + { ok: false, diagnostics: [{ severity: 'error', category: 'template_parse_error', message: e.message }], + policies: [] } rescue ::Toml::Merge::DestinationParseError => e - { ok: false, diagnostics: [{ severity: 'error', category: 'destination_parse_error', message: e.message }], policies: [] } + { ok: false, diagnostics: [{ severity: 'error', category: 'destination_parse_error', message: e.message }], + policies: [] } rescue StandardError => e { ok: false, diagnostics: [{ severity: 'error', category: 'merge_error', message: e.message }], policies: [] } end diff --git a/gems/psych-merge/Gemfile.lock b/gems/psych-merge/Gemfile.lock index 2a1e618a8..a12016d3e 100644 --- a/gems/psych-merge/Gemfile.lock +++ b/gems/psych-merge/Gemfile.lock @@ -18,7 +18,39 @@ PATH yaml-merge (= 7.1.0) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -27,7 +59,192 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -36,13 +253,28 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: yaml-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -62,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -125,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -153,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -292,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -344,6 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -390,24 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -416,12 +685,17 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) yaml-merge! yard (~> 0.9, >= 0.9.44) @@ -430,19 +704,35 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -450,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -462,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -489,9 +788,12 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 @@ -501,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -528,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -539,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -552,10 +859,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -568,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 7d6cbb74604dd67abf363e36910bbe98b6c2ecd6 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:26:07 -0600 Subject: [PATCH 176/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/citrus-toml-merge/Gemfile.lock | 392 +++------------------------- 1 file changed, 38 insertions(+), 354 deletions(-) diff --git a/gems/citrus-toml-merge/Gemfile.lock b/gems/citrus-toml-merge/Gemfile.lock index 4078ebd0e..eff6e8295 100644 --- a/gems/citrus-toml-merge/Gemfile.lock +++ b/gems/citrus-toml-merge/Gemfile.lock @@ -17,280 +17,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: toml-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -302,6 +35,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -310,12 +48,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -324,6 +56,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -379,6 +112,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -397,7 +139,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -537,23 +278,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -587,11 +330,14 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +384,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,61 +409,40 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +455,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +482,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +493,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,19 +520,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,19 +544,16 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +561,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From dba367875f32ec16fd166538a1e67582040d2d0d Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:26:28 -0600 Subject: [PATCH 177/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/citrus-toml-merge/Gemfile.lock | 341 ++++++++++++++++- gems/commonmarker-merge/.kettle-drift.lock | 60 ++- gems/commonmarker-merge/.rubocop_gradual.lock | 6 +- gems/commonmarker-merge/Gemfile | 40 ++ gems/commonmarker-merge/Gemfile.lock | 333 +---------------- gems/kramdown-merge/.kettle-drift.lock | 60 ++- gems/kramdown-merge/Gemfile | 70 +++- gems/kramdown-merge/Rakefile | 18 +- .../lib/kramdown/merge/version.rb | 2 +- gems/parslet-toml-merge/Gemfile.lock | 342 +++++++++++++++++- 10 files changed, 862 insertions(+), 410 deletions(-) diff --git a/gems/citrus-toml-merge/Gemfile.lock b/gems/citrus-toml-merge/Gemfile.lock index eff6e8295..75bc67a58 100644 --- a/gems/citrus-toml-merge/Gemfile.lock +++ b/gems/citrus-toml-merge/Gemfile.lock @@ -17,13 +17,264 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: toml-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -35,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -48,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -111,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -139,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -278,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -330,14 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -384,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -409,33 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -443,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -455,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -482,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -493,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -520,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -531,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -544,16 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -561,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/commonmarker-merge/.kettle-drift.lock b/gems/commonmarker-merge/.kettle-drift.lock index 9878fb8f5..508d631d8 100644 --- a/gems/commonmarker-merge/.kettle-drift.lock +++ b/gems/commonmarker-merge/.kettle-drift.lock @@ -5,7 +5,8 @@ "lines": [ 79, 119, - 159 + 159, + 199 ] } ], @@ -15,7 +16,8 @@ "lines": [ 90, 130, - 170 + 170, + 210 ] } ], @@ -25,7 +27,8 @@ "lines": [ 80, 120, - 160 + 160, + 200 ] } ], @@ -35,7 +38,8 @@ "lines": [ 92, 132, - 172 + 172, + 212 ] } ], @@ -45,7 +49,8 @@ "lines": [ 95, 135, - 175 + 175, + 215 ] } ], @@ -55,7 +60,8 @@ "lines": [ 81, 121, - 161 + 161, + 201 ] } ], @@ -66,7 +72,8 @@ 59, 99, 139, - 179 + 179, + 219 ] } ], @@ -76,7 +83,8 @@ "lines": [ 100, 140, - 180 + 180, + 220 ] } ], @@ -87,7 +95,8 @@ 42, 86, 126, - 166 + 166, + 206 ] } ], @@ -97,7 +106,8 @@ "lines": [ 109, 149, - 189 + 189, + 229 ] } ], @@ -108,7 +118,8 @@ 34, 78, 118, - 158 + 158, + 198 ] } ], @@ -119,7 +130,8 @@ 68, 108, 148, - 188 + 188, + 228 ] } ], @@ -129,7 +141,8 @@ "lines": [ 84, 124, - 164 + 164, + 204 ] } ], @@ -140,7 +153,8 @@ 47, 91, 131, - 171 + 171, + 211 ] } ], @@ -151,7 +165,8 @@ 43, 87, 127, - 167 + 167, + 207 ] } ], @@ -161,7 +176,8 @@ "lines": [ 85, 125, - 165 + 165, + 205 ] } ], @@ -171,7 +187,8 @@ "lines": [ 102, 142, - 182 + 182, + 222 ] } ], @@ -181,7 +198,8 @@ "lines": [ 101, 141, - 181 + 181, + 221 ] } ], @@ -191,7 +209,8 @@ "lines": [ 96, 136, - 176 + 176, + 216 ] } ], @@ -201,7 +220,8 @@ "lines": [ 105, 145, - 185 + 185, + 225 ] } ], diff --git a/gems/commonmarker-merge/.rubocop_gradual.lock b/gems/commonmarker-merge/.rubocop_gradual.lock index 266832971..4c6b37486 100644 --- a/gems/commonmarker-merge/.rubocop_gradual.lock +++ b/gems/commonmarker-merge/.rubocop_gradual.lock @@ -82,11 +82,11 @@ "lib/commonmarker-merge.rb:2377410954": [ [1, 1, 0, "Naming/FileName: The name of this source file (`commonmarker-merge.rb`) should use snake_case.", 5381] ], - "lib/commonmarker/merge.rb:3142122749": [ + "lib/commonmarker/merge.rb:3124175488": [ [10, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Commonmarker::Merge`.", 2866359175], - [10, 3, 8088, "Metrics/ModuleLength: Module has too many lines. [187/100]", 3577384442], + [10, 3, 8154, "Metrics/ModuleLength: Module has too many lines. [187/100]", 3577384442], [11, 5, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631], - [56, 5, 862, "Metrics/MethodLength: Method has too many lines. [24/10]", 336762865], + [56, 5, 928, "Metrics/MethodLength: Method has too many lines. [24/10]", 2523239963], [88, 5, 1442, "Metrics/AbcSize: Assignment Branch Condition size for `merge_markdown` is too high. [<11, 31, 11> 34.68/17]", 2548079514], [88, 5, 1442, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_markdown` is too high. [11/7]", 2548079514], [88, 5, 1442, "Metrics/MethodLength: Method has too many lines. [27/10]", 2548079514], diff --git a/gems/commonmarker-merge/Gemfile b/gems/commonmarker-merge/Gemfile index c5d98946b..4ac2ff4d0 100644 --- a/gems/commonmarker-merge/Gemfile +++ b/gems/commonmarker-merge/Gemfile @@ -191,6 +191,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/commonmarker-merge/Gemfile.lock b/gems/commonmarker-merge/Gemfile.lock index a7bd19904..9f517c718 100644 --- a/gems/commonmarker-merge/Gemfile.lock +++ b/gems/commonmarker-merge/Gemfile.lock @@ -17,264 +17,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +35,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -363,8 +117,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +145,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +284,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +336,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +387,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,46 +413,30 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca @@ -740,7 +452,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +464,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +492,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +503,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +530,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +541,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +554,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +569,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/kramdown-merge/.kettle-drift.lock b/gems/kramdown-merge/.kettle-drift.lock index 9878fb8f5..508d631d8 100644 --- a/gems/kramdown-merge/.kettle-drift.lock +++ b/gems/kramdown-merge/.kettle-drift.lock @@ -5,7 +5,8 @@ "lines": [ 79, 119, - 159 + 159, + 199 ] } ], @@ -15,7 +16,8 @@ "lines": [ 90, 130, - 170 + 170, + 210 ] } ], @@ -25,7 +27,8 @@ "lines": [ 80, 120, - 160 + 160, + 200 ] } ], @@ -35,7 +38,8 @@ "lines": [ 92, 132, - 172 + 172, + 212 ] } ], @@ -45,7 +49,8 @@ "lines": [ 95, 135, - 175 + 175, + 215 ] } ], @@ -55,7 +60,8 @@ "lines": [ 81, 121, - 161 + 161, + 201 ] } ], @@ -66,7 +72,8 @@ 59, 99, 139, - 179 + 179, + 219 ] } ], @@ -76,7 +83,8 @@ "lines": [ 100, 140, - 180 + 180, + 220 ] } ], @@ -87,7 +95,8 @@ 42, 86, 126, - 166 + 166, + 206 ] } ], @@ -97,7 +106,8 @@ "lines": [ 109, 149, - 189 + 189, + 229 ] } ], @@ -108,7 +118,8 @@ 34, 78, 118, - 158 + 158, + 198 ] } ], @@ -119,7 +130,8 @@ 68, 108, 148, - 188 + 188, + 228 ] } ], @@ -129,7 +141,8 @@ "lines": [ 84, 124, - 164 + 164, + 204 ] } ], @@ -140,7 +153,8 @@ 47, 91, 131, - 171 + 171, + 211 ] } ], @@ -151,7 +165,8 @@ 43, 87, 127, - 167 + 167, + 207 ] } ], @@ -161,7 +176,8 @@ "lines": [ 85, 125, - 165 + 165, + 205 ] } ], @@ -171,7 +187,8 @@ "lines": [ 102, 142, - 182 + 182, + 222 ] } ], @@ -181,7 +198,8 @@ "lines": [ 101, 141, - 181 + 181, + 221 ] } ], @@ -191,7 +209,8 @@ "lines": [ 96, 136, - 176 + 176, + 216 ] } ], @@ -201,7 +220,8 @@ "lines": [ 105, 145, - 185 + 185, + 225 ] } ], diff --git a/gems/kramdown-merge/Gemfile b/gems/kramdown-merge/Gemfile index d2345c8bd..187b00593 100644 --- a/gems/kramdown-merge/Gemfile +++ b/gems/kramdown-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source 'https://gem.coop' +source "https://gem.coop" git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,17 +19,61 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ['~> 1.0', '>= 1.0.8'] -gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ["~> 1.0", ">= 1.0.8"] +gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ markdown-merge ] -direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') +direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? + +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) + direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") + direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == "nomono" } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + if nomono_locked + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] + end + end + Kernel.send(:gem, "nomono", *nomono_activation_requirements) + require "nomono/bundler" + if direct_sibling_templating && !direct_sibling_local + ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + end + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: "STRUCTUREDMERGE", + path_env: "STRUCTUREDMERGE_DEV", + root: ["src", "my", "structuredmerge"] + ) + rescue LoadError + warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + else + ENV.delete("STRUCTUREDMERGE_DEV") + end + end + end +end if direct_sibling_gems.any? && (direct_sibling_local || @@ -209,25 +253,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? # Debugging -eval_gemfile 'gemfiles/modular/debug.gemfile' +eval_gemfile "gemfiles/modular/debug.gemfile" # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile 'gemfiles/modular/coverage.gemfile' +eval_gemfile "gemfiles/modular/coverage.gemfile" # Linting -eval_gemfile 'gemfiles/modular/style.gemfile' +eval_gemfile "gemfiles/modular/style.gemfile" # Documentation -eval_gemfile 'gemfiles/modular/documentation.gemfile' +eval_gemfile "gemfiles/modular/documentation.gemfile" # Optional -eval_gemfile 'gemfiles/modular/optional.gemfile' +eval_gemfile "gemfiles/modular/optional.gemfile" ### Std Lib Extracted Gems -eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' +eval_gemfile "gemfiles/modular/x_std_libs.gemfile" # See unlocked_deps appraisal for more details on irb inclusion -gem 'irb', '~> 1.17' # ruby >= 2.7 +gem "irb", "~> 1.17" # ruby >= 2.7 diff --git a/gems/kramdown-merge/Rakefile b/gems/kramdown-merge/Rakefile index 794a96e57..98bb2ef06 100644 --- a/gems/kramdown-merge/Rakefile +++ b/gems/kramdown-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require 'kettle/drift' + require "kettle/drift" Kettle::Drift.install_tasks rescue LoadError - desc('(stub) kettle:drift:check is unavailable') - task('kettle:drift:check') do + desc("(stub) kettle:drift:check is unavailable") + task("kettle:drift:check") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:update is unavailable') - task('kettle:drift:update') do + desc("(stub) kettle:drift:update is unavailable") + task("kettle:drift:update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:force_update is unavailable') - task('kettle:drift:force_update') do + desc("(stub) kettle:drift:force_update is unavailable") + task("kettle:drift:force_update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift is unavailable') - task('kettle:drift' => 'kettle:drift:update') + desc("(stub) kettle:drift is unavailable") + task("kettle:drift" => "kettle:drift:update") end ### TEMPLATING TASKS diff --git a/gems/kramdown-merge/lib/kramdown/merge/version.rb b/gems/kramdown-merge/lib/kramdown/merge/version.rb index feddb4113..058dbe0e1 100644 --- a/gems/kramdown-merge/lib/kramdown/merge/version.rb +++ b/gems/kramdown-merge/lib/kramdown/merge/version.rb @@ -3,7 +3,7 @@ module Kramdown module Merge module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/parslet-toml-merge/Gemfile.lock b/gems/parslet-toml-merge/Gemfile.lock index 3217bd106..3293a63f0 100644 --- a/gems/parslet-toml-merge/Gemfile.lock +++ b/gems/parslet-toml-merge/Gemfile.lock @@ -17,13 +17,264 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: toml-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -35,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -48,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -111,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -139,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -278,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -332,11 +589,9 @@ GEM version_gem (~> 1.1, >= 1.1.13) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -383,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -408,32 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -441,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -453,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -481,10 +789,13 @@ CHECKSUMS parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 parslet-toml-merge (7.1.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -492,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -519,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -530,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -545,14 +861,17 @@ CHECKSUMS token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -560,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 94d595e411ed20164d90dbfa637152ff42bf162c Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:26:40 -0600 Subject: [PATCH 178/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/commonmarker-merge/Gemfile.lock | 333 ++++++++++++++++- gems/kramdown-merge/.rubocop_gradual.lock | 20 +- gems/kramdown-merge/Gemfile | 68 ++-- gems/kramdown-merge/Gemfile.lock | 345 +----------------- gems/kramdown-merge/Rakefile | 18 +- .../lib/kramdown/merge/version.rb | 2 +- 6 files changed, 390 insertions(+), 396 deletions(-) diff --git a/gems/commonmarker-merge/Gemfile.lock b/gems/commonmarker-merge/Gemfile.lock index 9f517c718..a7bd19904 100644 --- a/gems/commonmarker-merge/Gemfile.lock +++ b/gems/commonmarker-merge/Gemfile.lock @@ -17,13 +17,264 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: markdown-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -35,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -117,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -145,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -284,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -336,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -387,24 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -413,30 +685,46 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca @@ -452,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -464,20 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -492,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -503,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -530,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -541,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -554,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -569,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/kramdown-merge/.rubocop_gradual.lock b/gems/kramdown-merge/.rubocop_gradual.lock index bf8d87dc0..d9d23567b 100644 --- a/gems/kramdown-merge/.rubocop_gradual.lock +++ b/gems/kramdown-merge/.rubocop_gradual.lock @@ -82,13 +82,23 @@ "lib/kramdown-merge.rb:2196362882": [ [1, 1, 0, "Naming/FileName: The name of this source file (`kramdown-merge.rb`) should use snake_case.", 5381] ], - "lib/kramdown/merge.rb:1323392188": [ + "lib/kramdown/merge.rb:1542815088": [ [10, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Kramdown::Merge`.", 2866359175], - [10, 3, 6831, "Metrics/ModuleLength: Module has too many lines. [158/100]", 3521641961], + [10, 3, 7119, "Metrics/ModuleLength: Module has too many lines. [163/100]", 4032157679], [11, 5, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631], - [48, 5, 980, "Metrics/MethodLength: Method has too many lines. [25/10]", 2523239963], - [91, 5, 613, "Metrics/MethodLength: Method has too many lines. [11/10]", 2967276583], - [91, 52, 144, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3050457682] + [48, 5, 1042, "Metrics/MethodLength: Method has too many lines. [25/10]", 2523239963], + [91, 5, 652, "Metrics/MethodLength: Method has too many lines. [12/10]", 1548795337], + [91, 52, 144, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3050457682], + [108, 5, 667, "Metrics/MethodLength: Method has too many lines. [11/10]", 1334645416], + [124, 5, 684, "Metrics/MethodLength: Method has too many lines. [11/10]", 107846886], + [140, 5, 662, "Metrics/MethodLength: Method has too many lines. [11/10]", 2351504264], + [156, 5, 681, "Metrics/MethodLength: Method has too many lines. [11/10]", 1477270603] + ], + "lib/kramdown/merge/backend.rb:2821144035": [ + [5, 5, 14, "Style/Documentation: Missing top-level documentation comment for `module Kramdown::Merge::Backend`.", 1362832539], + [13, 7, 14, "Style/Documentation: Missing top-level documentation comment for `class Kramdown::Merge::Backend::Language`.", 3674592793], + [30, 7, 12, "Style/Documentation: Missing top-level documentation comment for `class Kramdown::Merge::Backend::Parser`.", 2485220908], + [41, 7, 10, "Style/Documentation: Missing top-level documentation comment for `class Kramdown::Merge::Backend::Node`.", 3515419275] ], "spec/fixtures_integration_spec.rb:3613778634": [ [3, 1, 11994, "Metrics/BlockLength: Block has too many lines. [261/25]", 885184468], diff --git a/gems/kramdown-merge/Gemfile b/gems/kramdown-merge/Gemfile index 187b00593..266a10cbf 100644 --- a/gems/kramdown-merge/Gemfile +++ b/gems/kramdown-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source "https://gem.coop" +source 'https://gem.coop' git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,57 +19,53 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ["~> 1.0", ">= 1.0.8"] -gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ['~> 1.0', '>= 1.0.8'] +gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ markdown-merge ] -direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") +direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? if direct_sibling_gems.any? && - (direct_sibling_local || - ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) - direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") - direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) begin nomono_activation_requirements = nomono_requirements - nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) if File.file?(nomono_lockfile) nomono_locked_spec = Bundler::LockfileParser - .new(Bundler.read_file(nomono_lockfile)) - .specs - .find { |spec| spec.name == "nomono" } + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } nomono_locked = nomono_locked_spec && - Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) - if nomono_locked - nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] - end - end - Kernel.send(:gem, "nomono", *nomono_activation_requirements) - require "nomono/bundler" - if direct_sibling_templating && !direct_sibling_local - ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local eval_nomono_gems( gems: direct_sibling_gems, - prefix: "STRUCTUREDMERGE", - path_env: "STRUCTUREDMERGE_DEV", - root: ["src", "my", "structuredmerge"] + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] ) rescue LoadError - warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' ensure if direct_sibling_templating && !direct_sibling_local if direct_sibling_dev_was_set - ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original else - ENV.delete("STRUCTUREDMERGE_DEV") + ENV.delete('STRUCTUREDMERGE_DEV') end end end @@ -253,25 +249,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging -eval_gemfile "gemfiles/modular/debug.gemfile" +eval_gemfile 'gemfiles/modular/debug.gemfile' # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile "gemfiles/modular/coverage.gemfile" +eval_gemfile 'gemfiles/modular/coverage.gemfile' # Linting -eval_gemfile "gemfiles/modular/style.gemfile" +eval_gemfile 'gemfiles/modular/style.gemfile' # Documentation -eval_gemfile "gemfiles/modular/documentation.gemfile" +eval_gemfile 'gemfiles/modular/documentation.gemfile' # Optional -eval_gemfile "gemfiles/modular/optional.gemfile" +eval_gemfile 'gemfiles/modular/optional.gemfile' ### Std Lib Extracted Gems -eval_gemfile "gemfiles/modular/x_std_libs.gemfile" +eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' # See unlocked_deps appraisal for more details on irb inclusion -gem "irb", "~> 1.17" # ruby >= 2.7 +gem 'irb', '~> 1.17' # ruby >= 2.7 diff --git a/gems/kramdown-merge/Gemfile.lock b/gems/kramdown-merge/Gemfile.lock index 59d980821..4bd6f7840 100644 --- a/gems/kramdown-merge/Gemfile.lock +++ b/gems/kramdown-merge/Gemfile.lock @@ -17,264 +17,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -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.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +35,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +48,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +111,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +139,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +278,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +330,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +381,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +407,31 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +439,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,15 +451,11 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 @@ -772,8 +466,6 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +480,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +491,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +518,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +529,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +542,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +557,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/kramdown-merge/Rakefile b/gems/kramdown-merge/Rakefile index 98bb2ef06..794a96e57 100644 --- a/gems/kramdown-merge/Rakefile +++ b/gems/kramdown-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require "kettle/drift" + require 'kettle/drift' Kettle::Drift.install_tasks rescue LoadError - desc("(stub) kettle:drift:check is unavailable") - task("kettle:drift:check") do + desc('(stub) kettle:drift:check is unavailable') + task('kettle:drift:check') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:update is unavailable") - task("kettle:drift:update") do + desc('(stub) kettle:drift:update is unavailable') + task('kettle:drift:update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:force_update is unavailable") - task("kettle:drift:force_update") do + desc('(stub) kettle:drift:force_update is unavailable') + task('kettle:drift:force_update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift is unavailable") - task("kettle:drift" => "kettle:drift:update") + desc('(stub) kettle:drift is unavailable') + task('kettle:drift' => 'kettle:drift:update') end ### TEMPLATING TASKS diff --git a/gems/kramdown-merge/lib/kramdown/merge/version.rb b/gems/kramdown-merge/lib/kramdown/merge/version.rb index 058dbe0e1..feddb4113 100644 --- a/gems/kramdown-merge/lib/kramdown/merge/version.rb +++ b/gems/kramdown-merge/lib/kramdown/merge/version.rb @@ -3,7 +3,7 @@ module Kramdown module Merge module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end From d3ac029f9d6d708a574fb3133d0bee4cb12bf359 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:27:03 -0600 Subject: [PATCH 179/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/kramdown-merge/Gemfile.lock | 345 +++++++++++++++++- gems/prism-merge/.kettle-drift.lock | 60 ++- gems/prism-merge/.rubocop_gradual.lock | 260 ++++++------- gems/prism-merge/Gemfile | 40 ++ gems/prism-merge/Gemfile.lock | 345 +----------------- .../prism/merge/block_directive_detector.rb | 4 +- .../lib/prism/merge/method_match_refiner.rb | 1 - .../prism/merge/recursive_node_body_merger.rb | 4 +- 8 files changed, 536 insertions(+), 523 deletions(-) diff --git a/gems/kramdown-merge/Gemfile.lock b/gems/kramdown-merge/Gemfile.lock index 4bd6f7840..59d980821 100644 --- a/gems/kramdown-merge/Gemfile.lock +++ b/gems/kramdown-merge/Gemfile.lock @@ -17,13 +17,264 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: markdown-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -35,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -48,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -111,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -139,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -278,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -330,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,24 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -407,31 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -439,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -451,11 +753,15 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 @@ -466,6 +772,8 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -480,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -491,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -518,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -529,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -542,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/prism-merge/.kettle-drift.lock b/gems/prism-merge/.kettle-drift.lock index 9878fb8f5..508d631d8 100644 --- a/gems/prism-merge/.kettle-drift.lock +++ b/gems/prism-merge/.kettle-drift.lock @@ -5,7 +5,8 @@ "lines": [ 79, 119, - 159 + 159, + 199 ] } ], @@ -15,7 +16,8 @@ "lines": [ 90, 130, - 170 + 170, + 210 ] } ], @@ -25,7 +27,8 @@ "lines": [ 80, 120, - 160 + 160, + 200 ] } ], @@ -35,7 +38,8 @@ "lines": [ 92, 132, - 172 + 172, + 212 ] } ], @@ -45,7 +49,8 @@ "lines": [ 95, 135, - 175 + 175, + 215 ] } ], @@ -55,7 +60,8 @@ "lines": [ 81, 121, - 161 + 161, + 201 ] } ], @@ -66,7 +72,8 @@ 59, 99, 139, - 179 + 179, + 219 ] } ], @@ -76,7 +83,8 @@ "lines": [ 100, 140, - 180 + 180, + 220 ] } ], @@ -87,7 +95,8 @@ 42, 86, 126, - 166 + 166, + 206 ] } ], @@ -97,7 +106,8 @@ "lines": [ 109, 149, - 189 + 189, + 229 ] } ], @@ -108,7 +118,8 @@ 34, 78, 118, - 158 + 158, + 198 ] } ], @@ -119,7 +130,8 @@ 68, 108, 148, - 188 + 188, + 228 ] } ], @@ -129,7 +141,8 @@ "lines": [ 84, 124, - 164 + 164, + 204 ] } ], @@ -140,7 +153,8 @@ 47, 91, 131, - 171 + 171, + 211 ] } ], @@ -151,7 +165,8 @@ 43, 87, 127, - 167 + 167, + 207 ] } ], @@ -161,7 +176,8 @@ "lines": [ 85, 125, - 165 + 165, + 205 ] } ], @@ -171,7 +187,8 @@ "lines": [ 102, 142, - 182 + 182, + 222 ] } ], @@ -181,7 +198,8 @@ "lines": [ 101, 141, - 181 + 181, + 221 ] } ], @@ -191,7 +209,8 @@ "lines": [ 96, 136, - 176 + 176, + 216 ] } ], @@ -201,7 +220,8 @@ "lines": [ 105, 145, - 185 + 185, + 225 ] } ], diff --git a/gems/prism-merge/.rubocop_gradual.lock b/gems/prism-merge/.rubocop_gradual.lock index a0d47aef9..e28d99e64 100644 --- a/gems/prism-merge/.rubocop_gradual.lock +++ b/gems/prism-merge/.rubocop_gradual.lock @@ -76,9 +76,9 @@ "lib/prism-merge.rb:226590672": [ [1, 1, 0, "Naming/FileName: The name of this source file (`prism-merge.rb`) should use snake_case.", 5381] ], - "lib/prism/merge.rb:3873409785": [ + "lib/prism/merge.rb:3389866865": [ [12, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Prism::Merge`.", 2866359175], - [12, 3, 53263, "Metrics/ModuleLength: Module has too many lines. [1222/100]", 1955834049], + [12, 3, 52319, "Metrics/ModuleLength: Module has too many lines. [1195/100]", 1955834049], [13, 5, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631], [24, 5, 16, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::ParseError`.", 362242086], [120, 5, 1996, "Metrics/MethodLength: Method has too many lines. [42/10]", 709892915], @@ -92,12 +92,13 @@ [304, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 180584319], [323, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 949635646], [361, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1330685294], - [445, 5, 811, "Metrics/MethodLength: Method has too many lines. [21/10]", 2894794051], + [445, 5, 893, "Metrics/AbcSize: Assignment Branch Condition size for `parse_ruby` is too high. [<3, 17, 7> 18.63/17]", 2894794051], + [445, 5, 893, "Metrics/MethodLength: Method has too many lines. [21/10]", 2894794051], [471, 5, 491, "Metrics/MethodLength: Method has too many lines. [12/10]", 3211170428], - [486, 5, 3212, "Metrics/AbcSize: Assignment Branch Condition size for `parse_ruby_normalized` is too high. [<20, 64, 28> 72.66/17]", 1170714005], - [486, 5, 3212, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_ruby_normalized` is too high. [23/7]", 1170714005], - [486, 5, 3212, "Metrics/MethodLength: Method has too many lines. [70/10]", 1170714005], - [486, 5, 3212, "Metrics/PerceivedComplexity: Perceived complexity for `parse_ruby_normalized` is too high. [23/8]", 1170714005], + [486, 5, 3294, "Metrics/AbcSize: Assignment Branch Condition size for `parse_ruby_normalized` is too high. [<20, 68, 28> 76.21/17]", 3878823268], + [486, 5, 3294, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_ruby_normalized` is too high. [23/7]", 3878823268], + [486, 5, 3294, "Metrics/MethodLength: Method has too many lines. [70/10]", 3878823268], + [486, 5, 3294, "Metrics/PerceivedComplexity: Perceived complexity for `parse_ruby_normalized` is too high. [23/8]", 3878823268], [566, 5, 3671, "Metrics/AbcSize: Assignment Branch Condition size for `apply_edit_projection` is too high. [<14, 62, 19> 66.34/17]", 1859418783], [566, 5, 3671, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_edit_projection` is too high. [12/7]", 1859418783], [566, 5, 3671, "Metrics/MethodLength: Method has too many lines. [66/10]", 1859418783], @@ -127,27 +128,24 @@ [926, 5, 849, "Metrics/MethodLength: Method has too many lines. [23/10]", 2509812469], [957, 5, 1195, "Metrics/AbcSize: Assignment Branch Condition size for `prism_ruby_surfaces_for_owner` is too high. [<6, 19, 3> 20.15/17]", 1713430182], [957, 5, 1195, "Metrics/MethodLength: Method has too many lines. [20/10]", 1713430182], - [982, 5, 1563, "Metrics/AbcSize: Assignment Branch Condition size for `prism_ruby_example_surfaces` is too high. [<9, 26, 9> 28.95/17]", 2122389118], - [982, 5, 1563, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `prism_ruby_example_surfaces` is too high. [9/7]", 2122389118], - [982, 5, 1563, "Metrics/MethodLength: Method has too many lines. [28/10]", 2122389118], - [982, 5, 1563, "Metrics/PerceivedComplexity: Perceived complexity for `prism_ruby_example_surfaces` is too high. [9/8]", 2122389118], - [1042, 7, 3, "Layout/BlockAlignment: `end` at 1042, 6 is not aligned with `%w[coding encoding frozen_string_literal shareable_constant_value typed` at 1039, 22 or `warn_indent].any? do |prefix|` at 1040, 25.", 193405706], - [1088, 5, 421, "Metrics/MethodLength: Method has too many lines. [14/10]", 26440736], - [1119, 5, 827, "Metrics/MethodLength: Method has too many lines. [18/10]", 4288402374], - [1160, 5, 876, "Metrics/MethodLength: Method has too many lines. [23/10]", 3423854231], - [1198, 5, 1155, "Metrics/AbcSize: Assignment Branch Condition size for `prism_comment_node` is too high. [<1, 22, 0> 22.02/17]", 4287909739], - [1198, 5, 1155, "Metrics/MethodLength: Method has too many lines. [28/10]", 4287909739], - [1229, 5, 888, "Metrics/MethodLength: Method has too many lines. [27/10]", 3798554661], - [1282, 5, 920, "Metrics/MethodLength: Method has too many lines. [23/10]", 917985568] + [982, 5, 1216, "Metrics/AbcSize: Assignment Branch Condition size for `prism_ruby_example_surfaces` is too high. [<4, 20, 2> 20.49/17]", 2225356615], + [982, 5, 1216, "Metrics/MethodLength: Method has too many lines. [22/10]", 2225356615], + [1054, 5, 421, "Metrics/MethodLength: Method has too many lines. [14/10]", 26440736], + [1085, 5, 827, "Metrics/MethodLength: Method has too many lines. [18/10]", 4288402374], + [1126, 5, 876, "Metrics/MethodLength: Method has too many lines. [23/10]", 3423854231], + [1164, 5, 1155, "Metrics/AbcSize: Assignment Branch Condition size for `prism_comment_node` is too high. [<1, 22, 0> 22.02/17]", 4287909739], + [1164, 5, 1155, "Metrics/MethodLength: Method has too many lines. [28/10]", 4287909739], + [1195, 5, 888, "Metrics/MethodLength: Method has too many lines. [27/10]", 3798554661], + [1247, 5, 920, "Metrics/MethodLength: Method has too many lines. [23/10]", 917985568] ], "lib/prism/merge/begin_node_clause_body_merger.rb:1042804537": [ [5, 5, 31, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::BeginNodeClauseBodyMerger`.", 1242162299], [19, 7, 1511, "Metrics/AbcSize: Assignment Branch Condition size for `merge` is too high. [<5, 37, 1> 37.35/17]", 3275719934], [19, 7, 1511, "Metrics/MethodLength: Method has too many lines. [32/10]", 3275719934] ], - "lib/prism/merge/begin_node_clause_body_support.rb:2935202369": [ + "lib/prism/merge/begin_node_clause_body_support.rb:787370708": [ [5, 5, 32, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::BeginNodeClauseBodySupport`.", 3341069278], - [5, 5, 7532, "Metrics/ClassLength: Class has too many lines. [143/100]", 1403116805], + [5, 5, 7504, "Metrics/ClassLength: Class has too many lines. [142/100]", 1403116805], [8, 21, 100, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 4145084810], [22, 7, 937, "Metrics/AbcSize: Assignment Branch Condition size for `clause_header_end_line` is too high. [<5, 29, 16> 33.5/17]", 2050282033], [22, 7, 937, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `clause_header_end_line` is too high. [16/7]", 2050282033], @@ -156,13 +154,13 @@ [35, 63, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], [55, 9, 23, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 1178765246], [58, 7, 419, "Metrics/MethodLength: Method has too many lines. [11/10]", 3825428834], - [81, 7, 2424, "Metrics/AbcSize: Assignment Branch Condition size for `clause_body_components` is too high. [<12, 35, 16> 40.31/17]", 199420029], - [81, 7, 2424, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `clause_body_components` is too high. [13/7]", 199420029], - [81, 7, 2424, "Metrics/MethodLength: Method has too many lines. [40/10]", 199420029], - [81, 7, 2424, "Metrics/PerceivedComplexity: Perceived complexity for `clause_body_components` is too high. [14/8]", 199420029], - [127, 30, 23, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 1178765246], - [165, 7, 862, "Metrics/AbcSize: Assignment Branch Condition size for `clause_bodies_have_matching_statements?` is too high. [<3, 19, 2> 19.34/17]", 4182083840], - [165, 7, 862, "Metrics/MethodLength: Method has too many lines. [15/10]", 4182083840] + [81, 7, 2396, "Metrics/AbcSize: Assignment Branch Condition size for `clause_body_components` is too high. [<11, 30, 16> 35.74/17]", 199420029], + [81, 7, 2396, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `clause_body_components` is too high. [13/7]", 199420029], + [81, 7, 2396, "Metrics/MethodLength: Method has too many lines. [39/10]", 199420029], + [81, 7, 2396, "Metrics/PerceivedComplexity: Perceived complexity for `clause_body_components` is too high. [14/8]", 199420029], + [126, 30, 23, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 1178765246], + [164, 7, 862, "Metrics/AbcSize: Assignment Branch Condition size for `clause_bodies_have_matching_statements?` is too high. [<3, 19, 2> 19.34/17]", 4182083840], + [164, 7, 862, "Metrics/MethodLength: Method has too many lines. [15/10]", 4182083840] ], "lib/prism/merge/begin_node_clause_header_emitter.rb:2991300768": [ [5, 5, 34, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::BeginNodeClauseHeaderEmitter`.", 217025096], @@ -206,79 +204,53 @@ [76, 7, 1308, "Metrics/PerceivedComplexity: Perceived complexity for `emit_copied_unmatched_clause` is too high. [10/8]", 1339054986], [76, 39, 146, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2474530127] ], - "lib/prism/merge/begin_node_rescue_semantics.rb:2074892203": [ + "lib/prism/merge/begin_node_rescue_semantics.rb:2746062857": [ [5, 5, 30, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::BeginNodeRescueSemantics`.", 4100560642], - [5, 5, 14314, "Metrics/ClassLength: Class has too many lines. [278/100]", 1353739428], + [5, 5, 9687, "Metrics/ClassLength: Class has too many lines. [194/100]", 4227917508], [13, 7, 1953, "Metrics/AbcSize: Assignment Branch Condition size for `normalized_clause_body_and_header_source` is too high. [<9, 13, 21> 26.29/17]", 1895019213], [13, 7, 1953, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalized_clause_body_and_header_source` is too high. [15/7]", 1895019213], [13, 7, 1953, "Metrics/MethodLength: Method has too many lines. [26/10]", 1895019213], [13, 7, 1953, "Metrics/PerceivedComplexity: Perceived complexity for `normalized_clause_body_and_header_source` is too high. [17/8]", 1895019213], - [48, 7, 812, "Metrics/AbcSize: Assignment Branch Condition size for `merge_ordered_clause_types` is too high. [<9, 17, 8> 20.83/17]", 391537814], - [48, 7, 812, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_ordered_clause_types` is too high. [8/7]", 391537814], - [48, 7, 812, "Metrics/MethodLength: Method has too many lines. [16/10]", 391537814], - [48, 7, 812, "Metrics/PerceivedComplexity: Perceived complexity for `merge_ordered_clause_types` is too high. [9/8]", 391537814], - [71, 7, 1470, "Metrics/AbcSize: Assignment Branch Condition size for `canonicalize_rescue_clause_order` is too high. [<18, 28, 14> 36.11/17]", 570708009], - [71, 7, 1470, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonicalize_rescue_clause_order` is too high. [14/7]", 570708009], - [71, 7, 1470, "Metrics/MethodLength: Method has too many lines. [24/10]", 570708009], - [71, 7, 1470, "Metrics/PerceivedComplexity: Perceived complexity for `canonicalize_rescue_clause_order` is too high. [14/8]", 570708009], - [125, 7, 530, "Metrics/AbcSize: Assignment Branch Condition size for `local_variable_read_names_in` is too high. [<1, 16, 9> 18.38/17]", 2555890222], - [125, 7, 530, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `local_variable_read_names_in` is too high. [8/7]", 2555890222], - [125, 7, 530, "Metrics/MethodLength: Method has too many lines. [12/10]", 2555890222], - [125, 7, 530, "Metrics/PerceivedComplexity: Perceived complexity for `local_variable_read_names_in` is too high. [9/8]", 2555890222], - [177, 7, 618, "Metrics/AbcSize: Assignment Branch Condition size for `rewrite_local_reference_in_source` is too high. [<6, 16, 9> 19.31/17]", 1195871443], - [177, 7, 618, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `rewrite_local_reference_in_source` is too high. [9/7]", 1195871443], - [177, 7, 618, "Metrics/PerceivedComplexity: Perceived complexity for `rewrite_local_reference_in_source` is too high. [9/8]", 1195871443], - [230, 7, 1342, "Metrics/AbcSize: Assignment Branch Condition size for `source_defined_exception_hierarchy` is too high. [<10, 30, 14> 34.58/17]", 1939854289], - [230, 7, 1342, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `source_defined_exception_hierarchy` is too high. [14/7]", 1939854289], - [230, 7, 1342, "Metrics/MethodLength: Method has too many lines. [19/10]", 1939854289], - [230, 7, 1342, "Metrics/PerceivedComplexity: Perceived complexity for `source_defined_exception_hierarchy` is too high. [15/8]", 1939854289], - [234, 85, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [248, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1806710570], - [256, 7, 1233, "Metrics/AbcSize: Assignment Branch Condition size for `collect_source_defined_exception_definitions` is too high. [<4, 22, 9> 24.1/17]", 1970916346], - [256, 7, 1233, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_source_defined_exception_definitions` is too high. [10/7]", 1970916346], - [256, 7, 1233, "Metrics/MethodLength: Method has too many lines. [24/10]", 1970916346] - ], - "lib/prism/merge/begin_node_structure.rb:1595718070": [ + [80, 7, 530, "Metrics/AbcSize: Assignment Branch Condition size for `local_variable_read_names_in` is too high. [<1, 16, 9> 18.38/17]", 2555890222], + [80, 7, 530, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `local_variable_read_names_in` is too high. [8/7]", 2555890222], + [80, 7, 530, "Metrics/MethodLength: Method has too many lines. [12/10]", 2555890222], + [80, 7, 530, "Metrics/PerceivedComplexity: Perceived complexity for `local_variable_read_names_in` is too high. [9/8]", 2555890222], + [132, 7, 618, "Metrics/AbcSize: Assignment Branch Condition size for `rewrite_local_reference_in_source` is too high. [<6, 16, 9> 19.31/17]", 1195871443], + [132, 7, 618, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `rewrite_local_reference_in_source` is too high. [9/7]", 1195871443], + [132, 7, 618, "Metrics/PerceivedComplexity: Perceived complexity for `rewrite_local_reference_in_source` is too high. [9/8]", 1195871443], + [178, 85, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [190, 7, 1233, "Metrics/AbcSize: Assignment Branch Condition size for `collect_source_defined_exception_definitions` is too high. [<4, 22, 9> 24.1/17]", 1970916346], + [190, 7, 1233, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_source_defined_exception_definitions` is too high. [10/7]", 1970916346], + [190, 7, 1233, "Metrics/MethodLength: Method has too many lines. [24/10]", 1970916346] + ], + "lib/prism/merge/begin_node_structure.rb:1232724245": [ [5, 5, 24, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::BeginNodeStructure`.", 3506219929], - [5, 5, 4283, "Metrics/ClassLength: Class has too many lines. [106/100]", 1740419888], - [26, 7, 375, "Metrics/AbcSize: Assignment Branch Condition size for `boundary_lines` is too high. [<0, 28, 7> 28.86/17]", 3399008793], - [26, 7, 375, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `boundary_lines` is too high. [8/7]", 3399008793], - [38, 7, 251, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `clause_start_line` is too high. [8/7]", 1553904487], - [48, 7, 407, "Metrics/MethodLength: Method has too many lines. [12/10]", 3851339415], - [64, 7, 1089, "Metrics/AbcSize: Assignment Branch Condition size for `clause_regions` is too high. [<9, 38, 9> 40.07/17]", 1916795013], - [64, 7, 1089, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `clause_regions` is too high. [10/7]", 1916795013], - [64, 7, 1089, "Metrics/MethodLength: Method has too many lines. [22/10]", 1916795013], - [64, 7, 1089, "Metrics/PerceivedComplexity: Perceived complexity for `clause_regions` is too high. [10/8]", 1916795013], - [91, 7, 613, "Metrics/AbcSize: Assignment Branch Condition size for `clause_nodes_by_type` is too high. [<9, 19, 4> 21.4/17]", 1693909219], - [91, 7, 613, "Metrics/MethodLength: Method has too many lines. [12/10]", 1693909219], - [107, 11, 19, "Naming/PredicatePrefix: Rename `has_clause_or_body?` to `clause_or_body?`.", 2163996991], - [111, 7, 598, "Metrics/AbcSize: Assignment Branch Condition size for `line_map_for` is too high. [<13, 15, 6> 20.74/17]", 191778789] - ], - "lib/prism/merge/block_directive_detector.rb:14576901": [ - [21, 5, 12462, "Metrics/ClassLength: Class has too many lines. [242/100]", 638189870], - [65, 7, 2365, "Metrics/AbcSize: Assignment Branch Condition size for `promote_spans_to_nodes` is too high. [<24, 42, 32> 58/17]", 2022543448], - [65, 7, 2365, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `promote_spans_to_nodes` is too high. [24/7]", 2022543448], - [65, 7, 2365, "Metrics/MethodLength: Method has too many lines. [36/10]", 2022543448], - [65, 7, 2365, "Metrics/PerceivedComplexity: Perceived complexity for `promote_spans_to_nodes` is too high. [25/8]", 2022543448], - [92, 11, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], - [125, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087921317], - [139, 7, 1121, "Metrics/AbcSize: Assignment Branch Condition size for `detect_freeze_spans` is too high. [<10, 18, 7> 21.75/17]", 2014886705], - [139, 7, 1121, "Metrics/MethodLength: Method has too many lines. [28/10]", 2014886705], - [139, 7, 1121, "Metrics/PerceivedComplexity: Perceived complexity for `detect_freeze_spans` is too high. [9/8]", 2014886705], - [176, 7, 1496, "Metrics/AbcSize: Assignment Branch Condition size for `detect_nocov_spans` is too high. [<10, 25, 10> 28.72/17]", 284113190], - [176, 7, 1496, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_nocov_spans` is too high. [9/7]", 284113190], - [176, 7, 1496, "Metrics/MethodLength: Method has too many lines. [40/10]", 284113190], - [176, 7, 1496, "Metrics/PerceivedComplexity: Perceived complexity for `detect_nocov_spans` is too high. [12/8]", 284113190], - [184, 9, 1163, "Metrics/BlockLength: Block has too many lines. [30/25]", 4100741046], - [227, 7, 966, "Metrics/AbcSize: Assignment Branch Condition size for `validate_no_crossing` is too high. [<8, 27, 19> 33.97/17]", 3041442390], - [227, 7, 966, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_no_crossing` is too high. [13/7]", 3041442390], - [227, 7, 966, "Metrics/MethodLength: Method has too many lines. [20/10]", 3041442390], - [227, 7, 966, "Metrics/PerceivedComplexity: Perceived complexity for `validate_no_crossing` is too high. [13/8]", 3041442390], - [304, 7, 832, "Metrics/MethodLength: Method has too many lines. [23/10]", 3204610677], - [330, 7, 1136, "Metrics/AbcSize: Assignment Branch Condition size for `rebuild_statements` is too high. [<15, 17, 9> 24.39/17]", 1114825097], - [330, 7, 1136, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `rebuild_statements` is too high. [10/7]", 1114825097], - [330, 7, 1136, "Metrics/MethodLength: Method has too many lines. [15/10]", 1114825097], - [330, 7, 1136, "Metrics/PerceivedComplexity: Perceived complexity for `rebuild_statements` is too high. [10/8]", 1114825097] + [5, 5, 4080, "Metrics/ClassLength: Class has too many lines. [101/100]", 1611393241], + [21, 7, 375, "Metrics/AbcSize: Assignment Branch Condition size for `boundary_lines` is too high. [<0, 28, 7> 28.86/17]", 3399008793], + [21, 7, 375, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `boundary_lines` is too high. [8/7]", 3399008793], + [33, 7, 251, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `clause_start_line` is too high. [8/7]", 1553904487], + [43, 7, 407, "Metrics/MethodLength: Method has too many lines. [12/10]", 3851339415], + [59, 7, 1089, "Metrics/AbcSize: Assignment Branch Condition size for `clause_regions` is too high. [<9, 38, 9> 40.07/17]", 1916795013], + [59, 7, 1089, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `clause_regions` is too high. [10/7]", 1916795013], + [59, 7, 1089, "Metrics/MethodLength: Method has too many lines. [22/10]", 1916795013], + [59, 7, 1089, "Metrics/PerceivedComplexity: Perceived complexity for `clause_regions` is too high. [10/8]", 1916795013], + [86, 7, 613, "Metrics/AbcSize: Assignment Branch Condition size for `clause_nodes_by_type` is too high. [<9, 19, 4> 21.4/17]", 1693909219], + [86, 7, 613, "Metrics/MethodLength: Method has too many lines. [12/10]", 1693909219], + [102, 11, 19, "Naming/PredicatePrefix: Rename `has_clause_or_body?` to `clause_or_body?`.", 2163996991], + [106, 7, 598, "Metrics/AbcSize: Assignment Branch Condition size for `line_map_for` is too high. [<13, 15, 6> 20.74/17]", 191778789] + ], + "lib/prism/merge/block_directive_detector.rb:3698866715": [ + [9, 5, 5028, "Metrics/ClassLength: Class has too many lines. [121/100]", 2587374670], + [10, 7, 1976, "Metrics/AbcSize: Assignment Branch Condition size for `promote_spans_to_nodes` is too high. [<23, 42, 32> 57.59/17]", 1038475655], + [10, 7, 1976, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `promote_spans_to_nodes` is too high. [24/7]", 1038475655], + [10, 7, 1976, "Metrics/MethodLength: Method has too many lines. [37/10]", 1038475655], + [10, 7, 1976, "Metrics/PerceivedComplexity: Perceived complexity for `promote_spans_to_nodes` is too high. [25/8]", 1038475655], + [35, 11, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], + [108, 7, 832, "Metrics/MethodLength: Method has too many lines. [23/10]", 3204610677], + [134, 7, 722, "Metrics/AbcSize: Assignment Branch Condition size for `rebuild_statements` is too high. [<15, 17, 9> 24.39/17]", 3809085226], + [134, 7, 722, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `rebuild_statements` is too high. [10/7]", 3809085226], + [134, 7, 722, "Metrics/MethodLength: Method has too many lines. [15/10]", 3809085226], + [134, 7, 722, "Metrics/PerceivedComplexity: Perceived complexity for `rebuild_statements` is too high. [10/8]", 3809085226] ], "lib/prism/merge/comment/block.rb:3606937725": [ [65, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1573406415] @@ -314,8 +286,8 @@ [230, 7, 665, "Metrics/AbcSize: Assignment Branch Condition size for `emit_comment_only_prefix_lines` is too high. [<5, 21, 4> 21.95/17]", 1939505075], [243, 7, 942, "Metrics/MethodLength: Method has too many lines. [19/10]", 2012616838] ], - "lib/prism/merge/file_analysis.rb:738048557": [ - [16, 5, 55295, "Metrics/ClassLength: Class has too many lines. [623/100]", 2951008665], + "lib/prism/merge/file_analysis.rb:4241124500": [ + [16, 5, 55504, "Metrics/ClassLength: Class has too many lines. [614/100]", 2951008665], [19, 7, 28, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::FileAnalysis::NativeCommentAugmenter`.", 2321467727], [19, 7, 5712, "Metrics/ClassLength: Class has too many lines. [121/100]", 3225634005], [22, 9, 605, "Metrics/MethodLength: Method has too many lines. [16/10]", 3935631704], @@ -345,17 +317,17 @@ [828, 7, 2509, "Metrics/PerceivedComplexity: Perceived complexity for `extract_and_integrate_all_nodes` is too high. [16/8]", 1138957888], [897, 7, 1325, "Metrics/AbcSize: Assignment Branch Condition size for `extract_nodes_with_comments` is too high. [<3, 25, 7> 26.13/17]", 1498557944], [897, 7, 1325, "Metrics/MethodLength: Method has too many lines. [23/10]", 1498557944], - [1009, 7, 11719, "Metrics/AbcSize: Assignment Branch Condition size for `compute_node_signature` is too high. [<19, 139, 94> 168.9/17]", 2654183611], - [1009, 7, 11719, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_node_signature` is too high. [82/7]", 2654183611], - [1009, 7, 11719, "Metrics/MethodLength: Method has too many lines. [141/10]", 2654183611], - [1009, 7, 11719, "Metrics/PerceivedComplexity: Perceived complexity for `compute_node_signature` is too high. [70/8]", 2654183611], + [1009, 7, 11892, "Metrics/AbcSize: Assignment Branch Condition size for `compute_node_signature` is too high. [<19, 176, 83> 195.5/17]", 2654183611], + [1009, 7, 11892, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_node_signature` is too high. [75/7]", 2654183611], + [1009, 7, 11892, "Metrics/MethodLength: Method has too many lines. [132/10]", 2654183611], + [1009, 7, 11892, "Metrics/PerceivedComplexity: Perceived complexity for `compute_node_signature` is too high. [61/8]", 2654183611], [1070, 88, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], [1074, 24, 300, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 2690302041], [1074, 55, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [1299, 7, 680, "Metrics/AbcSize: Assignment Branch Condition size for `detect_gemspec_block_var` is too high. [<3, 22, 15> 26.8/17]", 3676370299], - [1299, 7, 680, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_gemspec_block_var` is too high. [14/7]", 3676370299], - [1299, 7, 680, "Metrics/MethodLength: Method has too many lines. [14/10]", 3676370299], - [1299, 7, 680, "Metrics/PerceivedComplexity: Perceived complexity for `detect_gemspec_block_var` is too high. [14/8]", 3676370299] + [1285, 7, 680, "Metrics/AbcSize: Assignment Branch Condition size for `detect_gemspec_block_var` is too high. [<3, 22, 15> 26.8/17]", 3676370299], + [1285, 7, 680, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_gemspec_block_var` is too high. [14/7]", 3676370299], + [1285, 7, 680, "Metrics/MethodLength: Method has too many lines. [14/10]", 3676370299], + [1285, 7, 680, "Metrics/PerceivedComplexity: Perceived complexity for `detect_gemspec_block_var` is too high. [14/8]", 3676370299] ], "lib/prism/merge/freeze_node.rb:2471800311": [ [67, 7, 577, "Metrics/MethodLength: Method has too many lines. [11/10]", 2189574632], @@ -365,17 +337,6 @@ [124, 7, 2888, "Metrics/MethodLength: Method has too many lines. [38/10]", 3621186151], [124, 7, 2888, "Metrics/PerceivedComplexity: Perceived complexity for `validate_structure!` is too high. [25/8]", 3621186151] ], - "lib/prism/merge/magic_comment_support.rb:1214861451": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177608], - [3, 5, 26, "Style/Documentation: Missing top-level documentation comment for `module Prism::Merge::MagicCommentSupport`.", 1989707586], - [16, 7, 1484, "Metrics/AbcSize: Assignment Branch Condition size for `comment_only_prefix_info` is too high. [<9, 38, 8> 39.86/17]", 1098666313], - [16, 7, 1484, "Metrics/MethodLength: Method has too many lines. [33/10]", 1098666313], - [59, 7, 693, "Metrics/AbcSize: Assignment Branch Condition size for `header_magic_comment_types_for_lines` is too high. [<10, 13, 9> 18.71/17]", 3693768719], - [59, 7, 693, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `header_magic_comment_types_for_lines` is too high. [8/7]", 3693768719], - [59, 7, 693, "Metrics/MethodLength: Method has too many lines. [16/10]", 3693768719], - [83, 7, 748, "Metrics/AbcSize: Assignment Branch Condition size for `prefix_comment_line_numbers_for_comments` is too high. [<10, 12, 7> 17.12/17]", 335042389], - [83, 7, 748, "Metrics/MethodLength: Method has too many lines. [19/10]", 335042389] - ], "lib/prism/merge/merge_result.rb:1970522956": [ [9, 5, 12561, "Metrics/ClassLength: Class has too many lines. [238/100]", 3020348188], [67, 7, 5058, "Metrics/AbcSize: Assignment Branch Condition size for `add_node` is too high. [<25, 54, 38> 70.6/17]", 2165268226], @@ -389,26 +350,20 @@ [219, 7, 901, "Metrics/MethodLength: Method has too many lines. [25/10]", 2776830125], [296, 7, 903, "Metrics/MethodLength: Method has too many lines. [18/10]", 2752342414] ], - "lib/prism/merge/method_match_refiner.rb:3086922470": [ - [98, 7, 678, "Metrics/AbcSize: Assignment Branch Condition size for `param_similarity` is too high. [<6, 21, 4> 22.2/17]", 2054244811], - [121, 7, 705, "Metrics/AbcSize: Assignment Branch Condition size for `extract_param_names` is too high. [<2, 37, 16> 40.36/17]", 3200522215], - [121, 7, 705, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_param_names` is too high. [17/7]", 3200522215], - [121, 7, 705, "Metrics/MethodLength: Method has too many lines. [11/10]", 3200522215], - [121, 7, 705, "Metrics/PerceivedComplexity: Perceived complexity for `extract_param_names` is too high. [17/8]", 3200522215], - [129, 49, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [132, 65, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [160, 7, 854, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<13, 29, 8> 32.77/17]", 2946547420], - [160, 7, 854, "Metrics/MethodLength: Method has too many lines. [20/10]", 2946547420] + "lib/prism/merge/method_match_refiner.rb:1593340636": [ + [103, 7, 705, "Metrics/AbcSize: Assignment Branch Condition size for `extract_param_names` is too high. [<2, 37, 16> 40.36/17]", 3200522215], + [103, 7, 705, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_param_names` is too high. [17/7]", 3200522215], + [103, 7, 705, "Metrics/MethodLength: Method has too many lines. [11/10]", 3200522215], + [103, 7, 705, "Metrics/PerceivedComplexity: Perceived complexity for `extract_param_names` is too high. [17/8]", 3200522215], + [111, 49, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [114, 65, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] ], "lib/prism/merge/nested_statement_walker.rb:3826169704": [ [24, 7, 695, "Metrics/MethodLength: Method has too many lines. [16/10]", 3744912119], [45, 7, 518, "Metrics/MethodLength: Method has too many lines. [12/10]", 2978518157] ], - "lib/prism/merge/nocov_node.rb:3116182832": [ - [59, 21, 84, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3439911158], - [90, 19, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [143, 7, 353, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `signature` is too high. [8/7]", 3442013923], - [143, 7, 353, "Metrics/PerceivedComplexity: Perceived complexity for `signature` is too high. [9/8]", 3442013923] + "lib/prism/merge/nocov_node.rb:2336029940": [ + [52, 19, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] ], "lib/prism/merge/node_body_layout.rb:1642074264": [ [5, 5, 20, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::NodeBodyLayout`.", 1262407425], @@ -505,16 +460,16 @@ [12, 7, 1132, "Metrics/PerceivedComplexity: Perceived complexity for `should_merge?` is too high. [13/8]", 4123619949], [47, 7, 398, "Metrics/MethodLength: Method has too many lines. [18/10]", 385694759] ], - "lib/prism/merge/recursive_node_body_merger.rb:2523299035": [ + "lib/prism/merge/recursive_node_body_merger.rb:1132596837": [ [5, 5, 29, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::RecursiveNodeBodyMerger`.", 3703318859], - [5, 5, 18406, "Metrics/ClassLength: Class has too many lines. [333/100]", 1740018190], - [12, 7, 12657, "Metrics/AbcSize: Assignment Branch Condition size for `merge` is too high. [<79, 259, 101> 289/17]", 1663029092], - [12, 7, 12657, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge` is too high. [78/7]", 1663029092], - [12, 7, 12657, "Metrics/MethodLength: Method has too many lines. [215/10]", 1663029092], - [12, 7, 12657, "Metrics/PerceivedComplexity: Perceived complexity for `merge` is too high. [83/8]", 1663029092], + [5, 5, 18505, "Metrics/ClassLength: Class has too many lines. [333/100]", 3196902308], + [12, 7, 12756, "Metrics/AbcSize: Assignment Branch Condition size for `merge` is too high. [<78, 262, 90> 287.8/17]", 1909933362], + [12, 7, 12756, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge` is too high. [70/7]", 1909933362], + [12, 7, 12756, "Metrics/MethodLength: Method has too many lines. [215/10]", 1909933362], + [12, 7, 12756, "Metrics/PerceivedComplexity: Perceived complexity for `merge` is too high. [75/8]", 1909933362], [27, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 929875726], - [65, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 518709914], - [70, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 366676207], + [62, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 518709914], + [67, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 366676207], [266, 7, 1221, "Metrics/AbcSize: Assignment Branch Condition size for `remap_inner_unresolved_review_state!` is too high. [<8, 22, 6> 24.17/17]", 3210674006], [266, 7, 1221, "Metrics/MethodLength: Method has too many lines. [21/10]", 3210674006], [293, 7, 1121, "Metrics/AbcSize: Assignment Branch Condition size for `remap_inner_unresolved_case` is too high. [<6, 24, 0> 24.74/17]", 3468635549], @@ -524,20 +479,19 @@ [376, 7, 826, "Metrics/MethodLength: Method has too many lines. [17/10]", 2158299973], [376, 7, 826, "Metrics/PerceivedComplexity: Perceived complexity for `emit_trailing_layout_gap_lines` is too high. [9/8]", 2158299973] ], - "lib/prism/merge/ruby_doc_surface_analyzer.rb:2647486851": [ - [7, 5, 8269, "Metrics/ClassLength: Class has too many lines. [192/100]", 2716524254], - [61, 7, 1408, "Metrics/AbcSize: Assignment Branch Condition size for `build_doc_comment_surface` is too high. [<10, 25, 5> 27.39/17]", 2414553577], - [61, 7, 1408, "Metrics/MethodLength: Method has too many lines. [28/10]", 2414553577], - [106, 7, 1513, "Metrics/AbcSize: Assignment Branch Condition size for `build_example_surface` is too high. [<6, 24, 6> 25.46/17]", 4167825853], - [106, 7, 1513, "Metrics/MethodLength: Method has too many lines. [29/10]", 4167825853], - [162, 7, 555, "Metrics/AbcSize: Assignment Branch Condition size for `doc_comment_entries` is too high. [<8, 18, 6> 20.59/17]", 358090808] - ], - "lib/prism/merge/scaffold_chunk_remover.rb:2190237849": [ - [15, 5, 5193, "Metrics/ClassLength: Class has too many lines. [123/100]", 3937701477], - [75, 7, 1856, "Metrics/AbcSize: Assignment Branch Condition size for `call` is too high. [<21, 60, 22> 67.27/17]", 1601329428], - [75, 7, 1856, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `call` is too high. [21/7]", 1601329428], - [75, 7, 1856, "Metrics/MethodLength: Method has too many lines. [37/10]", 1601329428], - [75, 7, 1856, "Metrics/PerceivedComplexity: Perceived complexity for `call` is too high. [21/8]", 1601329428] + "lib/prism/merge/ruby_doc_surface_analyzer.rb:3389668357": [ + [7, 5, 7100, "Metrics/ClassLength: Class has too many lines. [162/100]", 77379508], + [50, 7, 1408, "Metrics/AbcSize: Assignment Branch Condition size for `build_doc_comment_surface` is too high. [<10, 25, 5> 27.39/17]", 2414553577], + [50, 7, 1408, "Metrics/MethodLength: Method has too many lines. [28/10]", 2414553577], + [91, 7, 1256, "Metrics/AbcSize: Assignment Branch Condition size for `build_example_surface` is too high. [<4, 23, 2> 23.43/17]", 4074178203], + [91, 7, 1256, "Metrics/MethodLength: Method has too many lines. [25/10]", 4074178203], + [131, 7, 555, "Metrics/AbcSize: Assignment Branch Condition size for `doc_comment_entries` is too high. [<8, 18, 6> 20.59/17]", 358090808] + ], + "lib/prism/merge/scaffold_chunk_remover.rb:174131146": [ + [34, 7, 1958, "Metrics/AbcSize: Assignment Branch Condition size for `call` is too high. [<21, 60, 22> 67.27/17]", 1919383090], + [34, 7, 1958, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `call` is too high. [21/7]", 1919383090], + [34, 7, 1958, "Metrics/MethodLength: Method has too many lines. [37/10]", 1919383090], + [34, 7, 1958, "Metrics/PerceivedComplexity: Perceived complexity for `call` is too high. [21/8]", 1919383090] ], "lib/prism/merge/smart_merger.rb:3814529034": [ [48, 5, 42561, "Metrics/ClassLength: Class has too many lines. [603/100]", 3828655257], diff --git a/gems/prism-merge/Gemfile b/gems/prism-merge/Gemfile index 90383afce..4b3ea84a3 100644 --- a/gems/prism-merge/Gemfile +++ b/gems/prism-merge/Gemfile @@ -191,6 +191,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/prism-merge/Gemfile.lock b/gems/prism-merge/Gemfile.lock index 09fa20d97..049018dd0 100644 --- a/gems/prism-merge/Gemfile.lock +++ b/gems/prism-merge/Gemfile.lock @@ -17,264 +17,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -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.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +35,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +48,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +111,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +139,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +278,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +330,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +381,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -687,52 +408,30 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0.0) ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +439,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +451,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +478,11 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +490,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -835,8 +521,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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +529,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +542,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +557,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/prism-merge/lib/prism/merge/block_directive_detector.rb b/gems/prism-merge/lib/prism/merge/block_directive_detector.rb index 25d0013a2..2797aed66 100644 --- a/gems/prism-merge/lib/prism/merge/block_directive_detector.rb +++ b/gems/prism-merge/lib/prism/merge/block_directive_detector.rb @@ -36,7 +36,9 @@ def promote_spans_to_nodes(statements, spans, analysis:) inner_indices = inner_stmts.map(&:first) inner_nodes = inner_stmts.map(&:last) - nested = spans.select { |candidate| candidate != span && candidate.start_line >= span.start_line && candidate.end_line <= span.end_line } + nested = spans.select do |candidate| + candidate != span && candidate.start_line >= span.start_line && candidate.end_line <= span.end_line + end inner_nodes = promote_spans_to_nodes(inner_nodes, nested, analysis: analysis) unless nested.empty? insert_at = if inner_indices.any? diff --git a/gems/prism-merge/lib/prism/merge/method_match_refiner.rb b/gems/prism-merge/lib/prism/merge/method_match_refiner.rb index c220ea1cd..7586737b6 100644 --- a/gems/prism-merge/lib/prism/merge/method_match_refiner.rb +++ b/gems/prism-merge/lib/prism/merge/method_match_refiner.rb @@ -116,7 +116,6 @@ def extract_param_names(method_node) names.compact end - end end end diff --git a/gems/prism-merge/lib/prism/merge/recursive_node_body_merger.rb b/gems/prism-merge/lib/prism/merge/recursive_node_body_merger.rb index c3d3a0ebf..f837a70a1 100644 --- a/gems/prism-merge/lib/prism/merge/recursive_node_body_merger.rb +++ b/gems/prism-merge/lib/prism/merge/recursive_node_body_merger.rb @@ -27,9 +27,7 @@ def merge(template_node:, dest_node:) template_var = merger.template_analysis.respond_to?(:gemspec_block_var) ? merger.template_analysis.gemspec_block_var : nil dest_var = merger.dest_analysis.respond_to?(:gemspec_block_var) ? merger.dest_analysis.gemspec_block_var : nil preferred_var = Ruby::Merge::GemspecSupport.preferred_block_var(template_var, dest_var) - if preferred_var - dest_body = GemspecVarRenamer.rename(dest_body, old_var: dest_var, new_var: preferred_var) - end + dest_body = GemspecVarRenamer.rename(dest_body, old_var: dest_var, new_var: preferred_var) if preferred_var body_merger = merger.class.new( template_body, From 6462b203515c28824de67cf1aea7ba1aab8bd533 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:27:15 -0600 Subject: [PATCH 180/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/kettle-jem/.rubocop_gradual.lock | 23 -- gems/kettle-jem/Gemfile | 12 - gems/kettle-jem/Gemfile.lock | 69 ++-- .../gemfiles/modular/optional.gemfile | 1 + gems/kettle-jem/kettle-jem.gemspec | 1 + gems/prism-merge/Gemfile.lock | 345 +++++++++++++++++- gems/smorg-rb/.kettle-drift.lock | 60 ++- gems/smorg-rb/Gemfile | 40 ++ gems/smorg-rb/Gemfile.lock | 292 ++++----------- 9 files changed, 524 insertions(+), 319 deletions(-) delete mode 100644 gems/kettle-jem/.rubocop_gradual.lock diff --git a/gems/kettle-jem/.rubocop_gradual.lock b/gems/kettle-jem/.rubocop_gradual.lock deleted file mode 100644 index b09c227c5..000000000 --- a/gems/kettle-jem/.rubocop_gradual.lock +++ /dev/null @@ -1,23 +0,0 @@ -{ - "kettle-jem.gemspec:1783780734": [ - [19, 32, 10, "Gemspec/RequiredRubyVersion: `required_ruby_version` and `TargetRubyVersion` (3.2, which may be specified in .rubocop.yml) should be equal.", 3888670706], - [90, 3, 70, "Gemspec/DependencyVersion: Dependency version specification is required.", 4023754366], - [91, 3, 65, "Gemspec/DependencyVersion: Dependency version specification is required.", 1638532368], - [92, 3, 53, "Gemspec/DependencyVersion: Dependency version specification is required.", 897228968], - [93, 3, 54, "Gemspec/DependencyVersion: Dependency version specification is required.", 1601414454], - [94, 3, 61, "Gemspec/DependencyVersion: Dependency version specification is required.", 2631699923], - [95, 3, 62, "Gemspec/DependencyVersion: Dependency version specification is required.", 3348222081], - [96, 3, 56, "Gemspec/DependencyVersion: Dependency version specification is required.", 3843726476], - [97, 3, 54, "Gemspec/DependencyVersion: Dependency version specification is required.", 3293105462], - [100, 3, 58, "Gemspec/DependencyVersion: Dependency version specification is required.", 670728969], - [101, 3, 58, "Gemspec/DependencyVersion: Dependency version specification is required.", 1722946409], - [102, 3, 56, "Gemspec/DependencyVersion: Dependency version specification is required.", 2273926958], - [103, 3, 55, "Gemspec/DependencyVersion: Dependency version specification is required.", 1475977371], - [104, 3, 55, "Gemspec/DependencyVersion: Dependency version specification is required.", 3458446143], - [106, 3, 53, "Gemspec/DependencyVersion: Dependency version specification is required.", 3112555885], - [107, 3, 54, "Gemspec/DependencyVersion: Dependency version specification is required.", 1663642130], - [109, 3, 54, "Gemspec/DependencyVersion: Dependency version specification is required.", 527713396], - [111, 3, 54, "Gemspec/DependencyVersion: Dependency version specification is required.", 3116501450], - [112, 3, 54, "Gemspec/DependencyVersion: Dependency version specification is required.", 2771890615] - ] -} diff --git a/gems/kettle-jem/Gemfile b/gems/kettle-jem/Gemfile index b5dfa026e..c7b6554af 100644 --- a/gems/kettle-jem/Gemfile +++ b/gems/kettle-jem/Gemfile @@ -92,18 +92,6 @@ if direct_sibling_gems.any? && end end -tslp_dev = ENV.fetch("TSLP_DEV", nil) -if tslp_dev.to_s.empty? - gem( - "tree_sitter_language_pack", - git: "https://github.com/structuredmerge/tree-sitter-language-pack.git", - branch: "fix/ruby-parser-api-methods", - glob: "packages/ruby/*.gemspec", - ) -else - gem "tree_sitter_language_pack", path: tslp_dev -end - # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? diff --git a/gems/kettle-jem/Gemfile.lock b/gems/kettle-jem/Gemfile.lock index 3f9b1fce1..0be893ad7 100644 --- a/gems/kettle-jem/Gemfile.lock +++ b/gems/kettle-jem/Gemfile.lock @@ -1,13 +1,3 @@ -GIT - remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a - branch: fix/ruby-parser-api-methods - glob: packages/ruby/*.gemspec - specs: - tree_sitter_language_pack (1.12.5) - rb_sys (>= 0.9, < 0.9.128) - sorbet-runtime (~> 0.5) - PATH remote: . specs: @@ -275,6 +265,31 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-dev + specs: + kettle-dev (2.3.7) + emoji_regex (>= 15.0) + kettle-rb (~> 0.1, >= 0.1.2) + kettle-test (~> 2.0, >= 2.0.4) + ruby-progressbar (~> 1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -357,20 +372,7 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - kettle-dev (2.3.7) - emoji_regex (>= 15.0) - kettle-rb (~> 0.1, >= 0.1.2) - kettle-test (~> 2.0, >= 2.0.4) - ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -414,9 +416,6 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) - rake-compiler-dock (1.12.0) - rb_sys (0.9.127) - rake-compiler-dock (= 1.12.0) rbs (4.0.3) logger prism (>= 1.6.0) @@ -608,6 +607,8 @@ GEM toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) + sorbet-runtime (~> 0.5) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -670,9 +671,10 @@ DEPENDENCIES go-merge! irb (~> 1.17) json-merge! - kettle-drift (~> 1.0, >= 1.0.5) + kettle-dev! + kettle-drift! kettle-jem! - kettle-soup-cover (~> 3.0, >= 3.0.0) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -706,7 +708,6 @@ DEPENDENCIES stringio (>= 3.0) toml-merge! tree_haver! - tree_sitter_language_pack! turbo_tests2 (~> 3.1, >= 3.1.14) typescript-merge! webrick (~> 1.9) @@ -769,11 +770,11 @@ CHECKSUMS irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) - kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-dev (2.3.7) + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) sha256=83ebe2aa099f15781e4796b5faef0dc2720fba48f6b9d34808670b91baf271e4 + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -805,8 +806,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) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 - rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 @@ -874,7 +873,7 @@ CHECKSUMS toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) - tree_sitter_language_pack (1.12.5) + tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) sha256=ad6743a373eeac954c1b659b17af3aff1c82918b3ce9c9dc572a7c70ff843cdd tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 typescript-merge (7.1.0) diff --git a/gems/kettle-jem/gemfiles/modular/optional.gemfile b/gems/kettle-jem/gemfiles/modular/optional.gemfile index 0433c85a0..ec9c5d656 100644 --- a/gems/kettle-jem/gemfiles/modular/optional.gemfile +++ b/gems/kettle-jem/gemfiles/modular/optional.gemfile @@ -7,3 +7,4 @@ # # Optional dependencies are not depended on directly, but may be used if present. + diff --git a/gems/kettle-jem/kettle-jem.gemspec b/gems/kettle-jem/kettle-jem.gemspec index 3b7921be1..7c09d2800 100644 --- a/gems/kettle-jem/kettle-jem.gemspec +++ b/gems/kettle-jem/kettle-jem.gemspec @@ -144,4 +144,5 @@ Gem::Specification.new do |spec| # 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.4") # ruby >= 2.4 + end diff --git a/gems/prism-merge/Gemfile.lock b/gems/prism-merge/Gemfile.lock index 049018dd0..09fa20d97 100644 --- a/gems/prism-merge/Gemfile.lock +++ b/gems/prism-merge/Gemfile.lock @@ -17,13 +17,264 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: ruby-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -35,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -48,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -111,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -139,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -278,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -330,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -408,30 +687,52 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0.0) ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -439,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -451,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -478,11 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -490,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -521,6 +835,8 @@ 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -529,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -542,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/smorg-rb/.kettle-drift.lock b/gems/smorg-rb/.kettle-drift.lock index 991f5a042..e0e413a78 100644 --- a/gems/smorg-rb/.kettle-drift.lock +++ b/gems/smorg-rb/.kettle-drift.lock @@ -8,7 +8,8 @@ 165, 205, 245, - 285 + 285, + 325 ] } ], @@ -21,7 +22,8 @@ 176, 216, 256, - 296 + 296, + 336 ] } ], @@ -34,7 +36,8 @@ 166, 206, 246, - 286 + 286, + 326 ] } ], @@ -47,7 +50,8 @@ 178, 218, 258, - 298 + 298, + 338 ] } ], @@ -60,7 +64,8 @@ 181, 221, 261, - 301 + 301, + 341 ] } ], @@ -73,7 +78,8 @@ 167, 207, 247, - 287 + 287, + 327 ] } ], @@ -87,7 +93,8 @@ 185, 225, 265, - 305 + 305, + 345 ] } ], @@ -100,7 +107,8 @@ 186, 226, 266, - 306 + 306, + 346 ] } ], @@ -114,7 +122,8 @@ 172, 212, 252, - 292 + 292, + 332 ] } ], @@ -127,7 +136,8 @@ 195, 235, 275, - 315 + 315, + 355 ] } ], @@ -141,7 +151,8 @@ 164, 204, 244, - 284 + 284, + 324 ] } ], @@ -155,7 +166,8 @@ 194, 234, 274, - 314 + 314, + 354 ] } ], @@ -168,7 +180,8 @@ 170, 210, 250, - 290 + 290, + 330 ] } ], @@ -182,7 +195,8 @@ 177, 217, 257, - 297 + 297, + 337 ] } ], @@ -196,7 +210,8 @@ 173, 213, 253, - 293 + 293, + 333 ] } ], @@ -209,7 +224,8 @@ 171, 211, 251, - 291 + 291, + 331 ] } ], @@ -222,7 +238,8 @@ 188, 228, 268, - 308 + 308, + 348 ] } ], @@ -235,7 +252,8 @@ 187, 227, 267, - 307 + 307, + 347 ] } ], @@ -248,7 +266,8 @@ 182, 222, 262, - 302 + 302, + 342 ] } ], @@ -261,7 +280,8 @@ 191, 231, 271, - 311 + 311, + 351 ] } ], diff --git a/gems/smorg-rb/Gemfile b/gems/smorg-rb/Gemfile index 3033870f4..74b67070a 100644 --- a/gems/smorg-rb/Gemfile +++ b/gems/smorg-rb/Gemfile @@ -317,6 +317,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/smorg-rb/Gemfile.lock b/gems/smorg-rb/Gemfile.lock index 0260b354f..2521de11c 100644 --- a/gems/smorg-rb/Gemfile.lock +++ b/gems/smorg-rb/Gemfile.lock @@ -22,31 +22,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: ast-merge-git (7.1.0) ast-merge (= 7.1.0) @@ -54,7 +30,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -63,53 +39,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge specs: go-merge (7.1.0) ast-merge (= 7.1.0) @@ -117,7 +47,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: json-merge (7.1.0) ast-merge (= 7.1.0) @@ -125,7 +55,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem specs: kettle-jem (7.1.0) addressable (>= 2.8, < 3) @@ -154,23 +84,7 @@ PATH yaml-merge (= 7.1.0) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) markdown-merge (= 7.1.0) @@ -178,103 +92,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: plain-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,13 +110,33 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) bundler (>= 1.2.0) thor (~> 1.0) citrus (3.0.2) + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) cmdparse (3.0.7) commonmarker (2.9.0-aarch64-linux) commonmarker (2.9.0-aarch64-linux-musl) @@ -300,6 +144,10 @@ GEM commonmarker (2.9.0-x86_64-darwin) commonmarker (2.9.0-x86_64-linux) commonmarker (2.9.0-x86_64-linux-musl) + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -309,6 +157,10 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docile (1.4.1) + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -363,8 +215,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -388,11 +238,19 @@ GEM turbo_tests2 (~> 3.1, >= 3.1.12) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) 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.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) @@ -421,9 +279,18 @@ GEM prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) psych (5.4.0) date stringio + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -435,6 +302,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) rdoc (6.17.0) erb psych (>= 4.0.0) @@ -530,6 +402,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -587,11 +463,18 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -606,6 +489,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.13) + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) yard (0.9.45) yard-fence (0.9.6) rdoc (>= 6.11, < 8) @@ -638,20 +525,11 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) @@ -659,24 +537,17 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,26 +556,19 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -716,12 +580,10 @@ CHECKSUMS ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) @@ -760,7 +622,6 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad @@ -788,7 +649,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.0) plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -835,7 +695,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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -859,14 +718,12 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -879,7 +736,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From eb2d270808ec08ac10c4c485c41aea85b5ad5455 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:28:43 -0600 Subject: [PATCH 181/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/kettle-jem/.rubocop_gradual.lock | 23 ++ gems/kettle-jem/Gemfile.lock | 199 ++-------- .../gemfiles/modular/optional.gemfile | 1 - gems/kettle-jem/kettle-jem.gemspec | 1 - gems/prism-merge/Gemfile.lock | 356 +----------------- gems/smorg-rb/Gemfile.lock | 292 ++++++++++---- gems/typescript-merge/Gemfile.lock | 353 +---------------- 7 files changed, 301 insertions(+), 924 deletions(-) create mode 100644 gems/kettle-jem/.rubocop_gradual.lock diff --git a/gems/kettle-jem/.rubocop_gradual.lock b/gems/kettle-jem/.rubocop_gradual.lock new file mode 100644 index 000000000..b09c227c5 --- /dev/null +++ b/gems/kettle-jem/.rubocop_gradual.lock @@ -0,0 +1,23 @@ +{ + "kettle-jem.gemspec:1783780734": [ + [19, 32, 10, "Gemspec/RequiredRubyVersion: `required_ruby_version` and `TargetRubyVersion` (3.2, which may be specified in .rubocop.yml) should be equal.", 3888670706], + [90, 3, 70, "Gemspec/DependencyVersion: Dependency version specification is required.", 4023754366], + [91, 3, 65, "Gemspec/DependencyVersion: Dependency version specification is required.", 1638532368], + [92, 3, 53, "Gemspec/DependencyVersion: Dependency version specification is required.", 897228968], + [93, 3, 54, "Gemspec/DependencyVersion: Dependency version specification is required.", 1601414454], + [94, 3, 61, "Gemspec/DependencyVersion: Dependency version specification is required.", 2631699923], + [95, 3, 62, "Gemspec/DependencyVersion: Dependency version specification is required.", 3348222081], + [96, 3, 56, "Gemspec/DependencyVersion: Dependency version specification is required.", 3843726476], + [97, 3, 54, "Gemspec/DependencyVersion: Dependency version specification is required.", 3293105462], + [100, 3, 58, "Gemspec/DependencyVersion: Dependency version specification is required.", 670728969], + [101, 3, 58, "Gemspec/DependencyVersion: Dependency version specification is required.", 1722946409], + [102, 3, 56, "Gemspec/DependencyVersion: Dependency version specification is required.", 2273926958], + [103, 3, 55, "Gemspec/DependencyVersion: Dependency version specification is required.", 1475977371], + [104, 3, 55, "Gemspec/DependencyVersion: Dependency version specification is required.", 3458446143], + [106, 3, 53, "Gemspec/DependencyVersion: Dependency version specification is required.", 3112555885], + [107, 3, 54, "Gemspec/DependencyVersion: Dependency version specification is required.", 1663642130], + [109, 3, 54, "Gemspec/DependencyVersion: Dependency version specification is required.", 527713396], + [111, 3, 54, "Gemspec/DependencyVersion: Dependency version specification is required.", 3116501450], + [112, 3, 54, "Gemspec/DependencyVersion: Dependency version specification is required.", 2771890615] + ] +} diff --git a/gems/kettle-jem/Gemfile.lock b/gems/kettle-jem/Gemfile.lock index 0be893ad7..eae61967d 100644 --- a/gems/kettle-jem/Gemfile.lock +++ b/gems/kettle-jem/Gemfile.lock @@ -28,7 +28,7 @@ PATH yaml-merge (= 7.1.0) 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.0) ast-crispr (= 7.1.0) @@ -36,7 +36,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-crispr (= 7.1.0) @@ -44,23 +44,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -69,14 +53,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge specs: bash-merge (7.1.0) ast-merge (= 7.1.0) @@ -84,14 +61,7 @@ PATH version_gem (~> 1.1, >= 1.1.14) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge specs: citrus-toml-merge (7.1.0) toml-merge (= 7.1.0) @@ -99,7 +69,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) commonmarker (~> 2.2) @@ -107,7 +77,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-merge (= 7.1.0) @@ -115,15 +85,7 @@ PATH version_gem (~> 1.1, >= 1.1.14) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: json-merge (7.1.0) ast-merge (= 7.1.0) @@ -131,7 +93,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) kramdown (~> 2.5) @@ -139,7 +101,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-merge (= 7.1.0) @@ -147,7 +109,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) markdown-merge (= 7.1.0) @@ -155,23 +117,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) prism (~> 1.6) @@ -179,7 +125,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-merge (= 7.1.0) @@ -188,7 +134,7 @@ PATH yaml-merge (= 7.1.0) 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.0) ast-merge (= 7.1.0) @@ -197,7 +143,7 @@ PATH version_gem (~> 1.1, >= 1.1.14) 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.0) ast-merge (= 7.1.0) @@ -205,28 +151,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: toml-merge (7.1.0) ast-merge (= 7.1.0) @@ -234,7 +159,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) citrus (~> 3.0) @@ -243,53 +168,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: yaml-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-dev - specs: - kettle-dev (2.3.7) - emoji_regex (>= 15.0) - kettle-rb (~> 0.1, >= 0.1.2) - kettle-test (~> 2.0, >= 2.0.4) - ruby-progressbar (~> 1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -305,6 +190,10 @@ GEM rubocop (>= 1.0) version_gem (~> 1.1, >= 1.1.14) ast (2.4.3) + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -372,7 +261,18 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) + kettle-dev (2.3.7) + emoji_regex (>= 15.0) + kettle-rb (~> 0.1, >= 0.1.2) + kettle-test (~> 2.0, >= 2.0.4) + ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -602,8 +502,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) @@ -650,15 +548,11 @@ PLATFORMS DEPENDENCIES appraisal2 (~> 3.1, >= 3.1.4) appraisal2-rubocop (~> 1.0, >= 1.0.0) - 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! @@ -668,13 +562,10 @@ DEPENDENCIES erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) - go-merge! irb (~> 1.17) json-merge! - kettle-dev! - kettle-drift! kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 3.0, >= 3.0.0) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -683,8 +574,6 @@ DEPENDENCIES markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! prism-merge! psych-merge! rake (~> 13.0) @@ -701,15 +590,12 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0, >= 3.0.6) ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (~> 1.54, >= 1.54.0) stone_checksums (~> 1.0, >= 1.0.6) stringio (>= 3.0) toml-merge! tree_haver! turbo_tests2 (~> 3.1, >= 3.1.14) - typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.3) yaml-merge! @@ -719,7 +605,6 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.3) yard-yaml (~> 0.2, >= 0.2.3) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -731,13 +616,10 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 @@ -764,17 +646,15 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) - kettle-dev (2.3.7) - kettle-drift (1.0.5) + kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (3.0.1) sha256=83ebe2aa099f15781e4796b5faef0dc2720fba48f6b9d34808670b91baf271e4 kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -794,8 +674,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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 @@ -846,7 +724,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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 @@ -854,7 +731,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.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -869,14 +745,12 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) sha256=ad6743a373eeac954c1b659b17af3aff1c82918b3ce9c9dc572a7c70ff843cdd tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -890,7 +764,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/kettle-jem/gemfiles/modular/optional.gemfile b/gems/kettle-jem/gemfiles/modular/optional.gemfile index ec9c5d656..0433c85a0 100644 --- a/gems/kettle-jem/gemfiles/modular/optional.gemfile +++ b/gems/kettle-jem/gemfiles/modular/optional.gemfile @@ -7,4 +7,3 @@ # # Optional dependencies are not depended on directly, but may be used if present. - diff --git a/gems/kettle-jem/kettle-jem.gemspec b/gems/kettle-jem/kettle-jem.gemspec index 7c09d2800..3b7921be1 100644 --- a/gems/kettle-jem/kettle-jem.gemspec +++ b/gems/kettle-jem/kettle-jem.gemspec @@ -144,5 +144,4 @@ Gem::Specification.new do |spec| # 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.4") # ruby >= 2.4 - end diff --git a/gems/prism-merge/Gemfile.lock b/gems/prism-merge/Gemfile.lock index 09fa20d97..8a93d0713 100644 --- a/gems/prism-merge/Gemfile.lock +++ b/gems/prism-merge/Gemfile.lock @@ -16,265 +16,6 @@ PATH ruby-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +40,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +103,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +131,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -530,11 +267,13 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +326,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +377,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +402,31 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +434,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +446,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +473,11 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +485,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -835,8 +516,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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +524,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +537,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +552,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/smorg-rb/Gemfile.lock b/gems/smorg-rb/Gemfile.lock index 2521de11c..0260b354f 100644 --- a/gems/smorg-rb/Gemfile.lock +++ b/gems/smorg-rb/Gemfile.lock @@ -22,7 +22,31 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: ast-merge-git (7.1.0) ast-merge (= 7.1.0) @@ -30,7 +54,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) benchmark @@ -39,7 +63,53 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge specs: go-merge (7.1.0) ast-merge (= 7.1.0) @@ -47,7 +117,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-merge (= 7.1.0) @@ -55,7 +125,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem specs: kettle-jem (7.1.0) addressable (>= 2.8, < 3) @@ -84,7 +154,23 @@ PATH yaml-merge (= 7.1.0) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: markly-merge (7.1.0) markdown-merge (= 7.1.0) @@ -92,13 +178,103 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: plain-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -110,33 +286,13 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) bundler (>= 1.2.0) thor (~> 1.0) citrus (3.0.2) - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) cmdparse (3.0.7) commonmarker (2.9.0-aarch64-linux) commonmarker (2.9.0-aarch64-linux-musl) @@ -144,10 +300,6 @@ GEM commonmarker (2.9.0-x86_64-darwin) commonmarker (2.9.0-x86_64-linux) commonmarker (2.9.0-x86_64-linux-musl) - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -157,10 +309,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docile (1.4.1) - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -215,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -238,19 +388,11 @@ GEM turbo_tests2 (~> 3.1, >= 3.1.12) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) 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.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) @@ -279,18 +421,9 @@ GEM prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) psych (5.4.0) date stringio - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -302,11 +435,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) rdoc (6.17.0) erb psych (>= 4.0.0) @@ -402,10 +530,6 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -463,18 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -489,10 +606,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.13) - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) yard (0.9.45) yard-fence (0.9.6) rdoc (>= 6.11, < 8) @@ -525,11 +638,20 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) @@ -537,17 +659,24 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -556,19 +685,26 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -580,10 +716,12 @@ CHECKSUMS ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) @@ -622,6 +760,7 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad @@ -649,6 +788,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.0) plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -695,6 +835,7 @@ 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -718,12 +859,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -736,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/typescript-merge/Gemfile.lock b/gems/typescript-merge/Gemfile.lock index 776990eb1..de6a40e2a 100644 --- a/gems/typescript-merge/Gemfile.lock +++ b/gems/typescript-merge/Gemfile.lock @@ -16,265 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +40,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +103,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +131,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +270,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +322,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +373,22 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +397,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +430,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +442,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +469,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +480,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +507,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +518,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,9 +531,6 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f @@ -871,7 +540,6 @@ CHECKSUMS unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +547,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From a40cbef85a2842979b3209669ded3ab48c5d6800 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:29:10 -0600 Subject: [PATCH 182/347] Run family templates --- gems/kettle-jem/Gemfile.lock | 158 ++++++++++++++++++++++++++++++----- 1 file changed, 136 insertions(+), 22 deletions(-) diff --git a/gems/kettle-jem/Gemfile.lock b/gems/kettle-jem/Gemfile.lock index eae61967d..7fdf9cf4b 100644 --- a/gems/kettle-jem/Gemfile.lock +++ b/gems/kettle-jem/Gemfile.lock @@ -28,7 +28,7 @@ PATH yaml-merge (= 7.1.0) 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.0) ast-crispr (= 7.1.0) @@ -36,7 +36,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-crispr (= 7.1.0) @@ -44,7 +44,23 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -53,7 +69,14 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge specs: bash-merge (7.1.0) ast-merge (= 7.1.0) @@ -61,7 +84,14 @@ PATH version_gem (~> 1.1, >= 1.1.14) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge specs: citrus-toml-merge (7.1.0) toml-merge (= 7.1.0) @@ -69,7 +99,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) commonmarker (~> 2.2) @@ -77,7 +107,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-merge (= 7.1.0) @@ -85,7 +115,15 @@ PATH version_gem (~> 1.1, >= 1.1.14) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: json-merge (7.1.0) ast-merge (= 7.1.0) @@ -93,7 +131,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) kramdown (~> 2.5) @@ -101,7 +139,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-merge (= 7.1.0) @@ -109,7 +147,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) markdown-merge (= 7.1.0) @@ -117,7 +155,23 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge specs: prism-merge (7.1.0) prism (~> 1.6) @@ -125,7 +179,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-merge (= 7.1.0) @@ -134,7 +188,7 @@ PATH yaml-merge (= 7.1.0) 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.0) ast-merge (= 7.1.0) @@ -143,7 +197,7 @@ PATH version_gem (~> 1.1, >= 1.1.14) 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.0) ast-merge (= 7.1.0) @@ -151,7 +205,28 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: toml-merge (7.1.0) ast-merge (= 7.1.0) @@ -159,7 +234,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) citrus (~> 3.0) @@ -168,13 +243,28 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: yaml-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -190,10 +280,6 @@ GEM rubocop (>= 1.0) version_gem (~> 1.1, >= 1.1.14) ast (2.4.3) - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -266,6 +352,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (3.0.1) simplecov (>= 1.0) @@ -502,6 +590,8 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) @@ -548,11 +638,15 @@ PLATFORMS DEPENDENCIES appraisal2 (~> 3.1, >= 3.1.4) appraisal2-rubocop (~> 1.0, >= 1.0.0) + 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! @@ -562,8 +656,10 @@ DEPENDENCIES erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) + go-merge! irb (~> 1.17) json-merge! + kettle-drift (~> 1.0, >= 1.0.5) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.0) kettle-test (~> 2.0, >= 2.0.11) @@ -574,6 +670,8 @@ DEPENDENCIES markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! prism-merge! psych-merge! rake (~> 13.0) @@ -590,12 +688,15 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0, >= 3.0.6) ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (~> 1.54, >= 1.54.0) stone_checksums (~> 1.0, >= 1.0.6) stringio (>= 3.0) toml-merge! tree_haver! turbo_tests2 (~> 3.1, >= 3.1.14) + typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.3) yaml-merge! @@ -605,6 +706,7 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.3) yard-yaml (~> 0.2, >= 0.2.3) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -616,10 +718,13 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 @@ -646,12 +751,14 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (3.0.1) sha256=83ebe2aa099f15781e4796b5faef0dc2720fba48f6b9d34808670b91baf271e4 @@ -674,6 +781,8 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 @@ -724,6 +833,7 @@ 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 @@ -731,6 +841,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.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -745,12 +856,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) sha256=ad6743a373eeac954c1b659b17af3aff1c82918b3ce9c9dc572a7c70ff843cdd tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -764,6 +877,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 62fc91541c3b9a70ce3a9c85e34976df707de612 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:32:46 -0600 Subject: [PATCH 183/347] Deduplicate generated sibling Gemfile wiring --- gems/kettle-jem/lib/kettle/jem.rb | 15 ++++ gems/kettle-jem/spec/thin_slice_spec.rb | 103 ++++++++++++++++++++++++ 2 files changed, 118 insertions(+) diff --git a/gems/kettle-jem/lib/kettle/jem.rb b/gems/kettle-jem/lib/kettle/jem.rb index 970f22cf9..e827da9e1 100644 --- a/gems/kettle-jem/lib/kettle/jem.rb +++ b/gems/kettle-jem/lib/kettle/jem.rb @@ -5363,6 +5363,7 @@ def finalize_gemfile_template_source(recipe, content, destination_content, facts if recipe.fetch(:target_path).to_s == "Gemfile" output = inject_main_gemfile_recording_eval(output, facts) output = remove_stale_main_gemfile_direct_sibling_block(output, template_content) + output = deduplicate_main_gemfile_direct_sibling_blocks(output) output = ensure_main_gemfile_nomono_bootstrap(output, template_content) output = normalize_main_gemfile_nomono_requirements(output) output = guard_main_gemfile_runtime_workspace_overrides(output) @@ -5389,6 +5390,20 @@ def remove_stale_main_gemfile_direct_sibling_block(content, template_content) end end + def deduplicate_main_gemfile_direct_sibling_blocks(content) + records = main_gemfile_direct_sibling_records(content) + return content if records.length <= 1 + + records[0...-1].sort_by { |record| -record.fetch(:start_line) }.reduce(content.to_s) do |output, record| + replace_source_range_lines( + output, + record.fetch(:start_line), + expand_line_range_through_following_blanks(output, record.fetch(:end_line)), + "" + ) + end + end + def main_gemfile_direct_sibling_records(content) body = prism_parse_success(content)&.value&.statements&.body || [] assignments = body.select do |node| diff --git a/gems/kettle-jem/spec/thin_slice_spec.rb b/gems/kettle-jem/spec/thin_slice_spec.rb index f78638175..78093675e 100644 --- a/gems/kettle-jem/spec/thin_slice_spec.rb +++ b/gems/kettle-jem/spec/thin_slice_spec.rb @@ -14406,6 +14406,109 @@ def register_kettle_jem_plugin(registrar) end end + it "collapses repeated direct sibling runtime dependency wiring in the main Gemfile" do + tmp_root = File.join(__dir__, "tmp") + FileUtils.mkdir_p(tmp_root) + Dir.mktmpdir("kettle-jem-main-gemfile-direct-sibling-dedupe", tmp_root) do |workspace| + root = File.join(workspace, "adapter") + sibling = File.join(workspace, "shared-core") + FileUtils.mkdir_p([root, sibling]) + write_tree(sibling, { + "shared-core.gemspec" => <<~RUBY + Gem::Specification.new do |spec| + spec.name = "shared-core" + spec.version = "0.1.0" + spec.summary = "Shared core" + end + RUBY + }) + write_tree(root, { + "adapter.gemspec" => <<~RUBY, + Gem::Specification.new do |spec| + spec.name = "adapter" + spec.version = "0.1.0" + spec.summary = "Adapter" + spec.homepage = "https://github.com/rubythems/adapter" + spec.metadata["source_code_uri"] = "https://github.com/rubythems/adapter" + spec.add_dependency "shared-core", "= 0.1.0" + end + RUBY + "Gemfile" => <<~RUBY, + source "https://gem.coop" + + gemspec + + nomono_requirements = ["~> 1.0", ">= 1.0.8"] + gem "nomono", *nomono_requirements, require: false + + # Direct sibling dependencies (env-switched via RUBYTHEMS_DEV) + direct_sibling_gems = %w[ + stale-core + ] + direct_sibling_dev = ENV.fetch("RUBYTHEMS_DEV", "") + direct_sibling_local = + !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) + direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? + + if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) + require "nomono/bundler" + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: "RUBYTHEMS", + path_env: "RUBYTHEMS_DEV", + root: ["src", "my", "rubythems"] + ) + end + + # Direct sibling dependencies (env-switched via RUBYTHEMS_DEV) + direct_sibling_gems = %w[ + shared-core + ] + direct_sibling_dev = ENV.fetch("RUBYTHEMS_DEV", "") + direct_sibling_local = + !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) + direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? + + if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) + require "nomono/bundler" + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: "RUBYTHEMS", + path_env: "RUBYTHEMS_DEV", + root: ["src", "my", "rubythems"] + ) + end + + # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) + eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? + RUBY + ".kettle-jem.yml" => <<~YAML + project_emoji: "💎" + templates: + root: packaged + apply: true + entries: + - Gemfile + YAML + }) + + described_class.apply_project( + root, + env: {}, + run_options: {accept: true, force: true, skip_commit: true} + ) + gemfile = File.read(File.join(root, "Gemfile")) + + expect(gemfile.scan("# Direct sibling dependencies").length).to eq(1) + expect(gemfile).to include("shared-core") + expect(gemfile).not_to include("stale-core") + end + end + it "does not path-wire direct sibling dependencies when the sibling directory has a different gemspec name" do tmp_root = File.join(__dir__, "tmp") FileUtils.mkdir_p(tmp_root) From e10963cd3a1ea97455a0cbb52ecb1b76cab963e9 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:33:26 -0600 Subject: [PATCH 184/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-crispr-ruby-prism/.kettle-drift.lock | 60 ++- gems/ast-crispr-ruby-prism/Gemfile | 40 ++ gems/ast-crispr-ruby-prism/Gemfile.lock | 13 +- gems/ast-crispr/.kettle-drift.lock | 60 ++- gems/ast-crispr/.rubocop_gradual.lock | 213 ---------- gems/ast-crispr/Gemfile | 70 ++- gems/ast-crispr/Gemfile.lock | 401 ++++++++++++++++-- gems/ast-crispr/Rakefile | 18 +- gems/ast-crispr/bin/yard | 2 +- gems/ast-crispr/lib/ast/crispr/version.rb | 2 +- gems/tree_haver/Gemfile | 22 +- gems/tree_haver/Gemfile.lock | 386 ++++++++++++----- gems/tree_haver/Rakefile | 18 +- gems/tree_haver/lib/tree_haver/version.rb | 2 +- 14 files changed, 873 insertions(+), 434 deletions(-) delete mode 100644 gems/ast-crispr/.rubocop_gradual.lock diff --git a/gems/ast-crispr-ruby-prism/.kettle-drift.lock b/gems/ast-crispr-ruby-prism/.kettle-drift.lock index 508d631d8..44ac5c29d 100644 --- a/gems/ast-crispr-ruby-prism/.kettle-drift.lock +++ b/gems/ast-crispr-ruby-prism/.kettle-drift.lock @@ -6,7 +6,8 @@ 79, 119, 159, - 199 + 199, + 239 ] } ], @@ -17,7 +18,8 @@ 90, 130, 170, - 210 + 210, + 250 ] } ], @@ -28,7 +30,8 @@ 80, 120, 160, - 200 + 200, + 240 ] } ], @@ -39,7 +42,8 @@ 92, 132, 172, - 212 + 212, + 252 ] } ], @@ -50,7 +54,8 @@ 95, 135, 175, - 215 + 215, + 255 ] } ], @@ -61,7 +66,8 @@ 81, 121, 161, - 201 + 201, + 241 ] } ], @@ -73,7 +79,8 @@ 99, 139, 179, - 219 + 219, + 259 ] } ], @@ -84,7 +91,8 @@ 100, 140, 180, - 220 + 220, + 260 ] } ], @@ -96,7 +104,8 @@ 86, 126, 166, - 206 + 206, + 246 ] } ], @@ -107,7 +116,8 @@ 109, 149, 189, - 229 + 229, + 269 ] } ], @@ -119,7 +129,8 @@ 78, 118, 158, - 198 + 198, + 238 ] } ], @@ -131,7 +142,8 @@ 108, 148, 188, - 228 + 228, + 268 ] } ], @@ -142,7 +154,8 @@ 84, 124, 164, - 204 + 204, + 244 ] } ], @@ -154,7 +167,8 @@ 91, 131, 171, - 211 + 211, + 251 ] } ], @@ -166,7 +180,8 @@ 87, 127, 167, - 207 + 207, + 247 ] } ], @@ -177,7 +192,8 @@ 85, 125, 165, - 205 + 205, + 245 ] } ], @@ -188,7 +204,8 @@ 102, 142, 182, - 222 + 222, + 262 ] } ], @@ -199,7 +216,8 @@ 101, 141, 181, - 221 + 221, + 261 ] } ], @@ -210,7 +228,8 @@ 96, 136, 176, - 216 + 216, + 256 ] } ], @@ -221,7 +240,8 @@ 105, 145, 185, - 225 + 225, + 265 ] } ], diff --git a/gems/ast-crispr-ruby-prism/Gemfile b/gems/ast-crispr-ruby-prism/Gemfile index 0cb448d5a..9a7dbfd3c 100644 --- a/gems/ast-crispr-ruby-prism/Gemfile +++ b/gems/ast-crispr-ruby-prism/Gemfile @@ -231,6 +231,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/ast-crispr-ruby-prism/Gemfile.lock b/gems/ast-crispr-ruby-prism/Gemfile.lock index 306ec70b4..6edef92ea 100644 --- a/gems/ast-crispr-ruby-prism/Gemfile.lock +++ b/gems/ast-crispr-ruby-prism/Gemfile.lock @@ -16,6 +16,14 @@ PATH prism (>= 1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,10 +35,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) ast-merge (7.1.0) benchmark token-resolver (~> 2.0, >= 2.0.4) @@ -366,6 +370,7 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + ast-crispr! ast-crispr-ruby-prism! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) diff --git a/gems/ast-crispr/.kettle-drift.lock b/gems/ast-crispr/.kettle-drift.lock index 508d631d8..44ac5c29d 100644 --- a/gems/ast-crispr/.kettle-drift.lock +++ b/gems/ast-crispr/.kettle-drift.lock @@ -6,7 +6,8 @@ 79, 119, 159, - 199 + 199, + 239 ] } ], @@ -17,7 +18,8 @@ 90, 130, 170, - 210 + 210, + 250 ] } ], @@ -28,7 +30,8 @@ 80, 120, 160, - 200 + 200, + 240 ] } ], @@ -39,7 +42,8 @@ 92, 132, 172, - 212 + 212, + 252 ] } ], @@ -50,7 +54,8 @@ 95, 135, 175, - 215 + 215, + 255 ] } ], @@ -61,7 +66,8 @@ 81, 121, 161, - 201 + 201, + 241 ] } ], @@ -73,7 +79,8 @@ 99, 139, 179, - 219 + 219, + 259 ] } ], @@ -84,7 +91,8 @@ 100, 140, 180, - 220 + 220, + 260 ] } ], @@ -96,7 +104,8 @@ 86, 126, 166, - 206 + 206, + 246 ] } ], @@ -107,7 +116,8 @@ 109, 149, 189, - 229 + 229, + 269 ] } ], @@ -119,7 +129,8 @@ 78, 118, 158, - 198 + 198, + 238 ] } ], @@ -131,7 +142,8 @@ 108, 148, 188, - 228 + 228, + 268 ] } ], @@ -142,7 +154,8 @@ 84, 124, 164, - 204 + 204, + 244 ] } ], @@ -154,7 +167,8 @@ 91, 131, 171, - 211 + 211, + 251 ] } ], @@ -166,7 +180,8 @@ 87, 127, 167, - 207 + 207, + 247 ] } ], @@ -177,7 +192,8 @@ 85, 125, 165, - 205 + 205, + 245 ] } ], @@ -188,7 +204,8 @@ 102, 142, 182, - 222 + 222, + 262 ] } ], @@ -199,7 +216,8 @@ 101, 141, 181, - 221 + 221, + 261 ] } ], @@ -210,7 +228,8 @@ 96, 136, 176, - 216 + 216, + 256 ] } ], @@ -221,7 +240,8 @@ 105, 145, 185, - 225 + 225, + 265 ] } ], diff --git a/gems/ast-crispr/.rubocop_gradual.lock b/gems/ast-crispr/.rubocop_gradual.lock deleted file mode 100644 index d920cf89f..000000000 --- a/gems/ast-crispr/.rubocop_gradual.lock +++ /dev/null @@ -1,213 +0,0 @@ -{ - ".simplecov:3928423310": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:918344237": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "ast-crispr.gemspec:2262341056": [ - [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/ast-crispr.rb:247837913": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`ast-crispr.rb`) should use snake_case.", 5381] - ], - "lib/ast/crispr.rb:3730230259": [ - [12, 5, 11, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Error`.", 62528179], - [22, 5, 11, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Limit`.", 51888158], - [47, 7, 622, "Metrics/MethodLength: Method has too many lines. [14/10]", 2816807495], - [61, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], - [65, 7, 1168, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_hash` is too high. [<6, 29, 10> 31.26/17]", 3515286222], - [65, 7, 1168, "Metrics/MethodLength: Method has too many lines. [27/10]", 3515286222], - [90, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3685471369], - [96, 7, 822, "Metrics/AbcSize: Assignment Branch Condition size for `constraint_for_operator` is too high. [<5, 11, 13> 17.75/17]", 1402705503], - [96, 7, 822, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `constraint_for_operator` is too high. [8/7]", 1402705503], - [96, 7, 822, "Metrics/MethodLength: Method has too many lines. [19/10]", 1402705503], - [124, 5, 11, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Match`.", 52676120], - [127, 21, 73, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 344717847], - [172, 5, 18, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::MatchProfile`.", 365273299], - [172, 5, 4350, "Metrics/ClassLength: Class has too many lines. [115/100]", 1575766989], - [273, 7, 596, "Metrics/MethodLength: Method has too many lines. [14/10]", 2070486858], - [314, 5, 24, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::DestinationProfile`.", 3442102524], - [314, 5, 4581, "Metrics/ClassLength: Class has too many lines. [119/100]", 3503477661], - [352, 21, 126, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 931636409], - [417, 7, 667, "Metrics/MethodLength: Method has too many lines. [15/10]", 4004247638], - [460, 5, 27, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::DestinationResolution`.", 1305107769], - [474, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::StructureProfile`.", 614380405], - [512, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::SelectionProfile`.", 2464089216], - [531, 21, 165, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1182500333], - [566, 7, 585, "Metrics/MethodLength: Method has too many lines. [13/10]", 13786997], - [583, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::OperationProfile`.", 1974079861], - [607, 21, 188, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2526147676], - [662, 7, 478, "Metrics/MethodLength: Method has too many lines. [11/10]", 795235914], - [695, 7, 10, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Adapters::Null`.", 3515430288], - [728, 5, 21, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::DocumentContext`.", 594998459], - [788, 5, 19, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::OwnerSelector`.", 3092459999], - [791, 21, 81, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2293822273], - [853, 7, 606, "Metrics/MethodLength: Method has too many lines. [16/10]", 422136278], - [883, 5, 16, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::Selectors`.", 2133324825], - [883, 5, 5586, "Metrics/ModuleLength: Module has too many lines. [130/100]", 3440946513], - [886, 7, 1642, "Metrics/AbcSize: Assignment Branch Condition size for `owner_filter` is too high. [<6, 18, 11> 21.93/17]", 3224577904], - [886, 7, 1642, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `owner_filter` is too high. [10/7]", 3224577904], - [886, 7, 1642, "Metrics/MethodLength: Method has too many lines. [37/10]", 3224577904], - [886, 7, 1642, "Metrics/PerceivedComplexity: Perceived complexity for `owner_filter` is too high. [11/8]", 3224577904], - [886, 23, 135, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3231562627], - [930, 7, 1936, "Metrics/AbcSize: Assignment Branch Condition size for `comment_region_owned_owner` is too high. [<7, 16, 7> 18.81/17]", 2629441148], - [930, 7, 1936, "Metrics/MethodLength: Method has too many lines. [40/10]", 2629441148], - [930, 37, 190, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 4159525724], - [931, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 940069302], - [975, 7, 1731, "Metrics/AbcSize: Assignment Branch Condition size for `line_block` is too high. [<12, 22, 14> 28.71/17]", 1307990669], - [975, 7, 1731, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `line_block` is too high. [12/7]", 1307990669], - [975, 7, 1731, "Metrics/MethodLength: Method has too many lines. [38/10]", 1307990669], - [975, 7, 1731, "Metrics/PerceivedComplexity: Perceived complexity for `line_block` is too high. [12/8]", 1307990669], - [975, 21, 130, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 515174999], - [1027, 5, 23, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::OperationSupport`.", 343849029], - [1027, 5, 6491, "Metrics/ModuleLength: Module has too many lines. [139/100]", 2271788056], - [1072, 7, 1758, "Metrics/AbcSize: Assignment Branch Condition size for `insertion_from` is too high. [<5, 21, 11> 24.23/17]", 29011294], - [1072, 7, 1758, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `insertion_from` is too high. [9/7]", 29011294], - [1072, 7, 1758, "Metrics/MethodLength: Method has too many lines. [28/10]", 29011294], - [1072, 7, 1758, "Metrics/PerceivedComplexity: Perceived complexity for `insertion_from` is too high. [10/8]", 29011294], - [1115, 7, 827, "Metrics/AbcSize: Assignment Branch Condition size for `splice_after_anchor` is too high. [<4, 19, 2> 19.52/17]", 14691010], - [1115, 7, 827, "Metrics/MethodLength: Method has too many lines. [16/10]", 14691010], - [1119, 9, 72, "Style/RaiseArgs: Provide an exception class and message as arguments to `raise`.", 789091243], - [1121, 23, 72, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 2503424841], - [1153, 9, 25, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 768340433], - [1197, 5, 26, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::OperationProfilable`.", 4114431854], - [1206, 7, 19, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::OperationProfilable::ClassMethods`.", 3606528253], - [1218, 5, 13, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Replace`.", 1563590855], - [1243, 7, 643, "Metrics/AbcSize: Assignment Branch Condition size for `call` is too high. [<10, 32, 3> 33.66/17]", 3656683885], - [1243, 7, 643, "Metrics/MethodLength: Method has too many lines. [14/10]", 3656683885], - [1262, 5, 12, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Delete`.", 2011475922], - [1286, 7, 538, "Metrics/AbcSize: Assignment Branch Condition size for `call` is too high. [<7, 21, 1> 22.16/17]", 2655200768], - [1286, 7, 538, "Metrics/MethodLength: Method has too many lines. [13/10]", 2655200768], - [1304, 5, 12, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Insert`.", 1590185308], - [1338, 5, 10, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Move`.", 3515667002], - [1366, 7, 1182, "Metrics/AbcSize: Assignment Branch Condition size for `call` is too high. [<14, 40, 7> 42.95/17]", 172197360], - [1366, 7, 1182, "Metrics/MethodLength: Method has too many lines. [22/10]", 172197360], - [1383, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2688172402], - [1396, 3, 13, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr`.", 315644438], - [1396, 3, 12758, "Metrics/ModuleLength: Module has too many lines. [180/100]", 2662313186], - [1397, 5, 33, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::ProfileReportCompatibility`.", 3039519892], - [1419, 5, 18, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::MatchProfile`.", 365273299], - [1431, 7, 28, "Lint/DuplicateMethods: Method `Ast::Crispr::MatchProfile#normalize_start_boundary` is defined at both lib/ast/crispr.rb:292 and lib/ast/crispr.rb:1431.", 2362701855], - [1435, 7, 26, "Lint/DuplicateMethods: Method `Ast::Crispr::MatchProfile#normalize_end_boundary` is defined at both lib/ast/crispr.rb:299 and lib/ast/crispr.rb:1435.", 2613594544], - [1439, 7, 26, "Lint/DuplicateMethods: Method `Ast::Crispr::MatchProfile#normalize_payload_kind` is defined at both lib/ast/crispr.rb:306 and lib/ast/crispr.rb:1439.", 2604742721], - [1444, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::SelectionProfile`.", 2464089216], - [1466, 7, 14, "Lint/DuplicateMethods: Method `Ast::Crispr::SelectionProfile#initialize` is defined at both lib/ast/crispr.rb:531 and lib/ast/crispr.rb:1466.", 956205738], - [1466, 7, 773, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `initialize` is too high. [8/7]", 771809109], - [1466, 7, 773, "Metrics/MethodLength: Method has too many lines. [11/10]", 771809109], - [1466, 21, 190, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 4167448336], - [1481, 7, 1286, "Metrics/AbcSize: Assignment Branch Condition size for `report` is too high. [<5, 29, 13> 32.17/17]", 1720478959], - [1481, 7, 1286, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report` is too high. [11/7]", 1720478959], - [1481, 7, 1286, "Metrics/MethodLength: Method has too many lines. [17/10]", 1720478959], - [1481, 7, 1286, "Metrics/PerceivedComplexity: Perceived complexity for `report` is too high. [11/8]", 1720478959], - [1496, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 1470192175], - [1520, 5, 24, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::DestinationProfile`.", 3442102524], - [1534, 7, 29, "Lint/DuplicateMethods: Method `Ast::Crispr::DestinationProfile#normalize_resolution_kind` is defined at both lib/ast/crispr.rb:437 and lib/ast/crispr.rb:1534.", 99310177], - [1538, 7, 31, "Lint/DuplicateMethods: Method `Ast::Crispr::DestinationProfile#normalize_resolution_source` is defined at both lib/ast/crispr.rb:444 and lib/ast/crispr.rb:1538.", 1692065396], - [1542, 7, 29, "Lint/DuplicateMethods: Method `Ast::Crispr::DestinationProfile#normalize_anchor_boundary` is defined at both lib/ast/crispr.rb:452 and lib/ast/crispr.rb:1542.", 3028754726], - [1547, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::OperationProfile`.", 1974079861], - [1550, 7, 733, "Metrics/MethodLength: Method has too many lines. [13/10]", 2619513218], - [1570, 7, 25, "Lint/DuplicateMethods: Method `Ast::Crispr::OperationProfile#normalize_requirement` is defined at both lib/ast/crispr.rb:678 and lib/ast/crispr.rb:1570.", 440444039], - [1574, 7, 32, "Lint/DuplicateMethods: Method `Ast::Crispr::OperationProfile#normalize_replacement_source` is defined at both lib/ast/crispr.rb:686 and lib/ast/crispr.rb:1574.", 3533021156], - [1579, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::StructureProfile`.", 614380405], - [1595, 5, 6309, "Metrics/ClassLength: Class has too many lines. [172/100]", 1270437788], - [1600, 7, 2717, "Metrics/MethodLength: Method has too many lines. [67/10]", 1469599129], - [1665, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 259030389], - [1678, 28, 247, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3385598543], - [1710, 28, 242, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1038219895] - ], - "lib/ast/crispr/rspec/shared_examples/destination_profile.rb:2529475135": [ - [3, 1, 2386, "Metrics/BlockLength: Block has too many lines. [28/25]", 2846758965], - [4, 3, 2311, "Metrics/BlockLength: Block has too many lines. [26/25]", 2123267236] - ], - "lib/ast/crispr/rspec/shared_examples/match_profile.rb:2566447993": [ - [3, 1, 1997, "Metrics/BlockLength: Block has too many lines. [26/25]", 1032277788] - ], - "lib/ast/crispr/rspec/shared_examples/operation_profile.rb:3583567850": [ - [3, 1, 2148, "Metrics/BlockLength: Block has too many lines. [26/25]", 2745151209] - ], - "spec/old_runtime_spec.rb:1564590841": [ - [3, 1, 17728, "Metrics/BlockLength: Block has too many lines. [383/25]", 205400157], - [4, 3, 69, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3712453399], - [5, 3, 68, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1429320782], - [6, 3, 59, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 253007150], - [8, 3, 891, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 361389624], - [18, 37, 11, "Lint/UnusedMethodArgument: Unused method argument - `owner_scope`.", 3846606321], - [22, 46, 6, "Lint/UnusedMethodArgument: Unused method argument - `region`.", 2124512157], - [22, 64, 11, "Lint/UnusedMethodArgument: Unused method argument - `owner_scope`.", 3846606321], - [73, 3, 8534, "Metrics/BlockLength: Block has too many lines. [176/25]", 3042299525], - [313, 3, 3640, "Metrics/BlockLength: Block has too many lines. [72/25]", 1133370152], - [418, 3, 1663, "Metrics/BlockLength: Block has too many lines. [41/25]", 115074475] - ] -} diff --git a/gems/ast-crispr/Gemfile b/gems/ast-crispr/Gemfile index d841c9c33..9568b99c7 100644 --- a/gems/ast-crispr/Gemfile +++ b/gems/ast-crispr/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source 'https://gem.coop' +source "https://gem.coop" git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,17 +19,61 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ['~> 1.0', '>= 1.0.8'] -gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ["~> 1.0", ">= 1.0.8"] +gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ast-merge ] -direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') +direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? + +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) + direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") + direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == "nomono" } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + if nomono_locked + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] + end + end + Kernel.send(:gem, "nomono", *nomono_activation_requirements) + require "nomono/bundler" + if direct_sibling_templating && !direct_sibling_local + ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + end + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: "STRUCTUREDMERGE", + path_env: "STRUCTUREDMERGE_DEV", + root: ["src", "my", "structuredmerge"] + ) + rescue LoadError + warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + else + ENV.delete("STRUCTUREDMERGE_DEV") + end + end + end +end if direct_sibling_gems.any? && (direct_sibling_local || @@ -249,25 +293,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? # Debugging -eval_gemfile 'gemfiles/modular/debug.gemfile' +eval_gemfile "gemfiles/modular/debug.gemfile" # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile 'gemfiles/modular/coverage.gemfile' +eval_gemfile "gemfiles/modular/coverage.gemfile" # Linting -eval_gemfile 'gemfiles/modular/style.gemfile' +eval_gemfile "gemfiles/modular/style.gemfile" # Documentation -eval_gemfile 'gemfiles/modular/documentation.gemfile' +eval_gemfile "gemfiles/modular/documentation.gemfile" # Optional -eval_gemfile 'gemfiles/modular/optional.gemfile' +eval_gemfile "gemfiles/modular/optional.gemfile" ### Std Lib Extracted Gems -eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' +eval_gemfile "gemfiles/modular/x_std_libs.gemfile" # See unlocked_deps appraisal for more details on irb inclusion -gem 'irb', '~> 1.17' # ruby >= 2.7 +gem "irb", "~> 1.17" # ruby >= 2.7 diff --git a/gems/ast-crispr/Gemfile.lock b/gems/ast-crispr/Gemfile.lock index 3d95aba91..7478fbf81 100644 --- a/gems/ast-crispr/Gemfile.lock +++ b/gems/ast-crispr/Gemfile.lock @@ -16,6 +16,281 @@ PATH service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -27,11 +302,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +310,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -48,7 +324,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -104,15 +379,6 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -131,6 +397,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -275,22 +542,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -324,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -376,22 +639,44 @@ DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-drift! + kettle-jem! + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -400,18 +685,26 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -419,20 +712,34 @@ CHECKSUMS appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -445,19 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -472,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -483,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -510,18 +830,19 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -535,14 +856,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -550,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ast-crispr/Rakefile b/gems/ast-crispr/Rakefile index 0fe938704..2b30812c4 100644 --- a/gems/ast-crispr/Rakefile +++ b/gems/ast-crispr/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require 'kettle/drift' + require "kettle/drift" Kettle::Drift.install_tasks rescue LoadError - desc('(stub) kettle:drift:check is unavailable') - task('kettle:drift:check') do + desc("(stub) kettle:drift:check is unavailable") + task("kettle:drift:check") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:update is unavailable') - task('kettle:drift:update') do + desc("(stub) kettle:drift:update is unavailable") + task("kettle:drift:update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:force_update is unavailable') - task('kettle:drift:force_update') do + desc("(stub) kettle:drift:force_update is unavailable") + task("kettle:drift:force_update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift is unavailable') - task('kettle:drift' => 'kettle:drift:update') + desc("(stub) kettle:drift is unavailable") + task("kettle:drift" => "kettle:drift:update") end ### TEMPLATING TASKS diff --git a/gems/ast-crispr/bin/yard b/gems/ast-crispr/bin/yard index 5d516ad6f..a7e8b6eed 100755 --- a/gems/ast-crispr/bin/yard +++ b/gems/ast-crispr/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec('bundle', 'exec', 'rake', 'yard') +exec("bundle", "exec", "rake", "yard") diff --git a/gems/ast-crispr/lib/ast/crispr/version.rb b/gems/ast-crispr/lib/ast/crispr/version.rb index c2c80e954..af38578d7 100644 --- a/gems/ast-crispr/lib/ast/crispr/version.rb +++ b/gems/ast-crispr/lib/ast/crispr/version.rb @@ -3,7 +3,7 @@ module Ast module Crispr module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/tree_haver/Gemfile b/gems/tree_haver/Gemfile index 5209ba280..b1afe238c 100644 --- a/gems/tree_haver/Gemfile +++ b/gems/tree_haver/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source 'https://gem.coop' +source "https://gem.coop" git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,8 +19,8 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ['~> 1.0', '>= 1.0.8'] -gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ["~> 1.0", ">= 1.0.8"] +gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = @@ -29,25 +29,25 @@ if !tslp_declared_by_templating && tslp_dev.to_s.empty? end # Modular sibling dependencies (env-switched inside each modular Gemfile) -eval_gemfile 'gemfiles/modular/templating.gemfile' +eval_gemfile "gemfiles/modular/templating.gemfile" # Debugging -eval_gemfile 'gemfiles/modular/debug.gemfile' +eval_gemfile "gemfiles/modular/debug.gemfile" # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile 'gemfiles/modular/coverage.gemfile' +eval_gemfile "gemfiles/modular/coverage.gemfile" # Linting -eval_gemfile 'gemfiles/modular/style.gemfile' +eval_gemfile "gemfiles/modular/style.gemfile" # Documentation -eval_gemfile 'gemfiles/modular/documentation.gemfile' +eval_gemfile "gemfiles/modular/documentation.gemfile" # Optional -eval_gemfile 'gemfiles/modular/optional.gemfile' +eval_gemfile "gemfiles/modular/optional.gemfile" ### Std Lib Extracted Gems -eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' +eval_gemfile "gemfiles/modular/x_std_libs.gemfile" # See unlocked_deps appraisal for more details on irb inclusion -gem 'irb', '~> 1.17' # ruby >= 2.7 +gem "irb", "~> 1.17" # ruby >= 2.7 diff --git a/gems/tree_haver/Gemfile.lock b/gems/tree_haver/Gemfile.lock index 8e744e1af..7ac4910fb 100644 --- a/gems/tree_haver/Gemfile.lock +++ b/gems/tree_haver/Gemfile.lock @@ -7,59 +7,288 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -GEM - remote: https://gem.coop/ +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - ansi (1.6.0) - appraisal2 (3.2.0) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - ast (2.4.3) - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) ast-crispr-markdown-markly (7.1.0) ast-crispr (= 7.1.0) markly-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) prism (>= 1.0) version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: ast-merge (7.1.0) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) - backports (3.25.3) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: bash-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +GEM + remote: https://gem.coop/ + specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + ansi (1.6.0) + appraisal2 (3.2.0) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + 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) citrus (3.0.2) - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) cmdparse (3.0.7) commonmarker (2.9.0-aarch64-linux) commonmarker (2.9.0-aarch64-linux-musl) commonmarker (2.9.0-arm64-darwin) commonmarker (2.9.0-x86_64-linux) commonmarker (2.9.0-x86_64-linux-musl) - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -69,10 +298,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docile (1.4.1) - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -122,10 +347,6 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) @@ -133,31 +354,6 @@ GEM ruby-progressbar (~> 1.13) kettle-drift (1.0.5) version_gem (~> 1.1, >= 1.1.13) - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -181,24 +377,12 @@ GEM turbo_tests2 (~> 3.1, >= 3.1.12) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) 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.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -224,18 +408,9 @@ GEM prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) psych (5.4.0) date stringio - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -244,11 +419,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) rdoc (6.17.0) erb psych (>= 4.0.0) @@ -344,10 +514,6 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -407,10 +573,6 @@ GEM version_gem (~> 1.1, >= 1.1.13) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) @@ -434,10 +596,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.13) - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) yard (0.9.45) yard-fence (0.9.6) rdoc (>= 6.11, < 8) @@ -470,24 +628,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem (>= 7.0) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -496,20 +675,27 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml (~> 0.3) + toml-merge! toml-rb (~> 4.1) tree_haver! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -520,10 +706,13 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) @@ -554,6 +743,7 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 @@ -587,6 +777,8 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 @@ -630,6 +822,7 @@ 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -639,6 +832,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -661,6 +855,7 @@ CHECKSUMS tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) sha256=ad6743a373eeac954c1b659b17af3aff1c82918b3ce9c9dc572a7c70ff843cdd tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -673,6 +868,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/tree_haver/Rakefile b/gems/tree_haver/Rakefile index ab2dc23d9..0a3c6f7a9 100644 --- a/gems/tree_haver/Rakefile +++ b/gems/tree_haver/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require 'kettle/drift' + require "kettle/drift" Kettle::Drift.install_tasks rescue LoadError - desc('(stub) kettle:drift:check is unavailable') - task('kettle:drift:check') do + desc("(stub) kettle:drift:check is unavailable") + task("kettle:drift:check") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:update is unavailable') - task('kettle:drift:update') do + desc("(stub) kettle:drift:update is unavailable") + task("kettle:drift:update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:force_update is unavailable') - task('kettle:drift:force_update') do + desc("(stub) kettle:drift:force_update is unavailable") + task("kettle:drift:force_update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift is unavailable') - task('kettle:drift' => 'kettle:drift:update') + desc("(stub) kettle:drift is unavailable") + task("kettle:drift" => "kettle:drift:update") end ### TEMPLATING TASKS diff --git a/gems/tree_haver/lib/tree_haver/version.rb b/gems/tree_haver/lib/tree_haver/version.rb index 43365bf4e..9bd0db819 100644 --- a/gems/tree_haver/lib/tree_haver/version.rb +++ b/gems/tree_haver/lib/tree_haver/version.rb @@ -2,7 +2,7 @@ module TreeHaver module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end From 788bfd727cb47ee1aa57f93f20037cad510c99b5 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:33:33 -0600 Subject: [PATCH 185/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-crispr-ruby-prism/Gemfile.lock | 334 ++++++++++++++++++- gems/ast-crispr/.rubocop_gradual.lock | 213 ++++++++++++ gems/ast-crispr/Gemfile | 68 ++-- gems/ast-crispr/Gemfile.lock | 388 ++-------------------- gems/ast-crispr/Rakefile | 18 +- gems/ast-crispr/bin/yard | 2 +- gems/ast-crispr/lib/ast/crispr/version.rb | 2 +- gems/ast-merge/.kettle-drift.lock | 60 ++-- gems/ast-merge/Gemfile | 70 +++- gems/ast-merge/Rakefile | 18 +- gems/ast-merge/lib/ast/merge/version.rb | 2 +- gems/markdown-merge/Gemfile.lock | 353 +++++++++++++++++++- gems/tree_haver/Gemfile | 22 +- gems/tree_haver/Gemfile.lock | 59 ++-- gems/tree_haver/Rakefile | 18 +- gems/tree_haver/lib/tree_haver/version.rb | 2 +- 16 files changed, 1111 insertions(+), 518 deletions(-) create mode 100644 gems/ast-crispr/.rubocop_gradual.lock diff --git a/gems/ast-crispr-ruby-prism/Gemfile.lock b/gems/ast-crispr-ruby-prism/Gemfile.lock index 6edef92ea..de85587b4 100644 --- a/gems/ast-crispr-ruby-prism/Gemfile.lock +++ b/gems/ast-crispr-ruby-prism/Gemfile.lock @@ -17,13 +17,264 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: ast-crispr (7.1.0) ast-merge (= 7.1.0) service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -35,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -48,6 +294,8 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -111,6 +359,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -139,6 +389,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-x86_64-linux-gnu) racc (~> 1.4) @@ -324,11 +575,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -371,23 +622,44 @@ DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -396,18 +668,26 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -415,14 +695,23 @@ CHECKSUMS appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -430,6 +719,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -442,19 +732,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-x86_64-linux-gnu) sha256=379fae440b28915e3f19d752ce2dcf8465ed2b2fbefd2a7ca0dd497bc981a06a nokogiri (1.19.4-x86_64-linux-musl) sha256=17dfb7c1fa194ae02fbf7c51a7afc8d278045ab3fdacfd86f91d02d7b274470b @@ -465,10 +763,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -476,6 +778,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -503,9 +806,11 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -515,6 +820,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -528,14 +834,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -543,6 +854,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ast-crispr/.rubocop_gradual.lock b/gems/ast-crispr/.rubocop_gradual.lock new file mode 100644 index 000000000..d920cf89f --- /dev/null +++ b/gems/ast-crispr/.rubocop_gradual.lock @@ -0,0 +1,213 @@ +{ + ".simplecov:3928423310": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:918344237": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "ast-crispr.gemspec:2262341056": [ + [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/ast-crispr.rb:247837913": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`ast-crispr.rb`) should use snake_case.", 5381] + ], + "lib/ast/crispr.rb:3730230259": [ + [12, 5, 11, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Error`.", 62528179], + [22, 5, 11, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Limit`.", 51888158], + [47, 7, 622, "Metrics/MethodLength: Method has too many lines. [14/10]", 2816807495], + [61, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], + [65, 7, 1168, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_hash` is too high. [<6, 29, 10> 31.26/17]", 3515286222], + [65, 7, 1168, "Metrics/MethodLength: Method has too many lines. [27/10]", 3515286222], + [90, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3685471369], + [96, 7, 822, "Metrics/AbcSize: Assignment Branch Condition size for `constraint_for_operator` is too high. [<5, 11, 13> 17.75/17]", 1402705503], + [96, 7, 822, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `constraint_for_operator` is too high. [8/7]", 1402705503], + [96, 7, 822, "Metrics/MethodLength: Method has too many lines. [19/10]", 1402705503], + [124, 5, 11, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Match`.", 52676120], + [127, 21, 73, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 344717847], + [172, 5, 18, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::MatchProfile`.", 365273299], + [172, 5, 4350, "Metrics/ClassLength: Class has too many lines. [115/100]", 1575766989], + [273, 7, 596, "Metrics/MethodLength: Method has too many lines. [14/10]", 2070486858], + [314, 5, 24, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::DestinationProfile`.", 3442102524], + [314, 5, 4581, "Metrics/ClassLength: Class has too many lines. [119/100]", 3503477661], + [352, 21, 126, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 931636409], + [417, 7, 667, "Metrics/MethodLength: Method has too many lines. [15/10]", 4004247638], + [460, 5, 27, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::DestinationResolution`.", 1305107769], + [474, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::StructureProfile`.", 614380405], + [512, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::SelectionProfile`.", 2464089216], + [531, 21, 165, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1182500333], + [566, 7, 585, "Metrics/MethodLength: Method has too many lines. [13/10]", 13786997], + [583, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::OperationProfile`.", 1974079861], + [607, 21, 188, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2526147676], + [662, 7, 478, "Metrics/MethodLength: Method has too many lines. [11/10]", 795235914], + [695, 7, 10, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Adapters::Null`.", 3515430288], + [728, 5, 21, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::DocumentContext`.", 594998459], + [788, 5, 19, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::OwnerSelector`.", 3092459999], + [791, 21, 81, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2293822273], + [853, 7, 606, "Metrics/MethodLength: Method has too many lines. [16/10]", 422136278], + [883, 5, 16, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::Selectors`.", 2133324825], + [883, 5, 5586, "Metrics/ModuleLength: Module has too many lines. [130/100]", 3440946513], + [886, 7, 1642, "Metrics/AbcSize: Assignment Branch Condition size for `owner_filter` is too high. [<6, 18, 11> 21.93/17]", 3224577904], + [886, 7, 1642, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `owner_filter` is too high. [10/7]", 3224577904], + [886, 7, 1642, "Metrics/MethodLength: Method has too many lines. [37/10]", 3224577904], + [886, 7, 1642, "Metrics/PerceivedComplexity: Perceived complexity for `owner_filter` is too high. [11/8]", 3224577904], + [886, 23, 135, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3231562627], + [930, 7, 1936, "Metrics/AbcSize: Assignment Branch Condition size for `comment_region_owned_owner` is too high. [<7, 16, 7> 18.81/17]", 2629441148], + [930, 7, 1936, "Metrics/MethodLength: Method has too many lines. [40/10]", 2629441148], + [930, 37, 190, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 4159525724], + [931, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 940069302], + [975, 7, 1731, "Metrics/AbcSize: Assignment Branch Condition size for `line_block` is too high. [<12, 22, 14> 28.71/17]", 1307990669], + [975, 7, 1731, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `line_block` is too high. [12/7]", 1307990669], + [975, 7, 1731, "Metrics/MethodLength: Method has too many lines. [38/10]", 1307990669], + [975, 7, 1731, "Metrics/PerceivedComplexity: Perceived complexity for `line_block` is too high. [12/8]", 1307990669], + [975, 21, 130, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 515174999], + [1027, 5, 23, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::OperationSupport`.", 343849029], + [1027, 5, 6491, "Metrics/ModuleLength: Module has too many lines. [139/100]", 2271788056], + [1072, 7, 1758, "Metrics/AbcSize: Assignment Branch Condition size for `insertion_from` is too high. [<5, 21, 11> 24.23/17]", 29011294], + [1072, 7, 1758, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `insertion_from` is too high. [9/7]", 29011294], + [1072, 7, 1758, "Metrics/MethodLength: Method has too many lines. [28/10]", 29011294], + [1072, 7, 1758, "Metrics/PerceivedComplexity: Perceived complexity for `insertion_from` is too high. [10/8]", 29011294], + [1115, 7, 827, "Metrics/AbcSize: Assignment Branch Condition size for `splice_after_anchor` is too high. [<4, 19, 2> 19.52/17]", 14691010], + [1115, 7, 827, "Metrics/MethodLength: Method has too many lines. [16/10]", 14691010], + [1119, 9, 72, "Style/RaiseArgs: Provide an exception class and message as arguments to `raise`.", 789091243], + [1121, 23, 72, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 2503424841], + [1153, 9, 25, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 768340433], + [1197, 5, 26, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::OperationProfilable`.", 4114431854], + [1206, 7, 19, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::OperationProfilable::ClassMethods`.", 3606528253], + [1218, 5, 13, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Replace`.", 1563590855], + [1243, 7, 643, "Metrics/AbcSize: Assignment Branch Condition size for `call` is too high. [<10, 32, 3> 33.66/17]", 3656683885], + [1243, 7, 643, "Metrics/MethodLength: Method has too many lines. [14/10]", 3656683885], + [1262, 5, 12, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Delete`.", 2011475922], + [1286, 7, 538, "Metrics/AbcSize: Assignment Branch Condition size for `call` is too high. [<7, 21, 1> 22.16/17]", 2655200768], + [1286, 7, 538, "Metrics/MethodLength: Method has too many lines. [13/10]", 2655200768], + [1304, 5, 12, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Insert`.", 1590185308], + [1338, 5, 10, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Move`.", 3515667002], + [1366, 7, 1182, "Metrics/AbcSize: Assignment Branch Condition size for `call` is too high. [<14, 40, 7> 42.95/17]", 172197360], + [1366, 7, 1182, "Metrics/MethodLength: Method has too many lines. [22/10]", 172197360], + [1383, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2688172402], + [1396, 3, 13, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr`.", 315644438], + [1396, 3, 12758, "Metrics/ModuleLength: Module has too many lines. [180/100]", 2662313186], + [1397, 5, 33, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::ProfileReportCompatibility`.", 3039519892], + [1419, 5, 18, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::MatchProfile`.", 365273299], + [1431, 7, 28, "Lint/DuplicateMethods: Method `Ast::Crispr::MatchProfile#normalize_start_boundary` is defined at both lib/ast/crispr.rb:292 and lib/ast/crispr.rb:1431.", 2362701855], + [1435, 7, 26, "Lint/DuplicateMethods: Method `Ast::Crispr::MatchProfile#normalize_end_boundary` is defined at both lib/ast/crispr.rb:299 and lib/ast/crispr.rb:1435.", 2613594544], + [1439, 7, 26, "Lint/DuplicateMethods: Method `Ast::Crispr::MatchProfile#normalize_payload_kind` is defined at both lib/ast/crispr.rb:306 and lib/ast/crispr.rb:1439.", 2604742721], + [1444, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::SelectionProfile`.", 2464089216], + [1466, 7, 14, "Lint/DuplicateMethods: Method `Ast::Crispr::SelectionProfile#initialize` is defined at both lib/ast/crispr.rb:531 and lib/ast/crispr.rb:1466.", 956205738], + [1466, 7, 773, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `initialize` is too high. [8/7]", 771809109], + [1466, 7, 773, "Metrics/MethodLength: Method has too many lines. [11/10]", 771809109], + [1466, 21, 190, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 4167448336], + [1481, 7, 1286, "Metrics/AbcSize: Assignment Branch Condition size for `report` is too high. [<5, 29, 13> 32.17/17]", 1720478959], + [1481, 7, 1286, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report` is too high. [11/7]", 1720478959], + [1481, 7, 1286, "Metrics/MethodLength: Method has too many lines. [17/10]", 1720478959], + [1481, 7, 1286, "Metrics/PerceivedComplexity: Perceived complexity for `report` is too high. [11/8]", 1720478959], + [1496, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 1470192175], + [1520, 5, 24, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::DestinationProfile`.", 3442102524], + [1534, 7, 29, "Lint/DuplicateMethods: Method `Ast::Crispr::DestinationProfile#normalize_resolution_kind` is defined at both lib/ast/crispr.rb:437 and lib/ast/crispr.rb:1534.", 99310177], + [1538, 7, 31, "Lint/DuplicateMethods: Method `Ast::Crispr::DestinationProfile#normalize_resolution_source` is defined at both lib/ast/crispr.rb:444 and lib/ast/crispr.rb:1538.", 1692065396], + [1542, 7, 29, "Lint/DuplicateMethods: Method `Ast::Crispr::DestinationProfile#normalize_anchor_boundary` is defined at both lib/ast/crispr.rb:452 and lib/ast/crispr.rb:1542.", 3028754726], + [1547, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::OperationProfile`.", 1974079861], + [1550, 7, 733, "Metrics/MethodLength: Method has too many lines. [13/10]", 2619513218], + [1570, 7, 25, "Lint/DuplicateMethods: Method `Ast::Crispr::OperationProfile#normalize_requirement` is defined at both lib/ast/crispr.rb:678 and lib/ast/crispr.rb:1570.", 440444039], + [1574, 7, 32, "Lint/DuplicateMethods: Method `Ast::Crispr::OperationProfile#normalize_replacement_source` is defined at both lib/ast/crispr.rb:686 and lib/ast/crispr.rb:1574.", 3533021156], + [1579, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::StructureProfile`.", 614380405], + [1595, 5, 6309, "Metrics/ClassLength: Class has too many lines. [172/100]", 1270437788], + [1600, 7, 2717, "Metrics/MethodLength: Method has too many lines. [67/10]", 1469599129], + [1665, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 259030389], + [1678, 28, 247, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3385598543], + [1710, 28, 242, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1038219895] + ], + "lib/ast/crispr/rspec/shared_examples/destination_profile.rb:2529475135": [ + [3, 1, 2386, "Metrics/BlockLength: Block has too many lines. [28/25]", 2846758965], + [4, 3, 2311, "Metrics/BlockLength: Block has too many lines. [26/25]", 2123267236] + ], + "lib/ast/crispr/rspec/shared_examples/match_profile.rb:2566447993": [ + [3, 1, 1997, "Metrics/BlockLength: Block has too many lines. [26/25]", 1032277788] + ], + "lib/ast/crispr/rspec/shared_examples/operation_profile.rb:3583567850": [ + [3, 1, 2148, "Metrics/BlockLength: Block has too many lines. [26/25]", 2745151209] + ], + "spec/old_runtime_spec.rb:1564590841": [ + [3, 1, 17728, "Metrics/BlockLength: Block has too many lines. [383/25]", 205400157], + [4, 3, 69, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3712453399], + [5, 3, 68, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1429320782], + [6, 3, 59, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 253007150], + [8, 3, 891, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 361389624], + [18, 37, 11, "Lint/UnusedMethodArgument: Unused method argument - `owner_scope`.", 3846606321], + [22, 46, 6, "Lint/UnusedMethodArgument: Unused method argument - `region`.", 2124512157], + [22, 64, 11, "Lint/UnusedMethodArgument: Unused method argument - `owner_scope`.", 3846606321], + [73, 3, 8534, "Metrics/BlockLength: Block has too many lines. [176/25]", 3042299525], + [313, 3, 3640, "Metrics/BlockLength: Block has too many lines. [72/25]", 1133370152], + [418, 3, 1663, "Metrics/BlockLength: Block has too many lines. [41/25]", 115074475] + ] +} diff --git a/gems/ast-crispr/Gemfile b/gems/ast-crispr/Gemfile index 9568b99c7..a04db0753 100644 --- a/gems/ast-crispr/Gemfile +++ b/gems/ast-crispr/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source "https://gem.coop" +source 'https://gem.coop' git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,57 +19,53 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ["~> 1.0", ">= 1.0.8"] -gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ['~> 1.0', '>= 1.0.8'] +gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ast-merge ] -direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") +direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? if direct_sibling_gems.any? && - (direct_sibling_local || - ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) - direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") - direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) begin nomono_activation_requirements = nomono_requirements - nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) if File.file?(nomono_lockfile) nomono_locked_spec = Bundler::LockfileParser - .new(Bundler.read_file(nomono_lockfile)) - .specs - .find { |spec| spec.name == "nomono" } + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } nomono_locked = nomono_locked_spec && - Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) - if nomono_locked - nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] - end - end - Kernel.send(:gem, "nomono", *nomono_activation_requirements) - require "nomono/bundler" - if direct_sibling_templating && !direct_sibling_local - ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local eval_nomono_gems( gems: direct_sibling_gems, - prefix: "STRUCTUREDMERGE", - path_env: "STRUCTUREDMERGE_DEV", - root: ["src", "my", "structuredmerge"] + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] ) rescue LoadError - warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' ensure if direct_sibling_templating && !direct_sibling_local if direct_sibling_dev_was_set - ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original else - ENV.delete("STRUCTUREDMERGE_DEV") + ENV.delete('STRUCTUREDMERGE_DEV') end end end @@ -293,25 +289,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging -eval_gemfile "gemfiles/modular/debug.gemfile" +eval_gemfile 'gemfiles/modular/debug.gemfile' # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile "gemfiles/modular/coverage.gemfile" +eval_gemfile 'gemfiles/modular/coverage.gemfile' # Linting -eval_gemfile "gemfiles/modular/style.gemfile" +eval_gemfile 'gemfiles/modular/style.gemfile' # Documentation -eval_gemfile "gemfiles/modular/documentation.gemfile" +eval_gemfile 'gemfiles/modular/documentation.gemfile' # Optional -eval_gemfile "gemfiles/modular/optional.gemfile" +eval_gemfile 'gemfiles/modular/optional.gemfile' ### Std Lib Extracted Gems -eval_gemfile "gemfiles/modular/x_std_libs.gemfile" +eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' # See unlocked_deps appraisal for more details on irb inclusion -gem "irb", "~> 1.17" # ruby >= 2.7 +gem 'irb', '~> 1.17' # ruby >= 2.7 diff --git a/gems/ast-crispr/Gemfile.lock b/gems/ast-crispr/Gemfile.lock index 7478fbf81..70f7345f8 100644 --- a/gems/ast-crispr/Gemfile.lock +++ b/gems/ast-crispr/Gemfile.lock @@ -17,31 +17,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -49,248 +25,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -310,12 +44,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -324,6 +52,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -379,6 +108,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -397,7 +135,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -542,18 +279,22 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -587,11 +328,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -639,44 +380,23 @@ DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,26 +405,18 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -712,34 +424,20 @@ CHECKSUMS appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +450,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +477,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +488,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,19 +515,18 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,19 +540,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +555,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ast-crispr/Rakefile b/gems/ast-crispr/Rakefile index 2b30812c4..0fe938704 100644 --- a/gems/ast-crispr/Rakefile +++ b/gems/ast-crispr/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require "kettle/drift" + require 'kettle/drift' Kettle::Drift.install_tasks rescue LoadError - desc("(stub) kettle:drift:check is unavailable") - task("kettle:drift:check") do + desc('(stub) kettle:drift:check is unavailable') + task('kettle:drift:check') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:update is unavailable") - task("kettle:drift:update") do + desc('(stub) kettle:drift:update is unavailable') + task('kettle:drift:update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:force_update is unavailable") - task("kettle:drift:force_update") do + desc('(stub) kettle:drift:force_update is unavailable') + task('kettle:drift:force_update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift is unavailable") - task("kettle:drift" => "kettle:drift:update") + desc('(stub) kettle:drift is unavailable') + task('kettle:drift' => 'kettle:drift:update') end ### TEMPLATING TASKS diff --git a/gems/ast-crispr/bin/yard b/gems/ast-crispr/bin/yard index a7e8b6eed..5d516ad6f 100755 --- a/gems/ast-crispr/bin/yard +++ b/gems/ast-crispr/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec("bundle", "exec", "rake", "yard") +exec('bundle', 'exec', 'rake', 'yard') diff --git a/gems/ast-crispr/lib/ast/crispr/version.rb b/gems/ast-crispr/lib/ast/crispr/version.rb index af38578d7..c2c80e954 100644 --- a/gems/ast-crispr/lib/ast/crispr/version.rb +++ b/gems/ast-crispr/lib/ast/crispr/version.rb @@ -3,7 +3,7 @@ module Ast module Crispr module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/ast-merge/.kettle-drift.lock b/gems/ast-merge/.kettle-drift.lock index 8f289a29f..5fbedf92b 100644 --- a/gems/ast-merge/.kettle-drift.lock +++ b/gems/ast-merge/.kettle-drift.lock @@ -6,7 +6,8 @@ 79, 119, 159, - 199 + 199, + 239 ] } ], @@ -17,7 +18,8 @@ 90, 130, 170, - 210 + 210, + 250 ] } ], @@ -28,7 +30,8 @@ 80, 120, 160, - 200 + 200, + 240 ] } ], @@ -39,7 +42,8 @@ 92, 132, 172, - 212 + 212, + 252 ] } ], @@ -50,7 +54,8 @@ 95, 135, 175, - 215 + 215, + 255 ] } ], @@ -61,7 +66,8 @@ 81, 121, 161, - 201 + 201, + 241 ] } ], @@ -73,7 +79,8 @@ 99, 139, 179, - 219 + 219, + 259 ] } ], @@ -84,7 +91,8 @@ 100, 140, 180, - 220 + 220, + 260 ] } ], @@ -96,7 +104,8 @@ 86, 126, 166, - 206 + 206, + 246 ] } ], @@ -107,7 +116,8 @@ 109, 149, 189, - 229 + 229, + 269 ] } ], @@ -119,7 +129,8 @@ 78, 118, 158, - 198 + 198, + 238 ] } ], @@ -131,7 +142,8 @@ 108, 148, 188, - 228 + 228, + 268 ] } ], @@ -142,7 +154,8 @@ 84, 124, 164, - 204 + 204, + 244 ] } ], @@ -154,7 +167,8 @@ 91, 131, 171, - 211 + 211, + 251 ] } ], @@ -166,7 +180,8 @@ 87, 127, 167, - 207 + 207, + 247 ] } ], @@ -177,7 +192,8 @@ 85, 125, 165, - 205 + 205, + 245 ] } ], @@ -188,7 +204,8 @@ 102, 142, 182, - 222 + 222, + 262 ] } ], @@ -199,7 +216,8 @@ 101, 141, 181, - 221 + 221, + 261 ] } ], @@ -210,7 +228,8 @@ 96, 136, 176, - 216 + 216, + 256 ] } ], @@ -221,7 +240,8 @@ 105, 145, 185, - 225 + 225, + 265 ] } ], diff --git a/gems/ast-merge/Gemfile b/gems/ast-merge/Gemfile index aa6f7e698..42f08610c 100644 --- a/gems/ast-merge/Gemfile +++ b/gems/ast-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source 'https://gem.coop' +source "https://gem.coop" git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,17 +19,61 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ['~> 1.0', '>= 1.0.8'] -gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ["~> 1.0", ">= 1.0.8"] +gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ tree_haver ] -direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') +direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? + +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) + direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") + direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == "nomono" } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + if nomono_locked + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] + end + end + Kernel.send(:gem, "nomono", *nomono_activation_requirements) + require "nomono/bundler" + if direct_sibling_templating && !direct_sibling_local + ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + end + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: "STRUCTUREDMERGE", + path_env: "STRUCTUREDMERGE_DEV", + root: ["src", "my", "structuredmerge"] + ) + rescue LoadError + warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + else + ENV.delete("STRUCTUREDMERGE_DEV") + end + end + end +end if direct_sibling_gems.any? && (direct_sibling_local || @@ -249,25 +293,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? # Debugging -eval_gemfile 'gemfiles/modular/debug.gemfile' +eval_gemfile "gemfiles/modular/debug.gemfile" # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile 'gemfiles/modular/coverage.gemfile' +eval_gemfile "gemfiles/modular/coverage.gemfile" # Linting -eval_gemfile 'gemfiles/modular/style.gemfile' +eval_gemfile "gemfiles/modular/style.gemfile" # Documentation -eval_gemfile 'gemfiles/modular/documentation.gemfile' +eval_gemfile "gemfiles/modular/documentation.gemfile" # Optional -eval_gemfile 'gemfiles/modular/optional.gemfile' +eval_gemfile "gemfiles/modular/optional.gemfile" ### Std Lib Extracted Gems -eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' +eval_gemfile "gemfiles/modular/x_std_libs.gemfile" # See unlocked_deps appraisal for more details on irb inclusion -gem 'irb', '~> 1.17' # ruby >= 2.7 +gem "irb", "~> 1.17" # ruby >= 2.7 diff --git a/gems/ast-merge/Rakefile b/gems/ast-merge/Rakefile index 339c9a3cb..6b4e21dec 100644 --- a/gems/ast-merge/Rakefile +++ b/gems/ast-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require 'kettle/drift' + require "kettle/drift" Kettle::Drift.install_tasks rescue LoadError - desc('(stub) kettle:drift:check is unavailable') - task('kettle:drift:check') do + desc("(stub) kettle:drift:check is unavailable") + task("kettle:drift:check") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:update is unavailable') - task('kettle:drift:update') do + desc("(stub) kettle:drift:update is unavailable") + task("kettle:drift:update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:force_update is unavailable') - task('kettle:drift:force_update') do + desc("(stub) kettle:drift:force_update is unavailable") + task("kettle:drift:force_update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift is unavailable') - task('kettle:drift' => 'kettle:drift:update') + desc("(stub) kettle:drift is unavailable") + task("kettle:drift" => "kettle:drift:update") end ### TEMPLATING TASKS diff --git a/gems/ast-merge/lib/ast/merge/version.rb b/gems/ast-merge/lib/ast/merge/version.rb index 6e7dc90f7..3ef823f4d 100644 --- a/gems/ast-merge/lib/ast/merge/version.rb +++ b/gems/ast-merge/lib/ast/merge/version.rb @@ -3,7 +3,7 @@ module Ast module Merge module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/markdown-merge/Gemfile.lock b/gems/markdown-merge/Gemfile.lock index f3d09b5c3..f39d8ddab 100644 --- a/gems/markdown-merge/Gemfile.lock +++ b/gems/markdown-merge/Gemfile.lock @@ -16,6 +16,265 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -103,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -131,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -322,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -373,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -398,31 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -430,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -442,20 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -470,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -481,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -508,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -519,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -532,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -547,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/tree_haver/Gemfile b/gems/tree_haver/Gemfile index b1afe238c..5209ba280 100644 --- a/gems/tree_haver/Gemfile +++ b/gems/tree_haver/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source "https://gem.coop" +source 'https://gem.coop' git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,8 +19,8 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ["~> 1.0", ">= 1.0.8"] -gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ['~> 1.0', '>= 1.0.8'] +gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = @@ -29,25 +29,25 @@ if !tslp_declared_by_templating && tslp_dev.to_s.empty? end # Modular sibling dependencies (env-switched inside each modular Gemfile) -eval_gemfile "gemfiles/modular/templating.gemfile" +eval_gemfile 'gemfiles/modular/templating.gemfile' # Debugging -eval_gemfile "gemfiles/modular/debug.gemfile" +eval_gemfile 'gemfiles/modular/debug.gemfile' # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile "gemfiles/modular/coverage.gemfile" +eval_gemfile 'gemfiles/modular/coverage.gemfile' # Linting -eval_gemfile "gemfiles/modular/style.gemfile" +eval_gemfile 'gemfiles/modular/style.gemfile' # Documentation -eval_gemfile "gemfiles/modular/documentation.gemfile" +eval_gemfile 'gemfiles/modular/documentation.gemfile' # Optional -eval_gemfile "gemfiles/modular/optional.gemfile" +eval_gemfile 'gemfiles/modular/optional.gemfile' ### Std Lib Extracted Gems -eval_gemfile "gemfiles/modular/x_std_libs.gemfile" +eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' # See unlocked_deps appraisal for more details on irb inclusion -gem "irb", "~> 1.17" # ruby >= 2.7 +gem 'irb', '~> 1.17' # ruby >= 2.7 diff --git a/gems/tree_haver/Gemfile.lock b/gems/tree_haver/Gemfile.lock index 7ac4910fb..7191bd2b0 100644 --- a/gems/tree_haver/Gemfile.lock +++ b/gems/tree_haver/Gemfile.lock @@ -265,6 +265,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -297,7 +313,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -352,18 +367,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -522,22 +526,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -649,9 +649,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -729,7 +729,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -750,10 +749,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -825,13 +824,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/tree_haver/Rakefile b/gems/tree_haver/Rakefile index 0a3c6f7a9..ab2dc23d9 100644 --- a/gems/tree_haver/Rakefile +++ b/gems/tree_haver/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require "kettle/drift" + require 'kettle/drift' Kettle::Drift.install_tasks rescue LoadError - desc("(stub) kettle:drift:check is unavailable") - task("kettle:drift:check") do + desc('(stub) kettle:drift:check is unavailable') + task('kettle:drift:check') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:update is unavailable") - task("kettle:drift:update") do + desc('(stub) kettle:drift:update is unavailable') + task('kettle:drift:update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:force_update is unavailable") - task("kettle:drift:force_update") do + desc('(stub) kettle:drift:force_update is unavailable') + task('kettle:drift:force_update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift is unavailable") - task("kettle:drift" => "kettle:drift:update") + desc('(stub) kettle:drift is unavailable') + task('kettle:drift' => 'kettle:drift:update') end ### TEMPLATING TASKS diff --git a/gems/tree_haver/lib/tree_haver/version.rb b/gems/tree_haver/lib/tree_haver/version.rb index 9bd0db819..43365bf4e 100644 --- a/gems/tree_haver/lib/tree_haver/version.rb +++ b/gems/tree_haver/lib/tree_haver/version.rb @@ -2,7 +2,7 @@ module TreeHaver module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end From 51a8da4fe684afdae730a14737f2fd59ad760a6b Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:33:35 -0600 Subject: [PATCH 186/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-merge/Gemfile.lock | 59 +++-- gems/tree_haver/Gemfile.lock | 445 ++++++++++------------------------- 2 files changed, 154 insertions(+), 350 deletions(-) diff --git a/gems/ast-merge/Gemfile.lock b/gems/ast-merge/Gemfile.lock index b418a067c..40333e45c 100644 --- a/gems/ast-merge/Gemfile.lock +++ b/gems/ast-merge/Gemfile.lock @@ -275,6 +275,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -308,7 +324,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -363,18 +378,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -538,22 +542,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -659,9 +659,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -739,7 +739,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -760,10 +759,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -838,13 +837,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/tree_haver/Gemfile.lock b/gems/tree_haver/Gemfile.lock index 7191bd2b0..8e744e1af 100644 --- a/gems/tree_haver/Gemfile.lock +++ b/gems/tree_haver/Gemfile.lock @@ -7,304 +7,59 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /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) + ansi (1.6.0) + appraisal2 (3.2.0) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + ast (2.4.3) + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) ast-crispr-markdown-markly (7.1.0) ast-crispr (= 7.1.0) markly-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) prism (>= 1.0) version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: ast-merge (7.1.0) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: + backports (3.25.3) bash-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - -GEM - remote: https://gem.coop/ - specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - ansi (1.6.0) - appraisal2 (3.2.0) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - 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) citrus (3.0.2) + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) cmdparse (3.0.7) commonmarker (2.9.0-aarch64-linux) commonmarker (2.9.0-aarch64-linux-musl) commonmarker (2.9.0-arm64-darwin) commonmarker (2.9.0-x86_64-linux) commonmarker (2.9.0-x86_64-linux-musl) + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -313,6 +68,11 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -362,12 +122,52 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -381,12 +181,24 @@ GEM turbo_tests2 (~> 3.1, >= 3.1.12) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) 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.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -412,9 +224,18 @@ GEM prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) psych (5.4.0) date stringio + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -423,6 +244,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) rdoc (6.17.0) erb psych (>= 4.0.0) @@ -518,6 +344,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -526,18 +356,22 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -573,6 +407,10 @@ GEM version_gem (~> 1.1, >= 1.1.13) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) @@ -596,6 +434,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.13) + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) yard (0.9.45) yard-fence (0.9.6) rdoc (>= 6.11, < 8) @@ -628,45 +470,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem (>= 7.0) + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -675,27 +496,20 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml (~> 0.3) - toml-merge! toml-rb (~> 4.1) tree_haver! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -706,13 +520,10 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) @@ -729,6 +540,7 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -742,17 +554,16 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -776,8 +587,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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 @@ -821,15 +630,15 @@ 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -852,7 +661,6 @@ CHECKSUMS tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) sha256=ad6743a373eeac954c1b659b17af3aff1c82918b3ce9c9dc572a7c70ff843cdd tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -865,7 +673,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 437672e5a176a4d0b2e297b6768c357a152d3dc5 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:34:09 -0600 Subject: [PATCH 187/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../.kettle-drift.lock | 60 +- .../.rubocop_gradual.lock | 137 - gems/ast-crispr-markdown-markly/Gemfile | 70 +- gems/ast-crispr-markdown-markly/Gemfile.lock | 408 ++- gems/ast-crispr-markdown-markly/Rakefile | 18 +- gems/ast-crispr-markdown-markly/bin/yard | 2 +- .../lib/ast/crispr/markdown/markly/version.rb | 2 +- gems/ast-crispr/Gemfile.lock | 337 +- gems/ast-merge/.rubocop_gradual.lock | 2838 ----------------- gems/ast-merge/bin/yard | 2 +- gems/markdown-merge/.kettle-drift.lock | 60 +- gems/markdown-merge/Gemfile | 40 + gems/markdown-merge/Gemfile.lock | 327 +- gems/markly-merge/.kettle-drift.lock | 60 +- gems/markly-merge/.rubocop_gradual.lock | 126 - gems/markly-merge/Gemfile | 70 +- gems/markly-merge/Gemfile.lock | 405 ++- gems/markly-merge/Rakefile | 18 +- gems/markly-merge/bin/yard | 2 +- gems/markly-merge/lib/markly/merge/version.rb | 2 +- gems/tree_haver/Gemfile.lock | 386 ++- 21 files changed, 1644 insertions(+), 3726 deletions(-) delete mode 100644 gems/ast-crispr-markdown-markly/.rubocop_gradual.lock delete mode 100644 gems/ast-merge/.rubocop_gradual.lock delete mode 100644 gems/markly-merge/.rubocop_gradual.lock diff --git a/gems/ast-crispr-markdown-markly/.kettle-drift.lock b/gems/ast-crispr-markdown-markly/.kettle-drift.lock index 0161251a7..d3c2a2030 100644 --- a/gems/ast-crispr-markdown-markly/.kettle-drift.lock +++ b/gems/ast-crispr-markdown-markly/.kettle-drift.lock @@ -6,7 +6,8 @@ 80, 120, 160, - 200 + 200, + 240 ] } ], @@ -17,7 +18,8 @@ 91, 131, 171, - 211 + 211, + 251 ] } ], @@ -28,7 +30,8 @@ 81, 121, 161, - 201 + 201, + 241 ] } ], @@ -39,7 +42,8 @@ 93, 133, 173, - 213 + 213, + 253 ] } ], @@ -50,7 +54,8 @@ 96, 136, 176, - 216 + 216, + 256 ] } ], @@ -61,7 +66,8 @@ 82, 122, 162, - 202 + 202, + 242 ] } ], @@ -73,7 +79,8 @@ 100, 140, 180, - 220 + 220, + 260 ] } ], @@ -84,7 +91,8 @@ 101, 141, 181, - 221 + 221, + 261 ] } ], @@ -96,7 +104,8 @@ 87, 127, 167, - 207 + 207, + 247 ] } ], @@ -107,7 +116,8 @@ 110, 150, 190, - 230 + 230, + 270 ] } ], @@ -119,7 +129,8 @@ 79, 119, 159, - 199 + 199, + 239 ] } ], @@ -131,7 +142,8 @@ 109, 149, 189, - 229 + 229, + 269 ] } ], @@ -142,7 +154,8 @@ 85, 125, 165, - 205 + 205, + 245 ] } ], @@ -154,7 +167,8 @@ 92, 132, 172, - 212 + 212, + 252 ] } ], @@ -166,7 +180,8 @@ 88, 128, 168, - 208 + 208, + 248 ] } ], @@ -177,7 +192,8 @@ 86, 126, 166, - 206 + 206, + 246 ] } ], @@ -188,7 +204,8 @@ 103, 143, 183, - 223 + 223, + 263 ] } ], @@ -199,7 +216,8 @@ 102, 142, 182, - 222 + 222, + 262 ] } ], @@ -210,7 +228,8 @@ 97, 137, 177, - 217 + 217, + 257 ] } ], @@ -221,7 +240,8 @@ 106, 146, 186, - 226 + 226, + 266 ] } ], diff --git a/gems/ast-crispr-markdown-markly/.rubocop_gradual.lock b/gems/ast-crispr-markdown-markly/.rubocop_gradual.lock deleted file mode 100644 index 67ec8026a..000000000 --- a/gems/ast-crispr-markdown-markly/.rubocop_gradual.lock +++ /dev/null @@ -1,137 +0,0 @@ -{ - ".simplecov:971555246": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:4085821453": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "ast-crispr-markdown-markly.gemspec:1188642188": [ - [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/ast-crispr-markdown-markly.rb:374208510": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`ast-crispr-markdown-markly.rb`) should use snake_case.", 5381] - ], - "lib/ast/crispr/markdown/markly.rb:2564514831": [ - [11, 7, 13, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::Markdown::Markly`.", 95841343], - [14, 9, 13, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Markdown::Markly::Adapter`.", 2579377404], - [14, 9, 13970, "Metrics/ClassLength: Class has too many lines. [335/100]", 429557235], - [64, 11, 700, "Metrics/MethodLength: Method has too many lines. [15/10]", 196504356], - [90, 13, 87, "Style/RaiseArgs: Provide an exception class and message as arguments to `raise`.", 1878059440], - [93, 11, 1781, "Metrics/MethodLength: Method has too many lines. [39/10]", 2020253431], - [137, 11, 739, "Metrics/AbcSize: Assignment Branch Condition size for `build_heading_sections` is too high. [<5, 16, 3> 17.03/17]", 3186655060], - [137, 11, 739, "Metrics/MethodLength: Method has too many lines. [14/10]", 3186655060], - [156, 11, 915, "Metrics/AbcSize: Assignment Branch Condition size for `build_link_definitions` is too high. [<2, 19, 7> 20.35/17]", 2943708156], - [156, 11, 915, "Metrics/MethodLength: Method has too many lines. [18/10]", 2943708156], - [195, 11, 1750, "Metrics/AbcSize: Assignment Branch Condition size for `build_table_rows` is too high. [<16, 44, 17> 49.81/17]", 3931509409], - [195, 11, 1750, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_table_rows` is too high. [16/7]", 3931509409], - [195, 11, 1750, "Metrics/MethodLength: Method has too many lines. [34/10]", 3931509409], - [195, 11, 1750, "Metrics/PerceivedComplexity: Perceived complexity for `build_table_rows` is too high. [16/8]", 3931509409], - [253, 11, 768, "Metrics/MethodLength: Method has too many lines. [14/10]", 737914131], - [297, 11, 622, "Metrics/MethodLength: Method has too many lines. [18/10]", 1706283245], - [320, 11, 717, "Metrics/MethodLength: Method has too many lines. [15/10]", 1919892283], - [341, 11, 977, "Metrics/AbcSize: Assignment Branch Condition size for `inline_link_reference_at` is too high. [<6, 17, 11> 21.12/17]", 2987695093], - [341, 11, 977, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `inline_link_reference_at` is too high. [8/7]", 2987695093], - [341, 11, 977, "Metrics/MethodLength: Method has too many lines. [19/10]", 2987695093], - [366, 37, 83, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2884863618], - [379, 11, 404, "Metrics/MethodLength: Method has too many lines. [13/10]", 427422621], - [396, 9, 16, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::Markdown::Markly::Selectors`.", 2133324825], - [396, 9, 8840, "Metrics/ModuleLength: Module has too many lines. [186/100]", 1134016796], - [399, 11, 1452, "Metrics/AbcSize: Assignment Branch Condition size for `heading_section` is too high. [<2, 21, 7> 22.23/17]", 1578141243], - [399, 11, 1452, "Metrics/MethodLength: Method has too many lines. [30/10]", 1578141243], - [399, 30, 73, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 515735878], - [433, 11, 1397, "Metrics/AbcSize: Assignment Branch Condition size for `link_definition` is too high. [<2, 22, 8> 23.49/17]", 2035221200], - [433, 11, 1397, "Metrics/MethodLength: Method has too many lines. [29/10]", 2035221200], - [433, 30, 68, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2927391196], - [466, 11, 1236, "Metrics/MethodLength: Method has too many lines. [27/10]", 2705412671], - [497, 11, 1632, "Metrics/AbcSize: Assignment Branch Condition size for `inline_reference` is too high. [<2, 25, 7> 26.04/17]", 2822954343], - [497, 11, 1632, "Metrics/MethodLength: Method has too many lines. [32/10]", 2822954343], - [497, 31, 79, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 871966347], - [533, 11, 3009, "Metrics/AbcSize: Assignment Branch Condition size for `html_comment_block` is too high. [<14, 43, 23> 50.73/17]", 1757586727], - [533, 11, 3009, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `html_comment_block` is too high. [18/7]", 1757586727], - [533, 11, 3009, "Metrics/MethodLength: Method has too many lines. [56/10]", 1757586727], - [533, 11, 3009, "Metrics/PerceivedComplexity: Perceived complexity for `html_comment_block` is too high. [18/8]", 1757586727], - [533, 33, 148, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 4247948333], - [545, 23, 2311, "Metrics/BlockLength: Block has too many lines. [43/25]", 3166751632], - [550, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 236074548] - ], - "spec/ast/crispr/markdown/markly_spec.rb:4192197438": [ - [3, 1, 13013, "Metrics/BlockLength: Block has too many lines. [238/25]", 467937705], - [28, 3, 10302, "Metrics/BlockLength: Block has too many lines. [182/25]", 3591393606], - [132, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 2063489827], - [134, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 2916348790], - [152, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 3082451518], - [154, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 3021964175], - [267, 3, 1687, "Metrics/BlockLength: Block has too many lines. [33/25]", 4221412326] - ] -} diff --git a/gems/ast-crispr-markdown-markly/Gemfile b/gems/ast-crispr-markdown-markly/Gemfile index 32c5785f2..05281efd5 100644 --- a/gems/ast-crispr-markdown-markly/Gemfile +++ b/gems/ast-crispr-markdown-markly/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source 'https://gem.coop' +source "https://gem.coop" git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,18 +19,62 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ['~> 1.0', '>= 1.0.8'] -gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ["~> 1.0", ">= 1.0.8"] +gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ast-crispr markly-merge ] -direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') +direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? + +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) + direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") + direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == "nomono" } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + if nomono_locked + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] + end + end + Kernel.send(:gem, "nomono", *nomono_activation_requirements) + require "nomono/bundler" + if direct_sibling_templating && !direct_sibling_local + ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + end + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: "STRUCTUREDMERGE", + path_env: "STRUCTUREDMERGE_DEV", + root: ["src", "my", "structuredmerge"] + ) + rescue LoadError + warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + else + ENV.delete("STRUCTUREDMERGE_DEV") + end + end + end +end if direct_sibling_gems.any? && (direct_sibling_local || @@ -250,25 +294,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? # Debugging -eval_gemfile 'gemfiles/modular/debug.gemfile' +eval_gemfile "gemfiles/modular/debug.gemfile" # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile 'gemfiles/modular/coverage.gemfile' +eval_gemfile "gemfiles/modular/coverage.gemfile" # Linting -eval_gemfile 'gemfiles/modular/style.gemfile' +eval_gemfile "gemfiles/modular/style.gemfile" # Documentation -eval_gemfile 'gemfiles/modular/documentation.gemfile' +eval_gemfile "gemfiles/modular/documentation.gemfile" # Optional -eval_gemfile 'gemfiles/modular/optional.gemfile' +eval_gemfile "gemfiles/modular/optional.gemfile" ### Std Lib Extracted Gems -eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' +eval_gemfile "gemfiles/modular/x_std_libs.gemfile" # See unlocked_deps appraisal for more details on irb inclusion -gem 'irb', '~> 1.17' # ruby >= 2.7 +gem "irb", "~> 1.17" # ruby >= 2.7 diff --git a/gems/ast-crispr-markdown-markly/Gemfile.lock b/gems/ast-crispr-markdown-markly/Gemfile.lock index 83c0b9108..69b980543 100644 --- a/gems/ast-crispr-markdown-markly/Gemfile.lock +++ b/gems/ast-crispr-markdown-markly/Gemfile.lock @@ -16,6 +16,281 @@ PATH markly-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -27,15 +302,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -44,6 +310,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -52,7 +324,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -108,15 +379,6 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -135,15 +397,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -288,22 +542,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -337,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -388,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-drift! + kettle-jem! + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -413,18 +685,26 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -433,20 +713,33 @@ CHECKSUMS ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -459,15 +752,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 @@ -489,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -500,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -527,18 +830,19 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -552,14 +856,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -567,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ast-crispr-markdown-markly/Rakefile b/gems/ast-crispr-markdown-markly/Rakefile index 799afe6f5..c599763c0 100644 --- a/gems/ast-crispr-markdown-markly/Rakefile +++ b/gems/ast-crispr-markdown-markly/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require 'kettle/drift' + require "kettle/drift" Kettle::Drift.install_tasks rescue LoadError - desc('(stub) kettle:drift:check is unavailable') - task('kettle:drift:check') do + desc("(stub) kettle:drift:check is unavailable") + task("kettle:drift:check") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:update is unavailable') - task('kettle:drift:update') do + desc("(stub) kettle:drift:update is unavailable") + task("kettle:drift:update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:force_update is unavailable') - task('kettle:drift:force_update') do + desc("(stub) kettle:drift:force_update is unavailable") + task("kettle:drift:force_update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift is unavailable') - task('kettle:drift' => 'kettle:drift:update') + desc("(stub) kettle:drift is unavailable") + task("kettle:drift" => "kettle:drift:update") end ### TEMPLATING TASKS diff --git a/gems/ast-crispr-markdown-markly/bin/yard b/gems/ast-crispr-markdown-markly/bin/yard index 5d516ad6f..a7e8b6eed 100755 --- a/gems/ast-crispr-markdown-markly/bin/yard +++ b/gems/ast-crispr-markdown-markly/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec('bundle', 'exec', 'rake', 'yard') +exec("bundle", "exec", "rake", "yard") 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 ba5f0b149..e184c556f 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 @@ -5,7 +5,7 @@ module Crispr module Markdown module Markly module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/ast-crispr/Gemfile.lock b/gems/ast-crispr/Gemfile.lock index 70f7345f8..37fdf3f15 100644 --- a/gems/ast-crispr/Gemfile.lock +++ b/gems/ast-crispr/Gemfile.lock @@ -17,7 +17,31 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -25,6 +49,232 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -44,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -107,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -135,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -328,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -380,23 +639,44 @@ DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -405,18 +685,26 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -424,13 +712,27 @@ CHECKSUMS appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -438,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -450,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -477,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -488,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -515,9 +831,11 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -527,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -540,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -555,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ast-merge/.rubocop_gradual.lock b/gems/ast-merge/.rubocop_gradual.lock deleted file mode 100644 index f8391bc5b..000000000 --- a/gems/ast-merge/.rubocop_gradual.lock +++ /dev/null @@ -1,2838 +0,0 @@ -{ - ".simplecov:3463276878": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:429706125": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "ast-merge.gemspec:1182320030": [ - [16, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1168797721], - [129, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [144, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [145, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [152, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/ast-merge.rb:3005639624": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`ast-merge.rb`) should use snake_case.", 5381] - ], - "lib/ast/merge.rb:3429747270": [ - [11, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge`.", 2866359175], - [11, 3, 270037, "Metrics/ModuleLength: Module has too many lines. [5702/100]", 2847709439], - [22, 5, 16, "Style/Documentation: Missing top-level documentation comment for `class Ast::Merge::ParseError`.", 362242086], - [33, 7, 362, "Metrics/AbcSize: Assignment Branch Condition size for `build_message` is too high. [<2, 16, 6> 17.2/17]", 3988736327], - [47, 5, 31, "Style/Documentation: Missing top-level documentation comment for `class Ast::Merge::PlaceholderCollisionError`.", 218924302], - [161, 7, 337, "Metrics/MethodLength: Method has too many lines. [11/10]", 2388996629], - [178, 7, 327, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [8/7]", 979795121], - [309, 7, 383, "Metrics/MethodLength: Method has too many lines. [11/10]", 634650261], - [473, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 3450568485], - [474, 7, 461, "Metrics/MethodLength: Method has too many lines. [12/10]", 43929779], - [491, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1299979089], - [492, 7, 377, "Metrics/MethodLength: Method has too many lines. [11/10]", 3704151253], - [508, 121, 39, "Layout/LineLength: Line is too long. [159/120]", 85503958], - [509, 7, 447, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [8/7]", 298553749], - [509, 7, 447, "Metrics/MethodLength: Method has too many lines. [12/10]", 298553749], - [538, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1441148616], - [539, 7, 453, "Metrics/MethodLength: Method has too many lines. [14/10]", 1899007021], - [558, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193342990], - [559, 7, 400, "Metrics/MethodLength: Method has too many lines. [11/10]", 298553749], - [588, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860750], - [589, 7, 411, "Metrics/MethodLength: Method has too many lines. [12/10]", 2893925621], - [606, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3137791633], - [607, 7, 454, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [8/7]", 298553749], - [607, 7, 454, "Metrics/MethodLength: Method has too many lines. [12/10]", 298553749], - [666, 7, 385, "Metrics/MethodLength: Method has too many lines. [11/10]", 794265461], - [703, 7, 419, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [10/7]", 3313546353], - [703, 7, 419, "Metrics/PerceivedComplexity: Perceived complexity for `to_h` is too high. [10/8]", 3313546353], - [753, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 398187770], - [765, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 2746783933], - [812, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860841], - [820, 121, 156, "Layout/LineLength: Line is too long. [276/120]", 1149525480], - [825, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 2538424426], - [837, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 2285382915], - [847, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3962419360], - [860, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 398187770], - [862, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3195178507], - [866, 121, 85, "Layout/LineLength: Line is too long. [205/120]", 4238980637], - [868, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 2678411233], - [870, 121, 39, "Layout/LineLength: Line is too long. [159/120]", 4028520110], - [881, 121, 110, "Layout/LineLength: Line is too long. [230/120]", 3837814921], - [895, 5, 2283, "Metrics/MethodLength: Method has too many lines. [57/10]", 2282416447], - [955, 5, 2654, "Metrics/MethodLength: Method has too many lines. [63/10]", 2491520565], - [1006, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1823519875], - [1015, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1874311968], - [1021, 5, 10660, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_downstream_merge_gem_feature_matrix` is too high. [<0, 21, 0> 21/17]", 2277322577], - [1021, 5, 10660, "Metrics/MethodLength: Method has too many lines. [248/10]", 2277322577], - [1272, 5, 1546, "Metrics/MethodLength: Method has too many lines. [37/10]", 208933754], - [1306, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 2658452668], - [1312, 5, 4206, "Metrics/MethodLength: Method has too many lines. [96/10]", 1997530776], - [1389, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 183246985], - [1405, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 3268438356], - [1411, 5, 1598, "Metrics/MethodLength: Method has too many lines. [46/10]", 849757258], - [1454, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1323237892], - [1460, 5, 1164, "Metrics/MethodLength: Method has too many lines. [36/10]", 1477831421], - [1493, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 931876829], - [1499, 5, 1699, "Metrics/MethodLength: Method has too many lines. [43/10]", 1125544678], - [1545, 5, 1016, "Metrics/MethodLength: Method has too many lines. [27/10]", 2194427985], - [1575, 5, 1058, "Metrics/MethodLength: Method has too many lines. [30/10]", 47860722], - [1608, 5, 1186, "Metrics/MethodLength: Method has too many lines. [31/10]", 676863486], - [1636, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 2689509078], - [1642, 5, 1517, "Metrics/MethodLength: Method has too many lines. [41/10]", 3855445172], - [1655, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 817380904], - [1680, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 409671963], - [1686, 5, 2116, "Metrics/MethodLength: Method has too many lines. [61/10]", 524104794], - [1750, 5, 820, "Metrics/MethodLength: Method has too many lines. [12/10]", 1888457180], - [1750, 37, 298, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 789483382], - [1751, 121, 100, "Layout/LineLength: Line is too long. [220/120]", 3288750271], - [1766, 5, 3595, "Metrics/AbcSize: Assignment Branch Condition size for `initial_profile_promotion_policy` is too high. [<9, 20, 0> 21.93/17]", 83685787], - [1766, 5, 3595, "Metrics/MethodLength: Method has too many lines. [77/10]", 83685787], - [1846, 5, 768, "Metrics/MethodLength: Method has too many lines. [17/10]", 314059802], - [1867, 5, 1493, "Metrics/AbcSize: Assignment Branch Condition size for `evaluate_profile_selection_requirement` is too high. [<7, 23, 9> 25.67/17]", 3177555163], - [1867, 5, 1493, "Metrics/MethodLength: Method has too many lines. [29/10]", 3177555163], - [1868, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2145168012], - [1875, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 683002336], - [1909, 5, 985, "Metrics/AbcSize: Assignment Branch Condition size for `profile_promotion_blocking_reasons` is too high. [<4, 25, 13> 28.46/17]", 1146627465], - [1909, 5, 985, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `profile_promotion_blocking_reasons` is too high. [10/7]", 1146627465], - [1909, 5, 985, "Metrics/MethodLength: Method has too many lines. [18/10]", 1146627465], - [1909, 5, 985, "Metrics/PerceivedComplexity: Perceived complexity for `profile_promotion_blocking_reasons` is too high. [10/8]", 1146627465], - [1930, 5, 3173, "Metrics/AbcSize: Assignment Branch Condition size for `validate_language_backend_profile` is too high. [<25, 68, 20> 75.16/17]", 2100389324], - [1930, 5, 3173, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_language_backend_profile` is too high. [21/7]", 2100389324], - [1930, 5, 3173, "Metrics/MethodLength: Method has too many lines. [60/10]", 2100389324], - [1930, 5, 3173, "Metrics/PerceivedComplexity: Perceived complexity for `validate_language_backend_profile` is too high. [23/8]", 2100389324], - [2002, 5, 1523, "Metrics/AbcSize: Assignment Branch Condition size for `validate_backend_inventory` is too high. [<13, 38, 13> 42.21/17]", 1899037537], - [2002, 5, 1523, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_backend_inventory` is too high. [13/7]", 1899037537], - [2002, 5, 1523, "Metrics/MethodLength: Method has too many lines. [25/10]", 1899037537], - [2002, 5, 1523, "Metrics/PerceivedComplexity: Perceived complexity for `validate_backend_inventory` is too high. [13/8]", 1899037537], - [2045, 5, 906, "Metrics/MethodLength: Method has too many lines. [20/10]", 3137959843], - [2068, 5, 2744, "Metrics/AbcSize: Assignment Branch Condition size for `detect_raw_merge_inconsistencies` is too high. [<8, 43, 21> 48.52/17]", 3717440692], - [2068, 5, 2744, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_raw_merge_inconsistencies` is too high. [17/7]", 3717440692], - [2068, 5, 2744, "Metrics/MethodLength: Method has too many lines. [53/10]", 3717440692], - [2068, 5, 2744, "Metrics/PerceivedComplexity: Perceived complexity for `detect_raw_merge_inconsistencies` is too high. [17/8]", 3717440692], - [2083, 7, 1894, "Metrics/BlockLength: Block has too many lines. [33/25]", 758887611], - [2129, 5, 762, "Metrics/MethodLength: Method has too many lines. [11/10]", 3021402342], - [2143, 5, 490, "Metrics/MethodLength: Method has too many lines. [11/10]", 578473475], - [2157, 5, 881, "Metrics/AbcSize: Assignment Branch Condition size for `execute_independent_commutative_insertions` is too high. [<6, 16, 7> 18.47/17]", 259417386], - [2157, 5, 881, "Metrics/MethodLength: Method has too many lines. [21/10]", 259417386], - [2184, 5, 1107, "Metrics/AbcSize: Assignment Branch Condition size for `execute_independent_keyed_member_edits` is too high. [<10, 31, 15> 35.86/17]", 4271501385], - [2184, 5, 1107, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `execute_independent_keyed_member_edits` is too high. [14/7]", 4271501385], - [2184, 5, 1107, "Metrics/MethodLength: Method has too many lines. [24/10]", 4271501385], - [2184, 5, 1107, "Metrics/PerceivedComplexity: Perceived complexity for `execute_independent_keyed_member_edits` is too high. [14/8]", 4271501385], - [2228, 5, 3149, "Metrics/AbcSize: Assignment Branch Condition size for `parse_compact_ruleset` is too high. [<16, 68, 24> 73.86/17]", 3149098803], - [2228, 5, 3149, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_compact_ruleset` is too high. [22/7]", 3149098803], - [2228, 5, 3149, "Metrics/MethodLength: Method has too many lines. [67/10]", 3149098803], - [2228, 5, 3149, "Metrics/PerceivedComplexity: Perceived complexity for `parse_compact_ruleset` is too high. [23/8]", 3149098803], - [2234, 7, 2544, "Metrics/BlockLength: Block has too many lines. [50/25]", 2484860466], - [2261, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193420054], - [2307, 5, 2658, "Metrics/AbcSize: Assignment Branch Condition size for `compact_ruleset_feature_profile` is too high. [<11, 67, 38> 77.81/17]", 4022599673], - [2307, 5, 2658, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compact_ruleset_feature_profile` is too high. [29/7]", 4022599673], - [2307, 5, 2658, "Metrics/MethodLength: Method has too many lines. [66/10]", 4022599673], - [2307, 5, 2658, "Metrics/PerceivedComplexity: Perceived complexity for `compact_ruleset_feature_profile` is too high. [16/8]", 4022599673], - [2325, 7, 2243, "Metrics/BlockLength: Block has too many lines. [47/25]", 965041772], - [2392, 5, 2733, "Metrics/AbcSize: Assignment Branch Condition size for `classify_template_target_path` is too high. [<4, 36, 23> 42.91/17]", 3661828596], - [2392, 5, 2733, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `classify_template_target_path` is too high. [21/7]", 3661828596], - [2392, 5, 2733, "Metrics/MethodLength: Method has too many lines. [39/10]", 3661828596], - [2392, 5, 2733, "Metrics/PerceivedComplexity: Perceived complexity for `classify_template_target_path` is too high. [17/8]", 3661828596], - [2424, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [2438, 5, 416, "Metrics/MethodLength: Method has too many lines. [12/10]", 1388641773], - [2481, 5, 388, "Metrics/MethodLength: Method has too many lines. [12/10]", 2360583514], - [2510, 5, 820, "Metrics/MethodLength: Method has too many lines. [13/10]", 354674808], - [2526, 5, 929, "Metrics/AbcSize: Assignment Branch Condition size for `enrich_template_plan_entries` is too high. [<9, 12, 10> 18.03/17]", 2666747528], - [2526, 5, 929, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `enrich_template_plan_entries` is too high. [9/7]", 2666747528], - [2526, 5, 929, "Metrics/MethodLength: Method has too many lines. [19/10]", 2666747528], - [2526, 5, 929, "Metrics/PerceivedComplexity: Perceived complexity for `enrich_template_plan_entries` is too high. [10/8]", 2666747528], - [2549, 5, 1245, "Metrics/AbcSize: Assignment Branch Condition size for `enrich_template_plan_entries_with_token_state` is too high. [<11, 23, 14> 29.09/17]", 1507113977], - [2549, 5, 1245, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `enrich_template_plan_entries_with_token_state` is too high. [13/7]", 1507113977], - [2549, 5, 1245, "Metrics/MethodLength: Method has too many lines. [19/10]", 1507113977], - [2549, 5, 1245, "Metrics/PerceivedComplexity: Perceived complexity for `enrich_template_plan_entries_with_token_state` is too high. [13/8]", 1507113977], - [2573, 5, 1353, "Metrics/AbcSize: Assignment Branch Condition size for `prepare_template_entries` is too high. [<6, 18, 11> 21.93/17]", 2774310942], - [2573, 5, 1353, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `prepare_template_entries` is too high. [11/7]", 2774310942], - [2573, 5, 1353, "Metrics/MethodLength: Method has too many lines. [24/10]", 2774310942], - [2573, 5, 1353, "Metrics/PerceivedComplexity: Perceived complexity for `prepare_template_entries` is too high. [12/8]", 2774310942], - [2603, 5, 1494, "Metrics/AbcSize: Assignment Branch Condition size for `plan_template_execution` is too high. [<8, 22, 17> 28.93/17]", 3876421385], - [2603, 5, 1494, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `plan_template_execution` is too high. [14/7]", 3876421385], - [2603, 5, 1494, "Metrics/MethodLength: Method has too many lines. [29/10]", 3876421385], - [2603, 5, 1494, "Metrics/PerceivedComplexity: Perceived complexity for `plan_template_execution` is too high. [15/8]", 3876421385], - [2604, 7, 1421, "Metrics/BlockLength: Block has too many lines. [27/25]", 2887810383], - [2637, 5, 822, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 2749235529], - [2637, 37, 220, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 447165880], - [2638, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 518382509], - [2652, 5, 2060, "Metrics/AbcSize: Assignment Branch Condition size for `preview_template_execution` is too high. [<11, 42, 26> 50.61/17]", 2270817206], - [2652, 5, 2060, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preview_template_execution` is too high. [25/7]", 2270817206], - [2652, 5, 2060, "Metrics/MethodLength: Method has too many lines. [39/10]", 2270817206], - [2652, 5, 2060, "Metrics/PerceivedComplexity: Perceived complexity for `preview_template_execution` is too high. [23/8]", 2270817206], - [2662, 7, 1809, "Metrics/BlockLength: Block has too many lines. [28/25]", 310337564], - [2700, 5, 2513, "Metrics/AbcSize: Assignment Branch Condition size for `apply_template_execution` is too high. [<14, 50, 25> 57.63/17]", 177708331], - [2700, 5, 2513, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_template_execution` is too high. [26/7]", 177708331], - [2700, 5, 2513, "Metrics/MethodLength: Method has too many lines. [50/10]", 177708331], - [2700, 5, 2513, "Metrics/PerceivedComplexity: Perceived complexity for `apply_template_execution` is too high. [23/8]", 177708331], - [2711, 7, 2239, "Metrics/BlockLength: Block has too many lines. [38/25]", 1651205014], - [2761, 5, 1696, "Metrics/AbcSize: Assignment Branch Condition size for `evaluate_template_tree_convergence` is too high. [<11, 29, 17> 35.37/17]", 2507998041], - [2761, 5, 1696, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `evaluate_template_tree_convergence` is too high. [17/7]", 2507998041], - [2761, 5, 1696, "Metrics/MethodLength: Method has too many lines. [35/10]", 2507998041], - [2761, 5, 1696, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 2507998041], - [2761, 5, 1696, "Metrics/PerceivedComplexity: Perceived complexity for `evaluate_template_tree_convergence` is too high. [17/8]", 2507998041], - [2761, 43, 198, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 4214374277], - [2762, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 2983874608], - [2804, 5, 688, "Metrics/MethodLength: Method has too many lines. [15/10]", 3064253784], - [2804, 5, 688, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 3064253784], - [2804, 36, 216, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 448029307], - [2805, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3840139076], - [2848, 5, 664, "Metrics/MethodLength: Method has too many lines. [13/10]", 995637868], - [2848, 5, 664, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 995637868], - [2848, 53, 202, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 4227116196], - [2849, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 418683952], - [2866, 5, 649, "Metrics/MethodLength: Method has too many lines. [13/10]", 1831524792], - [2866, 5, 649, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 1831524792], - [2866, 54, 178, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2962381850], - [2867, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 3690915627], - [2884, 5, 1280, "Metrics/AbcSize: Assignment Branch Condition size for `apply_template_tree_execution_to_directory` is too high. [<6, 16, 6> 18.11/17]", 305449363], - [2884, 5, 1280, "Metrics/MethodLength: Method has too many lines. [23/10]", 305449363], - [2884, 5, 1280, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 305449363], - [2884, 51, 200, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1352434212], - [2885, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 1139621482], - [2913, 5, 2199, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_tree_run` is too high. [<15, 42, 31> 54.31/17]", 975627723], - [2913, 5, 2199, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_tree_run` is too high. [25/7]", 975627723], - [2913, 5, 2199, "Metrics/MethodLength: Method has too many lines. [38/10]", 975627723], - [2913, 5, 2199, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_tree_run` is too high. [26/8]", 975627723], - [2957, 5, 1515, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_apply` is too high. [<13, 35, 21> 42.84/17]", 3710254295], - [2957, 5, 1515, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_directory_apply` is too high. [17/7]", 3710254295], - [2957, 5, 1515, "Metrics/MethodLength: Method has too many lines. [26/10]", 3710254295], - [2957, 5, 1515, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_directory_apply` is too high. [17/8]", 3710254295], - [2972, 20, 1, "Style/DoubleNegation: Avoid the use of double negation (`!!`).", 177540], - [2989, 5, 1656, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_plan` is too high. [<11, 24, 25> 36.36/17]", 2946319293], - [2989, 5, 1656, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_directory_plan` is too high. [18/7]", 2946319293], - [2989, 5, 1656, "Metrics/MethodLength: Method has too many lines. [36/10]", 2946319293], - [2989, 5, 1656, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_directory_plan` is too high. [16/8]", 2946319293], - [3061, 7, 9, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 3648222389], - [3082, 5, 410, "Metrics/MethodLength: Method has too many lines. [12/10]", 248324428], - [3088, 7, 11, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 848344986], - [3132, 5, 712, "Metrics/MethodLength: Method has too many lines. [12/10]", 2500743043], - [3132, 27, 178, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 873705194], - [3132, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3023611470], - [3158, 42, 167, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2002181571], - [3171, 5, 1097, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structured_edit_selection_profile` is too high. [8/7]", 1149325233], - [3171, 5, 1097, "Metrics/MethodLength: Method has too many lines. [14/10]", 1149325233], - [3171, 42, 311, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 3814063337], - [3172, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 198450264], - [3185, 34, 47, "Style/SafeNavigation: Use safe navigation (`&.`) instead of checking if an object exists before calling the method.", 3204815976], - [3190, 5, 869, "Metrics/MethodLength: Method has too many lines. [11/10]", 83957392], - [3190, 41, 250, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1486072775], - [3191, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1967186495], - [3201, 36, 47, "Style/SafeNavigation: Use safe navigation (`&.`) instead of checking if an object exists before calling the method.", 3204815976], - [3206, 5, 1156, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structured_edit_match_profile` is too high. [10/7]", 4112674787], - [3206, 5, 1156, "Metrics/MethodLength: Method has too many lines. [15/10]", 4112674787], - [3206, 5, 1156, "Metrics/PerceivedComplexity: Perceived complexity for `structured_edit_match_profile` is too high. [10/8]", 4112674787], - [3206, 38, 321, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [12/5]", 823565876], - [3207, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859667], - [3208, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3673982236], - [3226, 5, 933, "Metrics/MethodLength: Method has too many lines. [14/10]", 2099388915], - [3226, 37, 319, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [12/5]", 250907892], - [3227, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177545], - [3228, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 4154814685], - [3245, 5, 907, "Metrics/MethodLength: Method has too many lines. [12/10]", 2242846328], - [3245, 42, 275, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 246196330], - [3246, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1439117336], - [3262, 5, 1057, "Metrics/MethodLength: Method has too many lines. [14/10]", 2891607970], - [3262, 44, 323, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 1386547750], - [3263, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1676243675], - [3264, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 4154814685], - [3281, 5, 1375, "Metrics/AbcSize: Assignment Branch Condition size for `structured_edit_request` is too high. [<11, 25, 10> 29.09/17]", 4153786554], - [3281, 5, 1375, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structured_edit_request` is too high. [11/7]", 4153786554], - [3281, 5, 1375, "Metrics/MethodLength: Method has too many lines. [16/10]", 4153786554], - [3281, 5, 1375, "Metrics/PerceivedComplexity: Perceived complexity for `structured_edit_request` is too high. [11/8]", 4153786554], - [3281, 32, 370, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [13/5]", 2381882467], - [3282, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177545], - [3303, 5, 728, "Metrics/MethodLength: Method has too many lines. [11/10]", 4026157473], - [3303, 31, 175, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 773121544], - [3335, 5, 597, "Metrics/MethodLength: Method has too many lines. [11/10]", 4143495860], - [3374, 5, 577, "Metrics/MethodLength: Method has too many lines. [11/10]", 4169131743], - [3389, 5, 1011, "Metrics/AbcSize: Assignment Branch Condition size for `structured_edit_execution_report` is too high. [<7, 16, 7> 18.81/17]", 876221899], - [3389, 5, 1011, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structured_edit_execution_report` is too high. [8/7]", 876221899], - [3389, 5, 1011, "Metrics/MethodLength: Method has too many lines. [12/10]", 876221899], - [3389, 41, 245, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 2484440861], - [3390, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 4036992717], - [3415, 55, 170, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 668161765], - [3438, 5, 819, "Metrics/MethodLength: Method has too many lines. [12/10]", 2287133436], - [3438, 56, 217, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3198032135], - [3439, 121, 51, "Layout/LineLength: Line is too long. [171/120]", 3526181051], - [3472, 5, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 1853778635], - [3481, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], - [3513, 5, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 1132214891], - [3522, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], - [3544, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 556747511], - [3553, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1808630920], - [3575, 5, 708, "Metrics/MethodLength: Method has too many lines. [11/10]", 3590891170], - [3584, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1367166441], - [3607, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 689748855], - [3616, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1808630920], - [3638, 5, 708, "Metrics/MethodLength: Method has too many lines. [11/10]", 1478642210], - [3647, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1367166441], - [3671, 5, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 239506091], - [3680, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], - [3702, 5, 693, "Metrics/MethodLength: Method has too many lines. [11/10]", 3803476550], - [3711, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], - [3734, 5, 728, "Metrics/MethodLength: Method has too many lines. [11/10]", 748161230], - [3743, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 2807086497], - [3765, 5, 758, "Metrics/MethodLength: Method has too many lines. [11/10]", 3900524558], - [3774, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3463884836], - [3798, 5, 748, "Metrics/MethodLength: Method has too many lines. [11/10]", 2076716686], - [3807, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 609414023], - [3829, 5, 778, "Metrics/MethodLength: Method has too many lines. [11/10]", 867958318], - [3833, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193343749], - [3838, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 1202823007], - [3862, 5, 728, "Metrics/MethodLength: Method has too many lines. [11/10]", 2078323790], - [3871, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 2807086497], - [3893, 5, 758, "Metrics/MethodLength: Method has too many lines. [11/10]", 121025422], - [3902, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3463884836], - [3924, 5, 733, "Metrics/MethodLength: Method has too many lines. [11/10]", 1216456558], - [3933, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 145839927], - [3955, 5, 763, "Metrics/MethodLength: Method has too many lines. [11/10]", 2946525998], - [3964, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 275709226], - [3988, 5, 768, "Metrics/MethodLength: Method has too many lines. [11/10]", 3281402414], - [3992, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177656], - [3997, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 1427340581], - [4034, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3673982236], - [4091, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193417070], - [4102, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2768444], - [4109, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3833204035], - [4117, 5, 863, "Metrics/MethodLength: Method has too many lines. [11/10]", 3731153486], - [4121, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 4054494590], - [4126, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 2084326338], - [4132, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 4201858364], - [4136, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861122], - [4140, 5, 873, "Metrics/MethodLength: Method has too many lines. [11/10]", 1866057614], - [4144, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3893180930], - [4149, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 863421408], - [4155, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 3247130491], - [4159, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1171438608], - [4163, 5, 883, "Metrics/MethodLength: Method has too many lines. [11/10]", 2352924462], - [4163, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860841], - [4164, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861334], - [4167, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 465221046], - [4172, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 1922522532], - [4188, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 4067226670], - [4192, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2033573170], - [4196, 5, 893, "Metrics/MethodLength: Method has too many lines. [11/10]", 1633175534], - [4196, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087926422], - [4197, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087421565], - [4200, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 615151909], - [4205, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 884393597], - [4231, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 417844693], - [4235, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1233681340], - [4239, 5, 903, "Metrics/MethodLength: Method has too many lines. [11/10]", 3964877742], - [4239, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873471], - [4240, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1322899615], - [4243, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 3471008807], - [4248, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 627945471], - [4254, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 2960084092], - [4258, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2148514258], - [4262, 5, 913, "Metrics/MethodLength: Method has too many lines. [11/10]", 385546958], - [4262, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2970472935], - [4263, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3808956371], - [4266, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 3412499338], - [4271, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 3274208144], - [4277, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 4275923717], - [4285, 5, 848, "Metrics/MethodLength: Method has too many lines. [11/10]", 457851502], - [4289, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 413805135], - [4294, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 951908917], - [4300, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 1859200227], - [4308, 5, 808, "Metrics/MethodLength: Method has too many lines. [11/10]", 884695726], - [4312, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 2011807620], - [4317, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 384138219], - [4323, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1176320663], - [4331, 5, 798, "Metrics/MethodLength: Method has too many lines. [11/10]", 1422521838], - [4335, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3247420006], - [4340, 121, 35, "Layout/LineLength: Line is too long. [155/120]", 1408316702], - [4346, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 938465266], - [4354, 5, 803, "Metrics/MethodLength: Method has too many lines. [11/10]", 2370839950], - [4358, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 74128911], - [4363, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 1364659899], - [4369, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2059517661], - [4377, 5, 803, "Metrics/MethodLength: Method has too many lines. [11/10]", 3379336814], - [4381, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 74128911], - [4386, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 1364659899], - [4434, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 4281772560], - [4442, 5, 833, "Metrics/MethodLength: Method has too many lines. [11/10]", 3245498510], - [4446, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3542644754], - [4451, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1916814773], - [4457, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 859690879], - [4465, 5, 833, "Metrics/MethodLength: Method has too many lines. [11/10]", 4138830126], - [4469, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3542644754], - [4474, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1916814773], - [4480, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3880141603], - [4488, 5, 828, "Metrics/MethodLength: Method has too many lines. [11/10]", 3621010990], - [4492, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3917260126], - [4497, 121, 41, "Layout/LineLength: Line is too long. [161/120]", 1879260859], - [4503, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1776611011], - [4511, 5, 838, "Metrics/MethodLength: Method has too many lines. [11/10]", 514585454], - [4515, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1353518231], - [4520, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 1228459824], - [4526, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 3932349968], - [4530, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087903307], - [4534, 5, 878, "Metrics/MethodLength: Method has too many lines. [11/10]", 1525737454], - [4534, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], - [4535, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177538], - [4538, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 2895681070], - [4543, 121, 51, "Layout/LineLength: Line is too long. [171/120]", 4040662298], - [4549, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 66929045], - [4557, 5, 808, "Metrics/MethodLength: Method has too many lines. [11/10]", 1626746606], - [4561, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 2011807620], - [4566, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 384138219], - [4580, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 849230508], - [4588, 5, 838, "Metrics/MethodLength: Method has too many lines. [11/10]", 3531122670], - [4592, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1353518231], - [4597, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 1228459824], - [4612, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1176320663], - [4620, 5, 798, "Metrics/MethodLength: Method has too many lines. [11/10]", 1118421486], - [4624, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3247420006], - [4629, 121, 35, "Layout/LineLength: Line is too long. [155/120]", 1408316702], - [4651, 5, 693, "Metrics/MethodLength: Method has too many lines. [11/10]", 1668406662], - [4660, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], - [4674, 5, 648, "Metrics/MethodLength: Method has too many lines. [11/10]", 3479836893], - [4683, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193343749], - [4705, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 3147549879], - [4714, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1808630920], - [4749, 5, 677, "Metrics/MethodLength: Method has too many lines. [11/10]", 1206941784], - [4758, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3937819337], - [4781, 5, 672, "Metrics/MethodLength: Method has too many lines. [11/10]", 3634903061], - [4790, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], - [4812, 5, 683, "Metrics/MethodLength: Method has too many lines. [11/10]", 3417053461], - [4821, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], - [4845, 5, 668, "Metrics/MethodLength: Method has too many lines. [11/10]", 1540762726], - [4854, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1808630920], - [4876, 5, 698, "Metrics/MethodLength: Method has too many lines. [11/10]", 2804825893], - [4885, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1367166441], - [4908, 5, 683, "Metrics/MethodLength: Method has too many lines. [11/10]", 3165010613], - [4917, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], - [4939, 5, 713, "Metrics/MethodLength: Method has too many lines. [11/10]", 2795628035], - [4948, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 497133415], - [4954, 5, 864, "Metrics/MethodLength: Method has too many lines. [12/10]", 1086224878], - [4954, 50, 268, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 4022739767], - [4955, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1607400384], - [4979, 5, 658, "Metrics/MethodLength: Method has too many lines. [11/10]", 3999796489], - [4988, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 102058825], - [5002, 59, 179, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1569981428], - [5003, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 1515849732], - [5034, 5, 694, "Metrics/MethodLength: Method has too many lines. [11/10]", 3830236120], - [5043, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2250857971], - [5057, 5, 673, "Metrics/MethodLength: Method has too many lines. [11/10]", 2413908653], - [5066, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1225026887], - [5080, 5, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 3935895659], - [5089, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], - [5103, 5, 692, "Metrics/MethodLength: Method has too many lines. [11/10]", 3660669627], - [5112, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3558241761], - [5126, 5, 612, "Metrics/MethodLength: Method has too many lines. [11/10]", 100391811], - [5165, 5, 693, "Metrics/MethodLength: Method has too many lines. [11/10]", 3138587622], - [5174, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], - [5196, 5, 688, "Metrics/MethodLength: Method has too many lines. [11/10]", 2736088861], - [5205, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1992103013], - [5228, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 2275602867], - [5237, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3598350322], - [5260, 5, 602, "Metrics/MethodLength: Method has too many lines. [11/10]", 3023166371], - [5275, 36, 181, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1071580945], - [5288, 5, 787, "Metrics/AbcSize: Assignment Branch Condition size for `group_projected_child_review_cases` is too high. [<4, 17, 4> 17.92/17]", 3391527151], - [5288, 5, 787, "Metrics/MethodLength: Method has too many lines. [18/10]", 3391527151], - [5312, 5, 705, "Metrics/MethodLength: Method has too many lines. [13/10]", 2629923275], - [5339, 5, 547, "Metrics/MethodLength: Method has too many lines. [12/10]", 1911190850], - [5364, 5, 1516, "Metrics/AbcSize: Assignment Branch Condition size for `review_projected_child_groups` is too high. [<11, 21, 9> 25.36/17]", 3333110579], - [5364, 5, 1516, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `review_projected_child_groups` is too high. [8/7]", 3333110579], - [5364, 5, 1516, "Metrics/MethodLength: Method has too many lines. [39/10]", 3333110579], - [5364, 5, 1516, "Metrics/PerceivedComplexity: Perceived complexity for `review_projected_child_groups` is too high. [9/8]", 3333110579], - [5398, 7, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], - [5410, 5, 562, "Metrics/MethodLength: Method has too many lines. [14/10]", 3083915102], - [5429, 5, 1898, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_delegated_child_outputs` is too high. [<11, 21, 6> 24.45/17]", 2739722546], - [5429, 5, 1898, "Metrics/MethodLength: Method has too many lines. [49/10]", 2739722546], - [5484, 5, 942, "Metrics/AbcSize: Assignment Branch Condition size for `execute_nested_merge` is too high. [<3, 17, 6> 18.28/17]", 766157172], - [5484, 5, 942, "Metrics/MethodLength: Method has too many lines. [20/10]", 766157172], - [5484, 29, 144, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1404367793], - [5511, 5, 652, "Metrics/MethodLength: Method has too many lines. [13/10]", 2105803856], - [5530, 38, 140, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1682835820], - [5560, 5, 577, "Metrics/MethodLength: Method has too many lines. [12/10]", 2659610443], - [5629, 5, 569, "Metrics/MethodLength: Method has too many lines. [14/10]", 20616641], - [5657, 5, 772, "Metrics/AbcSize: Assignment Branch Condition size for `conformance_manifest_review_request_ids` is too high. [<7, 16, 8> 19.21/17]", 3577418475], - [5657, 5, 772, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `conformance_manifest_review_request_ids` is too high. [9/7]", 3577418475], - [5657, 5, 772, "Metrics/MethodLength: Method has too many lines. [14/10]", 3577418475], - [5657, 5, 772, "Metrics/PerceivedComplexity: Perceived complexity for `conformance_manifest_review_request_ids` is too high. [9/8]", 3577418475], - [5711, 5, 606, "Metrics/MethodLength: Method has too many lines. [11/10]", 2675086662], - [5726, 5, 562, "Metrics/MethodLength: Method has too many lines. [11/10]", 3811715870], - [5741, 5, 578, "Metrics/MethodLength: Method has too many lines. [11/10]", 1776197415], - [5756, 5, 1298, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_conformance_family_context` is too high. [<7, 28, 9> 30.23/17]", 4265202259], - [5756, 5, 1298, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `resolve_conformance_family_context` is too high. [10/7]", 4265202259], - [5756, 5, 1298, "Metrics/MethodLength: Method has too many lines. [23/10]", 4265202259], - [5756, 5, 1298, "Metrics/PerceivedComplexity: Perceived complexity for `resolve_conformance_family_context` is too high. [10/8]", 4265202259], - [5785, 5, 1994, "Metrics/AbcSize: Assignment Branch Condition size for `review_conformance_family_context` is too high. [<12, 24, 10> 28.64/17]", 2834851944], - [5785, 5, 1994, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `review_conformance_family_context` is too high. [10/7]", 2834851944], - [5785, 5, 1994, "Metrics/MethodLength: Method has too many lines. [41/10]", 2834851944], - [5785, 5, 1994, "Metrics/PerceivedComplexity: Perceived complexity for `review_conformance_family_context` is too high. [11/8]", 2834851944], - [5808, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 641612328], - [5845, 5, 1844, "Metrics/AbcSize: Assignment Branch Condition size for `select_conformance_case` is too high. [<2, 43, 14> 45.27/17]", 670673209], - [5845, 5, 1844, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `select_conformance_case` is too high. [14/7]", 670673209], - [5845, 5, 1844, "Metrics/MethodLength: Method has too many lines. [30/10]", 670673209], - [5845, 5, 1844, "Metrics/PerceivedComplexity: Perceived complexity for `select_conformance_case` is too high. [16/8]", 670673209], - [5850, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 2135503892], - [5852, 121, 41, "Layout/LineLength: Line is too long. [161/120]", 3932054828], - [5861, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 3169124957], - [5883, 5, 509, "Metrics/MethodLength: Method has too many lines. [11/10]", 3552283123], - [5972, 5, 4195, "Metrics/AbcSize: Assignment Branch Condition size for `review_conformance_manifest` is too high. [<37, 63, 16> 74.79/17]", 2166560528], - [5972, 5, 4195, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `review_conformance_manifest` is too high. [14/7]", 2166560528], - [5972, 5, 4195, "Metrics/MethodLength: Method has too many lines. [89/10]", 2166560528], - [5972, 5, 4195, "Metrics/PerceivedComplexity: Perceived complexity for `review_conformance_manifest` is too high. [17/8]", 2166560528], - [6037, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2746826653], - [6053, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 3035993839], - [6075, 5, 676, "Metrics/MethodLength: Method has too many lines. [15/10]", 3048335475], - [6098, 5, 1054, "Metrics/AbcSize: Assignment Branch Condition size for `plan_conformance_suite` is too high. [<11, 18, 8> 22.56/17]", 1855254788], - [6098, 5, 1054, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `plan_conformance_suite` is too high. [8/7]", 1855254788], - [6098, 5, 1054, "Metrics/MethodLength: Method has too many lines. [25/10]", 1855254788], - [6098, 31, 84, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 172854173], - [6163, 5, 1274, "Metrics/AbcSize: Assignment Branch Condition size for `plan_named_conformance_suites_with_diagnostics` is too high. [<11, 21, 7> 24.72/17]", 3991300730], - [6163, 5, 1274, "Metrics/MethodLength: Method has too many lines. [27/10]", 3991300730], - [6190, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 3035993839], - [6255, 5, 2071, "Metrics/AbcSize: Assignment Branch Condition size for `review_decision_for_family_context` is too high. [<7, 22, 16> 28.09/17]", 4245377184], - [6255, 5, 2071, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `review_decision_for_family_context` is too high. [12/7]", 4245377184], - [6255, 5, 2071, "Metrics/MethodLength: Method has too many lines. [46/10]", 4245377184], - [6255, 5, 2071, "Metrics/PerceivedComplexity: Perceived complexity for `review_decision_for_family_context` is too high. [12/8]", 4245377184], - [6260, 7, 1766, "Metrics/BlockLength: Block has too many lines. [40/25]", 65448241], - [6312, 5, 686, "Metrics/MethodLength: Method has too many lines. [13/10]", 4030291682] - ], - "lib/ast/merge/ast_node.rb:2037773320": [ - [44, 5, 7086, "Metrics/ClassLength: Class has too many lines. [114/100]", 201314721], - [220, 11, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183] - ], - "lib/ast/merge/comment/attachment.rb:2388154769": [ - [42, 23, 180, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3775370530], - [75, 24, 2, "Lint/SafeNavigationConsistency: Use `.` instead of unnecessary `&.`.", 5858765], - [81, 25, 2, "Lint/SafeNavigationConsistency: Use `.` instead of unnecessary `&.`.", 5858765], - [114, 9, 410, "Metrics/AbcSize: Assignment Branch Condition size for `inspect` is too high. [<1, 17, 4> 17.49/17]", 605978105], - [115, 32, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] - ], - "lib/ast/merge/comment/augmenter.rb:633395157": [ - [12, 7, 13967, "Metrics/ClassLength: Class has too many lines. [291/100]", 2806660144], - [33, 9, 721, "Metrics/MethodLength: Method has too many lines. [16/10]", 200402816], - [33, 23, 91, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2938734913], - [64, 9, 1335, "Metrics/AbcSize: Assignment Branch Condition size for `build!` is too high. [<12, 29, 6> 31.95/17]", 3904283188], - [64, 9, 1335, "Metrics/MethodLength: Method has too many lines. [22/10]", 3904283188], - [94, 9, 867, "Metrics/AbcSize: Assignment Branch Condition size for `infer_leading_comments` is too high. [<8, 19, 14> 24.92/17]", 1941464872], - [94, 9, 867, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_leading_comments` is too high. [11/7]", 1941464872], - [94, 9, 867, "Metrics/MethodLength: Method has too many lines. [20/10]", 1941464872], - [94, 9, 867, "Metrics/PerceivedComplexity: Perceived complexity for `infer_leading_comments` is too high. [12/8]", 1941464872], - [122, 9, 429, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_inline_comments` is too high. [8/7]", 2688935834], - [133, 9, 934, "Metrics/AbcSize: Assignment Branch Condition size for `infer_trailing_comments` is too high. [<8, 21, 18> 28.79/17]", 1551855281], - [133, 9, 934, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_trailing_comments` is too high. [15/7]", 1551855281], - [133, 9, 934, "Metrics/MethodLength: Method has too many lines. [20/10]", 1551855281], - [133, 9, 934, "Metrics/PerceivedComplexity: Perceived complexity for `infer_trailing_comments` is too high. [15/8]", 1551855281], - [160, 9, 488, "Metrics/AbcSize: Assignment Branch Condition size for `infer_postlude!` is too high. [<5, 17, 8> 19.44/17]", 2562637949], - [160, 9, 488, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_postlude!` is too high. [8/7]", 2562637949], - [173, 9, 1529, "Metrics/AbcSize: Assignment Branch Condition size for `infer_remaining_regions!` is too high. [<12, 27, 23> 37.44/17]", 3911657050], - [173, 9, 1529, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_remaining_regions!` is too high. [18/7]", 3911657050], - [173, 9, 1529, "Metrics/MethodLength: Method has too many lines. [28/10]", 3911657050], - [173, 9, 1529, "Metrics/PerceivedComplexity: Perceived complexity for `infer_remaining_regions!` is too high. [20/8]", 3911657050], - [216, 9, 507, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split_preamble_group` is too high. [8/7]", 336784898], - [231, 9, 588, "Metrics/MethodLength: Method has too many lines. [17/10]", 3445626532], - [274, 9, 965, "Metrics/AbcSize: Assignment Branch Condition size for `build_region` is too high. [<6, 17, 7> 19.34/17]", 344809006], - [274, 9, 965, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_region` is too high. [8/7]", 344809006], - [274, 9, 965, "Metrics/MethodLength: Method has too many lines. [24/10]", 344809006] - ], - "lib/ast/merge/comment/block.rb:3806757604": [ - [31, 7, 6754, "Metrics/ClassLength: Class has too many lines. [106/100]", 2308582303], - [57, 9, 1059, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<12, 13, 14> 22.56/17]", 2656171724], - [57, 9, 1059, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `initialize` is too high. [14/7]", 2656171724], - [57, 9, 1059, "Metrics/MethodLength: Method has too many lines. [21/10]", 2656171724], - [57, 9, 1059, "Metrics/PerceivedComplexity: Perceived complexity for `initialize` is too high. [15/8]", 2656171724], - [113, 9, 511, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `freeze_action` is too high. [9/7]", 55014877], - [113, 9, 511, "Metrics/MethodLength: Method has too many lines. [12/10]", 55014877], - [113, 9, 511, "Metrics/PerceivedComplexity: Perceived complexity for `freeze_action` is too high. [9/8]", 55014877], - [181, 9, 439, "Metrics/AbcSize: Assignment Branch Condition size for `first_meaningful_content` is too high. [<2, 16, 11> 19.52/17]", 680479883], - [181, 9, 439, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `first_meaningful_content` is too high. [11/7]", 680479883], - [181, 9, 439, "Metrics/PerceivedComplexity: Perceived complexity for `first_meaningful_content` is too high. [12/8]", 680479883], - [197, 9, 765, "Metrics/AbcSize: Assignment Branch Condition size for `extract_block_content` is too high. [<7, 24, 9> 26.57/17]", 621871624], - [197, 9, 765, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_block_content` is too high. [9/7]", 621871624], - [197, 9, 765, "Metrics/PerceivedComplexity: Perceived complexity for `extract_block_content` is too high. [9/8]", 621871624] - ], - "lib/ast/merge/comment/c_style_tracker_base.rb:1569556520": [ - [22, 7, 15053, "Metrics/ClassLength: Class has too many lines. [284/100]", 3599183270], - [83, 9, 509, "Metrics/MethodLength: Method has too many lines. [11/10]", 1639553915], - [102, 9, 492, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `leading_comments_before` is too high. [8/7]", 3127043491], - [102, 9, 492, "Metrics/MethodLength: Method has too many lines. [11/10]", 3127043491], - [124, 9, 487, "Metrics/MethodLength: Method has too many lines. [11/10]", 1869933531], - [176, 9, 713, "Metrics/AbcSize: Assignment Branch Condition size for `trailing_comments_after` is too high. [<6, 12, 13> 18.68/17]", 543703521], - [176, 9, 713, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trailing_comments_after` is too high. [11/7]", 543703521], - [176, 9, 713, "Metrics/MethodLength: Method has too many lines. [14/10]", 543703521], - [176, 9, 713, "Metrics/PerceivedComplexity: Perceived complexity for `trailing_comments_after` is too high. [11/8]", 543703521], - [184, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177549], - [202, 9, 598, "Metrics/MethodLength: Method has too many lines. [12/10]", 1628921093], - [222, 9, 1271, "Metrics/MethodLength: Method has too many lines. [21/10]", 612335469], - [222, 35, 137, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1823300034], - [329, 35, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [348, 9, 2271, "Metrics/AbcSize: Assignment Branch Condition size for `extract_comments` is too high. [<17, 32, 13> 38.5/17]", 2751274968], - [348, 9, 2271, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_comments` is too high. [14/7]", 2751274968], - [348, 9, 2271, "Metrics/MethodLength: Method has too many lines. [59/10]", 2751274968], - [348, 9, 2271, "Metrics/PerceivedComplexity: Perceived complexity for `extract_comments` is too high. [14/8]", 2751274968], - [353, 11, 2045, "Metrics/BlockLength: Block has too many lines. [52/25]", 575665179], - [418, 9, 659, "Metrics/MethodLength: Method has too many lines. [15/10]", 177254901], - [439, 71, 4, "Lint/UnusedMethodArgument: Unused method argument - `line`.", 2087656651], - [439, 78, 8, "Lint/UnusedMethodArgument: Unused method argument - `line_num`.", 622661090] - ], - "lib/ast/merge/comment/hash_tracker_base.rb:861186417": [ - [32, 7, 19362, "Metrics/ClassLength: Class has too many lines. [221/100]", 1031055222], - [118, 9, 444, "Metrics/MethodLength: Method has too many lines. [11/10]", 3347260807], - [142, 9, 921, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `leading_comments_before` is too high. [8/7]", 415734636], - [142, 9, 921, "Metrics/MethodLength: Method has too many lines. [11/10]", 415734636], - [172, 9, 440, "Metrics/MethodLength: Method has too many lines. [11/10]", 2464474004], - [225, 9, 623, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trailing_comments_after` is too high. [10/7]", 543703521], - [225, 9, 623, "Metrics/MethodLength: Method has too many lines. [12/10]", 543703521], - [225, 9, 623, "Metrics/PerceivedComplexity: Perceived complexity for `trailing_comments_after` is too high. [10/8]", 543703521], - [249, 9, 551, "Metrics/MethodLength: Method has too many lines. [12/10]", 2783654570], - [278, 9, 1271, "Metrics/MethodLength: Method has too many lines. [21/10]", 612335469], - [278, 35, 137, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1823300034], - [374, 35, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [439, 9, 826, "Metrics/MethodLength: Method has too many lines. [12/10]", 1706632542] - ], - "lib/ast/merge/comment/parser.rb:2674748021": [ - [34, 7, 8372, "Metrics/ClassLength: Class has too many lines. [141/100]", 2541983664], - [84, 9, 357, "Metrics/MethodLength: Method has too many lines. [12/10]", 2265493710], - [104, 9, 545, "Metrics/AbcSize: Assignment Branch Condition size for `auto_detect_style` is too high. [<5, 17, 7> 19.05/17]", 868366444], - [104, 9, 545, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `auto_detect_style` is too high. [8/7]", 868366444], - [125, 9, 1650, "Metrics/AbcSize: Assignment Branch Condition size for `parse_line_comments` is too high. [<8, 28, 7> 29.95/17]", 1511562163], - [125, 9, 1650, "Metrics/MethodLength: Method has too many lines. [31/10]", 1511562163], - [176, 9, 2670, "Metrics/AbcSize: Assignment Branch Condition size for `parse_with_block_comments` is too high. [<15, 47, 15> 51.57/17]", 2963765048], - [176, 9, 2670, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_with_block_comments` is too high. [15/7]", 2963765048], - [176, 9, 2670, "Metrics/MethodLength: Method has too many lines. [47/10]", 2963765048], - [176, 9, 2670, "Metrics/PerceivedComplexity: Perceived complexity for `parse_with_block_comments` is too high. [16/8]", 2963765048], - [181, 11, 2390, "Metrics/BlockLength: Block has too many lines. [40/25]", 3720582340] - ], - "lib/ast/merge/comment/quoted_hash_line_parser.rb:2878420841": [ - [74, 9, 458, "Metrics/MethodLength: Method has too many lines. [11/10]", 1526360697], - [91, 9, 620, "Metrics/AbcSize: Assignment Branch Condition size for `inline_result` is too high. [<3, 16, 6> 17.35/17]", 2706755447], - [91, 9, 620, "Metrics/MethodLength: Method has too many lines. [14/10]", 2706755447] - ], - "lib/ast/merge/comment/region_merge_policy.rb:176745155": [ - [23, 23, 98, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1029631546], - [55, 9, 423, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `freeze_sensitive?` is too high. [8/7]", 4102661282], - [61, 41, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [61, 85, 2, "Lint/SafeNavigationConsistency: Use `.` instead of unnecessary `&.`.", 5858765], - [96, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3491399903] - ], - "lib/ast/merge/comment/style.rb:3045051983": [ - [27, 7, 9109, "Metrics/ClassLength: Class has too many lines. [143/100]", 131723516], - [142, 11, 911, "Metrics/MethodLength: Method has too many lines. [17/10]", 355862493], - [142, 23, 164, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 668558018], - [203, 23, 164, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 668558018] - ], - "lib/ast/merge/comment/tracked_hash_adapter.rb:3235547929": [ - [99, 11, 553, "Metrics/AbcSize: Assignment Branch Condition size for `line_text_from` is too high. [<4, 20, 4> 20.78/17]", 2680273536], - [99, 11, 553, "Metrics/MethodLength: Method has too many lines. [13/10]", 2680273536] - ], - "lib/ast/merge/composite_match_refiner.rb:1718969703": [ - [58, 7, 668, "Metrics/MethodLength: Method has too many lines. [14/10]", 2649148714] - ], - "lib/ast/merge/conflict_resolver_base.rb:765343263": [ - [69, 5, 14959, "Metrics/ClassLength: Class has too many lines. [170/100]", 633092728], - [156, 7, 919, "Metrics/MethodLength: Method has too many lines. [13/10]", 1701319380], - [156, 21, 200, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3369976202], - [367, 7, 972, "Metrics/MethodLength: Method has too many lines. [22/10]", 2870739148], - [434, 47, 13, "Style/NumericPredicate: Use `recursive.positive?` instead of `recursive > 0`.", 462999281], - [436, 99, 14, "Style/NumericPredicate: Use `recursive.zero?` instead of `recursive == 0`.", 2394069519] - ], - "lib/ast/merge/content_match_refiner.rb:3628272158": [ - [47, 5, 7719, "Metrics/ClassLength: Class has too many lines. [108/100]", 651494487], - [87, 7, 750, "Metrics/MethodLength: Method has too many lines. [17/10]", 3624290009], - [165, 37, 48, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 953994744], - [232, 7, 846, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<13, 29, 8> 32.77/17]", 3597737347], - [232, 7, 846, "Metrics/MethodLength: Method has too many lines. [20/10]", 3597737347] - ], - "lib/ast/merge/debug_logger.rb:1783610128": [ - [72, 5, 7614, "Metrics/ModuleLength: Module has too many lines. [118/100]", 736598454], - [85, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 941621], - [206, 7, 584, "Metrics/AbcSize: Assignment Branch Condition size for `time` is too high. [<3, 17, 2> 17.38/17]", 3468868523], - [206, 7, 584, "Metrics/MethodLength: Method has too many lines. [14/10]", 3468868523], - [269, 7, 450, "Metrics/PerceivedComplexity: Perceived complexity for `extract_lines` is too high. [9/8]", 680738666], - [287, 7, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631] - ], - "lib/ast/merge/detector/base.rb:343830240": [ - [175, 25, 73, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2991095115] - ], - "lib/ast/merge/detector/fenced_code_block.rb:3555142063": [ - [36, 7, 6302, "Metrics/ClassLength: Class has too many lines. [116/100]", 852968953], - [71, 9, 2492, "Metrics/AbcSize: Assignment Branch Condition size for `detect_all` is too high. [<31, 28, 12> 43.46/17]", 3575218793], - [71, 9, 2492, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_all` is too high. [11/7]", 3575218793], - [71, 9, 2492, "Metrics/MethodLength: Method has too many lines. [54/10]", 3575218793], - [71, 9, 2492, "Metrics/PerceivedComplexity: Perceived complexity for `detect_all` is too high. [13/8]", 3575218793], - [84, 11, 2060, "Metrics/BlockLength: Block has too many lines. [41/25]", 1744553779] - ], - "lib/ast/merge/detector/mergeable.rb:354817747": [ - [54, 7, 11933, "Metrics/ModuleLength: Module has too many lines. [140/100]", 1453034870], - [162, 9, 601, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_region_configs` is too high. [8/7]", 1278024890], - [162, 9, 601, "Metrics/MethodLength: Method has too many lines. [16/10]", 1278024890], - [189, 9, 1054, "Metrics/AbcSize: Assignment Branch Condition size for `extract_regions` is too high. [<11, 16, 3> 19.65/17]", 663241096], - [189, 9, 1054, "Metrics/MethodLength: Method has too many lines. [20/10]", 663241096], - [285, 9, 1005, "Metrics/AbcSize: Assignment Branch Condition size for `merge_and_substitute_regions` is too high. [<16, 19, 4> 25.16/17]", 4123525156], - [285, 9, 1005, "Metrics/MethodLength: Method has too many lines. [16/10]", 4123525156], - [318, 9, 1369, "Metrics/AbcSize: Assignment Branch Condition size for `merge_region` is too high. [<11, 20, 14> 26.78/17]", 746321843], - [318, 9, 1369, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_region` is too high. [15/7]", 746321843], - [318, 9, 1369, "Metrics/MethodLength: Method has too many lines. [16/10]", 746321843], - [318, 9, 1369, "Metrics/PerceivedComplexity: Perceived complexity for `merge_region` is too high. [15/8]", 746321843] - ], - "lib/ast/merge/detector/toml_frontmatter.rb:3255696517": [ - [50, 9, 892, "Metrics/MethodLength: Method has too many lines. [20/10]", 3132005303] - ], - "lib/ast/merge/detector/yaml_frontmatter.rb:2551474823": [ - [49, 9, 958, "Metrics/MethodLength: Method has too many lines. [20/10]", 3132005303] - ], - "lib/ast/merge/diff_mapper_base.rb:3204989377": [ - [22, 5, 7793, "Metrics/ClassLength: Class has too many lines. [141/100]", 2217731166], - [80, 7, 2598, "Metrics/AbcSize: Assignment Branch Condition size for `parse_diff` is too high. [<21, 31, 15> 40.34/17]", 939898835], - [80, 7, 2598, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_diff` is too high. [16/7]", 939898835], - [80, 7, 2598, "Metrics/MethodLength: Method has too many lines. [65/10]", 939898835], - [80, 7, 2598, "Metrics/PerceivedComplexity: Perceived complexity for `parse_diff` is too high. [12/8]", 939898835], - [90, 9, 2162, "Metrics/BlockLength: Block has too many lines. [50/25]", 3403609416], - [169, 7, 394, "Metrics/MethodLength: Method has too many lines. [11/10]", 2028641628] - ], - "lib/ast/merge/emitter_base.rb:655463559": [ - [26, 5, 14449, "Metrics/ClassLength: Class has too many lines. [226/100]", 2015391034], - [95, 7, 653, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_comment_region` is too high. [9/7]", 24580929], - [95, 7, 653, "Metrics/MethodLength: Method has too many lines. [12/10]", 24580929], - [95, 7, 653, "Metrics/PerceivedComplexity: Perceived complexity for `emit_comment_region` is too high. [9/8]", 24580929], - [120, 7, 1311, "Metrics/AbcSize: Assignment Branch Condition size for `emit_comment_attachment` is too high. [<5, 25, 16> 30.1/17]", 964928813], - [120, 7, 1311, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_comment_attachment` is too high. [17/7]", 964928813], - [120, 7, 1311, "Metrics/MethodLength: Method has too many lines. [17/10]", 964928813], - [120, 7, 1311, "Metrics/PerceivedComplexity: Perceived complexity for `emit_comment_attachment` is too high. [17/8]", 964928813], - [120, 34, 127, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 628879795], - [152, 7, 984, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_layout_gap` is too high. [8/7]", 1954418889], - [152, 7, 984, "Metrics/MethodLength: Method has too many lines. [13/10]", 1954418889], - [152, 7, 984, "Metrics/PerceivedComplexity: Perceived complexity for `emit_layout_gap` is too high. [9/8]", 1954418889], - [152, 26, 136, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3839882587], - [183, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861198], - [184, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087656651], - [186, 7, 1307, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_layout_attachment` is too high. [9/7]", 708408665], - [186, 7, 1307, "Metrics/MethodLength: Method has too many lines. [26/10]", 708408665], - [186, 7, 1307, "Metrics/PerceivedComplexity: Perceived complexity for `emit_layout_attachment` is too high. [9/8]", 708408665], - [186, 33, 218, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1552587384], - [187, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 1763090185], - [189, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1371312610], - [256, 31, 17, "Style/NumericPredicate: Use `@indent_level.positive?` instead of `@indent_level > 0`.", 1892475678], - [302, 56, 12, "Lint/UnusedMethodArgument: Unused method argument - `current_line`. You can also write as `inline_comment_region_target_column(*)` if you want the method to accept any arguments but don't care about them.", 2091263933], - [306, 42, 6, "Lint/UnusedMethodArgument: Unused method argument - `region`.", 2124512157], - [306, 51, 13, "Lint/UnusedMethodArgument: Unused method argument - `target_column`.", 3246375805], - [321, 7, 1141, "Metrics/AbcSize: Assignment Branch Condition size for `inline_comment_node_text` is too high. [<6, 29, 8> 30.68/17]", 2583471562], - [321, 7, 1141, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `inline_comment_node_text` is too high. [9/7]", 2583471562], - [321, 7, 1141, "Metrics/MethodLength: Method has too many lines. [22/10]", 2583471562], - [321, 7, 1141, "Metrics/PerceivedComplexity: Perceived complexity for `inline_comment_node_text` is too high. [9/8]", 2583471562], - [339, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861626], - [350, 7, 510, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_region_gap_lines` is too high. [8/7]", 1999747697], - [350, 7, 510, "Metrics/PerceivedComplexity: Perceived complexity for `emit_region_gap_lines` is too high. [9/8]", 1999747697] - ], - "lib/ast/merge/emitter_line_metadata_support.rb:3153033769": [ - [5, 5, 33, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::EmitterLineMetadataSupport`.", 2926748997], - [23, 7, 541, "Metrics/MethodLength: Method has too many lines. [12/10]", 2407359355] - ], - "lib/ast/merge/file_aligner_base.rb:4032045257": [ - [13, 5, 7473, "Metrics/ClassLength: Class has too many lines. [187/100]", 1391880441], - [27, 7, 2244, "Metrics/AbcSize: Assignment Branch Condition size for `align` is too high. [<19, 37, 12> 43.29/17]", 1243937217], - [27, 7, 2244, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `align` is too high. [12/7]", 1243937217], - [27, 7, 2244, "Metrics/MethodLength: Method has too many lines. [55/10]", 1243937217], - [27, 7, 2244, "Metrics/PerceivedComplexity: Perceived complexity for `align` is too high. [12/8]", 1243937217], - [148, 7, 655, "Metrics/MethodLength: Method has too many lines. [14/10]", 2468821688], - [180, 7, 455, "Metrics/MethodLength: Method has too many lines. [13/10]", 2361153066], - [199, 7, 1557, "Metrics/AbcSize: Assignment Branch Condition size for `apply_match_refiner!` is too high. [<10, 28, 12> 32.06/17]", 2386945712], - [199, 7, 1557, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_match_refiner!` is too high. [13/7]", 2386945712], - [199, 7, 1557, "Metrics/MethodLength: Method has too many lines. [31/10]", 2386945712], - [199, 7, 1557, "Metrics/PerceivedComplexity: Perceived complexity for `apply_match_refiner!` is too high. [13/8]", 2386945712] - ], - "lib/ast/merge/file_analyzable.rb:607555963": [ - [36, 5, 31229, "Metrics/ModuleLength: Module has too many lines. [316/100]", 1247752256], - [99, 19, 9, "Style/NumericPredicate: Use `index.negative?` instead of `index < 0`.", 4215255415], - [148, 7, 793, "Metrics/MethodLength: Method has too many lines. [22/10]", 1467470910], - [202, 7, 771, "Metrics/MethodLength: Method has too many lines. [16/10]", 1412317163], - [344, 7, 844, "Metrics/MethodLength: Method has too many lines. [12/10]", 2335919661], - [369, 7, 730, "Metrics/MethodLength: Method has too many lines. [11/10]", 1047958652], - [431, 7, 863, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_layout_owned_comment_attachment` is too high. [<0, 20, 4> 20.4/17]", 3284843691], - [431, 7, 863, "Metrics/MethodLength: Method has too many lines. [17/10]", 3284843691], - [481, 7, 683, "Metrics/MethodLength: Method has too many lines. [15/10]", 241044926], - [520, 14, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [614, 7, 6095, "Metrics/AbcSize: Assignment Branch Condition size for `generate_signature` is too high. [<4, 21, 13> 25.02/17]", 2828809875], - [614, 7, 6095, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `generate_signature` is too high. [11/7]", 2828809875], - [614, 7, 6095, "Metrics/MethodLength: Method has too many lines. [30/10]", 2828809875], - [614, 7, 6095, "Metrics/PerceivedComplexity: Perceived complexity for `generate_signature` is too high. [14/8]", 2828809875], - [676, 24, 390, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 3279112483] - ], - "lib/ast/merge/freeze_node_base.rb:2110274026": [ - [59, 5, 14572, "Metrics/ClassLength: Class has too many lines. [171/100]", 3038607603], - [108, 25, 545, "Style/MutableConstant: Freeze mutable objects assigned to constants.", 2366014160], - [186, 9, 1100, "Metrics/MethodLength: Method has too many lines. [15/10]", 2506841532], - [288, 7, 758, "Metrics/MethodLength: Method has too many lines. [11/10]", 136868205], - [288, 21, 276, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 1720059801], - [335, 7, 660, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `reason` is too high. [8/7]", 3127566048], - [418, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] - ], - "lib/ast/merge/healer.rb:3642412735": [ - [18, 7, 588, "Metrics/MethodLength: Method has too many lines. [15/10]", 3172269921], - [18, 17, 84, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1781025196], - [41, 7, 687, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `filter_items` is too high. [8/7]", 1200842691], - [41, 7, 687, "Metrics/MethodLength: Method has too many lines. [17/10]", 1200842691], - [41, 7, 687, "Metrics/PerceivedComplexity: Perceived complexity for `filter_items` is too high. [9/8]", 1200842691], - [41, 23, 130, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 33939503] - ], - "lib/ast/merge/jaccard_similarity.rb:678558736": [ - [87, 19, 1, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 177604], - [87, 22, 1, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 177607] - ], - "lib/ast/merge/key_path_partial_template_merger_base.rb:1818613864": [ - [22, 5, 6114, "Metrics/ClassLength: Class has too many lines. [155/100]", 1269962119], - [43, 21, 214, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 3637591635], - [68, 7, 489, "Metrics/MethodLength: Method has too many lines. [12/10]", 3170411580], - [118, 7, 640, "Metrics/AbcSize: Assignment Branch Condition size for `find_key_path` is too high. [<8, 14, 10> 18.97/17]", 2613403604], - [118, 7, 640, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_key_path` is too high. [8/7]", 2613403604], - [118, 7, 640, "Metrics/MethodLength: Method has too many lines. [16/10]", 2613403604], - [118, 7, 640, "Metrics/PerceivedComplexity: Perceived complexity for `find_key_path` is too high. [9/8]", 2613403604], - [140, 7, 536, "Metrics/MethodLength: Method has too many lines. [17/10]", 3598062652], - [168, 7, 804, "Metrics/MethodLength: Method has too many lines. [19/10]", 2773364183] - ], - "lib/ast/merge/layout.rb:3670500101": [ - [23, 36, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] - ], - "lib/ast/merge/layout/augmenter.rb:2556116722": [ - [8, 7, 5498, "Metrics/ClassLength: Class has too many lines. [129/100]", 3693754698], - [21, 23, 125, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 3395039982], - [53, 9, 1795, "Metrics/AbcSize: Assignment Branch Condition size for `build!` is too high. [<20, 32, 17> 41.39/17]", 3542913254], - [53, 9, 1795, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build!` is too high. [15/7]", 3542913254], - [53, 9, 1795, "Metrics/MethodLength: Method has too many lines. [43/10]", 3542913254], - [53, 9, 1795, "Metrics/PerceivedComplexity: Perceived complexity for `build!` is too high. [15/8]", 3542913254], - [58, 11, 1227, "Metrics/BlockLength: Block has too many lines. [29/25]", 55360131], - [105, 9, 504, "Metrics/MethodLength: Method has too many lines. [16/10]", 1953725517] - ], - "lib/ast/merge/layout/gap.rb:1678106201": [ - [11, 7, 7558, "Metrics/ClassLength: Class has too many lines. [151/100]", 2254377349], - [23, 9, 655, "Metrics/MethodLength: Method has too many lines. [11/10]", 3584854768], - [23, 23, 146, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 361396001], - [157, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859545], - [162, 9, 303, "Metrics/MethodLength: Method has too many lines. [12/10]", 2236444774], - [203, 9, 688, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_adjacency!` is too high. [10/7]", 1112786311], - [203, 9, 688, "Metrics/MethodLength: Method has too many lines. [13/10]", 1112786311] - ], - "lib/ast/merge/match_refiner_base.rb:1760054866": [ - [248, 7, 503, "Metrics/MethodLength: Method has too many lines. [11/10]", 2844230268], - [275, 7, 1056, "Metrics/AbcSize: Assignment Branch Condition size for `greedy_match` is too high. [<9, 24, 8> 26.85/17]", 2497617815], - [275, 7, 1056, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `greedy_match` is too high. [8/7]", 2497617815], - [275, 7, 1056, "Metrics/MethodLength: Method has too many lines. [24/10]", 2497617815] - ], - "lib/ast/merge/merge_result_base.rb:764500297": [ - [17, 5, 18646, "Metrics/ClassLength: Class has too many lines. [335/100]", 314460772], - [88, 21, 187, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1067369198], - [187, 7, 843, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_blank_line_runs!` is too high. [<12, 12, 10> 19.7/17]", 2347011594], - [187, 7, 843, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_blank_line_runs!` is too high. [9/7]", 2347011594], - [187, 7, 843, "Metrics/MethodLength: Method has too many lines. [22/10]", 2347011594], - [187, 7, 843, "Metrics/PerceivedComplexity: Perceived complexity for `normalize_blank_line_runs!` is too high. [10/8]", 2347011594], - [227, 7, 1004, "Metrics/MethodLength: Method has too many lines. [21/10]", 59539336], - [227, 35, 211, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 709487711], - [266, 7, 602, "Metrics/MethodLength: Method has too many lines. [13/10]", 320027623], - [341, 7, 927, "Metrics/AbcSize: Assignment Branch Condition size for `validate_review_state_compatibility!` is too high. [<8, 15, 4> 17.46/17]", 1596840080], - [341, 7, 927, "Metrics/MethodLength: Method has too many lines. [16/10]", 1596840080], - [403, 7, 936, "Metrics/AbcSize: Assignment Branch Condition size for `review_state_metadata` is too high. [<7, 18, 4> 19.72/17]", 4128292066], - [403, 7, 936, "Metrics/MethodLength: Method has too many lines. [14/10]", 4128292066], - [413, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 20421901], - [438, 7, 1194, "Metrics/MethodLength: Method has too many lines. [21/10]", 4289697646], - [448, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3342583337] - ], - "lib/ast/merge/merger_config.rb:3582657829": [ - [46, 5, 10581, "Metrics/ClassLength: Class has too many lines. [148/100]", 1598770872], - [96, 21, 234, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 720509970] - ], - "lib/ast/merge/navigable/injection_point_finder.rb:4117743218": [ - [45, 9, 1707, "Metrics/AbcSize: Assignment Branch Condition size for `find` is too high. [<9, 18, 17> 26.34/17]", 1445381162], - [45, 9, 1707, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find` is too high. [15/7]", 1445381162], - [45, 9, 1707, "Metrics/MethodLength: Method has too many lines. [28/10]", 1445381162], - [45, 9, 1707, "Metrics/PerceivedComplexity: Perceived complexity for `find` is too high. [16/8]", 1445381162], - [45, 17, 156, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 3876813166] - ], - "lib/ast/merge/navigable/statement.rb:3050515622": [ - [42, 7, 11078, "Metrics/ClassLength: Class has too many lines. [179/100]", 2550894515], - [96, 11, 550, "Metrics/AbcSize: Assignment Branch Condition size for `find_matching` is too high. [<7, 16, 12> 21.19/17]", 3492534565], - [96, 11, 550, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_matching` is too high. [12/7]", 3492534565], - [96, 11, 550, "Metrics/PerceivedComplexity: Perceived complexity for `find_matching` is too high. [12/8]", 3492534565], - [222, 13, 20, "Naming/PredicatePrefix: Rename `has_tree_navigation?` to `tree_navigation?`.", 733442156] - ], - "lib/ast/merge/node_typing.rb:4008165135": [ - [175, 9, 694, "Metrics/MethodLength: Method has too many lines. [12/10]", 777909930], - [213, 9, 891, "Metrics/AbcSize: Assignment Branch Condition size for `find_typing_callable` is too high. [<3, 23, 13> 26.59/17]", 3835052858], - [213, 9, 891, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_typing_callable` is too high. [14/7]", 3835052858], - [213, 9, 891, "Metrics/PerceivedComplexity: Perceived complexity for `find_typing_callable` is too high. [14/8]", 3835052858] - ], - "lib/ast/merge/node_wrapper_base.rb:3796877358": [ - [62, 5, 10228, "Metrics/ClassLength: Class has too many lines. [135/100]", 3832956007], - [92, 21, 81, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 4261369704] - ], - "lib/ast/merge/owner_selection.rb:2568070127": [ - [9, 7, 757, "Metrics/MethodLength: Method has too many lines. [13/10]", 2069564552] - ], - "lib/ast/merge/partial_template_merger_base.rb:2252899061": [ - [27, 5, 16780, "Metrics/ClassLength: Class has too many lines. [266/100]", 2205844189], - [48, 23, 81, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2112244807], - [106, 7, 757, "Metrics/MethodLength: Method has too many lines. [11/10]", 571708764], - [106, 21, 293, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 871709580], - [135, 7, 788, "Metrics/AbcSize: Assignment Branch Condition size for `merge` is too high. [<4, 19, 5> 20.05/17]", 467674580], - [135, 7, 788, "Metrics/MethodLength: Method has too many lines. [13/10]", 467674580], - [213, 7, 533, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_matcher` is too high. [<7, 20, 6> 22.02/17]", 1798972396], - [238, 7, 922, "Metrics/MethodLength: Method has too many lines. [25/10]", 1846154069], - [242, 25, 37, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 939456830], - [251, 25, 31, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 1024894473], - [268, 7, 1905, "Metrics/AbcSize: Assignment Branch Condition size for `perform_section_merge` is too high. [<13, 15, 2> 19.95/17]", 2711014340], - [268, 7, 1905, "Metrics/MethodLength: Method has too many lines. [34/10]", 2711014340], - [316, 50, 15, "Lint/UnusedMethodArgument: Unused method argument - `section_context`.", 2872123372], - [334, 7, 690, "Metrics/MethodLength: Method has too many lines. [14/10]", 1807124523], - [367, 7, 1122, "Metrics/AbcSize: Assignment Branch Condition size for `build_merged_content` is too high. [<1, 29, 14> 32.22/17]", 3938410418], - [367, 7, 1122, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_merged_content` is too high. [15/7]", 3938410418], - [367, 7, 1122, "Metrics/MethodLength: Method has too many lines. [18/10]", 3938410418], - [367, 7, 1122, "Metrics/PerceivedComplexity: Perceived complexity for `build_merged_content` is too high. [15/8]", 3938410418], - [397, 7, 596, "Metrics/MethodLength: Method has too many lines. [12/10]", 2602121883], - [397, 32, 144, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1463491208], - [414, 7, 1589, "Metrics/AbcSize: Assignment Branch Condition size for `source_splice_plan_for` is too high. [<6, 18, 9> 21/17]", 2889667289], - [414, 7, 1589, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `source_splice_plan_for` is too high. [9/7]", 2889667289], - [414, 7, 1589, "Metrics/MethodLength: Method has too many lines. [30/10]", 2889667289], - [414, 7, 1589, "Metrics/PerceivedComplexity: Perceived complexity for `source_splice_plan_for` is too high. [9/8]", 2889667289] - ], - "lib/ast/merge/recipe/config.rb:3990762705": [ - [54, 7, 14970, "Metrics/ClassLength: Class has too many lines. [296/100]", 2492031021], - [142, 9, 673, "Metrics/MethodLength: Method has too many lines. [12/10]", 3011978845], - [170, 9, 484, "Metrics/MethodLength: Method has too many lines. [15/10]", 183356432], - [246, 9, 710, "Metrics/AbcSize: Assignment Branch Condition size for `parse_injection` is too high. [<8, 13, 8> 17.23/17]", 641239814], - [246, 9, 710, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_injection` is too high. [9/7]", 641239814], - [246, 9, 710, "Metrics/MethodLength: Method has too many lines. [16/10]", 641239814], - [246, 9, 710, "Metrics/PerceivedComplexity: Perceived complexity for `parse_injection` is too high. [9/8]", 641239814], - [278, 9, 871, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_step` is too high. [8/7]", 3989307721], - [278, 9, 871, "Metrics/MethodLength: Method has too many lines. [20/10]", 3989307721], - [338, 9, 1758, "Metrics/AbcSize: Assignment Branch Condition size for `parse_step_merge_overrides` is too high. [<11, 43, 25> 50.94/17]", 806370438], - [338, 9, 1758, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_step_merge_overrides` is too high. [22/7]", 806370438], - [338, 9, 1758, "Metrics/MethodLength: Method has too many lines. [30/10]", 806370438], - [338, 9, 1758, "Metrics/PerceivedComplexity: Perceived complexity for `parse_step_merge_overrides` is too high. [22/8]", 806370438], - [373, 9, 566, "Metrics/MethodLength: Method has too many lines. [14/10]", 3671206955], - [391, 9, 547, "Metrics/MethodLength: Method has too many lines. [16/10]", 3273587697], - [459, 9, 799, "Metrics/AbcSize: Assignment Branch Condition size for `validate_injection!` is too high. [<2, 15, 12> 19.31/17]", 1665903587], - [459, 9, 799, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_injection!` is too high. [13/7]", 1665903587], - [459, 9, 799, "Metrics/MethodLength: Method has too many lines. [11/10]", 1665903587], - [459, 9, 799, "Metrics/PerceivedComplexity: Perceived complexity for `validate_injection!` is too high. [13/8]", 1665903587] - ], - "lib/ast/merge/recipe/preset.rb:2311326866": [ - [195, 9, 662, "Metrics/MethodLength: Method has too many lines. [12/10]", 1640897447] - ], - "lib/ast/merge/recipe/runner.rb:2243867806": [ - [27, 7, 28612, "Metrics/ClassLength: Class has too many lines. [547/100]", 79000832], - [73, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1411864995], - [77, 23, 136, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1636278032], - [92, 9, 849, "Metrics/MethodLength: Method has too many lines. [14/10]", 3083064345], - [128, 24, 129, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2642826282], - [210, 9, 788, "Metrics/MethodLength: Method has too many lines. [23/10]", 743008161], - [241, 9, 3397, "Metrics/AbcSize: Assignment Branch Condition size for `create_partial_template_merger` is too high. [<3, 52, 16> 54.49/17]", 2086180075], - [241, 9, 3397, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `create_partial_template_merger` is too high. [14/7]", 2086180075], - [241, 9, 3397, "Metrics/MethodLength: Method has too many lines. [63/10]", 2086180075], - [241, 9, 3397, "Metrics/PerceivedComplexity: Perceived complexity for `create_partial_template_merger` is too high. [13/8]", 2086180075], - [250, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2857356312], - [274, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177538], - [312, 9, 2210, "Metrics/AbcSize: Assignment Branch Condition size for `create_smart_merger` is too high. [<1, 39, 7> 39.64/17]", 1694660188], - [312, 9, 2210, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `create_smart_merger` is too high. [8/7]", 1694660188], - [312, 9, 2210, "Metrics/MethodLength: Method has too many lines. [45/10]", 1694660188], - [357, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 195423462], - [370, 9, 1087, "Metrics/MethodLength: Method has too many lines. [24/10]", 3850049530], - [370, 31, 124, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3466458723], - [401, 9, 1008, "Metrics/MethodLength: Method has too many lines. [19/10]", 2010895303], - [401, 25, 143, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2360959504], - [424, 9, 1263, "Metrics/AbcSize: Assignment Branch Condition size for `execute_partial_merge_step` is too high. [<3, 22, 1> 22.23/17]", 2850918453], - [424, 9, 1263, "Metrics/MethodLength: Method has too many lines. [25/10]", 2850918453], - [453, 9, 835, "Metrics/MethodLength: Method has too many lines. [14/10]", 1478843287], - [471, 9, 808, "Metrics/MethodLength: Method has too many lines. [15/10]", 1127254660], - [471, 37, 155, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 838578768], - [491, 9, 1126, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_smart_merge_result` is too high. [<8, 17, 12> 22.29/17]", 1786697339], - [491, 9, 1126, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_smart_merge_result` is too high. [9/7]", 1786697339], - [491, 9, 1126, "Metrics/MethodLength: Method has too many lines. [23/10]", 1786697339], - [491, 9, 1126, "Metrics/PerceivedComplexity: Perceived complexity for `normalize_smart_merge_result` is too high. [11/8]", 1786697339], - [518, 9, 2523, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_script_step_result` is too high. [<5, 40, 32> 51.47/17]", 2162420067], - [518, 9, 2523, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_script_step_result` is too high. [26/7]", 2162420067], - [518, 9, 2523, "Metrics/MethodLength: Method has too many lines. [48/10]", 2162420067], - [518, 9, 2523, "Metrics/PerceivedComplexity: Perceived complexity for `normalize_script_step_result` is too high. [29/8]", 2162420067], - [547, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 93872446], - [556, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 1527250939], - [586, 11, 155, "Style/HashTransformKeys: Prefer `transform_keys` over `each_with_object`.", 837503672], - [591, 9, 698, "Metrics/MethodLength: Method has too many lines. [11/10]", 1116310304], - [635, 9, 2582, "Metrics/AbcSize: Assignment Branch Condition size for `create_result_from_steps` is too high. [<8, 30, 31> 43.87/17]", 2040042265], - [635, 9, 2582, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `create_result_from_steps` is too high. [23/7]", 2040042265], - [635, 9, 2582, "Metrics/MethodLength: Method has too many lines. [60/10]", 2040042265], - [635, 9, 2582, "Metrics/PerceivedComplexity: Perceived complexity for `create_result_from_steps` is too high. [27/8]", 2040042265], - [635, 37, 133, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 789257106], - [649, 42, 40, "Style/SymbolProc: Pass `&:has_anchor` as an argument to `any?` instead of a block.", 4233626321] - ], - "lib/ast/merge/recipe/script_loader.rb:1397873218": [ - [145, 9, 1126, "Metrics/AbcSize: Assignment Branch Condition size for `load_script_file` is too high. [<6, 19, 4> 20.32/17]", 3417625171], - [145, 9, 1126, "Metrics/MethodLength: Method has too many lines. [17/10]", 3417625171] - ], - "lib/ast/merge/rspec/comment_behavior_matrix_adapters.rb:3429217018": [ - [9, 46, 341, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 532439002], - [31, 9, 901, "Metrics/MethodLength: Method has too many lines. [11/10]", 584608092], - [31, 59, 308, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 883491898], - [54, 9, 1269, "Metrics/MethodLength: Method has too many lines. [20/10]", 1021031182], - [65, 51, 6, "Lint/UnusedBlockArgument: Unused block argument - `inline`. If it's necessary, use `_` or `_inline` as an argument name to indicate that it won't be used.", 1605470060], - [69, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 4226982364], - [70, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1440420861] - ], - "lib/ast/merge/rspec/conformance_fixtures.rb:1295759615": [ - [6, 7, 26, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::RSpec::ConformanceFixtures`.", 90066768], - [9, 9, 1432, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_conformance_fixture_support` is too high. [<10, 30, 33> 45.71/17]", 518714108], - [9, 9, 1432, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_conformance_fixture_support` is too high. [33/7]", 518714108], - [9, 9, 1432, "Metrics/MethodLength: Method has too many lines. [25/10]", 518714108], - [9, 9, 1432, "Metrics/PerceivedComplexity: Perceived complexity for `normalize_conformance_fixture_support` is too high. [31/8]", 518714108] - ], - "lib/ast/merge/rspec/dependency_tags_config.rb:3604516304": [ - [30, 1, 2102, "Metrics/BlockLength: Block has too many lines. [26/25]", 113766065] - ], - "lib/ast/merge/rspec/merge_gem_registry.rb:3009576030": [ - [58, 7, 12129, "Metrics/ModuleLength: Module has too many lines. [158/100]", 335549747], - [90, 9, 780, "Metrics/MethodLength: Method has too many lines. [14/10]", 978965737], - [90, 21, 99, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3580433546], - [118, 9, 650, "Metrics/MethodLength: Method has too many lines. [12/10]", 3143160805], - [118, 31, 130, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2575863904], - [143, 9, 823, "Metrics/MethodLength: Method has too many lines. [17/10]", 4033116153], - [200, 9, 765, "Metrics/AbcSize: Assignment Branch Condition size for `register_known_gems` is too high. [<3, 17, 3> 17.52/17]", 1367620151], - [200, 9, 765, "Metrics/MethodLength: Method has too many lines. [17/10]", 1367620151] - ], - "lib/ast/merge/rspec/shared_examples.rb:2878318351": [ - [29, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 330577472] - ], - "lib/ast/merge/rspec/shared_examples/comment_behavior_matrix.rb:3695671858": [ - [36, 1, 27847, "Metrics/BlockLength: Block has too many lines. [540/25]", 3796645407], - [38, 55, 15, "Style/SymbolProc: Pass `&:value` as an argument to `lambda` instead of a block.", 1808354951], - [42, 64, 23, "Style/SymbolProc: Pass `&:statements` as an argument to `lambda` instead of a block.", 277221641], - [69, 3, 4455, "Metrics/BlockLength: Block has too many lines. [82/25]", 3672334777], - [72, 5, 1763, "Metrics/BlockLength: Block has too many lines. [34/25]", 164750821], - [165, 3, 22093, "Metrics/BlockLength: Block has too many lines. [429/25]", 229312375], - [292, 5, 1918, "Metrics/BlockLength: Block has too many lines. [29/25]", 1312741055], - [323, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1902517440], - [325, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 173482512], - [328, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 167607404], - [476, 5, 1605, "Metrics/BlockLength: Block has too many lines. [35/25]", 1943633697], - [677, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1902517440] - ], - "lib/ast/merge/rspec/shared_examples/conflict_resolver_base.rb:624045197": [ - [30, 1, 7893, "Metrics/BlockLength: Block has too many lines. [197/25]", 3450672926], - [37, 3, 1372, "Metrics/BlockLength: Block has too many lines. [33/25]", 3389152504], - [83, 3, 1206, "Metrics/BlockLength: Block has too many lines. [35/25]", 1580202348], - [128, 3, 1177, "Metrics/BlockLength: Block has too many lines. [33/25]", 2178974049], - [215, 3, 2443, "Metrics/BlockLength: Block has too many lines. [51/25]", 2538475273], - [219, 5, 1909, "Metrics/BlockLength: Block has too many lines. [35/25]", 880175101], - [279, 1, 2518, "Metrics/BlockLength: Block has too many lines. [74/25]", 958151448], - [286, 3, 2235, "Metrics/BlockLength: Block has too many lines. [70/25]", 2123260684], - [391, 1, 1317, "Metrics/BlockLength: Block has too many lines. [37/25]", 2321517041], - [439, 1, 1639, "Metrics/BlockLength: Block has too many lines. [37/25]", 276150366] - ], - "lib/ast/merge/rspec/shared_examples/debug_logger.rb:2747003588": [ - [23, 1, 4741, "Metrics/BlockLength: Block has too many lines. [121/25]", 3341338388], - [47, 3, 976, "Metrics/BlockLength: Block has too many lines. [27/25]", 2640321404], - [85, 3, 1452, "Metrics/BlockLength: Block has too many lines. [34/25]", 554663062] - ], - "lib/ast/merge/rspec/shared_examples/feature_profile.rb:4172143324": [ - [30, 1, 4249, "Metrics/BlockLength: Block has too many lines. [53/25]", 3787230403] - ], - "lib/ast/merge/rspec/shared_examples/file_analyzable.rb:2391547213": [ - [44, 1, 6468, "Metrics/BlockLength: Block has too many lines. [145/25]", 3744642916] - ], - "lib/ast/merge/rspec/shared_examples/freeze_node_base.rb:1711126715": [ - [23, 1, 5952, "Metrics/BlockLength: Block has too many lines. [157/25]", 3152271039], - [29, 3, 2836, "Metrics/BlockLength: Block has too many lines. [69/25]", 2082270913], - [115, 3, 1552, "Metrics/BlockLength: Block has too many lines. [46/25]", 4180117745] - ], - "lib/ast/merge/rspec/shared_examples/layout_attachment.rb:4130619694": [ - [30, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 1263574869], - [31, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 4282300883] - ], - "lib/ast/merge/rspec/shared_examples/layout_augmenter.rb:1928277603": [ - [18, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1311107624], - [19, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1311107624] - ], - "lib/ast/merge/rspec/shared_examples/merge_result_base.rb:2962043558": [ - [18, 1, 2330, "Metrics/BlockLength: Block has too many lines. [67/25]", 3496673178], - [53, 3, 1271, "Metrics/BlockLength: Block has too many lines. [42/25]", 2278976858] - ], - "lib/ast/merge/rspec/shared_examples/merger_config.rb:2413785902": [ - [18, 1, 8240, "Metrics/BlockLength: Block has too many lines. [193/25]", 3665443345], - [57, 3, 1628, "Metrics/BlockLength: Block has too many lines. [32/25]", 7828299], - [98, 3, 1266, "Metrics/BlockLength: Block has too many lines. [28/25]", 317929439], - [159, 3, 1740, "Metrics/BlockLength: Block has too many lines. [42/25]", 1736487820], - [217, 3, 1373, "Metrics/BlockLength: Block has too many lines. [30/25]", 442933563] - ], - "lib/ast/merge/rspec/shared_examples/recipe_preset_contract.rb:1495545061": [ - [7, 1, 2558, "Metrics/BlockLength: Block has too many lines. [51/25]", 4091815632] - ], - "lib/ast/merge/rspec/shared_examples/removal_mode_compliance.rb:3645548199": [ - [24, 1, 1860, "Metrics/BlockLength: Block has too many lines. [33/25]", 1115825136] - ], - "lib/ast/merge/rspec/shared_examples/reproducible_merge.rb:2276592459": [ - [51, 1, 2030, "Metrics/BlockLength: Block has too many lines. [52/25]", 563553381] - ], - "lib/ast/merge/rspec/shared_examples/reproducible_partial_merge.rb:524436129": [ - [3, 1, 2321, "Metrics/BlockLength: Block has too many lines. [44/25]", 3206099540] - ], - "lib/ast/merge/rspec/shared_examples/runtime_debug_contract.rb:4244040583": [ - [8, 1, 2808, "Metrics/BlockLength: Block has too many lines. [48/25]", 3274492878] - ], - "lib/ast/merge/rspec/shared_examples/unresolved_helper_contract.rb:2916431464": [ - [9, 1, 5998, "Metrics/BlockLength: Block has too many lines. [126/25]", 4174562424], - [94, 3, 1515, "Metrics/BlockLength: Block has too many lines. [32/25]", 1928238376] - ], - "lib/ast/merge/rspec/shared_examples/unresolved_review_state_transport_contract.rb:3368966854": [ - [14, 1, 3386, "Metrics/BlockLength: Block has too many lines. [68/25]", 2910343214], - [65, 3, 317, "Metrics/MethodLength: Method has too many lines. [12/10]", 2653897690] - ], - "lib/ast/merge/rspec/shared_examples/unresolved_runtime_contract.rb:1424234700": [ - [10, 1, 2652, "Metrics/BlockLength: Block has too many lines. [42/25]", 960283638], - [31, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2892620242], - [46, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193437756] - ], - "lib/ast/merge/rspec/shared_examples/unresolved_runtime_debug_contract.rb:2897026147": [ - [25, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2418171787], - [26, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 235635831] - ], - "lib/ast/merge/ruleset/config.rb:4242726919": [ - [7, 7, 3664, "Metrics/ClassLength: Class has too many lines. [101/100]", 1968929597], - [36, 9, 933, "Metrics/MethodLength: Method has too many lines. [15/10]", 3334511209], - [36, 23, 319, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [15/5]", 1652945408], - [65, 9, 515, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 18, 3> 18.25/17]", 2614325513], - [65, 9, 515, "Metrics/MethodLength: Method has too many lines. [14/10]", 2614325513] - ], - "lib/ast/merge/ruleset/feature_profile.rb:3980745364": [ - [12, 7, 6054, "Metrics/ClassLength: Class has too many lines. [155/100]", 2818730231], - [29, 9, 1351, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<17, 18, 7> 25.73/17]", 2248702332], - [29, 9, 1351, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `initialize` is too high. [8/7]", 2248702332], - [29, 9, 1351, "Metrics/MethodLength: Method has too many lines. [17/10]", 2248702332], - [29, 23, 422, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 1415781648], - [138, 9, 1509, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 36, 6> 36.5/17]", 3793816437], - [138, 9, 1509, "Metrics/MethodLength: Method has too many lines. [31/10]", 3793816437] - ], - "lib/ast/merge/ruleset/parser.rb:698282871": [ - [7, 7, 9396, "Metrics/ClassLength: Class has too many lines. [199/100]", 1305123525], - [43, 9, 473, "Metrics/AbcSize: Assignment Branch Condition size for `parse` is too high. [<0, 17, 2> 17.12/17]", 1400394586], - [43, 9, 473, "Metrics/MethodLength: Method has too many lines. [12/10]", 1400394586], - [71, 9, 1053, "Metrics/MethodLength: Method has too many lines. [24/10]", 1569959910], - [101, 9, 1123, "Metrics/AbcSize: Assignment Branch Condition size for `parse_single_value_directive!` is too high. [<7, 13, 10> 17.83/17]", 706129883], - [101, 9, 1123, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_single_value_directive!` is too high. [8/7]", 706129883], - [101, 9, 1123, "Metrics/MethodLength: Method has too many lines. [24/10]", 706129883], - [170, 9, 605, "Metrics/MethodLength: Method has too many lines. [11/10]", 336127382], - [186, 9, 687, "Metrics/MethodLength: Method has too many lines. [11/10]", 2962844982] - ], - "lib/ast/merge/ruleset/profile_vocabulary.rb:2359837647": [ - [7, 7, 3956, "Metrics/ModuleLength: Module has too many lines. [107/100]", 1680256705] - ], - "lib/ast/merge/ruleset/runtime_declaration.rb:1016848190": [ - [18, 9, 819, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<11, 13, 5> 17.75/17]", 4043304883], - [18, 9, 819, "Metrics/MethodLength: Method has too many lines. [11/10]", 4043304883], - [18, 23, 240, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 3868000276], - [49, 9, 551, "Metrics/MethodLength: Method has too many lines. [13/10]", 448215861] - ], - "lib/ast/merge/ruleset/runtime_translator.rb:3255492631": [ - [9, 11, 816, "Metrics/MethodLength: Method has too many lines. [19/10]", 225301385], - [31, 11, 986, "Metrics/AbcSize: Assignment Branch Condition size for `feature_profile` is too high. [<1, 17, 0> 17.03/17]", 1395467476], - [31, 11, 986, "Metrics/MethodLength: Method has too many lines. [19/10]", 1395467476] - ], - "lib/ast/merge/ruleset/support_style_resolver.rb:508975884": [ - [9, 11, 864, "Metrics/MethodLength: Method has too many lines. [22/10]", 3902551296] - ], - "lib/ast/merge/runtime/child_result.rb:4083710804": [ - [16, 9, 698, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<7, 16, 2> 17.58/17]", 2208366179], - [16, 23, 227, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 3688358290], - [38, 9, 584, "Metrics/MethodLength: Method has too many lines. [11/10]", 3113479157], - [55, 11, 106, "Style/HashTransformKeys: Prefer `transform_keys` over `each_with_object`.", 4262612225] - ], - "lib/ast/merge/runtime/delegate.rb:3607371286": [ - [17, 23, 285, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 2793452069] - ], - "lib/ast/merge/runtime/diagnostic.rb:805162185": [ - [10, 23, 72, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1875462867] - ], - "lib/ast/merge/runtime/operation.rb:1030261783": [ - [20, 9, 767, "Metrics/MethodLength: Method has too many lines. [11/10]", 2728174753], - [20, 23, 278, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 694444911], - [100, 9, 617, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<2, 24, 6> 24.82/17]", 1175382849], - [100, 9, 617, "Metrics/MethodLength: Method has too many lines. [11/10]", 1175382849] - ], - "lib/ast/merge/runtime/resolution_case.rb:250040454": [ - [8, 9, 707, "Metrics/AbcSize: Assignment Branch Condition size for `from_h` is too high. [<1, 19, 6> 19.95/17]", 2592154170], - [29, 23, 189, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 818714714], - [81, 11, 111, "Style/HashTransformKeys: Prefer `transform_keys` over `each_with_object`.", 2712537644] - ], - "lib/ast/merge/runtime/root_session_support.rb:1917388966": [ - [10, 9, 2153, "Metrics/AbcSize: Assignment Branch Condition size for `start_runtime_root_session!` is too high. [<5, 20, 3> 20.83/17]", 1888056651], - [10, 9, 2153, "Metrics/MethodLength: Method has too many lines. [41/10]", 1888056651], - [10, 40, 421, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 2297301282], - [60, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2312419928], - [68, 9, 771, "Metrics/MethodLength: Method has too many lines. [13/10]", 1787620786], - [68, 43, 191, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3635875424] - ], - "lib/ast/merge/runtime/session.rb:628419040": [ - [66, 9, 1203, "Metrics/AbcSize: Assignment Branch Condition size for `summary` is too high. [<5, 43, 13> 45.2/17]", 550888870], - [66, 9, 1203, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `summary` is too high. [14/7]", 550888870], - [66, 9, 1203, "Metrics/MethodLength: Method has too many lines. [20/10]", 550888870], - [66, 9, 1203, "Metrics/PerceivedComplexity: Perceived complexity for `summary` is too high. [14/8]", 550888870] - ], - "lib/ast/merge/runtime/surface.rb:3684795905": [ - [17, 23, 230, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 469229117], - [44, 9, 418, "Metrics/MethodLength: Method has too many lines. [11/10]", 998969973] - ], - "lib/ast/merge/section_typing.rb:4261989256": [ - [112, 9, 710, "Metrics/MethodLength: Method has too many lines. [15/10]", 3600335459], - [176, 9, 67, "Lint/MissingSuper: Call `super` to initialize state of the parent class.", 4077537758], - [216, 9, 85, "Lint/MissingSuper: Call `super` to initialize state of the parent class.", 3648782014], - [245, 9, 1446, "Metrics/AbcSize: Assignment Branch Condition size for `merge_sections` is too high. [<13, 20, 12> 26.7/17]", 525095633], - [245, 9, 1446, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_sections` is too high. [12/7]", 525095633], - [245, 9, 1446, "Metrics/MethodLength: Method has too many lines. [28/10]", 525095633], - [245, 9, 1446, "Metrics/PerceivedComplexity: Perceived complexity for `merge_sections` is too high. [13/8]", 525095633] - ], - "lib/ast/merge/smart_merger_base.rb:4189972287": [ - [109, 5, 15324, "Metrics/ClassLength: Class has too many lines. [172/100]", 3547407870], - [214, 7, 1974, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<20, 14, 5> 24.92/17]", 2211610736], - [214, 7, 1974, "Metrics/MethodLength: Method has too many lines. [23/10]", 2211610736], - [214, 21, 443, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [15/5]", 1530523783], - [424, 7, 1312, "Metrics/AbcSize: Assignment Branch Condition size for `parse_and_analyze` is too high. [<7, 25, 11> 28.2/17]", 1640248187], - [424, 7, 1312, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_and_analyze` is too high. [10/7]", 1640248187], - [424, 7, 1312, "Metrics/MethodLength: Method has too many lines. [15/10]", 1640248187], - [424, 7, 1312, "Metrics/PerceivedComplexity: Perceived complexity for `parse_and_analyze` is too high. [10/8]", 1640248187], - [517, 12, 52, "Style/NumericPredicate: Use `result_class.instance_method(:initialize).arity.zero?` instead of `result_class.instance_method(:initialize).arity == 0`.", 1312375552] - ], - "lib/ast/merge/structural_edit/boundary.rb:2838060197": [ - [20, 23, 93, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3901214537], - [41, 38, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [51, 38, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [60, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087440865] - ], - "lib/ast/merge/structural_edit/boundary_support.rb:2036464761": [ - [31, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861061], - [32, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 97596930] - ], - "lib/ast/merge/structural_edit/plan_set.rb:538463647": [ - [116, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 2855200692] - ], - "lib/ast/merge/structural_edit/rehome_plan.rb:2152178780": [ - [23, 23, 123, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3433617242], - [100, 9, 519, "Metrics/MethodLength: Method has too many lines. [11/10]", 318006380], - [136, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 2367140872] - ], - "lib/ast/merge/structural_edit/remove_plan.rb:1189569486": [ - [11, 7, 9717, "Metrics/ClassLength: Class has too many lines. [160/100]", 3652701475], - [25, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861091], - [27, 9, 1409, "Metrics/MethodLength: Method has too many lines. [22/10]", 3344870777], - [27, 23, 255, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 3970946607], - [28, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 1637059282], - [36, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859104], - [196, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 1617827253], - [224, 9, 1032, "Metrics/MethodLength: Method has too many lines. [20/10]", 968444047] - ], - "lib/ast/merge/structural_edit/remove_plan_support.rb:877461974": [ - [9, 9, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631], - [19, 9, 1429, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_remove_plan` is too high. [8/7]", 4091314919], - [19, 9, 1429, "Metrics/MethodLength: Method has too many lines. [32/10]", 4091314919] - ], - "lib/ast/merge/structural_edit/splice_plan.rb:2675806114": [ - [39, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1683893295], - [42, 23, 203, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3653221702], - [113, 9, 517, "Metrics/MethodLength: Method has too many lines. [11/10]", 634912361] - ], - "lib/ast/merge/structured_emitter_provenance_support.rb:445323365": [ - [5, 5, 41, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::StructuredEmitterProvenanceSupport`.", 3548518830] - ], - "lib/ast/merge/structured_review_apply_support.rb:3649736380": [ - [5, 5, 35, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::StructuredReviewApplySupport`.", 1282380463], - [22, 7, 782, "Metrics/AbcSize: Assignment Branch Condition size for `current_output_span_for` is too high. [<6, 19, 11> 22.76/17]", 4137750179], - [22, 7, 782, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `current_output_span_for` is too high. [8/7]", 4137750179], - [22, 7, 782, "Metrics/MethodLength: Method has too many lines. [14/10]", 4137750179], - [42, 7, 595, "Metrics/MethodLength: Method has too many lines. [12/10]", 2080934521], - [60, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3151172498] - ], - "lib/ast/merge/text/conflict_resolver.rb:989169286": [ - [19, 7, 9182, "Metrics/ClassLength: Class has too many lines. [159/100]", 1070563745], - [28, 23, 211, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2639535499], - [53, 9, 2507, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_batch` is too high. [<15, 34, 5> 37.5/17]", 825130797], - [53, 9, 2507, "Metrics/MethodLength: Method has too many lines. [44/10]", 825130797], - [196, 9, 2458, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_matched_pair` is too high. [<2, 30, 11> 32.02/17]", 4037214978], - [196, 9, 2458, "Metrics/MethodLength: Method has too many lines. [46/10]", 4037214978] - ], - "lib/ast/merge/text/file_analysis.rb:1530312707": [ - [106, 9, 1484, "Metrics/AbcSize: Assignment Branch Condition size for `parse_statements` is too high. [<11, 15, 6> 19.54/17]", 1858083071], - [106, 9, 1484, "Metrics/MethodLength: Method has too many lines. [34/10]", 1858083071], - [160, 9, 449, "Metrics/MethodLength: Method has too many lines. [11/10]", 1902035813] - ], - "lib/ast/merge/text/line_node.rb:3385927013": [ - [145, 9, 699, "Metrics/MethodLength: Method has too many lines. [17/10]", 2201872249] - ], - "lib/ast/merge/text/section_splitter.rb:129704488": [ - [141, 9, 1442, "Metrics/AbcSize: Assignment Branch Condition size for `merge_section_lists` is too high. [<13, 20, 6> 24.6/17]", 3551729170], - [141, 9, 1442, "Metrics/MethodLength: Method has too many lines. [23/10]", 3551729170], - [322, 9, 1767, "Metrics/AbcSize: Assignment Branch Condition size for `split` is too high. [<11, 29, 10> 32.59/17]", 2207922758], - [322, 9, 1767, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split` is too high. [10/7]", 2207922758], - [322, 9, 1767, "Metrics/MethodLength: Method has too many lines. [46/10]", 2207922758], - [322, 9, 1767, "Metrics/PerceivedComplexity: Perceived complexity for `split` is too high. [13/8]", 2207922758], - [328, 11, 1019, "Metrics/BlockLength: Block has too many lines. [26/25]", 1561634792] - ], - "lib/ast/merge/text/smart_merger.rb:2405807903": [ - [67, 9, 831, "Metrics/MethodLength: Method has too many lines. [12/10]", 584426022], - [67, 23, 350, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 3074172637] - ], - "lib/ast/merge/trailing_groups/alignment_sort.rb:2593404330": [ - [40, 9, 513, "Metrics/MethodLength: Method has too many lines. [12/10]", 89360683] - ], - "lib/ast/merge/trailing_groups/core.rb:4231959665": [ - [61, 9, 812, "Metrics/MethodLength: Method has too many lines. [17/10]", 1777526069], - [101, 9, 998, "Metrics/AbcSize: Assignment Branch Condition size for `flush_ready_trailing_groups` is too high. [<8, 18, 15> 24.76/17]", 2397698441], - [101, 9, 998, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `flush_ready_trailing_groups` is too high. [13/7]", 2397698441], - [101, 9, 998, "Metrics/MethodLength: Method has too many lines. [17/10]", 2397698441], - [101, 9, 998, "Metrics/PerceivedComplexity: Perceived complexity for `flush_ready_trailing_groups` is too high. [13/8]", 2397698441] - ], - "lib/ast/merge/trailing_groups/dest_iterate.rb:3897205087": [ - [69, 9, 751, "Metrics/MethodLength: Method has too many lines. [12/10]", 3915657972], - [69, 47, 199, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2545849044] - ], - "lib/ast/merge/unresolved_support.rb:2881272494": [ - [7, 5, 24, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::UnresolvedSupport`.", 990281691], - [7, 5, 4392, "Metrics/ModuleLength: Module has too many lines. [116/100]", 3475162940], - [32, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [67, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [85, 7, 1038, "Metrics/MethodLength: Method has too many lines. [14/10]", 3139619197], - [85, 40, 338, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 71164914] - ], - "spec/ast/merge/ast_node_spec.rb:1362065144": [ - [3, 1, 8199, "Metrics/BlockLength: Block has too many lines. [254/25]", 1649868231], - [18, 3, 1030, "Metrics/BlockLength: Block has too many lines. [33/25]", 1409835577] - ], - "spec/ast/merge/block_directive_spec.rb:2305756581": [ - [3, 1, 5181, "Metrics/BlockLength: Block has too many lines. [138/25]", 1887900896], - [128, 3, 1391, "Metrics/BlockLength: Block has too many lines. [39/25]", 3626371694] - ], - "spec/ast/merge/comment/attachment_spec.rb:2571833836": [ - [3, 1, 5536, "Metrics/BlockLength: Block has too many lines. [150/25]", 1841571757], - [93, 3, 1639, "Metrics/BlockLength: Block has too many lines. [37/25]", 212730671] - ], - "spec/ast/merge/comment/augmenter_spec.rb:4266625483": [ - [3, 1, 9141, "Metrics/BlockLength: Block has too many lines. [212/25]", 530365996], - [16, 3, 6849, "Metrics/BlockLength: Block has too many lines. [154/25]", 503152628], - [200, 3, 1244, "Metrics/BlockLength: Block has too many lines. [33/25]", 3565041107] - ], - "spec/ast/merge/comment/block_spec.rb:4138473890": [ - [3, 1, 9021, "Metrics/BlockLength: Block has too many lines. [250/25]", 1617505173], - [8, 3, 1115, "Metrics/BlockLength: Block has too many lines. [27/25]", 2958989619], - [93, 3, 1127, "Metrics/BlockLength: Block has too many lines. [33/25]", 196340527], - [123, 45, 16, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 155572628], - [159, 3, 1432, "Metrics/BlockLength: Block has too many lines. [35/25]", 281400319] - ], - "spec/ast/merge/comment/c_style_tracker_base_spec.rb:3154319400": [ - [3, 1, 5816, "Metrics/BlockLength: Block has too many lines. [133/25]", 680831933], - [100, 3, 1450, "Metrics/BlockLength: Block has too many lines. [35/25]", 4153882185] - ], - "spec/ast/merge/comment/capability_spec.rb:2763521225": [ - [3, 1, 3522, "Metrics/BlockLength: Block has too many lines. [89/25]", 1487980773], - [4, 3, 1954, "Metrics/BlockLength: Block has too many lines. [41/25]", 160187362] - ], - "spec/ast/merge/comment/empty_spec.rb:1801324640": [ - [3, 1, 2584, "Metrics/BlockLength: Block has too many lines. [70/25]", 270179899], - [4, 3, 1047, "Metrics/BlockLength: Block has too many lines. [27/25]", 3056449816] - ], - "spec/ast/merge/comment/hash_tracker_base_spec.rb:3624528747": [ - [3, 1, 9653, "Metrics/BlockLength: Block has too many lines. [271/25]", 3748659406], - [8, 3, 1210, "Metrics/BlockLength: Block has too many lines. [37/25]", 2566766302], - [21, 7, 872, "Metrics/AbcSize: Assignment Branch Condition size for `extract_comments` is too high. [<7, 24, 5> 25.5/17]", 1213080161], - [21, 7, 872, "Metrics/MethodLength: Method has too many lines. [25/10]", 1213080161], - [275, 3, 1171, "Metrics/BlockLength: Block has too many lines. [29/25]", 1425466742] - ], - "spec/ast/merge/comment/line_spec.rb:1487829548": [ - [3, 1, 5291, "Metrics/BlockLength: Block has too many lines. [128/25]", 587604747], - [6, 3, 1573, "Metrics/BlockLength: Block has too many lines. [37/25]", 4105920006] - ], - "spec/ast/merge/comment/parser_spec.rb:2443973508": [ - [3, 1, 9855, "Metrics/BlockLength: Block has too many lines. [237/25]", 404174977], - [4, 3, 1013, "Metrics/BlockLength: Block has too many lines. [26/25]", 182655397], - [38, 3, 1282, "Metrics/BlockLength: Block has too many lines. [28/25]", 2303702609] - ], - "spec/ast/merge/comment/quoted_hash_line_parser_spec.rb:3795390831": [ - [3, 1, 1810, "Metrics/BlockLength: Block has too many lines. [44/25]", 2575838586], - [6, 3, 1700, "Metrics/BlockLength: Block has too many lines. [41/25]", 1553834548] - ], - "spec/ast/merge/comment/region_merge_policy_spec.rb:4175996936": [ - [3, 1, 3618, "Metrics/BlockLength: Block has too many lines. [75/25]", 4006378358], - [11, 3, 2752, "Metrics/BlockLength: Block has too many lines. [52/25]", 494211987] - ], - "spec/ast/merge/comment/region_spec.rb:2674736508": [ - [3, 1, 4033, "Metrics/BlockLength: Block has too many lines. [91/25]", 1828104331] - ], - "spec/ast/merge/comment/style_spec.rb:1875195890": [ - [3, 1, 4040, "Metrics/BlockLength: Block has too many lines. [101/25]", 2759361650] - ], - "spec/ast/merge/comment/support_style_spec.rb:1350169032": [ - [3, 1, 1577, "Metrics/BlockLength: Block has too many lines. [39/25]", 3414039011] - ], - "spec/ast/merge/comment/tracked_hash_adapter_spec.rb:1256807736": [ - [3, 1, 4482, "Metrics/BlockLength: Block has too many lines. [97/25]", 264417763], - [4, 3, 3101, "Metrics/BlockLength: Block has too many lines. [63/25]", 1050939978], - [81, 3, 1313, "Metrics/BlockLength: Block has too many lines. [30/25]", 515655104] - ], - "spec/ast/merge/comment_spec.rb:81945459": [ - [3, 1, 15888, "Metrics/BlockLength: Block has too many lines. [384/25]", 2229554982], - [4, 3, 3957, "Metrics/BlockLength: Block has too many lines. [84/25]", 660667217], - [5, 5, 1187, "Metrics/BlockLength: Block has too many lines. [26/25]", 241562105], - [105, 3, 1371, "Metrics/BlockLength: Block has too many lines. [30/25]", 1901983597], - [159, 3, 1296, "Metrics/BlockLength: Block has too many lines. [30/25]", 1749880380], - [239, 3, 1151, "Metrics/BlockLength: Block has too many lines. [28/25]", 183967322], - [272, 3, 2004, "Metrics/BlockLength: Block has too many lines. [45/25]", 2594323837], - [349, 3, 3220, "Metrics/BlockLength: Block has too many lines. [83/25]", 790417809], - [350, 5, 2347, "Metrics/BlockLength: Block has too many lines. [60/25]", 4016801881] - ], - "spec/ast/merge/composite_match_refiner_spec.rb:2888297870": [ - [3, 1, 6152, "Metrics/BlockLength: Block has too many lines. [143/25]", 3308692548], - [55, 3, 4118, "Metrics/BlockLength: Block has too many lines. [87/25]", 1405655464] - ], - "spec/ast/merge/conflict_resolver_base_spec.rb:3331938447": [ - [5, 1, 20643, "Metrics/BlockLength: Block has too many lines. [516/25]", 3129196558], - [14, 59, 14, "Lint/UnusedMethodArgument: Unused method argument - `template_index`.", 1809801172], - [14, 76, 10, "Lint/UnusedMethodArgument: Unused method argument - `dest_index`.", 2703999490], - [47, 61, 14, "Lint/UnusedMethodArgument: Unused method argument - `template_index`. You can also write as `resolve_node_pair(*)` if you want the method to accept any arguments but don't care about them.", 1809801172], - [47, 78, 10, "Lint/UnusedMethodArgument: Unused method argument - `dest_index`. You can also write as `resolve_node_pair(*)` if you want the method to accept any arguments but don't care about them.", 2703999490], - [105, 3, 17203, "Metrics/BlockLength: Block has too many lines. [425/25]", 1114912980], - [154, 5, 1797, "Metrics/BlockLength: Block has too many lines. [37/25]", 515146940], - [203, 5, 1373, "Metrics/BlockLength: Block has too many lines. [32/25]", 603210832], - [292, 5, 2874, "Metrics/BlockLength: Block has too many lines. [77/25]", 3918129775], - [341, 7, 1292, "Metrics/BlockLength: Block has too many lines. [34/25]", 1769555944], - [402, 5, 1857, "Metrics/BlockLength: Block has too many lines. [44/25]", 1516406612], - [456, 5, 1209, "Metrics/BlockLength: Block has too many lines. [31/25]", 430489898], - [514, 5, 2021, "Metrics/BlockLength: Block has too many lines. [37/25]", 144128170], - [515, 7, 1953, "Metrics/BlockLength: Block has too many lines. [35/25]", 1574966248], - [567, 5, 1500, "Metrics/BlockLength: Block has too many lines. [40/25]", 2509466150] - ], - "spec/ast/merge/content_match_refiner_spec.rb:4058001158": [ - [3, 1, 14348, "Metrics/BlockLength: Block has too many lines. [318/25]", 1171164704], - [25, 3, 1238, "Metrics/BlockLength: Block has too many lines. [29/25]", 2139810386], - [63, 3, 4077, "Metrics/BlockLength: Block has too many lines. [95/25]", 3471153375], - [325, 3, 2213, "Metrics/BlockLength: Block has too many lines. [37/25]", 3370370915] - ], - "spec/ast/merge/debug_logger_spec.rb:429510168": [ - [3, 1, 17306, "Metrics/BlockLength: Block has too many lines. [358/25]", 2287792973], - [251, 3, 1598, "Metrics/BlockLength: Block has too many lines. [27/25]", 3227542816], - [358, 3, 5118, "Metrics/BlockLength: Block has too many lines. [77/25]", 1759761803] - ], - "spec/ast/merge/detector/base_spec.rb:4157102211": [ - [3, 1, 3172, "Metrics/BlockLength: Block has too many lines. [100/25]", 3745104028], - [11, 7, 498, "Metrics/MethodLength: Method has too many lines. [13/10]", 3178368155], - [49, 3, 900, "Metrics/BlockLength: Block has too many lines. [28/25]", 2333048204] - ], - "spec/ast/merge/detector/fenced_code_block_spec.rb:495797689": [ - [3, 1, 11589, "Metrics/BlockLength: Block has too many lines. [363/25]", 3764545134], - [38, 3, 4467, "Metrics/BlockLength: Block has too many lines. [150/25]", 1597401000], - [41, 5, 1077, "Metrics/BlockLength: Block has too many lines. [31/25]", 2269642514], - [115, 5, 848, "Metrics/BlockLength: Block has too many lines. [27/25]", 1704866975], - [220, 3, 4815, "Metrics/BlockLength: Block has too many lines. [146/25]", 3797214474] - ], - "spec/ast/merge/detector/mergeable_spec.rb:1307688846": [ - [3, 1, 23175, "Metrics/BlockLength: Block has too many lines. [654/25]", 2932391114], - [77, 3, 2079, "Metrics/BlockLength: Block has too many lines. [53/25]", 1093085347], - [177, 3, 2217, "Metrics/BlockLength: Block has too many lines. [69/25]", 926985871], - [188, 5, 948, "Metrics/BlockLength: Block has too many lines. [26/25]", 4186135901], - [225, 5, 898, "Metrics/BlockLength: Block has too many lines. [31/25]", 513446836], - [266, 3, 1168, "Metrics/BlockLength: Block has too many lines. [29/25]", 774699411], - [304, 3, 1188, "Metrics/BlockLength: Block has too many lines. [27/25]", 4282853126], - [339, 3, 918, "Metrics/BlockLength: Block has too many lines. [28/25]", 1759590109], - [372, 3, 870, "Metrics/BlockLength: Block has too many lines. [28/25]", 131542026], - [410, 3, 3768, "Metrics/BlockLength: Block has too many lines. [111/25]", 181819560], - [483, 5, 1536, "Metrics/BlockLength: Block has too many lines. [47/25]", 385085357], - [540, 3, 1891, "Metrics/BlockLength: Block has too many lines. [52/25]", 602757329], - [664, 3, 1927, "Metrics/BlockLength: Block has too many lines. [56/25]", 48062261], - [691, 5, 1146, "Metrics/BlockLength: Block has too many lines. [31/25]", 1961728737], - [721, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3104497040], - [729, 3, 1625, "Metrics/BlockLength: Block has too many lines. [46/25]", 1570579215] - ], - "spec/ast/merge/detector/region_spec.rb:594725562": [ - [3, 1, 8128, "Metrics/BlockLength: Block has too many lines. [290/25]", 1984713692], - [4, 3, 806, "Metrics/BlockLength: Block has too many lines. [28/25]", 1515087192], - [58, 3, 1236, "Metrics/BlockLength: Block has too many lines. [45/25]", 2464968707], - [128, 3, 1063, "Metrics/BlockLength: Block has too many lines. [33/25]", 239148700], - [250, 3, 2010, "Metrics/BlockLength: Block has too many lines. [76/25]", 2595033382] - ], - "spec/ast/merge/detector/toml_frontmatter_spec.rb:1135160129": [ - [3, 1, 6717, "Metrics/BlockLength: Block has too many lines. [218/25]", 2273975625], - [12, 3, 5534, "Metrics/BlockLength: Block has too many lines. [187/25]", 538920673], - [13, 5, 1456, "Metrics/BlockLength: Block has too many lines. [38/25]", 3113759139] - ], - "spec/ast/merge/detector/yaml_frontmatter_spec.rb:2467934365": [ - [3, 1, 6702, "Metrics/BlockLength: Block has too many lines. [213/25]", 3083039982], - [12, 3, 5056, "Metrics/BlockLength: Block has too many lines. [170/25]", 1889948780], - [13, 5, 1438, "Metrics/BlockLength: Block has too many lines. [38/25]", 1736912391], - [219, 3, 1396, "Metrics/BlockLength: Block has too many lines. [33/25]", 2446467851] - ], - "spec/ast/merge/diff_mapper_base_spec.rb:1771546518": [ - [5, 1, 8521, "Metrics/BlockLength: Block has too many lines. [248/25]", 1057580573], - [22, 9, 44, "Style/InverseMethods: Use `reject` instead of inverting `select`.", 3063843489], - [46, 3, 3878, "Metrics/BlockLength: Block has too many lines. [116/25]", 2874032080], - [47, 5, 1938, "Metrics/BlockLength: Block has too many lines. [48/25]", 1904497583], - [191, 3, 1488, "Metrics/BlockLength: Block has too many lines. [43/25]", 1632956840] - ], - "spec/ast/merge/emitter_base_spec.rb:4197360291": [ - [3, 1, 11215, "Metrics/BlockLength: Block has too many lines. [282/25]", 4254840781], - [30, 3, 4393, "Metrics/BlockLength: Block has too many lines. [102/25]", 3992142376], - [134, 58, 12, "Lint/UnusedMethodArgument: Unused method argument - `current_line`. You can also write as `inline_comment_region_target_column(*)` if you want the method to accept any arguments but don't care about them.", 2091263933], - [138, 44, 6, "Lint/UnusedMethodArgument: Unused method argument - `region`.", 2124512157], - [159, 3, 1815, "Metrics/BlockLength: Block has too many lines. [39/25]", 719023387], - [206, 3, 2233, "Metrics/BlockLength: Block has too many lines. [62/25]", 3754339775], - [312, 3, 1059, "Metrics/BlockLength: Block has too many lines. [26/25]", 375007123] - ], - "spec/ast/merge/fictive_language_harness_spec.rb:1179155480": [ - [6, 1, 6693, "Metrics/BlockLength: Block has too many lines. [143/25]", 245088433], - [7, 3, 1968, "Metrics/BlockLength: Block has too many lines. [36/25]", 4161580169], - [58, 3, 1230, "Metrics/BlockLength: Block has too many lines. [34/25]", 990452676], - [103, 3, 2668, "Metrics/BlockLength: Block has too many lines. [51/25]", 1755027956] - ], - "spec/ast/merge/file_aligner_base_spec.rb:610089304": [ - [5, 1, 7287, "Metrics/BlockLength: Block has too many lines. [164/25]", 597898988], - [6, 3, 1237, "Metrics/BlockLength: Block has too many lines. [37/25]", 1284505259], - [86, 3, 5087, "Metrics/BlockLength: Block has too many lines. [84/25]", 119873771], - [94, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3749416415] - ], - "spec/ast/merge/file_analyzable_spec.rb:3816965829": [ - [3, 1, 12458, "Metrics/BlockLength: Block has too many lines. [272/25]", 216138965], - [25, 3, 9603, "Metrics/BlockLength: Block has too many lines. [202/25]", 2508188172], - [297, 3, 1214, "Metrics/BlockLength: Block has too many lines. [30/25]", 777182624] - ], - "spec/ast/merge/freezable_spec.rb:559280324": [ - [5, 1, 5033, "Metrics/BlockLength: Block has too many lines. [123/25]", 3070666859], - [6, 3, 1199, "Metrics/BlockLength: Block has too many lines. [34/25]", 4058875636], - [66, 3, 1530, "Metrics/BlockLength: Block has too many lines. [31/25]", 1670675428] - ], - "spec/ast/merge/freeze_node_base_spec.rb:2962962931": [ - [3, 1, 21887, "Metrics/BlockLength: Block has too many lines. [560/25]", 567315021], - [48, 3, 1369, "Metrics/BlockLength: Block has too many lines. [38/25]", 3363160391], - [131, 3, 2739, "Metrics/BlockLength: Block has too many lines. [56/25]", 2008289622], - [205, 3, 1586, "Metrics/BlockLength: Block has too many lines. [35/25]", 4179606047], - [251, 3, 977, "Metrics/BlockLength: Block has too many lines. [26/25]", 1240612851], - [287, 3, 1130, "Metrics/BlockLength: Block has too many lines. [28/25]", 2511265379], - [322, 3, 5029, "Metrics/BlockLength: Block has too many lines. [126/25]", 739537566], - [598, 3, 3055, "Metrics/BlockLength: Block has too many lines. [81/25]", 145217296] - ], - "spec/ast/merge/healer_spec.rb:877829793": [ - [3, 1, 4896, "Metrics/BlockLength: Block has too many lines. [148/25]", 1074378773], - [19, 3, 1333, "Metrics/BlockLength: Block has too many lines. [38/25]", 2940878263], - [24, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193432399], - [61, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085379023], - [67, 3, 2985, "Metrics/BlockLength: Block has too many lines. [93/25]", 4032786576] - ], - "spec/ast/merge/jaccard_similarity_spec.rb:3984307047": [ - [3, 1, 2659, "Metrics/BlockLength: Block has too many lines. [71/25]", 1122516612], - [6, 3, 1484, "Metrics/BlockLength: Block has too many lines. [38/25]", 3367914637], - [55, 3, 1090, "Metrics/BlockLength: Block has too many lines. [28/25]", 2629339264] - ], - "spec/ast/merge/key_path_partial_template_merger_base_spec.rb:2189485360": [ - [5, 1, 5955, "Metrics/BlockLength: Block has too many lines. [138/25]", 91542958], - [35, 3, 1217, "Metrics/BlockLength: Block has too many lines. [33/25]", 2663081123], - [97, 3, 3019, "Metrics/BlockLength: Block has too many lines. [54/25]", 1411952192] - ], - "spec/ast/merge/layout/attachment_spec.rb:3814294426": [ - [3, 1, 1799, "Metrics/BlockLength: Block has too many lines. [34/25]", 1283153367] - ], - "spec/ast/merge/layout/augmenter_spec.rb:3633045915": [ - [3, 1, 4412, "Metrics/BlockLength: Block has too many lines. [92/25]", 2690553031], - [20, 3, 2725, "Metrics/BlockLength: Block has too many lines. [54/25]", 3645203819] - ], - "spec/ast/merge/layout/gap_spec.rb:4232058283": [ - [3, 1, 2758, "Metrics/BlockLength: Block has too many lines. [72/25]", 2052697931], - [9, 3, 1290, "Metrics/BlockLength: Block has too many lines. [28/25]", 3175967312] - ], - "spec/ast/merge/match_refiner_base_spec.rb:3961767223": [ - [3, 1, 10604, "Metrics/BlockLength: Block has too many lines. [301/25]", 4290485382], - [4, 3, 1146, "Metrics/BlockLength: Block has too many lines. [37/25]", 108051658], - [50, 3, 1005, "Metrics/BlockLength: Block has too many lines. [28/25]", 3807648246], - [125, 3, 1026, "Metrics/BlockLength: Block has too many lines. [27/25]", 2896086726], - [162, 3, 4464, "Metrics/BlockLength: Block has too many lines. [114/25]", 2878217135], - [218, 5, 1112, "Metrics/BlockLength: Block has too many lines. [30/25]", 1605825436], - [224, 11, 104, "Style/HashLikeCase: Consider replacing `case-when` with a hash lookup.", 4220899731], - [247, 11, 132, "Style/HashLikeCase: Consider replacing `case-when` with a hash lookup.", 3401820780], - [258, 5, 1642, "Metrics/BlockLength: Block has too many lines. [35/25]", 1288881729], - [337, 3, 1108, "Metrics/BlockLength: Block has too many lines. [33/25]", 2139263963] - ], - "spec/ast/merge/match_score_base_spec.rb:2340739872": [ - [3, 1, 15213, "Metrics/BlockLength: Block has too many lines. [372/25]", 1512747000], - [4, 3, 1553, "Metrics/BlockLength: Block has too many lines. [41/25]", 2789289940], - [43, 20, 2, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 5862747], - [43, 24, 2, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 5862744], - [56, 3, 1041, "Metrics/BlockLength: Block has too many lines. [29/25]", 3729310115], - [152, 3, 3259, "Metrics/BlockLength: Block has too many lines. [82/25]", 1438003770], - [258, 3, 2199, "Metrics/BlockLength: Block has too many lines. [43/25]", 3386602801], - [320, 3, 1684, "Metrics/BlockLength: Block has too many lines. [35/25]", 3807719546], - [365, 14, 16, "Lint/FloatComparison: Avoid equality comparisons of floats as they are unreliable.", 3787748956], - [369, 3, 1696, "Metrics/BlockLength: Block has too many lines. [36/25]", 3172214426], - [417, 3, 1792, "Metrics/BlockLength: Block has too many lines. [45/25]", 3557977606], - [438, 5, 1121, "Metrics/BlockLength: Block has too many lines. [26/25]", 4236927298] - ], - "spec/ast/merge/merge_result_base_spec.rb:2262708492": [ - [3, 1, 19471, "Metrics/BlockLength: Block has too many lines. [529/25]", 4106058751], - [38, 3, 2735, "Metrics/BlockLength: Block has too many lines. [80/25]", 1103243845], - [279, 3, 1611, "Metrics/BlockLength: Block has too many lines. [39/25]", 1928511417], - [280, 5, 1203, "Metrics/BlockLength: Block has too many lines. [26/25]", 857223227], - [326, 3, 2070, "Metrics/BlockLength: Block has too many lines. [48/25]", 2552826824], - [385, 3, 5769, "Metrics/BlockLength: Block has too many lines. [140/25]", 1457747735], - [511, 5, 1306, "Metrics/BlockLength: Block has too many lines. [29/25]", 2980786372], - [574, 3, 1308, "Metrics/BlockLength: Block has too many lines. [32/25]", 1342704008] - ], - "spec/ast/merge/merger_config_spec.rb:663896662": [ - [5, 1, 7314, "Metrics/BlockLength: Block has too many lines. [189/25]", 1279589310], - [11, 3, 1180, "Metrics/BlockLength: Block has too many lines. [26/25]", 1014009176], - [45, 3, 1151, "Metrics/BlockLength: Block has too many lines. [26/25]", 785276703], - [79, 3, 3574, "Metrics/BlockLength: Block has too many lines. [97/25]", 969726064], - [126, 5, 1158, "Metrics/BlockLength: Block has too many lines. [29/25]", 389808524] - ], - "spec/ast/merge/navigable/injection_point_finder_spec.rb:3693754765": [ - [3, 1, 5152, "Metrics/BlockLength: Block has too many lines. [123/25]", 3265221808], - [15, 3, 4026, "Metrics/BlockLength: Block has too many lines. [96/25]", 1482695302], - [63, 5, 2337, "Metrics/BlockLength: Block has too many lines. [54/25]", 2678200297] - ], - "spec/ast/merge/navigable/injection_point_spec.rb:3295717447": [ - [3, 1, 6032, "Metrics/BlockLength: Block has too many lines. [161/25]", 805025024], - [77, 3, 1083, "Metrics/BlockLength: Block has too many lines. [28/25]", 3091139104] - ], - "spec/ast/merge/navigable/statement_spec.rb:2965726260": [ - [3, 1, 18289, "Metrics/BlockLength: Block has too many lines. [510/25]", 4119203121], - [102, 3, 3570, "Metrics/BlockLength: Block has too many lines. [97/25]", 3287535168], - [156, 5, 2030, "Metrics/BlockLength: Block has too many lines. [51/25]", 3299963733], - [251, 3, 1338, "Metrics/BlockLength: Block has too many lines. [37/25]", 844559624], - [411, 3, 1550, "Metrics/BlockLength: Block has too many lines. [42/25]", 3851790429], - [465, 3, 1372, "Metrics/BlockLength: Block has too many lines. [41/25]", 3782869383] - ], - "spec/ast/merge/node_typing/frozen_wrapper_spec.rb:3823345520": [ - [3, 1, 4532, "Metrics/BlockLength: Block has too many lines. [117/25]", 3944573785] - ], - "spec/ast/merge/node_typing/normalizer_spec.rb:1976431423": [ - [4, 1, 8679, "Metrics/BlockLength: Block has too many lines. [219/25]", 938207310], - [65, 3, 1137, "Metrics/BlockLength: Block has too many lines. [26/25]", 3180807289], - [101, 3, 1404, "Metrics/BlockLength: Block has too many lines. [28/25]", 1094334251], - [216, 3, 875, "Metrics/BlockLength: Block has too many lines. [26/25]", 2755551247] - ], - "spec/ast/merge/node_typing/wrapper_spec.rb:3211588263": [ - [3, 1, 3469, "Metrics/BlockLength: Block has too many lines. [92/25]", 638644563] - ], - "spec/ast/merge/node_typing_spec.rb:4080661389": [ - [3, 1, 12728, "Metrics/BlockLength: Block has too many lines. [333/25]", 3927571381], - [132, 3, 3704, "Metrics/BlockLength: Block has too many lines. [98/25]", 2130243754], - [208, 5, 1267, "Metrics/BlockLength: Block has too many lines. [31/25]", 2816753725], - [265, 3, 1298, "Metrics/BlockLength: Block has too many lines. [33/25]", 3320876250], - [311, 3, 3803, "Metrics/BlockLength: Block has too many lines. [100/25]", 2743470911] - ], - "spec/ast/merge/node_wrapper_base_spec.rb:2252820285": [ - [3, 1, 11681, "Metrics/BlockLength: Block has too many lines. [307/25]", 1698593962], - [32, 3, 2341, "Metrics/BlockLength: Block has too many lines. [68/25]", 1594381363], - [179, 3, 2568, "Metrics/BlockLength: Block has too many lines. [51/25]", 1269052990], - [294, 3, 1252, "Metrics/BlockLength: Block has too many lines. [26/25]", 4220822180], - [329, 3, 1963, "Metrics/BlockLength: Block has too many lines. [39/25]", 1623030031] - ], - "spec/ast/merge/owner_selection_spec.rb:1894901093": [ - [3, 1, 1356, "Metrics/BlockLength: Block has too many lines. [35/25]", 1030003775] - ], - "spec/ast/merge/partial_template_merger_base_spec.rb:3412991027": [ - [3, 1, 7073, "Metrics/BlockLength: Block has too many lines. [145/25]", 3415302240], - [16, 9, 43, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3196404056], - [22, 9, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 4116824817], - [48, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [96, 3, 4220, "Metrics/BlockLength: Block has too many lines. [68/25]", 3464417459], - [97, 5, 2029, "Metrics/BlockLength: Block has too many lines. [27/25]", 3297854360], - [138, 5, 2122, "Metrics/BlockLength: Block has too many lines. [37/25]", 1592076374] - ], - "spec/ast/merge/recipe/config_spec.rb:3917288551": [ - [3, 1, 21041, "Metrics/BlockLength: Block has too many lines. [611/25]", 2431235923], - [72, 3, 1653, "Metrics/BlockLength: Block has too many lines. [36/25]", 2702780755], - [174, 3, 1465, "Metrics/BlockLength: Block has too many lines. [44/25]", 2326126933], - [226, 3, 3419, "Metrics/BlockLength: Block has too many lines. [89/25]", 798604841], - [327, 3, 1398, "Metrics/BlockLength: Block has too many lines. [34/25]", 3113267700], - [474, 3, 1184, "Metrics/BlockLength: Block has too many lines. [39/25]", 2599756030], - [519, 3, 4630, "Metrics/BlockLength: Block has too many lines. [147/25]", 1245526575] - ], - "spec/ast/merge/recipe/preset_spec.rb:818394232": [ - [3, 1, 6696, "Metrics/BlockLength: Block has too many lines. [173/25]", 3205615892] - ], - "spec/ast/merge/recipe/runner_spec.rb:3689194117": [ - [3, 1, 46798, "Metrics/BlockLength: Block has too many lines. [1104/25]", 3220015076], - [48, 3, 1128, "Metrics/BlockLength: Block has too many lines. [26/25]", 910457645], - [108, 3, 3036, "Metrics/BlockLength: Block has too many lines. [92/25]", 2112378918], - [132, 5, 881, "Metrics/BlockLength: Block has too many lines. [27/25]", 3842010356], - [177, 5, 918, "Metrics/BlockLength: Block has too many lines. [27/25]", 2152367239], - [295, 3, 1383, "Metrics/BlockLength: Block has too many lines. [41/25]", 2141027559], - [362, 3, 1653, "Metrics/BlockLength: Block has too many lines. [33/25]", 1536472295], - [449, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3960802027], - [497, 3, 7959, "Metrics/BlockLength: Block has too many lines. [200/25]", 3739116912], - [556, 5, 1225, "Metrics/BlockLength: Block has too many lines. [31/25]", 195497726], - [740, 3, 6977, "Metrics/BlockLength: Block has too many lines. [145/25]", 2805535296], - [748, 5, 2241, "Metrics/BlockLength: Block has too many lines. [49/25]", 2552233173], - [805, 5, 3007, "Metrics/BlockLength: Block has too many lines. [59/25]", 708771722], - [877, 5, 1444, "Metrics/BlockLength: Block has too many lines. [26/25]", 3274225022], - [911, 3, 3258, "Metrics/BlockLength: Block has too many lines. [85/25]", 2346849758], - [1012, 3, 2710, "Metrics/BlockLength: Block has too many lines. [71/25]", 3801821877], - [1029, 5, 1547, "Metrics/BlockLength: Block has too many lines. [42/25]", 2962020615], - [1109, 3, 2240, "Metrics/BlockLength: Block has too many lines. [35/25]", 1139957345], - [1115, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], - [1117, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], - [1119, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1801369636], - [1121, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2652710920], - [1123, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1375785821], - [1125, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 632755459], - [1160, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], - [1162, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], - [1164, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1375785821], - [1176, 3, 1472, "Metrics/BlockLength: Block has too many lines. [31/25]", 844153987], - [1181, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1239303812], - [1183, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1251336963], - [1216, 3, 2277, "Metrics/BlockLength: Block has too many lines. [43/25]", 4287127386], - [1221, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], - [1223, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2652710920], - [1225, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1375785821], - [1227, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 632755459], - [1274, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3420615328] - ], - "spec/ast/merge/recipe/script_loader_spec.rb:2136892097": [ - [3, 1, 8554, "Metrics/BlockLength: Block has too many lines. [237/25]", 2314425369], - [45, 3, 2842, "Metrics/BlockLength: Block has too many lines. [75/25]", 168902852], - [155, 3, 1400, "Metrics/BlockLength: Block has too many lines. [39/25]", 1611123964] - ], - "spec/ast/merge/rspec/shared_examples/feature_profile_spec.rb:2654837708": [ - [5, 1, 1140, "Metrics/BlockLength: Block has too many lines. [31/25]", 678325840] - ], - "spec/ast/merge/rspec/shared_examples/file_analyzable_spec.rb:1833922303": [ - [58, 3, 970, "Metrics/AbcSize: Assignment Branch Condition size for `detect_freeze_blocks` is too high. [<16, 9, 5> 19.03/17]", 1533823667], - [58, 3, 970, "Metrics/MethodLength: Method has too many lines. [31/10]", 1533823667], - [104, 1, 1216, "Metrics/BlockLength: Block has too many lines. [39/25]", 1009012120], - [105, 3, 1159, "Metrics/BlockLength: Block has too many lines. [38/25]", 1361521205] - ], - "spec/ast/merge/rspec/shared_examples/layout_attachment_spec.rb:714796658": [ - [8, 1, 957, "Metrics/BlockLength: Block has too many lines. [28/25]", 3738990548] - ], - "spec/ast/merge/rspec/shared_examples/recipe_preset_contract_spec.rb:669158728": [ - [6, 1, 1577, "Metrics/BlockLength: Block has too many lines. [41/25]", 2157464290], - [7, 3, 1512, "Metrics/BlockLength: Block has too many lines. [39/25]", 1968160370], - [44, 5, 401, "Metrics/AbcSize: Assignment Branch Condition size for `run_verify_loaded_preset` is too high. [<0, 26, 0> 26/17]", 2960760840] - ], - "spec/ast/merge/rspec/shared_examples/removal_mode_compliance_spec.rb:31388352": [ - [6, 22, 2, "Style/MutableConstant: Freeze mutable objects assigned to constants.", 5861859], - [44, 1, 2546, "Metrics/BlockLength: Block has too many lines. [77/25]", 3740028971], - [45, 3, 1350, "Metrics/BlockLength: Block has too many lines. [41/25]", 2793151667], - [94, 3, 1128, "Metrics/BlockLength: Block has too many lines. [32/25]", 2527000512], - [95, 5, 1081, "Metrics/BlockLength: Block has too many lines. [30/25]", 3825359844] - ], - "spec/ast/merge/rspec/shared_examples/reproducible_partial_merge_spec.rb:2862326360": [ - [19, 3, 600, "Metrics/MethodLength: Method has too many lines. [13/10]", 1542875905] - ], - "spec/ast/merge/ruleset/config_spec.rb:1860949041": [ - [3, 1, 9431, "Metrics/BlockLength: Block has too many lines. [236/25]", 4015119559], - [24, 3, 5341, "Metrics/BlockLength: Block has too many lines. [149/25]", 2361087446], - [25, 5, 1064, "Metrics/BlockLength: Block has too many lines. [26/25]", 603056104], - [226, 3, 2125, "Metrics/BlockLength: Block has too many lines. [36/25]", 1640873170] - ], - "spec/ast/merge/ruleset/declaration_objects_spec.rb:3827892270": [ - [3, 1, 1881, "Metrics/BlockLength: Block has too many lines. [47/25]", 1770376910] - ], - "spec/ast/merge/ruleset/feature_profile_spec.rb:2241111096": [ - [3, 1, 4189, "Metrics/BlockLength: Block has too many lines. [86/25]", 1116963550], - [4, 3, 4129, "Metrics/BlockLength: Block has too many lines. [84/25]", 117079811], - [5, 5, 2391, "Metrics/BlockLength: Block has too many lines. [45/25]", 1800077283] - ], - "spec/ast/merge/ruleset/parser_spec.rb:386407767": [ - [3, 1, 5670, "Metrics/BlockLength: Block has too many lines. [144/25]", 3425850453], - [4, 3, 5618, "Metrics/BlockLength: Block has too many lines. [143/25]", 246633759] - ], - "spec/ast/merge/ruleset/profile_vocabulary_spec.rb:2570869276": [ - [3, 1, 2095, "Metrics/BlockLength: Block has too many lines. [46/25]", 3214342662] - ], - "spec/ast/merge/ruleset/support_style_resolver_spec.rb:640167644": [ - [3, 1, 1625, "Metrics/BlockLength: Block has too many lines. [49/25]", 2066834885], - [4, 3, 1559, "Metrics/BlockLength: Block has too many lines. [47/25]", 1169495477] - ], - "spec/ast/merge/runtime_spec.rb:3962589694": [ - [5, 1, 24649, "Metrics/BlockLength: Block has too many lines. [664/25]", 2634021188], - [76, 3, 1459, "Metrics/BlockLength: Block has too many lines. [41/25]", 3744002593], - [125, 3, 1417, "Metrics/BlockLength: Block has too many lines. [33/25]", 4087615381], - [166, 3, 2549, "Metrics/BlockLength: Block has too many lines. [69/25]", 3150260095], - [175, 5, 1068, "Metrics/BlockLength: Block has too many lines. [26/25]", 2933114685], - [247, 3, 1668, "Metrics/BlockLength: Block has too many lines. [39/25]", 2386637993], - [259, 5, 1265, "Metrics/BlockLength: Block has too many lines. [27/25]", 3157806167], - [321, 3, 10884, "Metrics/BlockLength: Block has too many lines. [295/25]", 1889265918], - [322, 5, 1879, "Metrics/BlockLength: Block has too many lines. [46/25]", 2536583521], - [373, 5, 3938, "Metrics/BlockLength: Block has too many lines. [108/25]", 340276027], - [486, 5, 1270, "Metrics/BlockLength: Block has too many lines. [38/25]", 3844174392], - [528, 5, 3728, "Metrics/BlockLength: Block has too many lines. [95/25]", 3779381786], - [630, 3, 3240, "Metrics/BlockLength: Block has too many lines. [84/25]", 3856725067], - [656, 5, 1649, "Metrics/BlockLength: Block has too many lines. [40/25]", 3713662683] - ], - "spec/ast/merge/section_typing_spec.rb:2580971307": [ - [3, 1, 14786, "Metrics/BlockLength: Block has too many lines. [344/25]", 2925587076], - [4, 3, 1940, "Metrics/BlockLength: Block has too many lines. [50/25]", 3362429388], - [67, 3, 3684, "Metrics/BlockLength: Block has too many lines. [96/25]", 3864076664], - [120, 5, 1998, "Metrics/BlockLength: Block has too many lines. [50/25]", 411620722], - [183, 3, 1415, "Metrics/BlockLength: Block has too many lines. [37/25]", 3323012675], - [192, 5, 1124, "Metrics/BlockLength: Block has too many lines. [28/25]", 966216762], - [229, 3, 1610, "Metrics/BlockLength: Block has too many lines. [38/25]", 1499957007], - [229, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 1025596574], - [279, 3, 4437, "Metrics/BlockLength: Block has too many lines. [80/25]", 423587151], - [356, 36, 23, "Style/SymbolProc: Pass `&:unclassified?` as an argument to `find` instead of a block.", 563945984], - [369, 36, 23, "Style/SymbolProc: Pass `&:unclassified?` as an argument to `find` instead of a block.", 563945984], - [375, 3, 1630, "Metrics/BlockLength: Block has too many lines. [31/25]", 1675144727] - ], - "spec/ast/merge/smart_merger_base_spec.rb:1904727390": [ - [3, 1, 13253, "Metrics/BlockLength: Block has too many lines. [398/25]", 3611753358], - [30, 9, 10, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 1099697163], - [87, 3, 1851, "Metrics/BlockLength: Block has too many lines. [40/25]", 3729571903], - [210, 3, 925, "Metrics/BlockLength: Block has too many lines. [35/25]", 2001100899], - [344, 3, 709, "Metrics/BlockLength: Block has too many lines. [27/25]", 3041950416], - [415, 3, 1074, "Metrics/BlockLength: Block has too many lines. [35/25]", 956635689], - [416, 5, 1026, "Metrics/BlockLength: Block has too many lines. [33/25]", 1993879652], - [461, 3, 1031, "Metrics/BlockLength: Block has too many lines. [31/25]", 35315996] - ], - "spec/ast/merge/structural_edit/boundary_support_spec.rb:863387845": [ - [3, 1, 4226, "Metrics/BlockLength: Block has too many lines. [86/25]", 1889771490], - [16, 9, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1304492024], - [22, 9, 41, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3828424401], - [59, 3, 1294, "Metrics/BlockLength: Block has too many lines. [26/25]", 3038774774] - ], - "spec/ast/merge/structural_edit/plan_set_spec.rb:3633263362": [ - [3, 1, 5945, "Metrics/BlockLength: Block has too many lines. [180/25]", 3883285271], - [14, 3, 2139, "Metrics/BlockLength: Block has too many lines. [72/25]", 3558415255], - [128, 3, 1412, "Metrics/BlockLength: Block has too many lines. [39/25]", 1216754705] - ], - "spec/ast/merge/structural_edit/remove_plan_spec.rb:3569534665": [ - [3, 1, 6442, "Metrics/BlockLength: Block has too many lines. [134/25]", 3440814588], - [39, 3, 3768, "Metrics/BlockLength: Block has too many lines. [75/25]", 876721813], - [127, 3, 1439, "Metrics/BlockLength: Block has too many lines. [29/25]", 3378195351] - ], - "spec/ast/merge/structural_edit/remove_plan_support_spec.rb:800158061": [ - [3, 1, 2893, "Metrics/BlockLength: Block has too many lines. [62/25]", 3748446914], - [16, 9, 43, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3196404056], - [22, 9, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 4116824817], - [29, 3, 2091, "Metrics/BlockLength: Block has too many lines. [39/25]", 1684933040], - [30, 5, 1653, "Metrics/BlockLength: Block has too many lines. [27/25]", 2456404305] - ], - "spec/ast/merge/structural_edit/splice_plan_spec.rb:3331205681": [ - [3, 1, 3159, "Metrics/BlockLength: Block has too many lines. [83/25]", 2234926397], - [16, 3, 1837, "Metrics/BlockLength: Block has too many lines. [46/25]", 2935991482], - [42, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860750] - ], - "spec/ast/merge/text/conflict_resolver_spec.rb:3810004132": [ - [5, 1, 9102, "Metrics/BlockLength: Block has too many lines. [218/25]", 672115618], - [33, 3, 8206, "Metrics/BlockLength: Block has too many lines. [194/25]", 259803246], - [78, 5, 1920, "Metrics/BlockLength: Block has too many lines. [45/25]", 3965182334], - [139, 5, 1918, "Metrics/BlockLength: Block has too many lines. [44/25]", 3707046125] - ], - "spec/ast/merge/text/file_analysis_spec.rb:3430380445": [ - [5, 1, 8842, "Metrics/BlockLength: Block has too many lines. [205/25]", 4255187284], - [6, 3, 1323, "Metrics/BlockLength: Block has too many lines. [29/25]", 2518912953], - [47, 3, 1830, "Metrics/BlockLength: Block has too many lines. [43/25]", 3685770590], - [135, 3, 1620, "Metrics/BlockLength: Block has too many lines. [35/25]", 3089951119] - ], - "spec/ast/merge/text/line_node_spec.rb:1757790485": [ - [5, 1, 4739, "Metrics/BlockLength: Block has too many lines. [131/25]", 1487875238] - ], - "spec/ast/merge/text/merge_result_spec.rb:589380024": [ - [5, 1, 1541, "Metrics/BlockLength: Block has too many lines. [40/25]", 2828087992] - ], - "spec/ast/merge/text/section_splitter_spec.rb:804308722": [ - [4, 1, 5705, "Metrics/BlockLength: Block has too many lines. [209/25]", 4175363685], - [5, 3, 794, "Metrics/BlockLength: Block has too many lines. [28/25]", 2386862842], - [42, 3, 1126, "Metrics/BlockLength: Block has too many lines. [45/25]", 1507887296], - [95, 3, 746, "Metrics/BlockLength: Block has too many lines. [30/25]", 1759029412], - [131, 3, 1169, "Metrics/BlockLength: Block has too many lines. [45/25]", 1412318991], - [184, 3, 754, "Metrics/BlockLength: Block has too many lines. [30/25]", 2717556691], - [246, 1, 16648, "Metrics/BlockLength: Block has too many lines. [428/25]", 3166834694], - [370, 3, 1640, "Metrics/BlockLength: Block has too many lines. [46/25]", 2049342960], - [424, 3, 3237, "Metrics/BlockLength: Block has too many lines. [102/25]", 2357275144], - [540, 3, 3505, "Metrics/BlockLength: Block has too many lines. [67/25]", 2112469350], - [619, 3, 3586, "Metrics/BlockLength: Block has too many lines. [90/25]", 3866409298], - [620, 5, 1650, "Metrics/BlockLength: Block has too many lines. [48/25]", 289235626], - [622, 9, 1474, "Metrics/AbcSize: Assignment Branch Condition size for `split` is too high. [<8, 21, 7> 23.54/17]", 557655357], - [622, 9, 1474, "Metrics/MethodLength: Method has too many lines. [41/10]", 557655357], - [622, 9, 1474, "Metrics/PerceivedComplexity: Perceived complexity for `split` is too high. [9/8]", 557655357], - [628, 11, 1237, "Metrics/BlockLength: Block has too many lines. [33/25]", 1134667672], - [717, 29, 44, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 2169354946], - [723, 29, 44, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 2169354946], - [751, 1, 3128, "Metrics/BlockLength: Block has too many lines. [85/25]", 2082776744], - [769, 3, 1744, "Metrics/BlockLength: Block has too many lines. [46/25]", 223880162], - [770, 5, 1258, "Metrics/BlockLength: Block has too many lines. [31/25]", 2245422869] - ], - "spec/ast/merge/text/smart_merger_spec.rb:4128732567": [ - [3, 1, 8057, "Metrics/BlockLength: Block has too many lines. [210/25]", 1690443322], - [4, 3, 1135, "Metrics/BlockLength: Block has too many lines. [28/25]", 3788979655], - [58, 3, 4438, "Metrics/BlockLength: Block has too many lines. [106/25]", 2613192474], - [187, 3, 1053, "Metrics/BlockLength: Block has too many lines. [26/25]", 803567817], - [220, 3, 892, "Metrics/BlockLength: Block has too many lines. [28/25]", 2001100899] - ], - "spec/ast/merge/text/word_node_spec.rb:1457011521": [ - [5, 1, 3264, "Metrics/BlockLength: Block has too many lines. [74/25]", 677733430] - ], - "spec/ast/merge/token_match_refiner_spec.rb:3180314913": [ - [3, 1, 4000, "Metrics/BlockLength: Block has too many lines. [80/25]", 1630791278], - [8, 3, 2912, "Metrics/BlockLength: Block has too many lines. [60/25]", 529772148] - ], - "spec/ast/merge/trailing_groups/alignment_sort_spec.rb:1594915480": [ - [5, 1, 4710, "Metrics/BlockLength: Block has too many lines. [114/25]", 2499296583], - [14, 3, 2140, "Metrics/BlockLength: Block has too many lines. [47/25]", 3871799493], - [95, 3, 1482, "Metrics/BlockLength: Block has too many lines. [35/25]", 1088314263] - ], - "spec/ast/merge/trailing_groups/core_spec.rb:2651131504": [ - [5, 1, 9601, "Metrics/BlockLength: Block has too many lines. [242/25]", 598045669], - [22, 3, 3728, "Metrics/BlockLength: Block has too many lines. [87/25]", 1304580063], - [119, 3, 3931, "Metrics/BlockLength: Block has too many lines. [99/25]", 2464218479], - [186, 5, 1322, "Metrics/BlockLength: Block has too many lines. [30/25]", 427915501], - [187, 7, 1267, "Metrics/BlockLength: Block has too many lines. [28/25]", 861882691], - [245, 3, 1306, "Metrics/BlockLength: Block has too many lines. [34/25]", 86572459] - ], - "spec/ast/merge/trailing_groups/dest_iterate_spec.rb:3632880085": [ - [5, 1, 5523, "Metrics/BlockLength: Block has too many lines. [131/25]", 3077369183], - [19, 3, 3990, "Metrics/BlockLength: Block has too many lines. [91/25]", 593259616], - [39, 35, 12, "Style/SymbolProc: Pass `&:sig` as an argument to `lambda` instead of a block.", 3587754320], - [54, 33, 23, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 384283629], - [89, 35, 13, "Style/SymbolProc: Pass `&:name` as an argument to `lambda` instead of a block.", 3561384234], - [98, 35, 12, "Style/SymbolProc: Pass `&:sig` as an argument to `lambda` instead of a block.", 3587754320], - [113, 35, 12, "Style/SymbolProc: Pass `&:sig` as an argument to `lambda` instead of a block.", 3587754320] - ], - "spec/ast/merge/unresolved_policy_spec.rb:2561713656": [ - [3, 1, 1333, "Metrics/BlockLength: Block has too many lines. [33/25]", 4109547889] - ], - "spec/ast/merge/unresolved_review_state_spec.rb:3186871217": [ - [3, 1, 1038, "Metrics/BlockLength: Block has too many lines. [31/25]", 1325553035] - ], - "spec/ast/merge_rspec_conformance_fixtures_spec.rb:251774004": [ - [5, 1, 2119, "Metrics/BlockLength: Block has too many lines. [55/25]", 1724925683], - [6, 3, 1203, "Metrics/BlockLength: Block has too many lines. [29/25]", 3306863581] - ], - "spec/ast/merge_spec.rb:664670069": [ - [3, 1, 3113, "Metrics/BlockLength: Block has too many lines. [74/25]", 4034649501], - [9, 3, 2227, "Metrics/BlockLength: Block has too many lines. [51/25]", 578300230], - [10, 5, 2182, "Metrics/BlockLength: Block has too many lines. [49/25]", 2758871265] - ], - "spec/base_substrate_spec.rb:2864492094": [ - [5, 1, 5800, "Metrics/BlockLength: Block has too many lines. [143/25]", 784801982], - [6, 3, 192, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 680981873], - [13, 3, 378, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1223797442], - [31, 3, 628, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 2123191050], - [53, 3, 429, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3536712197], - [69, 3, 24, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 2280792512], - [70, 3, 78, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 604224776], - [72, 3, 146, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3315091322] - ], - "spec/fixtures_integration_spec.rb:1145500459": [ - [595, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859109], - [758, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 576909008], - [881, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087900170], - [1806, 3, 816, "Metrics/MethodLength: Method has too many lines. [13/10]", 170960660], - [1806, 39, 213, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 635200700], - [1807, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3976306097], - [1831, 38, 80, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3297939075], - [1916, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1745553512], - [1917, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 118067488], - [1918, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 196190368], - [1919, 121, 41, "Layout/LineLength: Line is too long. [161/120]", 3371256193], - [2090, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3241114703], - [2428, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], - [2567, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], - [2991, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3697593604], - [2992, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], - [3113, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179435314], - [3122, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1182194285], - [3124, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 3886107031], - [3151, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1751849111], - [3152, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1519587684], - [3153, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 4086262880], - [3170, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3568081822], - [3171, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1776876782], - [3173, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [3174, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1751849111], - [3176, 121, 73, "Layout/LineLength: Line is too long. [193/120]", 3322243646], - [3178, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1715153206], - [3179, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [3180, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 504997180], - [3181, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 1146860021], - [3182, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 2312101607], - [3183, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1423779161], - [3184, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1900897138], - [3185, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 1689840383], - [3186, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 1589056236], - [3188, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 763176550], - [3194, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3957871310], - [3196, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 763176550], - [3198, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 919916608], - [3199, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 919916608], - [3200, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3957871310], - [3201, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 4073040612], - [3202, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 763176550], - [3203, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 667593075], - [3205, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1310972770], - [3206, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 311387795], - [3207, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 724840266], - [3208, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 2555878310], - [3209, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1781078972], - [3210, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [3213, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [3214, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1658060570], - [3215, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 3085728851], - [3216, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3129400559], - [3217, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3197516464], - [3218, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087771520], - [3219, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3837194228], - [3220, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1312323543], - [3221, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 2356847623], - [3222, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [3223, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3428073441], - [3224, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 2891080552], - [3225, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3080737172], - [3226, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 170445026], - [3227, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3240051869], - [3228, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 4266052680], - [3229, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3376297786], - [3230, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 398435913], - [3231, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 4134940256], - [3232, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 30370035], - [3233, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 2862546359], - [3234, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1901388514], - [3235, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 838864274], - [3236, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 3437460384], - [3237, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1567003152], - [3238, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2609066305], - [3239, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 4043187090], - [3240, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3866430009], - [3241, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 2182699083], - [3242, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 3958792129], - [3243, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3449926560], - [3244, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 399774089], - [3245, 121, 68, "Layout/LineLength: Line is too long. [188/120]", 2119246799], - [3247, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3592658842], - [3248, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2905723409], - [3249, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 3930305198], - [3250, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 4186230052], - [3251, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [3252, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2700200720], - [3253, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 1630526402], - [3254, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3669244926], - [3255, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2814234644], - [3256, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3109415933], - [3257, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3643275044], - [3258, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 3825290660], - [3259, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1751849111], - [3260, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 4112285398], - [3261, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 1684279672], - [3262, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 1616506266], - [3264, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [3265, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1330093223], - [3266, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 4084555566], - [3267, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 2466867154], - [3268, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 4088314613], - [3269, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 2416893689], - [3270, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 683312682], - [3271, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 2516517934], - [3272, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2414563355], - [3273, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 2232595211], - [3274, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 2940789369], - [3275, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 941259913], - [3276, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2133508098], - [3277, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1621975014], - [3278, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 35985461], - [3279, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 746016305], - [3280, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 435488100], - [3281, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 2581129172], - [3282, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 3495900774], - [3283, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1413120342], - [3284, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [3285, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2333800791], - [3286, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 2576906206], - [3287, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 2986659874], - [3288, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2811932564], - [3289, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 1970813291], - [3290, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 2904941246], - [3291, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3745922508], - [3292, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 735247237], - [3293, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3731320885], - [3294, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 3896022034], - [3295, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 2827048584], - [3296, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 2548596663], - [3297, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 3812352018], - [3298, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 1280243910], - [3299, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 1742643292], - [3300, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 3056442430], - [3301, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 3144363287], - [3302, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 477297993], - [3303, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 3657857971], - [3304, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3913984414], - [3305, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 336201058], - [3306, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 485418789], - [3307, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 453253839], - [3308, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3673833034], - [3309, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 1552836890], - [3310, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 2714635965], - [3311, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 9336999], - [3312, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 584857208], - [3313, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1394865213], - [3314, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 3973222761], - [3315, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 2020040051], - [3316, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 3060994335], - [3317, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 196286917], - [3318, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 4168514178], - [3319, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 810581246], - [3320, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 1473417372], - [3321, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 3008376885], - [3322, 121, 84, "Layout/LineLength: Line is too long. [204/120]", 454816400], - [3323, 121, 88, "Layout/LineLength: Line is too long. [208/120]", 1416223705], - [3324, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 2896813919], - [3325, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 957293983], - [3326, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 2118117430], - [3327, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 1367404612], - [3328, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 2459902188], - [3329, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 461483815], - [3330, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 2791596520], - [3331, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 203085787], - [3332, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 2942095139], - [3333, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 131861965], - [3334, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 3340827551], - [3335, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 102582610], - [3336, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 762789354], - [3337, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 3478337442], - [3338, 121, 112, "Layout/LineLength: Line is too long. [232/120]", 4010607435], - [3339, 121, 132, "Layout/LineLength: Line is too long. [252/120]", 3754747587], - [3340, 121, 136, "Layout/LineLength: Line is too long. [256/120]", 379336923], - [3341, 121, 108, "Layout/LineLength: Line is too long. [228/120]", 3366353902], - [3342, 121, 128, "Layout/LineLength: Line is too long. [248/120]", 1686898289], - [3343, 121, 132, "Layout/LineLength: Line is too long. [252/120]", 2005192241], - [3344, 121, 104, "Layout/LineLength: Line is too long. [224/120]", 1868634464], - [3345, 121, 124, "Layout/LineLength: Line is too long. [244/120]", 3939743614], - [3346, 121, 128, "Layout/LineLength: Line is too long. [248/120]", 2978506702], - [3347, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 3909866928], - [3348, 121, 118, "Layout/LineLength: Line is too long. [238/120]", 2853032177], - [3349, 121, 122, "Layout/LineLength: Line is too long. [242/120]", 2968366309], - [3350, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 1753663643], - [3351, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 3387619436], - [3352, 121, 106, "Layout/LineLength: Line is too long. [226/120]", 197895496], - [3353, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 576181861], - [3354, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 2809313444], - [3355, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 3963067112], - [3356, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 1121380327], - [3357, 121, 100, "Layout/LineLength: Line is too long. [220/120]", 31591211], - [3358, 121, 104, "Layout/LineLength: Line is too long. [224/120]", 1946129497], - [3359, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 767185096], - [3360, 121, 100, "Layout/LineLength: Line is too long. [220/120]", 1092646020], - [3361, 121, 104, "Layout/LineLength: Line is too long. [224/120]", 1328841270], - [3362, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 2663749624], - [3363, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 430318647], - [3364, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 1650234037], - [3365, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 1082269805], - [3366, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 316397809], - [3367, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 3145391348], - [3368, 121, 112, "Layout/LineLength: Line is too long. [232/120]", 2808088654], - [3369, 121, 116, "Layout/LineLength: Line is too long. [236/120]", 1035513748], - [3370, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 2552800539], - [3371, 121, 112, "Layout/LineLength: Line is too long. [232/120]", 1727699169], - [3372, 121, 116, "Layout/LineLength: Line is too long. [236/120]", 1171566267], - [3373, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 2994775049], - [3374, 121, 110, "Layout/LineLength: Line is too long. [230/120]", 3860489151], - [3375, 121, 114, "Layout/LineLength: Line is too long. [234/120]", 959496607], - [3376, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 1694222439], - [3377, 121, 114, "Layout/LineLength: Line is too long. [234/120]", 1501186331], - [3378, 121, 118, "Layout/LineLength: Line is too long. [238/120]", 4059659418], - [3379, 121, 110, "Layout/LineLength: Line is too long. [230/120]", 1899868779], - [3380, 121, 130, "Layout/LineLength: Line is too long. [250/120]", 323324279], - [3381, 121, 134, "Layout/LineLength: Line is too long. [254/120]", 3956414359], - [3382, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 3506644741], - [3383, 121, 116, "Layout/LineLength: Line is too long. [236/120]", 936139074], - [3384, 121, 136, "Layout/LineLength: Line is too long. [256/120]", 4153213512], - [3385, 121, 140, "Layout/LineLength: Line is too long. [260/120]", 1491976338], - [3386, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 4061753206], - [3387, 121, 106, "Layout/LineLength: Line is too long. [226/120]", 2410434304], - [3388, 121, 124, "Layout/LineLength: Line is too long. [244/120]", 3518300264], - [3389, 121, 144, "Layout/LineLength: Line is too long. [264/120]", 1040696046], - [3390, 121, 148, "Layout/LineLength: Line is too long. [268/120]", 139604188], - [3391, 121, 120, "Layout/LineLength: Line is too long. [240/120]", 231937793], - [3392, 121, 140, "Layout/LineLength: Line is too long. [260/120]", 1835509805], - [3393, 121, 144, "Layout/LineLength: Line is too long. [264/120]", 1629218396], - [3394, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 2312875700], - [3395, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 2933374083], - [3396, 121, 106, "Layout/LineLength: Line is too long. [226/120]", 1719349671], - [3397, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 2555579810], - [3398, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 2023551624], - [3399, 121, 114, "Layout/LineLength: Line is too long. [234/120]", 955231924], - [3400, 121, 118, "Layout/LineLength: Line is too long. [238/120]", 4232993781], - [3401, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 3472954835], - [3402, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 3211922285], - [3403, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 2874956332], - [3404, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 1360335840], - [3405, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2135379556], - [3406, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3242768475], - [3407, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 2789115918], - [3408, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3346448124], - [3409, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1538469817], - [3410, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1543041113], - [3411, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 3344741438], - [3412, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2188404009], - [3413, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1330398779], - [3414, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 332468826], - [3415, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 1905397598], - [3416, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 438831062], - [3417, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 3377667334], - [3418, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3232541734], - [3420, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2130930429], - [3421, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 3684939371], - [3423, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2361951097], - [3424, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 1211447462], - [3425, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3309872691], - [3426, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 360053761], - [3427, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 1310136493], - [3428, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1950686342], - [3429, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 1397845826], - [3430, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 4191304724], - [3431, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2354128498], - [3432, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 1865717453], - [3433, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 24220542], - [3434, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 2618612673], - [3437, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3422918867], - [3438, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3689431739], - [3482, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 4093564799], - [3488, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1662653970], - [3489, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3967501655], - [3490, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2178516622], - [3491, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 1345346561], - [3505, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193466072], - [3625, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 3612393276], - [3626, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 797303985], - [3629, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1606320605], - [3649, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1776876782], - [3653, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 828742791], - [3673, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3294617581], - [3683, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3519842846], - [3693, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1966440909], - [3694, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053864], - [3700, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1606320605], - [3723, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 1340744311], - [3742, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1741893077], - [3743, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053865], - [3747, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193405204], - [3761, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1401226501], - [3764, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085352569], - [3767, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 696523922], - [3782, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], - [3792, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2746826653], - [4208, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1138870161], - [4770, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], - [4781, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 2132299307], - [4828, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087775098], - [4839, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 757851079], - [4875, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], - [4886, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 441649198], - [4909, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087903295], - [4921, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 170442008], - [4930, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], - [4932, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1888875443], - [4969, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 398433651], - [4980, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3921367744], - [5003, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2422819473], - [5009, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 194583095], - [5015, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1901385496], - [5024, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 490810486], - [5026, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 586287746], - [5030, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1310969752], - [5050, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087389205], - [5062, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2609063547], - [5071, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], - [5073, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1370761696], - [5096, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 2208661169], - [5102, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1862604658], - [5108, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 3958789371], - [5117, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3449594464], - [5119, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 692050524], - [5123, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 802172558], - [5193, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2406691660], - [5228, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], - [5239, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1811982742], - [5266, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2562189319], - [5272, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193430346], - [5278, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2814237166], - [5287, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2189106693], - [5289, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 3874870868], - [5293, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179474914], - [5326, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1751845165], - [5337, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2617230371], - [5341, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], - [5382, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], - [5393, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3793790598], - [5428, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 4088312783], - [5439, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3220724736], - [5443, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087899888], - [5462, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2552888401], - [5468, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 194583095], - [5474, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2414559905], - [5483, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 626762179], - [5485, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3969284923], - [5489, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 1893261414], - [5521, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2133507320], - [5532, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 2101353476], - [5536, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087685705], - [5555, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2431380437], - [5561, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 194583095], - [5567, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 435489438], - [5576, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 1520878209], - [5578, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 2238995076], - [5582, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 2789405913], - [5615, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], - [5626, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3409328196], - [5649, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087858069], - [5661, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2811935086], - [5670, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], - [5672, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1113346693], - [5676, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3227128786], - [5696, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 48793812], - [5702, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 338440584], - [5708, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 735248703], - [5717, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 927473097], - [5719, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 1394536741], - [5723, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3134012967], - [5742, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 2967615316], - [5748, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 2810710931], - [5754, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 2548594701], - [5757, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860796], - [5759, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], - [5763, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3549194295], - [5765, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 1074004741], - [5769, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 2874423564], - [5772, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087576526], - [5774, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], - [5789, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 1696848307], - [5795, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 2883501659], - [5801, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 3056443076], - [5806, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193405204], - [5810, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 1487412605], - [5812, 121, 51, "Layout/LineLength: Line is too long. [171/120]", 2021571284], - [5816, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1975782995], - [5819, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860796], - [5821, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193405204], - [5826, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 183236849], - [5835, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 856018753], - [5838, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], - [5841, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 2146546324], - [5847, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3913983076], - [5850, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 3491931666], - [5852, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3536323546], - [5856, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 356581191], - [5858, 121, 63, "Layout/LineLength: Line is too long. [183/120]", 4144657639], - [5862, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 1478616653], - [5865, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1774852021], - [5867, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3536323546], - [5882, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3884289787], - [5888, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 1001503687], - [5894, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3673836976], - [5903, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 3164908550], - [5905, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 1134300778], - [5909, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1797165224], - [5928, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 2508143995], - [5934, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 3002532188], - [5940, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 584857986], - [5943, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860796], - [5945, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], - [5949, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 749691384], - [5951, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 3389354954], - [5955, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 3402045699], - [5958, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087576526], - [5960, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], - [5974, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 2447716612], - [5980, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3201685099], - [5986, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 3060990885], - [5995, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 29396315], - [5997, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 1228645365], - [6001, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1436742837], - [6020, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 716917214], - [6026, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 2175814211], - [6032, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 1473420390], - [6035, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193433391], - [6037, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1422839111], - [6041, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 1571170198], - [6043, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 2175059093], - [6047, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3886666417], - [6050, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 176753677], - [6052, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1422839111], - [6068, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 3471319495], - [6074, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 1274038477], - [6080, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 2896814693], - [6083, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087576526], - [6085, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114086530], - [6089, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 250433828], - [6091, 121, 59, "Layout/LineLength: Line is too long. [179/120]", 3910556848], - [6095, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4002014976], - [6098, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 3491931666], - [6100, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114086530], - [6194, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861664], - [6208, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087932582], - [6222, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861664], - [6238, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 876012844], - [6240, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1756764194], - [6241, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 4173216735], - [6244, 121, 75, "Layout/LineLength: Line is too long. [195/120]", 911964425], - [6245, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 173266907], - [6246, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1412705933], - [6249, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1756764194], - [6250, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 2605683750], - [6253, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 3182252139], - [6255, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1652557742], - [6259, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 2240437058], - [6260, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 173266907], - [6261, 121, 101, "Layout/LineLength: Line is too long. [221/120]", 3694598076], - [6263, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861152], - [6264, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179079542], - [6265, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 3528944411], - [6268, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3020159378], - [6270, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1652557742], - [6276, 121, 84, "Layout/LineLength: Line is too long. [204/120]", 420843234], - [6278, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1401226501], - [6279, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 442915368], - [6282, 121, 79, "Layout/LineLength: Line is too long. [199/120]", 4212444955], - [6283, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053864], - [6284, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1373660924], - [6287, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1401226501], - [6288, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 1539225758], - [6291, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3020159378], - [6293, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 4240691845], - [6297, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 674553335], - [6298, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053864], - [6299, 121, 105, "Layout/LineLength: Line is too long. [225/120]", 4163432287], - [6301, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2089555761], - [6302, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2034687276], - [6303, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 3710905302], - [6306, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 4204667212], - [6308, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 4240691845], - [6314, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 2071493433], - [6316, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085352569], - [6317, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 2853066942], - [6320, 121, 71, "Layout/LineLength: Line is too long. [191/120]", 2771467828], - [6321, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193425976], - [6322, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3025157142], - [6325, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085352569], - [6326, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 3340824101], - [6329, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 3999804761], - [6331, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1999310973], - [6335, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 835016333], - [6336, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193425976], - [6337, 121, 97, "Layout/LineLength: Line is too long. [217/120]", 3575893945], - [6340, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193405945], - [6341, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 1755858308], - [6344, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 3182252139], - [6346, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1999310973], - [6352, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 3033080032], - [6354, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177549], - [6355, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 2720985203], - [6358, 121, 65, "Layout/LineLength: Line is too long. [185/120]", 3233424320], - [6360, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873483], - [6363, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177549], - [6364, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 131859703], - [6367, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1943494546], - [6369, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 4016166830], - [6373, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 1350760977], - [6375, 121, 91, "Layout/LineLength: Line is too long. [211/120]", 4098706554], - [6379, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 4059724765], - [6382, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1651955548], - [6384, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 4016166830], - [6390, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 1057495720], - [6393, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1621971220], - [6396, 121, 49, "Layout/LineLength: Line is too long. [169/120]", 1585717593], - [6402, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 2942094233], - [6405, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2624667704], - [6407, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2317051977], - [6411, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 1321610634], - [6413, 121, 75, "Layout/LineLength: Line is too long. [195/120]", 2854688831], - [6417, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 4185465554], - [6420, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1169781875], - [6422, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2317051977], - [6428, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 1916545020], - [6431, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1422839111], - [6434, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 910134593], - [6440, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 203086561], - [6443, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2939363812], - [6445, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3155638331], - [6449, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 1955758062], - [6451, 121, 71, "Layout/LineLength: Line is too long. [191/120]", 3737424359], - [6455, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 3597620692], - [6458, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2624667704], - [6460, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3155638331], - [6466, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 1036052399], - [6469, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114086530], - [6472, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 1268266488], - [6478, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 2791598354], - [6481, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1302589368], - [6483, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3533902728], - [6487, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 3942276897], - [6489, 121, 73, "Layout/LineLength: Line is too long. [193/120]", 1175941460], - [6493, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 679697318], - [6496, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 28126263], - [6498, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3533902728], - [6499, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 181895237], - [6504, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 4057848448], - [6507, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114086530], - [6510, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 4067769399], - [6516, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 461482909], - [6519, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1302589368], - [6521, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3533902728], - [6525, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 3561204590], - [6527, 121, 73, "Layout/LineLength: Line is too long. [193/120]", 880160795], - [6531, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 1614719145], - [6534, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 28126263], - [6536, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3533902728], - [6537, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 181895237], - [6584, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193432306], - [6598, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 1645945966], - [6601, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3212740609], - [6604, 121, 59, "Layout/LineLength: Line is too long. [179/120]", 3982698123], - [6606, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193425997], - [6610, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 2663750402], - [6613, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2420297272], - [6615, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1164389943], - [6619, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 3483121581], - [6621, 121, 85, "Layout/LineLength: Line is too long. [205/120]", 2271668600], - [6625, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 804794365], - [6628, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3659367004], - [6630, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1164389943], - [6631, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 561395486], - [6636, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 1251661057], - [6639, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3212740609], - [6642, 121, 59, "Layout/LineLength: Line is too long. [179/120]", 3210109508], - [6644, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193425997], - [6648, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 430316685], - [6651, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2420297272], - [6653, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1164389943], - [6657, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 2428160226], - [6659, 121, 85, "Layout/LineLength: Line is too long. [205/120]", 2663295671], - [6663, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 2822109938], - [6666, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3659367004], - [6668, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1164389943], - [6669, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 561395486], - [6674, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 857639785], - [6677, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3669622788], - [6680, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 140453799], - [6682, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860765], - [6686, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 1650236431], - [6689, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 150699323], - [6691, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 50618962], - [6695, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 4205571164], - [6697, 121, 83, "Layout/LineLength: Line is too long. [203/120]", 1549528021], - [6701, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 1325488145], - [6704, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1510711065], - [6706, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 50618962], - [6712, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 3043205563], - [6715, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2381137493], - [6718, 121, 61, "Layout/LineLength: Line is too long. [181/120]", 2200345195], - [6720, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087926498], - [6724, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 1082269527], - [6727, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1510711065], - [6729, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1104064739], - [6733, 121, 68, "Layout/LineLength: Line is too long. [188/120]", 1652941658], - [6735, 121, 87, "Layout/LineLength: Line is too long. [207/120]", 1440323819], - [6739, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 802896260], - [6742, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1943494546], - [6744, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1104064739], - [6750, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 788730815], - [6752, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2034687276], - [6753, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 4226330106], - [6756, 121, 77, "Layout/LineLength: Line is too long. [197/120]", 2414796320], - [6757, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873470], - [6758, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3090817832], - [6761, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2034687276], - [6762, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 2839148677], - [6765, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 2393983240], - [6767, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 2581936864], - [6771, 121, 84, "Layout/LineLength: Line is too long. [204/120]", 3923254945], - [6772, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873470], - [6773, 121, 103, "Layout/LineLength: Line is too long. [223/120]", 580639726], - [6775, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193419246], - [6776, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1756764194], - [6777, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 3202758044], - [6780, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 912651721], - [6782, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 2581936864], - [6786, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1164293389], - [6799, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860840], - [6800, 121, 88, "Layout/LineLength: Line is too long. [208/120]", 574552570], - [6802, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3845073641], - [6803, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 543375177], - [6806, 121, 83, "Layout/LineLength: Line is too long. [203/120]", 222410330], - [6807, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3025157219], - [6808, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1904561434], - [6811, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 489872984], - [6812, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 97325617], - [6815, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 4204667212], - [6817, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 4062673070], - [6821, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 1451915960], - [6822, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3025157219], - [6823, 121, 109, "Layout/LineLength: Line is too long. [229/120]", 4200529758], - [6825, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1497831350], - [6826, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 4214367244], - [6827, 121, 84, "Layout/LineLength: Line is too long. [204/120]", 399603517], - [6830, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3423548875], - [6832, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 4062673070], - [6836, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3279830097], - [6848, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 659167322], - [6860, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087926423], - [6861, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 3300294193], - [6863, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3172850966], - [6864, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 2396187736], - [6867, 121, 87, "Layout/LineLength: Line is too long. [207/120]", 1991888901], - [6868, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1954380402], - [6869, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2589970962], - [6872, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 42340644], - [6873, 121, 67, "Layout/LineLength: Line is too long. [187/120]", 479235996], - [6876, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3423548875], - [6878, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1462541970], - [6882, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 1373978781], - [6883, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1954380402], - [6884, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 280641011], - [6886, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1664110553], - [6887, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1009650381], - [6888, 121, 88, "Layout/LineLength: Line is too long. [208/120]", 909329343], - [6891, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 2977589831], - [6893, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1462541970], - [6898, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873470], - [6899, 121, 61, "Layout/LineLength: Line is too long. [181/120]", 1904101094], - [6901, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2229256255], - [6902, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 1839090017], - [6905, 121, 91, "Layout/LineLength: Line is too long. [211/120]", 4260980907], - [6906, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 4253118453], - [6907, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1536690221], - [6909, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861152], - [6910, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 209824656], - [6911, 121, 71, "Layout/LineLength: Line is too long. [191/120]", 1530496074], - [6914, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 2977589831], - [6916, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3261436902], - [6920, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 3762694917], - [6921, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 4253118453], - [6922, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 3196230010], - [6924, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3165598659], - [6925, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 4264469493], - [6926, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 3140690958], - [6929, 121, 35, "Layout/LineLength: Line is too long. [155/120]", 2999583208], - [6931, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3261436902], - [6937, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 326070599], - [6940, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1621971220], - [6943, 121, 49, "Layout/LineLength: Line is too long. [169/120]", 1689000214], - [6949, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 2459904022], - [6952, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2624667704], - [6954, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2317051977], - [6958, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 2842872837], - [6960, 121, 75, "Layout/LineLength: Line is too long. [195/120]", 423884656], - [6964, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 2673769885], - [6967, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1169781875], - [6969, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2317051977], - [6970, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2126253911], - [6986, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 2388292564], - [6989, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2381137493], - [6992, 121, 61, "Layout/LineLength: Line is too long. [181/120]", 1136762660], - [6994, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087926498], - [6998, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 2555581016], - [7001, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1510711065], - [7003, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1104064739], - [7007, 121, 68, "Layout/LineLength: Line is too long. [188/120]", 1986812885], - [7009, 121, 87, "Layout/LineLength: Line is too long. [207/120]", 1864036132], - [7013, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 3590180043], - [7016, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1943494546], - [7018, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1104064739], - [7019, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2382712010], - [7029, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1791534645], - [7034, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 2403815412], - [7037, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1422839111], - [7040, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 4046048864], - [7046, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 3472955113], - [7049, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2939363812], - [7051, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3155638331], - [7055, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3911469720], - [7057, 121, 71, "Layout/LineLength: Line is too long. [191/120]", 272433263], - [7061, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 634420444], - [7064, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2624667704], - [7066, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3155638331], - [7067, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2088324682], - [7080, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087906711], - [7092, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2135380894], - [7101, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], - [7103, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 4280757685], - [7107, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 161599970], - [7141, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053789], - [7176, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2188407955], - [7187, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3692322233], - [7191, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087557694], - [7214, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3197512522], - [7223, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858840], - [7225, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 85298067], - [7282, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193418403], - [7288, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193418403], - [7311, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087432474], - [7323, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2361949763], - [7332, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], - [7334, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 581045160], - [7338, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 4235011647], - [7357, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1898147766], - [7363, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177560], - [7369, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 1310140439], - [7378, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 681770239], - [7380, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3821940657], - [7384, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], - [7404, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861292], - [7416, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2354124424], - [7425, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087922021], - [7427, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 3921370162], - [8020, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 4083054536], - [8048, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 4083054536], - [8077, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 4083054536], - [8135, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 632953222], - [8164, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 732995265], - [8214, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 1886249927], - [8376, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 578751979], - [8377, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3803540269], - [8386, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2238403955], - [8387, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1028441932], - [8388, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 1975950909], - [8443, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1244043798] - ], - "spec/integration/freeze_node_edge_cases_spec.rb:3416491031": [ - [6, 1, 28959, "Metrics/BlockLength: Block has too many lines. [663/25]", 3473768018], - [7, 3, 2985, "Metrics/BlockLength: Block has too many lines. [57/25]", 436154415], - [8, 5, 2934, "Metrics/BlockLength: Block has too many lines. [55/25]", 1963918102], - [78, 3, 6091, "Metrics/BlockLength: Block has too many lines. [136/25]", 232153494], - [98, 5, 3053, "Metrics/BlockLength: Block has too many lines. [69/25]", 1442974101], - [202, 5, 1691, "Metrics/BlockLength: Block has too many lines. [29/25]", 985654389], - [241, 3, 8515, "Metrics/BlockLength: Block has too many lines. [176/25]", 2776676526], - [473, 3, 2024, "Metrics/BlockLength: Block has too many lines. [55/25]", 1048101963], - [474, 5, 890, "Metrics/BlockLength: Block has too many lines. [26/25]", 753961540], - [543, 3, 4511, "Metrics/BlockLength: Block has too many lines. [116/25]", 1227615145], - [693, 3, 1660, "Metrics/BlockLength: Block has too many lines. [43/25]", 1881888061], - [694, 5, 1107, "Metrics/BlockLength: Block has too many lines. [26/25]", 368095693] - ], - "spec/integration/gem_family_section_merge_spec.rb:1744383089": [ - [164, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 93655697] - ], - "spec/integration/integration_spec.rb:2239247043": [ - [14, 1, 4488, "Metrics/BlockLength: Block has too many lines. [88/25]", 206207480], - [15, 3, 3267, "Metrics/BlockLength: Block has too many lines. [62/25]", 1323899085], - [40, 5, 2263, "Metrics/BlockLength: Block has too many lines. [48/25]", 3172595581] - ], - "spec/integration/link_reference_preservation_spec.rb:3764298162": [ - [6, 1, 2646, "Metrics/BlockLength: Block has too many lines. [48/25]", 3396410609], - [19, 3, 2058, "Metrics/BlockLength: Block has too many lines. [33/25]", 163363949] - ], - "spec/integration/markly_merge_spec.rb:3076950975": [ - [3, 1, 22886, "Metrics/BlockLength: Block has too many lines. [670/25]", 1408138744], - [62, 3, 7192, "Metrics/BlockLength: Block has too many lines. [189/25]", 1890889324], - [63, 5, 1678, "Metrics/BlockLength: Block has too many lines. [41/25]", 2587582896], - [115, 5, 1808, "Metrics/BlockLength: Block has too many lines. [48/25]", 3381172795], - [147, 46, 21, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 451071547], - [171, 5, 1134, "Metrics/BlockLength: Block has too many lines. [30/25]", 2526618199], - [220, 5, 1335, "Metrics/BlockLength: Block has too many lines. [32/25]", 2790596215], - [311, 3, 2008, "Metrics/BlockLength: Block has too many lines. [66/25]", 2640155627], - [394, 3, 1052, "Metrics/BlockLength: Block has too many lines. [27/25]", 3988836255], - [440, 3, 2950, "Metrics/BlockLength: Block has too many lines. [89/25]", 961031348], - [441, 5, 1352, "Metrics/BlockLength: Block has too many lines. [37/25]", 1952365669], - [495, 5, 1550, "Metrics/BlockLength: Block has too many lines. [48/25]", 2400197001], - [561, 3, 1665, "Metrics/BlockLength: Block has too many lines. [52/25]", 3884776329], - [650, 3, 1919, "Metrics/BlockLength: Block has too many lines. [57/25]", 2594646583], - [725, 3, 1644, "Metrics/BlockLength: Block has too many lines. [45/25]", 2348710811], - [791, 3, 1600, "Metrics/BlockLength: Block has too many lines. [46/25]", 3683503747] - ], - "spec/integration/partial_template_merger_table_merge_spec.rb:3504046892": [ - [7, 1, 7402, "Metrics/BlockLength: Block has too many lines. [164/25]", 3368892126], - [9, 3, 2986, "Metrics/BlockLength: Block has too many lines. [67/25]", 2267114449], - [65, 5, 1359, "Metrics/BlockLength: Block has too many lines. [28/25]", 3145143002], - [102, 3, 997, "Metrics/BlockLength: Block has too many lines. [26/25]", 3156068215], - [147, 3, 3009, "Metrics/BlockLength: Block has too many lines. [65/25]", 994160212], - [202, 5, 1401, "Metrics/BlockLength: Block has too many lines. [28/25]", 3038951618] - ], - "spec/integration/table_formatting_preservation_spec.rb:3943985446": [ - [6, 1, 3086, "Metrics/BlockLength: Block has too many lines. [56/25]", 2210897849], - [19, 3, 2374, "Metrics/BlockLength: Block has too many lines. [40/25]", 668961519], - [33, 5, 1847, "Metrics/BlockLength: Block has too many lines. [28/25]", 3433318963] - ], - "spec/integration/text_merge_spec.rb:884566200": [ - [6, 1, 7747, "Metrics/BlockLength: Block has too many lines. [204/25]", 2372984305], - [60, 3, 1113, "Metrics/BlockLength: Block has too many lines. [34/25]", 3399970957], - [67, 5, 860, "Metrics/BlockLength: Block has too many lines. [27/25]", 2337191560], - [103, 3, 916, "Metrics/BlockLength: Block has too many lines. [28/25]", 4082963348], - [149, 3, 3001, "Metrics/BlockLength: Block has too many lines. [74/25]", 7776854] - ], - "spec/support/fictive_language_harness.rb:1770581700": [ - [85, 7, 733, "Metrics/AbcSize: Assignment Branch Condition size for `extract_comments` is too high. [<5, 16, 5> 17.49/17]", 1127096515], - [85, 7, 733, "Metrics/MethodLength: Method has too many lines. [22/10]", 1127096515], - [117, 21, 129, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 681912759], - [182, 7, 1084, "Metrics/AbcSize: Assignment Branch Condition size for `parse_statements` is too high. [<9, 28, 7> 30.23/17]", 3123785685], - [182, 7, 1084, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_statements` is too high. [8/7]", 3123785685], - [182, 7, 1084, "Metrics/MethodLength: Method has too many lines. [24/10]", 3123785685], - [233, 5, 9879, "Metrics/ClassLength: Class has too many lines. [228/100]", 3231256134], - [236, 21, 208, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2970487173], - [257, 7, 1981, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_batch` is too high. [<16, 32, 4> 36/17]", 4125392918], - [257, 7, 1981, "Metrics/MethodLength: Method has too many lines. [42/10]", 4125392918], - [342, 7, 778, "Metrics/MethodLength: Method has too many lines. [18/10]", 4189873983], - [364, 7, 844, "Metrics/MethodLength: Method has too many lines. [19/10]", 526186683], - [449, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087956942], - [464, 7, 1065, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_template_preamble_prefix_region` is too high. [<6, 24, 11> 27.07/17]", 2332280467], - [464, 7, 1065, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collapse_template_preamble_prefix_region` is too high. [10/7]", 2332280467], - [464, 7, 1065, "Metrics/MethodLength: Method has too many lines. [20/10]", 2332280467], - [464, 7, 1065, "Metrics/PerceivedComplexity: Perceived complexity for `collapse_template_preamble_prefix_region` is too high. [10/8]", 2332280467] - ], - "spec/support/testable_node.rb:1110514732": [ - [10, 7, 573, "Metrics/MethodLength: Method has too many lines. [12/10]", 798847435], - [10, 22, 226, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 2319398994], - [40, 7, 642, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<11, 14, 6> 18.79/17]", 2249578474], - [40, 21, 131, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 1786967686] - ] -} diff --git a/gems/ast-merge/bin/yard b/gems/ast-merge/bin/yard index 5d516ad6f..a7e8b6eed 100755 --- a/gems/ast-merge/bin/yard +++ b/gems/ast-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec('bundle', 'exec', 'rake', 'yard') +exec("bundle", "exec", "rake", "yard") diff --git a/gems/markdown-merge/.kettle-drift.lock b/gems/markdown-merge/.kettle-drift.lock index 0161251a7..d3c2a2030 100644 --- a/gems/markdown-merge/.kettle-drift.lock +++ b/gems/markdown-merge/.kettle-drift.lock @@ -6,7 +6,8 @@ 80, 120, 160, - 200 + 200, + 240 ] } ], @@ -17,7 +18,8 @@ 91, 131, 171, - 211 + 211, + 251 ] } ], @@ -28,7 +30,8 @@ 81, 121, 161, - 201 + 201, + 241 ] } ], @@ -39,7 +42,8 @@ 93, 133, 173, - 213 + 213, + 253 ] } ], @@ -50,7 +54,8 @@ 96, 136, 176, - 216 + 216, + 256 ] } ], @@ -61,7 +66,8 @@ 82, 122, 162, - 202 + 202, + 242 ] } ], @@ -73,7 +79,8 @@ 100, 140, 180, - 220 + 220, + 260 ] } ], @@ -84,7 +91,8 @@ 101, 141, 181, - 221 + 221, + 261 ] } ], @@ -96,7 +104,8 @@ 87, 127, 167, - 207 + 207, + 247 ] } ], @@ -107,7 +116,8 @@ 110, 150, 190, - 230 + 230, + 270 ] } ], @@ -119,7 +129,8 @@ 79, 119, 159, - 199 + 199, + 239 ] } ], @@ -131,7 +142,8 @@ 109, 149, 189, - 229 + 229, + 269 ] } ], @@ -142,7 +154,8 @@ 85, 125, 165, - 205 + 205, + 245 ] } ], @@ -154,7 +167,8 @@ 92, 132, 172, - 212 + 212, + 252 ] } ], @@ -166,7 +180,8 @@ 88, 128, 168, - 208 + 208, + 248 ] } ], @@ -177,7 +192,8 @@ 86, 126, 166, - 206 + 206, + 246 ] } ], @@ -188,7 +204,8 @@ 103, 143, 183, - 223 + 223, + 263 ] } ], @@ -199,7 +216,8 @@ 102, 142, 182, - 222 + 222, + 262 ] } ], @@ -210,7 +228,8 @@ 97, 137, 177, - 217 + 217, + 257 ] } ], @@ -221,7 +240,8 @@ 106, 146, 186, - 226 + 226, + 266 ] } ], diff --git a/gems/markdown-merge/Gemfile b/gems/markdown-merge/Gemfile index fbf163308..56efdc48c 100644 --- a/gems/markdown-merge/Gemfile +++ b/gems/markdown-merge/Gemfile @@ -232,6 +232,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/markdown-merge/Gemfile.lock b/gems/markdown-merge/Gemfile.lock index f39d8ddab..f7a60e363 100644 --- a/gems/markdown-merge/Gemfile.lock +++ b/gems/markdown-merge/Gemfile.lock @@ -17,39 +17,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -58,193 +26,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -252,29 +34,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -294,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +116,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +283,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +381,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +407,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +440,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +452,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +480,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +491,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +518,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +529,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +542,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +557,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/markly-merge/.kettle-drift.lock b/gems/markly-merge/.kettle-drift.lock index 508d631d8..44ac5c29d 100644 --- a/gems/markly-merge/.kettle-drift.lock +++ b/gems/markly-merge/.kettle-drift.lock @@ -6,7 +6,8 @@ 79, 119, 159, - 199 + 199, + 239 ] } ], @@ -17,7 +18,8 @@ 90, 130, 170, - 210 + 210, + 250 ] } ], @@ -28,7 +30,8 @@ 80, 120, 160, - 200 + 200, + 240 ] } ], @@ -39,7 +42,8 @@ 92, 132, 172, - 212 + 212, + 252 ] } ], @@ -50,7 +54,8 @@ 95, 135, 175, - 215 + 215, + 255 ] } ], @@ -61,7 +66,8 @@ 81, 121, 161, - 201 + 201, + 241 ] } ], @@ -73,7 +79,8 @@ 99, 139, 179, - 219 + 219, + 259 ] } ], @@ -84,7 +91,8 @@ 100, 140, 180, - 220 + 220, + 260 ] } ], @@ -96,7 +104,8 @@ 86, 126, 166, - 206 + 206, + 246 ] } ], @@ -107,7 +116,8 @@ 109, 149, 189, - 229 + 229, + 269 ] } ], @@ -119,7 +129,8 @@ 78, 118, 158, - 198 + 198, + 238 ] } ], @@ -131,7 +142,8 @@ 108, 148, 188, - 228 + 228, + 268 ] } ], @@ -142,7 +154,8 @@ 84, 124, 164, - 204 + 204, + 244 ] } ], @@ -154,7 +167,8 @@ 91, 131, 171, - 211 + 211, + 251 ] } ], @@ -166,7 +180,8 @@ 87, 127, 167, - 207 + 207, + 247 ] } ], @@ -177,7 +192,8 @@ 85, 125, 165, - 205 + 205, + 245 ] } ], @@ -188,7 +204,8 @@ 102, 142, 182, - 222 + 222, + 262 ] } ], @@ -199,7 +216,8 @@ 101, 141, 181, - 221 + 221, + 261 ] } ], @@ -210,7 +228,8 @@ 96, 136, 176, - 216 + 216, + 256 ] } ], @@ -221,7 +240,8 @@ 105, 145, 185, - 225 + 225, + 265 ] } ], diff --git a/gems/markly-merge/.rubocop_gradual.lock b/gems/markly-merge/.rubocop_gradual.lock deleted file mode 100644 index 7b6a96fee..000000000 --- a/gems/markly-merge/.rubocop_gradual.lock +++ /dev/null @@ -1,126 +0,0 @@ -{ - ".simplecov:3376604078": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:1376789005": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/markly-merge.rb:2425755333": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`markly-merge.rb`) should use snake_case.", 5381] - ], - "lib/markly/merge.rb:2367262886": [ - [10, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Markly::Merge`.", 2866359175], - [10, 3, 22686, "Metrics/ModuleLength: Module has too many lines. [484/100]", 3039251951], - [11, 5, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631], - [56, 5, 1957, "Metrics/MethodLength: Method has too many lines. [42/10]", 2638032592], - [101, 5, 1815, "Metrics/MethodLength: Method has too many lines. [37/10]", 421864374], - [141, 5, 1063, "Metrics/MethodLength: Method has too many lines. [23/10]", 598358845], - [179, 5, 523, "Metrics/MethodLength: Method has too many lines. [11/10]", 3598278634], - [193, 5, 1855, "Metrics/MethodLength: Method has too many lines. [37/10]", 2215035372], - [194, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2184804663], - [233, 5, 7461, "Metrics/AbcSize: Assignment Branch Condition size for `markdown_structured_edit_batch_report_projection` is too high. [<1, 30, 0> 30.02/17]", 958979462], - [233, 5, 7461, "Metrics/MethodLength: Method has too many lines. [139/10]", 958979462], - [234, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2184804663], - [253, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 4247938618], - [291, 121, 69, "Layout/LineLength: Line is too long. [189/120]", 713082266], - [375, 5, 928, "Metrics/MethodLength: Method has too many lines. [24/10]", 2523239963], - [416, 5, 613, "Metrics/MethodLength: Method has too many lines. [11/10]", 2967276583], - [416, 52, 144, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3050457682] - ], - "lib/markly/merge/backend.rb:1783442402": [ - [115, 9, 517, "Metrics/MethodLength: Method has too many lines. [14/10]", 66093445], - [207, 9, 453, "Metrics/AbcSize: Assignment Branch Condition size for `text` is too high. [<1, 16, 7> 17.49/17]", 2420537429], - [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:1833318890": [ - [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ], - "spec/fixtures_integration_spec.rb:2168126107": [ - [3, 1, 14870, "Metrics/BlockLength: Block has too many lines. [337/25]", 605418848], - [16, 3, 1325, "Metrics/BlockLength: Block has too many lines. [28/25]", 928093310], - [224, 3, 1341, "Metrics/BlockLength: Block has too many lines. [26/25]", 2630958569], - [307, 3, 1352, "Metrics/BlockLength: Block has too many lines. [30/25]", 2376182886], - [342, 3, 1378, "Metrics/BlockLength: Block has too many lines. [29/25]", 3678391303] - ], - "spec/markly/merge/partial_template_merger_integration_spec.rb:2767758749": [ - [5, 1, 4127, "Metrics/BlockLength: Block has too many lines. [107/25]", 2704075138], - [25, 3, 1109, "Metrics/BlockLength: Block has too many lines. [30/25]", 2339832693], - [84, 3, 1236, "Metrics/BlockLength: Block has too many lines. [30/25]", 503179966], - [84, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 567791365] - ], - "spec/reproducible_merge_spec.rb:1557187402": [ - [6, 1, 1458, "Metrics/BlockLength: Block has too many lines. [35/25]", 100797552] - ] -} diff --git a/gems/markly-merge/Gemfile b/gems/markly-merge/Gemfile index 3d1cc291f..f014d1167 100644 --- a/gems/markly-merge/Gemfile +++ b/gems/markly-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source 'https://gem.coop' +source "https://gem.coop" git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,17 +19,61 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ['~> 1.0', '>= 1.0.8'] -gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ["~> 1.0", ">= 1.0.8"] +gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ markdown-merge ] -direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') +direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? + +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) + direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") + direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == "nomono" } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + if nomono_locked + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] + end + end + Kernel.send(:gem, "nomono", *nomono_activation_requirements) + require "nomono/bundler" + if direct_sibling_templating && !direct_sibling_local + ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + end + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: "STRUCTUREDMERGE", + path_env: "STRUCTUREDMERGE_DEV", + root: ["src", "my", "structuredmerge"] + ) + rescue LoadError + warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + else + ENV.delete("STRUCTUREDMERGE_DEV") + end + end + end +end if direct_sibling_gems.any? && (direct_sibling_local || @@ -249,25 +293,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? # Debugging -eval_gemfile 'gemfiles/modular/debug.gemfile' +eval_gemfile "gemfiles/modular/debug.gemfile" # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile 'gemfiles/modular/coverage.gemfile' +eval_gemfile "gemfiles/modular/coverage.gemfile" # Linting -eval_gemfile 'gemfiles/modular/style.gemfile' +eval_gemfile "gemfiles/modular/style.gemfile" # Documentation -eval_gemfile 'gemfiles/modular/documentation.gemfile' +eval_gemfile "gemfiles/modular/documentation.gemfile" # Optional -eval_gemfile 'gemfiles/modular/optional.gemfile' +eval_gemfile "gemfiles/modular/optional.gemfile" ### Std Lib Extracted Gems -eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' +eval_gemfile "gemfiles/modular/x_std_libs.gemfile" # See unlocked_deps appraisal for more details on irb inclusion -gem 'irb', '~> 1.17' # ruby >= 2.7 +gem "irb", "~> 1.17" # ruby >= 2.7 diff --git a/gems/markly-merge/Gemfile.lock b/gems/markly-merge/Gemfile.lock index 190fca775..7f98b7804 100644 --- a/gems/markly-merge/Gemfile.lock +++ b/gems/markly-merge/Gemfile.lock @@ -16,6 +16,281 @@ PATH markly (~> 0.9) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -27,11 +302,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +310,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -48,7 +324,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -104,15 +379,6 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -131,10 +397,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) @@ -275,25 +537,23 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -327,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -378,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-drift! + kettle-jem! + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -403,38 +685,61 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -447,15 +752,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 @@ -477,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -488,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -515,17 +830,19 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -539,14 +856,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -554,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/markly-merge/Rakefile b/gems/markly-merge/Rakefile index 9946d12a1..319456e08 100644 --- a/gems/markly-merge/Rakefile +++ b/gems/markly-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require 'kettle/drift' + require "kettle/drift" Kettle::Drift.install_tasks rescue LoadError - desc('(stub) kettle:drift:check is unavailable') - task('kettle:drift:check') do + desc("(stub) kettle:drift:check is unavailable") + task("kettle:drift:check") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:update is unavailable') - task('kettle:drift:update') do + desc("(stub) kettle:drift:update is unavailable") + task("kettle:drift:update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:force_update is unavailable') - task('kettle:drift:force_update') do + desc("(stub) kettle:drift:force_update is unavailable") + task("kettle:drift:force_update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift is unavailable') - task('kettle:drift' => 'kettle:drift:update') + desc("(stub) kettle:drift is unavailable") + task("kettle:drift" => "kettle:drift:update") end ### TEMPLATING TASKS diff --git a/gems/markly-merge/bin/yard b/gems/markly-merge/bin/yard index 5d516ad6f..a7e8b6eed 100755 --- a/gems/markly-merge/bin/yard +++ b/gems/markly-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec('bundle', 'exec', 'rake', 'yard') +exec("bundle", "exec", "rake", "yard") diff --git a/gems/markly-merge/lib/markly/merge/version.rb b/gems/markly-merge/lib/markly/merge/version.rb index 3bfd8e9b0..b4ff2ffeb 100644 --- a/gems/markly-merge/lib/markly/merge/version.rb +++ b/gems/markly-merge/lib/markly/merge/version.rb @@ -3,7 +3,7 @@ module Markly module Merge module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/tree_haver/Gemfile.lock b/gems/tree_haver/Gemfile.lock index 8e744e1af..7ac4910fb 100644 --- a/gems/tree_haver/Gemfile.lock +++ b/gems/tree_haver/Gemfile.lock @@ -7,59 +7,288 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -GEM - remote: https://gem.coop/ +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - ansi (1.6.0) - appraisal2 (3.2.0) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - ast (2.4.3) - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) ast-crispr-markdown-markly (7.1.0) ast-crispr (= 7.1.0) markly-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) prism (>= 1.0) version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: ast-merge (7.1.0) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) - backports (3.25.3) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: bash-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +GEM + remote: https://gem.coop/ + specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + ansi (1.6.0) + appraisal2 (3.2.0) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + 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) citrus (3.0.2) - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) cmdparse (3.0.7) commonmarker (2.9.0-aarch64-linux) commonmarker (2.9.0-aarch64-linux-musl) commonmarker (2.9.0-arm64-darwin) commonmarker (2.9.0-x86_64-linux) commonmarker (2.9.0-x86_64-linux-musl) - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -69,10 +298,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docile (1.4.1) - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -122,10 +347,6 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) @@ -133,31 +354,6 @@ GEM ruby-progressbar (~> 1.13) kettle-drift (1.0.5) version_gem (~> 1.1, >= 1.1.13) - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -181,24 +377,12 @@ GEM turbo_tests2 (~> 3.1, >= 3.1.12) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) 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.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -224,18 +408,9 @@ GEM prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) psych (5.4.0) date stringio - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -244,11 +419,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) rdoc (6.17.0) erb psych (>= 4.0.0) @@ -344,10 +514,6 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -407,10 +573,6 @@ GEM version_gem (~> 1.1, >= 1.1.13) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) @@ -434,10 +596,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.13) - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) yard (0.9.45) yard-fence (0.9.6) rdoc (>= 6.11, < 8) @@ -470,24 +628,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem (>= 7.0) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -496,20 +675,27 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml (~> 0.3) + toml-merge! toml-rb (~> 4.1) tree_haver! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -520,10 +706,13 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) @@ -554,6 +743,7 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 @@ -587,6 +777,8 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 @@ -630,6 +822,7 @@ 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -639,6 +832,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -661,6 +855,7 @@ CHECKSUMS tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) sha256=ad6743a373eeac954c1b659b17af3aff1c82918b3ce9c9dc572a7c70ff843cdd tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -673,6 +868,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From ecfce407d4f875bb473779926285b48aa137db50 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:34:14 -0600 Subject: [PATCH 188/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../.rubocop_gradual.lock | 137 +++++++ gems/ast-crispr-markdown-markly/Gemfile | 68 ++- gems/ast-crispr-markdown-markly/Gemfile.lock | 386 ++---------------- gems/ast-crispr-markdown-markly/Rakefile | 18 +- gems/ast-crispr-markdown-markly/bin/yard | 2 +- .../lib/ast/crispr/markdown/markly/version.rb | 2 +- gems/markdown-merge/Gemfile.lock | 327 ++++++++++++++- gems/markly-merge/.rubocop_gradual.lock | 126 ++++++ gems/markly-merge/Gemfile | 68 ++- gems/markly-merge/Rakefile | 18 +- gems/markly-merge/bin/yard | 2 +- gems/markly-merge/lib/markly/merge/version.rb | 2 +- 12 files changed, 717 insertions(+), 439 deletions(-) create mode 100644 gems/ast-crispr-markdown-markly/.rubocop_gradual.lock create mode 100644 gems/markly-merge/.rubocop_gradual.lock diff --git a/gems/ast-crispr-markdown-markly/.rubocop_gradual.lock b/gems/ast-crispr-markdown-markly/.rubocop_gradual.lock new file mode 100644 index 000000000..67ec8026a --- /dev/null +++ b/gems/ast-crispr-markdown-markly/.rubocop_gradual.lock @@ -0,0 +1,137 @@ +{ + ".simplecov:971555246": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:4085821453": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "ast-crispr-markdown-markly.gemspec:1188642188": [ + [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/ast-crispr-markdown-markly.rb:374208510": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`ast-crispr-markdown-markly.rb`) should use snake_case.", 5381] + ], + "lib/ast/crispr/markdown/markly.rb:2564514831": [ + [11, 7, 13, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::Markdown::Markly`.", 95841343], + [14, 9, 13, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Markdown::Markly::Adapter`.", 2579377404], + [14, 9, 13970, "Metrics/ClassLength: Class has too many lines. [335/100]", 429557235], + [64, 11, 700, "Metrics/MethodLength: Method has too many lines. [15/10]", 196504356], + [90, 13, 87, "Style/RaiseArgs: Provide an exception class and message as arguments to `raise`.", 1878059440], + [93, 11, 1781, "Metrics/MethodLength: Method has too many lines. [39/10]", 2020253431], + [137, 11, 739, "Metrics/AbcSize: Assignment Branch Condition size for `build_heading_sections` is too high. [<5, 16, 3> 17.03/17]", 3186655060], + [137, 11, 739, "Metrics/MethodLength: Method has too many lines. [14/10]", 3186655060], + [156, 11, 915, "Metrics/AbcSize: Assignment Branch Condition size for `build_link_definitions` is too high. [<2, 19, 7> 20.35/17]", 2943708156], + [156, 11, 915, "Metrics/MethodLength: Method has too many lines. [18/10]", 2943708156], + [195, 11, 1750, "Metrics/AbcSize: Assignment Branch Condition size for `build_table_rows` is too high. [<16, 44, 17> 49.81/17]", 3931509409], + [195, 11, 1750, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_table_rows` is too high. [16/7]", 3931509409], + [195, 11, 1750, "Metrics/MethodLength: Method has too many lines. [34/10]", 3931509409], + [195, 11, 1750, "Metrics/PerceivedComplexity: Perceived complexity for `build_table_rows` is too high. [16/8]", 3931509409], + [253, 11, 768, "Metrics/MethodLength: Method has too many lines. [14/10]", 737914131], + [297, 11, 622, "Metrics/MethodLength: Method has too many lines. [18/10]", 1706283245], + [320, 11, 717, "Metrics/MethodLength: Method has too many lines. [15/10]", 1919892283], + [341, 11, 977, "Metrics/AbcSize: Assignment Branch Condition size for `inline_link_reference_at` is too high. [<6, 17, 11> 21.12/17]", 2987695093], + [341, 11, 977, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `inline_link_reference_at` is too high. [8/7]", 2987695093], + [341, 11, 977, "Metrics/MethodLength: Method has too many lines. [19/10]", 2987695093], + [366, 37, 83, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2884863618], + [379, 11, 404, "Metrics/MethodLength: Method has too many lines. [13/10]", 427422621], + [396, 9, 16, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::Markdown::Markly::Selectors`.", 2133324825], + [396, 9, 8840, "Metrics/ModuleLength: Module has too many lines. [186/100]", 1134016796], + [399, 11, 1452, "Metrics/AbcSize: Assignment Branch Condition size for `heading_section` is too high. [<2, 21, 7> 22.23/17]", 1578141243], + [399, 11, 1452, "Metrics/MethodLength: Method has too many lines. [30/10]", 1578141243], + [399, 30, 73, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 515735878], + [433, 11, 1397, "Metrics/AbcSize: Assignment Branch Condition size for `link_definition` is too high. [<2, 22, 8> 23.49/17]", 2035221200], + [433, 11, 1397, "Metrics/MethodLength: Method has too many lines. [29/10]", 2035221200], + [433, 30, 68, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2927391196], + [466, 11, 1236, "Metrics/MethodLength: Method has too many lines. [27/10]", 2705412671], + [497, 11, 1632, "Metrics/AbcSize: Assignment Branch Condition size for `inline_reference` is too high. [<2, 25, 7> 26.04/17]", 2822954343], + [497, 11, 1632, "Metrics/MethodLength: Method has too many lines. [32/10]", 2822954343], + [497, 31, 79, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 871966347], + [533, 11, 3009, "Metrics/AbcSize: Assignment Branch Condition size for `html_comment_block` is too high. [<14, 43, 23> 50.73/17]", 1757586727], + [533, 11, 3009, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `html_comment_block` is too high. [18/7]", 1757586727], + [533, 11, 3009, "Metrics/MethodLength: Method has too many lines. [56/10]", 1757586727], + [533, 11, 3009, "Metrics/PerceivedComplexity: Perceived complexity for `html_comment_block` is too high. [18/8]", 1757586727], + [533, 33, 148, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 4247948333], + [545, 23, 2311, "Metrics/BlockLength: Block has too many lines. [43/25]", 3166751632], + [550, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 236074548] + ], + "spec/ast/crispr/markdown/markly_spec.rb:4192197438": [ + [3, 1, 13013, "Metrics/BlockLength: Block has too many lines. [238/25]", 467937705], + [28, 3, 10302, "Metrics/BlockLength: Block has too many lines. [182/25]", 3591393606], + [132, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 2063489827], + [134, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 2916348790], + [152, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 3082451518], + [154, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 3021964175], + [267, 3, 1687, "Metrics/BlockLength: Block has too many lines. [33/25]", 4221412326] + ] +} diff --git a/gems/ast-crispr-markdown-markly/Gemfile b/gems/ast-crispr-markdown-markly/Gemfile index 05281efd5..fd20e7992 100644 --- a/gems/ast-crispr-markdown-markly/Gemfile +++ b/gems/ast-crispr-markdown-markly/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source "https://gem.coop" +source 'https://gem.coop' git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,58 +19,54 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ["~> 1.0", ">= 1.0.8"] -gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ['~> 1.0', '>= 1.0.8'] +gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ast-crispr markly-merge ] -direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") +direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? if direct_sibling_gems.any? && - (direct_sibling_local || - ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) - direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") - direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) begin nomono_activation_requirements = nomono_requirements - nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) if File.file?(nomono_lockfile) nomono_locked_spec = Bundler::LockfileParser - .new(Bundler.read_file(nomono_lockfile)) - .specs - .find { |spec| spec.name == "nomono" } + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } nomono_locked = nomono_locked_spec && - Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) - if nomono_locked - nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] - end - end - Kernel.send(:gem, "nomono", *nomono_activation_requirements) - require "nomono/bundler" - if direct_sibling_templating && !direct_sibling_local - ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local eval_nomono_gems( gems: direct_sibling_gems, - prefix: "STRUCTUREDMERGE", - path_env: "STRUCTUREDMERGE_DEV", - root: ["src", "my", "structuredmerge"] + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] ) rescue LoadError - warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' ensure if direct_sibling_templating && !direct_sibling_local if direct_sibling_dev_was_set - ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original else - ENV.delete("STRUCTUREDMERGE_DEV") + ENV.delete('STRUCTUREDMERGE_DEV') end end end @@ -294,25 +290,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging -eval_gemfile "gemfiles/modular/debug.gemfile" +eval_gemfile 'gemfiles/modular/debug.gemfile' # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile "gemfiles/modular/coverage.gemfile" +eval_gemfile 'gemfiles/modular/coverage.gemfile' # Linting -eval_gemfile "gemfiles/modular/style.gemfile" +eval_gemfile 'gemfiles/modular/style.gemfile' # Documentation -eval_gemfile "gemfiles/modular/documentation.gemfile" +eval_gemfile 'gemfiles/modular/documentation.gemfile' # Optional -eval_gemfile "gemfiles/modular/optional.gemfile" +eval_gemfile 'gemfiles/modular/optional.gemfile' ### Std Lib Extracted Gems -eval_gemfile "gemfiles/modular/x_std_libs.gemfile" +eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' # See unlocked_deps appraisal for more details on irb inclusion -gem "irb", "~> 1.17" # ruby >= 2.7 +gem 'irb', '~> 1.17' # ruby >= 2.7 diff --git a/gems/ast-crispr-markdown-markly/Gemfile.lock b/gems/ast-crispr-markdown-markly/Gemfile.lock index 69b980543..29a2558b5 100644 --- a/gems/ast-crispr-markdown-markly/Gemfile.lock +++ b/gems/ast-crispr-markdown-markly/Gemfile.lock @@ -17,15 +17,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) ast-merge (= 7.1.0) @@ -33,264 +25,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) markdown-merge (= 7.1.0) markly (~> 0.9) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -302,6 +43,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -310,12 +56,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -324,6 +64,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -379,6 +120,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -397,6 +147,10 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) @@ -542,18 +296,22 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -587,11 +345,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -640,43 +398,23 @@ DEPENDENCIES appraisal2 (~> 3.0, >= 3.0.6) 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,26 +423,18 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -713,33 +443,20 @@ CHECKSUMS ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,20 +469,15 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 @@ -787,14 +499,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +510,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,19 +537,18 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,19 +562,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +577,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ast-crispr-markdown-markly/Rakefile b/gems/ast-crispr-markdown-markly/Rakefile index c599763c0..799afe6f5 100644 --- a/gems/ast-crispr-markdown-markly/Rakefile +++ b/gems/ast-crispr-markdown-markly/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require "kettle/drift" + require 'kettle/drift' Kettle::Drift.install_tasks rescue LoadError - desc("(stub) kettle:drift:check is unavailable") - task("kettle:drift:check") do + desc('(stub) kettle:drift:check is unavailable') + task('kettle:drift:check') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:update is unavailable") - task("kettle:drift:update") do + desc('(stub) kettle:drift:update is unavailable') + task('kettle:drift:update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:force_update is unavailable") - task("kettle:drift:force_update") do + desc('(stub) kettle:drift:force_update is unavailable') + task('kettle:drift:force_update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift is unavailable") - task("kettle:drift" => "kettle:drift:update") + desc('(stub) kettle:drift is unavailable') + task('kettle:drift' => 'kettle:drift:update') end ### TEMPLATING TASKS diff --git a/gems/ast-crispr-markdown-markly/bin/yard b/gems/ast-crispr-markdown-markly/bin/yard index a7e8b6eed..5d516ad6f 100755 --- a/gems/ast-crispr-markdown-markly/bin/yard +++ b/gems/ast-crispr-markdown-markly/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec("bundle", "exec", "rake", "yard") +exec('bundle', 'exec', 'rake', 'yard') 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 e184c556f..ba5f0b149 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 @@ -5,7 +5,7 @@ module Crispr module Markdown module Markly module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/markdown-merge/Gemfile.lock b/gems/markdown-merge/Gemfile.lock index f7a60e363..f39d8ddab 100644 --- a/gems/markdown-merge/Gemfile.lock +++ b/gems/markdown-merge/Gemfile.lock @@ -17,7 +17,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -26,7 +58,193 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -34,6 +252,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -53,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,24 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -407,32 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,20 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -480,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -491,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -518,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -529,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -542,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/markly-merge/.rubocop_gradual.lock b/gems/markly-merge/.rubocop_gradual.lock new file mode 100644 index 000000000..7b6a96fee --- /dev/null +++ b/gems/markly-merge/.rubocop_gradual.lock @@ -0,0 +1,126 @@ +{ + ".simplecov:3376604078": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:1376789005": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/markly-merge.rb:2425755333": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`markly-merge.rb`) should use snake_case.", 5381] + ], + "lib/markly/merge.rb:2367262886": [ + [10, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Markly::Merge`.", 2866359175], + [10, 3, 22686, "Metrics/ModuleLength: Module has too many lines. [484/100]", 3039251951], + [11, 5, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631], + [56, 5, 1957, "Metrics/MethodLength: Method has too many lines. [42/10]", 2638032592], + [101, 5, 1815, "Metrics/MethodLength: Method has too many lines. [37/10]", 421864374], + [141, 5, 1063, "Metrics/MethodLength: Method has too many lines. [23/10]", 598358845], + [179, 5, 523, "Metrics/MethodLength: Method has too many lines. [11/10]", 3598278634], + [193, 5, 1855, "Metrics/MethodLength: Method has too many lines. [37/10]", 2215035372], + [194, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2184804663], + [233, 5, 7461, "Metrics/AbcSize: Assignment Branch Condition size for `markdown_structured_edit_batch_report_projection` is too high. [<1, 30, 0> 30.02/17]", 958979462], + [233, 5, 7461, "Metrics/MethodLength: Method has too many lines. [139/10]", 958979462], + [234, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2184804663], + [253, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 4247938618], + [291, 121, 69, "Layout/LineLength: Line is too long. [189/120]", 713082266], + [375, 5, 928, "Metrics/MethodLength: Method has too many lines. [24/10]", 2523239963], + [416, 5, 613, "Metrics/MethodLength: Method has too many lines. [11/10]", 2967276583], + [416, 52, 144, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3050457682] + ], + "lib/markly/merge/backend.rb:1783442402": [ + [115, 9, 517, "Metrics/MethodLength: Method has too many lines. [14/10]", 66093445], + [207, 9, 453, "Metrics/AbcSize: Assignment Branch Condition size for `text` is too high. [<1, 16, 7> 17.49/17]", 2420537429], + [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:1833318890": [ + [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ], + "spec/fixtures_integration_spec.rb:2168126107": [ + [3, 1, 14870, "Metrics/BlockLength: Block has too many lines. [337/25]", 605418848], + [16, 3, 1325, "Metrics/BlockLength: Block has too many lines. [28/25]", 928093310], + [224, 3, 1341, "Metrics/BlockLength: Block has too many lines. [26/25]", 2630958569], + [307, 3, 1352, "Metrics/BlockLength: Block has too many lines. [30/25]", 2376182886], + [342, 3, 1378, "Metrics/BlockLength: Block has too many lines. [29/25]", 3678391303] + ], + "spec/markly/merge/partial_template_merger_integration_spec.rb:2767758749": [ + [5, 1, 4127, "Metrics/BlockLength: Block has too many lines. [107/25]", 2704075138], + [25, 3, 1109, "Metrics/BlockLength: Block has too many lines. [30/25]", 2339832693], + [84, 3, 1236, "Metrics/BlockLength: Block has too many lines. [30/25]", 503179966], + [84, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 567791365] + ], + "spec/reproducible_merge_spec.rb:1557187402": [ + [6, 1, 1458, "Metrics/BlockLength: Block has too many lines. [35/25]", 100797552] + ] +} diff --git a/gems/markly-merge/Gemfile b/gems/markly-merge/Gemfile index f014d1167..a208b31c6 100644 --- a/gems/markly-merge/Gemfile +++ b/gems/markly-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source "https://gem.coop" +source 'https://gem.coop' git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,57 +19,53 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ["~> 1.0", ">= 1.0.8"] -gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ['~> 1.0', '>= 1.0.8'] +gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ markdown-merge ] -direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") +direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? if direct_sibling_gems.any? && - (direct_sibling_local || - ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) - direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") - direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) begin nomono_activation_requirements = nomono_requirements - nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) if File.file?(nomono_lockfile) nomono_locked_spec = Bundler::LockfileParser - .new(Bundler.read_file(nomono_lockfile)) - .specs - .find { |spec| spec.name == "nomono" } + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } nomono_locked = nomono_locked_spec && - Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) - if nomono_locked - nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] - end - end - Kernel.send(:gem, "nomono", *nomono_activation_requirements) - require "nomono/bundler" - if direct_sibling_templating && !direct_sibling_local - ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local eval_nomono_gems( gems: direct_sibling_gems, - prefix: "STRUCTUREDMERGE", - path_env: "STRUCTUREDMERGE_DEV", - root: ["src", "my", "structuredmerge"] + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] ) rescue LoadError - warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' ensure if direct_sibling_templating && !direct_sibling_local if direct_sibling_dev_was_set - ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original else - ENV.delete("STRUCTUREDMERGE_DEV") + ENV.delete('STRUCTUREDMERGE_DEV') end end end @@ -293,25 +289,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging -eval_gemfile "gemfiles/modular/debug.gemfile" +eval_gemfile 'gemfiles/modular/debug.gemfile' # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile "gemfiles/modular/coverage.gemfile" +eval_gemfile 'gemfiles/modular/coverage.gemfile' # Linting -eval_gemfile "gemfiles/modular/style.gemfile" +eval_gemfile 'gemfiles/modular/style.gemfile' # Documentation -eval_gemfile "gemfiles/modular/documentation.gemfile" +eval_gemfile 'gemfiles/modular/documentation.gemfile' # Optional -eval_gemfile "gemfiles/modular/optional.gemfile" +eval_gemfile 'gemfiles/modular/optional.gemfile' ### Std Lib Extracted Gems -eval_gemfile "gemfiles/modular/x_std_libs.gemfile" +eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' # See unlocked_deps appraisal for more details on irb inclusion -gem "irb", "~> 1.17" # ruby >= 2.7 +gem 'irb', '~> 1.17' # ruby >= 2.7 diff --git a/gems/markly-merge/Rakefile b/gems/markly-merge/Rakefile index 319456e08..9946d12a1 100644 --- a/gems/markly-merge/Rakefile +++ b/gems/markly-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require "kettle/drift" + require 'kettle/drift' Kettle::Drift.install_tasks rescue LoadError - desc("(stub) kettle:drift:check is unavailable") - task("kettle:drift:check") do + desc('(stub) kettle:drift:check is unavailable') + task('kettle:drift:check') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:update is unavailable") - task("kettle:drift:update") do + desc('(stub) kettle:drift:update is unavailable') + task('kettle:drift:update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:force_update is unavailable") - task("kettle:drift:force_update") do + desc('(stub) kettle:drift:force_update is unavailable') + task('kettle:drift:force_update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift is unavailable") - task("kettle:drift" => "kettle:drift:update") + desc('(stub) kettle:drift is unavailable') + task('kettle:drift' => 'kettle:drift:update') end ### TEMPLATING TASKS diff --git a/gems/markly-merge/bin/yard b/gems/markly-merge/bin/yard index a7e8b6eed..5d516ad6f 100755 --- a/gems/markly-merge/bin/yard +++ b/gems/markly-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec("bundle", "exec", "rake", "yard") +exec('bundle', 'exec', 'rake', 'yard') diff --git a/gems/markly-merge/lib/markly/merge/version.rb b/gems/markly-merge/lib/markly/merge/version.rb index b4ff2ffeb..3bfd8e9b0 100644 --- a/gems/markly-merge/lib/markly/merge/version.rb +++ b/gems/markly-merge/lib/markly/merge/version.rb @@ -3,7 +3,7 @@ module Markly module Merge module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end From 39953af08dca4426be5cf2d9b2179493e3034f1c Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:34:16 -0600 Subject: [PATCH 189/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-crispr-markdown-markly/Gemfile.lock | 335 +++++++++++++++- gems/json-merge/Gemfile.lock | 353 ++++++++++++++++- gems/markly-merge/Gemfile.lock | 394 ++----------------- 3 files changed, 700 insertions(+), 382 deletions(-) diff --git a/gems/ast-crispr-markdown-markly/Gemfile.lock b/gems/ast-crispr-markdown-markly/Gemfile.lock index 29a2558b5..0e9612d0a 100644 --- a/gems/ast-crispr-markdown-markly/Gemfile.lock +++ b/gems/ast-crispr-markdown-markly/Gemfile.lock @@ -17,7 +17,15 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: ast-crispr (7.1.0) ast-merge (= 7.1.0) @@ -25,13 +33,248 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: markly-merge (7.1.0) markdown-merge (= 7.1.0) markly (~> 0.9) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -43,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -56,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -119,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -147,10 +393,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) @@ -345,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -398,23 +640,43 @@ DEPENDENCIES appraisal2 (~> 3.0, >= 3.0.6) 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -423,18 +685,26 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -443,13 +713,26 @@ CHECKSUMS ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -457,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -469,15 +753,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 @@ -499,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -510,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -537,9 +831,11 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -549,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -562,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -577,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/json-merge/Gemfile.lock b/gems/json-merge/Gemfile.lock index 84c77ede1..3271a7758 100644 --- a/gems/json-merge/Gemfile.lock +++ b/gems/json-merge/Gemfile.lock @@ -16,6 +16,265 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -103,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -131,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -322,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -373,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -398,31 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -430,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -442,20 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -470,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -481,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -508,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -519,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -532,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -547,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/markly-merge/Gemfile.lock b/gems/markly-merge/Gemfile.lock index 7f98b7804..e32016aaf 100644 --- a/gems/markly-merge/Gemfile.lock +++ b/gems/markly-merge/Gemfile.lock @@ -17,280 +17,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -302,6 +35,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -310,12 +48,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -324,6 +56,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -379,6 +112,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -537,23 +279,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -587,11 +331,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +382,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,61 +408,38 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,20 +452,15 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 @@ -787,14 +482,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +493,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,19 +520,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,19 +544,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +559,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 1d4d8e2486f82a1c9d74368437807d2870452e91 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:34:52 -0600 Subject: [PATCH 190/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-merge-git/.kettle-drift.lock | 60 ++- gems/ast-merge-git/Gemfile | 40 ++ gems/ast-merge-git/Gemfile.lock | 407 ++++++++++++++++++-- gems/ast-merge/Gemfile | 68 ++-- gems/ast-merge/Rakefile | 18 +- gems/ast-merge/bin/yard | 2 +- gems/ast-merge/lib/ast/merge/version.rb | 2 +- gems/json-merge/.kettle-drift.lock | 60 ++- gems/json-merge/Gemfile | 40 ++ gems/json-merge/Gemfile.lock | 327 +--------------- gems/markdown-merge/Gemfile.lock | 353 +---------------- gems/markly-merge/Gemfile.lock | 343 ++++++++++++++++- gems/plain-merge/.kettle-drift.lock | 60 ++- gems/plain-merge/Gemfile | 70 +++- gems/plain-merge/Gemfile.lock | 353 ++++++++++++++++- gems/plain-merge/Rakefile | 18 +- gems/plain-merge/lib/plain/merge/version.rb | 2 +- 17 files changed, 1363 insertions(+), 860 deletions(-) diff --git a/gems/ast-merge-git/.kettle-drift.lock b/gems/ast-merge-git/.kettle-drift.lock index 0161251a7..d3c2a2030 100644 --- a/gems/ast-merge-git/.kettle-drift.lock +++ b/gems/ast-merge-git/.kettle-drift.lock @@ -6,7 +6,8 @@ 80, 120, 160, - 200 + 200, + 240 ] } ], @@ -17,7 +18,8 @@ 91, 131, 171, - 211 + 211, + 251 ] } ], @@ -28,7 +30,8 @@ 81, 121, 161, - 201 + 201, + 241 ] } ], @@ -39,7 +42,8 @@ 93, 133, 173, - 213 + 213, + 253 ] } ], @@ -50,7 +54,8 @@ 96, 136, 176, - 216 + 216, + 256 ] } ], @@ -61,7 +66,8 @@ 82, 122, 162, - 202 + 202, + 242 ] } ], @@ -73,7 +79,8 @@ 100, 140, 180, - 220 + 220, + 260 ] } ], @@ -84,7 +91,8 @@ 101, 141, 181, - 221 + 221, + 261 ] } ], @@ -96,7 +104,8 @@ 87, 127, 167, - 207 + 207, + 247 ] } ], @@ -107,7 +116,8 @@ 110, 150, 190, - 230 + 230, + 270 ] } ], @@ -119,7 +129,8 @@ 79, 119, 159, - 199 + 199, + 239 ] } ], @@ -131,7 +142,8 @@ 109, 149, 189, - 229 + 229, + 269 ] } ], @@ -142,7 +154,8 @@ 85, 125, 165, - 205 + 205, + 245 ] } ], @@ -154,7 +167,8 @@ 92, 132, 172, - 212 + 212, + 252 ] } ], @@ -166,7 +180,8 @@ 88, 128, 168, - 208 + 208, + 248 ] } ], @@ -177,7 +192,8 @@ 86, 126, 166, - 206 + 206, + 246 ] } ], @@ -188,7 +204,8 @@ 103, 143, 183, - 223 + 223, + 263 ] } ], @@ -199,7 +216,8 @@ 102, 142, 182, - 222 + 222, + 262 ] } ], @@ -210,7 +228,8 @@ 97, 137, 177, - 217 + 217, + 257 ] } ], @@ -221,7 +240,8 @@ 106, 146, 186, - 226 + 226, + 266 ] } ], diff --git a/gems/ast-merge-git/Gemfile b/gems/ast-merge-git/Gemfile index b33678050..9087f2b95 100644 --- a/gems/ast-merge-git/Gemfile +++ b/gems/ast-merge-git/Gemfile @@ -232,6 +232,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/ast-merge-git/Gemfile.lock b/gems/ast-merge-git/Gemfile.lock index 4681158d7..24bd36523 100644 --- a/gems/ast-merge-git/Gemfile.lock +++ b/gems/ast-merge-git/Gemfile.lock @@ -16,6 +16,281 @@ PATH json-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -27,11 +302,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +310,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -48,7 +324,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -98,25 +373,12 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -135,6 +397,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -274,25 +537,23 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -326,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -377,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-drift! + kettle-jem! + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -402,39 +685,61 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -447,20 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -475,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -486,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -513,17 +830,19 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -537,14 +856,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -552,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ast-merge/Gemfile b/gems/ast-merge/Gemfile index 42f08610c..8b094b8a5 100644 --- a/gems/ast-merge/Gemfile +++ b/gems/ast-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source "https://gem.coop" +source 'https://gem.coop' git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,57 +19,53 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ["~> 1.0", ">= 1.0.8"] -gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ['~> 1.0', '>= 1.0.8'] +gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ tree_haver ] -direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") +direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? if direct_sibling_gems.any? && - (direct_sibling_local || - ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) - direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") - direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) begin nomono_activation_requirements = nomono_requirements - nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) if File.file?(nomono_lockfile) nomono_locked_spec = Bundler::LockfileParser - .new(Bundler.read_file(nomono_lockfile)) - .specs - .find { |spec| spec.name == "nomono" } + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } nomono_locked = nomono_locked_spec && - Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) - if nomono_locked - nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] - end - end - Kernel.send(:gem, "nomono", *nomono_activation_requirements) - require "nomono/bundler" - if direct_sibling_templating && !direct_sibling_local - ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local eval_nomono_gems( gems: direct_sibling_gems, - prefix: "STRUCTUREDMERGE", - path_env: "STRUCTUREDMERGE_DEV", - root: ["src", "my", "structuredmerge"] + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] ) rescue LoadError - warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' ensure if direct_sibling_templating && !direct_sibling_local if direct_sibling_dev_was_set - ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original else - ENV.delete("STRUCTUREDMERGE_DEV") + ENV.delete('STRUCTUREDMERGE_DEV') end end end @@ -293,25 +289,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging -eval_gemfile "gemfiles/modular/debug.gemfile" +eval_gemfile 'gemfiles/modular/debug.gemfile' # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile "gemfiles/modular/coverage.gemfile" +eval_gemfile 'gemfiles/modular/coverage.gemfile' # Linting -eval_gemfile "gemfiles/modular/style.gemfile" +eval_gemfile 'gemfiles/modular/style.gemfile' # Documentation -eval_gemfile "gemfiles/modular/documentation.gemfile" +eval_gemfile 'gemfiles/modular/documentation.gemfile' # Optional -eval_gemfile "gemfiles/modular/optional.gemfile" +eval_gemfile 'gemfiles/modular/optional.gemfile' ### Std Lib Extracted Gems -eval_gemfile "gemfiles/modular/x_std_libs.gemfile" +eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' # See unlocked_deps appraisal for more details on irb inclusion -gem "irb", "~> 1.17" # ruby >= 2.7 +gem 'irb', '~> 1.17' # ruby >= 2.7 diff --git a/gems/ast-merge/Rakefile b/gems/ast-merge/Rakefile index 6b4e21dec..339c9a3cb 100644 --- a/gems/ast-merge/Rakefile +++ b/gems/ast-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require "kettle/drift" + require 'kettle/drift' Kettle::Drift.install_tasks rescue LoadError - desc("(stub) kettle:drift:check is unavailable") - task("kettle:drift:check") do + desc('(stub) kettle:drift:check is unavailable') + task('kettle:drift:check') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:update is unavailable") - task("kettle:drift:update") do + desc('(stub) kettle:drift:update is unavailable') + task('kettle:drift:update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:force_update is unavailable") - task("kettle:drift:force_update") do + desc('(stub) kettle:drift:force_update is unavailable') + task('kettle:drift:force_update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift is unavailable") - task("kettle:drift" => "kettle:drift:update") + desc('(stub) kettle:drift is unavailable') + task('kettle:drift' => 'kettle:drift:update') end ### TEMPLATING TASKS diff --git a/gems/ast-merge/bin/yard b/gems/ast-merge/bin/yard index a7e8b6eed..5d516ad6f 100755 --- a/gems/ast-merge/bin/yard +++ b/gems/ast-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec("bundle", "exec", "rake", "yard") +exec('bundle', 'exec', 'rake', 'yard') diff --git a/gems/ast-merge/lib/ast/merge/version.rb b/gems/ast-merge/lib/ast/merge/version.rb index 3ef823f4d..6e7dc90f7 100644 --- a/gems/ast-merge/lib/ast/merge/version.rb +++ b/gems/ast-merge/lib/ast/merge/version.rb @@ -3,7 +3,7 @@ module Ast module Merge module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/json-merge/.kettle-drift.lock b/gems/json-merge/.kettle-drift.lock index 0161251a7..d3c2a2030 100644 --- a/gems/json-merge/.kettle-drift.lock +++ b/gems/json-merge/.kettle-drift.lock @@ -6,7 +6,8 @@ 80, 120, 160, - 200 + 200, + 240 ] } ], @@ -17,7 +18,8 @@ 91, 131, 171, - 211 + 211, + 251 ] } ], @@ -28,7 +30,8 @@ 81, 121, 161, - 201 + 201, + 241 ] } ], @@ -39,7 +42,8 @@ 93, 133, 173, - 213 + 213, + 253 ] } ], @@ -50,7 +54,8 @@ 96, 136, 176, - 216 + 216, + 256 ] } ], @@ -61,7 +66,8 @@ 82, 122, 162, - 202 + 202, + 242 ] } ], @@ -73,7 +79,8 @@ 100, 140, 180, - 220 + 220, + 260 ] } ], @@ -84,7 +91,8 @@ 101, 141, 181, - 221 + 221, + 261 ] } ], @@ -96,7 +104,8 @@ 87, 127, 167, - 207 + 207, + 247 ] } ], @@ -107,7 +116,8 @@ 110, 150, 190, - 230 + 230, + 270 ] } ], @@ -119,7 +129,8 @@ 79, 119, 159, - 199 + 199, + 239 ] } ], @@ -131,7 +142,8 @@ 109, 149, 189, - 229 + 229, + 269 ] } ], @@ -142,7 +154,8 @@ 85, 125, 165, - 205 + 205, + 245 ] } ], @@ -154,7 +167,8 @@ 92, 132, 172, - 212 + 212, + 252 ] } ], @@ -166,7 +180,8 @@ 88, 128, 168, - 208 + 208, + 248 ] } ], @@ -177,7 +192,8 @@ 86, 126, 166, - 206 + 206, + 246 ] } ], @@ -188,7 +204,8 @@ 103, 143, 183, - 223 + 223, + 263 ] } ], @@ -199,7 +216,8 @@ 102, 142, 182, - 222 + 222, + 262 ] } ], @@ -210,7 +228,8 @@ 97, 137, 177, - 217 + 217, + 257 ] } ], @@ -221,7 +240,8 @@ 106, 146, 186, - 226 + 226, + 266 ] } ], diff --git a/gems/json-merge/Gemfile b/gems/json-merge/Gemfile index 211f8ef0e..0130bb0b7 100644 --- a/gems/json-merge/Gemfile +++ b/gems/json-merge/Gemfile @@ -232,6 +232,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/json-merge/Gemfile.lock b/gems/json-merge/Gemfile.lock index 3271a7758..2998cff4c 100644 --- a/gems/json-merge/Gemfile.lock +++ b/gems/json-merge/Gemfile.lock @@ -17,39 +17,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -58,193 +26,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -252,29 +34,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -294,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +116,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +283,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +381,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +407,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +440,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +452,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +480,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +491,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +518,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +529,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +542,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +557,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/markdown-merge/Gemfile.lock b/gems/markdown-merge/Gemfile.lock index f39d8ddab..f3d09b5c3 100644 --- a/gems/markdown-merge/Gemfile.lock +++ b/gems/markdown-merge/Gemfile.lock @@ -16,265 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +40,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +103,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +131,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +270,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +322,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +373,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +398,31 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +430,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +442,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +470,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +481,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +508,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +519,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +532,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +547,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/markly-merge/Gemfile.lock b/gems/markly-merge/Gemfile.lock index e32016aaf..0e38a0a14 100644 --- a/gems/markly-merge/Gemfile.lock +++ b/gems/markly-merge/Gemfile.lock @@ -17,13 +17,264 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: markdown-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -35,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -48,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -111,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -279,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -331,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -382,24 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -408,31 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,15 +753,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 @@ -482,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -493,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -520,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -531,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -544,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -559,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/plain-merge/.kettle-drift.lock b/gems/plain-merge/.kettle-drift.lock index 0161251a7..d3c2a2030 100644 --- a/gems/plain-merge/.kettle-drift.lock +++ b/gems/plain-merge/.kettle-drift.lock @@ -6,7 +6,8 @@ 80, 120, 160, - 200 + 200, + 240 ] } ], @@ -17,7 +18,8 @@ 91, 131, 171, - 211 + 211, + 251 ] } ], @@ -28,7 +30,8 @@ 81, 121, 161, - 201 + 201, + 241 ] } ], @@ -39,7 +42,8 @@ 93, 133, 173, - 213 + 213, + 253 ] } ], @@ -50,7 +54,8 @@ 96, 136, 176, - 216 + 216, + 256 ] } ], @@ -61,7 +66,8 @@ 82, 122, 162, - 202 + 202, + 242 ] } ], @@ -73,7 +79,8 @@ 100, 140, 180, - 220 + 220, + 260 ] } ], @@ -84,7 +91,8 @@ 101, 141, 181, - 221 + 221, + 261 ] } ], @@ -96,7 +104,8 @@ 87, 127, 167, - 207 + 207, + 247 ] } ], @@ -107,7 +116,8 @@ 110, 150, 190, - 230 + 230, + 270 ] } ], @@ -119,7 +129,8 @@ 79, 119, 159, - 199 + 199, + 239 ] } ], @@ -131,7 +142,8 @@ 109, 149, 189, - 229 + 229, + 269 ] } ], @@ -142,7 +154,8 @@ 85, 125, 165, - 205 + 205, + 245 ] } ], @@ -154,7 +167,8 @@ 92, 132, 172, - 212 + 212, + 252 ] } ], @@ -166,7 +180,8 @@ 88, 128, 168, - 208 + 208, + 248 ] } ], @@ -177,7 +192,8 @@ 86, 126, 166, - 206 + 206, + 246 ] } ], @@ -188,7 +204,8 @@ 103, 143, 183, - 223 + 223, + 263 ] } ], @@ -199,7 +216,8 @@ 102, 142, 182, - 222 + 222, + 262 ] } ], @@ -210,7 +228,8 @@ 97, 137, 177, - 217 + 217, + 257 ] } ], @@ -221,7 +240,8 @@ 106, 146, 186, - 226 + 226, + 266 ] } ], diff --git a/gems/plain-merge/Gemfile b/gems/plain-merge/Gemfile index c0992188e..837c4bbd2 100644 --- a/gems/plain-merge/Gemfile +++ b/gems/plain-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source 'https://gem.coop' +source "https://gem.coop" git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,18 +19,62 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ['~> 1.0', '>= 1.0.8'] -gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ["~> 1.0", ">= 1.0.8"] +gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ast-merge tree_haver ] -direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') +direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? + +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) + direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") + direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == "nomono" } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + if nomono_locked + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] + end + end + Kernel.send(:gem, "nomono", *nomono_activation_requirements) + require "nomono/bundler" + if direct_sibling_templating && !direct_sibling_local + ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + end + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: "STRUCTUREDMERGE", + path_env: "STRUCTUREDMERGE_DEV", + root: ["src", "my", "structuredmerge"] + ) + rescue LoadError + warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + else + ENV.delete("STRUCTUREDMERGE_DEV") + end + end + end +end if direct_sibling_gems.any? && (direct_sibling_local || @@ -250,25 +294,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? # Debugging -eval_gemfile 'gemfiles/modular/debug.gemfile' +eval_gemfile "gemfiles/modular/debug.gemfile" # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile 'gemfiles/modular/coverage.gemfile' +eval_gemfile "gemfiles/modular/coverage.gemfile" # Linting -eval_gemfile 'gemfiles/modular/style.gemfile' +eval_gemfile "gemfiles/modular/style.gemfile" # Documentation -eval_gemfile 'gemfiles/modular/documentation.gemfile' +eval_gemfile "gemfiles/modular/documentation.gemfile" # Optional -eval_gemfile 'gemfiles/modular/optional.gemfile' +eval_gemfile "gemfiles/modular/optional.gemfile" ### Std Lib Extracted Gems -eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' +eval_gemfile "gemfiles/modular/x_std_libs.gemfile" # See unlocked_deps appraisal for more details on irb inclusion -gem 'irb', '~> 1.17' # ruby >= 2.7 +gem "irb", "~> 1.17" # ruby >= 2.7 diff --git a/gems/plain-merge/Gemfile.lock b/gems/plain-merge/Gemfile.lock index ae3867db7..c020666f7 100644 --- a/gems/plain-merge/Gemfile.lock +++ b/gems/plain-merge/Gemfile.lock @@ -16,6 +16,265 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -103,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -131,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -322,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -373,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -398,31 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -430,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -442,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -469,11 +788,14 @@ 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.0) plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -481,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -508,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -519,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -532,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -547,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/plain-merge/Rakefile b/gems/plain-merge/Rakefile index c1132c880..571409183 100644 --- a/gems/plain-merge/Rakefile +++ b/gems/plain-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require 'kettle/drift' + require "kettle/drift" Kettle::Drift.install_tasks rescue LoadError - desc('(stub) kettle:drift:check is unavailable') - task('kettle:drift:check') do + desc("(stub) kettle:drift:check is unavailable") + task("kettle:drift:check") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:update is unavailable') - task('kettle:drift:update') do + desc("(stub) kettle:drift:update is unavailable") + task("kettle:drift:update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:force_update is unavailable') - task('kettle:drift:force_update') do + desc("(stub) kettle:drift:force_update is unavailable") + task("kettle:drift:force_update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift is unavailable') - task('kettle:drift' => 'kettle:drift:update') + desc("(stub) kettle:drift is unavailable") + task("kettle:drift" => "kettle:drift:update") end ### TEMPLATING TASKS diff --git a/gems/plain-merge/lib/plain/merge/version.rb b/gems/plain-merge/lib/plain/merge/version.rb index e6b3a5844..aab4f67c1 100644 --- a/gems/plain-merge/lib/plain/merge/version.rb +++ b/gems/plain-merge/lib/plain/merge/version.rb @@ -3,7 +3,7 @@ module Plain module Merge module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end From 068a621631844bc4c4457a6e6dec72446e92bd2e Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:34:56 -0600 Subject: [PATCH 191/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-merge-git/Gemfile.lock | 383 +++---------------------- gems/json-merge/Gemfile.lock | 327 ++++++++++++++++++++- gems/plain-merge/.rubocop_gradual.lock | 106 ------- gems/plain-merge/Gemfile.lock | 59 ++-- gems/plain-merge/bin/yard | 2 +- 5 files changed, 388 insertions(+), 489 deletions(-) delete mode 100644 gems/plain-merge/.rubocop_gradual.lock diff --git a/gems/ast-merge-git/Gemfile.lock b/gems/ast-merge-git/Gemfile.lock index 24bd36523..863f65ef6 100644 --- a/gems/ast-merge-git/Gemfile.lock +++ b/gems/ast-merge-git/Gemfile.lock @@ -17,31 +17,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -50,247 +26,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: json-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -310,12 +52,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -324,6 +60,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -379,6 +116,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -397,7 +143,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -537,23 +282,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -587,11 +334,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +385,25 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,61 +412,39 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +457,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +485,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +496,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,19 +523,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,19 +547,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +562,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/json-merge/Gemfile.lock b/gems/json-merge/Gemfile.lock index 2998cff4c..3271a7758 100644 --- a/gems/json-merge/Gemfile.lock +++ b/gems/json-merge/Gemfile.lock @@ -17,7 +17,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -26,7 +58,193 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -34,6 +252,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -53,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,24 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -407,32 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,20 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -480,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -491,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -518,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -529,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -542,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/plain-merge/.rubocop_gradual.lock b/gems/plain-merge/.rubocop_gradual.lock deleted file mode 100644 index 2200cf1b9..000000000 --- a/gems/plain-merge/.rubocop_gradual.lock +++ /dev/null @@ -1,106 +0,0 @@ -{ - ".simplecov:3133826638": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:4149951629": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/plain-merge.rb:619298015": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`plain-merge.rb`) should use snake_case.", 5381] - ], - "lib/plain/merge.rb:3584995729": [ - [9, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Plain::Merge`.", 2866359175], - [9, 3, 7932, "Metrics/ModuleLength: Module has too many lines. [211/100]", 719656966], - [42, 5, 645, "Metrics/MethodLength: Method has too many lines. [21/10]", 3773389417], - [69, 5, 513, "Metrics/AbcSize: Assignment Branch Condition size for `similarity_score` is too high. [<9, 17, 3> 19.47/17]", 594433443], - [69, 5, 513, "Metrics/MethodLength: Method has too many lines. [12/10]", 594433443], - [87, 9, 10, "Naming/PredicatePrefix: Rename `is_similar` to `similar?`.", 1730577729], - [96, 5, 2163, "Metrics/AbcSize: Assignment Branch Condition size for `match_text_blocks` is too high. [<25, 36, 16> 46.66/17]", 1824707567], - [96, 5, 2163, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `match_text_blocks` is too high. [14/7]", 1824707567], - [96, 5, 2163, "Metrics/MethodLength: Method has too many lines. [50/10]", 1824707567], - [96, 5, 2163, "Metrics/PerceivedComplexity: Perceived complexity for `match_text_blocks` is too high. [14/8]", 1824707567], - [119, 7, 1032, "Style/CombinableLoops: Combine this loop with the previous loop.", 2654397768], - [158, 5, 683, "Metrics/AbcSize: Assignment Branch Condition size for `merge_text` is too high. [<11, 16, 4> 19.82/17]", 3448903566], - [158, 5, 683, "Metrics/MethodLength: Method has too many lines. [14/10]", 3448903566], - [178, 5, 633, "Metrics/AbcSize: Assignment Branch Condition size for `refined_text_similarity` is too high. [<3, 17, 0> 17.26/17]", 2185070085], - [208, 5, 700, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<8, 31, 8> 33/17]", 1827550752], - [208, 5, 700, "Metrics/MethodLength: Method has too many lines. [18/10]", 1827550752] - ], - "plain-merge.gemspec:3762840848": [ - [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ], - "spec/fixtures_integration_spec.rb:922433761": [ - [3, 1, 3550, "Metrics/BlockLength: Block has too many lines. [77/25]", 4225834063] - ] -} diff --git a/gems/plain-merge/Gemfile.lock b/gems/plain-merge/Gemfile.lock index c020666f7..4f8595887 100644 --- a/gems/plain-merge/Gemfile.lock +++ b/gems/plain-merge/Gemfile.lock @@ -275,6 +275,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -308,7 +324,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -363,18 +378,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -538,22 +542,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -659,9 +659,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -739,7 +739,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -760,10 +759,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -838,13 +837,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/plain-merge/bin/yard b/gems/plain-merge/bin/yard index 5d516ad6f..a7e8b6eed 100755 --- a/gems/plain-merge/bin/yard +++ b/gems/plain-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec('bundle', 'exec', 'rake', 'yard') +exec("bundle", "exec", "rake", "yard") From 89bd8947d7bbfc5f841742459f96bb9a3cc996f9 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:35:00 -0600 Subject: [PATCH 192/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-merge-git/Gemfile.lock | 332 ++++++++++++++++- gems/bash-merge/Gemfile.lock | 353 +++++++++++++++++- gems/plain-merge/.rubocop_gradual.lock | 106 ++++++ gems/plain-merge/Gemfile | 68 ++-- gems/plain-merge/Gemfile.lock | 378 ++------------------ gems/plain-merge/Rakefile | 18 +- gems/plain-merge/bin/yard | 2 +- gems/plain-merge/lib/plain/merge/version.rb | 2 +- 8 files changed, 846 insertions(+), 413 deletions(-) create mode 100644 gems/plain-merge/.rubocop_gradual.lock diff --git a/gems/ast-merge-git/Gemfile.lock b/gems/ast-merge-git/Gemfile.lock index 863f65ef6..4df4417ad 100644 --- a/gems/ast-merge-git/Gemfile.lock +++ b/gems/ast-merge-git/Gemfile.lock @@ -17,7 +17,31 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -26,13 +50,231 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: json-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -52,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -115,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -143,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -282,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -334,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -385,25 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -412,32 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -445,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -457,20 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -485,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -496,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -523,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -534,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -547,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -562,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/bash-merge/Gemfile.lock b/gems/bash-merge/Gemfile.lock index 6fdf80d44..95209e787 100644 --- a/gems/bash-merge/Gemfile.lock +++ b/gems/bash-merge/Gemfile.lock @@ -16,6 +16,265 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -103,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -131,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -322,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -373,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.1, >= 3.1.4) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.3, >= 2.3.7) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -398,33 +685,55 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.1, >= 3.1.14) + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -432,6 +741,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -444,19 +754,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -471,10 +789,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -482,6 +804,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -509,9 +832,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -520,6 +846,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -533,14 +860,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -548,6 +880,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/plain-merge/.rubocop_gradual.lock b/gems/plain-merge/.rubocop_gradual.lock new file mode 100644 index 000000000..2200cf1b9 --- /dev/null +++ b/gems/plain-merge/.rubocop_gradual.lock @@ -0,0 +1,106 @@ +{ + ".simplecov:3133826638": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:4149951629": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/plain-merge.rb:619298015": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`plain-merge.rb`) should use snake_case.", 5381] + ], + "lib/plain/merge.rb:3584995729": [ + [9, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Plain::Merge`.", 2866359175], + [9, 3, 7932, "Metrics/ModuleLength: Module has too many lines. [211/100]", 719656966], + [42, 5, 645, "Metrics/MethodLength: Method has too many lines. [21/10]", 3773389417], + [69, 5, 513, "Metrics/AbcSize: Assignment Branch Condition size for `similarity_score` is too high. [<9, 17, 3> 19.47/17]", 594433443], + [69, 5, 513, "Metrics/MethodLength: Method has too many lines. [12/10]", 594433443], + [87, 9, 10, "Naming/PredicatePrefix: Rename `is_similar` to `similar?`.", 1730577729], + [96, 5, 2163, "Metrics/AbcSize: Assignment Branch Condition size for `match_text_blocks` is too high. [<25, 36, 16> 46.66/17]", 1824707567], + [96, 5, 2163, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `match_text_blocks` is too high. [14/7]", 1824707567], + [96, 5, 2163, "Metrics/MethodLength: Method has too many lines. [50/10]", 1824707567], + [96, 5, 2163, "Metrics/PerceivedComplexity: Perceived complexity for `match_text_blocks` is too high. [14/8]", 1824707567], + [119, 7, 1032, "Style/CombinableLoops: Combine this loop with the previous loop.", 2654397768], + [158, 5, 683, "Metrics/AbcSize: Assignment Branch Condition size for `merge_text` is too high. [<11, 16, 4> 19.82/17]", 3448903566], + [158, 5, 683, "Metrics/MethodLength: Method has too many lines. [14/10]", 3448903566], + [178, 5, 633, "Metrics/AbcSize: Assignment Branch Condition size for `refined_text_similarity` is too high. [<3, 17, 0> 17.26/17]", 2185070085], + [208, 5, 700, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<8, 31, 8> 33/17]", 1827550752], + [208, 5, 700, "Metrics/MethodLength: Method has too many lines. [18/10]", 1827550752] + ], + "plain-merge.gemspec:3762840848": [ + [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ], + "spec/fixtures_integration_spec.rb:922433761": [ + [3, 1, 3550, "Metrics/BlockLength: Block has too many lines. [77/25]", 4225834063] + ] +} diff --git a/gems/plain-merge/Gemfile b/gems/plain-merge/Gemfile index 837c4bbd2..698643059 100644 --- a/gems/plain-merge/Gemfile +++ b/gems/plain-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source "https://gem.coop" +source 'https://gem.coop' git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,58 +19,54 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ["~> 1.0", ">= 1.0.8"] -gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ['~> 1.0', '>= 1.0.8'] +gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ast-merge tree_haver ] -direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") +direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? if direct_sibling_gems.any? && - (direct_sibling_local || - ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) - direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") - direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) begin nomono_activation_requirements = nomono_requirements - nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) if File.file?(nomono_lockfile) nomono_locked_spec = Bundler::LockfileParser - .new(Bundler.read_file(nomono_lockfile)) - .specs - .find { |spec| spec.name == "nomono" } + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } nomono_locked = nomono_locked_spec && - Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) - if nomono_locked - nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] - end - end - Kernel.send(:gem, "nomono", *nomono_activation_requirements) - require "nomono/bundler" - if direct_sibling_templating && !direct_sibling_local - ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local eval_nomono_gems( gems: direct_sibling_gems, - prefix: "STRUCTUREDMERGE", - path_env: "STRUCTUREDMERGE_DEV", - root: ["src", "my", "structuredmerge"] + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] ) rescue LoadError - warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' ensure if direct_sibling_templating && !direct_sibling_local if direct_sibling_dev_was_set - ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original else - ENV.delete("STRUCTUREDMERGE_DEV") + ENV.delete('STRUCTUREDMERGE_DEV') end end end @@ -294,25 +290,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging -eval_gemfile "gemfiles/modular/debug.gemfile" +eval_gemfile 'gemfiles/modular/debug.gemfile' # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile "gemfiles/modular/coverage.gemfile" +eval_gemfile 'gemfiles/modular/coverage.gemfile' # Linting -eval_gemfile "gemfiles/modular/style.gemfile" +eval_gemfile 'gemfiles/modular/style.gemfile' # Documentation -eval_gemfile "gemfiles/modular/documentation.gemfile" +eval_gemfile 'gemfiles/modular/documentation.gemfile' # Optional -eval_gemfile "gemfiles/modular/optional.gemfile" +eval_gemfile 'gemfiles/modular/optional.gemfile' ### Std Lib Extracted Gems -eval_gemfile "gemfiles/modular/x_std_libs.gemfile" +eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' # See unlocked_deps appraisal for more details on irb inclusion -gem "irb", "~> 1.17" # ruby >= 2.7 +gem 'irb', '~> 1.17' # ruby >= 2.7 diff --git a/gems/plain-merge/Gemfile.lock b/gems/plain-merge/Gemfile.lock index 4f8595887..fcd1b5f4a 100644 --- a/gems/plain-merge/Gemfile.lock +++ b/gems/plain-merge/Gemfile.lock @@ -17,39 +17,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -58,193 +26,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -252,45 +34,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -310,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -324,6 +61,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -379,6 +117,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -397,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -537,23 +283,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -587,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +381,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,61 +407,39 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +452,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +479,11 @@ 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.0) plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +491,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,19 +518,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,19 +542,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +557,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/plain-merge/Rakefile b/gems/plain-merge/Rakefile index 571409183..c1132c880 100644 --- a/gems/plain-merge/Rakefile +++ b/gems/plain-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require "kettle/drift" + require 'kettle/drift' Kettle::Drift.install_tasks rescue LoadError - desc("(stub) kettle:drift:check is unavailable") - task("kettle:drift:check") do + desc('(stub) kettle:drift:check is unavailable') + task('kettle:drift:check') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:update is unavailable") - task("kettle:drift:update") do + desc('(stub) kettle:drift:update is unavailable') + task('kettle:drift:update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:force_update is unavailable") - task("kettle:drift:force_update") do + desc('(stub) kettle:drift:force_update is unavailable') + task('kettle:drift:force_update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift is unavailable") - task("kettle:drift" => "kettle:drift:update") + desc('(stub) kettle:drift is unavailable') + task('kettle:drift' => 'kettle:drift:update') end ### TEMPLATING TASKS diff --git a/gems/plain-merge/bin/yard b/gems/plain-merge/bin/yard index a7e8b6eed..5d516ad6f 100755 --- a/gems/plain-merge/bin/yard +++ b/gems/plain-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec("bundle", "exec", "rake", "yard") +exec('bundle', 'exec', 'rake', 'yard') diff --git a/gems/plain-merge/lib/plain/merge/version.rb b/gems/plain-merge/lib/plain/merge/version.rb index aab4f67c1..e6b3a5844 100644 --- a/gems/plain-merge/lib/plain/merge/version.rb +++ b/gems/plain-merge/lib/plain/merge/version.rb @@ -3,7 +3,7 @@ module Plain module Merge module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end From 74fc224590f116810ff5a22509245ee187a5cabe Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:35:35 -0600 Subject: [PATCH 193/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-merge-git/Gemfile.lock | 356 +-------------------- gems/bash-merge/.kettle-drift.lock | 60 ++-- gems/bash-merge/Gemfile | 40 +++ gems/bash-merge/Gemfile.lock | 327 +------------------ gems/dotenv-merge/.kettle-drift.lock | 60 ++-- gems/dotenv-merge/.rubocop_gradual.lock | 185 ----------- gems/dotenv-merge/Gemfile | 40 +++ gems/dotenv-merge/Gemfile.lock | 404 +++++++++++++++++++++--- gems/json-merge/Gemfile.lock | 353 +-------------------- gems/plain-merge/Gemfile.lock | 327 ++++++++++++++++++- gems/rbs-merge/.kettle-drift.lock | 60 ++-- gems/rbs-merge/.rubocop_gradual.lock | 402 ----------------------- gems/rbs-merge/Gemfile | 70 +++- gems/rbs-merge/Gemfile.lock | 59 ++-- gems/rbs-merge/Rakefile | 18 +- gems/rbs-merge/bin/yard | 2 +- gems/rbs-merge/lib/rbs/merge/version.rb | 2 +- gems/rbs-merge/rbs-merge.gemspec | 85 ++--- 18 files changed, 1057 insertions(+), 1793 deletions(-) delete mode 100644 gems/dotenv-merge/.rubocop_gradual.lock delete mode 100644 gems/rbs-merge/.rubocop_gradual.lock diff --git a/gems/ast-merge-git/Gemfile.lock b/gems/ast-merge-git/Gemfile.lock index 4df4417ad..4681158d7 100644 --- a/gems/ast-merge-git/Gemfile.lock +++ b/gems/ast-merge-git/Gemfile.lock @@ -16,265 +16,6 @@ PATH json-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +40,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -358,13 +98,15 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +135,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +274,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +326,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +377,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +402,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +435,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +447,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +475,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +486,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +513,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +524,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +537,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +552,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/bash-merge/.kettle-drift.lock b/gems/bash-merge/.kettle-drift.lock index 0161251a7..d3c2a2030 100644 --- a/gems/bash-merge/.kettle-drift.lock +++ b/gems/bash-merge/.kettle-drift.lock @@ -6,7 +6,8 @@ 80, 120, 160, - 200 + 200, + 240 ] } ], @@ -17,7 +18,8 @@ 91, 131, 171, - 211 + 211, + 251 ] } ], @@ -28,7 +30,8 @@ 81, 121, 161, - 201 + 201, + 241 ] } ], @@ -39,7 +42,8 @@ 93, 133, 173, - 213 + 213, + 253 ] } ], @@ -50,7 +54,8 @@ 96, 136, 176, - 216 + 216, + 256 ] } ], @@ -61,7 +66,8 @@ 82, 122, 162, - 202 + 202, + 242 ] } ], @@ -73,7 +79,8 @@ 100, 140, 180, - 220 + 220, + 260 ] } ], @@ -84,7 +91,8 @@ 101, 141, 181, - 221 + 221, + 261 ] } ], @@ -96,7 +104,8 @@ 87, 127, 167, - 207 + 207, + 247 ] } ], @@ -107,7 +116,8 @@ 110, 150, 190, - 230 + 230, + 270 ] } ], @@ -119,7 +129,8 @@ 79, 119, 159, - 199 + 199, + 239 ] } ], @@ -131,7 +142,8 @@ 109, 149, 189, - 229 + 229, + 269 ] } ], @@ -142,7 +154,8 @@ 85, 125, 165, - 205 + 205, + 245 ] } ], @@ -154,7 +167,8 @@ 92, 132, 172, - 212 + 212, + 252 ] } ], @@ -166,7 +180,8 @@ 88, 128, 168, - 208 + 208, + 248 ] } ], @@ -177,7 +192,8 @@ 86, 126, 166, - 206 + 206, + 246 ] } ], @@ -188,7 +204,8 @@ 103, 143, 183, - 223 + 223, + 263 ] } ], @@ -199,7 +216,8 @@ 102, 142, 182, - 222 + 222, + 262 ] } ], @@ -210,7 +228,8 @@ 97, 137, 177, - 217 + 217, + 257 ] } ], @@ -221,7 +240,8 @@ 106, 146, 186, - 226 + 226, + 266 ] } ], diff --git a/gems/bash-merge/Gemfile b/gems/bash-merge/Gemfile index 53b41c0f6..53719ef0c 100644 --- a/gems/bash-merge/Gemfile +++ b/gems/bash-merge/Gemfile @@ -232,6 +232,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/bash-merge/Gemfile.lock b/gems/bash-merge/Gemfile.lock index 95209e787..e955f4ae1 100644 --- a/gems/bash-merge/Gemfile.lock +++ b/gems/bash-merge/Gemfile.lock @@ -17,39 +17,7 @@ PATH version_gem (~> 1.1, >= 1.1.14) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -58,193 +26,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -252,29 +34,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -294,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +116,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +283,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +381,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.1, >= 3.1.4) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.3, >= 2.3.7) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,55 +407,34 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.1, >= 3.1.14) - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -741,7 +442,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -754,27 +454,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -789,14 +481,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -804,7 +492,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -832,12 +519,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -846,7 +530,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -860,19 +543,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -880,7 +558,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/dotenv-merge/.kettle-drift.lock b/gems/dotenv-merge/.kettle-drift.lock index 0161251a7..d3c2a2030 100644 --- a/gems/dotenv-merge/.kettle-drift.lock +++ b/gems/dotenv-merge/.kettle-drift.lock @@ -6,7 +6,8 @@ 80, 120, 160, - 200 + 200, + 240 ] } ], @@ -17,7 +18,8 @@ 91, 131, 171, - 211 + 211, + 251 ] } ], @@ -28,7 +30,8 @@ 81, 121, 161, - 201 + 201, + 241 ] } ], @@ -39,7 +42,8 @@ 93, 133, 173, - 213 + 213, + 253 ] } ], @@ -50,7 +54,8 @@ 96, 136, 176, - 216 + 216, + 256 ] } ], @@ -61,7 +66,8 @@ 82, 122, 162, - 202 + 202, + 242 ] } ], @@ -73,7 +79,8 @@ 100, 140, 180, - 220 + 220, + 260 ] } ], @@ -84,7 +91,8 @@ 101, 141, 181, - 221 + 221, + 261 ] } ], @@ -96,7 +104,8 @@ 87, 127, 167, - 207 + 207, + 247 ] } ], @@ -107,7 +116,8 @@ 110, 150, 190, - 230 + 230, + 270 ] } ], @@ -119,7 +129,8 @@ 79, 119, 159, - 199 + 199, + 239 ] } ], @@ -131,7 +142,8 @@ 109, 149, 189, - 229 + 229, + 269 ] } ], @@ -142,7 +154,8 @@ 85, 125, 165, - 205 + 205, + 245 ] } ], @@ -154,7 +167,8 @@ 92, 132, 172, - 212 + 212, + 252 ] } ], @@ -166,7 +180,8 @@ 88, 128, 168, - 208 + 208, + 248 ] } ], @@ -177,7 +192,8 @@ 86, 126, 166, - 206 + 206, + 246 ] } ], @@ -188,7 +204,8 @@ 103, 143, 183, - 223 + 223, + 263 ] } ], @@ -199,7 +216,8 @@ 102, 142, 182, - 222 + 222, + 262 ] } ], @@ -210,7 +228,8 @@ 97, 137, 177, - 217 + 217, + 257 ] } ], @@ -221,7 +240,8 @@ 106, 146, 186, - 226 + 226, + 266 ] } ], diff --git a/gems/dotenv-merge/.rubocop_gradual.lock b/gems/dotenv-merge/.rubocop_gradual.lock deleted file mode 100644 index a7735088e..000000000 --- a/gems/dotenv-merge/.rubocop_gradual.lock +++ /dev/null @@ -1,185 +0,0 @@ -{ - ".simplecov:811436142": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:3735002317": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "dotenv-merge.gemspec:2358764930": [ - [125, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [127, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2105564149], - [133, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/dotenv-merge.rb:3412166704": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`dotenv-merge.rb`) should use snake_case.", 5381], - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "lib/dotenv/merge.rb:3295153861": [ - [13, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Dotenv::Merge`.", 2866359175] - ], - "lib/dotenv/merge/comment_tracker.rb:107522322": [ - [75, 7, 484, "Metrics/MethodLength: Method has too many lines. [13/10]", 786949197] - ], - "lib/dotenv/merge/env_line.rb:1395549015": [ - [38, 5, 6332, "Metrics/ClassLength: Class has too many lines. [112/100]", 1345509408], - [65, 7, 442, "Metrics/MethodLength: Method has too many lines. [14/10]", 415810066], - [177, 7, 576, "Metrics/MethodLength: Method has too many lines. [18/10]", 1351261581], - [202, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193406010] - ], - "lib/dotenv/merge/file_analysis.rb:4181609114": [ - [24, 5, 10717, "Metrics/ClassLength: Class has too many lines. [178/100]", 144541378], - [40, 7, 1034, "Metrics/MethodLength: Method has too many lines. [13/10]", 4069640141], - [254, 7, 589, "Metrics/MethodLength: Method has too many lines. [15/10]", 1686454790], - [280, 7, 946, "Metrics/MethodLength: Method has too many lines. [26/10]", 2970142744], - [315, 7, 908, "Metrics/AbcSize: Assignment Branch Condition size for `integrate_freeze_blocks` is too high. [<8, 20, 11> 24.19/17]", 3290540918], - [315, 7, 908, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `integrate_freeze_blocks` is too high. [10/7]", 3290540918], - [315, 7, 908, "Metrics/MethodLength: Method has too many lines. [18/10]", 3290540918], - [315, 7, 908, "Metrics/PerceivedComplexity: Perceived complexity for `integrate_freeze_blocks` is too high. [11/8]", 3290540918] - ], - "lib/dotenv/merge/smart_merger.rb:4110302585": [ - [27, 5, 20190, "Metrics/ClassLength: Class has too many lines. [398/100]", 2164846336], - [52, 7, 1092, "Metrics/MethodLength: Method has too many lines. [16/10]", 2908064588], - [52, 21, 401, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [13/5]", 1661881927], - [126, 7, 2338, "Metrics/AbcSize: Assignment Branch Condition size for `perform_merge` is too high. [<17, 42, 7> 45.85/17]", 2431495447], - [126, 7, 2338, "Metrics/MethodLength: Method has too many lines. [49/10]", 2431495447], - [235, 7, 733, "Metrics/MethodLength: Method has too many lines. [11/10]", 3293257138], - [260, 7, 331, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_node_typing` is too high. [8/7]", 1465922549], - [272, 7, 680, "Metrics/MethodLength: Method has too many lines. [11/10]", 4253249620], - [300, 7, 602, "Metrics/MethodLength: Method has too many lines. [12/10]", 1142282607], - [364, 7, 1110, "Metrics/AbcSize: Assignment Branch Condition size for `root_boundary_lines_for` is too high. [<7, 29, 24> 38.29/17]", 3853137527], - [364, 7, 1110, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `root_boundary_lines_for` is too high. [22/7]", 3853137527], - [364, 7, 1110, "Metrics/MethodLength: Method has too many lines. [21/10]", 3853137527], - [364, 7, 1110, "Metrics/PerceivedComplexity: Perceived complexity for `root_boundary_lines_for` is too high. [21/8]", 3853137527], - [392, 7, 732, "Metrics/AbcSize: Assignment Branch Condition size for `emission_start_line_for` is too high. [<4, 17, 10> 20.12/17]", 2147944725], - [392, 7, 732, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emission_start_line_for` is too high. [9/7]", 2147944725], - [392, 7, 732, "Metrics/MethodLength: Method has too many lines. [12/10]", 2147944725], - [392, 7, 732, "Metrics/PerceivedComplexity: Perceived complexity for `emission_start_line_for` is too high. [10/8]", 2147944725], - [413, 7, 1134, "Metrics/MethodLength: Method has too many lines. [15/10]", 3700686114], - [413, 25, 239, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 406985461], - [440, 7, 712, "Metrics/MethodLength: Method has too many lines. [13/10]", 3393691510], - [506, 7, 1797, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_cross_source_preamble_prefixes` is too high. [<14, 21, 9> 26.8/17]", 3130187278], - [506, 7, 1797, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collapse_cross_source_preamble_prefixes` is too high. [9/7]", 3130187278], - [506, 7, 1797, "Metrics/MethodLength: Method has too many lines. [31/10]", 3130187278], - [506, 7, 1797, "Metrics/PerceivedComplexity: Perceived complexity for `collapse_cross_source_preamble_prefixes` is too high. [9/8]", 3130187278], - [546, 7, 536, "Metrics/MethodLength: Method has too many lines. [15/10]", 4188914818] - ], - "spec/dotenv/merge/comment_behavior_matrix_spec.rb:4260851990": [ - [13, 37, 15, "Style/SymbolProc: Pass `&:value` as an argument to `lambda` instead of a block.", 1808354951], - [19, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 727266440], - [20, 121, 81, "Layout/LineLength: Line is too long. [201/120]", 2338882412], - [21, 121, 81, "Layout/LineLength: Line is too long. [201/120]", 2338882412], - [22, 121, 73, "Layout/LineLength: Line is too long. [193/120]", 2861499882], - [23, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 851778368] - ], - "spec/dotenv/merge/comment_tracker_spec.rb:2874668910": [ - [3, 1, 2792, "Metrics/BlockLength: Block has too many lines. [67/25]", 3333395414], - [4, 3, 1161, "Metrics/BlockLength: Block has too many lines. [34/25]", 3155362699], - [49, 3, 1573, "Metrics/BlockLength: Block has too many lines. [29/25]", 2926301238] - ], - "spec/dotenv/merge/env_line_spec.rb:22931135": [ - [3, 1, 8558, "Metrics/BlockLength: Block has too many lines. [240/25]", 612064308], - [4, 3, 4878, "Metrics/BlockLength: Block has too many lines. [143/25]", 4253904397] - ], - "spec/dotenv/merge/file_analysis_spec.rb:3466760370": [ - [3, 1, 12591, "Metrics/BlockLength: Block has too many lines. [336/25]", 3181229288], - [4, 3, 1048, "Metrics/BlockLength: Block has too many lines. [28/25]", 1006937171], - [38, 3, 2747, "Metrics/BlockLength: Block has too many lines. [77/25]", 1880493411], - [266, 3, 1819, "Metrics/BlockLength: Block has too many lines. [33/25]", 768689889], - [313, 3, 1498, "Metrics/BlockLength: Block has too many lines. [32/25]", 3435107213], - [356, 3, 1164, "Metrics/BlockLength: Block has too many lines. [35/25]", 2711157174] - ], - "spec/dotenv/merge/freeze_node_spec.rb:1103944682": [ - [5, 1, 7018, "Metrics/BlockLength: Block has too many lines. [170/25]", 2479529721], - [199, 29, 21, "Style/SymbolProc: Pass `&:assignment?` as an argument to `all?` instead of a block.", 359149537] - ], - "spec/dotenv/merge/merge_result_spec.rb:185036265": [ - [5, 1, 6358, "Metrics/BlockLength: Block has too many lines. [163/25]", 2313329306] - ], - "spec/dotenv/merge/smart_merger_spec.rb:3022416291": [ - [3, 1, 21266, "Metrics/BlockLength: Block has too many lines. [531/25]", 2706633331], - [24, 3, 13017, "Metrics/BlockLength: Block has too many lines. [317/25]", 1016391740], - [57, 5, 1320, "Metrics/BlockLength: Block has too many lines. [37/25]", 2903507276], - [156, 5, 2293, "Metrics/BlockLength: Block has too many lines. [48/25]", 1412485907], - [222, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1224552102], - [226, 5, 4055, "Metrics/BlockLength: Block has too many lines. [94/25]", 3099913322], - [396, 5, 1538, "Metrics/BlockLength: Block has too many lines. [33/25]", 4208751294], - [479, 3, 939, "Metrics/BlockLength: Block has too many lines. [26/25]", 4270544143], - [513, 3, 2177, "Metrics/BlockLength: Block has too many lines. [58/25]", 2538783756], - [662, 3, 1280, "Metrics/BlockLength: Block has too many lines. [32/25]", 2559985794] - ], - "spec/dotenv/merge_spec.rb:3204622260": [ - [3, 1, 2523, "Metrics/BlockLength: Block has too many lines. [63/25]", 2724479079], - [19, 3, 1267, "Metrics/BlockLength: Block has too many lines. [29/25]", 2157048718] - ], - "spec/integration/reproducible_merge_spec.rb:2470745815": [ - [6, 1, 1451, "Metrics/BlockLength: Block has too many lines. [31/25]", 1550571542] - ] -} diff --git a/gems/dotenv-merge/Gemfile b/gems/dotenv-merge/Gemfile index 707638a46..fdddd9a28 100644 --- a/gems/dotenv-merge/Gemfile +++ b/gems/dotenv-merge/Gemfile @@ -232,6 +232,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/dotenv-merge/Gemfile.lock b/gems/dotenv-merge/Gemfile.lock index a05c429e9..7ca2b1965 100644 --- a/gems/dotenv-merge/Gemfile.lock +++ b/gems/dotenv-merge/Gemfile.lock @@ -16,6 +16,281 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -27,11 +302,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +310,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -48,7 +324,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -104,15 +379,6 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -131,6 +397,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,25 +537,23 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -322,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -373,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.1, >= 3.1.4) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.3, >= 2.3.7) - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-drift! + kettle-jem! + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -398,39 +685,61 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.1, >= 3.1.14) + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -444,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -471,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -482,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -509,17 +831,19 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -533,14 +857,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -548,6 +877,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/json-merge/Gemfile.lock b/gems/json-merge/Gemfile.lock index 3271a7758..84c77ede1 100644 --- a/gems/json-merge/Gemfile.lock +++ b/gems/json-merge/Gemfile.lock @@ -16,265 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +40,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +103,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +131,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +270,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +322,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +373,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +398,31 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +430,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +442,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +470,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +481,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +508,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +519,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +532,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +547,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/plain-merge/Gemfile.lock b/gems/plain-merge/Gemfile.lock index fcd1b5f4a..c020666f7 100644 --- a/gems/plain-merge/Gemfile.lock +++ b/gems/plain-merge/Gemfile.lock @@ -17,7 +17,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -26,7 +58,193 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -34,6 +252,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -53,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,24 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -407,32 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -479,11 +788,14 @@ 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.0) plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -491,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -518,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -529,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -542,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/rbs-merge/.kettle-drift.lock b/gems/rbs-merge/.kettle-drift.lock index 0161251a7..d3c2a2030 100644 --- a/gems/rbs-merge/.kettle-drift.lock +++ b/gems/rbs-merge/.kettle-drift.lock @@ -6,7 +6,8 @@ 80, 120, 160, - 200 + 200, + 240 ] } ], @@ -17,7 +18,8 @@ 91, 131, 171, - 211 + 211, + 251 ] } ], @@ -28,7 +30,8 @@ 81, 121, 161, - 201 + 201, + 241 ] } ], @@ -39,7 +42,8 @@ 93, 133, 173, - 213 + 213, + 253 ] } ], @@ -50,7 +54,8 @@ 96, 136, 176, - 216 + 216, + 256 ] } ], @@ -61,7 +66,8 @@ 82, 122, 162, - 202 + 202, + 242 ] } ], @@ -73,7 +79,8 @@ 100, 140, 180, - 220 + 220, + 260 ] } ], @@ -84,7 +91,8 @@ 101, 141, 181, - 221 + 221, + 261 ] } ], @@ -96,7 +104,8 @@ 87, 127, 167, - 207 + 207, + 247 ] } ], @@ -107,7 +116,8 @@ 110, 150, 190, - 230 + 230, + 270 ] } ], @@ -119,7 +129,8 @@ 79, 119, 159, - 199 + 199, + 239 ] } ], @@ -131,7 +142,8 @@ 109, 149, 189, - 229 + 229, + 269 ] } ], @@ -142,7 +154,8 @@ 85, 125, 165, - 205 + 205, + 245 ] } ], @@ -154,7 +167,8 @@ 92, 132, 172, - 212 + 212, + 252 ] } ], @@ -166,7 +180,8 @@ 88, 128, 168, - 208 + 208, + 248 ] } ], @@ -177,7 +192,8 @@ 86, 126, 166, - 206 + 206, + 246 ] } ], @@ -188,7 +204,8 @@ 103, 143, 183, - 223 + 223, + 263 ] } ], @@ -199,7 +216,8 @@ 102, 142, 182, - 222 + 222, + 262 ] } ], @@ -210,7 +228,8 @@ 97, 137, 177, - 217 + 217, + 257 ] } ], @@ -221,7 +240,8 @@ 106, 146, 186, - 226 + 226, + 266 ] } ], diff --git a/gems/rbs-merge/.rubocop_gradual.lock b/gems/rbs-merge/.rubocop_gradual.lock deleted file mode 100644 index 3d9c5b1c7..000000000 --- a/gems/rbs-merge/.rubocop_gradual.lock +++ /dev/null @@ -1,402 +0,0 @@ -{ - ".simplecov:2483172942": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:3295679373": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/rbs-merge.rb:334311121": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`rbs-merge.rb`) should use snake_case.", 5381], - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "lib/rbs/merge.rb:1873081658": [ - [17, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Rbs::Merge`.", 2866359175], - [103, 7, 1197, "Metrics/MethodLength: Method has too many lines. [22/10]", 564456261] - ], - "lib/rbs/merge/backends/rbs_backend.rb:2885387755": [ - [48, 11, 555, "Metrics/MethodLength: Method has too many lines. [13/10]", 2078142514], - [81, 11, 658, "Metrics/MethodLength: Method has too many lines. [11/10]", 324484142], - [172, 11, 527, "Metrics/MethodLength: Method has too many lines. [14/10]", 631898529], - [240, 15, 11, "Naming/PredicatePrefix: Rename `has_errors?` to `errors?`.", 1181419252], - [263, 9, 9332, "Metrics/ClassLength: Class has too many lines. [135/100]", 1906483935], - [290, 11, 1914, "Metrics/AbcSize: Assignment Branch Condition size for `type` is too high. [<0, 9, 23> 24.7/17]", 3636991776], - [290, 11, 1914, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `type` is too high. [24/7]", 3636991776], - [290, 11, 1914, "Metrics/MethodLength: Method has too many lines. [28/10]", 3636991776], - [363, 11, 489, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `end_point` is too high. [8/7]", 844861810], - [504, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] - ], - "lib/rbs/merge/comment_tracker.rb:1938176986": [ - [28, 7, 767, "Metrics/MethodLength: Method has too many lines. [15/10]", 752916075], - [60, 7, 416, "Metrics/MethodLength: Method has too many lines. [12/10]", 2715172162] - ], - "lib/rbs/merge/conflict_resolver.rb:1305396962": [ - [16, 5, 11045, "Metrics/ClassLength: Class has too many lines. [174/100]", 330576807], - [44, 7, 1614, "Metrics/MethodLength: Method has too many lines. [23/10]", 1004723330], - [44, 45, 14, "Lint/UnusedMethodArgument: Unused method argument - `template_index`.", 1809801172], - [44, 62, 10, "Lint/UnusedMethodArgument: Unused method argument - `dest_index`.", 2703999490], - [122, 7, 717, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `resolve_preference` is too high. [8/7]", 2783267415], - [122, 7, 717, "Metrics/MethodLength: Method has too many lines. [12/10]", 2783267415], - [156, 7, 949, "Metrics/AbcSize: Assignment Branch Condition size for `extract_declaration_text` is too high. [<9, 19, 14> 25.26/17]", 4132302840], - [156, 7, 949, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_declaration_text` is too high. [13/7]", 4132302840], - [156, 7, 949, "Metrics/MethodLength: Method has too many lines. [18/10]", 4132302840], - [156, 7, 949, "Metrics/PerceivedComplexity: Perceived complexity for `extract_declaration_text` is too high. [14/8]", 4132302840], - [181, 39, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [279, 7, 565, "Metrics/MethodLength: Method has too many lines. [13/10]", 375776463], - [279, 11, 12, "Naming/PredicatePrefix: Rename `has_members?` to `members?`.", 496913372] - ], - "lib/rbs/merge/file_aligner.rb:157117932": [ - [32, 7, 128, "Lint/UselessMethodDefinition: Useless method definition detected.", 4031328363] - ], - "lib/rbs/merge/file_analysis.rb:4205990536": [ - [23, 5, 20642, "Metrics/ClassLength: Class has too many lines. [403/100]", 3271819659], - [59, 7, 1146, "Metrics/MethodLength: Method has too many lines. [20/10]", 1625645012], - [191, 7, 398, "Metrics/MethodLength: Method has too many lines. [12/10]", 4157341657], - [211, 7, 719, "Metrics/MethodLength: Method has too many lines. [13/10]", 2571132513], - [235, 7, 965, "Metrics/AbcSize: Assignment Branch Condition size for `compute_tree_sitter_signature` is too high. [<3, 5, 21> 21.79/17]", 2963702282], - [235, 7, 965, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_tree_sitter_signature` is too high. [22/7]", 2963702282], - [235, 7, 965, "Metrics/MethodLength: Method has too many lines. [26/10]", 2963702282], - [235, 7, 965, "Metrics/PerceivedComplexity: Perceived complexity for `compute_tree_sitter_signature` is too high. [16/8]", 2963702282], - [269, 7, 996, "Metrics/AbcSize: Assignment Branch Condition size for `extract_tree_sitter_node_name` is too high. [<5, 16, 10> 19.52/17]", 300940102], - [269, 7, 996, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_tree_sitter_node_name` is too high. [11/7]", 300940102], - [269, 7, 996, "Metrics/MethodLength: Method has too many lines. [24/10]", 300940102], - [269, 7, 996, "Metrics/PerceivedComplexity: Perceived complexity for `extract_tree_sitter_node_name` is too high. [11/8]", 300940102], - [320, 7, 834, "Metrics/MethodLength: Method has too many lines. [16/10]", 658496547], - [380, 7, 1612, "Metrics/AbcSize: Assignment Branch Condition size for `extract_tree_sitter_declarations` is too high. [<8, 18, 11> 22.56/17]", 1899595676], - [380, 7, 1612, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_tree_sitter_declarations` is too high. [10/7]", 1899595676], - [380, 7, 1612, "Metrics/MethodLength: Method has too many lines. [23/10]", 1899595676], - [380, 7, 1612, "Metrics/PerceivedComplexity: Perceived complexity for `extract_tree_sitter_declarations` is too high. [11/8]", 1899595676], - [449, 7, 569, "Metrics/MethodLength: Method has too many lines. [13/10]", 210550095], - [471, 7, 1133, "Metrics/AbcSize: Assignment Branch Condition size for `build_freeze_blocks` is too high. [<7, 22, 6> 23.85/17]", 4016218974], - [471, 7, 1133, "Metrics/MethodLength: Method has too many lines. [29/10]", 4016218974], - [528, 7, 486, "Metrics/MethodLength: Method has too many lines. [12/10]", 618123864], - [528, 7, 486, "Metrics/PerceivedComplexity: Perceived complexity for `node_start_line` is too high. [9/8]", 618123864], - [545, 7, 472, "Metrics/MethodLength: Method has too many lines. [12/10]", 1339916888], - [545, 7, 472, "Metrics/PerceivedComplexity: Perceived complexity for `node_end_line` is too high. [9/8]", 1339916888], - [579, 7, 1868, "Metrics/AbcSize: Assignment Branch Condition size for `compute_rbs_gem_signature` is too high. [<0, 45, 23> 50.54/17]", 2652509672], - [579, 7, 1868, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_rbs_gem_signature` is too high. [23/7]", 2652509672], - [579, 7, 1868, "Metrics/MethodLength: Method has too many lines. [43/10]", 2652509672], - [579, 7, 1868, "Metrics/PerceivedComplexity: Perceived complexity for `compute_rbs_gem_signature` is too high. [9/8]", 2652509672] - ], - "lib/rbs/merge/freeze_node.rb:2942544870": [ - [34, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 201145846], - [39, 7, 577, "Metrics/MethodLength: Method has too many lines. [11/10]", 2189574632], - [39, 21, 186, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1006469938], - [78, 7, 1506, "Metrics/AbcSize: Assignment Branch Condition size for `validate_structure!` is too high. [<12, 12, 17> 24.02/17]", 1543687562], - [78, 7, 1506, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_structure!` is too high. [12/7]", 1543687562], - [78, 7, 1506, "Metrics/MethodLength: Method has too many lines. [25/10]", 1543687562], - [78, 7, 1506, "Metrics/PerceivedComplexity: Perceived complexity for `validate_structure!` is too high. [12/8]", 1543687562], - [150, 7, 891, "Metrics/AbcSize: Assignment Branch Condition size for `extract_node_name` is too high. [<4, 21, 12> 24.52/17]", 1223188123], - [150, 7, 891, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_node_name` is too high. [13/7]", 1223188123], - [150, 7, 891, "Metrics/MethodLength: Method has too many lines. [18/10]", 1223188123], - [150, 7, 891, "Metrics/PerceivedComplexity: Perceived complexity for `extract_node_name` is too high. [13/8]", 1223188123], - [162, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861336] - ], - "lib/rbs/merge/merge_result.rb:1707720872": [ - [18, 5, 15586, "Metrics/ClassLength: Class has too many lines. [276/100]", 817348545], - [89, 7, 966, "Metrics/MethodLength: Method has too many lines. [14/10]", 3349669346], - [176, 7, 1770, "Metrics/AbcSize: Assignment Branch Condition size for `extract_lines` is too high. [<15, 21, 16> 30.36/17]", 3951991352], - [176, 7, 1770, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_lines` is too high. [15/7]", 3951991352], - [176, 7, 1770, "Metrics/MethodLength: Method has too many lines. [29/10]", 3951991352], - [176, 7, 1770, "Metrics/PerceivedComplexity: Perceived complexity for `extract_lines` is too high. [16/8]", 3951991352], - [226, 44, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [232, 7, 606, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trailing_lines_for` is too high. [9/7]", 518209980], - [232, 7, 606, "Metrics/MethodLength: Method has too many lines. [13/10]", 518209980], - [232, 7, 606, "Metrics/PerceivedComplexity: Perceived complexity for `trailing_lines_for` is too high. [10/8]", 518209980], - [233, 47, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [266, 33, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [271, 7, 682, "Metrics/AbcSize: Assignment Branch Condition size for `deduplicate_leading_comment_overlap` is too high. [<4, 15, 9> 17.94/17]", 4227245480], - [271, 7, 682, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `deduplicate_leading_comment_overlap` is too high. [8/7]", 4227245480], - [271, 7, 682, "Metrics/MethodLength: Method has too many lines. [11/10]", 4227245480], - [335, 23, 24, "Style/SafeNavigation: Use safe navigation (`&.`) instead of checking if an object exists before calling the method.", 1487466207], - [371, 7, 893, "Metrics/MethodLength: Method has too many lines. [11/10]", 1066420963], - [371, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 2582953496] - ], - "lib/rbs/merge/node_type_normalizer.rb:2788764230": [ - [65, 5, 10747, "Metrics/ModuleLength: Module has too many lines. [199/100]", 63560324], - [250, 9, 693, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonical_type_for_node` is too high. [9/7]", 908800634], - [250, 9, 693, "Metrics/MethodLength: Method has too many lines. [16/10]", 908800634], - [250, 9, 693, "Metrics/PerceivedComplexity: Perceived complexity for `canonical_type_for_node` is too high. [9/8]", 908800634], - [323, 9, 689, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `refine_tree_sitter_attribute_type` is too high. [9/7]", 2340352499], - [323, 9, 689, "Metrics/MethodLength: Method has too many lines. [13/10]", 2340352499], - [323, 9, 689, "Metrics/PerceivedComplexity: Perceived complexity for `refine_tree_sitter_attribute_type` is too high. [9/8]", 2340352499], - [343, 9, 475, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `refine_tree_sitter_variable_type` is too high. [8/7]", 536330497], - [343, 9, 475, "Metrics/MethodLength: Method has too many lines. [14/10]", 536330497] - ], - "lib/rbs/merge/node_wrapper.rb:1434186839": [ - [26, 5, 14933, "Metrics/ClassLength: Class has too many lines. [344/100]", 4139761414], - [37, 17, 84, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 366036293], - [264, 7, 831, "Metrics/AbcSize: Assignment Branch Condition size for `text` is too high. [<3, 32, 20> 37.85/17]", 980238327], - [264, 7, 831, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `text` is too high. [18/7]", 980238327], - [264, 7, 831, "Metrics/MethodLength: Method has too many lines. [18/10]", 980238327], - [264, 7, 831, "Metrics/PerceivedComplexity: Perceived complexity for `text` is too high. [20/8]", 980238327], - [268, 47, 2, "Lint/SafeNavigationConsistency: Use `.` instead of unnecessary `&.`.", 5858765], - [280, 22, 14, "Style/NumericPredicate: Use `start_line.positive?` instead of `start_line > 0`.", 792111162], - [301, 7, 1209, "Metrics/AbcSize: Assignment Branch Condition size for `signature` is too high. [<1, 25, 20> 32.03/17]", 4281557215], - [301, 7, 1209, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `signature` is too high. [21/7]", 4281557215], - [301, 7, 1209, "Metrics/MethodLength: Method has too many lines. [45/10]", 4281557215], - [351, 7, 384, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `method_kind` is too high. [8/7]", 563626808], - [351, 7, 384, "Metrics/PerceivedComplexity: Perceived complexity for `method_kind` is too high. [9/8]", 563626808], - [423, 7, 935, "Metrics/MethodLength: Method has too many lines. [21/10]", 3557799127], - [469, 7, 667, "Metrics/AbcSize: Assignment Branch Condition size for `extract_child_texts` is too high. [<6, 16, 8> 18.87/17]", 1979652559], - [469, 7, 667, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_child_texts` is too high. [9/7]", 1979652559], - [469, 7, 667, "Metrics/MethodLength: Method has too many lines. [12/10]", 1979652559], - [469, 7, 667, "Metrics/PerceivedComplexity: Perceived complexity for `extract_child_texts` is too high. [9/8]", 1979652559], - [487, 7, 583, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_tree_sitter_visibility_kind` is too high. [9/7]", 2002684122], - [487, 7, 583, "Metrics/MethodLength: Method has too many lines. [13/10]", 2002684122], - [487, 7, 583, "Metrics/PerceivedComplexity: Perceived complexity for `extract_tree_sitter_visibility_kind` is too high. [9/8]", 2002684122], - [532, 7, 557, "Metrics/MethodLength: Method has too many lines. [14/10]", 1753294094] - ], - "lib/rbs/merge/smart_merger.rb:4114819804": [ - [43, 5, 38956, "Metrics/ClassLength: Class has too many lines. [785/100]", 3732361716], - [85, 7, 1188, "Metrics/MethodLength: Method has too many lines. [17/10]", 2908064588], - [85, 21, 447, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 1344979847], - [181, 7, 805, "Metrics/AbcSize: Assignment Branch Condition size for `perform_merge` is too high. [<6, 15, 8> 18.03/17]", 1638854701], - [181, 7, 805, "Metrics/MethodLength: Method has too many lines. [14/10]", 1638854701], - [207, 7, 572, "Metrics/MethodLength: Method has too many lines. [15/10]", 3471574631], - [290, 7, 621, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `root_boundary_lines_for` is too high. [9/7]", 354795708], - [290, 7, 621, "Metrics/PerceivedComplexity: Perceived complexity for `root_boundary_lines_for` is too high. [9/8]", 354795708], - [291, 34, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [323, 9, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 748374760], - [326, 7, 794, "Metrics/AbcSize: Assignment Branch Condition size for `root_boundary_range` is too high. [<4, 22, 11> 24.92/17]", 2546634651], - [326, 7, 794, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `root_boundary_range` is too high. [10/7]", 2546634651], - [326, 7, 794, "Metrics/MethodLength: Method has too many lines. [19/10]", 2546634651], - [326, 7, 794, "Metrics/PerceivedComplexity: Perceived complexity for `root_boundary_range` is too high. [11/8]", 2546634651], - [365, 7, 1030, "Metrics/AbcSize: Assignment Branch Condition size for `process_match` is too high. [<1, 22, 7> 23.11/17]", 333057092], - [365, 7, 1030, "Metrics/MethodLength: Method has too many lines. [27/10]", 333057092], - [428, 7, 1830, "Metrics/AbcSize: Assignment Branch Condition size for `removed_declaration_comment_lines` is too high. [<13, 31, 25> 41.89/17]", 276966259], - [428, 7, 1830, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `removed_declaration_comment_lines` is too high. [21/7]", 276966259], - [428, 7, 1830, "Metrics/MethodLength: Method has too many lines. [38/10]", 276966259], - [428, 7, 1830, "Metrics/PerceivedComplexity: Perceived complexity for `removed_declaration_comment_lines` is too high. [24/8]", 276966259], - [476, 7, 675, "Metrics/MethodLength: Method has too many lines. [13/10]", 1415352570], - [502, 7, 2604, "Metrics/AbcSize: Assignment Branch Condition size for `reconstruct_declaration_with_merged_members` is too high. [<19, 23, 22> 37.07/17]", 1250076424], - [502, 7, 2604, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `reconstruct_declaration_with_merged_members` is too high. [17/7]", 1250076424], - [502, 7, 2604, "Metrics/MethodLength: Method has too many lines. [49/10]", 1250076424], - [502, 7, 2604, "Metrics/PerceivedComplexity: Perceived complexity for `reconstruct_declaration_with_merged_members` is too high. [17/8]", 1250076424], - [540, 20, 46, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 1375387925], - [555, 9, 210, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 3589424565], - [565, 7, 1271, "Metrics/AbcSize: Assignment Branch Condition size for `recursive_body_lines_for_declaration` is too high. [<8, 23, 9> 25.96/17]", 2123349984], - [565, 7, 1271, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `recursive_body_lines_for_declaration` is too high. [10/7]", 2123349984], - [565, 7, 1271, "Metrics/MethodLength: Method has too many lines. [18/10]", 2123349984], - [565, 7, 1271, "Metrics/PerceivedComplexity: Perceived complexity for `recursive_body_lines_for_declaration` is too high. [10/8]", 2123349984], - [565, 47, 139, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 652517575], - [591, 7, 1910, "Metrics/AbcSize: Assignment Branch Condition size for `merge_member_lines` is too high. [<4, 35, 12> 37.22/17]", 1631109354], - [591, 7, 1910, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_member_lines` is too high. [11/7]", 1631109354], - [591, 7, 1910, "Metrics/MethodLength: Method has too many lines. [42/10]", 1631109354], - [592, 9, 1837, "Metrics/BlockLength: Block has too many lines. [40/25]", 3339652106], - [638, 7, 1779, "Metrics/AbcSize: Assignment Branch Condition size for `align_member_lists` is too high. [<14, 26, 14> 32.68/17]", 3585753868], - [638, 7, 1779, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `align_member_lists` is too high. [14/7]", 3585753868], - [638, 7, 1779, "Metrics/MethodLength: Method has too many lines. [49/10]", 3585753868], - [638, 7, 1779, "Metrics/PerceivedComplexity: Perceived complexity for `align_member_lists` is too high. [15/8]", 3585753868], - [745, 7, 605, "Metrics/AbcSize: Assignment Branch Condition size for `split_top_level_return_type` is too high. [<7, 14, 10> 18.57/17]", 1731525207], - [745, 7, 605, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split_top_level_return_type` is too high. [8/7]", 1731525207], - [745, 7, 605, "Metrics/MethodLength: Method has too many lines. [17/10]", 1731525207], - [782, 7, 1684, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_statement_lines_with_leading_comments` is too high. [8/7]", 3625004207], - [782, 7, 1684, "Metrics/MethodLength: Method has too many lines. [29/10]", 3625004207], - [782, 7, 1684, "Metrics/PerceivedComplexity: Perceived complexity for `extract_statement_lines_with_leading_comments` is too high. [10/8]", 3625004207], - [869, 33, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [874, 7, 840, "Metrics/MethodLength: Method has too many lines. [15/10]", 3400690599], - [895, 39, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [982, 23, 24, "Style/SafeNavigation: Use safe navigation (`&.`) instead of checking if an object exists before calling the method.", 1487466207], - [998, 7, 1788, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_cross_source_preamble_prefixes` is too high. [<14, 21, 9> 26.8/17]", 3130187278], - [998, 7, 1788, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collapse_cross_source_preamble_prefixes` is too high. [9/7]", 3130187278], - [998, 7, 1788, "Metrics/MethodLength: Method has too many lines. [31/10]", 3130187278], - [998, 7, 1788, "Metrics/PerceivedComplexity: Perceived complexity for `collapse_cross_source_preamble_prefixes` is too high. [9/8]", 3130187278], - [1038, 7, 533, "Metrics/MethodLength: Method has too many lines. [15/10]", 4188914818] - ], - "rbs-merge.gemspec:395192785": [ - [126, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [128, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2105564149], - [134, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949] - ], - "spec/integration/reproducible_merge_spec.rb:4124333249": [ - [9, 1, 6937, "Metrics/BlockLength: Block has too many lines. [155/25]", 1482304086], - [14, 3, 4384, "Metrics/BlockLength: Block has too many lines. [85/25]", 628655161], - [15, 5, 3507, "Metrics/BlockLength: Block has too many lines. [65/25]", 2935184196], - [56, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858910], - [62, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 50415752], - [87, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1546684737] - ], - "spec/rbs/merge/comment_behavior_matrix_spec.rb:2666227529": [ - [14, 45, 6, "Lint/UnusedBlockArgument: Unused block argument - `inline`. If it's necessary, use `_` or `_inline` as an argument name to indicate that it won't be used.", 1605470060], - [18, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 253885993], - [19, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 1702591521] - ], - "spec/rbs/merge/comment_tracker_spec.rb:1831412931": [ - [5, 1, 14574, "Metrics/BlockLength: Block has too many lines. [306/25]", 1598998757], - [8, 3, 3272, "Metrics/BlockLength: Block has too many lines. [67/25]", 935176133], - [95, 3, 1130, "Metrics/BlockLength: Block has too many lines. [28/25]", 204252301], - [143, 3, 1704, "Metrics/BlockLength: Block has too many lines. [32/25]", 1579622084], - [209, 3, 5815, "Metrics/BlockLength: Block has too many lines. [112/25]", 433112678] - ], - "spec/rbs/merge/conflict_resolver_spec.rb:999961156": [ - [8, 1, 19854, "Metrics/BlockLength: Block has too many lines. [491/25]", 3942921818], - [9, 3, 1428, "Metrics/BlockLength: Block has too many lines. [36/25]", 529294185], - [56, 3, 1199, "Metrics/BlockLength: Block has too many lines. [28/25]", 73504201], - [93, 3, 1277, "Metrics/BlockLength: Block has too many lines. [29/25]", 595351018], - [190, 3, 7078, "Metrics/BlockLength: Block has too many lines. [149/25]", 3739681265], - [296, 5, 1646, "Metrics/BlockLength: Block has too many lines. [33/25]", 3128279135], - [302, 7, 1292, "Metrics/BlockLength: Block has too many lines. [27/25]", 729602127], - [404, 3, 4548, "Metrics/BlockLength: Block has too many lines. [114/25]", 2619563374], - [420, 5, 922, "Metrics/BlockLength: Block has too many lines. [26/25]", 3893264586], - [452, 5, 960, "Metrics/BlockLength: Block has too many lines. [26/25]", 3053707146] - ], - "spec/rbs/merge/file_aligner_spec.rb:2643720547": [ - [7, 1, 21476, "Metrics/BlockLength: Block has too many lines. [555/25]", 4145069110], - [65, 3, 1123, "Metrics/BlockLength: Block has too many lines. [28/25]", 1358831340], - [188, 3, 1226, "Metrics/BlockLength: Block has too many lines. [34/25]", 1337144492], - [246, 3, 4891, "Metrics/BlockLength: Block has too many lines. [152/25]", 125990895], - [436, 3, 1943, "Metrics/BlockLength: Block has too many lines. [34/25]", 4126970167], - [483, 3, 3944, "Metrics/BlockLength: Block has too many lines. [94/25]", 2604333848], - [565, 5, 1328, "Metrics/BlockLength: Block has too many lines. [27/25]", 1994971578] - ], - "spec/rbs/merge/file_analysis_spec.rb:952231308": [ - [15, 1, 54363, "Metrics/BlockLength: Block has too many lines. [1205/25]", 2485884639], - [16, 3, 1272, "Metrics/BlockLength: Block has too many lines. [38/25]", 1778989479], - [17, 5, 1210, "Metrics/BlockLength: Block has too many lines. [37/25]", 1755177515], - [67, 3, 1152, "Metrics/BlockLength: Block has too many lines. [33/25]", 2931980952], - [68, 5, 1083, "Metrics/BlockLength: Block has too many lines. [32/25]", 3589815947], - [136, 3, 982, "Metrics/BlockLength: Block has too many lines. [30/25]", 1355840781], - [137, 5, 929, "Metrics/BlockLength: Block has too many lines. [29/25]", 3738902933], - [200, 3, 1559, "Metrics/BlockLength: Block has too many lines. [30/25]", 3203356148], - [201, 5, 1493, "Metrics/BlockLength: Block has too many lines. [29/25]", 1389049628], - [860, 3, 2525, "Metrics/BlockLength: Block has too many lines. [42/25]", 2701315631], - [861, 5, 2455, "Metrics/BlockLength: Block has too many lines. [41/25]", 1293659790], - [884, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 193270906], - [919, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 115067835], - [948, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [954, 3, 3548, "Metrics/BlockLength: Block has too many lines. [59/25]", 2573657607], - [955, 5, 3497, "Metrics/BlockLength: Block has too many lines. [58/25]", 14776664], - [982, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085251945], - [1017, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2659900392], - [1038, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2659900392], - [1091, 3, 1750, "Metrics/BlockLength: Block has too many lines. [29/25]", 460836946], - [1092, 5, 1693, "Metrics/BlockLength: Block has too many lines. [28/25]", 1601111212], - [1135, 3, 1948, "Metrics/BlockLength: Block has too many lines. [41/25]", 4061538475], - [1136, 5, 1892, "Metrics/BlockLength: Block has too many lines. [40/25]", 4081702319], - [1195, 3, 2571, "Metrics/BlockLength: Block has too many lines. [55/25]", 3959149994], - [1265, 3, 2440, "Metrics/BlockLength: Block has too many lines. [52/25]", 2164819729], - [1332, 3, 2008, "Metrics/BlockLength: Block has too many lines. [39/25]", 609327574], - [1379, 3, 1938, "Metrics/BlockLength: Block has too many lines. [38/25]", 361672068], - [1425, 3, 1995, "Metrics/BlockLength: Block has too many lines. [39/25]", 4024875480], - [1472, 3, 1992, "Metrics/BlockLength: Block has too many lines. [39/25]", 1156260241] - ], - "spec/rbs/merge/freeze_node_spec.rb:2278400615": [ - [8, 1, 13268, "Metrics/BlockLength: Block has too many lines. [327/25]", 1590692835], - [9, 3, 2116, "Metrics/BlockLength: Block has too many lines. [43/25]", 4215218715], - [98, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3784984989], - [99, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1182436848], - [331, 3, 2919, "Metrics/BlockLength: Block has too many lines. [65/25]", 1415484725] - ], - "spec/rbs/merge/merge_result_spec.rb:2449518259": [ - [8, 1, 20574, "Metrics/BlockLength: Block has too many lines. [454/25]", 736738811], - [53, 3, 1244, "Metrics/BlockLength: Block has too many lines. [31/25]", 3686452170] - ], - "spec/rbs/merge/smart_merger_removal_mode_compliance_spec.rb:3475743041": [ - [7, 1, 1860, "Metrics/BlockLength: Block has too many lines. [66/25]", 3469987127], - [8, 3, 1798, "Metrics/BlockLength: Block has too many lines. [65/25]", 778477682] - ], - "spec/rbs/merge/smart_merger_spec.rb:3451189224": [ - [14, 1, 43498, "Metrics/BlockLength: Block has too many lines. [1190/25]", 1106962], - [149, 3, 10886, "Metrics/BlockLength: Block has too many lines. [286/25]", 1693926280], - [315, 5, 985, "Metrics/BlockLength: Block has too many lines. [26/25]", 3397066157], - [351, 5, 1063, "Metrics/BlockLength: Block has too many lines. [26/25]", 2718784043], - [461, 5, 1135, "Metrics/BlockLength: Block has too many lines. [26/25]", 3797285781], - [497, 5, 1213, "Metrics/BlockLength: Block has too many lines. [26/25]", 3686078390], - [536, 3, 2766, "Metrics/BlockLength: Block has too many lines. [84/25]", 3927490181], - [649, 3, 1714, "Metrics/BlockLength: Block has too many lines. [54/25]", 386494661], - [721, 3, 5393, "Metrics/BlockLength: Block has too many lines. [138/25]", 2457897034], - [925, 3, 4479, "Metrics/BlockLength: Block has too many lines. [134/25]", 3856958364], - [926, 5, 1327, "Metrics/BlockLength: Block has too many lines. [33/25]", 4009192695], - [970, 5, 953, "Metrics/BlockLength: Block has too many lines. [29/25]", 902715698], - [1008, 5, 1147, "Metrics/BlockLength: Block has too many lines. [37/25]", 3544491851], - [1058, 5, 955, "Metrics/BlockLength: Block has too many lines. [27/25]", 2688118410], - [1096, 3, 1031, "Metrics/BlockLength: Block has too many lines. [32/25]", 663517347], - [1097, 5, 970, "Metrics/BlockLength: Block has too many lines. [31/25]", 1575476639], - [1135, 3, 882, "Metrics/BlockLength: Block has too many lines. [27/25]", 3845382500], - [1136, 5, 813, "Metrics/BlockLength: Block has too many lines. [26/25]", 1755501948], - [1171, 3, 805, "Metrics/BlockLength: Block has too many lines. [26/25]", 3413285873], - [1204, 3, 2200, "Metrics/BlockLength: Block has too many lines. [70/25]", 3541894760], - [1205, 5, 1202, "Metrics/BlockLength: Block has too many lines. [38/25]", 3971143978], - [1235, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177610], - [1251, 5, 923, "Metrics/BlockLength: Block has too many lines. [28/25]", 3867507419], - [1288, 3, 1175, "Metrics/BlockLength: Block has too many lines. [36/25]", 1587654554], - [1289, 5, 1103, "Metrics/BlockLength: Block has too many lines. [35/25]", 3885176914], - [1368, 3, 1252, "Metrics/BlockLength: Block has too many lines. [28/25]", 4206068435], - [1407, 3, 1278, "Metrics/BlockLength: Block has too many lines. [28/25]", 1372687996], - [1446, 3, 1265, "Metrics/BlockLength: Block has too many lines. [28/25]", 3208600846], - [1485, 3, 1265, "Metrics/BlockLength: Block has too many lines. [28/25]", 212464082], - [1524, 3, 1262, "Metrics/BlockLength: Block has too many lines. [28/25]", 4277366491] - ], - "spec/rbs/merge_spec.rb:3352331478": [ - [5, 1, 1389, "Metrics/BlockLength: Block has too many lines. [37/25]", 373922011], - [10, 3, 1270, "Metrics/BlockLength: Block has too many lines. [32/25]", 2567886247] - ] -} diff --git a/gems/rbs-merge/Gemfile b/gems/rbs-merge/Gemfile index 83096ab88..245923666 100644 --- a/gems/rbs-merge/Gemfile +++ b/gems/rbs-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source 'https://gem.coop' +source "https://gem.coop" git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,18 +19,62 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ['~> 1.0', '>= 1.0.8'] -gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ["~> 1.0", ">= 1.0.8"] +gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ast-merge tree_haver ] -direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') +direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? + +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) + direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") + direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == "nomono" } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + if nomono_locked + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] + end + end + Kernel.send(:gem, "nomono", *nomono_activation_requirements) + require "nomono/bundler" + if direct_sibling_templating && !direct_sibling_local + ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + end + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: "STRUCTUREDMERGE", + path_env: "STRUCTUREDMERGE_DEV", + root: ["src", "my", "structuredmerge"] + ) + rescue LoadError + warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + else + ENV.delete("STRUCTUREDMERGE_DEV") + end + end + end +end if direct_sibling_gems.any? && (direct_sibling_local || @@ -250,25 +294,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? # Debugging -eval_gemfile 'gemfiles/modular/debug.gemfile' +eval_gemfile "gemfiles/modular/debug.gemfile" # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile 'gemfiles/modular/coverage.gemfile' +eval_gemfile "gemfiles/modular/coverage.gemfile" # Linting -eval_gemfile 'gemfiles/modular/style.gemfile' +eval_gemfile "gemfiles/modular/style.gemfile" # Documentation -eval_gemfile 'gemfiles/modular/documentation.gemfile' +eval_gemfile "gemfiles/modular/documentation.gemfile" # Optional -eval_gemfile 'gemfiles/modular/optional.gemfile' +eval_gemfile "gemfiles/modular/optional.gemfile" ### Std Lib Extracted Gems -eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' +eval_gemfile "gemfiles/modular/x_std_libs.gemfile" # See unlocked_deps appraisal for more details on irb inclusion -gem 'irb', '~> 1.17' # ruby >= 2.7 +gem "irb", "~> 1.17" # ruby >= 2.7 diff --git a/gems/rbs-merge/Gemfile.lock b/gems/rbs-merge/Gemfile.lock index 78f88aa8f..5fe56c0c1 100644 --- a/gems/rbs-merge/Gemfile.lock +++ b/gems/rbs-merge/Gemfile.lock @@ -275,6 +275,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -307,7 +323,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -362,18 +377,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -535,22 +539,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -656,9 +656,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.3, >= 2.3.7) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -736,7 +736,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -757,10 +756,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -834,13 +833,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/rbs-merge/Rakefile b/gems/rbs-merge/Rakefile index bd4e18e2d..34f8ffe21 100644 --- a/gems/rbs-merge/Rakefile +++ b/gems/rbs-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require 'kettle/drift' + require "kettle/drift" Kettle::Drift.install_tasks rescue LoadError - desc('(stub) kettle:drift:check is unavailable') - task('kettle:drift:check') do + desc("(stub) kettle:drift:check is unavailable") + task("kettle:drift:check") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:update is unavailable') - task('kettle:drift:update') do + desc("(stub) kettle:drift:update is unavailable") + task("kettle:drift:update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:force_update is unavailable') - task('kettle:drift:force_update') do + desc("(stub) kettle:drift:force_update is unavailable") + task("kettle:drift:force_update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift is unavailable') - task('kettle:drift' => 'kettle:drift:update') + desc("(stub) kettle:drift is unavailable") + task("kettle:drift" => "kettle:drift:update") end ### TEMPLATING TASKS diff --git a/gems/rbs-merge/bin/yard b/gems/rbs-merge/bin/yard index 5d516ad6f..a7e8b6eed 100755 --- a/gems/rbs-merge/bin/yard +++ b/gems/rbs-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec('bundle', 'exec', 'rake', 'yard') +exec("bundle", "exec", "rake", "yard") diff --git a/gems/rbs-merge/lib/rbs/merge/version.rb b/gems/rbs-merge/lib/rbs/merge/version.rb index a96a21ddc..8e09fbec5 100644 --- a/gems/rbs-merge/lib/rbs/merge/version.rb +++ b/gems/rbs-merge/lib/rbs/merge/version.rb @@ -3,7 +3,7 @@ module Rbs module Merge module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/rbs-merge/rbs-merge.gemspec b/gems/rbs-merge/rbs-merge.gemspec index 0f7a1c47f..90f0b88ab 100644 --- a/gems/rbs-merge/rbs-merge.gemspec +++ b/gems/rbs-merge/rbs-merge.gemspec @@ -9,47 +9,47 @@ Gem::Specification.new do |spec| spec.name = 'rbs-merge' spec.version = Module.new.tap { |mod| Kernel.load("#{__dir__}/lib/rbs/merge/version.rb", mod) }::Rbs::Merge::Version::VERSION - spec.authors = ['Peter H. Boling'] - spec.email = ['floss@galtzo.com'] + spec.authors = ["Peter H. Boling"] + spec.email = ["floss@galtzo.com"] spec.summary = '☯️ Structured Merge RBS analysis and merge for Ruby' spec.description = '☯️ RBS declaration, comment, freeze-block, and template merge behavior for Structured Merge.' spec.homepage = 'https://github.com/structuredmerge/structuredmerge-ruby' - spec.licenses = ['AGPL-3.0-only', 'PolyForm-Small-Business-1.0.0'] - spec.required_ruby_version = '>= 4.0.0' + spec.licenses = ["AGPL-3.0-only", "PolyForm-Small-Business-1.0.0"] + spec.required_ruby_version = ">= 4.0.0" # 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') - user_cert = "certs/#{ENV.fetch('GEM_CERT_USER', ENV['USER'])}.pem" + unless ENV.include?("SKIP_GEM_SIGNING") + user_cert = "certs/#{ENV.fetch("GEM_CERT_USER", ENV["USER"])}.pem" cert_file_path = File.join(__dir__, user_cert) - cert_chain = cert_file_path.split(',') + cert_chain = cert_file_path.split(",") cert_chain.select! { |fp| File.exist?(fp) } if cert_file_path && cert_chain.any? spec.cert_chain = cert_chain - if $PROGRAM_NAME.end_with?('gem') && ARGV[0] == 'build' - spec.signing_key = File.join(Gem.user_home, '.ssh', 'gem-private_key.pem') + if $PROGRAM_NAME.end_with?("gem") && ARGV[0] == "build" + spec.signing_key = File.join(Gem.user_home, ".ssh", "gem-private_key.pem") end end end - spec.metadata['homepage_uri'] = 'https://structuredmerge.org' - spec.metadata['source_code_uri'] = "#{spec.homepage}/tree/v#{spec.version}" - spec.metadata['changelog_uri'] = "#{spec.homepage}/blob/v#{spec.version}/CHANGELOG.md" - spec.metadata['bug_tracker_uri'] = "#{spec.homepage}/issues" - spec.metadata['documentation_uri'] = "https://www.rubydoc.info/gems/#{spec.name}/#{spec.version}" - spec.metadata['funding_uri'] = 'https://github.com/sponsors/pboling' - spec.metadata['wiki_uri'] = "#{spec.homepage}/wiki" - spec.metadata['news_uri'] = "https://www.railsbling.com/tags/#{spec.name}" - spec.metadata['discord_uri'] = 'https://discord.gg/3qme4XHNKN' - spec.metadata['rubygems_mfa_required'] = 'true' + spec.metadata["homepage_uri"] = "https://structuredmerge.org" + spec.metadata["source_code_uri"] = "#{spec.homepage}/tree/v#{spec.version}" + spec.metadata["changelog_uri"] = "#{spec.homepage}/blob/v#{spec.version}/CHANGELOG.md" + spec.metadata["bug_tracker_uri"] = "#{spec.homepage}/issues" + spec.metadata["documentation_uri"] = "https://www.rubydoc.info/gems/#{spec.name}/#{spec.version}" + spec.metadata["funding_uri"] = "https://github.com/sponsors/pboling" + spec.metadata["wiki_uri"] = "#{spec.homepage}/wiki" + spec.metadata["news_uri"] = "https://www.railsbling.com/tags/#{spec.name}" + spec.metadata["discord_uri"] = "https://discord.gg/3qme4XHNKN" + spec.metadata["rubygems_mfa_required"] = "true" enumerate_package_files = lambda do |root| - Dir.glob(File.join(root, '**', '*'), File::FNM_DOTMATCH).select do |path| - File.file?(path) && !['.', '..'].include?(File.basename(path)) + Dir.glob(File.join(root, "**", "*"), File::FNM_DOTMATCH).select do |path| + File.file?(path) && ![".", ".."].include?(File.basename(path)) end end package_metadata_files = %w[ @@ -69,17 +69,17 @@ Gem::Specification.new do |spec| *enumerate_package_files.call('exe') ] spec.rdoc_options += [ - '--title', + "--title", "#{spec.name} - #{spec.summary}", - '--main', - 'README.md', - '--exclude', - '^sig/', - '--line-numbers', - '--inline-source', - '--quiet' + "--main", + "README.md", + "--exclude", + "^sig/", + "--line-numbers", + "--inline-source", + "--quiet" ] - spec.bindir = 'exe' + spec.bindir = "exe" # Listed files are the relative paths from bindir above. spec.executables = [] @@ -89,13 +89,13 @@ Gem::Specification.new do |spec| # rbs-merge will then preserve content between those markers across template runs. # kettle-jem:unfreeze - spec.require_paths = ['lib'] + spec.require_paths = ["lib"] # Utilities spec.add_dependency 'ast-merge', "= #{spec.version}" spec.add_dependency 'rbs', '>= 3.10' spec.add_dependency 'tree_haver', "= #{spec.version}" - spec.add_dependency('version_gem', '~> 1.1', '>= 1.1.14') # ruby >= 2.2.0 + spec.add_dependency("version_gem", "~> 1.1", ">= 1.1.14") # ruby >= 2.2.0 # NOTE: It is preferable to list development dependencies in the gemspec due to increased # visibility and discoverability. @@ -111,26 +111,27 @@ Gem::Specification.new do |spec| # and preferably a modular one (see gemfiles/modular/*.gemfile). # Dev, Test, & Release Tasks - spec.add_development_dependency('kettle-dev', '~> 2.3', '>= 2.3.7') # ruby >= 4.0.0 + spec.add_development_dependency("kettle-dev", "~> 2.3", ">= 2.3.7") # ruby >= 4.0.0 # Security - spec.add_development_dependency('bundler-audit', '~> 0.9.3') # ruby >= 2.0.0 + spec.add_development_dependency("bundler-audit", "~> 0.9.3") # ruby >= 2.0.0 # Tasks - spec.add_development_dependency('rake', '~> 13.0') # ruby >= 2.2.0 + spec.add_development_dependency("rake", "~> 13.0") # ruby >= 2.2.0 # Debugging - spec.add_development_dependency('require_bench', '~> 1.0', '>= 1.0.4') # ruby >= 2.2.0 + spec.add_development_dependency("require_bench", "~> 1.0", ">= 1.0.4") # ruby >= 2.2.0 # Testing - spec.add_development_dependency('appraisal2', '~> 3.1', '>= 3.1.4') # ruby >= 1.8.7, for testing against multiple versions of dependencies - spec.add_development_dependency('kettle-test', '~> 2.0', '>= 2.0.11') # ruby >= 4.0.0 - spec.add_development_dependency('turbo_tests2', '~> 3.1', '>= 3.1.14') # ruby >= 2.4.0, default kettle-test runner + spec.add_development_dependency("appraisal2", "~> 3.1", ">= 3.1.4") # ruby >= 1.8.7, for testing against multiple versions of dependencies + spec.add_development_dependency("kettle-test", "~> 2.0", ">= 2.0.11") # ruby >= 4.0.0 + spec.add_development_dependency("turbo_tests2", "~> 3.1", ">= 3.1.14") # ruby >= 2.4.0, default kettle-test runner # Releasing - spec.add_development_dependency('ruby-progressbar', '~> 1.13') # ruby >= 0 - spec.add_development_dependency('stone_checksums', '~> 1.0', '>= 1.0.6') # ruby >= 2.2.0 + spec.add_development_dependency("ruby-progressbar", "~> 1.13") # ruby >= 0 + spec.add_development_dependency("stone_checksums", "~> 1.0", ">= 1.0.6") # ruby >= 2.2.0 # 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.4') # ruby >= 2.4 + spec.add_development_dependency("gitmoji-regex", "~> 2.0", ">= 2.0.4") # ruby >= 2.4 + end From d9cb03a1fd915a12d10eab89b82a502ffe8276ba Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:35:41 -0600 Subject: [PATCH 194/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/bash-merge/Gemfile.lock | 327 ++++++++++++++++++- gems/dotenv-merge/.rubocop_gradual.lock | 185 +++++++++++ gems/dotenv-merge/Gemfile.lock | 378 ++-------------------- gems/rbs-merge/.rubocop_gradual.lock | 402 ++++++++++++++++++++++++ gems/rbs-merge/Gemfile | 68 ++-- gems/rbs-merge/Rakefile | 18 +- gems/rbs-merge/bin/yard | 2 +- gems/rbs-merge/lib/rbs/merge/version.rb | 2 +- gems/rbs-merge/rbs-merge.gemspec | 85 +++-- 9 files changed, 1026 insertions(+), 441 deletions(-) create mode 100644 gems/dotenv-merge/.rubocop_gradual.lock create mode 100644 gems/rbs-merge/.rubocop_gradual.lock diff --git a/gems/bash-merge/Gemfile.lock b/gems/bash-merge/Gemfile.lock index e955f4ae1..95209e787 100644 --- a/gems/bash-merge/Gemfile.lock +++ b/gems/bash-merge/Gemfile.lock @@ -17,7 +17,39 @@ PATH version_gem (~> 1.1, >= 1.1.14) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -26,7 +58,193 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -34,6 +252,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -53,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,24 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.1, >= 3.1.4) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.3, >= 2.3.7) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -407,34 +685,55 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.1, >= 3.1.14) + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -442,6 +741,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -454,19 +754,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -481,10 +789,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -492,6 +804,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -519,9 +832,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -530,6 +846,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -543,14 +860,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -558,6 +880,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/dotenv-merge/.rubocop_gradual.lock b/gems/dotenv-merge/.rubocop_gradual.lock new file mode 100644 index 000000000..a7735088e --- /dev/null +++ b/gems/dotenv-merge/.rubocop_gradual.lock @@ -0,0 +1,185 @@ +{ + ".simplecov:811436142": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:3735002317": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "dotenv-merge.gemspec:2358764930": [ + [125, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [127, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2105564149], + [133, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/dotenv-merge.rb:3412166704": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`dotenv-merge.rb`) should use snake_case.", 5381], + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "lib/dotenv/merge.rb:3295153861": [ + [13, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Dotenv::Merge`.", 2866359175] + ], + "lib/dotenv/merge/comment_tracker.rb:107522322": [ + [75, 7, 484, "Metrics/MethodLength: Method has too many lines. [13/10]", 786949197] + ], + "lib/dotenv/merge/env_line.rb:1395549015": [ + [38, 5, 6332, "Metrics/ClassLength: Class has too many lines. [112/100]", 1345509408], + [65, 7, 442, "Metrics/MethodLength: Method has too many lines. [14/10]", 415810066], + [177, 7, 576, "Metrics/MethodLength: Method has too many lines. [18/10]", 1351261581], + [202, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193406010] + ], + "lib/dotenv/merge/file_analysis.rb:4181609114": [ + [24, 5, 10717, "Metrics/ClassLength: Class has too many lines. [178/100]", 144541378], + [40, 7, 1034, "Metrics/MethodLength: Method has too many lines. [13/10]", 4069640141], + [254, 7, 589, "Metrics/MethodLength: Method has too many lines. [15/10]", 1686454790], + [280, 7, 946, "Metrics/MethodLength: Method has too many lines. [26/10]", 2970142744], + [315, 7, 908, "Metrics/AbcSize: Assignment Branch Condition size for `integrate_freeze_blocks` is too high. [<8, 20, 11> 24.19/17]", 3290540918], + [315, 7, 908, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `integrate_freeze_blocks` is too high. [10/7]", 3290540918], + [315, 7, 908, "Metrics/MethodLength: Method has too many lines. [18/10]", 3290540918], + [315, 7, 908, "Metrics/PerceivedComplexity: Perceived complexity for `integrate_freeze_blocks` is too high. [11/8]", 3290540918] + ], + "lib/dotenv/merge/smart_merger.rb:4110302585": [ + [27, 5, 20190, "Metrics/ClassLength: Class has too many lines. [398/100]", 2164846336], + [52, 7, 1092, "Metrics/MethodLength: Method has too many lines. [16/10]", 2908064588], + [52, 21, 401, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [13/5]", 1661881927], + [126, 7, 2338, "Metrics/AbcSize: Assignment Branch Condition size for `perform_merge` is too high. [<17, 42, 7> 45.85/17]", 2431495447], + [126, 7, 2338, "Metrics/MethodLength: Method has too many lines. [49/10]", 2431495447], + [235, 7, 733, "Metrics/MethodLength: Method has too many lines. [11/10]", 3293257138], + [260, 7, 331, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_node_typing` is too high. [8/7]", 1465922549], + [272, 7, 680, "Metrics/MethodLength: Method has too many lines. [11/10]", 4253249620], + [300, 7, 602, "Metrics/MethodLength: Method has too many lines. [12/10]", 1142282607], + [364, 7, 1110, "Metrics/AbcSize: Assignment Branch Condition size for `root_boundary_lines_for` is too high. [<7, 29, 24> 38.29/17]", 3853137527], + [364, 7, 1110, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `root_boundary_lines_for` is too high. [22/7]", 3853137527], + [364, 7, 1110, "Metrics/MethodLength: Method has too many lines. [21/10]", 3853137527], + [364, 7, 1110, "Metrics/PerceivedComplexity: Perceived complexity for `root_boundary_lines_for` is too high. [21/8]", 3853137527], + [392, 7, 732, "Metrics/AbcSize: Assignment Branch Condition size for `emission_start_line_for` is too high. [<4, 17, 10> 20.12/17]", 2147944725], + [392, 7, 732, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emission_start_line_for` is too high. [9/7]", 2147944725], + [392, 7, 732, "Metrics/MethodLength: Method has too many lines. [12/10]", 2147944725], + [392, 7, 732, "Metrics/PerceivedComplexity: Perceived complexity for `emission_start_line_for` is too high. [10/8]", 2147944725], + [413, 7, 1134, "Metrics/MethodLength: Method has too many lines. [15/10]", 3700686114], + [413, 25, 239, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 406985461], + [440, 7, 712, "Metrics/MethodLength: Method has too many lines. [13/10]", 3393691510], + [506, 7, 1797, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_cross_source_preamble_prefixes` is too high. [<14, 21, 9> 26.8/17]", 3130187278], + [506, 7, 1797, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collapse_cross_source_preamble_prefixes` is too high. [9/7]", 3130187278], + [506, 7, 1797, "Metrics/MethodLength: Method has too many lines. [31/10]", 3130187278], + [506, 7, 1797, "Metrics/PerceivedComplexity: Perceived complexity for `collapse_cross_source_preamble_prefixes` is too high. [9/8]", 3130187278], + [546, 7, 536, "Metrics/MethodLength: Method has too many lines. [15/10]", 4188914818] + ], + "spec/dotenv/merge/comment_behavior_matrix_spec.rb:4260851990": [ + [13, 37, 15, "Style/SymbolProc: Pass `&:value` as an argument to `lambda` instead of a block.", 1808354951], + [19, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 727266440], + [20, 121, 81, "Layout/LineLength: Line is too long. [201/120]", 2338882412], + [21, 121, 81, "Layout/LineLength: Line is too long. [201/120]", 2338882412], + [22, 121, 73, "Layout/LineLength: Line is too long. [193/120]", 2861499882], + [23, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 851778368] + ], + "spec/dotenv/merge/comment_tracker_spec.rb:2874668910": [ + [3, 1, 2792, "Metrics/BlockLength: Block has too many lines. [67/25]", 3333395414], + [4, 3, 1161, "Metrics/BlockLength: Block has too many lines. [34/25]", 3155362699], + [49, 3, 1573, "Metrics/BlockLength: Block has too many lines. [29/25]", 2926301238] + ], + "spec/dotenv/merge/env_line_spec.rb:22931135": [ + [3, 1, 8558, "Metrics/BlockLength: Block has too many lines. [240/25]", 612064308], + [4, 3, 4878, "Metrics/BlockLength: Block has too many lines. [143/25]", 4253904397] + ], + "spec/dotenv/merge/file_analysis_spec.rb:3466760370": [ + [3, 1, 12591, "Metrics/BlockLength: Block has too many lines. [336/25]", 3181229288], + [4, 3, 1048, "Metrics/BlockLength: Block has too many lines. [28/25]", 1006937171], + [38, 3, 2747, "Metrics/BlockLength: Block has too many lines. [77/25]", 1880493411], + [266, 3, 1819, "Metrics/BlockLength: Block has too many lines. [33/25]", 768689889], + [313, 3, 1498, "Metrics/BlockLength: Block has too many lines. [32/25]", 3435107213], + [356, 3, 1164, "Metrics/BlockLength: Block has too many lines. [35/25]", 2711157174] + ], + "spec/dotenv/merge/freeze_node_spec.rb:1103944682": [ + [5, 1, 7018, "Metrics/BlockLength: Block has too many lines. [170/25]", 2479529721], + [199, 29, 21, "Style/SymbolProc: Pass `&:assignment?` as an argument to `all?` instead of a block.", 359149537] + ], + "spec/dotenv/merge/merge_result_spec.rb:185036265": [ + [5, 1, 6358, "Metrics/BlockLength: Block has too many lines. [163/25]", 2313329306] + ], + "spec/dotenv/merge/smart_merger_spec.rb:3022416291": [ + [3, 1, 21266, "Metrics/BlockLength: Block has too many lines. [531/25]", 2706633331], + [24, 3, 13017, "Metrics/BlockLength: Block has too many lines. [317/25]", 1016391740], + [57, 5, 1320, "Metrics/BlockLength: Block has too many lines. [37/25]", 2903507276], + [156, 5, 2293, "Metrics/BlockLength: Block has too many lines. [48/25]", 1412485907], + [222, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1224552102], + [226, 5, 4055, "Metrics/BlockLength: Block has too many lines. [94/25]", 3099913322], + [396, 5, 1538, "Metrics/BlockLength: Block has too many lines. [33/25]", 4208751294], + [479, 3, 939, "Metrics/BlockLength: Block has too many lines. [26/25]", 4270544143], + [513, 3, 2177, "Metrics/BlockLength: Block has too many lines. [58/25]", 2538783756], + [662, 3, 1280, "Metrics/BlockLength: Block has too many lines. [32/25]", 2559985794] + ], + "spec/dotenv/merge_spec.rb:3204622260": [ + [3, 1, 2523, "Metrics/BlockLength: Block has too many lines. [63/25]", 2724479079], + [19, 3, 1267, "Metrics/BlockLength: Block has too many lines. [29/25]", 2157048718] + ], + "spec/integration/reproducible_merge_spec.rb:2470745815": [ + [6, 1, 1451, "Metrics/BlockLength: Block has too many lines. [31/25]", 1550571542] + ] +} diff --git a/gems/dotenv-merge/Gemfile.lock b/gems/dotenv-merge/Gemfile.lock index 7ca2b1965..15b0c9cc6 100644 --- a/gems/dotenv-merge/Gemfile.lock +++ b/gems/dotenv-merge/Gemfile.lock @@ -17,39 +17,7 @@ PATH version_gem (~> 1.1, >= 1.1.14) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -58,193 +26,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -252,45 +34,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -310,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -324,6 +61,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -379,6 +117,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -397,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -537,23 +283,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -587,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +381,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.1, >= 3.1.4) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.3, >= 2.3.7) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,61 +407,40 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.1, >= 3.1.14) - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -753,27 +454,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +481,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +492,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,19 +519,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -857,19 +543,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -877,7 +558,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/rbs-merge/.rubocop_gradual.lock b/gems/rbs-merge/.rubocop_gradual.lock new file mode 100644 index 000000000..3d9c5b1c7 --- /dev/null +++ b/gems/rbs-merge/.rubocop_gradual.lock @@ -0,0 +1,402 @@ +{ + ".simplecov:2483172942": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:3295679373": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/rbs-merge.rb:334311121": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`rbs-merge.rb`) should use snake_case.", 5381], + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "lib/rbs/merge.rb:1873081658": [ + [17, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Rbs::Merge`.", 2866359175], + [103, 7, 1197, "Metrics/MethodLength: Method has too many lines. [22/10]", 564456261] + ], + "lib/rbs/merge/backends/rbs_backend.rb:2885387755": [ + [48, 11, 555, "Metrics/MethodLength: Method has too many lines. [13/10]", 2078142514], + [81, 11, 658, "Metrics/MethodLength: Method has too many lines. [11/10]", 324484142], + [172, 11, 527, "Metrics/MethodLength: Method has too many lines. [14/10]", 631898529], + [240, 15, 11, "Naming/PredicatePrefix: Rename `has_errors?` to `errors?`.", 1181419252], + [263, 9, 9332, "Metrics/ClassLength: Class has too many lines. [135/100]", 1906483935], + [290, 11, 1914, "Metrics/AbcSize: Assignment Branch Condition size for `type` is too high. [<0, 9, 23> 24.7/17]", 3636991776], + [290, 11, 1914, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `type` is too high. [24/7]", 3636991776], + [290, 11, 1914, "Metrics/MethodLength: Method has too many lines. [28/10]", 3636991776], + [363, 11, 489, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `end_point` is too high. [8/7]", 844861810], + [504, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] + ], + "lib/rbs/merge/comment_tracker.rb:1938176986": [ + [28, 7, 767, "Metrics/MethodLength: Method has too many lines. [15/10]", 752916075], + [60, 7, 416, "Metrics/MethodLength: Method has too many lines. [12/10]", 2715172162] + ], + "lib/rbs/merge/conflict_resolver.rb:1305396962": [ + [16, 5, 11045, "Metrics/ClassLength: Class has too many lines. [174/100]", 330576807], + [44, 7, 1614, "Metrics/MethodLength: Method has too many lines. [23/10]", 1004723330], + [44, 45, 14, "Lint/UnusedMethodArgument: Unused method argument - `template_index`.", 1809801172], + [44, 62, 10, "Lint/UnusedMethodArgument: Unused method argument - `dest_index`.", 2703999490], + [122, 7, 717, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `resolve_preference` is too high. [8/7]", 2783267415], + [122, 7, 717, "Metrics/MethodLength: Method has too many lines. [12/10]", 2783267415], + [156, 7, 949, "Metrics/AbcSize: Assignment Branch Condition size for `extract_declaration_text` is too high. [<9, 19, 14> 25.26/17]", 4132302840], + [156, 7, 949, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_declaration_text` is too high. [13/7]", 4132302840], + [156, 7, 949, "Metrics/MethodLength: Method has too many lines. [18/10]", 4132302840], + [156, 7, 949, "Metrics/PerceivedComplexity: Perceived complexity for `extract_declaration_text` is too high. [14/8]", 4132302840], + [181, 39, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [279, 7, 565, "Metrics/MethodLength: Method has too many lines. [13/10]", 375776463], + [279, 11, 12, "Naming/PredicatePrefix: Rename `has_members?` to `members?`.", 496913372] + ], + "lib/rbs/merge/file_aligner.rb:157117932": [ + [32, 7, 128, "Lint/UselessMethodDefinition: Useless method definition detected.", 4031328363] + ], + "lib/rbs/merge/file_analysis.rb:4205990536": [ + [23, 5, 20642, "Metrics/ClassLength: Class has too many lines. [403/100]", 3271819659], + [59, 7, 1146, "Metrics/MethodLength: Method has too many lines. [20/10]", 1625645012], + [191, 7, 398, "Metrics/MethodLength: Method has too many lines. [12/10]", 4157341657], + [211, 7, 719, "Metrics/MethodLength: Method has too many lines. [13/10]", 2571132513], + [235, 7, 965, "Metrics/AbcSize: Assignment Branch Condition size for `compute_tree_sitter_signature` is too high. [<3, 5, 21> 21.79/17]", 2963702282], + [235, 7, 965, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_tree_sitter_signature` is too high. [22/7]", 2963702282], + [235, 7, 965, "Metrics/MethodLength: Method has too many lines. [26/10]", 2963702282], + [235, 7, 965, "Metrics/PerceivedComplexity: Perceived complexity for `compute_tree_sitter_signature` is too high. [16/8]", 2963702282], + [269, 7, 996, "Metrics/AbcSize: Assignment Branch Condition size for `extract_tree_sitter_node_name` is too high. [<5, 16, 10> 19.52/17]", 300940102], + [269, 7, 996, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_tree_sitter_node_name` is too high. [11/7]", 300940102], + [269, 7, 996, "Metrics/MethodLength: Method has too many lines. [24/10]", 300940102], + [269, 7, 996, "Metrics/PerceivedComplexity: Perceived complexity for `extract_tree_sitter_node_name` is too high. [11/8]", 300940102], + [320, 7, 834, "Metrics/MethodLength: Method has too many lines. [16/10]", 658496547], + [380, 7, 1612, "Metrics/AbcSize: Assignment Branch Condition size for `extract_tree_sitter_declarations` is too high. [<8, 18, 11> 22.56/17]", 1899595676], + [380, 7, 1612, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_tree_sitter_declarations` is too high. [10/7]", 1899595676], + [380, 7, 1612, "Metrics/MethodLength: Method has too many lines. [23/10]", 1899595676], + [380, 7, 1612, "Metrics/PerceivedComplexity: Perceived complexity for `extract_tree_sitter_declarations` is too high. [11/8]", 1899595676], + [449, 7, 569, "Metrics/MethodLength: Method has too many lines. [13/10]", 210550095], + [471, 7, 1133, "Metrics/AbcSize: Assignment Branch Condition size for `build_freeze_blocks` is too high. [<7, 22, 6> 23.85/17]", 4016218974], + [471, 7, 1133, "Metrics/MethodLength: Method has too many lines. [29/10]", 4016218974], + [528, 7, 486, "Metrics/MethodLength: Method has too many lines. [12/10]", 618123864], + [528, 7, 486, "Metrics/PerceivedComplexity: Perceived complexity for `node_start_line` is too high. [9/8]", 618123864], + [545, 7, 472, "Metrics/MethodLength: Method has too many lines. [12/10]", 1339916888], + [545, 7, 472, "Metrics/PerceivedComplexity: Perceived complexity for `node_end_line` is too high. [9/8]", 1339916888], + [579, 7, 1868, "Metrics/AbcSize: Assignment Branch Condition size for `compute_rbs_gem_signature` is too high. [<0, 45, 23> 50.54/17]", 2652509672], + [579, 7, 1868, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_rbs_gem_signature` is too high. [23/7]", 2652509672], + [579, 7, 1868, "Metrics/MethodLength: Method has too many lines. [43/10]", 2652509672], + [579, 7, 1868, "Metrics/PerceivedComplexity: Perceived complexity for `compute_rbs_gem_signature` is too high. [9/8]", 2652509672] + ], + "lib/rbs/merge/freeze_node.rb:2942544870": [ + [34, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 201145846], + [39, 7, 577, "Metrics/MethodLength: Method has too many lines. [11/10]", 2189574632], + [39, 21, 186, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1006469938], + [78, 7, 1506, "Metrics/AbcSize: Assignment Branch Condition size for `validate_structure!` is too high. [<12, 12, 17> 24.02/17]", 1543687562], + [78, 7, 1506, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_structure!` is too high. [12/7]", 1543687562], + [78, 7, 1506, "Metrics/MethodLength: Method has too many lines. [25/10]", 1543687562], + [78, 7, 1506, "Metrics/PerceivedComplexity: Perceived complexity for `validate_structure!` is too high. [12/8]", 1543687562], + [150, 7, 891, "Metrics/AbcSize: Assignment Branch Condition size for `extract_node_name` is too high. [<4, 21, 12> 24.52/17]", 1223188123], + [150, 7, 891, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_node_name` is too high. [13/7]", 1223188123], + [150, 7, 891, "Metrics/MethodLength: Method has too many lines. [18/10]", 1223188123], + [150, 7, 891, "Metrics/PerceivedComplexity: Perceived complexity for `extract_node_name` is too high. [13/8]", 1223188123], + [162, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861336] + ], + "lib/rbs/merge/merge_result.rb:1707720872": [ + [18, 5, 15586, "Metrics/ClassLength: Class has too many lines. [276/100]", 817348545], + [89, 7, 966, "Metrics/MethodLength: Method has too many lines. [14/10]", 3349669346], + [176, 7, 1770, "Metrics/AbcSize: Assignment Branch Condition size for `extract_lines` is too high. [<15, 21, 16> 30.36/17]", 3951991352], + [176, 7, 1770, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_lines` is too high. [15/7]", 3951991352], + [176, 7, 1770, "Metrics/MethodLength: Method has too many lines. [29/10]", 3951991352], + [176, 7, 1770, "Metrics/PerceivedComplexity: Perceived complexity for `extract_lines` is too high. [16/8]", 3951991352], + [226, 44, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [232, 7, 606, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trailing_lines_for` is too high. [9/7]", 518209980], + [232, 7, 606, "Metrics/MethodLength: Method has too many lines. [13/10]", 518209980], + [232, 7, 606, "Metrics/PerceivedComplexity: Perceived complexity for `trailing_lines_for` is too high. [10/8]", 518209980], + [233, 47, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [266, 33, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [271, 7, 682, "Metrics/AbcSize: Assignment Branch Condition size for `deduplicate_leading_comment_overlap` is too high. [<4, 15, 9> 17.94/17]", 4227245480], + [271, 7, 682, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `deduplicate_leading_comment_overlap` is too high. [8/7]", 4227245480], + [271, 7, 682, "Metrics/MethodLength: Method has too many lines. [11/10]", 4227245480], + [335, 23, 24, "Style/SafeNavigation: Use safe navigation (`&.`) instead of checking if an object exists before calling the method.", 1487466207], + [371, 7, 893, "Metrics/MethodLength: Method has too many lines. [11/10]", 1066420963], + [371, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 2582953496] + ], + "lib/rbs/merge/node_type_normalizer.rb:2788764230": [ + [65, 5, 10747, "Metrics/ModuleLength: Module has too many lines. [199/100]", 63560324], + [250, 9, 693, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonical_type_for_node` is too high. [9/7]", 908800634], + [250, 9, 693, "Metrics/MethodLength: Method has too many lines. [16/10]", 908800634], + [250, 9, 693, "Metrics/PerceivedComplexity: Perceived complexity for `canonical_type_for_node` is too high. [9/8]", 908800634], + [323, 9, 689, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `refine_tree_sitter_attribute_type` is too high. [9/7]", 2340352499], + [323, 9, 689, "Metrics/MethodLength: Method has too many lines. [13/10]", 2340352499], + [323, 9, 689, "Metrics/PerceivedComplexity: Perceived complexity for `refine_tree_sitter_attribute_type` is too high. [9/8]", 2340352499], + [343, 9, 475, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `refine_tree_sitter_variable_type` is too high. [8/7]", 536330497], + [343, 9, 475, "Metrics/MethodLength: Method has too many lines. [14/10]", 536330497] + ], + "lib/rbs/merge/node_wrapper.rb:1434186839": [ + [26, 5, 14933, "Metrics/ClassLength: Class has too many lines. [344/100]", 4139761414], + [37, 17, 84, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 366036293], + [264, 7, 831, "Metrics/AbcSize: Assignment Branch Condition size for `text` is too high. [<3, 32, 20> 37.85/17]", 980238327], + [264, 7, 831, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `text` is too high. [18/7]", 980238327], + [264, 7, 831, "Metrics/MethodLength: Method has too many lines. [18/10]", 980238327], + [264, 7, 831, "Metrics/PerceivedComplexity: Perceived complexity for `text` is too high. [20/8]", 980238327], + [268, 47, 2, "Lint/SafeNavigationConsistency: Use `.` instead of unnecessary `&.`.", 5858765], + [280, 22, 14, "Style/NumericPredicate: Use `start_line.positive?` instead of `start_line > 0`.", 792111162], + [301, 7, 1209, "Metrics/AbcSize: Assignment Branch Condition size for `signature` is too high. [<1, 25, 20> 32.03/17]", 4281557215], + [301, 7, 1209, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `signature` is too high. [21/7]", 4281557215], + [301, 7, 1209, "Metrics/MethodLength: Method has too many lines. [45/10]", 4281557215], + [351, 7, 384, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `method_kind` is too high. [8/7]", 563626808], + [351, 7, 384, "Metrics/PerceivedComplexity: Perceived complexity for `method_kind` is too high. [9/8]", 563626808], + [423, 7, 935, "Metrics/MethodLength: Method has too many lines. [21/10]", 3557799127], + [469, 7, 667, "Metrics/AbcSize: Assignment Branch Condition size for `extract_child_texts` is too high. [<6, 16, 8> 18.87/17]", 1979652559], + [469, 7, 667, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_child_texts` is too high. [9/7]", 1979652559], + [469, 7, 667, "Metrics/MethodLength: Method has too many lines. [12/10]", 1979652559], + [469, 7, 667, "Metrics/PerceivedComplexity: Perceived complexity for `extract_child_texts` is too high. [9/8]", 1979652559], + [487, 7, 583, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_tree_sitter_visibility_kind` is too high. [9/7]", 2002684122], + [487, 7, 583, "Metrics/MethodLength: Method has too many lines. [13/10]", 2002684122], + [487, 7, 583, "Metrics/PerceivedComplexity: Perceived complexity for `extract_tree_sitter_visibility_kind` is too high. [9/8]", 2002684122], + [532, 7, 557, "Metrics/MethodLength: Method has too many lines. [14/10]", 1753294094] + ], + "lib/rbs/merge/smart_merger.rb:4114819804": [ + [43, 5, 38956, "Metrics/ClassLength: Class has too many lines. [785/100]", 3732361716], + [85, 7, 1188, "Metrics/MethodLength: Method has too many lines. [17/10]", 2908064588], + [85, 21, 447, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 1344979847], + [181, 7, 805, "Metrics/AbcSize: Assignment Branch Condition size for `perform_merge` is too high. [<6, 15, 8> 18.03/17]", 1638854701], + [181, 7, 805, "Metrics/MethodLength: Method has too many lines. [14/10]", 1638854701], + [207, 7, 572, "Metrics/MethodLength: Method has too many lines. [15/10]", 3471574631], + [290, 7, 621, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `root_boundary_lines_for` is too high. [9/7]", 354795708], + [290, 7, 621, "Metrics/PerceivedComplexity: Perceived complexity for `root_boundary_lines_for` is too high. [9/8]", 354795708], + [291, 34, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [323, 9, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 748374760], + [326, 7, 794, "Metrics/AbcSize: Assignment Branch Condition size for `root_boundary_range` is too high. [<4, 22, 11> 24.92/17]", 2546634651], + [326, 7, 794, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `root_boundary_range` is too high. [10/7]", 2546634651], + [326, 7, 794, "Metrics/MethodLength: Method has too many lines. [19/10]", 2546634651], + [326, 7, 794, "Metrics/PerceivedComplexity: Perceived complexity for `root_boundary_range` is too high. [11/8]", 2546634651], + [365, 7, 1030, "Metrics/AbcSize: Assignment Branch Condition size for `process_match` is too high. [<1, 22, 7> 23.11/17]", 333057092], + [365, 7, 1030, "Metrics/MethodLength: Method has too many lines. [27/10]", 333057092], + [428, 7, 1830, "Metrics/AbcSize: Assignment Branch Condition size for `removed_declaration_comment_lines` is too high. [<13, 31, 25> 41.89/17]", 276966259], + [428, 7, 1830, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `removed_declaration_comment_lines` is too high. [21/7]", 276966259], + [428, 7, 1830, "Metrics/MethodLength: Method has too many lines. [38/10]", 276966259], + [428, 7, 1830, "Metrics/PerceivedComplexity: Perceived complexity for `removed_declaration_comment_lines` is too high. [24/8]", 276966259], + [476, 7, 675, "Metrics/MethodLength: Method has too many lines. [13/10]", 1415352570], + [502, 7, 2604, "Metrics/AbcSize: Assignment Branch Condition size for `reconstruct_declaration_with_merged_members` is too high. [<19, 23, 22> 37.07/17]", 1250076424], + [502, 7, 2604, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `reconstruct_declaration_with_merged_members` is too high. [17/7]", 1250076424], + [502, 7, 2604, "Metrics/MethodLength: Method has too many lines. [49/10]", 1250076424], + [502, 7, 2604, "Metrics/PerceivedComplexity: Perceived complexity for `reconstruct_declaration_with_merged_members` is too high. [17/8]", 1250076424], + [540, 20, 46, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 1375387925], + [555, 9, 210, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 3589424565], + [565, 7, 1271, "Metrics/AbcSize: Assignment Branch Condition size for `recursive_body_lines_for_declaration` is too high. [<8, 23, 9> 25.96/17]", 2123349984], + [565, 7, 1271, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `recursive_body_lines_for_declaration` is too high. [10/7]", 2123349984], + [565, 7, 1271, "Metrics/MethodLength: Method has too many lines. [18/10]", 2123349984], + [565, 7, 1271, "Metrics/PerceivedComplexity: Perceived complexity for `recursive_body_lines_for_declaration` is too high. [10/8]", 2123349984], + [565, 47, 139, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 652517575], + [591, 7, 1910, "Metrics/AbcSize: Assignment Branch Condition size for `merge_member_lines` is too high. [<4, 35, 12> 37.22/17]", 1631109354], + [591, 7, 1910, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_member_lines` is too high. [11/7]", 1631109354], + [591, 7, 1910, "Metrics/MethodLength: Method has too many lines. [42/10]", 1631109354], + [592, 9, 1837, "Metrics/BlockLength: Block has too many lines. [40/25]", 3339652106], + [638, 7, 1779, "Metrics/AbcSize: Assignment Branch Condition size for `align_member_lists` is too high. [<14, 26, 14> 32.68/17]", 3585753868], + [638, 7, 1779, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `align_member_lists` is too high. [14/7]", 3585753868], + [638, 7, 1779, "Metrics/MethodLength: Method has too many lines. [49/10]", 3585753868], + [638, 7, 1779, "Metrics/PerceivedComplexity: Perceived complexity for `align_member_lists` is too high. [15/8]", 3585753868], + [745, 7, 605, "Metrics/AbcSize: Assignment Branch Condition size for `split_top_level_return_type` is too high. [<7, 14, 10> 18.57/17]", 1731525207], + [745, 7, 605, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split_top_level_return_type` is too high. [8/7]", 1731525207], + [745, 7, 605, "Metrics/MethodLength: Method has too many lines. [17/10]", 1731525207], + [782, 7, 1684, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_statement_lines_with_leading_comments` is too high. [8/7]", 3625004207], + [782, 7, 1684, "Metrics/MethodLength: Method has too many lines. [29/10]", 3625004207], + [782, 7, 1684, "Metrics/PerceivedComplexity: Perceived complexity for `extract_statement_lines_with_leading_comments` is too high. [10/8]", 3625004207], + [869, 33, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [874, 7, 840, "Metrics/MethodLength: Method has too many lines. [15/10]", 3400690599], + [895, 39, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [982, 23, 24, "Style/SafeNavigation: Use safe navigation (`&.`) instead of checking if an object exists before calling the method.", 1487466207], + [998, 7, 1788, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_cross_source_preamble_prefixes` is too high. [<14, 21, 9> 26.8/17]", 3130187278], + [998, 7, 1788, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collapse_cross_source_preamble_prefixes` is too high. [9/7]", 3130187278], + [998, 7, 1788, "Metrics/MethodLength: Method has too many lines. [31/10]", 3130187278], + [998, 7, 1788, "Metrics/PerceivedComplexity: Perceived complexity for `collapse_cross_source_preamble_prefixes` is too high. [9/8]", 3130187278], + [1038, 7, 533, "Metrics/MethodLength: Method has too many lines. [15/10]", 4188914818] + ], + "rbs-merge.gemspec:395192785": [ + [126, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [128, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2105564149], + [134, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949] + ], + "spec/integration/reproducible_merge_spec.rb:4124333249": [ + [9, 1, 6937, "Metrics/BlockLength: Block has too many lines. [155/25]", 1482304086], + [14, 3, 4384, "Metrics/BlockLength: Block has too many lines. [85/25]", 628655161], + [15, 5, 3507, "Metrics/BlockLength: Block has too many lines. [65/25]", 2935184196], + [56, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858910], + [62, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 50415752], + [87, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1546684737] + ], + "spec/rbs/merge/comment_behavior_matrix_spec.rb:2666227529": [ + [14, 45, 6, "Lint/UnusedBlockArgument: Unused block argument - `inline`. If it's necessary, use `_` or `_inline` as an argument name to indicate that it won't be used.", 1605470060], + [18, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 253885993], + [19, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 1702591521] + ], + "spec/rbs/merge/comment_tracker_spec.rb:1831412931": [ + [5, 1, 14574, "Metrics/BlockLength: Block has too many lines. [306/25]", 1598998757], + [8, 3, 3272, "Metrics/BlockLength: Block has too many lines. [67/25]", 935176133], + [95, 3, 1130, "Metrics/BlockLength: Block has too many lines. [28/25]", 204252301], + [143, 3, 1704, "Metrics/BlockLength: Block has too many lines. [32/25]", 1579622084], + [209, 3, 5815, "Metrics/BlockLength: Block has too many lines. [112/25]", 433112678] + ], + "spec/rbs/merge/conflict_resolver_spec.rb:999961156": [ + [8, 1, 19854, "Metrics/BlockLength: Block has too many lines. [491/25]", 3942921818], + [9, 3, 1428, "Metrics/BlockLength: Block has too many lines. [36/25]", 529294185], + [56, 3, 1199, "Metrics/BlockLength: Block has too many lines. [28/25]", 73504201], + [93, 3, 1277, "Metrics/BlockLength: Block has too many lines. [29/25]", 595351018], + [190, 3, 7078, "Metrics/BlockLength: Block has too many lines. [149/25]", 3739681265], + [296, 5, 1646, "Metrics/BlockLength: Block has too many lines. [33/25]", 3128279135], + [302, 7, 1292, "Metrics/BlockLength: Block has too many lines. [27/25]", 729602127], + [404, 3, 4548, "Metrics/BlockLength: Block has too many lines. [114/25]", 2619563374], + [420, 5, 922, "Metrics/BlockLength: Block has too many lines. [26/25]", 3893264586], + [452, 5, 960, "Metrics/BlockLength: Block has too many lines. [26/25]", 3053707146] + ], + "spec/rbs/merge/file_aligner_spec.rb:2643720547": [ + [7, 1, 21476, "Metrics/BlockLength: Block has too many lines. [555/25]", 4145069110], + [65, 3, 1123, "Metrics/BlockLength: Block has too many lines. [28/25]", 1358831340], + [188, 3, 1226, "Metrics/BlockLength: Block has too many lines. [34/25]", 1337144492], + [246, 3, 4891, "Metrics/BlockLength: Block has too many lines. [152/25]", 125990895], + [436, 3, 1943, "Metrics/BlockLength: Block has too many lines. [34/25]", 4126970167], + [483, 3, 3944, "Metrics/BlockLength: Block has too many lines. [94/25]", 2604333848], + [565, 5, 1328, "Metrics/BlockLength: Block has too many lines. [27/25]", 1994971578] + ], + "spec/rbs/merge/file_analysis_spec.rb:952231308": [ + [15, 1, 54363, "Metrics/BlockLength: Block has too many lines. [1205/25]", 2485884639], + [16, 3, 1272, "Metrics/BlockLength: Block has too many lines. [38/25]", 1778989479], + [17, 5, 1210, "Metrics/BlockLength: Block has too many lines. [37/25]", 1755177515], + [67, 3, 1152, "Metrics/BlockLength: Block has too many lines. [33/25]", 2931980952], + [68, 5, 1083, "Metrics/BlockLength: Block has too many lines. [32/25]", 3589815947], + [136, 3, 982, "Metrics/BlockLength: Block has too many lines. [30/25]", 1355840781], + [137, 5, 929, "Metrics/BlockLength: Block has too many lines. [29/25]", 3738902933], + [200, 3, 1559, "Metrics/BlockLength: Block has too many lines. [30/25]", 3203356148], + [201, 5, 1493, "Metrics/BlockLength: Block has too many lines. [29/25]", 1389049628], + [860, 3, 2525, "Metrics/BlockLength: Block has too many lines. [42/25]", 2701315631], + [861, 5, 2455, "Metrics/BlockLength: Block has too many lines. [41/25]", 1293659790], + [884, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 193270906], + [919, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 115067835], + [948, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [954, 3, 3548, "Metrics/BlockLength: Block has too many lines. [59/25]", 2573657607], + [955, 5, 3497, "Metrics/BlockLength: Block has too many lines. [58/25]", 14776664], + [982, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085251945], + [1017, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2659900392], + [1038, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2659900392], + [1091, 3, 1750, "Metrics/BlockLength: Block has too many lines. [29/25]", 460836946], + [1092, 5, 1693, "Metrics/BlockLength: Block has too many lines. [28/25]", 1601111212], + [1135, 3, 1948, "Metrics/BlockLength: Block has too many lines. [41/25]", 4061538475], + [1136, 5, 1892, "Metrics/BlockLength: Block has too many lines. [40/25]", 4081702319], + [1195, 3, 2571, "Metrics/BlockLength: Block has too many lines. [55/25]", 3959149994], + [1265, 3, 2440, "Metrics/BlockLength: Block has too many lines. [52/25]", 2164819729], + [1332, 3, 2008, "Metrics/BlockLength: Block has too many lines. [39/25]", 609327574], + [1379, 3, 1938, "Metrics/BlockLength: Block has too many lines. [38/25]", 361672068], + [1425, 3, 1995, "Metrics/BlockLength: Block has too many lines. [39/25]", 4024875480], + [1472, 3, 1992, "Metrics/BlockLength: Block has too many lines. [39/25]", 1156260241] + ], + "spec/rbs/merge/freeze_node_spec.rb:2278400615": [ + [8, 1, 13268, "Metrics/BlockLength: Block has too many lines. [327/25]", 1590692835], + [9, 3, 2116, "Metrics/BlockLength: Block has too many lines. [43/25]", 4215218715], + [98, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3784984989], + [99, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1182436848], + [331, 3, 2919, "Metrics/BlockLength: Block has too many lines. [65/25]", 1415484725] + ], + "spec/rbs/merge/merge_result_spec.rb:2449518259": [ + [8, 1, 20574, "Metrics/BlockLength: Block has too many lines. [454/25]", 736738811], + [53, 3, 1244, "Metrics/BlockLength: Block has too many lines. [31/25]", 3686452170] + ], + "spec/rbs/merge/smart_merger_removal_mode_compliance_spec.rb:3475743041": [ + [7, 1, 1860, "Metrics/BlockLength: Block has too many lines. [66/25]", 3469987127], + [8, 3, 1798, "Metrics/BlockLength: Block has too many lines. [65/25]", 778477682] + ], + "spec/rbs/merge/smart_merger_spec.rb:3451189224": [ + [14, 1, 43498, "Metrics/BlockLength: Block has too many lines. [1190/25]", 1106962], + [149, 3, 10886, "Metrics/BlockLength: Block has too many lines. [286/25]", 1693926280], + [315, 5, 985, "Metrics/BlockLength: Block has too many lines. [26/25]", 3397066157], + [351, 5, 1063, "Metrics/BlockLength: Block has too many lines. [26/25]", 2718784043], + [461, 5, 1135, "Metrics/BlockLength: Block has too many lines. [26/25]", 3797285781], + [497, 5, 1213, "Metrics/BlockLength: Block has too many lines. [26/25]", 3686078390], + [536, 3, 2766, "Metrics/BlockLength: Block has too many lines. [84/25]", 3927490181], + [649, 3, 1714, "Metrics/BlockLength: Block has too many lines. [54/25]", 386494661], + [721, 3, 5393, "Metrics/BlockLength: Block has too many lines. [138/25]", 2457897034], + [925, 3, 4479, "Metrics/BlockLength: Block has too many lines. [134/25]", 3856958364], + [926, 5, 1327, "Metrics/BlockLength: Block has too many lines. [33/25]", 4009192695], + [970, 5, 953, "Metrics/BlockLength: Block has too many lines. [29/25]", 902715698], + [1008, 5, 1147, "Metrics/BlockLength: Block has too many lines. [37/25]", 3544491851], + [1058, 5, 955, "Metrics/BlockLength: Block has too many lines. [27/25]", 2688118410], + [1096, 3, 1031, "Metrics/BlockLength: Block has too many lines. [32/25]", 663517347], + [1097, 5, 970, "Metrics/BlockLength: Block has too many lines. [31/25]", 1575476639], + [1135, 3, 882, "Metrics/BlockLength: Block has too many lines. [27/25]", 3845382500], + [1136, 5, 813, "Metrics/BlockLength: Block has too many lines. [26/25]", 1755501948], + [1171, 3, 805, "Metrics/BlockLength: Block has too many lines. [26/25]", 3413285873], + [1204, 3, 2200, "Metrics/BlockLength: Block has too many lines. [70/25]", 3541894760], + [1205, 5, 1202, "Metrics/BlockLength: Block has too many lines. [38/25]", 3971143978], + [1235, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177610], + [1251, 5, 923, "Metrics/BlockLength: Block has too many lines. [28/25]", 3867507419], + [1288, 3, 1175, "Metrics/BlockLength: Block has too many lines. [36/25]", 1587654554], + [1289, 5, 1103, "Metrics/BlockLength: Block has too many lines. [35/25]", 3885176914], + [1368, 3, 1252, "Metrics/BlockLength: Block has too many lines. [28/25]", 4206068435], + [1407, 3, 1278, "Metrics/BlockLength: Block has too many lines. [28/25]", 1372687996], + [1446, 3, 1265, "Metrics/BlockLength: Block has too many lines. [28/25]", 3208600846], + [1485, 3, 1265, "Metrics/BlockLength: Block has too many lines. [28/25]", 212464082], + [1524, 3, 1262, "Metrics/BlockLength: Block has too many lines. [28/25]", 4277366491] + ], + "spec/rbs/merge_spec.rb:3352331478": [ + [5, 1, 1389, "Metrics/BlockLength: Block has too many lines. [37/25]", 373922011], + [10, 3, 1270, "Metrics/BlockLength: Block has too many lines. [32/25]", 2567886247] + ] +} diff --git a/gems/rbs-merge/Gemfile b/gems/rbs-merge/Gemfile index 245923666..4137f14bc 100644 --- a/gems/rbs-merge/Gemfile +++ b/gems/rbs-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source "https://gem.coop" +source 'https://gem.coop' git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,58 +19,54 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ["~> 1.0", ">= 1.0.8"] -gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ['~> 1.0', '>= 1.0.8'] +gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ast-merge tree_haver ] -direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") +direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? if direct_sibling_gems.any? && - (direct_sibling_local || - ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) - direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") - direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) begin nomono_activation_requirements = nomono_requirements - nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) if File.file?(nomono_lockfile) nomono_locked_spec = Bundler::LockfileParser - .new(Bundler.read_file(nomono_lockfile)) - .specs - .find { |spec| spec.name == "nomono" } + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } nomono_locked = nomono_locked_spec && - Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) - if nomono_locked - nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] - end - end - Kernel.send(:gem, "nomono", *nomono_activation_requirements) - require "nomono/bundler" - if direct_sibling_templating && !direct_sibling_local - ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local eval_nomono_gems( gems: direct_sibling_gems, - prefix: "STRUCTUREDMERGE", - path_env: "STRUCTUREDMERGE_DEV", - root: ["src", "my", "structuredmerge"] + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] ) rescue LoadError - warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' ensure if direct_sibling_templating && !direct_sibling_local if direct_sibling_dev_was_set - ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original else - ENV.delete("STRUCTUREDMERGE_DEV") + ENV.delete('STRUCTUREDMERGE_DEV') end end end @@ -294,25 +290,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging -eval_gemfile "gemfiles/modular/debug.gemfile" +eval_gemfile 'gemfiles/modular/debug.gemfile' # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile "gemfiles/modular/coverage.gemfile" +eval_gemfile 'gemfiles/modular/coverage.gemfile' # Linting -eval_gemfile "gemfiles/modular/style.gemfile" +eval_gemfile 'gemfiles/modular/style.gemfile' # Documentation -eval_gemfile "gemfiles/modular/documentation.gemfile" +eval_gemfile 'gemfiles/modular/documentation.gemfile' # Optional -eval_gemfile "gemfiles/modular/optional.gemfile" +eval_gemfile 'gemfiles/modular/optional.gemfile' ### Std Lib Extracted Gems -eval_gemfile "gemfiles/modular/x_std_libs.gemfile" +eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' # See unlocked_deps appraisal for more details on irb inclusion -gem "irb", "~> 1.17" # ruby >= 2.7 +gem 'irb', '~> 1.17' # ruby >= 2.7 diff --git a/gems/rbs-merge/Rakefile b/gems/rbs-merge/Rakefile index 34f8ffe21..bd4e18e2d 100644 --- a/gems/rbs-merge/Rakefile +++ b/gems/rbs-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require "kettle/drift" + require 'kettle/drift' Kettle::Drift.install_tasks rescue LoadError - desc("(stub) kettle:drift:check is unavailable") - task("kettle:drift:check") do + desc('(stub) kettle:drift:check is unavailable') + task('kettle:drift:check') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:update is unavailable") - task("kettle:drift:update") do + desc('(stub) kettle:drift:update is unavailable') + task('kettle:drift:update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:force_update is unavailable") - task("kettle:drift:force_update") do + desc('(stub) kettle:drift:force_update is unavailable') + task('kettle:drift:force_update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift is unavailable") - task("kettle:drift" => "kettle:drift:update") + desc('(stub) kettle:drift is unavailable') + task('kettle:drift' => 'kettle:drift:update') end ### TEMPLATING TASKS diff --git a/gems/rbs-merge/bin/yard b/gems/rbs-merge/bin/yard index a7e8b6eed..5d516ad6f 100755 --- a/gems/rbs-merge/bin/yard +++ b/gems/rbs-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec("bundle", "exec", "rake", "yard") +exec('bundle', 'exec', 'rake', 'yard') diff --git a/gems/rbs-merge/lib/rbs/merge/version.rb b/gems/rbs-merge/lib/rbs/merge/version.rb index 8e09fbec5..a96a21ddc 100644 --- a/gems/rbs-merge/lib/rbs/merge/version.rb +++ b/gems/rbs-merge/lib/rbs/merge/version.rb @@ -3,7 +3,7 @@ module Rbs module Merge module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/rbs-merge/rbs-merge.gemspec b/gems/rbs-merge/rbs-merge.gemspec index 90f0b88ab..0f7a1c47f 100644 --- a/gems/rbs-merge/rbs-merge.gemspec +++ b/gems/rbs-merge/rbs-merge.gemspec @@ -9,47 +9,47 @@ Gem::Specification.new do |spec| spec.name = 'rbs-merge' spec.version = Module.new.tap { |mod| Kernel.load("#{__dir__}/lib/rbs/merge/version.rb", mod) }::Rbs::Merge::Version::VERSION - spec.authors = ["Peter H. Boling"] - spec.email = ["floss@galtzo.com"] + spec.authors = ['Peter H. Boling'] + spec.email = ['floss@galtzo.com'] spec.summary = '☯️ Structured Merge RBS analysis and merge for Ruby' spec.description = '☯️ RBS declaration, comment, freeze-block, and template merge behavior for Structured Merge.' spec.homepage = 'https://github.com/structuredmerge/structuredmerge-ruby' - spec.licenses = ["AGPL-3.0-only", "PolyForm-Small-Business-1.0.0"] - spec.required_ruby_version = ">= 4.0.0" + spec.licenses = ['AGPL-3.0-only', 'PolyForm-Small-Business-1.0.0'] + spec.required_ruby_version = '>= 4.0.0' # 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") - user_cert = "certs/#{ENV.fetch("GEM_CERT_USER", ENV["USER"])}.pem" + unless ENV.include?('SKIP_GEM_SIGNING') + user_cert = "certs/#{ENV.fetch('GEM_CERT_USER', ENV['USER'])}.pem" cert_file_path = File.join(__dir__, user_cert) - cert_chain = cert_file_path.split(",") + cert_chain = cert_file_path.split(',') cert_chain.select! { |fp| File.exist?(fp) } if cert_file_path && cert_chain.any? spec.cert_chain = cert_chain - if $PROGRAM_NAME.end_with?("gem") && ARGV[0] == "build" - spec.signing_key = File.join(Gem.user_home, ".ssh", "gem-private_key.pem") + if $PROGRAM_NAME.end_with?('gem') && ARGV[0] == 'build' + spec.signing_key = File.join(Gem.user_home, '.ssh', 'gem-private_key.pem') end end end - spec.metadata["homepage_uri"] = "https://structuredmerge.org" - spec.metadata["source_code_uri"] = "#{spec.homepage}/tree/v#{spec.version}" - spec.metadata["changelog_uri"] = "#{spec.homepage}/blob/v#{spec.version}/CHANGELOG.md" - spec.metadata["bug_tracker_uri"] = "#{spec.homepage}/issues" - spec.metadata["documentation_uri"] = "https://www.rubydoc.info/gems/#{spec.name}/#{spec.version}" - spec.metadata["funding_uri"] = "https://github.com/sponsors/pboling" - spec.metadata["wiki_uri"] = "#{spec.homepage}/wiki" - spec.metadata["news_uri"] = "https://www.railsbling.com/tags/#{spec.name}" - spec.metadata["discord_uri"] = "https://discord.gg/3qme4XHNKN" - spec.metadata["rubygems_mfa_required"] = "true" + spec.metadata['homepage_uri'] = 'https://structuredmerge.org' + spec.metadata['source_code_uri'] = "#{spec.homepage}/tree/v#{spec.version}" + spec.metadata['changelog_uri'] = "#{spec.homepage}/blob/v#{spec.version}/CHANGELOG.md" + spec.metadata['bug_tracker_uri'] = "#{spec.homepage}/issues" + spec.metadata['documentation_uri'] = "https://www.rubydoc.info/gems/#{spec.name}/#{spec.version}" + spec.metadata['funding_uri'] = 'https://github.com/sponsors/pboling' + spec.metadata['wiki_uri'] = "#{spec.homepage}/wiki" + spec.metadata['news_uri'] = "https://www.railsbling.com/tags/#{spec.name}" + spec.metadata['discord_uri'] = 'https://discord.gg/3qme4XHNKN' + spec.metadata['rubygems_mfa_required'] = 'true' enumerate_package_files = lambda do |root| - Dir.glob(File.join(root, "**", "*"), File::FNM_DOTMATCH).select do |path| - File.file?(path) && ![".", ".."].include?(File.basename(path)) + Dir.glob(File.join(root, '**', '*'), File::FNM_DOTMATCH).select do |path| + File.file?(path) && !['.', '..'].include?(File.basename(path)) end end package_metadata_files = %w[ @@ -69,17 +69,17 @@ Gem::Specification.new do |spec| *enumerate_package_files.call('exe') ] spec.rdoc_options += [ - "--title", + '--title', "#{spec.name} - #{spec.summary}", - "--main", - "README.md", - "--exclude", - "^sig/", - "--line-numbers", - "--inline-source", - "--quiet" + '--main', + 'README.md', + '--exclude', + '^sig/', + '--line-numbers', + '--inline-source', + '--quiet' ] - spec.bindir = "exe" + spec.bindir = 'exe' # Listed files are the relative paths from bindir above. spec.executables = [] @@ -89,13 +89,13 @@ Gem::Specification.new do |spec| # rbs-merge will then preserve content between those markers across template runs. # kettle-jem:unfreeze - spec.require_paths = ["lib"] + spec.require_paths = ['lib'] # Utilities spec.add_dependency 'ast-merge', "= #{spec.version}" spec.add_dependency 'rbs', '>= 3.10' spec.add_dependency 'tree_haver', "= #{spec.version}" - spec.add_dependency("version_gem", "~> 1.1", ">= 1.1.14") # ruby >= 2.2.0 + spec.add_dependency('version_gem', '~> 1.1', '>= 1.1.14') # ruby >= 2.2.0 # NOTE: It is preferable to list development dependencies in the gemspec due to increased # visibility and discoverability. @@ -111,27 +111,26 @@ Gem::Specification.new do |spec| # and preferably a modular one (see gemfiles/modular/*.gemfile). # Dev, Test, & Release Tasks - spec.add_development_dependency("kettle-dev", "~> 2.3", ">= 2.3.7") # ruby >= 4.0.0 + spec.add_development_dependency('kettle-dev', '~> 2.3', '>= 2.3.7') # ruby >= 4.0.0 # Security - spec.add_development_dependency("bundler-audit", "~> 0.9.3") # ruby >= 2.0.0 + spec.add_development_dependency('bundler-audit', '~> 0.9.3') # ruby >= 2.0.0 # Tasks - spec.add_development_dependency("rake", "~> 13.0") # ruby >= 2.2.0 + spec.add_development_dependency('rake', '~> 13.0') # ruby >= 2.2.0 # Debugging - spec.add_development_dependency("require_bench", "~> 1.0", ">= 1.0.4") # ruby >= 2.2.0 + spec.add_development_dependency('require_bench', '~> 1.0', '>= 1.0.4') # ruby >= 2.2.0 # Testing - spec.add_development_dependency("appraisal2", "~> 3.1", ">= 3.1.4") # ruby >= 1.8.7, for testing against multiple versions of dependencies - spec.add_development_dependency("kettle-test", "~> 2.0", ">= 2.0.11") # ruby >= 4.0.0 - spec.add_development_dependency("turbo_tests2", "~> 3.1", ">= 3.1.14") # ruby >= 2.4.0, default kettle-test runner + spec.add_development_dependency('appraisal2', '~> 3.1', '>= 3.1.4') # ruby >= 1.8.7, for testing against multiple versions of dependencies + spec.add_development_dependency('kettle-test', '~> 2.0', '>= 2.0.11') # ruby >= 4.0.0 + spec.add_development_dependency('turbo_tests2', '~> 3.1', '>= 3.1.14') # ruby >= 2.4.0, default kettle-test runner # Releasing - spec.add_development_dependency("ruby-progressbar", "~> 1.13") # ruby >= 0 - spec.add_development_dependency("stone_checksums", "~> 1.0", ">= 1.0.6") # ruby >= 2.2.0 + spec.add_development_dependency('ruby-progressbar', '~> 1.13') # ruby >= 0 + spec.add_development_dependency('stone_checksums', '~> 1.0', '>= 1.0.6') # ruby >= 2.2.0 # 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.4") # ruby >= 2.4 - + spec.add_development_dependency('gitmoji-regex', '~> 2.0', '>= 2.0.4') # ruby >= 2.4 end From e395a0d8b8e2e6bc16a4b92eec1ae4513b189f88 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:35:43 -0600 Subject: [PATCH 195/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/bash-merge/Gemfile.lock | 353 +-------------------------------- gems/rbs-merge/Gemfile.lock | 375 +++-------------------------------- 2 files changed, 39 insertions(+), 689 deletions(-) diff --git a/gems/bash-merge/Gemfile.lock b/gems/bash-merge/Gemfile.lock index 95209e787..6fdf80d44 100644 --- a/gems/bash-merge/Gemfile.lock +++ b/gems/bash-merge/Gemfile.lock @@ -16,265 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +40,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +103,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +131,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +270,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +322,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +373,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.1, >= 3.1.4) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.3, >= 2.3.7) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,55 +398,33 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.1, >= 3.1.14) - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -741,7 +432,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -754,27 +444,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -789,14 +471,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -804,7 +482,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -832,12 +509,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -846,7 +520,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -860,19 +533,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -880,7 +548,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/rbs-merge/Gemfile.lock b/gems/rbs-merge/Gemfile.lock index 5fe56c0c1..36af7f55d 100644 --- a/gems/rbs-merge/Gemfile.lock +++ b/gems/rbs-merge/Gemfile.lock @@ -18,39 +18,7 @@ PATH version_gem (~> 1.1, >= 1.1.14) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -59,192 +27,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -252,45 +35,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -310,11 +54,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -323,6 +62,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -378,6 +118,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -396,7 +145,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -534,23 +282,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -584,11 +334,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -635,42 +380,21 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.1, >= 3.1.4) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.3, >= 2.3.7) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) rbs-merge! @@ -682,61 +406,40 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.1, >= 3.1.14) - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -749,27 +452,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -783,14 +478,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -826,19 +517,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -852,19 +541,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -872,7 +556,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From f380f756e48d83571070a9606251303c702bbf91 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:35:49 -0600 Subject: [PATCH 196/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-merge/.rubocop_gradual.lock | 2838 ++++++++++++++++++++++++++ gems/ast-merge/Gemfile.lock | 386 +--- gems/dotenv-merge/Gemfile.lock | 327 ++- gems/rbs-merge/Gemfile.lock | 324 ++- gems/toml-merge/Gemfile.lock | 353 +++- 5 files changed, 3856 insertions(+), 372 deletions(-) create mode 100644 gems/ast-merge/.rubocop_gradual.lock diff --git a/gems/ast-merge/.rubocop_gradual.lock b/gems/ast-merge/.rubocop_gradual.lock new file mode 100644 index 000000000..f8391bc5b --- /dev/null +++ b/gems/ast-merge/.rubocop_gradual.lock @@ -0,0 +1,2838 @@ +{ + ".simplecov:3463276878": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:429706125": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "ast-merge.gemspec:1182320030": [ + [16, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1168797721], + [129, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [144, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [145, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [152, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/ast-merge.rb:3005639624": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`ast-merge.rb`) should use snake_case.", 5381] + ], + "lib/ast/merge.rb:3429747270": [ + [11, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge`.", 2866359175], + [11, 3, 270037, "Metrics/ModuleLength: Module has too many lines. [5702/100]", 2847709439], + [22, 5, 16, "Style/Documentation: Missing top-level documentation comment for `class Ast::Merge::ParseError`.", 362242086], + [33, 7, 362, "Metrics/AbcSize: Assignment Branch Condition size for `build_message` is too high. [<2, 16, 6> 17.2/17]", 3988736327], + [47, 5, 31, "Style/Documentation: Missing top-level documentation comment for `class Ast::Merge::PlaceholderCollisionError`.", 218924302], + [161, 7, 337, "Metrics/MethodLength: Method has too many lines. [11/10]", 2388996629], + [178, 7, 327, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [8/7]", 979795121], + [309, 7, 383, "Metrics/MethodLength: Method has too many lines. [11/10]", 634650261], + [473, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 3450568485], + [474, 7, 461, "Metrics/MethodLength: Method has too many lines. [12/10]", 43929779], + [491, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1299979089], + [492, 7, 377, "Metrics/MethodLength: Method has too many lines. [11/10]", 3704151253], + [508, 121, 39, "Layout/LineLength: Line is too long. [159/120]", 85503958], + [509, 7, 447, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [8/7]", 298553749], + [509, 7, 447, "Metrics/MethodLength: Method has too many lines. [12/10]", 298553749], + [538, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1441148616], + [539, 7, 453, "Metrics/MethodLength: Method has too many lines. [14/10]", 1899007021], + [558, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193342990], + [559, 7, 400, "Metrics/MethodLength: Method has too many lines. [11/10]", 298553749], + [588, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860750], + [589, 7, 411, "Metrics/MethodLength: Method has too many lines. [12/10]", 2893925621], + [606, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3137791633], + [607, 7, 454, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [8/7]", 298553749], + [607, 7, 454, "Metrics/MethodLength: Method has too many lines. [12/10]", 298553749], + [666, 7, 385, "Metrics/MethodLength: Method has too many lines. [11/10]", 794265461], + [703, 7, 419, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [10/7]", 3313546353], + [703, 7, 419, "Metrics/PerceivedComplexity: Perceived complexity for `to_h` is too high. [10/8]", 3313546353], + [753, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 398187770], + [765, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 2746783933], + [812, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860841], + [820, 121, 156, "Layout/LineLength: Line is too long. [276/120]", 1149525480], + [825, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 2538424426], + [837, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 2285382915], + [847, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3962419360], + [860, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 398187770], + [862, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3195178507], + [866, 121, 85, "Layout/LineLength: Line is too long. [205/120]", 4238980637], + [868, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 2678411233], + [870, 121, 39, "Layout/LineLength: Line is too long. [159/120]", 4028520110], + [881, 121, 110, "Layout/LineLength: Line is too long. [230/120]", 3837814921], + [895, 5, 2283, "Metrics/MethodLength: Method has too many lines. [57/10]", 2282416447], + [955, 5, 2654, "Metrics/MethodLength: Method has too many lines. [63/10]", 2491520565], + [1006, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1823519875], + [1015, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1874311968], + [1021, 5, 10660, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_downstream_merge_gem_feature_matrix` is too high. [<0, 21, 0> 21/17]", 2277322577], + [1021, 5, 10660, "Metrics/MethodLength: Method has too many lines. [248/10]", 2277322577], + [1272, 5, 1546, "Metrics/MethodLength: Method has too many lines. [37/10]", 208933754], + [1306, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 2658452668], + [1312, 5, 4206, "Metrics/MethodLength: Method has too many lines. [96/10]", 1997530776], + [1389, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 183246985], + [1405, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 3268438356], + [1411, 5, 1598, "Metrics/MethodLength: Method has too many lines. [46/10]", 849757258], + [1454, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1323237892], + [1460, 5, 1164, "Metrics/MethodLength: Method has too many lines. [36/10]", 1477831421], + [1493, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 931876829], + [1499, 5, 1699, "Metrics/MethodLength: Method has too many lines. [43/10]", 1125544678], + [1545, 5, 1016, "Metrics/MethodLength: Method has too many lines. [27/10]", 2194427985], + [1575, 5, 1058, "Metrics/MethodLength: Method has too many lines. [30/10]", 47860722], + [1608, 5, 1186, "Metrics/MethodLength: Method has too many lines. [31/10]", 676863486], + [1636, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 2689509078], + [1642, 5, 1517, "Metrics/MethodLength: Method has too many lines. [41/10]", 3855445172], + [1655, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 817380904], + [1680, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 409671963], + [1686, 5, 2116, "Metrics/MethodLength: Method has too many lines. [61/10]", 524104794], + [1750, 5, 820, "Metrics/MethodLength: Method has too many lines. [12/10]", 1888457180], + [1750, 37, 298, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 789483382], + [1751, 121, 100, "Layout/LineLength: Line is too long. [220/120]", 3288750271], + [1766, 5, 3595, "Metrics/AbcSize: Assignment Branch Condition size for `initial_profile_promotion_policy` is too high. [<9, 20, 0> 21.93/17]", 83685787], + [1766, 5, 3595, "Metrics/MethodLength: Method has too many lines. [77/10]", 83685787], + [1846, 5, 768, "Metrics/MethodLength: Method has too many lines. [17/10]", 314059802], + [1867, 5, 1493, "Metrics/AbcSize: Assignment Branch Condition size for `evaluate_profile_selection_requirement` is too high. [<7, 23, 9> 25.67/17]", 3177555163], + [1867, 5, 1493, "Metrics/MethodLength: Method has too many lines. [29/10]", 3177555163], + [1868, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2145168012], + [1875, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 683002336], + [1909, 5, 985, "Metrics/AbcSize: Assignment Branch Condition size for `profile_promotion_blocking_reasons` is too high. [<4, 25, 13> 28.46/17]", 1146627465], + [1909, 5, 985, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `profile_promotion_blocking_reasons` is too high. [10/7]", 1146627465], + [1909, 5, 985, "Metrics/MethodLength: Method has too many lines. [18/10]", 1146627465], + [1909, 5, 985, "Metrics/PerceivedComplexity: Perceived complexity for `profile_promotion_blocking_reasons` is too high. [10/8]", 1146627465], + [1930, 5, 3173, "Metrics/AbcSize: Assignment Branch Condition size for `validate_language_backend_profile` is too high. [<25, 68, 20> 75.16/17]", 2100389324], + [1930, 5, 3173, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_language_backend_profile` is too high. [21/7]", 2100389324], + [1930, 5, 3173, "Metrics/MethodLength: Method has too many lines. [60/10]", 2100389324], + [1930, 5, 3173, "Metrics/PerceivedComplexity: Perceived complexity for `validate_language_backend_profile` is too high. [23/8]", 2100389324], + [2002, 5, 1523, "Metrics/AbcSize: Assignment Branch Condition size for `validate_backend_inventory` is too high. [<13, 38, 13> 42.21/17]", 1899037537], + [2002, 5, 1523, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_backend_inventory` is too high. [13/7]", 1899037537], + [2002, 5, 1523, "Metrics/MethodLength: Method has too many lines. [25/10]", 1899037537], + [2002, 5, 1523, "Metrics/PerceivedComplexity: Perceived complexity for `validate_backend_inventory` is too high. [13/8]", 1899037537], + [2045, 5, 906, "Metrics/MethodLength: Method has too many lines. [20/10]", 3137959843], + [2068, 5, 2744, "Metrics/AbcSize: Assignment Branch Condition size for `detect_raw_merge_inconsistencies` is too high. [<8, 43, 21> 48.52/17]", 3717440692], + [2068, 5, 2744, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_raw_merge_inconsistencies` is too high. [17/7]", 3717440692], + [2068, 5, 2744, "Metrics/MethodLength: Method has too many lines. [53/10]", 3717440692], + [2068, 5, 2744, "Metrics/PerceivedComplexity: Perceived complexity for `detect_raw_merge_inconsistencies` is too high. [17/8]", 3717440692], + [2083, 7, 1894, "Metrics/BlockLength: Block has too many lines. [33/25]", 758887611], + [2129, 5, 762, "Metrics/MethodLength: Method has too many lines. [11/10]", 3021402342], + [2143, 5, 490, "Metrics/MethodLength: Method has too many lines. [11/10]", 578473475], + [2157, 5, 881, "Metrics/AbcSize: Assignment Branch Condition size for `execute_independent_commutative_insertions` is too high. [<6, 16, 7> 18.47/17]", 259417386], + [2157, 5, 881, "Metrics/MethodLength: Method has too many lines. [21/10]", 259417386], + [2184, 5, 1107, "Metrics/AbcSize: Assignment Branch Condition size for `execute_independent_keyed_member_edits` is too high. [<10, 31, 15> 35.86/17]", 4271501385], + [2184, 5, 1107, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `execute_independent_keyed_member_edits` is too high. [14/7]", 4271501385], + [2184, 5, 1107, "Metrics/MethodLength: Method has too many lines. [24/10]", 4271501385], + [2184, 5, 1107, "Metrics/PerceivedComplexity: Perceived complexity for `execute_independent_keyed_member_edits` is too high. [14/8]", 4271501385], + [2228, 5, 3149, "Metrics/AbcSize: Assignment Branch Condition size for `parse_compact_ruleset` is too high. [<16, 68, 24> 73.86/17]", 3149098803], + [2228, 5, 3149, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_compact_ruleset` is too high. [22/7]", 3149098803], + [2228, 5, 3149, "Metrics/MethodLength: Method has too many lines. [67/10]", 3149098803], + [2228, 5, 3149, "Metrics/PerceivedComplexity: Perceived complexity for `parse_compact_ruleset` is too high. [23/8]", 3149098803], + [2234, 7, 2544, "Metrics/BlockLength: Block has too many lines. [50/25]", 2484860466], + [2261, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193420054], + [2307, 5, 2658, "Metrics/AbcSize: Assignment Branch Condition size for `compact_ruleset_feature_profile` is too high. [<11, 67, 38> 77.81/17]", 4022599673], + [2307, 5, 2658, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compact_ruleset_feature_profile` is too high. [29/7]", 4022599673], + [2307, 5, 2658, "Metrics/MethodLength: Method has too many lines. [66/10]", 4022599673], + [2307, 5, 2658, "Metrics/PerceivedComplexity: Perceived complexity for `compact_ruleset_feature_profile` is too high. [16/8]", 4022599673], + [2325, 7, 2243, "Metrics/BlockLength: Block has too many lines. [47/25]", 965041772], + [2392, 5, 2733, "Metrics/AbcSize: Assignment Branch Condition size for `classify_template_target_path` is too high. [<4, 36, 23> 42.91/17]", 3661828596], + [2392, 5, 2733, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `classify_template_target_path` is too high. [21/7]", 3661828596], + [2392, 5, 2733, "Metrics/MethodLength: Method has too many lines. [39/10]", 3661828596], + [2392, 5, 2733, "Metrics/PerceivedComplexity: Perceived complexity for `classify_template_target_path` is too high. [17/8]", 3661828596], + [2424, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [2438, 5, 416, "Metrics/MethodLength: Method has too many lines. [12/10]", 1388641773], + [2481, 5, 388, "Metrics/MethodLength: Method has too many lines. [12/10]", 2360583514], + [2510, 5, 820, "Metrics/MethodLength: Method has too many lines. [13/10]", 354674808], + [2526, 5, 929, "Metrics/AbcSize: Assignment Branch Condition size for `enrich_template_plan_entries` is too high. [<9, 12, 10> 18.03/17]", 2666747528], + [2526, 5, 929, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `enrich_template_plan_entries` is too high. [9/7]", 2666747528], + [2526, 5, 929, "Metrics/MethodLength: Method has too many lines. [19/10]", 2666747528], + [2526, 5, 929, "Metrics/PerceivedComplexity: Perceived complexity for `enrich_template_plan_entries` is too high. [10/8]", 2666747528], + [2549, 5, 1245, "Metrics/AbcSize: Assignment Branch Condition size for `enrich_template_plan_entries_with_token_state` is too high. [<11, 23, 14> 29.09/17]", 1507113977], + [2549, 5, 1245, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `enrich_template_plan_entries_with_token_state` is too high. [13/7]", 1507113977], + [2549, 5, 1245, "Metrics/MethodLength: Method has too many lines. [19/10]", 1507113977], + [2549, 5, 1245, "Metrics/PerceivedComplexity: Perceived complexity for `enrich_template_plan_entries_with_token_state` is too high. [13/8]", 1507113977], + [2573, 5, 1353, "Metrics/AbcSize: Assignment Branch Condition size for `prepare_template_entries` is too high. [<6, 18, 11> 21.93/17]", 2774310942], + [2573, 5, 1353, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `prepare_template_entries` is too high. [11/7]", 2774310942], + [2573, 5, 1353, "Metrics/MethodLength: Method has too many lines. [24/10]", 2774310942], + [2573, 5, 1353, "Metrics/PerceivedComplexity: Perceived complexity for `prepare_template_entries` is too high. [12/8]", 2774310942], + [2603, 5, 1494, "Metrics/AbcSize: Assignment Branch Condition size for `plan_template_execution` is too high. [<8, 22, 17> 28.93/17]", 3876421385], + [2603, 5, 1494, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `plan_template_execution` is too high. [14/7]", 3876421385], + [2603, 5, 1494, "Metrics/MethodLength: Method has too many lines. [29/10]", 3876421385], + [2603, 5, 1494, "Metrics/PerceivedComplexity: Perceived complexity for `plan_template_execution` is too high. [15/8]", 3876421385], + [2604, 7, 1421, "Metrics/BlockLength: Block has too many lines. [27/25]", 2887810383], + [2637, 5, 822, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 2749235529], + [2637, 37, 220, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 447165880], + [2638, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 518382509], + [2652, 5, 2060, "Metrics/AbcSize: Assignment Branch Condition size for `preview_template_execution` is too high. [<11, 42, 26> 50.61/17]", 2270817206], + [2652, 5, 2060, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preview_template_execution` is too high. [25/7]", 2270817206], + [2652, 5, 2060, "Metrics/MethodLength: Method has too many lines. [39/10]", 2270817206], + [2652, 5, 2060, "Metrics/PerceivedComplexity: Perceived complexity for `preview_template_execution` is too high. [23/8]", 2270817206], + [2662, 7, 1809, "Metrics/BlockLength: Block has too many lines. [28/25]", 310337564], + [2700, 5, 2513, "Metrics/AbcSize: Assignment Branch Condition size for `apply_template_execution` is too high. [<14, 50, 25> 57.63/17]", 177708331], + [2700, 5, 2513, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_template_execution` is too high. [26/7]", 177708331], + [2700, 5, 2513, "Metrics/MethodLength: Method has too many lines. [50/10]", 177708331], + [2700, 5, 2513, "Metrics/PerceivedComplexity: Perceived complexity for `apply_template_execution` is too high. [23/8]", 177708331], + [2711, 7, 2239, "Metrics/BlockLength: Block has too many lines. [38/25]", 1651205014], + [2761, 5, 1696, "Metrics/AbcSize: Assignment Branch Condition size for `evaluate_template_tree_convergence` is too high. [<11, 29, 17> 35.37/17]", 2507998041], + [2761, 5, 1696, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `evaluate_template_tree_convergence` is too high. [17/7]", 2507998041], + [2761, 5, 1696, "Metrics/MethodLength: Method has too many lines. [35/10]", 2507998041], + [2761, 5, 1696, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 2507998041], + [2761, 5, 1696, "Metrics/PerceivedComplexity: Perceived complexity for `evaluate_template_tree_convergence` is too high. [17/8]", 2507998041], + [2761, 43, 198, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 4214374277], + [2762, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 2983874608], + [2804, 5, 688, "Metrics/MethodLength: Method has too many lines. [15/10]", 3064253784], + [2804, 5, 688, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 3064253784], + [2804, 36, 216, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 448029307], + [2805, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3840139076], + [2848, 5, 664, "Metrics/MethodLength: Method has too many lines. [13/10]", 995637868], + [2848, 5, 664, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 995637868], + [2848, 53, 202, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 4227116196], + [2849, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 418683952], + [2866, 5, 649, "Metrics/MethodLength: Method has too many lines. [13/10]", 1831524792], + [2866, 5, 649, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 1831524792], + [2866, 54, 178, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2962381850], + [2867, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 3690915627], + [2884, 5, 1280, "Metrics/AbcSize: Assignment Branch Condition size for `apply_template_tree_execution_to_directory` is too high. [<6, 16, 6> 18.11/17]", 305449363], + [2884, 5, 1280, "Metrics/MethodLength: Method has too many lines. [23/10]", 305449363], + [2884, 5, 1280, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 305449363], + [2884, 51, 200, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1352434212], + [2885, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 1139621482], + [2913, 5, 2199, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_tree_run` is too high. [<15, 42, 31> 54.31/17]", 975627723], + [2913, 5, 2199, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_tree_run` is too high. [25/7]", 975627723], + [2913, 5, 2199, "Metrics/MethodLength: Method has too many lines. [38/10]", 975627723], + [2913, 5, 2199, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_tree_run` is too high. [26/8]", 975627723], + [2957, 5, 1515, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_apply` is too high. [<13, 35, 21> 42.84/17]", 3710254295], + [2957, 5, 1515, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_directory_apply` is too high. [17/7]", 3710254295], + [2957, 5, 1515, "Metrics/MethodLength: Method has too many lines. [26/10]", 3710254295], + [2957, 5, 1515, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_directory_apply` is too high. [17/8]", 3710254295], + [2972, 20, 1, "Style/DoubleNegation: Avoid the use of double negation (`!!`).", 177540], + [2989, 5, 1656, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_plan` is too high. [<11, 24, 25> 36.36/17]", 2946319293], + [2989, 5, 1656, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_directory_plan` is too high. [18/7]", 2946319293], + [2989, 5, 1656, "Metrics/MethodLength: Method has too many lines. [36/10]", 2946319293], + [2989, 5, 1656, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_directory_plan` is too high. [16/8]", 2946319293], + [3061, 7, 9, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 3648222389], + [3082, 5, 410, "Metrics/MethodLength: Method has too many lines. [12/10]", 248324428], + [3088, 7, 11, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 848344986], + [3132, 5, 712, "Metrics/MethodLength: Method has too many lines. [12/10]", 2500743043], + [3132, 27, 178, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 873705194], + [3132, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3023611470], + [3158, 42, 167, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2002181571], + [3171, 5, 1097, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structured_edit_selection_profile` is too high. [8/7]", 1149325233], + [3171, 5, 1097, "Metrics/MethodLength: Method has too many lines. [14/10]", 1149325233], + [3171, 42, 311, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 3814063337], + [3172, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 198450264], + [3185, 34, 47, "Style/SafeNavigation: Use safe navigation (`&.`) instead of checking if an object exists before calling the method.", 3204815976], + [3190, 5, 869, "Metrics/MethodLength: Method has too many lines. [11/10]", 83957392], + [3190, 41, 250, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1486072775], + [3191, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1967186495], + [3201, 36, 47, "Style/SafeNavigation: Use safe navigation (`&.`) instead of checking if an object exists before calling the method.", 3204815976], + [3206, 5, 1156, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structured_edit_match_profile` is too high. [10/7]", 4112674787], + [3206, 5, 1156, "Metrics/MethodLength: Method has too many lines. [15/10]", 4112674787], + [3206, 5, 1156, "Metrics/PerceivedComplexity: Perceived complexity for `structured_edit_match_profile` is too high. [10/8]", 4112674787], + [3206, 38, 321, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [12/5]", 823565876], + [3207, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859667], + [3208, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3673982236], + [3226, 5, 933, "Metrics/MethodLength: Method has too many lines. [14/10]", 2099388915], + [3226, 37, 319, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [12/5]", 250907892], + [3227, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177545], + [3228, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 4154814685], + [3245, 5, 907, "Metrics/MethodLength: Method has too many lines. [12/10]", 2242846328], + [3245, 42, 275, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 246196330], + [3246, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1439117336], + [3262, 5, 1057, "Metrics/MethodLength: Method has too many lines. [14/10]", 2891607970], + [3262, 44, 323, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 1386547750], + [3263, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1676243675], + [3264, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 4154814685], + [3281, 5, 1375, "Metrics/AbcSize: Assignment Branch Condition size for `structured_edit_request` is too high. [<11, 25, 10> 29.09/17]", 4153786554], + [3281, 5, 1375, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structured_edit_request` is too high. [11/7]", 4153786554], + [3281, 5, 1375, "Metrics/MethodLength: Method has too many lines. [16/10]", 4153786554], + [3281, 5, 1375, "Metrics/PerceivedComplexity: Perceived complexity for `structured_edit_request` is too high. [11/8]", 4153786554], + [3281, 32, 370, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [13/5]", 2381882467], + [3282, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177545], + [3303, 5, 728, "Metrics/MethodLength: Method has too many lines. [11/10]", 4026157473], + [3303, 31, 175, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 773121544], + [3335, 5, 597, "Metrics/MethodLength: Method has too many lines. [11/10]", 4143495860], + [3374, 5, 577, "Metrics/MethodLength: Method has too many lines. [11/10]", 4169131743], + [3389, 5, 1011, "Metrics/AbcSize: Assignment Branch Condition size for `structured_edit_execution_report` is too high. [<7, 16, 7> 18.81/17]", 876221899], + [3389, 5, 1011, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structured_edit_execution_report` is too high. [8/7]", 876221899], + [3389, 5, 1011, "Metrics/MethodLength: Method has too many lines. [12/10]", 876221899], + [3389, 41, 245, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 2484440861], + [3390, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 4036992717], + [3415, 55, 170, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 668161765], + [3438, 5, 819, "Metrics/MethodLength: Method has too many lines. [12/10]", 2287133436], + [3438, 56, 217, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3198032135], + [3439, 121, 51, "Layout/LineLength: Line is too long. [171/120]", 3526181051], + [3472, 5, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 1853778635], + [3481, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], + [3513, 5, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 1132214891], + [3522, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], + [3544, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 556747511], + [3553, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1808630920], + [3575, 5, 708, "Metrics/MethodLength: Method has too many lines. [11/10]", 3590891170], + [3584, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1367166441], + [3607, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 689748855], + [3616, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1808630920], + [3638, 5, 708, "Metrics/MethodLength: Method has too many lines. [11/10]", 1478642210], + [3647, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1367166441], + [3671, 5, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 239506091], + [3680, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], + [3702, 5, 693, "Metrics/MethodLength: Method has too many lines. [11/10]", 3803476550], + [3711, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], + [3734, 5, 728, "Metrics/MethodLength: Method has too many lines. [11/10]", 748161230], + [3743, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 2807086497], + [3765, 5, 758, "Metrics/MethodLength: Method has too many lines. [11/10]", 3900524558], + [3774, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3463884836], + [3798, 5, 748, "Metrics/MethodLength: Method has too many lines. [11/10]", 2076716686], + [3807, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 609414023], + [3829, 5, 778, "Metrics/MethodLength: Method has too many lines. [11/10]", 867958318], + [3833, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193343749], + [3838, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 1202823007], + [3862, 5, 728, "Metrics/MethodLength: Method has too many lines. [11/10]", 2078323790], + [3871, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 2807086497], + [3893, 5, 758, "Metrics/MethodLength: Method has too many lines. [11/10]", 121025422], + [3902, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3463884836], + [3924, 5, 733, "Metrics/MethodLength: Method has too many lines. [11/10]", 1216456558], + [3933, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 145839927], + [3955, 5, 763, "Metrics/MethodLength: Method has too many lines. [11/10]", 2946525998], + [3964, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 275709226], + [3988, 5, 768, "Metrics/MethodLength: Method has too many lines. [11/10]", 3281402414], + [3992, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177656], + [3997, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 1427340581], + [4034, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3673982236], + [4091, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193417070], + [4102, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2768444], + [4109, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3833204035], + [4117, 5, 863, "Metrics/MethodLength: Method has too many lines. [11/10]", 3731153486], + [4121, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 4054494590], + [4126, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 2084326338], + [4132, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 4201858364], + [4136, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861122], + [4140, 5, 873, "Metrics/MethodLength: Method has too many lines. [11/10]", 1866057614], + [4144, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3893180930], + [4149, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 863421408], + [4155, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 3247130491], + [4159, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1171438608], + [4163, 5, 883, "Metrics/MethodLength: Method has too many lines. [11/10]", 2352924462], + [4163, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860841], + [4164, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861334], + [4167, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 465221046], + [4172, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 1922522532], + [4188, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 4067226670], + [4192, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2033573170], + [4196, 5, 893, "Metrics/MethodLength: Method has too many lines. [11/10]", 1633175534], + [4196, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087926422], + [4197, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087421565], + [4200, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 615151909], + [4205, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 884393597], + [4231, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 417844693], + [4235, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1233681340], + [4239, 5, 903, "Metrics/MethodLength: Method has too many lines. [11/10]", 3964877742], + [4239, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873471], + [4240, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1322899615], + [4243, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 3471008807], + [4248, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 627945471], + [4254, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 2960084092], + [4258, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2148514258], + [4262, 5, 913, "Metrics/MethodLength: Method has too many lines. [11/10]", 385546958], + [4262, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2970472935], + [4263, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3808956371], + [4266, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 3412499338], + [4271, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 3274208144], + [4277, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 4275923717], + [4285, 5, 848, "Metrics/MethodLength: Method has too many lines. [11/10]", 457851502], + [4289, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 413805135], + [4294, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 951908917], + [4300, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 1859200227], + [4308, 5, 808, "Metrics/MethodLength: Method has too many lines. [11/10]", 884695726], + [4312, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 2011807620], + [4317, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 384138219], + [4323, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1176320663], + [4331, 5, 798, "Metrics/MethodLength: Method has too many lines. [11/10]", 1422521838], + [4335, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3247420006], + [4340, 121, 35, "Layout/LineLength: Line is too long. [155/120]", 1408316702], + [4346, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 938465266], + [4354, 5, 803, "Metrics/MethodLength: Method has too many lines. [11/10]", 2370839950], + [4358, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 74128911], + [4363, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 1364659899], + [4369, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2059517661], + [4377, 5, 803, "Metrics/MethodLength: Method has too many lines. [11/10]", 3379336814], + [4381, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 74128911], + [4386, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 1364659899], + [4434, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 4281772560], + [4442, 5, 833, "Metrics/MethodLength: Method has too many lines. [11/10]", 3245498510], + [4446, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3542644754], + [4451, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1916814773], + [4457, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 859690879], + [4465, 5, 833, "Metrics/MethodLength: Method has too many lines. [11/10]", 4138830126], + [4469, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3542644754], + [4474, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1916814773], + [4480, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3880141603], + [4488, 5, 828, "Metrics/MethodLength: Method has too many lines. [11/10]", 3621010990], + [4492, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3917260126], + [4497, 121, 41, "Layout/LineLength: Line is too long. [161/120]", 1879260859], + [4503, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1776611011], + [4511, 5, 838, "Metrics/MethodLength: Method has too many lines. [11/10]", 514585454], + [4515, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1353518231], + [4520, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 1228459824], + [4526, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 3932349968], + [4530, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087903307], + [4534, 5, 878, "Metrics/MethodLength: Method has too many lines. [11/10]", 1525737454], + [4534, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], + [4535, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177538], + [4538, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 2895681070], + [4543, 121, 51, "Layout/LineLength: Line is too long. [171/120]", 4040662298], + [4549, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 66929045], + [4557, 5, 808, "Metrics/MethodLength: Method has too many lines. [11/10]", 1626746606], + [4561, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 2011807620], + [4566, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 384138219], + [4580, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 849230508], + [4588, 5, 838, "Metrics/MethodLength: Method has too many lines. [11/10]", 3531122670], + [4592, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1353518231], + [4597, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 1228459824], + [4612, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1176320663], + [4620, 5, 798, "Metrics/MethodLength: Method has too many lines. [11/10]", 1118421486], + [4624, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3247420006], + [4629, 121, 35, "Layout/LineLength: Line is too long. [155/120]", 1408316702], + [4651, 5, 693, "Metrics/MethodLength: Method has too many lines. [11/10]", 1668406662], + [4660, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], + [4674, 5, 648, "Metrics/MethodLength: Method has too many lines. [11/10]", 3479836893], + [4683, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193343749], + [4705, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 3147549879], + [4714, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1808630920], + [4749, 5, 677, "Metrics/MethodLength: Method has too many lines. [11/10]", 1206941784], + [4758, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3937819337], + [4781, 5, 672, "Metrics/MethodLength: Method has too many lines. [11/10]", 3634903061], + [4790, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], + [4812, 5, 683, "Metrics/MethodLength: Method has too many lines. [11/10]", 3417053461], + [4821, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], + [4845, 5, 668, "Metrics/MethodLength: Method has too many lines. [11/10]", 1540762726], + [4854, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1808630920], + [4876, 5, 698, "Metrics/MethodLength: Method has too many lines. [11/10]", 2804825893], + [4885, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1367166441], + [4908, 5, 683, "Metrics/MethodLength: Method has too many lines. [11/10]", 3165010613], + [4917, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], + [4939, 5, 713, "Metrics/MethodLength: Method has too many lines. [11/10]", 2795628035], + [4948, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 497133415], + [4954, 5, 864, "Metrics/MethodLength: Method has too many lines. [12/10]", 1086224878], + [4954, 50, 268, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 4022739767], + [4955, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1607400384], + [4979, 5, 658, "Metrics/MethodLength: Method has too many lines. [11/10]", 3999796489], + [4988, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 102058825], + [5002, 59, 179, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1569981428], + [5003, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 1515849732], + [5034, 5, 694, "Metrics/MethodLength: Method has too many lines. [11/10]", 3830236120], + [5043, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2250857971], + [5057, 5, 673, "Metrics/MethodLength: Method has too many lines. [11/10]", 2413908653], + [5066, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1225026887], + [5080, 5, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 3935895659], + [5089, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], + [5103, 5, 692, "Metrics/MethodLength: Method has too many lines. [11/10]", 3660669627], + [5112, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3558241761], + [5126, 5, 612, "Metrics/MethodLength: Method has too many lines. [11/10]", 100391811], + [5165, 5, 693, "Metrics/MethodLength: Method has too many lines. [11/10]", 3138587622], + [5174, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], + [5196, 5, 688, "Metrics/MethodLength: Method has too many lines. [11/10]", 2736088861], + [5205, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1992103013], + [5228, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 2275602867], + [5237, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3598350322], + [5260, 5, 602, "Metrics/MethodLength: Method has too many lines. [11/10]", 3023166371], + [5275, 36, 181, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1071580945], + [5288, 5, 787, "Metrics/AbcSize: Assignment Branch Condition size for `group_projected_child_review_cases` is too high. [<4, 17, 4> 17.92/17]", 3391527151], + [5288, 5, 787, "Metrics/MethodLength: Method has too many lines. [18/10]", 3391527151], + [5312, 5, 705, "Metrics/MethodLength: Method has too many lines. [13/10]", 2629923275], + [5339, 5, 547, "Metrics/MethodLength: Method has too many lines. [12/10]", 1911190850], + [5364, 5, 1516, "Metrics/AbcSize: Assignment Branch Condition size for `review_projected_child_groups` is too high. [<11, 21, 9> 25.36/17]", 3333110579], + [5364, 5, 1516, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `review_projected_child_groups` is too high. [8/7]", 3333110579], + [5364, 5, 1516, "Metrics/MethodLength: Method has too many lines. [39/10]", 3333110579], + [5364, 5, 1516, "Metrics/PerceivedComplexity: Perceived complexity for `review_projected_child_groups` is too high. [9/8]", 3333110579], + [5398, 7, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], + [5410, 5, 562, "Metrics/MethodLength: Method has too many lines. [14/10]", 3083915102], + [5429, 5, 1898, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_delegated_child_outputs` is too high. [<11, 21, 6> 24.45/17]", 2739722546], + [5429, 5, 1898, "Metrics/MethodLength: Method has too many lines. [49/10]", 2739722546], + [5484, 5, 942, "Metrics/AbcSize: Assignment Branch Condition size for `execute_nested_merge` is too high. [<3, 17, 6> 18.28/17]", 766157172], + [5484, 5, 942, "Metrics/MethodLength: Method has too many lines. [20/10]", 766157172], + [5484, 29, 144, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1404367793], + [5511, 5, 652, "Metrics/MethodLength: Method has too many lines. [13/10]", 2105803856], + [5530, 38, 140, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1682835820], + [5560, 5, 577, "Metrics/MethodLength: Method has too many lines. [12/10]", 2659610443], + [5629, 5, 569, "Metrics/MethodLength: Method has too many lines. [14/10]", 20616641], + [5657, 5, 772, "Metrics/AbcSize: Assignment Branch Condition size for `conformance_manifest_review_request_ids` is too high. [<7, 16, 8> 19.21/17]", 3577418475], + [5657, 5, 772, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `conformance_manifest_review_request_ids` is too high. [9/7]", 3577418475], + [5657, 5, 772, "Metrics/MethodLength: Method has too many lines. [14/10]", 3577418475], + [5657, 5, 772, "Metrics/PerceivedComplexity: Perceived complexity for `conformance_manifest_review_request_ids` is too high. [9/8]", 3577418475], + [5711, 5, 606, "Metrics/MethodLength: Method has too many lines. [11/10]", 2675086662], + [5726, 5, 562, "Metrics/MethodLength: Method has too many lines. [11/10]", 3811715870], + [5741, 5, 578, "Metrics/MethodLength: Method has too many lines. [11/10]", 1776197415], + [5756, 5, 1298, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_conformance_family_context` is too high. [<7, 28, 9> 30.23/17]", 4265202259], + [5756, 5, 1298, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `resolve_conformance_family_context` is too high. [10/7]", 4265202259], + [5756, 5, 1298, "Metrics/MethodLength: Method has too many lines. [23/10]", 4265202259], + [5756, 5, 1298, "Metrics/PerceivedComplexity: Perceived complexity for `resolve_conformance_family_context` is too high. [10/8]", 4265202259], + [5785, 5, 1994, "Metrics/AbcSize: Assignment Branch Condition size for `review_conformance_family_context` is too high. [<12, 24, 10> 28.64/17]", 2834851944], + [5785, 5, 1994, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `review_conformance_family_context` is too high. [10/7]", 2834851944], + [5785, 5, 1994, "Metrics/MethodLength: Method has too many lines. [41/10]", 2834851944], + [5785, 5, 1994, "Metrics/PerceivedComplexity: Perceived complexity for `review_conformance_family_context` is too high. [11/8]", 2834851944], + [5808, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 641612328], + [5845, 5, 1844, "Metrics/AbcSize: Assignment Branch Condition size for `select_conformance_case` is too high. [<2, 43, 14> 45.27/17]", 670673209], + [5845, 5, 1844, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `select_conformance_case` is too high. [14/7]", 670673209], + [5845, 5, 1844, "Metrics/MethodLength: Method has too many lines. [30/10]", 670673209], + [5845, 5, 1844, "Metrics/PerceivedComplexity: Perceived complexity for `select_conformance_case` is too high. [16/8]", 670673209], + [5850, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 2135503892], + [5852, 121, 41, "Layout/LineLength: Line is too long. [161/120]", 3932054828], + [5861, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 3169124957], + [5883, 5, 509, "Metrics/MethodLength: Method has too many lines. [11/10]", 3552283123], + [5972, 5, 4195, "Metrics/AbcSize: Assignment Branch Condition size for `review_conformance_manifest` is too high. [<37, 63, 16> 74.79/17]", 2166560528], + [5972, 5, 4195, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `review_conformance_manifest` is too high. [14/7]", 2166560528], + [5972, 5, 4195, "Metrics/MethodLength: Method has too many lines. [89/10]", 2166560528], + [5972, 5, 4195, "Metrics/PerceivedComplexity: Perceived complexity for `review_conformance_manifest` is too high. [17/8]", 2166560528], + [6037, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2746826653], + [6053, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 3035993839], + [6075, 5, 676, "Metrics/MethodLength: Method has too many lines. [15/10]", 3048335475], + [6098, 5, 1054, "Metrics/AbcSize: Assignment Branch Condition size for `plan_conformance_suite` is too high. [<11, 18, 8> 22.56/17]", 1855254788], + [6098, 5, 1054, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `plan_conformance_suite` is too high. [8/7]", 1855254788], + [6098, 5, 1054, "Metrics/MethodLength: Method has too many lines. [25/10]", 1855254788], + [6098, 31, 84, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 172854173], + [6163, 5, 1274, "Metrics/AbcSize: Assignment Branch Condition size for `plan_named_conformance_suites_with_diagnostics` is too high. [<11, 21, 7> 24.72/17]", 3991300730], + [6163, 5, 1274, "Metrics/MethodLength: Method has too many lines. [27/10]", 3991300730], + [6190, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 3035993839], + [6255, 5, 2071, "Metrics/AbcSize: Assignment Branch Condition size for `review_decision_for_family_context` is too high. [<7, 22, 16> 28.09/17]", 4245377184], + [6255, 5, 2071, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `review_decision_for_family_context` is too high. [12/7]", 4245377184], + [6255, 5, 2071, "Metrics/MethodLength: Method has too many lines. [46/10]", 4245377184], + [6255, 5, 2071, "Metrics/PerceivedComplexity: Perceived complexity for `review_decision_for_family_context` is too high. [12/8]", 4245377184], + [6260, 7, 1766, "Metrics/BlockLength: Block has too many lines. [40/25]", 65448241], + [6312, 5, 686, "Metrics/MethodLength: Method has too many lines. [13/10]", 4030291682] + ], + "lib/ast/merge/ast_node.rb:2037773320": [ + [44, 5, 7086, "Metrics/ClassLength: Class has too many lines. [114/100]", 201314721], + [220, 11, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183] + ], + "lib/ast/merge/comment/attachment.rb:2388154769": [ + [42, 23, 180, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3775370530], + [75, 24, 2, "Lint/SafeNavigationConsistency: Use `.` instead of unnecessary `&.`.", 5858765], + [81, 25, 2, "Lint/SafeNavigationConsistency: Use `.` instead of unnecessary `&.`.", 5858765], + [114, 9, 410, "Metrics/AbcSize: Assignment Branch Condition size for `inspect` is too high. [<1, 17, 4> 17.49/17]", 605978105], + [115, 32, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] + ], + "lib/ast/merge/comment/augmenter.rb:633395157": [ + [12, 7, 13967, "Metrics/ClassLength: Class has too many lines. [291/100]", 2806660144], + [33, 9, 721, "Metrics/MethodLength: Method has too many lines. [16/10]", 200402816], + [33, 23, 91, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2938734913], + [64, 9, 1335, "Metrics/AbcSize: Assignment Branch Condition size for `build!` is too high. [<12, 29, 6> 31.95/17]", 3904283188], + [64, 9, 1335, "Metrics/MethodLength: Method has too many lines. [22/10]", 3904283188], + [94, 9, 867, "Metrics/AbcSize: Assignment Branch Condition size for `infer_leading_comments` is too high. [<8, 19, 14> 24.92/17]", 1941464872], + [94, 9, 867, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_leading_comments` is too high. [11/7]", 1941464872], + [94, 9, 867, "Metrics/MethodLength: Method has too many lines. [20/10]", 1941464872], + [94, 9, 867, "Metrics/PerceivedComplexity: Perceived complexity for `infer_leading_comments` is too high. [12/8]", 1941464872], + [122, 9, 429, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_inline_comments` is too high. [8/7]", 2688935834], + [133, 9, 934, "Metrics/AbcSize: Assignment Branch Condition size for `infer_trailing_comments` is too high. [<8, 21, 18> 28.79/17]", 1551855281], + [133, 9, 934, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_trailing_comments` is too high. [15/7]", 1551855281], + [133, 9, 934, "Metrics/MethodLength: Method has too many lines. [20/10]", 1551855281], + [133, 9, 934, "Metrics/PerceivedComplexity: Perceived complexity for `infer_trailing_comments` is too high. [15/8]", 1551855281], + [160, 9, 488, "Metrics/AbcSize: Assignment Branch Condition size for `infer_postlude!` is too high. [<5, 17, 8> 19.44/17]", 2562637949], + [160, 9, 488, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_postlude!` is too high. [8/7]", 2562637949], + [173, 9, 1529, "Metrics/AbcSize: Assignment Branch Condition size for `infer_remaining_regions!` is too high. [<12, 27, 23> 37.44/17]", 3911657050], + [173, 9, 1529, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_remaining_regions!` is too high. [18/7]", 3911657050], + [173, 9, 1529, "Metrics/MethodLength: Method has too many lines. [28/10]", 3911657050], + [173, 9, 1529, "Metrics/PerceivedComplexity: Perceived complexity for `infer_remaining_regions!` is too high. [20/8]", 3911657050], + [216, 9, 507, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split_preamble_group` is too high. [8/7]", 336784898], + [231, 9, 588, "Metrics/MethodLength: Method has too many lines. [17/10]", 3445626532], + [274, 9, 965, "Metrics/AbcSize: Assignment Branch Condition size for `build_region` is too high. [<6, 17, 7> 19.34/17]", 344809006], + [274, 9, 965, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_region` is too high. [8/7]", 344809006], + [274, 9, 965, "Metrics/MethodLength: Method has too many lines. [24/10]", 344809006] + ], + "lib/ast/merge/comment/block.rb:3806757604": [ + [31, 7, 6754, "Metrics/ClassLength: Class has too many lines. [106/100]", 2308582303], + [57, 9, 1059, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<12, 13, 14> 22.56/17]", 2656171724], + [57, 9, 1059, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `initialize` is too high. [14/7]", 2656171724], + [57, 9, 1059, "Metrics/MethodLength: Method has too many lines. [21/10]", 2656171724], + [57, 9, 1059, "Metrics/PerceivedComplexity: Perceived complexity for `initialize` is too high. [15/8]", 2656171724], + [113, 9, 511, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `freeze_action` is too high. [9/7]", 55014877], + [113, 9, 511, "Metrics/MethodLength: Method has too many lines. [12/10]", 55014877], + [113, 9, 511, "Metrics/PerceivedComplexity: Perceived complexity for `freeze_action` is too high. [9/8]", 55014877], + [181, 9, 439, "Metrics/AbcSize: Assignment Branch Condition size for `first_meaningful_content` is too high. [<2, 16, 11> 19.52/17]", 680479883], + [181, 9, 439, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `first_meaningful_content` is too high. [11/7]", 680479883], + [181, 9, 439, "Metrics/PerceivedComplexity: Perceived complexity for `first_meaningful_content` is too high. [12/8]", 680479883], + [197, 9, 765, "Metrics/AbcSize: Assignment Branch Condition size for `extract_block_content` is too high. [<7, 24, 9> 26.57/17]", 621871624], + [197, 9, 765, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_block_content` is too high. [9/7]", 621871624], + [197, 9, 765, "Metrics/PerceivedComplexity: Perceived complexity for `extract_block_content` is too high. [9/8]", 621871624] + ], + "lib/ast/merge/comment/c_style_tracker_base.rb:1569556520": [ + [22, 7, 15053, "Metrics/ClassLength: Class has too many lines. [284/100]", 3599183270], + [83, 9, 509, "Metrics/MethodLength: Method has too many lines. [11/10]", 1639553915], + [102, 9, 492, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `leading_comments_before` is too high. [8/7]", 3127043491], + [102, 9, 492, "Metrics/MethodLength: Method has too many lines. [11/10]", 3127043491], + [124, 9, 487, "Metrics/MethodLength: Method has too many lines. [11/10]", 1869933531], + [176, 9, 713, "Metrics/AbcSize: Assignment Branch Condition size for `trailing_comments_after` is too high. [<6, 12, 13> 18.68/17]", 543703521], + [176, 9, 713, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trailing_comments_after` is too high. [11/7]", 543703521], + [176, 9, 713, "Metrics/MethodLength: Method has too many lines. [14/10]", 543703521], + [176, 9, 713, "Metrics/PerceivedComplexity: Perceived complexity for `trailing_comments_after` is too high. [11/8]", 543703521], + [184, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177549], + [202, 9, 598, "Metrics/MethodLength: Method has too many lines. [12/10]", 1628921093], + [222, 9, 1271, "Metrics/MethodLength: Method has too many lines. [21/10]", 612335469], + [222, 35, 137, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1823300034], + [329, 35, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [348, 9, 2271, "Metrics/AbcSize: Assignment Branch Condition size for `extract_comments` is too high. [<17, 32, 13> 38.5/17]", 2751274968], + [348, 9, 2271, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_comments` is too high. [14/7]", 2751274968], + [348, 9, 2271, "Metrics/MethodLength: Method has too many lines. [59/10]", 2751274968], + [348, 9, 2271, "Metrics/PerceivedComplexity: Perceived complexity for `extract_comments` is too high. [14/8]", 2751274968], + [353, 11, 2045, "Metrics/BlockLength: Block has too many lines. [52/25]", 575665179], + [418, 9, 659, "Metrics/MethodLength: Method has too many lines. [15/10]", 177254901], + [439, 71, 4, "Lint/UnusedMethodArgument: Unused method argument - `line`.", 2087656651], + [439, 78, 8, "Lint/UnusedMethodArgument: Unused method argument - `line_num`.", 622661090] + ], + "lib/ast/merge/comment/hash_tracker_base.rb:861186417": [ + [32, 7, 19362, "Metrics/ClassLength: Class has too many lines. [221/100]", 1031055222], + [118, 9, 444, "Metrics/MethodLength: Method has too many lines. [11/10]", 3347260807], + [142, 9, 921, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `leading_comments_before` is too high. [8/7]", 415734636], + [142, 9, 921, "Metrics/MethodLength: Method has too many lines. [11/10]", 415734636], + [172, 9, 440, "Metrics/MethodLength: Method has too many lines. [11/10]", 2464474004], + [225, 9, 623, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trailing_comments_after` is too high. [10/7]", 543703521], + [225, 9, 623, "Metrics/MethodLength: Method has too many lines. [12/10]", 543703521], + [225, 9, 623, "Metrics/PerceivedComplexity: Perceived complexity for `trailing_comments_after` is too high. [10/8]", 543703521], + [249, 9, 551, "Metrics/MethodLength: Method has too many lines. [12/10]", 2783654570], + [278, 9, 1271, "Metrics/MethodLength: Method has too many lines. [21/10]", 612335469], + [278, 35, 137, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1823300034], + [374, 35, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [439, 9, 826, "Metrics/MethodLength: Method has too many lines. [12/10]", 1706632542] + ], + "lib/ast/merge/comment/parser.rb:2674748021": [ + [34, 7, 8372, "Metrics/ClassLength: Class has too many lines. [141/100]", 2541983664], + [84, 9, 357, "Metrics/MethodLength: Method has too many lines. [12/10]", 2265493710], + [104, 9, 545, "Metrics/AbcSize: Assignment Branch Condition size for `auto_detect_style` is too high. [<5, 17, 7> 19.05/17]", 868366444], + [104, 9, 545, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `auto_detect_style` is too high. [8/7]", 868366444], + [125, 9, 1650, "Metrics/AbcSize: Assignment Branch Condition size for `parse_line_comments` is too high. [<8, 28, 7> 29.95/17]", 1511562163], + [125, 9, 1650, "Metrics/MethodLength: Method has too many lines. [31/10]", 1511562163], + [176, 9, 2670, "Metrics/AbcSize: Assignment Branch Condition size for `parse_with_block_comments` is too high. [<15, 47, 15> 51.57/17]", 2963765048], + [176, 9, 2670, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_with_block_comments` is too high. [15/7]", 2963765048], + [176, 9, 2670, "Metrics/MethodLength: Method has too many lines. [47/10]", 2963765048], + [176, 9, 2670, "Metrics/PerceivedComplexity: Perceived complexity for `parse_with_block_comments` is too high. [16/8]", 2963765048], + [181, 11, 2390, "Metrics/BlockLength: Block has too many lines. [40/25]", 3720582340] + ], + "lib/ast/merge/comment/quoted_hash_line_parser.rb:2878420841": [ + [74, 9, 458, "Metrics/MethodLength: Method has too many lines. [11/10]", 1526360697], + [91, 9, 620, "Metrics/AbcSize: Assignment Branch Condition size for `inline_result` is too high. [<3, 16, 6> 17.35/17]", 2706755447], + [91, 9, 620, "Metrics/MethodLength: Method has too many lines. [14/10]", 2706755447] + ], + "lib/ast/merge/comment/region_merge_policy.rb:176745155": [ + [23, 23, 98, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1029631546], + [55, 9, 423, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `freeze_sensitive?` is too high. [8/7]", 4102661282], + [61, 41, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [61, 85, 2, "Lint/SafeNavigationConsistency: Use `.` instead of unnecessary `&.`.", 5858765], + [96, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3491399903] + ], + "lib/ast/merge/comment/style.rb:3045051983": [ + [27, 7, 9109, "Metrics/ClassLength: Class has too many lines. [143/100]", 131723516], + [142, 11, 911, "Metrics/MethodLength: Method has too many lines. [17/10]", 355862493], + [142, 23, 164, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 668558018], + [203, 23, 164, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 668558018] + ], + "lib/ast/merge/comment/tracked_hash_adapter.rb:3235547929": [ + [99, 11, 553, "Metrics/AbcSize: Assignment Branch Condition size for `line_text_from` is too high. [<4, 20, 4> 20.78/17]", 2680273536], + [99, 11, 553, "Metrics/MethodLength: Method has too many lines. [13/10]", 2680273536] + ], + "lib/ast/merge/composite_match_refiner.rb:1718969703": [ + [58, 7, 668, "Metrics/MethodLength: Method has too many lines. [14/10]", 2649148714] + ], + "lib/ast/merge/conflict_resolver_base.rb:765343263": [ + [69, 5, 14959, "Metrics/ClassLength: Class has too many lines. [170/100]", 633092728], + [156, 7, 919, "Metrics/MethodLength: Method has too many lines. [13/10]", 1701319380], + [156, 21, 200, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3369976202], + [367, 7, 972, "Metrics/MethodLength: Method has too many lines. [22/10]", 2870739148], + [434, 47, 13, "Style/NumericPredicate: Use `recursive.positive?` instead of `recursive > 0`.", 462999281], + [436, 99, 14, "Style/NumericPredicate: Use `recursive.zero?` instead of `recursive == 0`.", 2394069519] + ], + "lib/ast/merge/content_match_refiner.rb:3628272158": [ + [47, 5, 7719, "Metrics/ClassLength: Class has too many lines. [108/100]", 651494487], + [87, 7, 750, "Metrics/MethodLength: Method has too many lines. [17/10]", 3624290009], + [165, 37, 48, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 953994744], + [232, 7, 846, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<13, 29, 8> 32.77/17]", 3597737347], + [232, 7, 846, "Metrics/MethodLength: Method has too many lines. [20/10]", 3597737347] + ], + "lib/ast/merge/debug_logger.rb:1783610128": [ + [72, 5, 7614, "Metrics/ModuleLength: Module has too many lines. [118/100]", 736598454], + [85, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 941621], + [206, 7, 584, "Metrics/AbcSize: Assignment Branch Condition size for `time` is too high. [<3, 17, 2> 17.38/17]", 3468868523], + [206, 7, 584, "Metrics/MethodLength: Method has too many lines. [14/10]", 3468868523], + [269, 7, 450, "Metrics/PerceivedComplexity: Perceived complexity for `extract_lines` is too high. [9/8]", 680738666], + [287, 7, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631] + ], + "lib/ast/merge/detector/base.rb:343830240": [ + [175, 25, 73, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2991095115] + ], + "lib/ast/merge/detector/fenced_code_block.rb:3555142063": [ + [36, 7, 6302, "Metrics/ClassLength: Class has too many lines. [116/100]", 852968953], + [71, 9, 2492, "Metrics/AbcSize: Assignment Branch Condition size for `detect_all` is too high. [<31, 28, 12> 43.46/17]", 3575218793], + [71, 9, 2492, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_all` is too high. [11/7]", 3575218793], + [71, 9, 2492, "Metrics/MethodLength: Method has too many lines. [54/10]", 3575218793], + [71, 9, 2492, "Metrics/PerceivedComplexity: Perceived complexity for `detect_all` is too high. [13/8]", 3575218793], + [84, 11, 2060, "Metrics/BlockLength: Block has too many lines. [41/25]", 1744553779] + ], + "lib/ast/merge/detector/mergeable.rb:354817747": [ + [54, 7, 11933, "Metrics/ModuleLength: Module has too many lines. [140/100]", 1453034870], + [162, 9, 601, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_region_configs` is too high. [8/7]", 1278024890], + [162, 9, 601, "Metrics/MethodLength: Method has too many lines. [16/10]", 1278024890], + [189, 9, 1054, "Metrics/AbcSize: Assignment Branch Condition size for `extract_regions` is too high. [<11, 16, 3> 19.65/17]", 663241096], + [189, 9, 1054, "Metrics/MethodLength: Method has too many lines. [20/10]", 663241096], + [285, 9, 1005, "Metrics/AbcSize: Assignment Branch Condition size for `merge_and_substitute_regions` is too high. [<16, 19, 4> 25.16/17]", 4123525156], + [285, 9, 1005, "Metrics/MethodLength: Method has too many lines. [16/10]", 4123525156], + [318, 9, 1369, "Metrics/AbcSize: Assignment Branch Condition size for `merge_region` is too high. [<11, 20, 14> 26.78/17]", 746321843], + [318, 9, 1369, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_region` is too high. [15/7]", 746321843], + [318, 9, 1369, "Metrics/MethodLength: Method has too many lines. [16/10]", 746321843], + [318, 9, 1369, "Metrics/PerceivedComplexity: Perceived complexity for `merge_region` is too high. [15/8]", 746321843] + ], + "lib/ast/merge/detector/toml_frontmatter.rb:3255696517": [ + [50, 9, 892, "Metrics/MethodLength: Method has too many lines. [20/10]", 3132005303] + ], + "lib/ast/merge/detector/yaml_frontmatter.rb:2551474823": [ + [49, 9, 958, "Metrics/MethodLength: Method has too many lines. [20/10]", 3132005303] + ], + "lib/ast/merge/diff_mapper_base.rb:3204989377": [ + [22, 5, 7793, "Metrics/ClassLength: Class has too many lines. [141/100]", 2217731166], + [80, 7, 2598, "Metrics/AbcSize: Assignment Branch Condition size for `parse_diff` is too high. [<21, 31, 15> 40.34/17]", 939898835], + [80, 7, 2598, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_diff` is too high. [16/7]", 939898835], + [80, 7, 2598, "Metrics/MethodLength: Method has too many lines. [65/10]", 939898835], + [80, 7, 2598, "Metrics/PerceivedComplexity: Perceived complexity for `parse_diff` is too high. [12/8]", 939898835], + [90, 9, 2162, "Metrics/BlockLength: Block has too many lines. [50/25]", 3403609416], + [169, 7, 394, "Metrics/MethodLength: Method has too many lines. [11/10]", 2028641628] + ], + "lib/ast/merge/emitter_base.rb:655463559": [ + [26, 5, 14449, "Metrics/ClassLength: Class has too many lines. [226/100]", 2015391034], + [95, 7, 653, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_comment_region` is too high. [9/7]", 24580929], + [95, 7, 653, "Metrics/MethodLength: Method has too many lines. [12/10]", 24580929], + [95, 7, 653, "Metrics/PerceivedComplexity: Perceived complexity for `emit_comment_region` is too high. [9/8]", 24580929], + [120, 7, 1311, "Metrics/AbcSize: Assignment Branch Condition size for `emit_comment_attachment` is too high. [<5, 25, 16> 30.1/17]", 964928813], + [120, 7, 1311, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_comment_attachment` is too high. [17/7]", 964928813], + [120, 7, 1311, "Metrics/MethodLength: Method has too many lines. [17/10]", 964928813], + [120, 7, 1311, "Metrics/PerceivedComplexity: Perceived complexity for `emit_comment_attachment` is too high. [17/8]", 964928813], + [120, 34, 127, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 628879795], + [152, 7, 984, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_layout_gap` is too high. [8/7]", 1954418889], + [152, 7, 984, "Metrics/MethodLength: Method has too many lines. [13/10]", 1954418889], + [152, 7, 984, "Metrics/PerceivedComplexity: Perceived complexity for `emit_layout_gap` is too high. [9/8]", 1954418889], + [152, 26, 136, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3839882587], + [183, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861198], + [184, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087656651], + [186, 7, 1307, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_layout_attachment` is too high. [9/7]", 708408665], + [186, 7, 1307, "Metrics/MethodLength: Method has too many lines. [26/10]", 708408665], + [186, 7, 1307, "Metrics/PerceivedComplexity: Perceived complexity for `emit_layout_attachment` is too high. [9/8]", 708408665], + [186, 33, 218, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1552587384], + [187, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 1763090185], + [189, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1371312610], + [256, 31, 17, "Style/NumericPredicate: Use `@indent_level.positive?` instead of `@indent_level > 0`.", 1892475678], + [302, 56, 12, "Lint/UnusedMethodArgument: Unused method argument - `current_line`. You can also write as `inline_comment_region_target_column(*)` if you want the method to accept any arguments but don't care about them.", 2091263933], + [306, 42, 6, "Lint/UnusedMethodArgument: Unused method argument - `region`.", 2124512157], + [306, 51, 13, "Lint/UnusedMethodArgument: Unused method argument - `target_column`.", 3246375805], + [321, 7, 1141, "Metrics/AbcSize: Assignment Branch Condition size for `inline_comment_node_text` is too high. [<6, 29, 8> 30.68/17]", 2583471562], + [321, 7, 1141, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `inline_comment_node_text` is too high. [9/7]", 2583471562], + [321, 7, 1141, "Metrics/MethodLength: Method has too many lines. [22/10]", 2583471562], + [321, 7, 1141, "Metrics/PerceivedComplexity: Perceived complexity for `inline_comment_node_text` is too high. [9/8]", 2583471562], + [339, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861626], + [350, 7, 510, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_region_gap_lines` is too high. [8/7]", 1999747697], + [350, 7, 510, "Metrics/PerceivedComplexity: Perceived complexity for `emit_region_gap_lines` is too high. [9/8]", 1999747697] + ], + "lib/ast/merge/emitter_line_metadata_support.rb:3153033769": [ + [5, 5, 33, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::EmitterLineMetadataSupport`.", 2926748997], + [23, 7, 541, "Metrics/MethodLength: Method has too many lines. [12/10]", 2407359355] + ], + "lib/ast/merge/file_aligner_base.rb:4032045257": [ + [13, 5, 7473, "Metrics/ClassLength: Class has too many lines. [187/100]", 1391880441], + [27, 7, 2244, "Metrics/AbcSize: Assignment Branch Condition size for `align` is too high. [<19, 37, 12> 43.29/17]", 1243937217], + [27, 7, 2244, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `align` is too high. [12/7]", 1243937217], + [27, 7, 2244, "Metrics/MethodLength: Method has too many lines. [55/10]", 1243937217], + [27, 7, 2244, "Metrics/PerceivedComplexity: Perceived complexity for `align` is too high. [12/8]", 1243937217], + [148, 7, 655, "Metrics/MethodLength: Method has too many lines. [14/10]", 2468821688], + [180, 7, 455, "Metrics/MethodLength: Method has too many lines. [13/10]", 2361153066], + [199, 7, 1557, "Metrics/AbcSize: Assignment Branch Condition size for `apply_match_refiner!` is too high. [<10, 28, 12> 32.06/17]", 2386945712], + [199, 7, 1557, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_match_refiner!` is too high. [13/7]", 2386945712], + [199, 7, 1557, "Metrics/MethodLength: Method has too many lines. [31/10]", 2386945712], + [199, 7, 1557, "Metrics/PerceivedComplexity: Perceived complexity for `apply_match_refiner!` is too high. [13/8]", 2386945712] + ], + "lib/ast/merge/file_analyzable.rb:607555963": [ + [36, 5, 31229, "Metrics/ModuleLength: Module has too many lines. [316/100]", 1247752256], + [99, 19, 9, "Style/NumericPredicate: Use `index.negative?` instead of `index < 0`.", 4215255415], + [148, 7, 793, "Metrics/MethodLength: Method has too many lines. [22/10]", 1467470910], + [202, 7, 771, "Metrics/MethodLength: Method has too many lines. [16/10]", 1412317163], + [344, 7, 844, "Metrics/MethodLength: Method has too many lines. [12/10]", 2335919661], + [369, 7, 730, "Metrics/MethodLength: Method has too many lines. [11/10]", 1047958652], + [431, 7, 863, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_layout_owned_comment_attachment` is too high. [<0, 20, 4> 20.4/17]", 3284843691], + [431, 7, 863, "Metrics/MethodLength: Method has too many lines. [17/10]", 3284843691], + [481, 7, 683, "Metrics/MethodLength: Method has too many lines. [15/10]", 241044926], + [520, 14, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [614, 7, 6095, "Metrics/AbcSize: Assignment Branch Condition size for `generate_signature` is too high. [<4, 21, 13> 25.02/17]", 2828809875], + [614, 7, 6095, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `generate_signature` is too high. [11/7]", 2828809875], + [614, 7, 6095, "Metrics/MethodLength: Method has too many lines. [30/10]", 2828809875], + [614, 7, 6095, "Metrics/PerceivedComplexity: Perceived complexity for `generate_signature` is too high. [14/8]", 2828809875], + [676, 24, 390, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 3279112483] + ], + "lib/ast/merge/freeze_node_base.rb:2110274026": [ + [59, 5, 14572, "Metrics/ClassLength: Class has too many lines. [171/100]", 3038607603], + [108, 25, 545, "Style/MutableConstant: Freeze mutable objects assigned to constants.", 2366014160], + [186, 9, 1100, "Metrics/MethodLength: Method has too many lines. [15/10]", 2506841532], + [288, 7, 758, "Metrics/MethodLength: Method has too many lines. [11/10]", 136868205], + [288, 21, 276, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 1720059801], + [335, 7, 660, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `reason` is too high. [8/7]", 3127566048], + [418, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] + ], + "lib/ast/merge/healer.rb:3642412735": [ + [18, 7, 588, "Metrics/MethodLength: Method has too many lines. [15/10]", 3172269921], + [18, 17, 84, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1781025196], + [41, 7, 687, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `filter_items` is too high. [8/7]", 1200842691], + [41, 7, 687, "Metrics/MethodLength: Method has too many lines. [17/10]", 1200842691], + [41, 7, 687, "Metrics/PerceivedComplexity: Perceived complexity for `filter_items` is too high. [9/8]", 1200842691], + [41, 23, 130, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 33939503] + ], + "lib/ast/merge/jaccard_similarity.rb:678558736": [ + [87, 19, 1, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 177604], + [87, 22, 1, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 177607] + ], + "lib/ast/merge/key_path_partial_template_merger_base.rb:1818613864": [ + [22, 5, 6114, "Metrics/ClassLength: Class has too many lines. [155/100]", 1269962119], + [43, 21, 214, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 3637591635], + [68, 7, 489, "Metrics/MethodLength: Method has too many lines. [12/10]", 3170411580], + [118, 7, 640, "Metrics/AbcSize: Assignment Branch Condition size for `find_key_path` is too high. [<8, 14, 10> 18.97/17]", 2613403604], + [118, 7, 640, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_key_path` is too high. [8/7]", 2613403604], + [118, 7, 640, "Metrics/MethodLength: Method has too many lines. [16/10]", 2613403604], + [118, 7, 640, "Metrics/PerceivedComplexity: Perceived complexity for `find_key_path` is too high. [9/8]", 2613403604], + [140, 7, 536, "Metrics/MethodLength: Method has too many lines. [17/10]", 3598062652], + [168, 7, 804, "Metrics/MethodLength: Method has too many lines. [19/10]", 2773364183] + ], + "lib/ast/merge/layout.rb:3670500101": [ + [23, 36, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] + ], + "lib/ast/merge/layout/augmenter.rb:2556116722": [ + [8, 7, 5498, "Metrics/ClassLength: Class has too many lines. [129/100]", 3693754698], + [21, 23, 125, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 3395039982], + [53, 9, 1795, "Metrics/AbcSize: Assignment Branch Condition size for `build!` is too high. [<20, 32, 17> 41.39/17]", 3542913254], + [53, 9, 1795, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build!` is too high. [15/7]", 3542913254], + [53, 9, 1795, "Metrics/MethodLength: Method has too many lines. [43/10]", 3542913254], + [53, 9, 1795, "Metrics/PerceivedComplexity: Perceived complexity for `build!` is too high. [15/8]", 3542913254], + [58, 11, 1227, "Metrics/BlockLength: Block has too many lines. [29/25]", 55360131], + [105, 9, 504, "Metrics/MethodLength: Method has too many lines. [16/10]", 1953725517] + ], + "lib/ast/merge/layout/gap.rb:1678106201": [ + [11, 7, 7558, "Metrics/ClassLength: Class has too many lines. [151/100]", 2254377349], + [23, 9, 655, "Metrics/MethodLength: Method has too many lines. [11/10]", 3584854768], + [23, 23, 146, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 361396001], + [157, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859545], + [162, 9, 303, "Metrics/MethodLength: Method has too many lines. [12/10]", 2236444774], + [203, 9, 688, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_adjacency!` is too high. [10/7]", 1112786311], + [203, 9, 688, "Metrics/MethodLength: Method has too many lines. [13/10]", 1112786311] + ], + "lib/ast/merge/match_refiner_base.rb:1760054866": [ + [248, 7, 503, "Metrics/MethodLength: Method has too many lines. [11/10]", 2844230268], + [275, 7, 1056, "Metrics/AbcSize: Assignment Branch Condition size for `greedy_match` is too high. [<9, 24, 8> 26.85/17]", 2497617815], + [275, 7, 1056, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `greedy_match` is too high. [8/7]", 2497617815], + [275, 7, 1056, "Metrics/MethodLength: Method has too many lines. [24/10]", 2497617815] + ], + "lib/ast/merge/merge_result_base.rb:764500297": [ + [17, 5, 18646, "Metrics/ClassLength: Class has too many lines. [335/100]", 314460772], + [88, 21, 187, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1067369198], + [187, 7, 843, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_blank_line_runs!` is too high. [<12, 12, 10> 19.7/17]", 2347011594], + [187, 7, 843, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_blank_line_runs!` is too high. [9/7]", 2347011594], + [187, 7, 843, "Metrics/MethodLength: Method has too many lines. [22/10]", 2347011594], + [187, 7, 843, "Metrics/PerceivedComplexity: Perceived complexity for `normalize_blank_line_runs!` is too high. [10/8]", 2347011594], + [227, 7, 1004, "Metrics/MethodLength: Method has too many lines. [21/10]", 59539336], + [227, 35, 211, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 709487711], + [266, 7, 602, "Metrics/MethodLength: Method has too many lines. [13/10]", 320027623], + [341, 7, 927, "Metrics/AbcSize: Assignment Branch Condition size for `validate_review_state_compatibility!` is too high. [<8, 15, 4> 17.46/17]", 1596840080], + [341, 7, 927, "Metrics/MethodLength: Method has too many lines. [16/10]", 1596840080], + [403, 7, 936, "Metrics/AbcSize: Assignment Branch Condition size for `review_state_metadata` is too high. [<7, 18, 4> 19.72/17]", 4128292066], + [403, 7, 936, "Metrics/MethodLength: Method has too many lines. [14/10]", 4128292066], + [413, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 20421901], + [438, 7, 1194, "Metrics/MethodLength: Method has too many lines. [21/10]", 4289697646], + [448, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3342583337] + ], + "lib/ast/merge/merger_config.rb:3582657829": [ + [46, 5, 10581, "Metrics/ClassLength: Class has too many lines. [148/100]", 1598770872], + [96, 21, 234, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 720509970] + ], + "lib/ast/merge/navigable/injection_point_finder.rb:4117743218": [ + [45, 9, 1707, "Metrics/AbcSize: Assignment Branch Condition size for `find` is too high. [<9, 18, 17> 26.34/17]", 1445381162], + [45, 9, 1707, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find` is too high. [15/7]", 1445381162], + [45, 9, 1707, "Metrics/MethodLength: Method has too many lines. [28/10]", 1445381162], + [45, 9, 1707, "Metrics/PerceivedComplexity: Perceived complexity for `find` is too high. [16/8]", 1445381162], + [45, 17, 156, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 3876813166] + ], + "lib/ast/merge/navigable/statement.rb:3050515622": [ + [42, 7, 11078, "Metrics/ClassLength: Class has too many lines. [179/100]", 2550894515], + [96, 11, 550, "Metrics/AbcSize: Assignment Branch Condition size for `find_matching` is too high. [<7, 16, 12> 21.19/17]", 3492534565], + [96, 11, 550, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_matching` is too high. [12/7]", 3492534565], + [96, 11, 550, "Metrics/PerceivedComplexity: Perceived complexity for `find_matching` is too high. [12/8]", 3492534565], + [222, 13, 20, "Naming/PredicatePrefix: Rename `has_tree_navigation?` to `tree_navigation?`.", 733442156] + ], + "lib/ast/merge/node_typing.rb:4008165135": [ + [175, 9, 694, "Metrics/MethodLength: Method has too many lines. [12/10]", 777909930], + [213, 9, 891, "Metrics/AbcSize: Assignment Branch Condition size for `find_typing_callable` is too high. [<3, 23, 13> 26.59/17]", 3835052858], + [213, 9, 891, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_typing_callable` is too high. [14/7]", 3835052858], + [213, 9, 891, "Metrics/PerceivedComplexity: Perceived complexity for `find_typing_callable` is too high. [14/8]", 3835052858] + ], + "lib/ast/merge/node_wrapper_base.rb:3796877358": [ + [62, 5, 10228, "Metrics/ClassLength: Class has too many lines. [135/100]", 3832956007], + [92, 21, 81, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 4261369704] + ], + "lib/ast/merge/owner_selection.rb:2568070127": [ + [9, 7, 757, "Metrics/MethodLength: Method has too many lines. [13/10]", 2069564552] + ], + "lib/ast/merge/partial_template_merger_base.rb:2252899061": [ + [27, 5, 16780, "Metrics/ClassLength: Class has too many lines. [266/100]", 2205844189], + [48, 23, 81, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2112244807], + [106, 7, 757, "Metrics/MethodLength: Method has too many lines. [11/10]", 571708764], + [106, 21, 293, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 871709580], + [135, 7, 788, "Metrics/AbcSize: Assignment Branch Condition size for `merge` is too high. [<4, 19, 5> 20.05/17]", 467674580], + [135, 7, 788, "Metrics/MethodLength: Method has too many lines. [13/10]", 467674580], + [213, 7, 533, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_matcher` is too high. [<7, 20, 6> 22.02/17]", 1798972396], + [238, 7, 922, "Metrics/MethodLength: Method has too many lines. [25/10]", 1846154069], + [242, 25, 37, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 939456830], + [251, 25, 31, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 1024894473], + [268, 7, 1905, "Metrics/AbcSize: Assignment Branch Condition size for `perform_section_merge` is too high. [<13, 15, 2> 19.95/17]", 2711014340], + [268, 7, 1905, "Metrics/MethodLength: Method has too many lines. [34/10]", 2711014340], + [316, 50, 15, "Lint/UnusedMethodArgument: Unused method argument - `section_context`.", 2872123372], + [334, 7, 690, "Metrics/MethodLength: Method has too many lines. [14/10]", 1807124523], + [367, 7, 1122, "Metrics/AbcSize: Assignment Branch Condition size for `build_merged_content` is too high. [<1, 29, 14> 32.22/17]", 3938410418], + [367, 7, 1122, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_merged_content` is too high. [15/7]", 3938410418], + [367, 7, 1122, "Metrics/MethodLength: Method has too many lines. [18/10]", 3938410418], + [367, 7, 1122, "Metrics/PerceivedComplexity: Perceived complexity for `build_merged_content` is too high. [15/8]", 3938410418], + [397, 7, 596, "Metrics/MethodLength: Method has too many lines. [12/10]", 2602121883], + [397, 32, 144, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1463491208], + [414, 7, 1589, "Metrics/AbcSize: Assignment Branch Condition size for `source_splice_plan_for` is too high. [<6, 18, 9> 21/17]", 2889667289], + [414, 7, 1589, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `source_splice_plan_for` is too high. [9/7]", 2889667289], + [414, 7, 1589, "Metrics/MethodLength: Method has too many lines. [30/10]", 2889667289], + [414, 7, 1589, "Metrics/PerceivedComplexity: Perceived complexity for `source_splice_plan_for` is too high. [9/8]", 2889667289] + ], + "lib/ast/merge/recipe/config.rb:3990762705": [ + [54, 7, 14970, "Metrics/ClassLength: Class has too many lines. [296/100]", 2492031021], + [142, 9, 673, "Metrics/MethodLength: Method has too many lines. [12/10]", 3011978845], + [170, 9, 484, "Metrics/MethodLength: Method has too many lines. [15/10]", 183356432], + [246, 9, 710, "Metrics/AbcSize: Assignment Branch Condition size for `parse_injection` is too high. [<8, 13, 8> 17.23/17]", 641239814], + [246, 9, 710, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_injection` is too high. [9/7]", 641239814], + [246, 9, 710, "Metrics/MethodLength: Method has too many lines. [16/10]", 641239814], + [246, 9, 710, "Metrics/PerceivedComplexity: Perceived complexity for `parse_injection` is too high. [9/8]", 641239814], + [278, 9, 871, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_step` is too high. [8/7]", 3989307721], + [278, 9, 871, "Metrics/MethodLength: Method has too many lines. [20/10]", 3989307721], + [338, 9, 1758, "Metrics/AbcSize: Assignment Branch Condition size for `parse_step_merge_overrides` is too high. [<11, 43, 25> 50.94/17]", 806370438], + [338, 9, 1758, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_step_merge_overrides` is too high. [22/7]", 806370438], + [338, 9, 1758, "Metrics/MethodLength: Method has too many lines. [30/10]", 806370438], + [338, 9, 1758, "Metrics/PerceivedComplexity: Perceived complexity for `parse_step_merge_overrides` is too high. [22/8]", 806370438], + [373, 9, 566, "Metrics/MethodLength: Method has too many lines. [14/10]", 3671206955], + [391, 9, 547, "Metrics/MethodLength: Method has too many lines. [16/10]", 3273587697], + [459, 9, 799, "Metrics/AbcSize: Assignment Branch Condition size for `validate_injection!` is too high. [<2, 15, 12> 19.31/17]", 1665903587], + [459, 9, 799, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_injection!` is too high. [13/7]", 1665903587], + [459, 9, 799, "Metrics/MethodLength: Method has too many lines. [11/10]", 1665903587], + [459, 9, 799, "Metrics/PerceivedComplexity: Perceived complexity for `validate_injection!` is too high. [13/8]", 1665903587] + ], + "lib/ast/merge/recipe/preset.rb:2311326866": [ + [195, 9, 662, "Metrics/MethodLength: Method has too many lines. [12/10]", 1640897447] + ], + "lib/ast/merge/recipe/runner.rb:2243867806": [ + [27, 7, 28612, "Metrics/ClassLength: Class has too many lines. [547/100]", 79000832], + [73, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1411864995], + [77, 23, 136, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1636278032], + [92, 9, 849, "Metrics/MethodLength: Method has too many lines. [14/10]", 3083064345], + [128, 24, 129, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2642826282], + [210, 9, 788, "Metrics/MethodLength: Method has too many lines. [23/10]", 743008161], + [241, 9, 3397, "Metrics/AbcSize: Assignment Branch Condition size for `create_partial_template_merger` is too high. [<3, 52, 16> 54.49/17]", 2086180075], + [241, 9, 3397, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `create_partial_template_merger` is too high. [14/7]", 2086180075], + [241, 9, 3397, "Metrics/MethodLength: Method has too many lines. [63/10]", 2086180075], + [241, 9, 3397, "Metrics/PerceivedComplexity: Perceived complexity for `create_partial_template_merger` is too high. [13/8]", 2086180075], + [250, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2857356312], + [274, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177538], + [312, 9, 2210, "Metrics/AbcSize: Assignment Branch Condition size for `create_smart_merger` is too high. [<1, 39, 7> 39.64/17]", 1694660188], + [312, 9, 2210, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `create_smart_merger` is too high. [8/7]", 1694660188], + [312, 9, 2210, "Metrics/MethodLength: Method has too many lines. [45/10]", 1694660188], + [357, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 195423462], + [370, 9, 1087, "Metrics/MethodLength: Method has too many lines. [24/10]", 3850049530], + [370, 31, 124, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3466458723], + [401, 9, 1008, "Metrics/MethodLength: Method has too many lines. [19/10]", 2010895303], + [401, 25, 143, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2360959504], + [424, 9, 1263, "Metrics/AbcSize: Assignment Branch Condition size for `execute_partial_merge_step` is too high. [<3, 22, 1> 22.23/17]", 2850918453], + [424, 9, 1263, "Metrics/MethodLength: Method has too many lines. [25/10]", 2850918453], + [453, 9, 835, "Metrics/MethodLength: Method has too many lines. [14/10]", 1478843287], + [471, 9, 808, "Metrics/MethodLength: Method has too many lines. [15/10]", 1127254660], + [471, 37, 155, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 838578768], + [491, 9, 1126, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_smart_merge_result` is too high. [<8, 17, 12> 22.29/17]", 1786697339], + [491, 9, 1126, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_smart_merge_result` is too high. [9/7]", 1786697339], + [491, 9, 1126, "Metrics/MethodLength: Method has too many lines. [23/10]", 1786697339], + [491, 9, 1126, "Metrics/PerceivedComplexity: Perceived complexity for `normalize_smart_merge_result` is too high. [11/8]", 1786697339], + [518, 9, 2523, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_script_step_result` is too high. [<5, 40, 32> 51.47/17]", 2162420067], + [518, 9, 2523, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_script_step_result` is too high. [26/7]", 2162420067], + [518, 9, 2523, "Metrics/MethodLength: Method has too many lines. [48/10]", 2162420067], + [518, 9, 2523, "Metrics/PerceivedComplexity: Perceived complexity for `normalize_script_step_result` is too high. [29/8]", 2162420067], + [547, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 93872446], + [556, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 1527250939], + [586, 11, 155, "Style/HashTransformKeys: Prefer `transform_keys` over `each_with_object`.", 837503672], + [591, 9, 698, "Metrics/MethodLength: Method has too many lines. [11/10]", 1116310304], + [635, 9, 2582, "Metrics/AbcSize: Assignment Branch Condition size for `create_result_from_steps` is too high. [<8, 30, 31> 43.87/17]", 2040042265], + [635, 9, 2582, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `create_result_from_steps` is too high. [23/7]", 2040042265], + [635, 9, 2582, "Metrics/MethodLength: Method has too many lines. [60/10]", 2040042265], + [635, 9, 2582, "Metrics/PerceivedComplexity: Perceived complexity for `create_result_from_steps` is too high. [27/8]", 2040042265], + [635, 37, 133, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 789257106], + [649, 42, 40, "Style/SymbolProc: Pass `&:has_anchor` as an argument to `any?` instead of a block.", 4233626321] + ], + "lib/ast/merge/recipe/script_loader.rb:1397873218": [ + [145, 9, 1126, "Metrics/AbcSize: Assignment Branch Condition size for `load_script_file` is too high. [<6, 19, 4> 20.32/17]", 3417625171], + [145, 9, 1126, "Metrics/MethodLength: Method has too many lines. [17/10]", 3417625171] + ], + "lib/ast/merge/rspec/comment_behavior_matrix_adapters.rb:3429217018": [ + [9, 46, 341, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 532439002], + [31, 9, 901, "Metrics/MethodLength: Method has too many lines. [11/10]", 584608092], + [31, 59, 308, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 883491898], + [54, 9, 1269, "Metrics/MethodLength: Method has too many lines. [20/10]", 1021031182], + [65, 51, 6, "Lint/UnusedBlockArgument: Unused block argument - `inline`. If it's necessary, use `_` or `_inline` as an argument name to indicate that it won't be used.", 1605470060], + [69, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 4226982364], + [70, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1440420861] + ], + "lib/ast/merge/rspec/conformance_fixtures.rb:1295759615": [ + [6, 7, 26, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::RSpec::ConformanceFixtures`.", 90066768], + [9, 9, 1432, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_conformance_fixture_support` is too high. [<10, 30, 33> 45.71/17]", 518714108], + [9, 9, 1432, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_conformance_fixture_support` is too high. [33/7]", 518714108], + [9, 9, 1432, "Metrics/MethodLength: Method has too many lines. [25/10]", 518714108], + [9, 9, 1432, "Metrics/PerceivedComplexity: Perceived complexity for `normalize_conformance_fixture_support` is too high. [31/8]", 518714108] + ], + "lib/ast/merge/rspec/dependency_tags_config.rb:3604516304": [ + [30, 1, 2102, "Metrics/BlockLength: Block has too many lines. [26/25]", 113766065] + ], + "lib/ast/merge/rspec/merge_gem_registry.rb:3009576030": [ + [58, 7, 12129, "Metrics/ModuleLength: Module has too many lines. [158/100]", 335549747], + [90, 9, 780, "Metrics/MethodLength: Method has too many lines. [14/10]", 978965737], + [90, 21, 99, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3580433546], + [118, 9, 650, "Metrics/MethodLength: Method has too many lines. [12/10]", 3143160805], + [118, 31, 130, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2575863904], + [143, 9, 823, "Metrics/MethodLength: Method has too many lines. [17/10]", 4033116153], + [200, 9, 765, "Metrics/AbcSize: Assignment Branch Condition size for `register_known_gems` is too high. [<3, 17, 3> 17.52/17]", 1367620151], + [200, 9, 765, "Metrics/MethodLength: Method has too many lines. [17/10]", 1367620151] + ], + "lib/ast/merge/rspec/shared_examples.rb:2878318351": [ + [29, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 330577472] + ], + "lib/ast/merge/rspec/shared_examples/comment_behavior_matrix.rb:3695671858": [ + [36, 1, 27847, "Metrics/BlockLength: Block has too many lines. [540/25]", 3796645407], + [38, 55, 15, "Style/SymbolProc: Pass `&:value` as an argument to `lambda` instead of a block.", 1808354951], + [42, 64, 23, "Style/SymbolProc: Pass `&:statements` as an argument to `lambda` instead of a block.", 277221641], + [69, 3, 4455, "Metrics/BlockLength: Block has too many lines. [82/25]", 3672334777], + [72, 5, 1763, "Metrics/BlockLength: Block has too many lines. [34/25]", 164750821], + [165, 3, 22093, "Metrics/BlockLength: Block has too many lines. [429/25]", 229312375], + [292, 5, 1918, "Metrics/BlockLength: Block has too many lines. [29/25]", 1312741055], + [323, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1902517440], + [325, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 173482512], + [328, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 167607404], + [476, 5, 1605, "Metrics/BlockLength: Block has too many lines. [35/25]", 1943633697], + [677, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1902517440] + ], + "lib/ast/merge/rspec/shared_examples/conflict_resolver_base.rb:624045197": [ + [30, 1, 7893, "Metrics/BlockLength: Block has too many lines. [197/25]", 3450672926], + [37, 3, 1372, "Metrics/BlockLength: Block has too many lines. [33/25]", 3389152504], + [83, 3, 1206, "Metrics/BlockLength: Block has too many lines. [35/25]", 1580202348], + [128, 3, 1177, "Metrics/BlockLength: Block has too many lines. [33/25]", 2178974049], + [215, 3, 2443, "Metrics/BlockLength: Block has too many lines. [51/25]", 2538475273], + [219, 5, 1909, "Metrics/BlockLength: Block has too many lines. [35/25]", 880175101], + [279, 1, 2518, "Metrics/BlockLength: Block has too many lines. [74/25]", 958151448], + [286, 3, 2235, "Metrics/BlockLength: Block has too many lines. [70/25]", 2123260684], + [391, 1, 1317, "Metrics/BlockLength: Block has too many lines. [37/25]", 2321517041], + [439, 1, 1639, "Metrics/BlockLength: Block has too many lines. [37/25]", 276150366] + ], + "lib/ast/merge/rspec/shared_examples/debug_logger.rb:2747003588": [ + [23, 1, 4741, "Metrics/BlockLength: Block has too many lines. [121/25]", 3341338388], + [47, 3, 976, "Metrics/BlockLength: Block has too many lines. [27/25]", 2640321404], + [85, 3, 1452, "Metrics/BlockLength: Block has too many lines. [34/25]", 554663062] + ], + "lib/ast/merge/rspec/shared_examples/feature_profile.rb:4172143324": [ + [30, 1, 4249, "Metrics/BlockLength: Block has too many lines. [53/25]", 3787230403] + ], + "lib/ast/merge/rspec/shared_examples/file_analyzable.rb:2391547213": [ + [44, 1, 6468, "Metrics/BlockLength: Block has too many lines. [145/25]", 3744642916] + ], + "lib/ast/merge/rspec/shared_examples/freeze_node_base.rb:1711126715": [ + [23, 1, 5952, "Metrics/BlockLength: Block has too many lines. [157/25]", 3152271039], + [29, 3, 2836, "Metrics/BlockLength: Block has too many lines. [69/25]", 2082270913], + [115, 3, 1552, "Metrics/BlockLength: Block has too many lines. [46/25]", 4180117745] + ], + "lib/ast/merge/rspec/shared_examples/layout_attachment.rb:4130619694": [ + [30, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 1263574869], + [31, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 4282300883] + ], + "lib/ast/merge/rspec/shared_examples/layout_augmenter.rb:1928277603": [ + [18, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1311107624], + [19, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1311107624] + ], + "lib/ast/merge/rspec/shared_examples/merge_result_base.rb:2962043558": [ + [18, 1, 2330, "Metrics/BlockLength: Block has too many lines. [67/25]", 3496673178], + [53, 3, 1271, "Metrics/BlockLength: Block has too many lines. [42/25]", 2278976858] + ], + "lib/ast/merge/rspec/shared_examples/merger_config.rb:2413785902": [ + [18, 1, 8240, "Metrics/BlockLength: Block has too many lines. [193/25]", 3665443345], + [57, 3, 1628, "Metrics/BlockLength: Block has too many lines. [32/25]", 7828299], + [98, 3, 1266, "Metrics/BlockLength: Block has too many lines. [28/25]", 317929439], + [159, 3, 1740, "Metrics/BlockLength: Block has too many lines. [42/25]", 1736487820], + [217, 3, 1373, "Metrics/BlockLength: Block has too many lines. [30/25]", 442933563] + ], + "lib/ast/merge/rspec/shared_examples/recipe_preset_contract.rb:1495545061": [ + [7, 1, 2558, "Metrics/BlockLength: Block has too many lines. [51/25]", 4091815632] + ], + "lib/ast/merge/rspec/shared_examples/removal_mode_compliance.rb:3645548199": [ + [24, 1, 1860, "Metrics/BlockLength: Block has too many lines. [33/25]", 1115825136] + ], + "lib/ast/merge/rspec/shared_examples/reproducible_merge.rb:2276592459": [ + [51, 1, 2030, "Metrics/BlockLength: Block has too many lines. [52/25]", 563553381] + ], + "lib/ast/merge/rspec/shared_examples/reproducible_partial_merge.rb:524436129": [ + [3, 1, 2321, "Metrics/BlockLength: Block has too many lines. [44/25]", 3206099540] + ], + "lib/ast/merge/rspec/shared_examples/runtime_debug_contract.rb:4244040583": [ + [8, 1, 2808, "Metrics/BlockLength: Block has too many lines. [48/25]", 3274492878] + ], + "lib/ast/merge/rspec/shared_examples/unresolved_helper_contract.rb:2916431464": [ + [9, 1, 5998, "Metrics/BlockLength: Block has too many lines. [126/25]", 4174562424], + [94, 3, 1515, "Metrics/BlockLength: Block has too many lines. [32/25]", 1928238376] + ], + "lib/ast/merge/rspec/shared_examples/unresolved_review_state_transport_contract.rb:3368966854": [ + [14, 1, 3386, "Metrics/BlockLength: Block has too many lines. [68/25]", 2910343214], + [65, 3, 317, "Metrics/MethodLength: Method has too many lines. [12/10]", 2653897690] + ], + "lib/ast/merge/rspec/shared_examples/unresolved_runtime_contract.rb:1424234700": [ + [10, 1, 2652, "Metrics/BlockLength: Block has too many lines. [42/25]", 960283638], + [31, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2892620242], + [46, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193437756] + ], + "lib/ast/merge/rspec/shared_examples/unresolved_runtime_debug_contract.rb:2897026147": [ + [25, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2418171787], + [26, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 235635831] + ], + "lib/ast/merge/ruleset/config.rb:4242726919": [ + [7, 7, 3664, "Metrics/ClassLength: Class has too many lines. [101/100]", 1968929597], + [36, 9, 933, "Metrics/MethodLength: Method has too many lines. [15/10]", 3334511209], + [36, 23, 319, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [15/5]", 1652945408], + [65, 9, 515, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 18, 3> 18.25/17]", 2614325513], + [65, 9, 515, "Metrics/MethodLength: Method has too many lines. [14/10]", 2614325513] + ], + "lib/ast/merge/ruleset/feature_profile.rb:3980745364": [ + [12, 7, 6054, "Metrics/ClassLength: Class has too many lines. [155/100]", 2818730231], + [29, 9, 1351, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<17, 18, 7> 25.73/17]", 2248702332], + [29, 9, 1351, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `initialize` is too high. [8/7]", 2248702332], + [29, 9, 1351, "Metrics/MethodLength: Method has too many lines. [17/10]", 2248702332], + [29, 23, 422, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 1415781648], + [138, 9, 1509, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 36, 6> 36.5/17]", 3793816437], + [138, 9, 1509, "Metrics/MethodLength: Method has too many lines. [31/10]", 3793816437] + ], + "lib/ast/merge/ruleset/parser.rb:698282871": [ + [7, 7, 9396, "Metrics/ClassLength: Class has too many lines. [199/100]", 1305123525], + [43, 9, 473, "Metrics/AbcSize: Assignment Branch Condition size for `parse` is too high. [<0, 17, 2> 17.12/17]", 1400394586], + [43, 9, 473, "Metrics/MethodLength: Method has too many lines. [12/10]", 1400394586], + [71, 9, 1053, "Metrics/MethodLength: Method has too many lines. [24/10]", 1569959910], + [101, 9, 1123, "Metrics/AbcSize: Assignment Branch Condition size for `parse_single_value_directive!` is too high. [<7, 13, 10> 17.83/17]", 706129883], + [101, 9, 1123, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_single_value_directive!` is too high. [8/7]", 706129883], + [101, 9, 1123, "Metrics/MethodLength: Method has too many lines. [24/10]", 706129883], + [170, 9, 605, "Metrics/MethodLength: Method has too many lines. [11/10]", 336127382], + [186, 9, 687, "Metrics/MethodLength: Method has too many lines. [11/10]", 2962844982] + ], + "lib/ast/merge/ruleset/profile_vocabulary.rb:2359837647": [ + [7, 7, 3956, "Metrics/ModuleLength: Module has too many lines. [107/100]", 1680256705] + ], + "lib/ast/merge/ruleset/runtime_declaration.rb:1016848190": [ + [18, 9, 819, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<11, 13, 5> 17.75/17]", 4043304883], + [18, 9, 819, "Metrics/MethodLength: Method has too many lines. [11/10]", 4043304883], + [18, 23, 240, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 3868000276], + [49, 9, 551, "Metrics/MethodLength: Method has too many lines. [13/10]", 448215861] + ], + "lib/ast/merge/ruleset/runtime_translator.rb:3255492631": [ + [9, 11, 816, "Metrics/MethodLength: Method has too many lines. [19/10]", 225301385], + [31, 11, 986, "Metrics/AbcSize: Assignment Branch Condition size for `feature_profile` is too high. [<1, 17, 0> 17.03/17]", 1395467476], + [31, 11, 986, "Metrics/MethodLength: Method has too many lines. [19/10]", 1395467476] + ], + "lib/ast/merge/ruleset/support_style_resolver.rb:508975884": [ + [9, 11, 864, "Metrics/MethodLength: Method has too many lines. [22/10]", 3902551296] + ], + "lib/ast/merge/runtime/child_result.rb:4083710804": [ + [16, 9, 698, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<7, 16, 2> 17.58/17]", 2208366179], + [16, 23, 227, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 3688358290], + [38, 9, 584, "Metrics/MethodLength: Method has too many lines. [11/10]", 3113479157], + [55, 11, 106, "Style/HashTransformKeys: Prefer `transform_keys` over `each_with_object`.", 4262612225] + ], + "lib/ast/merge/runtime/delegate.rb:3607371286": [ + [17, 23, 285, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 2793452069] + ], + "lib/ast/merge/runtime/diagnostic.rb:805162185": [ + [10, 23, 72, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1875462867] + ], + "lib/ast/merge/runtime/operation.rb:1030261783": [ + [20, 9, 767, "Metrics/MethodLength: Method has too many lines. [11/10]", 2728174753], + [20, 23, 278, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 694444911], + [100, 9, 617, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<2, 24, 6> 24.82/17]", 1175382849], + [100, 9, 617, "Metrics/MethodLength: Method has too many lines. [11/10]", 1175382849] + ], + "lib/ast/merge/runtime/resolution_case.rb:250040454": [ + [8, 9, 707, "Metrics/AbcSize: Assignment Branch Condition size for `from_h` is too high. [<1, 19, 6> 19.95/17]", 2592154170], + [29, 23, 189, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 818714714], + [81, 11, 111, "Style/HashTransformKeys: Prefer `transform_keys` over `each_with_object`.", 2712537644] + ], + "lib/ast/merge/runtime/root_session_support.rb:1917388966": [ + [10, 9, 2153, "Metrics/AbcSize: Assignment Branch Condition size for `start_runtime_root_session!` is too high. [<5, 20, 3> 20.83/17]", 1888056651], + [10, 9, 2153, "Metrics/MethodLength: Method has too many lines. [41/10]", 1888056651], + [10, 40, 421, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 2297301282], + [60, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2312419928], + [68, 9, 771, "Metrics/MethodLength: Method has too many lines. [13/10]", 1787620786], + [68, 43, 191, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3635875424] + ], + "lib/ast/merge/runtime/session.rb:628419040": [ + [66, 9, 1203, "Metrics/AbcSize: Assignment Branch Condition size for `summary` is too high. [<5, 43, 13> 45.2/17]", 550888870], + [66, 9, 1203, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `summary` is too high. [14/7]", 550888870], + [66, 9, 1203, "Metrics/MethodLength: Method has too many lines. [20/10]", 550888870], + [66, 9, 1203, "Metrics/PerceivedComplexity: Perceived complexity for `summary` is too high. [14/8]", 550888870] + ], + "lib/ast/merge/runtime/surface.rb:3684795905": [ + [17, 23, 230, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 469229117], + [44, 9, 418, "Metrics/MethodLength: Method has too many lines. [11/10]", 998969973] + ], + "lib/ast/merge/section_typing.rb:4261989256": [ + [112, 9, 710, "Metrics/MethodLength: Method has too many lines. [15/10]", 3600335459], + [176, 9, 67, "Lint/MissingSuper: Call `super` to initialize state of the parent class.", 4077537758], + [216, 9, 85, "Lint/MissingSuper: Call `super` to initialize state of the parent class.", 3648782014], + [245, 9, 1446, "Metrics/AbcSize: Assignment Branch Condition size for `merge_sections` is too high. [<13, 20, 12> 26.7/17]", 525095633], + [245, 9, 1446, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_sections` is too high. [12/7]", 525095633], + [245, 9, 1446, "Metrics/MethodLength: Method has too many lines. [28/10]", 525095633], + [245, 9, 1446, "Metrics/PerceivedComplexity: Perceived complexity for `merge_sections` is too high. [13/8]", 525095633] + ], + "lib/ast/merge/smart_merger_base.rb:4189972287": [ + [109, 5, 15324, "Metrics/ClassLength: Class has too many lines. [172/100]", 3547407870], + [214, 7, 1974, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<20, 14, 5> 24.92/17]", 2211610736], + [214, 7, 1974, "Metrics/MethodLength: Method has too many lines. [23/10]", 2211610736], + [214, 21, 443, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [15/5]", 1530523783], + [424, 7, 1312, "Metrics/AbcSize: Assignment Branch Condition size for `parse_and_analyze` is too high. [<7, 25, 11> 28.2/17]", 1640248187], + [424, 7, 1312, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_and_analyze` is too high. [10/7]", 1640248187], + [424, 7, 1312, "Metrics/MethodLength: Method has too many lines. [15/10]", 1640248187], + [424, 7, 1312, "Metrics/PerceivedComplexity: Perceived complexity for `parse_and_analyze` is too high. [10/8]", 1640248187], + [517, 12, 52, "Style/NumericPredicate: Use `result_class.instance_method(:initialize).arity.zero?` instead of `result_class.instance_method(:initialize).arity == 0`.", 1312375552] + ], + "lib/ast/merge/structural_edit/boundary.rb:2838060197": [ + [20, 23, 93, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3901214537], + [41, 38, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [51, 38, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [60, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087440865] + ], + "lib/ast/merge/structural_edit/boundary_support.rb:2036464761": [ + [31, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861061], + [32, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 97596930] + ], + "lib/ast/merge/structural_edit/plan_set.rb:538463647": [ + [116, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 2855200692] + ], + "lib/ast/merge/structural_edit/rehome_plan.rb:2152178780": [ + [23, 23, 123, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3433617242], + [100, 9, 519, "Metrics/MethodLength: Method has too many lines. [11/10]", 318006380], + [136, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 2367140872] + ], + "lib/ast/merge/structural_edit/remove_plan.rb:1189569486": [ + [11, 7, 9717, "Metrics/ClassLength: Class has too many lines. [160/100]", 3652701475], + [25, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861091], + [27, 9, 1409, "Metrics/MethodLength: Method has too many lines. [22/10]", 3344870777], + [27, 23, 255, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 3970946607], + [28, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 1637059282], + [36, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859104], + [196, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 1617827253], + [224, 9, 1032, "Metrics/MethodLength: Method has too many lines. [20/10]", 968444047] + ], + "lib/ast/merge/structural_edit/remove_plan_support.rb:877461974": [ + [9, 9, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631], + [19, 9, 1429, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_remove_plan` is too high. [8/7]", 4091314919], + [19, 9, 1429, "Metrics/MethodLength: Method has too many lines. [32/10]", 4091314919] + ], + "lib/ast/merge/structural_edit/splice_plan.rb:2675806114": [ + [39, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1683893295], + [42, 23, 203, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3653221702], + [113, 9, 517, "Metrics/MethodLength: Method has too many lines. [11/10]", 634912361] + ], + "lib/ast/merge/structured_emitter_provenance_support.rb:445323365": [ + [5, 5, 41, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::StructuredEmitterProvenanceSupport`.", 3548518830] + ], + "lib/ast/merge/structured_review_apply_support.rb:3649736380": [ + [5, 5, 35, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::StructuredReviewApplySupport`.", 1282380463], + [22, 7, 782, "Metrics/AbcSize: Assignment Branch Condition size for `current_output_span_for` is too high. [<6, 19, 11> 22.76/17]", 4137750179], + [22, 7, 782, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `current_output_span_for` is too high. [8/7]", 4137750179], + [22, 7, 782, "Metrics/MethodLength: Method has too many lines. [14/10]", 4137750179], + [42, 7, 595, "Metrics/MethodLength: Method has too many lines. [12/10]", 2080934521], + [60, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3151172498] + ], + "lib/ast/merge/text/conflict_resolver.rb:989169286": [ + [19, 7, 9182, "Metrics/ClassLength: Class has too many lines. [159/100]", 1070563745], + [28, 23, 211, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2639535499], + [53, 9, 2507, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_batch` is too high. [<15, 34, 5> 37.5/17]", 825130797], + [53, 9, 2507, "Metrics/MethodLength: Method has too many lines. [44/10]", 825130797], + [196, 9, 2458, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_matched_pair` is too high. [<2, 30, 11> 32.02/17]", 4037214978], + [196, 9, 2458, "Metrics/MethodLength: Method has too many lines. [46/10]", 4037214978] + ], + "lib/ast/merge/text/file_analysis.rb:1530312707": [ + [106, 9, 1484, "Metrics/AbcSize: Assignment Branch Condition size for `parse_statements` is too high. [<11, 15, 6> 19.54/17]", 1858083071], + [106, 9, 1484, "Metrics/MethodLength: Method has too many lines. [34/10]", 1858083071], + [160, 9, 449, "Metrics/MethodLength: Method has too many lines. [11/10]", 1902035813] + ], + "lib/ast/merge/text/line_node.rb:3385927013": [ + [145, 9, 699, "Metrics/MethodLength: Method has too many lines. [17/10]", 2201872249] + ], + "lib/ast/merge/text/section_splitter.rb:129704488": [ + [141, 9, 1442, "Metrics/AbcSize: Assignment Branch Condition size for `merge_section_lists` is too high. [<13, 20, 6> 24.6/17]", 3551729170], + [141, 9, 1442, "Metrics/MethodLength: Method has too many lines. [23/10]", 3551729170], + [322, 9, 1767, "Metrics/AbcSize: Assignment Branch Condition size for `split` is too high. [<11, 29, 10> 32.59/17]", 2207922758], + [322, 9, 1767, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split` is too high. [10/7]", 2207922758], + [322, 9, 1767, "Metrics/MethodLength: Method has too many lines. [46/10]", 2207922758], + [322, 9, 1767, "Metrics/PerceivedComplexity: Perceived complexity for `split` is too high. [13/8]", 2207922758], + [328, 11, 1019, "Metrics/BlockLength: Block has too many lines. [26/25]", 1561634792] + ], + "lib/ast/merge/text/smart_merger.rb:2405807903": [ + [67, 9, 831, "Metrics/MethodLength: Method has too many lines. [12/10]", 584426022], + [67, 23, 350, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 3074172637] + ], + "lib/ast/merge/trailing_groups/alignment_sort.rb:2593404330": [ + [40, 9, 513, "Metrics/MethodLength: Method has too many lines. [12/10]", 89360683] + ], + "lib/ast/merge/trailing_groups/core.rb:4231959665": [ + [61, 9, 812, "Metrics/MethodLength: Method has too many lines. [17/10]", 1777526069], + [101, 9, 998, "Metrics/AbcSize: Assignment Branch Condition size for `flush_ready_trailing_groups` is too high. [<8, 18, 15> 24.76/17]", 2397698441], + [101, 9, 998, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `flush_ready_trailing_groups` is too high. [13/7]", 2397698441], + [101, 9, 998, "Metrics/MethodLength: Method has too many lines. [17/10]", 2397698441], + [101, 9, 998, "Metrics/PerceivedComplexity: Perceived complexity for `flush_ready_trailing_groups` is too high. [13/8]", 2397698441] + ], + "lib/ast/merge/trailing_groups/dest_iterate.rb:3897205087": [ + [69, 9, 751, "Metrics/MethodLength: Method has too many lines. [12/10]", 3915657972], + [69, 47, 199, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2545849044] + ], + "lib/ast/merge/unresolved_support.rb:2881272494": [ + [7, 5, 24, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::UnresolvedSupport`.", 990281691], + [7, 5, 4392, "Metrics/ModuleLength: Module has too many lines. [116/100]", 3475162940], + [32, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [67, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [85, 7, 1038, "Metrics/MethodLength: Method has too many lines. [14/10]", 3139619197], + [85, 40, 338, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 71164914] + ], + "spec/ast/merge/ast_node_spec.rb:1362065144": [ + [3, 1, 8199, "Metrics/BlockLength: Block has too many lines. [254/25]", 1649868231], + [18, 3, 1030, "Metrics/BlockLength: Block has too many lines. [33/25]", 1409835577] + ], + "spec/ast/merge/block_directive_spec.rb:2305756581": [ + [3, 1, 5181, "Metrics/BlockLength: Block has too many lines. [138/25]", 1887900896], + [128, 3, 1391, "Metrics/BlockLength: Block has too many lines. [39/25]", 3626371694] + ], + "spec/ast/merge/comment/attachment_spec.rb:2571833836": [ + [3, 1, 5536, "Metrics/BlockLength: Block has too many lines. [150/25]", 1841571757], + [93, 3, 1639, "Metrics/BlockLength: Block has too many lines. [37/25]", 212730671] + ], + "spec/ast/merge/comment/augmenter_spec.rb:4266625483": [ + [3, 1, 9141, "Metrics/BlockLength: Block has too many lines. [212/25]", 530365996], + [16, 3, 6849, "Metrics/BlockLength: Block has too many lines. [154/25]", 503152628], + [200, 3, 1244, "Metrics/BlockLength: Block has too many lines. [33/25]", 3565041107] + ], + "spec/ast/merge/comment/block_spec.rb:4138473890": [ + [3, 1, 9021, "Metrics/BlockLength: Block has too many lines. [250/25]", 1617505173], + [8, 3, 1115, "Metrics/BlockLength: Block has too many lines. [27/25]", 2958989619], + [93, 3, 1127, "Metrics/BlockLength: Block has too many lines. [33/25]", 196340527], + [123, 45, 16, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 155572628], + [159, 3, 1432, "Metrics/BlockLength: Block has too many lines. [35/25]", 281400319] + ], + "spec/ast/merge/comment/c_style_tracker_base_spec.rb:3154319400": [ + [3, 1, 5816, "Metrics/BlockLength: Block has too many lines. [133/25]", 680831933], + [100, 3, 1450, "Metrics/BlockLength: Block has too many lines. [35/25]", 4153882185] + ], + "spec/ast/merge/comment/capability_spec.rb:2763521225": [ + [3, 1, 3522, "Metrics/BlockLength: Block has too many lines. [89/25]", 1487980773], + [4, 3, 1954, "Metrics/BlockLength: Block has too many lines. [41/25]", 160187362] + ], + "spec/ast/merge/comment/empty_spec.rb:1801324640": [ + [3, 1, 2584, "Metrics/BlockLength: Block has too many lines. [70/25]", 270179899], + [4, 3, 1047, "Metrics/BlockLength: Block has too many lines. [27/25]", 3056449816] + ], + "spec/ast/merge/comment/hash_tracker_base_spec.rb:3624528747": [ + [3, 1, 9653, "Metrics/BlockLength: Block has too many lines. [271/25]", 3748659406], + [8, 3, 1210, "Metrics/BlockLength: Block has too many lines. [37/25]", 2566766302], + [21, 7, 872, "Metrics/AbcSize: Assignment Branch Condition size for `extract_comments` is too high. [<7, 24, 5> 25.5/17]", 1213080161], + [21, 7, 872, "Metrics/MethodLength: Method has too many lines. [25/10]", 1213080161], + [275, 3, 1171, "Metrics/BlockLength: Block has too many lines. [29/25]", 1425466742] + ], + "spec/ast/merge/comment/line_spec.rb:1487829548": [ + [3, 1, 5291, "Metrics/BlockLength: Block has too many lines. [128/25]", 587604747], + [6, 3, 1573, "Metrics/BlockLength: Block has too many lines. [37/25]", 4105920006] + ], + "spec/ast/merge/comment/parser_spec.rb:2443973508": [ + [3, 1, 9855, "Metrics/BlockLength: Block has too many lines. [237/25]", 404174977], + [4, 3, 1013, "Metrics/BlockLength: Block has too many lines. [26/25]", 182655397], + [38, 3, 1282, "Metrics/BlockLength: Block has too many lines. [28/25]", 2303702609] + ], + "spec/ast/merge/comment/quoted_hash_line_parser_spec.rb:3795390831": [ + [3, 1, 1810, "Metrics/BlockLength: Block has too many lines. [44/25]", 2575838586], + [6, 3, 1700, "Metrics/BlockLength: Block has too many lines. [41/25]", 1553834548] + ], + "spec/ast/merge/comment/region_merge_policy_spec.rb:4175996936": [ + [3, 1, 3618, "Metrics/BlockLength: Block has too many lines. [75/25]", 4006378358], + [11, 3, 2752, "Metrics/BlockLength: Block has too many lines. [52/25]", 494211987] + ], + "spec/ast/merge/comment/region_spec.rb:2674736508": [ + [3, 1, 4033, "Metrics/BlockLength: Block has too many lines. [91/25]", 1828104331] + ], + "spec/ast/merge/comment/style_spec.rb:1875195890": [ + [3, 1, 4040, "Metrics/BlockLength: Block has too many lines. [101/25]", 2759361650] + ], + "spec/ast/merge/comment/support_style_spec.rb:1350169032": [ + [3, 1, 1577, "Metrics/BlockLength: Block has too many lines. [39/25]", 3414039011] + ], + "spec/ast/merge/comment/tracked_hash_adapter_spec.rb:1256807736": [ + [3, 1, 4482, "Metrics/BlockLength: Block has too many lines. [97/25]", 264417763], + [4, 3, 3101, "Metrics/BlockLength: Block has too many lines. [63/25]", 1050939978], + [81, 3, 1313, "Metrics/BlockLength: Block has too many lines. [30/25]", 515655104] + ], + "spec/ast/merge/comment_spec.rb:81945459": [ + [3, 1, 15888, "Metrics/BlockLength: Block has too many lines. [384/25]", 2229554982], + [4, 3, 3957, "Metrics/BlockLength: Block has too many lines. [84/25]", 660667217], + [5, 5, 1187, "Metrics/BlockLength: Block has too many lines. [26/25]", 241562105], + [105, 3, 1371, "Metrics/BlockLength: Block has too many lines. [30/25]", 1901983597], + [159, 3, 1296, "Metrics/BlockLength: Block has too many lines. [30/25]", 1749880380], + [239, 3, 1151, "Metrics/BlockLength: Block has too many lines. [28/25]", 183967322], + [272, 3, 2004, "Metrics/BlockLength: Block has too many lines. [45/25]", 2594323837], + [349, 3, 3220, "Metrics/BlockLength: Block has too many lines. [83/25]", 790417809], + [350, 5, 2347, "Metrics/BlockLength: Block has too many lines. [60/25]", 4016801881] + ], + "spec/ast/merge/composite_match_refiner_spec.rb:2888297870": [ + [3, 1, 6152, "Metrics/BlockLength: Block has too many lines. [143/25]", 3308692548], + [55, 3, 4118, "Metrics/BlockLength: Block has too many lines. [87/25]", 1405655464] + ], + "spec/ast/merge/conflict_resolver_base_spec.rb:3331938447": [ + [5, 1, 20643, "Metrics/BlockLength: Block has too many lines. [516/25]", 3129196558], + [14, 59, 14, "Lint/UnusedMethodArgument: Unused method argument - `template_index`.", 1809801172], + [14, 76, 10, "Lint/UnusedMethodArgument: Unused method argument - `dest_index`.", 2703999490], + [47, 61, 14, "Lint/UnusedMethodArgument: Unused method argument - `template_index`. You can also write as `resolve_node_pair(*)` if you want the method to accept any arguments but don't care about them.", 1809801172], + [47, 78, 10, "Lint/UnusedMethodArgument: Unused method argument - `dest_index`. You can also write as `resolve_node_pair(*)` if you want the method to accept any arguments but don't care about them.", 2703999490], + [105, 3, 17203, "Metrics/BlockLength: Block has too many lines. [425/25]", 1114912980], + [154, 5, 1797, "Metrics/BlockLength: Block has too many lines. [37/25]", 515146940], + [203, 5, 1373, "Metrics/BlockLength: Block has too many lines. [32/25]", 603210832], + [292, 5, 2874, "Metrics/BlockLength: Block has too many lines. [77/25]", 3918129775], + [341, 7, 1292, "Metrics/BlockLength: Block has too many lines. [34/25]", 1769555944], + [402, 5, 1857, "Metrics/BlockLength: Block has too many lines. [44/25]", 1516406612], + [456, 5, 1209, "Metrics/BlockLength: Block has too many lines. [31/25]", 430489898], + [514, 5, 2021, "Metrics/BlockLength: Block has too many lines. [37/25]", 144128170], + [515, 7, 1953, "Metrics/BlockLength: Block has too many lines. [35/25]", 1574966248], + [567, 5, 1500, "Metrics/BlockLength: Block has too many lines. [40/25]", 2509466150] + ], + "spec/ast/merge/content_match_refiner_spec.rb:4058001158": [ + [3, 1, 14348, "Metrics/BlockLength: Block has too many lines. [318/25]", 1171164704], + [25, 3, 1238, "Metrics/BlockLength: Block has too many lines. [29/25]", 2139810386], + [63, 3, 4077, "Metrics/BlockLength: Block has too many lines. [95/25]", 3471153375], + [325, 3, 2213, "Metrics/BlockLength: Block has too many lines. [37/25]", 3370370915] + ], + "spec/ast/merge/debug_logger_spec.rb:429510168": [ + [3, 1, 17306, "Metrics/BlockLength: Block has too many lines. [358/25]", 2287792973], + [251, 3, 1598, "Metrics/BlockLength: Block has too many lines. [27/25]", 3227542816], + [358, 3, 5118, "Metrics/BlockLength: Block has too many lines. [77/25]", 1759761803] + ], + "spec/ast/merge/detector/base_spec.rb:4157102211": [ + [3, 1, 3172, "Metrics/BlockLength: Block has too many lines. [100/25]", 3745104028], + [11, 7, 498, "Metrics/MethodLength: Method has too many lines. [13/10]", 3178368155], + [49, 3, 900, "Metrics/BlockLength: Block has too many lines. [28/25]", 2333048204] + ], + "spec/ast/merge/detector/fenced_code_block_spec.rb:495797689": [ + [3, 1, 11589, "Metrics/BlockLength: Block has too many lines. [363/25]", 3764545134], + [38, 3, 4467, "Metrics/BlockLength: Block has too many lines. [150/25]", 1597401000], + [41, 5, 1077, "Metrics/BlockLength: Block has too many lines. [31/25]", 2269642514], + [115, 5, 848, "Metrics/BlockLength: Block has too many lines. [27/25]", 1704866975], + [220, 3, 4815, "Metrics/BlockLength: Block has too many lines. [146/25]", 3797214474] + ], + "spec/ast/merge/detector/mergeable_spec.rb:1307688846": [ + [3, 1, 23175, "Metrics/BlockLength: Block has too many lines. [654/25]", 2932391114], + [77, 3, 2079, "Metrics/BlockLength: Block has too many lines. [53/25]", 1093085347], + [177, 3, 2217, "Metrics/BlockLength: Block has too many lines. [69/25]", 926985871], + [188, 5, 948, "Metrics/BlockLength: Block has too many lines. [26/25]", 4186135901], + [225, 5, 898, "Metrics/BlockLength: Block has too many lines. [31/25]", 513446836], + [266, 3, 1168, "Metrics/BlockLength: Block has too many lines. [29/25]", 774699411], + [304, 3, 1188, "Metrics/BlockLength: Block has too many lines. [27/25]", 4282853126], + [339, 3, 918, "Metrics/BlockLength: Block has too many lines. [28/25]", 1759590109], + [372, 3, 870, "Metrics/BlockLength: Block has too many lines. [28/25]", 131542026], + [410, 3, 3768, "Metrics/BlockLength: Block has too many lines. [111/25]", 181819560], + [483, 5, 1536, "Metrics/BlockLength: Block has too many lines. [47/25]", 385085357], + [540, 3, 1891, "Metrics/BlockLength: Block has too many lines. [52/25]", 602757329], + [664, 3, 1927, "Metrics/BlockLength: Block has too many lines. [56/25]", 48062261], + [691, 5, 1146, "Metrics/BlockLength: Block has too many lines. [31/25]", 1961728737], + [721, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3104497040], + [729, 3, 1625, "Metrics/BlockLength: Block has too many lines. [46/25]", 1570579215] + ], + "spec/ast/merge/detector/region_spec.rb:594725562": [ + [3, 1, 8128, "Metrics/BlockLength: Block has too many lines. [290/25]", 1984713692], + [4, 3, 806, "Metrics/BlockLength: Block has too many lines. [28/25]", 1515087192], + [58, 3, 1236, "Metrics/BlockLength: Block has too many lines. [45/25]", 2464968707], + [128, 3, 1063, "Metrics/BlockLength: Block has too many lines. [33/25]", 239148700], + [250, 3, 2010, "Metrics/BlockLength: Block has too many lines. [76/25]", 2595033382] + ], + "spec/ast/merge/detector/toml_frontmatter_spec.rb:1135160129": [ + [3, 1, 6717, "Metrics/BlockLength: Block has too many lines. [218/25]", 2273975625], + [12, 3, 5534, "Metrics/BlockLength: Block has too many lines. [187/25]", 538920673], + [13, 5, 1456, "Metrics/BlockLength: Block has too many lines. [38/25]", 3113759139] + ], + "spec/ast/merge/detector/yaml_frontmatter_spec.rb:2467934365": [ + [3, 1, 6702, "Metrics/BlockLength: Block has too many lines. [213/25]", 3083039982], + [12, 3, 5056, "Metrics/BlockLength: Block has too many lines. [170/25]", 1889948780], + [13, 5, 1438, "Metrics/BlockLength: Block has too many lines. [38/25]", 1736912391], + [219, 3, 1396, "Metrics/BlockLength: Block has too many lines. [33/25]", 2446467851] + ], + "spec/ast/merge/diff_mapper_base_spec.rb:1771546518": [ + [5, 1, 8521, "Metrics/BlockLength: Block has too many lines. [248/25]", 1057580573], + [22, 9, 44, "Style/InverseMethods: Use `reject` instead of inverting `select`.", 3063843489], + [46, 3, 3878, "Metrics/BlockLength: Block has too many lines. [116/25]", 2874032080], + [47, 5, 1938, "Metrics/BlockLength: Block has too many lines. [48/25]", 1904497583], + [191, 3, 1488, "Metrics/BlockLength: Block has too many lines. [43/25]", 1632956840] + ], + "spec/ast/merge/emitter_base_spec.rb:4197360291": [ + [3, 1, 11215, "Metrics/BlockLength: Block has too many lines. [282/25]", 4254840781], + [30, 3, 4393, "Metrics/BlockLength: Block has too many lines. [102/25]", 3992142376], + [134, 58, 12, "Lint/UnusedMethodArgument: Unused method argument - `current_line`. You can also write as `inline_comment_region_target_column(*)` if you want the method to accept any arguments but don't care about them.", 2091263933], + [138, 44, 6, "Lint/UnusedMethodArgument: Unused method argument - `region`.", 2124512157], + [159, 3, 1815, "Metrics/BlockLength: Block has too many lines. [39/25]", 719023387], + [206, 3, 2233, "Metrics/BlockLength: Block has too many lines. [62/25]", 3754339775], + [312, 3, 1059, "Metrics/BlockLength: Block has too many lines. [26/25]", 375007123] + ], + "spec/ast/merge/fictive_language_harness_spec.rb:1179155480": [ + [6, 1, 6693, "Metrics/BlockLength: Block has too many lines. [143/25]", 245088433], + [7, 3, 1968, "Metrics/BlockLength: Block has too many lines. [36/25]", 4161580169], + [58, 3, 1230, "Metrics/BlockLength: Block has too many lines. [34/25]", 990452676], + [103, 3, 2668, "Metrics/BlockLength: Block has too many lines. [51/25]", 1755027956] + ], + "spec/ast/merge/file_aligner_base_spec.rb:610089304": [ + [5, 1, 7287, "Metrics/BlockLength: Block has too many lines. [164/25]", 597898988], + [6, 3, 1237, "Metrics/BlockLength: Block has too many lines. [37/25]", 1284505259], + [86, 3, 5087, "Metrics/BlockLength: Block has too many lines. [84/25]", 119873771], + [94, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3749416415] + ], + "spec/ast/merge/file_analyzable_spec.rb:3816965829": [ + [3, 1, 12458, "Metrics/BlockLength: Block has too many lines. [272/25]", 216138965], + [25, 3, 9603, "Metrics/BlockLength: Block has too many lines. [202/25]", 2508188172], + [297, 3, 1214, "Metrics/BlockLength: Block has too many lines. [30/25]", 777182624] + ], + "spec/ast/merge/freezable_spec.rb:559280324": [ + [5, 1, 5033, "Metrics/BlockLength: Block has too many lines. [123/25]", 3070666859], + [6, 3, 1199, "Metrics/BlockLength: Block has too many lines. [34/25]", 4058875636], + [66, 3, 1530, "Metrics/BlockLength: Block has too many lines. [31/25]", 1670675428] + ], + "spec/ast/merge/freeze_node_base_spec.rb:2962962931": [ + [3, 1, 21887, "Metrics/BlockLength: Block has too many lines. [560/25]", 567315021], + [48, 3, 1369, "Metrics/BlockLength: Block has too many lines. [38/25]", 3363160391], + [131, 3, 2739, "Metrics/BlockLength: Block has too many lines. [56/25]", 2008289622], + [205, 3, 1586, "Metrics/BlockLength: Block has too many lines. [35/25]", 4179606047], + [251, 3, 977, "Metrics/BlockLength: Block has too many lines. [26/25]", 1240612851], + [287, 3, 1130, "Metrics/BlockLength: Block has too many lines. [28/25]", 2511265379], + [322, 3, 5029, "Metrics/BlockLength: Block has too many lines. [126/25]", 739537566], + [598, 3, 3055, "Metrics/BlockLength: Block has too many lines. [81/25]", 145217296] + ], + "spec/ast/merge/healer_spec.rb:877829793": [ + [3, 1, 4896, "Metrics/BlockLength: Block has too many lines. [148/25]", 1074378773], + [19, 3, 1333, "Metrics/BlockLength: Block has too many lines. [38/25]", 2940878263], + [24, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193432399], + [61, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085379023], + [67, 3, 2985, "Metrics/BlockLength: Block has too many lines. [93/25]", 4032786576] + ], + "spec/ast/merge/jaccard_similarity_spec.rb:3984307047": [ + [3, 1, 2659, "Metrics/BlockLength: Block has too many lines. [71/25]", 1122516612], + [6, 3, 1484, "Metrics/BlockLength: Block has too many lines. [38/25]", 3367914637], + [55, 3, 1090, "Metrics/BlockLength: Block has too many lines. [28/25]", 2629339264] + ], + "spec/ast/merge/key_path_partial_template_merger_base_spec.rb:2189485360": [ + [5, 1, 5955, "Metrics/BlockLength: Block has too many lines. [138/25]", 91542958], + [35, 3, 1217, "Metrics/BlockLength: Block has too many lines. [33/25]", 2663081123], + [97, 3, 3019, "Metrics/BlockLength: Block has too many lines. [54/25]", 1411952192] + ], + "spec/ast/merge/layout/attachment_spec.rb:3814294426": [ + [3, 1, 1799, "Metrics/BlockLength: Block has too many lines. [34/25]", 1283153367] + ], + "spec/ast/merge/layout/augmenter_spec.rb:3633045915": [ + [3, 1, 4412, "Metrics/BlockLength: Block has too many lines. [92/25]", 2690553031], + [20, 3, 2725, "Metrics/BlockLength: Block has too many lines. [54/25]", 3645203819] + ], + "spec/ast/merge/layout/gap_spec.rb:4232058283": [ + [3, 1, 2758, "Metrics/BlockLength: Block has too many lines. [72/25]", 2052697931], + [9, 3, 1290, "Metrics/BlockLength: Block has too many lines. [28/25]", 3175967312] + ], + "spec/ast/merge/match_refiner_base_spec.rb:3961767223": [ + [3, 1, 10604, "Metrics/BlockLength: Block has too many lines. [301/25]", 4290485382], + [4, 3, 1146, "Metrics/BlockLength: Block has too many lines. [37/25]", 108051658], + [50, 3, 1005, "Metrics/BlockLength: Block has too many lines. [28/25]", 3807648246], + [125, 3, 1026, "Metrics/BlockLength: Block has too many lines. [27/25]", 2896086726], + [162, 3, 4464, "Metrics/BlockLength: Block has too many lines. [114/25]", 2878217135], + [218, 5, 1112, "Metrics/BlockLength: Block has too many lines. [30/25]", 1605825436], + [224, 11, 104, "Style/HashLikeCase: Consider replacing `case-when` with a hash lookup.", 4220899731], + [247, 11, 132, "Style/HashLikeCase: Consider replacing `case-when` with a hash lookup.", 3401820780], + [258, 5, 1642, "Metrics/BlockLength: Block has too many lines. [35/25]", 1288881729], + [337, 3, 1108, "Metrics/BlockLength: Block has too many lines. [33/25]", 2139263963] + ], + "spec/ast/merge/match_score_base_spec.rb:2340739872": [ + [3, 1, 15213, "Metrics/BlockLength: Block has too many lines. [372/25]", 1512747000], + [4, 3, 1553, "Metrics/BlockLength: Block has too many lines. [41/25]", 2789289940], + [43, 20, 2, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 5862747], + [43, 24, 2, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 5862744], + [56, 3, 1041, "Metrics/BlockLength: Block has too many lines. [29/25]", 3729310115], + [152, 3, 3259, "Metrics/BlockLength: Block has too many lines. [82/25]", 1438003770], + [258, 3, 2199, "Metrics/BlockLength: Block has too many lines. [43/25]", 3386602801], + [320, 3, 1684, "Metrics/BlockLength: Block has too many lines. [35/25]", 3807719546], + [365, 14, 16, "Lint/FloatComparison: Avoid equality comparisons of floats as they are unreliable.", 3787748956], + [369, 3, 1696, "Metrics/BlockLength: Block has too many lines. [36/25]", 3172214426], + [417, 3, 1792, "Metrics/BlockLength: Block has too many lines. [45/25]", 3557977606], + [438, 5, 1121, "Metrics/BlockLength: Block has too many lines. [26/25]", 4236927298] + ], + "spec/ast/merge/merge_result_base_spec.rb:2262708492": [ + [3, 1, 19471, "Metrics/BlockLength: Block has too many lines. [529/25]", 4106058751], + [38, 3, 2735, "Metrics/BlockLength: Block has too many lines. [80/25]", 1103243845], + [279, 3, 1611, "Metrics/BlockLength: Block has too many lines. [39/25]", 1928511417], + [280, 5, 1203, "Metrics/BlockLength: Block has too many lines. [26/25]", 857223227], + [326, 3, 2070, "Metrics/BlockLength: Block has too many lines. [48/25]", 2552826824], + [385, 3, 5769, "Metrics/BlockLength: Block has too many lines. [140/25]", 1457747735], + [511, 5, 1306, "Metrics/BlockLength: Block has too many lines. [29/25]", 2980786372], + [574, 3, 1308, "Metrics/BlockLength: Block has too many lines. [32/25]", 1342704008] + ], + "spec/ast/merge/merger_config_spec.rb:663896662": [ + [5, 1, 7314, "Metrics/BlockLength: Block has too many lines. [189/25]", 1279589310], + [11, 3, 1180, "Metrics/BlockLength: Block has too many lines. [26/25]", 1014009176], + [45, 3, 1151, "Metrics/BlockLength: Block has too many lines. [26/25]", 785276703], + [79, 3, 3574, "Metrics/BlockLength: Block has too many lines. [97/25]", 969726064], + [126, 5, 1158, "Metrics/BlockLength: Block has too many lines. [29/25]", 389808524] + ], + "spec/ast/merge/navigable/injection_point_finder_spec.rb:3693754765": [ + [3, 1, 5152, "Metrics/BlockLength: Block has too many lines. [123/25]", 3265221808], + [15, 3, 4026, "Metrics/BlockLength: Block has too many lines. [96/25]", 1482695302], + [63, 5, 2337, "Metrics/BlockLength: Block has too many lines. [54/25]", 2678200297] + ], + "spec/ast/merge/navigable/injection_point_spec.rb:3295717447": [ + [3, 1, 6032, "Metrics/BlockLength: Block has too many lines. [161/25]", 805025024], + [77, 3, 1083, "Metrics/BlockLength: Block has too many lines. [28/25]", 3091139104] + ], + "spec/ast/merge/navigable/statement_spec.rb:2965726260": [ + [3, 1, 18289, "Metrics/BlockLength: Block has too many lines. [510/25]", 4119203121], + [102, 3, 3570, "Metrics/BlockLength: Block has too many lines. [97/25]", 3287535168], + [156, 5, 2030, "Metrics/BlockLength: Block has too many lines. [51/25]", 3299963733], + [251, 3, 1338, "Metrics/BlockLength: Block has too many lines. [37/25]", 844559624], + [411, 3, 1550, "Metrics/BlockLength: Block has too many lines. [42/25]", 3851790429], + [465, 3, 1372, "Metrics/BlockLength: Block has too many lines. [41/25]", 3782869383] + ], + "spec/ast/merge/node_typing/frozen_wrapper_spec.rb:3823345520": [ + [3, 1, 4532, "Metrics/BlockLength: Block has too many lines. [117/25]", 3944573785] + ], + "spec/ast/merge/node_typing/normalizer_spec.rb:1976431423": [ + [4, 1, 8679, "Metrics/BlockLength: Block has too many lines. [219/25]", 938207310], + [65, 3, 1137, "Metrics/BlockLength: Block has too many lines. [26/25]", 3180807289], + [101, 3, 1404, "Metrics/BlockLength: Block has too many lines. [28/25]", 1094334251], + [216, 3, 875, "Metrics/BlockLength: Block has too many lines. [26/25]", 2755551247] + ], + "spec/ast/merge/node_typing/wrapper_spec.rb:3211588263": [ + [3, 1, 3469, "Metrics/BlockLength: Block has too many lines. [92/25]", 638644563] + ], + "spec/ast/merge/node_typing_spec.rb:4080661389": [ + [3, 1, 12728, "Metrics/BlockLength: Block has too many lines. [333/25]", 3927571381], + [132, 3, 3704, "Metrics/BlockLength: Block has too many lines. [98/25]", 2130243754], + [208, 5, 1267, "Metrics/BlockLength: Block has too many lines. [31/25]", 2816753725], + [265, 3, 1298, "Metrics/BlockLength: Block has too many lines. [33/25]", 3320876250], + [311, 3, 3803, "Metrics/BlockLength: Block has too many lines. [100/25]", 2743470911] + ], + "spec/ast/merge/node_wrapper_base_spec.rb:2252820285": [ + [3, 1, 11681, "Metrics/BlockLength: Block has too many lines. [307/25]", 1698593962], + [32, 3, 2341, "Metrics/BlockLength: Block has too many lines. [68/25]", 1594381363], + [179, 3, 2568, "Metrics/BlockLength: Block has too many lines. [51/25]", 1269052990], + [294, 3, 1252, "Metrics/BlockLength: Block has too many lines. [26/25]", 4220822180], + [329, 3, 1963, "Metrics/BlockLength: Block has too many lines. [39/25]", 1623030031] + ], + "spec/ast/merge/owner_selection_spec.rb:1894901093": [ + [3, 1, 1356, "Metrics/BlockLength: Block has too many lines. [35/25]", 1030003775] + ], + "spec/ast/merge/partial_template_merger_base_spec.rb:3412991027": [ + [3, 1, 7073, "Metrics/BlockLength: Block has too many lines. [145/25]", 3415302240], + [16, 9, 43, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3196404056], + [22, 9, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 4116824817], + [48, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [96, 3, 4220, "Metrics/BlockLength: Block has too many lines. [68/25]", 3464417459], + [97, 5, 2029, "Metrics/BlockLength: Block has too many lines. [27/25]", 3297854360], + [138, 5, 2122, "Metrics/BlockLength: Block has too many lines. [37/25]", 1592076374] + ], + "spec/ast/merge/recipe/config_spec.rb:3917288551": [ + [3, 1, 21041, "Metrics/BlockLength: Block has too many lines. [611/25]", 2431235923], + [72, 3, 1653, "Metrics/BlockLength: Block has too many lines. [36/25]", 2702780755], + [174, 3, 1465, "Metrics/BlockLength: Block has too many lines. [44/25]", 2326126933], + [226, 3, 3419, "Metrics/BlockLength: Block has too many lines. [89/25]", 798604841], + [327, 3, 1398, "Metrics/BlockLength: Block has too many lines. [34/25]", 3113267700], + [474, 3, 1184, "Metrics/BlockLength: Block has too many lines. [39/25]", 2599756030], + [519, 3, 4630, "Metrics/BlockLength: Block has too many lines. [147/25]", 1245526575] + ], + "spec/ast/merge/recipe/preset_spec.rb:818394232": [ + [3, 1, 6696, "Metrics/BlockLength: Block has too many lines. [173/25]", 3205615892] + ], + "spec/ast/merge/recipe/runner_spec.rb:3689194117": [ + [3, 1, 46798, "Metrics/BlockLength: Block has too many lines. [1104/25]", 3220015076], + [48, 3, 1128, "Metrics/BlockLength: Block has too many lines. [26/25]", 910457645], + [108, 3, 3036, "Metrics/BlockLength: Block has too many lines. [92/25]", 2112378918], + [132, 5, 881, "Metrics/BlockLength: Block has too many lines. [27/25]", 3842010356], + [177, 5, 918, "Metrics/BlockLength: Block has too many lines. [27/25]", 2152367239], + [295, 3, 1383, "Metrics/BlockLength: Block has too many lines. [41/25]", 2141027559], + [362, 3, 1653, "Metrics/BlockLength: Block has too many lines. [33/25]", 1536472295], + [449, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3960802027], + [497, 3, 7959, "Metrics/BlockLength: Block has too many lines. [200/25]", 3739116912], + [556, 5, 1225, "Metrics/BlockLength: Block has too many lines. [31/25]", 195497726], + [740, 3, 6977, "Metrics/BlockLength: Block has too many lines. [145/25]", 2805535296], + [748, 5, 2241, "Metrics/BlockLength: Block has too many lines. [49/25]", 2552233173], + [805, 5, 3007, "Metrics/BlockLength: Block has too many lines. [59/25]", 708771722], + [877, 5, 1444, "Metrics/BlockLength: Block has too many lines. [26/25]", 3274225022], + [911, 3, 3258, "Metrics/BlockLength: Block has too many lines. [85/25]", 2346849758], + [1012, 3, 2710, "Metrics/BlockLength: Block has too many lines. [71/25]", 3801821877], + [1029, 5, 1547, "Metrics/BlockLength: Block has too many lines. [42/25]", 2962020615], + [1109, 3, 2240, "Metrics/BlockLength: Block has too many lines. [35/25]", 1139957345], + [1115, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], + [1117, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], + [1119, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1801369636], + [1121, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2652710920], + [1123, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1375785821], + [1125, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 632755459], + [1160, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], + [1162, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], + [1164, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1375785821], + [1176, 3, 1472, "Metrics/BlockLength: Block has too many lines. [31/25]", 844153987], + [1181, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1239303812], + [1183, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1251336963], + [1216, 3, 2277, "Metrics/BlockLength: Block has too many lines. [43/25]", 4287127386], + [1221, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], + [1223, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2652710920], + [1225, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1375785821], + [1227, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 632755459], + [1274, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3420615328] + ], + "spec/ast/merge/recipe/script_loader_spec.rb:2136892097": [ + [3, 1, 8554, "Metrics/BlockLength: Block has too many lines. [237/25]", 2314425369], + [45, 3, 2842, "Metrics/BlockLength: Block has too many lines. [75/25]", 168902852], + [155, 3, 1400, "Metrics/BlockLength: Block has too many lines. [39/25]", 1611123964] + ], + "spec/ast/merge/rspec/shared_examples/feature_profile_spec.rb:2654837708": [ + [5, 1, 1140, "Metrics/BlockLength: Block has too many lines. [31/25]", 678325840] + ], + "spec/ast/merge/rspec/shared_examples/file_analyzable_spec.rb:1833922303": [ + [58, 3, 970, "Metrics/AbcSize: Assignment Branch Condition size for `detect_freeze_blocks` is too high. [<16, 9, 5> 19.03/17]", 1533823667], + [58, 3, 970, "Metrics/MethodLength: Method has too many lines. [31/10]", 1533823667], + [104, 1, 1216, "Metrics/BlockLength: Block has too many lines. [39/25]", 1009012120], + [105, 3, 1159, "Metrics/BlockLength: Block has too many lines. [38/25]", 1361521205] + ], + "spec/ast/merge/rspec/shared_examples/layout_attachment_spec.rb:714796658": [ + [8, 1, 957, "Metrics/BlockLength: Block has too many lines. [28/25]", 3738990548] + ], + "spec/ast/merge/rspec/shared_examples/recipe_preset_contract_spec.rb:669158728": [ + [6, 1, 1577, "Metrics/BlockLength: Block has too many lines. [41/25]", 2157464290], + [7, 3, 1512, "Metrics/BlockLength: Block has too many lines. [39/25]", 1968160370], + [44, 5, 401, "Metrics/AbcSize: Assignment Branch Condition size for `run_verify_loaded_preset` is too high. [<0, 26, 0> 26/17]", 2960760840] + ], + "spec/ast/merge/rspec/shared_examples/removal_mode_compliance_spec.rb:31388352": [ + [6, 22, 2, "Style/MutableConstant: Freeze mutable objects assigned to constants.", 5861859], + [44, 1, 2546, "Metrics/BlockLength: Block has too many lines. [77/25]", 3740028971], + [45, 3, 1350, "Metrics/BlockLength: Block has too many lines. [41/25]", 2793151667], + [94, 3, 1128, "Metrics/BlockLength: Block has too many lines. [32/25]", 2527000512], + [95, 5, 1081, "Metrics/BlockLength: Block has too many lines. [30/25]", 3825359844] + ], + "spec/ast/merge/rspec/shared_examples/reproducible_partial_merge_spec.rb:2862326360": [ + [19, 3, 600, "Metrics/MethodLength: Method has too many lines. [13/10]", 1542875905] + ], + "spec/ast/merge/ruleset/config_spec.rb:1860949041": [ + [3, 1, 9431, "Metrics/BlockLength: Block has too many lines. [236/25]", 4015119559], + [24, 3, 5341, "Metrics/BlockLength: Block has too many lines. [149/25]", 2361087446], + [25, 5, 1064, "Metrics/BlockLength: Block has too many lines. [26/25]", 603056104], + [226, 3, 2125, "Metrics/BlockLength: Block has too many lines. [36/25]", 1640873170] + ], + "spec/ast/merge/ruleset/declaration_objects_spec.rb:3827892270": [ + [3, 1, 1881, "Metrics/BlockLength: Block has too many lines. [47/25]", 1770376910] + ], + "spec/ast/merge/ruleset/feature_profile_spec.rb:2241111096": [ + [3, 1, 4189, "Metrics/BlockLength: Block has too many lines. [86/25]", 1116963550], + [4, 3, 4129, "Metrics/BlockLength: Block has too many lines. [84/25]", 117079811], + [5, 5, 2391, "Metrics/BlockLength: Block has too many lines. [45/25]", 1800077283] + ], + "spec/ast/merge/ruleset/parser_spec.rb:386407767": [ + [3, 1, 5670, "Metrics/BlockLength: Block has too many lines. [144/25]", 3425850453], + [4, 3, 5618, "Metrics/BlockLength: Block has too many lines. [143/25]", 246633759] + ], + "spec/ast/merge/ruleset/profile_vocabulary_spec.rb:2570869276": [ + [3, 1, 2095, "Metrics/BlockLength: Block has too many lines. [46/25]", 3214342662] + ], + "spec/ast/merge/ruleset/support_style_resolver_spec.rb:640167644": [ + [3, 1, 1625, "Metrics/BlockLength: Block has too many lines. [49/25]", 2066834885], + [4, 3, 1559, "Metrics/BlockLength: Block has too many lines. [47/25]", 1169495477] + ], + "spec/ast/merge/runtime_spec.rb:3962589694": [ + [5, 1, 24649, "Metrics/BlockLength: Block has too many lines. [664/25]", 2634021188], + [76, 3, 1459, "Metrics/BlockLength: Block has too many lines. [41/25]", 3744002593], + [125, 3, 1417, "Metrics/BlockLength: Block has too many lines. [33/25]", 4087615381], + [166, 3, 2549, "Metrics/BlockLength: Block has too many lines. [69/25]", 3150260095], + [175, 5, 1068, "Metrics/BlockLength: Block has too many lines. [26/25]", 2933114685], + [247, 3, 1668, "Metrics/BlockLength: Block has too many lines. [39/25]", 2386637993], + [259, 5, 1265, "Metrics/BlockLength: Block has too many lines. [27/25]", 3157806167], + [321, 3, 10884, "Metrics/BlockLength: Block has too many lines. [295/25]", 1889265918], + [322, 5, 1879, "Metrics/BlockLength: Block has too many lines. [46/25]", 2536583521], + [373, 5, 3938, "Metrics/BlockLength: Block has too many lines. [108/25]", 340276027], + [486, 5, 1270, "Metrics/BlockLength: Block has too many lines. [38/25]", 3844174392], + [528, 5, 3728, "Metrics/BlockLength: Block has too many lines. [95/25]", 3779381786], + [630, 3, 3240, "Metrics/BlockLength: Block has too many lines. [84/25]", 3856725067], + [656, 5, 1649, "Metrics/BlockLength: Block has too many lines. [40/25]", 3713662683] + ], + "spec/ast/merge/section_typing_spec.rb:2580971307": [ + [3, 1, 14786, "Metrics/BlockLength: Block has too many lines. [344/25]", 2925587076], + [4, 3, 1940, "Metrics/BlockLength: Block has too many lines. [50/25]", 3362429388], + [67, 3, 3684, "Metrics/BlockLength: Block has too many lines. [96/25]", 3864076664], + [120, 5, 1998, "Metrics/BlockLength: Block has too many lines. [50/25]", 411620722], + [183, 3, 1415, "Metrics/BlockLength: Block has too many lines. [37/25]", 3323012675], + [192, 5, 1124, "Metrics/BlockLength: Block has too many lines. [28/25]", 966216762], + [229, 3, 1610, "Metrics/BlockLength: Block has too many lines. [38/25]", 1499957007], + [229, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 1025596574], + [279, 3, 4437, "Metrics/BlockLength: Block has too many lines. [80/25]", 423587151], + [356, 36, 23, "Style/SymbolProc: Pass `&:unclassified?` as an argument to `find` instead of a block.", 563945984], + [369, 36, 23, "Style/SymbolProc: Pass `&:unclassified?` as an argument to `find` instead of a block.", 563945984], + [375, 3, 1630, "Metrics/BlockLength: Block has too many lines. [31/25]", 1675144727] + ], + "spec/ast/merge/smart_merger_base_spec.rb:1904727390": [ + [3, 1, 13253, "Metrics/BlockLength: Block has too many lines. [398/25]", 3611753358], + [30, 9, 10, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 1099697163], + [87, 3, 1851, "Metrics/BlockLength: Block has too many lines. [40/25]", 3729571903], + [210, 3, 925, "Metrics/BlockLength: Block has too many lines. [35/25]", 2001100899], + [344, 3, 709, "Metrics/BlockLength: Block has too many lines. [27/25]", 3041950416], + [415, 3, 1074, "Metrics/BlockLength: Block has too many lines. [35/25]", 956635689], + [416, 5, 1026, "Metrics/BlockLength: Block has too many lines. [33/25]", 1993879652], + [461, 3, 1031, "Metrics/BlockLength: Block has too many lines. [31/25]", 35315996] + ], + "spec/ast/merge/structural_edit/boundary_support_spec.rb:863387845": [ + [3, 1, 4226, "Metrics/BlockLength: Block has too many lines. [86/25]", 1889771490], + [16, 9, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1304492024], + [22, 9, 41, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3828424401], + [59, 3, 1294, "Metrics/BlockLength: Block has too many lines. [26/25]", 3038774774] + ], + "spec/ast/merge/structural_edit/plan_set_spec.rb:3633263362": [ + [3, 1, 5945, "Metrics/BlockLength: Block has too many lines. [180/25]", 3883285271], + [14, 3, 2139, "Metrics/BlockLength: Block has too many lines. [72/25]", 3558415255], + [128, 3, 1412, "Metrics/BlockLength: Block has too many lines. [39/25]", 1216754705] + ], + "spec/ast/merge/structural_edit/remove_plan_spec.rb:3569534665": [ + [3, 1, 6442, "Metrics/BlockLength: Block has too many lines. [134/25]", 3440814588], + [39, 3, 3768, "Metrics/BlockLength: Block has too many lines. [75/25]", 876721813], + [127, 3, 1439, "Metrics/BlockLength: Block has too many lines. [29/25]", 3378195351] + ], + "spec/ast/merge/structural_edit/remove_plan_support_spec.rb:800158061": [ + [3, 1, 2893, "Metrics/BlockLength: Block has too many lines. [62/25]", 3748446914], + [16, 9, 43, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3196404056], + [22, 9, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 4116824817], + [29, 3, 2091, "Metrics/BlockLength: Block has too many lines. [39/25]", 1684933040], + [30, 5, 1653, "Metrics/BlockLength: Block has too many lines. [27/25]", 2456404305] + ], + "spec/ast/merge/structural_edit/splice_plan_spec.rb:3331205681": [ + [3, 1, 3159, "Metrics/BlockLength: Block has too many lines. [83/25]", 2234926397], + [16, 3, 1837, "Metrics/BlockLength: Block has too many lines. [46/25]", 2935991482], + [42, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860750] + ], + "spec/ast/merge/text/conflict_resolver_spec.rb:3810004132": [ + [5, 1, 9102, "Metrics/BlockLength: Block has too many lines. [218/25]", 672115618], + [33, 3, 8206, "Metrics/BlockLength: Block has too many lines. [194/25]", 259803246], + [78, 5, 1920, "Metrics/BlockLength: Block has too many lines. [45/25]", 3965182334], + [139, 5, 1918, "Metrics/BlockLength: Block has too many lines. [44/25]", 3707046125] + ], + "spec/ast/merge/text/file_analysis_spec.rb:3430380445": [ + [5, 1, 8842, "Metrics/BlockLength: Block has too many lines. [205/25]", 4255187284], + [6, 3, 1323, "Metrics/BlockLength: Block has too many lines. [29/25]", 2518912953], + [47, 3, 1830, "Metrics/BlockLength: Block has too many lines. [43/25]", 3685770590], + [135, 3, 1620, "Metrics/BlockLength: Block has too many lines. [35/25]", 3089951119] + ], + "spec/ast/merge/text/line_node_spec.rb:1757790485": [ + [5, 1, 4739, "Metrics/BlockLength: Block has too many lines. [131/25]", 1487875238] + ], + "spec/ast/merge/text/merge_result_spec.rb:589380024": [ + [5, 1, 1541, "Metrics/BlockLength: Block has too many lines. [40/25]", 2828087992] + ], + "spec/ast/merge/text/section_splitter_spec.rb:804308722": [ + [4, 1, 5705, "Metrics/BlockLength: Block has too many lines. [209/25]", 4175363685], + [5, 3, 794, "Metrics/BlockLength: Block has too many lines. [28/25]", 2386862842], + [42, 3, 1126, "Metrics/BlockLength: Block has too many lines. [45/25]", 1507887296], + [95, 3, 746, "Metrics/BlockLength: Block has too many lines. [30/25]", 1759029412], + [131, 3, 1169, "Metrics/BlockLength: Block has too many lines. [45/25]", 1412318991], + [184, 3, 754, "Metrics/BlockLength: Block has too many lines. [30/25]", 2717556691], + [246, 1, 16648, "Metrics/BlockLength: Block has too many lines. [428/25]", 3166834694], + [370, 3, 1640, "Metrics/BlockLength: Block has too many lines. [46/25]", 2049342960], + [424, 3, 3237, "Metrics/BlockLength: Block has too many lines. [102/25]", 2357275144], + [540, 3, 3505, "Metrics/BlockLength: Block has too many lines. [67/25]", 2112469350], + [619, 3, 3586, "Metrics/BlockLength: Block has too many lines. [90/25]", 3866409298], + [620, 5, 1650, "Metrics/BlockLength: Block has too many lines. [48/25]", 289235626], + [622, 9, 1474, "Metrics/AbcSize: Assignment Branch Condition size for `split` is too high. [<8, 21, 7> 23.54/17]", 557655357], + [622, 9, 1474, "Metrics/MethodLength: Method has too many lines. [41/10]", 557655357], + [622, 9, 1474, "Metrics/PerceivedComplexity: Perceived complexity for `split` is too high. [9/8]", 557655357], + [628, 11, 1237, "Metrics/BlockLength: Block has too many lines. [33/25]", 1134667672], + [717, 29, 44, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 2169354946], + [723, 29, 44, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 2169354946], + [751, 1, 3128, "Metrics/BlockLength: Block has too many lines. [85/25]", 2082776744], + [769, 3, 1744, "Metrics/BlockLength: Block has too many lines. [46/25]", 223880162], + [770, 5, 1258, "Metrics/BlockLength: Block has too many lines. [31/25]", 2245422869] + ], + "spec/ast/merge/text/smart_merger_spec.rb:4128732567": [ + [3, 1, 8057, "Metrics/BlockLength: Block has too many lines. [210/25]", 1690443322], + [4, 3, 1135, "Metrics/BlockLength: Block has too many lines. [28/25]", 3788979655], + [58, 3, 4438, "Metrics/BlockLength: Block has too many lines. [106/25]", 2613192474], + [187, 3, 1053, "Metrics/BlockLength: Block has too many lines. [26/25]", 803567817], + [220, 3, 892, "Metrics/BlockLength: Block has too many lines. [28/25]", 2001100899] + ], + "spec/ast/merge/text/word_node_spec.rb:1457011521": [ + [5, 1, 3264, "Metrics/BlockLength: Block has too many lines. [74/25]", 677733430] + ], + "spec/ast/merge/token_match_refiner_spec.rb:3180314913": [ + [3, 1, 4000, "Metrics/BlockLength: Block has too many lines. [80/25]", 1630791278], + [8, 3, 2912, "Metrics/BlockLength: Block has too many lines. [60/25]", 529772148] + ], + "spec/ast/merge/trailing_groups/alignment_sort_spec.rb:1594915480": [ + [5, 1, 4710, "Metrics/BlockLength: Block has too many lines. [114/25]", 2499296583], + [14, 3, 2140, "Metrics/BlockLength: Block has too many lines. [47/25]", 3871799493], + [95, 3, 1482, "Metrics/BlockLength: Block has too many lines. [35/25]", 1088314263] + ], + "spec/ast/merge/trailing_groups/core_spec.rb:2651131504": [ + [5, 1, 9601, "Metrics/BlockLength: Block has too many lines. [242/25]", 598045669], + [22, 3, 3728, "Metrics/BlockLength: Block has too many lines. [87/25]", 1304580063], + [119, 3, 3931, "Metrics/BlockLength: Block has too many lines. [99/25]", 2464218479], + [186, 5, 1322, "Metrics/BlockLength: Block has too many lines. [30/25]", 427915501], + [187, 7, 1267, "Metrics/BlockLength: Block has too many lines. [28/25]", 861882691], + [245, 3, 1306, "Metrics/BlockLength: Block has too many lines. [34/25]", 86572459] + ], + "spec/ast/merge/trailing_groups/dest_iterate_spec.rb:3632880085": [ + [5, 1, 5523, "Metrics/BlockLength: Block has too many lines. [131/25]", 3077369183], + [19, 3, 3990, "Metrics/BlockLength: Block has too many lines. [91/25]", 593259616], + [39, 35, 12, "Style/SymbolProc: Pass `&:sig` as an argument to `lambda` instead of a block.", 3587754320], + [54, 33, 23, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 384283629], + [89, 35, 13, "Style/SymbolProc: Pass `&:name` as an argument to `lambda` instead of a block.", 3561384234], + [98, 35, 12, "Style/SymbolProc: Pass `&:sig` as an argument to `lambda` instead of a block.", 3587754320], + [113, 35, 12, "Style/SymbolProc: Pass `&:sig` as an argument to `lambda` instead of a block.", 3587754320] + ], + "spec/ast/merge/unresolved_policy_spec.rb:2561713656": [ + [3, 1, 1333, "Metrics/BlockLength: Block has too many lines. [33/25]", 4109547889] + ], + "spec/ast/merge/unresolved_review_state_spec.rb:3186871217": [ + [3, 1, 1038, "Metrics/BlockLength: Block has too many lines. [31/25]", 1325553035] + ], + "spec/ast/merge_rspec_conformance_fixtures_spec.rb:251774004": [ + [5, 1, 2119, "Metrics/BlockLength: Block has too many lines. [55/25]", 1724925683], + [6, 3, 1203, "Metrics/BlockLength: Block has too many lines. [29/25]", 3306863581] + ], + "spec/ast/merge_spec.rb:664670069": [ + [3, 1, 3113, "Metrics/BlockLength: Block has too many lines. [74/25]", 4034649501], + [9, 3, 2227, "Metrics/BlockLength: Block has too many lines. [51/25]", 578300230], + [10, 5, 2182, "Metrics/BlockLength: Block has too many lines. [49/25]", 2758871265] + ], + "spec/base_substrate_spec.rb:2864492094": [ + [5, 1, 5800, "Metrics/BlockLength: Block has too many lines. [143/25]", 784801982], + [6, 3, 192, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 680981873], + [13, 3, 378, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1223797442], + [31, 3, 628, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 2123191050], + [53, 3, 429, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3536712197], + [69, 3, 24, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 2280792512], + [70, 3, 78, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 604224776], + [72, 3, 146, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3315091322] + ], + "spec/fixtures_integration_spec.rb:1145500459": [ + [595, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859109], + [758, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 576909008], + [881, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087900170], + [1806, 3, 816, "Metrics/MethodLength: Method has too many lines. [13/10]", 170960660], + [1806, 39, 213, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 635200700], + [1807, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3976306097], + [1831, 38, 80, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3297939075], + [1916, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1745553512], + [1917, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 118067488], + [1918, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 196190368], + [1919, 121, 41, "Layout/LineLength: Line is too long. [161/120]", 3371256193], + [2090, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3241114703], + [2428, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], + [2567, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], + [2991, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3697593604], + [2992, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], + [3113, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179435314], + [3122, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1182194285], + [3124, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 3886107031], + [3151, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1751849111], + [3152, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1519587684], + [3153, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 4086262880], + [3170, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3568081822], + [3171, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1776876782], + [3173, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [3174, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1751849111], + [3176, 121, 73, "Layout/LineLength: Line is too long. [193/120]", 3322243646], + [3178, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1715153206], + [3179, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [3180, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 504997180], + [3181, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 1146860021], + [3182, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 2312101607], + [3183, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1423779161], + [3184, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1900897138], + [3185, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 1689840383], + [3186, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 1589056236], + [3188, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 763176550], + [3194, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3957871310], + [3196, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 763176550], + [3198, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 919916608], + [3199, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 919916608], + [3200, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3957871310], + [3201, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 4073040612], + [3202, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 763176550], + [3203, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 667593075], + [3205, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1310972770], + [3206, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 311387795], + [3207, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 724840266], + [3208, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 2555878310], + [3209, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1781078972], + [3210, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [3213, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [3214, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1658060570], + [3215, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 3085728851], + [3216, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3129400559], + [3217, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3197516464], + [3218, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087771520], + [3219, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3837194228], + [3220, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1312323543], + [3221, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 2356847623], + [3222, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [3223, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3428073441], + [3224, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 2891080552], + [3225, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3080737172], + [3226, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 170445026], + [3227, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3240051869], + [3228, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 4266052680], + [3229, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3376297786], + [3230, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 398435913], + [3231, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 4134940256], + [3232, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 30370035], + [3233, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 2862546359], + [3234, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1901388514], + [3235, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 838864274], + [3236, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 3437460384], + [3237, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1567003152], + [3238, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2609066305], + [3239, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 4043187090], + [3240, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3866430009], + [3241, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 2182699083], + [3242, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 3958792129], + [3243, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3449926560], + [3244, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 399774089], + [3245, 121, 68, "Layout/LineLength: Line is too long. [188/120]", 2119246799], + [3247, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3592658842], + [3248, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2905723409], + [3249, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 3930305198], + [3250, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 4186230052], + [3251, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [3252, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2700200720], + [3253, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 1630526402], + [3254, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3669244926], + [3255, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2814234644], + [3256, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3109415933], + [3257, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3643275044], + [3258, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 3825290660], + [3259, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1751849111], + [3260, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 4112285398], + [3261, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 1684279672], + [3262, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 1616506266], + [3264, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [3265, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1330093223], + [3266, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 4084555566], + [3267, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 2466867154], + [3268, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 4088314613], + [3269, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 2416893689], + [3270, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 683312682], + [3271, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 2516517934], + [3272, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2414563355], + [3273, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 2232595211], + [3274, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 2940789369], + [3275, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 941259913], + [3276, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2133508098], + [3277, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1621975014], + [3278, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 35985461], + [3279, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 746016305], + [3280, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 435488100], + [3281, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 2581129172], + [3282, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 3495900774], + [3283, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1413120342], + [3284, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [3285, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2333800791], + [3286, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 2576906206], + [3287, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 2986659874], + [3288, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2811932564], + [3289, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 1970813291], + [3290, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 2904941246], + [3291, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3745922508], + [3292, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 735247237], + [3293, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3731320885], + [3294, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 3896022034], + [3295, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 2827048584], + [3296, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 2548596663], + [3297, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 3812352018], + [3298, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 1280243910], + [3299, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 1742643292], + [3300, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 3056442430], + [3301, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 3144363287], + [3302, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 477297993], + [3303, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 3657857971], + [3304, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3913984414], + [3305, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 336201058], + [3306, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 485418789], + [3307, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 453253839], + [3308, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3673833034], + [3309, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 1552836890], + [3310, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 2714635965], + [3311, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 9336999], + [3312, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 584857208], + [3313, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1394865213], + [3314, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 3973222761], + [3315, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 2020040051], + [3316, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 3060994335], + [3317, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 196286917], + [3318, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 4168514178], + [3319, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 810581246], + [3320, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 1473417372], + [3321, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 3008376885], + [3322, 121, 84, "Layout/LineLength: Line is too long. [204/120]", 454816400], + [3323, 121, 88, "Layout/LineLength: Line is too long. [208/120]", 1416223705], + [3324, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 2896813919], + [3325, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 957293983], + [3326, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 2118117430], + [3327, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 1367404612], + [3328, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 2459902188], + [3329, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 461483815], + [3330, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 2791596520], + [3331, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 203085787], + [3332, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 2942095139], + [3333, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 131861965], + [3334, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 3340827551], + [3335, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 102582610], + [3336, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 762789354], + [3337, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 3478337442], + [3338, 121, 112, "Layout/LineLength: Line is too long. [232/120]", 4010607435], + [3339, 121, 132, "Layout/LineLength: Line is too long. [252/120]", 3754747587], + [3340, 121, 136, "Layout/LineLength: Line is too long. [256/120]", 379336923], + [3341, 121, 108, "Layout/LineLength: Line is too long. [228/120]", 3366353902], + [3342, 121, 128, "Layout/LineLength: Line is too long. [248/120]", 1686898289], + [3343, 121, 132, "Layout/LineLength: Line is too long. [252/120]", 2005192241], + [3344, 121, 104, "Layout/LineLength: Line is too long. [224/120]", 1868634464], + [3345, 121, 124, "Layout/LineLength: Line is too long. [244/120]", 3939743614], + [3346, 121, 128, "Layout/LineLength: Line is too long. [248/120]", 2978506702], + [3347, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 3909866928], + [3348, 121, 118, "Layout/LineLength: Line is too long. [238/120]", 2853032177], + [3349, 121, 122, "Layout/LineLength: Line is too long. [242/120]", 2968366309], + [3350, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 1753663643], + [3351, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 3387619436], + [3352, 121, 106, "Layout/LineLength: Line is too long. [226/120]", 197895496], + [3353, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 576181861], + [3354, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 2809313444], + [3355, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 3963067112], + [3356, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 1121380327], + [3357, 121, 100, "Layout/LineLength: Line is too long. [220/120]", 31591211], + [3358, 121, 104, "Layout/LineLength: Line is too long. [224/120]", 1946129497], + [3359, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 767185096], + [3360, 121, 100, "Layout/LineLength: Line is too long. [220/120]", 1092646020], + [3361, 121, 104, "Layout/LineLength: Line is too long. [224/120]", 1328841270], + [3362, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 2663749624], + [3363, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 430318647], + [3364, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 1650234037], + [3365, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 1082269805], + [3366, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 316397809], + [3367, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 3145391348], + [3368, 121, 112, "Layout/LineLength: Line is too long. [232/120]", 2808088654], + [3369, 121, 116, "Layout/LineLength: Line is too long. [236/120]", 1035513748], + [3370, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 2552800539], + [3371, 121, 112, "Layout/LineLength: Line is too long. [232/120]", 1727699169], + [3372, 121, 116, "Layout/LineLength: Line is too long. [236/120]", 1171566267], + [3373, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 2994775049], + [3374, 121, 110, "Layout/LineLength: Line is too long. [230/120]", 3860489151], + [3375, 121, 114, "Layout/LineLength: Line is too long. [234/120]", 959496607], + [3376, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 1694222439], + [3377, 121, 114, "Layout/LineLength: Line is too long. [234/120]", 1501186331], + [3378, 121, 118, "Layout/LineLength: Line is too long. [238/120]", 4059659418], + [3379, 121, 110, "Layout/LineLength: Line is too long. [230/120]", 1899868779], + [3380, 121, 130, "Layout/LineLength: Line is too long. [250/120]", 323324279], + [3381, 121, 134, "Layout/LineLength: Line is too long. [254/120]", 3956414359], + [3382, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 3506644741], + [3383, 121, 116, "Layout/LineLength: Line is too long. [236/120]", 936139074], + [3384, 121, 136, "Layout/LineLength: Line is too long. [256/120]", 4153213512], + [3385, 121, 140, "Layout/LineLength: Line is too long. [260/120]", 1491976338], + [3386, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 4061753206], + [3387, 121, 106, "Layout/LineLength: Line is too long. [226/120]", 2410434304], + [3388, 121, 124, "Layout/LineLength: Line is too long. [244/120]", 3518300264], + [3389, 121, 144, "Layout/LineLength: Line is too long. [264/120]", 1040696046], + [3390, 121, 148, "Layout/LineLength: Line is too long. [268/120]", 139604188], + [3391, 121, 120, "Layout/LineLength: Line is too long. [240/120]", 231937793], + [3392, 121, 140, "Layout/LineLength: Line is too long. [260/120]", 1835509805], + [3393, 121, 144, "Layout/LineLength: Line is too long. [264/120]", 1629218396], + [3394, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 2312875700], + [3395, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 2933374083], + [3396, 121, 106, "Layout/LineLength: Line is too long. [226/120]", 1719349671], + [3397, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 2555579810], + [3398, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 2023551624], + [3399, 121, 114, "Layout/LineLength: Line is too long. [234/120]", 955231924], + [3400, 121, 118, "Layout/LineLength: Line is too long. [238/120]", 4232993781], + [3401, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 3472954835], + [3402, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 3211922285], + [3403, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 2874956332], + [3404, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 1360335840], + [3405, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2135379556], + [3406, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3242768475], + [3407, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 2789115918], + [3408, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3346448124], + [3409, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1538469817], + [3410, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1543041113], + [3411, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 3344741438], + [3412, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2188404009], + [3413, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1330398779], + [3414, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 332468826], + [3415, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 1905397598], + [3416, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 438831062], + [3417, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 3377667334], + [3418, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3232541734], + [3420, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2130930429], + [3421, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 3684939371], + [3423, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2361951097], + [3424, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 1211447462], + [3425, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3309872691], + [3426, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 360053761], + [3427, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 1310136493], + [3428, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1950686342], + [3429, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 1397845826], + [3430, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 4191304724], + [3431, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2354128498], + [3432, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 1865717453], + [3433, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 24220542], + [3434, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 2618612673], + [3437, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3422918867], + [3438, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3689431739], + [3482, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 4093564799], + [3488, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1662653970], + [3489, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3967501655], + [3490, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2178516622], + [3491, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 1345346561], + [3505, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193466072], + [3625, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 3612393276], + [3626, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 797303985], + [3629, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1606320605], + [3649, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1776876782], + [3653, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 828742791], + [3673, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3294617581], + [3683, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3519842846], + [3693, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1966440909], + [3694, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053864], + [3700, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1606320605], + [3723, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 1340744311], + [3742, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1741893077], + [3743, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053865], + [3747, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193405204], + [3761, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1401226501], + [3764, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085352569], + [3767, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 696523922], + [3782, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], + [3792, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2746826653], + [4208, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1138870161], + [4770, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], + [4781, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 2132299307], + [4828, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087775098], + [4839, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 757851079], + [4875, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], + [4886, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 441649198], + [4909, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087903295], + [4921, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 170442008], + [4930, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], + [4932, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1888875443], + [4969, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 398433651], + [4980, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3921367744], + [5003, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2422819473], + [5009, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 194583095], + [5015, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1901385496], + [5024, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 490810486], + [5026, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 586287746], + [5030, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1310969752], + [5050, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087389205], + [5062, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2609063547], + [5071, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], + [5073, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1370761696], + [5096, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 2208661169], + [5102, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1862604658], + [5108, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 3958789371], + [5117, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3449594464], + [5119, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 692050524], + [5123, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 802172558], + [5193, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2406691660], + [5228, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], + [5239, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1811982742], + [5266, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2562189319], + [5272, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193430346], + [5278, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2814237166], + [5287, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2189106693], + [5289, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 3874870868], + [5293, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179474914], + [5326, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1751845165], + [5337, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2617230371], + [5341, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], + [5382, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], + [5393, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3793790598], + [5428, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 4088312783], + [5439, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3220724736], + [5443, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087899888], + [5462, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2552888401], + [5468, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 194583095], + [5474, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2414559905], + [5483, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 626762179], + [5485, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3969284923], + [5489, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 1893261414], + [5521, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2133507320], + [5532, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 2101353476], + [5536, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087685705], + [5555, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2431380437], + [5561, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 194583095], + [5567, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 435489438], + [5576, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 1520878209], + [5578, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 2238995076], + [5582, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 2789405913], + [5615, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], + [5626, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3409328196], + [5649, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087858069], + [5661, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2811935086], + [5670, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], + [5672, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1113346693], + [5676, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3227128786], + [5696, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 48793812], + [5702, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 338440584], + [5708, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 735248703], + [5717, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 927473097], + [5719, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 1394536741], + [5723, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3134012967], + [5742, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 2967615316], + [5748, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 2810710931], + [5754, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 2548594701], + [5757, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860796], + [5759, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], + [5763, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3549194295], + [5765, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 1074004741], + [5769, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 2874423564], + [5772, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087576526], + [5774, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], + [5789, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 1696848307], + [5795, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 2883501659], + [5801, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 3056443076], + [5806, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193405204], + [5810, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 1487412605], + [5812, 121, 51, "Layout/LineLength: Line is too long. [171/120]", 2021571284], + [5816, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1975782995], + [5819, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860796], + [5821, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193405204], + [5826, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 183236849], + [5835, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 856018753], + [5838, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], + [5841, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 2146546324], + [5847, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3913983076], + [5850, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 3491931666], + [5852, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3536323546], + [5856, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 356581191], + [5858, 121, 63, "Layout/LineLength: Line is too long. [183/120]", 4144657639], + [5862, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 1478616653], + [5865, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1774852021], + [5867, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3536323546], + [5882, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3884289787], + [5888, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 1001503687], + [5894, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3673836976], + [5903, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 3164908550], + [5905, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 1134300778], + [5909, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1797165224], + [5928, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 2508143995], + [5934, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 3002532188], + [5940, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 584857986], + [5943, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860796], + [5945, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], + [5949, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 749691384], + [5951, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 3389354954], + [5955, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 3402045699], + [5958, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087576526], + [5960, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], + [5974, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 2447716612], + [5980, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3201685099], + [5986, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 3060990885], + [5995, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 29396315], + [5997, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 1228645365], + [6001, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1436742837], + [6020, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 716917214], + [6026, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 2175814211], + [6032, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 1473420390], + [6035, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193433391], + [6037, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1422839111], + [6041, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 1571170198], + [6043, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 2175059093], + [6047, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3886666417], + [6050, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 176753677], + [6052, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1422839111], + [6068, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 3471319495], + [6074, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 1274038477], + [6080, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 2896814693], + [6083, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087576526], + [6085, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114086530], + [6089, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 250433828], + [6091, 121, 59, "Layout/LineLength: Line is too long. [179/120]", 3910556848], + [6095, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4002014976], + [6098, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 3491931666], + [6100, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114086530], + [6194, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861664], + [6208, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087932582], + [6222, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861664], + [6238, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 876012844], + [6240, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1756764194], + [6241, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 4173216735], + [6244, 121, 75, "Layout/LineLength: Line is too long. [195/120]", 911964425], + [6245, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 173266907], + [6246, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1412705933], + [6249, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1756764194], + [6250, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 2605683750], + [6253, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 3182252139], + [6255, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1652557742], + [6259, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 2240437058], + [6260, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 173266907], + [6261, 121, 101, "Layout/LineLength: Line is too long. [221/120]", 3694598076], + [6263, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861152], + [6264, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179079542], + [6265, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 3528944411], + [6268, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3020159378], + [6270, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1652557742], + [6276, 121, 84, "Layout/LineLength: Line is too long. [204/120]", 420843234], + [6278, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1401226501], + [6279, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 442915368], + [6282, 121, 79, "Layout/LineLength: Line is too long. [199/120]", 4212444955], + [6283, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053864], + [6284, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1373660924], + [6287, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1401226501], + [6288, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 1539225758], + [6291, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3020159378], + [6293, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 4240691845], + [6297, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 674553335], + [6298, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053864], + [6299, 121, 105, "Layout/LineLength: Line is too long. [225/120]", 4163432287], + [6301, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2089555761], + [6302, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2034687276], + [6303, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 3710905302], + [6306, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 4204667212], + [6308, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 4240691845], + [6314, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 2071493433], + [6316, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085352569], + [6317, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 2853066942], + [6320, 121, 71, "Layout/LineLength: Line is too long. [191/120]", 2771467828], + [6321, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193425976], + [6322, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3025157142], + [6325, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085352569], + [6326, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 3340824101], + [6329, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 3999804761], + [6331, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1999310973], + [6335, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 835016333], + [6336, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193425976], + [6337, 121, 97, "Layout/LineLength: Line is too long. [217/120]", 3575893945], + [6340, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193405945], + [6341, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 1755858308], + [6344, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 3182252139], + [6346, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1999310973], + [6352, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 3033080032], + [6354, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177549], + [6355, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 2720985203], + [6358, 121, 65, "Layout/LineLength: Line is too long. [185/120]", 3233424320], + [6360, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873483], + [6363, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177549], + [6364, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 131859703], + [6367, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1943494546], + [6369, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 4016166830], + [6373, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 1350760977], + [6375, 121, 91, "Layout/LineLength: Line is too long. [211/120]", 4098706554], + [6379, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 4059724765], + [6382, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1651955548], + [6384, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 4016166830], + [6390, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 1057495720], + [6393, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1621971220], + [6396, 121, 49, "Layout/LineLength: Line is too long. [169/120]", 1585717593], + [6402, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 2942094233], + [6405, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2624667704], + [6407, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2317051977], + [6411, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 1321610634], + [6413, 121, 75, "Layout/LineLength: Line is too long. [195/120]", 2854688831], + [6417, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 4185465554], + [6420, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1169781875], + [6422, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2317051977], + [6428, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 1916545020], + [6431, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1422839111], + [6434, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 910134593], + [6440, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 203086561], + [6443, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2939363812], + [6445, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3155638331], + [6449, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 1955758062], + [6451, 121, 71, "Layout/LineLength: Line is too long. [191/120]", 3737424359], + [6455, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 3597620692], + [6458, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2624667704], + [6460, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3155638331], + [6466, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 1036052399], + [6469, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114086530], + [6472, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 1268266488], + [6478, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 2791598354], + [6481, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1302589368], + [6483, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3533902728], + [6487, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 3942276897], + [6489, 121, 73, "Layout/LineLength: Line is too long. [193/120]", 1175941460], + [6493, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 679697318], + [6496, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 28126263], + [6498, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3533902728], + [6499, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 181895237], + [6504, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 4057848448], + [6507, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114086530], + [6510, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 4067769399], + [6516, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 461482909], + [6519, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1302589368], + [6521, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3533902728], + [6525, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 3561204590], + [6527, 121, 73, "Layout/LineLength: Line is too long. [193/120]", 880160795], + [6531, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 1614719145], + [6534, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 28126263], + [6536, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3533902728], + [6537, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 181895237], + [6584, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193432306], + [6598, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 1645945966], + [6601, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3212740609], + [6604, 121, 59, "Layout/LineLength: Line is too long. [179/120]", 3982698123], + [6606, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193425997], + [6610, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 2663750402], + [6613, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2420297272], + [6615, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1164389943], + [6619, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 3483121581], + [6621, 121, 85, "Layout/LineLength: Line is too long. [205/120]", 2271668600], + [6625, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 804794365], + [6628, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3659367004], + [6630, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1164389943], + [6631, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 561395486], + [6636, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 1251661057], + [6639, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3212740609], + [6642, 121, 59, "Layout/LineLength: Line is too long. [179/120]", 3210109508], + [6644, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193425997], + [6648, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 430316685], + [6651, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2420297272], + [6653, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1164389943], + [6657, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 2428160226], + [6659, 121, 85, "Layout/LineLength: Line is too long. [205/120]", 2663295671], + [6663, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 2822109938], + [6666, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3659367004], + [6668, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1164389943], + [6669, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 561395486], + [6674, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 857639785], + [6677, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3669622788], + [6680, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 140453799], + [6682, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860765], + [6686, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 1650236431], + [6689, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 150699323], + [6691, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 50618962], + [6695, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 4205571164], + [6697, 121, 83, "Layout/LineLength: Line is too long. [203/120]", 1549528021], + [6701, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 1325488145], + [6704, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1510711065], + [6706, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 50618962], + [6712, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 3043205563], + [6715, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2381137493], + [6718, 121, 61, "Layout/LineLength: Line is too long. [181/120]", 2200345195], + [6720, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087926498], + [6724, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 1082269527], + [6727, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1510711065], + [6729, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1104064739], + [6733, 121, 68, "Layout/LineLength: Line is too long. [188/120]", 1652941658], + [6735, 121, 87, "Layout/LineLength: Line is too long. [207/120]", 1440323819], + [6739, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 802896260], + [6742, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1943494546], + [6744, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1104064739], + [6750, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 788730815], + [6752, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2034687276], + [6753, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 4226330106], + [6756, 121, 77, "Layout/LineLength: Line is too long. [197/120]", 2414796320], + [6757, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873470], + [6758, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3090817832], + [6761, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2034687276], + [6762, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 2839148677], + [6765, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 2393983240], + [6767, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 2581936864], + [6771, 121, 84, "Layout/LineLength: Line is too long. [204/120]", 3923254945], + [6772, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873470], + [6773, 121, 103, "Layout/LineLength: Line is too long. [223/120]", 580639726], + [6775, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193419246], + [6776, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1756764194], + [6777, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 3202758044], + [6780, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 912651721], + [6782, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 2581936864], + [6786, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1164293389], + [6799, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860840], + [6800, 121, 88, "Layout/LineLength: Line is too long. [208/120]", 574552570], + [6802, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3845073641], + [6803, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 543375177], + [6806, 121, 83, "Layout/LineLength: Line is too long. [203/120]", 222410330], + [6807, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3025157219], + [6808, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1904561434], + [6811, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 489872984], + [6812, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 97325617], + [6815, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 4204667212], + [6817, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 4062673070], + [6821, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 1451915960], + [6822, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3025157219], + [6823, 121, 109, "Layout/LineLength: Line is too long. [229/120]", 4200529758], + [6825, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1497831350], + [6826, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 4214367244], + [6827, 121, 84, "Layout/LineLength: Line is too long. [204/120]", 399603517], + [6830, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3423548875], + [6832, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 4062673070], + [6836, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3279830097], + [6848, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 659167322], + [6860, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087926423], + [6861, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 3300294193], + [6863, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3172850966], + [6864, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 2396187736], + [6867, 121, 87, "Layout/LineLength: Line is too long. [207/120]", 1991888901], + [6868, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1954380402], + [6869, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2589970962], + [6872, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 42340644], + [6873, 121, 67, "Layout/LineLength: Line is too long. [187/120]", 479235996], + [6876, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3423548875], + [6878, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1462541970], + [6882, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 1373978781], + [6883, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1954380402], + [6884, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 280641011], + [6886, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1664110553], + [6887, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1009650381], + [6888, 121, 88, "Layout/LineLength: Line is too long. [208/120]", 909329343], + [6891, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 2977589831], + [6893, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1462541970], + [6898, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873470], + [6899, 121, 61, "Layout/LineLength: Line is too long. [181/120]", 1904101094], + [6901, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2229256255], + [6902, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 1839090017], + [6905, 121, 91, "Layout/LineLength: Line is too long. [211/120]", 4260980907], + [6906, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 4253118453], + [6907, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1536690221], + [6909, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861152], + [6910, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 209824656], + [6911, 121, 71, "Layout/LineLength: Line is too long. [191/120]", 1530496074], + [6914, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 2977589831], + [6916, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3261436902], + [6920, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 3762694917], + [6921, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 4253118453], + [6922, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 3196230010], + [6924, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3165598659], + [6925, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 4264469493], + [6926, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 3140690958], + [6929, 121, 35, "Layout/LineLength: Line is too long. [155/120]", 2999583208], + [6931, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3261436902], + [6937, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 326070599], + [6940, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1621971220], + [6943, 121, 49, "Layout/LineLength: Line is too long. [169/120]", 1689000214], + [6949, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 2459904022], + [6952, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2624667704], + [6954, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2317051977], + [6958, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 2842872837], + [6960, 121, 75, "Layout/LineLength: Line is too long. [195/120]", 423884656], + [6964, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 2673769885], + [6967, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1169781875], + [6969, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2317051977], + [6970, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2126253911], + [6986, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 2388292564], + [6989, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2381137493], + [6992, 121, 61, "Layout/LineLength: Line is too long. [181/120]", 1136762660], + [6994, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087926498], + [6998, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 2555581016], + [7001, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1510711065], + [7003, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1104064739], + [7007, 121, 68, "Layout/LineLength: Line is too long. [188/120]", 1986812885], + [7009, 121, 87, "Layout/LineLength: Line is too long. [207/120]", 1864036132], + [7013, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 3590180043], + [7016, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1943494546], + [7018, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1104064739], + [7019, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2382712010], + [7029, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1791534645], + [7034, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 2403815412], + [7037, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1422839111], + [7040, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 4046048864], + [7046, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 3472955113], + [7049, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2939363812], + [7051, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3155638331], + [7055, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3911469720], + [7057, 121, 71, "Layout/LineLength: Line is too long. [191/120]", 272433263], + [7061, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 634420444], + [7064, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2624667704], + [7066, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3155638331], + [7067, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2088324682], + [7080, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087906711], + [7092, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2135380894], + [7101, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], + [7103, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 4280757685], + [7107, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 161599970], + [7141, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053789], + [7176, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2188407955], + [7187, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3692322233], + [7191, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087557694], + [7214, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3197512522], + [7223, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858840], + [7225, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 85298067], + [7282, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193418403], + [7288, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193418403], + [7311, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087432474], + [7323, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2361949763], + [7332, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], + [7334, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 581045160], + [7338, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 4235011647], + [7357, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1898147766], + [7363, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177560], + [7369, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 1310140439], + [7378, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 681770239], + [7380, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3821940657], + [7384, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], + [7404, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861292], + [7416, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2354124424], + [7425, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087922021], + [7427, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 3921370162], + [8020, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 4083054536], + [8048, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 4083054536], + [8077, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 4083054536], + [8135, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 632953222], + [8164, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 732995265], + [8214, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 1886249927], + [8376, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 578751979], + [8377, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3803540269], + [8386, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2238403955], + [8387, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1028441932], + [8388, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 1975950909], + [8443, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1244043798] + ], + "spec/integration/freeze_node_edge_cases_spec.rb:3416491031": [ + [6, 1, 28959, "Metrics/BlockLength: Block has too many lines. [663/25]", 3473768018], + [7, 3, 2985, "Metrics/BlockLength: Block has too many lines. [57/25]", 436154415], + [8, 5, 2934, "Metrics/BlockLength: Block has too many lines. [55/25]", 1963918102], + [78, 3, 6091, "Metrics/BlockLength: Block has too many lines. [136/25]", 232153494], + [98, 5, 3053, "Metrics/BlockLength: Block has too many lines. [69/25]", 1442974101], + [202, 5, 1691, "Metrics/BlockLength: Block has too many lines. [29/25]", 985654389], + [241, 3, 8515, "Metrics/BlockLength: Block has too many lines. [176/25]", 2776676526], + [473, 3, 2024, "Metrics/BlockLength: Block has too many lines. [55/25]", 1048101963], + [474, 5, 890, "Metrics/BlockLength: Block has too many lines. [26/25]", 753961540], + [543, 3, 4511, "Metrics/BlockLength: Block has too many lines. [116/25]", 1227615145], + [693, 3, 1660, "Metrics/BlockLength: Block has too many lines. [43/25]", 1881888061], + [694, 5, 1107, "Metrics/BlockLength: Block has too many lines. [26/25]", 368095693] + ], + "spec/integration/gem_family_section_merge_spec.rb:1744383089": [ + [164, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 93655697] + ], + "spec/integration/integration_spec.rb:2239247043": [ + [14, 1, 4488, "Metrics/BlockLength: Block has too many lines. [88/25]", 206207480], + [15, 3, 3267, "Metrics/BlockLength: Block has too many lines. [62/25]", 1323899085], + [40, 5, 2263, "Metrics/BlockLength: Block has too many lines. [48/25]", 3172595581] + ], + "spec/integration/link_reference_preservation_spec.rb:3764298162": [ + [6, 1, 2646, "Metrics/BlockLength: Block has too many lines. [48/25]", 3396410609], + [19, 3, 2058, "Metrics/BlockLength: Block has too many lines. [33/25]", 163363949] + ], + "spec/integration/markly_merge_spec.rb:3076950975": [ + [3, 1, 22886, "Metrics/BlockLength: Block has too many lines. [670/25]", 1408138744], + [62, 3, 7192, "Metrics/BlockLength: Block has too many lines. [189/25]", 1890889324], + [63, 5, 1678, "Metrics/BlockLength: Block has too many lines. [41/25]", 2587582896], + [115, 5, 1808, "Metrics/BlockLength: Block has too many lines. [48/25]", 3381172795], + [147, 46, 21, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 451071547], + [171, 5, 1134, "Metrics/BlockLength: Block has too many lines. [30/25]", 2526618199], + [220, 5, 1335, "Metrics/BlockLength: Block has too many lines. [32/25]", 2790596215], + [311, 3, 2008, "Metrics/BlockLength: Block has too many lines. [66/25]", 2640155627], + [394, 3, 1052, "Metrics/BlockLength: Block has too many lines. [27/25]", 3988836255], + [440, 3, 2950, "Metrics/BlockLength: Block has too many lines. [89/25]", 961031348], + [441, 5, 1352, "Metrics/BlockLength: Block has too many lines. [37/25]", 1952365669], + [495, 5, 1550, "Metrics/BlockLength: Block has too many lines. [48/25]", 2400197001], + [561, 3, 1665, "Metrics/BlockLength: Block has too many lines. [52/25]", 3884776329], + [650, 3, 1919, "Metrics/BlockLength: Block has too many lines. [57/25]", 2594646583], + [725, 3, 1644, "Metrics/BlockLength: Block has too many lines. [45/25]", 2348710811], + [791, 3, 1600, "Metrics/BlockLength: Block has too many lines. [46/25]", 3683503747] + ], + "spec/integration/partial_template_merger_table_merge_spec.rb:3504046892": [ + [7, 1, 7402, "Metrics/BlockLength: Block has too many lines. [164/25]", 3368892126], + [9, 3, 2986, "Metrics/BlockLength: Block has too many lines. [67/25]", 2267114449], + [65, 5, 1359, "Metrics/BlockLength: Block has too many lines. [28/25]", 3145143002], + [102, 3, 997, "Metrics/BlockLength: Block has too many lines. [26/25]", 3156068215], + [147, 3, 3009, "Metrics/BlockLength: Block has too many lines. [65/25]", 994160212], + [202, 5, 1401, "Metrics/BlockLength: Block has too many lines. [28/25]", 3038951618] + ], + "spec/integration/table_formatting_preservation_spec.rb:3943985446": [ + [6, 1, 3086, "Metrics/BlockLength: Block has too many lines. [56/25]", 2210897849], + [19, 3, 2374, "Metrics/BlockLength: Block has too many lines. [40/25]", 668961519], + [33, 5, 1847, "Metrics/BlockLength: Block has too many lines. [28/25]", 3433318963] + ], + "spec/integration/text_merge_spec.rb:884566200": [ + [6, 1, 7747, "Metrics/BlockLength: Block has too many lines. [204/25]", 2372984305], + [60, 3, 1113, "Metrics/BlockLength: Block has too many lines. [34/25]", 3399970957], + [67, 5, 860, "Metrics/BlockLength: Block has too many lines. [27/25]", 2337191560], + [103, 3, 916, "Metrics/BlockLength: Block has too many lines. [28/25]", 4082963348], + [149, 3, 3001, "Metrics/BlockLength: Block has too many lines. [74/25]", 7776854] + ], + "spec/support/fictive_language_harness.rb:1770581700": [ + [85, 7, 733, "Metrics/AbcSize: Assignment Branch Condition size for `extract_comments` is too high. [<5, 16, 5> 17.49/17]", 1127096515], + [85, 7, 733, "Metrics/MethodLength: Method has too many lines. [22/10]", 1127096515], + [117, 21, 129, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 681912759], + [182, 7, 1084, "Metrics/AbcSize: Assignment Branch Condition size for `parse_statements` is too high. [<9, 28, 7> 30.23/17]", 3123785685], + [182, 7, 1084, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_statements` is too high. [8/7]", 3123785685], + [182, 7, 1084, "Metrics/MethodLength: Method has too many lines. [24/10]", 3123785685], + [233, 5, 9879, "Metrics/ClassLength: Class has too many lines. [228/100]", 3231256134], + [236, 21, 208, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2970487173], + [257, 7, 1981, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_batch` is too high. [<16, 32, 4> 36/17]", 4125392918], + [257, 7, 1981, "Metrics/MethodLength: Method has too many lines. [42/10]", 4125392918], + [342, 7, 778, "Metrics/MethodLength: Method has too many lines. [18/10]", 4189873983], + [364, 7, 844, "Metrics/MethodLength: Method has too many lines. [19/10]", 526186683], + [449, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087956942], + [464, 7, 1065, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_template_preamble_prefix_region` is too high. [<6, 24, 11> 27.07/17]", 2332280467], + [464, 7, 1065, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collapse_template_preamble_prefix_region` is too high. [10/7]", 2332280467], + [464, 7, 1065, "Metrics/MethodLength: Method has too many lines. [20/10]", 2332280467], + [464, 7, 1065, "Metrics/PerceivedComplexity: Perceived complexity for `collapse_template_preamble_prefix_region` is too high. [10/8]", 2332280467] + ], + "spec/support/testable_node.rb:1110514732": [ + [10, 7, 573, "Metrics/MethodLength: Method has too many lines. [12/10]", 798847435], + [10, 22, 226, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 2319398994], + [40, 7, 642, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<11, 14, 6> 18.79/17]", 2249578474], + [40, 21, 131, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 1786967686] + ] +} diff --git a/gems/ast-merge/Gemfile.lock b/gems/ast-merge/Gemfile.lock index 40333e45c..c806f79bf 100644 --- a/gems/ast-merge/Gemfile.lock +++ b/gems/ast-merge/Gemfile.lock @@ -18,233 +18,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -252,45 +26,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -310,12 +45,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -324,6 +53,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -379,6 +109,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -397,7 +136,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -537,23 +275,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -587,11 +327,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +373,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,61 +398,39 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +443,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +470,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +481,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,19 +508,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,19 +532,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +547,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/dotenv-merge/Gemfile.lock b/gems/dotenv-merge/Gemfile.lock index 15b0c9cc6..191c40b34 100644 --- a/gems/dotenv-merge/Gemfile.lock +++ b/gems/dotenv-merge/Gemfile.lock @@ -17,7 +17,39 @@ PATH version_gem (~> 1.1, >= 1.1.14) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -26,7 +58,193 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -34,6 +252,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -53,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,24 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.1, >= 3.1.4) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.3, >= 2.3.7) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -407,33 +685,55 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.1, >= 3.1.14) + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -454,19 +754,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -481,10 +789,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -492,6 +804,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -519,9 +832,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -530,6 +846,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -543,14 +860,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -558,6 +880,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/rbs-merge/Gemfile.lock b/gems/rbs-merge/Gemfile.lock index 36af7f55d..78f88aa8f 100644 --- a/gems/rbs-merge/Gemfile.lock +++ b/gems/rbs-merge/Gemfile.lock @@ -18,7 +18,39 @@ PATH version_gem (~> 1.1, >= 1.1.14) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -27,7 +59,192 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -35,6 +252,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -54,6 +294,11 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -117,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -145,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -282,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -334,6 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -380,21 +635,42 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.1, >= 3.1.4) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.3, >= 2.3.7) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) rbs-merge! @@ -406,33 +682,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.1, >= 3.1.14) + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,19 +750,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -478,10 +784,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -517,9 +827,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -528,6 +841,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -541,14 +855,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -556,6 +875,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/toml-merge/Gemfile.lock b/gems/toml-merge/Gemfile.lock index 1182f98db..87531476e 100644 --- a/gems/toml-merge/Gemfile.lock +++ b/gems/toml-merge/Gemfile.lock @@ -16,6 +16,265 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -103,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -131,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -322,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -373,22 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -397,32 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -430,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -442,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -469,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -480,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -507,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -518,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -531,15 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -547,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 167ea6b93aa94e5184e5994bc0b7757cdec6ef27 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:36:14 -0600 Subject: [PATCH 197/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-merge/Gemfile.lock | 335 +++++++++++++++++++- gems/go-merge/Gemfile.lock | 353 +++++++++++++++++++++- gems/ruby-merge/.kettle-drift.lock | 60 ++-- gems/ruby-merge/Gemfile | 70 ++++- gems/ruby-merge/Rakefile | 18 +- gems/ruby-merge/lib/ruby/merge/version.rb | 2 +- gems/toml-merge/.kettle-drift.lock | 60 ++-- gems/toml-merge/.rubocop_gradual.lock | 258 ---------------- gems/toml-merge/Gemfile | 70 ++++- gems/toml-merge/Gemfile.lock | 59 ++-- gems/toml-merge/Rakefile | 18 +- gems/toml-merge/bin/yard | 2 +- gems/toml-merge/lib/toml/merge/version.rb | 2 +- gems/yaml-merge/.kettle-drift.lock | 60 ++-- gems/yaml-merge/Gemfile | 40 +++ gems/yaml-merge/Gemfile.lock | 327 +------------------- 16 files changed, 1002 insertions(+), 732 deletions(-) delete mode 100644 gems/toml-merge/.rubocop_gradual.lock diff --git a/gems/ast-merge/Gemfile.lock b/gems/ast-merge/Gemfile.lock index c806f79bf..b418a067c 100644 --- a/gems/ast-merge/Gemfile.lock +++ b/gems/ast-merge/Gemfile.lock @@ -18,7 +18,233 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -26,6 +252,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -45,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -108,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -136,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -275,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -327,6 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -373,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -398,32 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -431,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -443,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -470,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -481,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -508,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -519,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -532,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -547,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/go-merge/Gemfile.lock b/gems/go-merge/Gemfile.lock index 088a2e56c..c35a1d0fa 100644 --- a/gems/go-merge/Gemfile.lock +++ b/gems/go-merge/Gemfile.lock @@ -16,6 +16,265 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -103,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -131,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -322,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -373,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -398,31 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -430,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -447,15 +758,22 @@ CHECKSUMS io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -470,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -481,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -508,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -519,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -532,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -547,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ruby-merge/.kettle-drift.lock b/gems/ruby-merge/.kettle-drift.lock index 0161251a7..d3c2a2030 100644 --- a/gems/ruby-merge/.kettle-drift.lock +++ b/gems/ruby-merge/.kettle-drift.lock @@ -6,7 +6,8 @@ 80, 120, 160, - 200 + 200, + 240 ] } ], @@ -17,7 +18,8 @@ 91, 131, 171, - 211 + 211, + 251 ] } ], @@ -28,7 +30,8 @@ 81, 121, 161, - 201 + 201, + 241 ] } ], @@ -39,7 +42,8 @@ 93, 133, 173, - 213 + 213, + 253 ] } ], @@ -50,7 +54,8 @@ 96, 136, 176, - 216 + 216, + 256 ] } ], @@ -61,7 +66,8 @@ 82, 122, 162, - 202 + 202, + 242 ] } ], @@ -73,7 +79,8 @@ 100, 140, 180, - 220 + 220, + 260 ] } ], @@ -84,7 +91,8 @@ 101, 141, 181, - 221 + 221, + 261 ] } ], @@ -96,7 +104,8 @@ 87, 127, 167, - 207 + 207, + 247 ] } ], @@ -107,7 +116,8 @@ 110, 150, 190, - 230 + 230, + 270 ] } ], @@ -119,7 +129,8 @@ 79, 119, 159, - 199 + 199, + 239 ] } ], @@ -131,7 +142,8 @@ 109, 149, 189, - 229 + 229, + 269 ] } ], @@ -142,7 +154,8 @@ 85, 125, 165, - 205 + 205, + 245 ] } ], @@ -154,7 +167,8 @@ 92, 132, 172, - 212 + 212, + 252 ] } ], @@ -166,7 +180,8 @@ 88, 128, 168, - 208 + 208, + 248 ] } ], @@ -177,7 +192,8 @@ 86, 126, 166, - 206 + 206, + 246 ] } ], @@ -188,7 +204,8 @@ 103, 143, 183, - 223 + 223, + 263 ] } ], @@ -199,7 +216,8 @@ 102, 142, 182, - 222 + 222, + 262 ] } ], @@ -210,7 +228,8 @@ 97, 137, 177, - 217 + 217, + 257 ] } ], @@ -221,7 +240,8 @@ 106, 146, 186, - 226 + 226, + 266 ] } ], diff --git a/gems/ruby-merge/Gemfile b/gems/ruby-merge/Gemfile index fe0a045a7..2a659368c 100644 --- a/gems/ruby-merge/Gemfile +++ b/gems/ruby-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source 'https://gem.coop' +source "https://gem.coop" git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,18 +19,62 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ['~> 1.0', '>= 1.0.8'] -gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ["~> 1.0", ">= 1.0.8"] +gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ast-merge tree_haver ] -direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') +direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? + +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) + direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") + direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == "nomono" } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + if nomono_locked + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] + end + end + Kernel.send(:gem, "nomono", *nomono_activation_requirements) + require "nomono/bundler" + if direct_sibling_templating && !direct_sibling_local + ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + end + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: "STRUCTUREDMERGE", + path_env: "STRUCTUREDMERGE_DEV", + root: ["src", "my", "structuredmerge"] + ) + rescue LoadError + warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + else + ENV.delete("STRUCTUREDMERGE_DEV") + end + end + end +end if direct_sibling_gems.any? && (direct_sibling_local || @@ -250,25 +294,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? # Debugging -eval_gemfile 'gemfiles/modular/debug.gemfile' +eval_gemfile "gemfiles/modular/debug.gemfile" # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile 'gemfiles/modular/coverage.gemfile' +eval_gemfile "gemfiles/modular/coverage.gemfile" # Linting -eval_gemfile 'gemfiles/modular/style.gemfile' +eval_gemfile "gemfiles/modular/style.gemfile" # Documentation -eval_gemfile 'gemfiles/modular/documentation.gemfile' +eval_gemfile "gemfiles/modular/documentation.gemfile" # Optional -eval_gemfile 'gemfiles/modular/optional.gemfile' +eval_gemfile "gemfiles/modular/optional.gemfile" ### Std Lib Extracted Gems -eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' +eval_gemfile "gemfiles/modular/x_std_libs.gemfile" # See unlocked_deps appraisal for more details on irb inclusion -gem 'irb', '~> 1.17' # ruby >= 2.7 +gem "irb", "~> 1.17" # ruby >= 2.7 diff --git a/gems/ruby-merge/Rakefile b/gems/ruby-merge/Rakefile index c528d41ee..c7b8a4b9e 100644 --- a/gems/ruby-merge/Rakefile +++ b/gems/ruby-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require 'kettle/drift' + require "kettle/drift" Kettle::Drift.install_tasks rescue LoadError - desc('(stub) kettle:drift:check is unavailable') - task('kettle:drift:check') do + desc("(stub) kettle:drift:check is unavailable") + task("kettle:drift:check") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:update is unavailable') - task('kettle:drift:update') do + desc("(stub) kettle:drift:update is unavailable") + task("kettle:drift:update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:force_update is unavailable') - task('kettle:drift:force_update') do + desc("(stub) kettle:drift:force_update is unavailable") + task("kettle:drift:force_update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift is unavailable') - task('kettle:drift' => 'kettle:drift:update') + desc("(stub) kettle:drift is unavailable") + task("kettle:drift" => "kettle:drift:update") end ### TEMPLATING TASKS diff --git a/gems/ruby-merge/lib/ruby/merge/version.rb b/gems/ruby-merge/lib/ruby/merge/version.rb index d88eae0c6..0dcd005a5 100644 --- a/gems/ruby-merge/lib/ruby/merge/version.rb +++ b/gems/ruby-merge/lib/ruby/merge/version.rb @@ -3,7 +3,7 @@ module Ruby module Merge module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/toml-merge/.kettle-drift.lock b/gems/toml-merge/.kettle-drift.lock index 0161251a7..d3c2a2030 100644 --- a/gems/toml-merge/.kettle-drift.lock +++ b/gems/toml-merge/.kettle-drift.lock @@ -6,7 +6,8 @@ 80, 120, 160, - 200 + 200, + 240 ] } ], @@ -17,7 +18,8 @@ 91, 131, 171, - 211 + 211, + 251 ] } ], @@ -28,7 +30,8 @@ 81, 121, 161, - 201 + 201, + 241 ] } ], @@ -39,7 +42,8 @@ 93, 133, 173, - 213 + 213, + 253 ] } ], @@ -50,7 +54,8 @@ 96, 136, 176, - 216 + 216, + 256 ] } ], @@ -61,7 +66,8 @@ 82, 122, 162, - 202 + 202, + 242 ] } ], @@ -73,7 +79,8 @@ 100, 140, 180, - 220 + 220, + 260 ] } ], @@ -84,7 +91,8 @@ 101, 141, 181, - 221 + 221, + 261 ] } ], @@ -96,7 +104,8 @@ 87, 127, 167, - 207 + 207, + 247 ] } ], @@ -107,7 +116,8 @@ 110, 150, 190, - 230 + 230, + 270 ] } ], @@ -119,7 +129,8 @@ 79, 119, 159, - 199 + 199, + 239 ] } ], @@ -131,7 +142,8 @@ 109, 149, 189, - 229 + 229, + 269 ] } ], @@ -142,7 +154,8 @@ 85, 125, 165, - 205 + 205, + 245 ] } ], @@ -154,7 +167,8 @@ 92, 132, 172, - 212 + 212, + 252 ] } ], @@ -166,7 +180,8 @@ 88, 128, 168, - 208 + 208, + 248 ] } ], @@ -177,7 +192,8 @@ 86, 126, 166, - 206 + 206, + 246 ] } ], @@ -188,7 +204,8 @@ 103, 143, 183, - 223 + 223, + 263 ] } ], @@ -199,7 +216,8 @@ 102, 142, 182, - 222 + 222, + 262 ] } ], @@ -210,7 +228,8 @@ 97, 137, 177, - 217 + 217, + 257 ] } ], @@ -221,7 +240,8 @@ 106, 146, 186, - 226 + 226, + 266 ] } ], diff --git a/gems/toml-merge/.rubocop_gradual.lock b/gems/toml-merge/.rubocop_gradual.lock deleted file mode 100644 index 918c85d88..000000000 --- a/gems/toml-merge/.rubocop_gradual.lock +++ /dev/null @@ -1,258 +0,0 @@ -{ - ".simplecov:3682400110": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:133885645": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/toml-merge.rb:3814390984": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`toml-merge.rb`) should use snake_case.", 5381], - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "lib/toml/merge.rb:3069711497": [ - [39, 3, 12193, "Metrics/ModuleLength: Module has too many lines. [231/100]", 1479901406], - [114, 5, 9241, "Metrics/ClassLength: Class has too many lines. [205/100]", 349141169], - [156, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1773216188], - [165, 7, 709, "Metrics/MethodLength: Method has too many lines. [17/10]", 2355964538], - [191, 7, 1280, "Metrics/AbcSize: Assignment Branch Condition size for `merge_toml` is too high. [<6, 16, 6> 18.11/17]", 2322240506], - [191, 7, 1280, "Metrics/MethodLength: Method has too many lines. [25/10]", 2322240506], - [195, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1773216188], - [222, 7, 1401, "Metrics/AbcSize: Assignment Branch Condition size for `merge_toml_with_parser` is too high. [<6, 18, 6> 19.9/17]", 3118052892], - [222, 7, 1401, "Metrics/MethodLength: Method has too many lines. [24/10]", 3118052892], - [321, 9, 11, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 848344986] - ], - "lib/toml/merge/comment_tracker.rb:743656609": [ - [16, 5, 5242, "Metrics/ClassLength: Class has too many lines. [112/100]", 3014190138], - [28, 7, 990, "Metrics/MethodLength: Method has too many lines. [17/10]", 85804539], - [92, 7, 949, "Metrics/AbcSize: Assignment Branch Condition size for `build_toml_region` is too high. [<7, 21, 9> 23.9/17]", 552845000], - [92, 7, 949, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_toml_region` is too high. [9/7]", 552845000], - [92, 7, 949, "Metrics/MethodLength: Method has too many lines. [23/10]", 552845000], - [92, 7, 949, "Metrics/PerceivedComplexity: Perceived complexity for `build_toml_region` is too high. [9/8]", 552845000] - ], - "lib/toml/merge/conflict_resolver.rb:2699752146": [ - [11, 5, 42658, "Metrics/ClassLength: Class has too many lines. [791/100]", 2931993361], - [30, 7, 788, "Metrics/MethodLength: Method has too many lines. [13/10]", 2218400960], - [30, 21, 235, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 788504679], - [31, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3099130903], - [52, 7, 1676, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_batch` is too high. [<4, 24, 3> 24.52/17]", 623996510], - [52, 7, 1676, "Metrics/MethodLength: Method has too many lines. [29/10]", 623996510], - [53, 9, 1632, "Metrics/BlockLength: Block has too many lines. [27/25]", 3553849414], - [101, 7, 8464, "Metrics/AbcSize: Assignment Branch Condition size for `merge_node_lists_to_emitter` is too high. [<54, 88, 31> 107.8/17]", 3669765511], - [101, 7, 8464, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_node_lists_to_emitter` is too high. [27/7]", 3669765511], - [101, 7, 8464, "Metrics/MethodLength: Method has too many lines. [141/10]", 3669765511], - [101, 7, 8464, "Metrics/PerceivedComplexity: Perceived complexity for `merge_node_lists_to_emitter` is too high. [29/8]", 3669765511], - [146, 9, 5685, "Metrics/BlockLength: Block has too many lines. [102/25]", 464560406], - [286, 7, 2458, "Metrics/AbcSize: Assignment Branch Condition size for `merge_matched_nodes_to_emitter` is too high. [<6, 17, 10> 20.62/17]", 4036358483], - [286, 7, 2458, "Metrics/MethodLength: Method has too many lines. [49/10]", 4036358483], - [286, 7, 2458, "Metrics/PerceivedComplexity: Perceived complexity for `merge_matched_nodes_to_emitter` is too high. [9/8]", 4036358483], - [289, 11, 1647, "Metrics/BlockLength: Block has too many lines. [34/25]", 997955803], - [353, 7, 770, "Metrics/MethodLength: Method has too many lines. [21/10]", 543737609], - [387, 7, 1101, "Metrics/AbcSize: Assignment Branch Condition size for `build_refined_matches` is too high. [<11, 16, 8> 21/17]", 4236016583], - [387, 7, 1101, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_refined_matches` is too high. [9/7]", 4236016583], - [387, 7, 1101, "Metrics/MethodLength: Method has too many lines. [18/10]", 4236016583], - [387, 7, 1101, "Metrics/PerceivedComplexity: Perceived complexity for `build_refined_matches` is too high. [9/8]", 4236016583], - [427, 7, 642, "Metrics/AbcSize: Assignment Branch Condition size for `emit_removed_destination_node_inline_comments` is too high. [<4, 20, 5> 21/17]", 2624953678], - [427, 7, 642, "Metrics/MethodLength: Method has too many lines. [11/10]", 2624953678], - [462, 7, 720, "Metrics/MethodLength: Method has too many lines. [11/10]", 4270722493], - [499, 7, 1022, "Metrics/MethodLength: Method has too many lines. [17/10]", 3216685542], - [584, 7, 1854, "Metrics/AbcSize: Assignment Branch Condition size for `emit_leading_region` is too high. [<8, 28, 9> 30.48/17]", 377203837], - [584, 7, 1854, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_leading_region` is too high. [10/7]", 377203837], - [584, 7, 1854, "Metrics/MethodLength: Method has too many lines. [32/10]", 377203837], - [584, 7, 1854, "Metrics/PerceivedComplexity: Perceived complexity for `emit_leading_region` is too high. [10/8]", 377203837], - [685, 7, 1275, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_template_preamble_prefix_region` is too high. [<7, 24, 9> 26.57/17]", 1754222078], - [685, 7, 1275, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collapse_template_preamble_prefix_region` is too high. [8/7]", 1754222078], - [685, 7, 1275, "Metrics/MethodLength: Method has too many lines. [24/10]", 1754222078], - [716, 7, 662, "Metrics/AbcSize: Assignment Branch Condition size for `root_boundary_lines_for` is too high. [<4, 15, 10> 18.47/17]", 935744348], - [716, 7, 662, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `root_boundary_lines_for` is too high. [9/7]", 935744348], - [716, 7, 662, "Metrics/MethodLength: Method has too many lines. [14/10]", 935744348], - [736, 7, 343, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `region_lines_for` is too high. [8/7]", 399995706], - [753, 7, 614, "Metrics/AbcSize: Assignment Branch Condition size for `dedup_warning_context` is too high. [<0, 20, 10> 22.36/17]", 2011768288], - [753, 7, 614, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `dedup_warning_context` is too high. [11/7]", 2011768288], - [753, 7, 614, "Metrics/PerceivedComplexity: Perceived complexity for `dedup_warning_context` is too high. [11/8]", 2011768288], - [756, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [757, 41, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [757, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 3287405165], - [783, 7, 1426, "Metrics/MethodLength: Method has too many lines. [34/10]", 1351993853], - [849, 7, 955, "Metrics/MethodLength: Method has too many lines. [21/10]", 3080929417], - [877, 7, 1249, "Metrics/AbcSize: Assignment Branch Condition size for `emit_node_lines` is too high. [<6, 21, 6> 22.65/17]", 3195628693], - [877, 7, 1249, "Metrics/MethodLength: Method has too many lines. [21/10]", 3195628693], - [952, 7, 637, "Metrics/AbcSize: Assignment Branch Condition size for `inline_region_separator` is too high. [<5, 18, 7> 19.95/17]", 2029360360], - [952, 7, 637, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `inline_region_separator` is too high. [8/7]", 2029360360], - [952, 7, 637, "Metrics/MethodLength: Method has too many lines. [12/10]", 2029360360], - [969, 7, 465, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_interstitial_blank_lines` is too high. [9/7]", 1640065866], - [969, 7, 465, "Metrics/PerceivedComplexity: Perceived complexity for `emit_interstitial_blank_lines` is too high. [9/8]", 1640065866], - [981, 7, 620, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_gap_before_node` is too high. [12/7]", 2808239642], - [981, 7, 620, "Metrics/PerceivedComplexity: Perceived complexity for `emit_gap_before_node` is too high. [12/8]", 2808239642], - [983, 36, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [998, 7, 526, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_preceding_blank_lines` is too high. [8/7]", 3889743093], - [998, 7, 526, "Metrics/MethodLength: Method has too many lines. [11/10]", 3889743093] - ], - "lib/toml/merge/file_analysis.rb:2630402533": [ - [12, 5, 19537, "Metrics/ClassLength: Class has too many lines. [368/100]", 929433986], - [15, 7, 22, "Style/Documentation: Missing top-level documentation comment for `class Toml::Merge::FileAnalysis::CommentAugmenter`.", 2864244718], - [20, 9, 849, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<11, 13, 1> 17.06/17]", 1333266342], - [20, 9, 849, "Metrics/MethodLength: Method has too many lines. [16/10]", 1333266342], - [72, 7, 869, "Metrics/MethodLength: Method has too many lines. [13/10]", 1683071581], - [228, 7, 959, "Metrics/AbcSize: Assignment Branch Condition size for `root_pairs` is too high. [<10, 13, 16> 22.91/17]", 1481059821], - [228, 7, 959, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `root_pairs` is too high. [15/7]", 1481059821], - [228, 7, 959, "Metrics/MethodLength: Method has too many lines. [21/10]", 1481059821], - [228, 7, 959, "Metrics/PerceivedComplexity: Perceived complexity for `root_pairs` is too high. [15/8]", 1481059821], - [246, 9, 384, "Style/CombinableLoops: Combine this loop with the previous loop.", 2434692315], - [263, 7, 1743, "Metrics/AbcSize: Assignment Branch Condition size for `parse_toml` is too high. [<10, 12, 8> 17.55/17]", 1966830746], - [263, 7, 1743, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_toml` is too high. [9/7]", 1966830746], - [263, 7, 1743, "Metrics/MethodLength: Method has too many lines. [19/10]", 1966830746], - [331, 7, 596, "Metrics/MethodLength: Method has too many lines. [13/10]", 995924372], - [389, 7, 588, "Metrics/AbcSize: Assignment Branch Condition size for `comment_owner_end_line_for_augmenter` is too high. [<1, 20, 13> 23.87/17]", 1972553155], - [389, 7, 588, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `comment_owner_end_line_for_augmenter` is too high. [14/7]", 1972553155], - [389, 7, 588, "Metrics/PerceivedComplexity: Perceived complexity for `comment_owner_end_line_for_augmenter` is too high. [14/8]", 1972553155], - [448, 7, 1255, "Metrics/AbcSize: Assignment Branch Condition size for `scan_line_for_comment` is too high. [<16, 13, 17> 26.72/17]", 622981429], - [448, 7, 1255, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `scan_line_for_comment` is too high. [12/7]", 622981429], - [448, 7, 1255, "Metrics/MethodLength: Method has too many lines. [38/10]", 622981429], - [448, 7, 1255, "Metrics/PerceivedComplexity: Perceived complexity for `scan_line_for_comment` is too high. [13/8]", 622981429], - [496, 7, 319, "Metrics/MethodLength: Method has too many lines. [11/10]", 2890996257], - [535, 7, 416, "Metrics/MethodLength: Method has too many lines. [11/10]", 2416972242], - [576, 7, 464, "Metrics/AbcSize: Assignment Branch Condition size for `node_text` is too high. [<3, 16, 8> 18.14/17]", 2138809005], - [576, 7, 464, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `node_text` is too high. [8/7]", 2138809005] - ], - "lib/toml/merge/key_sorter.rb:829731466": [ - [59, 7, 1787, "Metrics/AbcSize: Assignment Branch Condition size for `partition_into_blocks` is too high. [<11, 23, 8> 26.72/17]", 3324132918], - [59, 7, 1787, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `partition_into_blocks` is too high. [8/7]", 3324132918], - [59, 7, 1787, "Metrics/MethodLength: Method has too many lines. [38/10]", 3324132918], - [59, 7, 1787, "Metrics/PerceivedComplexity: Perceived complexity for `partition_into_blocks` is too high. [9/8]", 3324132918] - ], - "lib/toml/merge/node_type_normalizer.rb:2171981470": [ - [67, 5, 7844, "Metrics/ModuleLength: Module has too many lines. [134/100]", 828548837], - [159, 11, 4, "Lint/BooleanSymbol: Symbol with a boolean name - you probably meant to use `true`.", 2087932467], - [160, 11, 5, "Lint/BooleanSymbol: Symbol with a boolean name - you probably meant to use `false`.", 170962968], - [215, 11, 4, "Lint/BooleanSymbol: Symbol with a boolean name - you probably meant to use `true`.", 2087932467], - [216, 11, 5, "Lint/BooleanSymbol: Symbol with a boolean name - you probably meant to use `false`.", 170962968] - ], - "lib/toml/merge/node_wrapper.rb:975742583": [ - [26, 5, 24084, "Metrics/ClassLength: Class has too many lines. [424/100]", 111672250], - [37, 9, 517, "Metrics/MethodLength: Method has too many lines. [11/10]", 3513234297], - [37, 17, 154, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2431837951], - [54, 7, 503, "Metrics/MethodLength: Method has too many lines. [12/10]", 2647031658], - [54, 21, 82, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2652802373], - [229, 7, 1380, "Metrics/AbcSize: Assignment Branch Condition size for `value_node` is too high. [<5, 16, 10> 19.52/17]", 1398903082], - [229, 7, 1380, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `value_node` is too high. [9/7]", 1398903082], - [229, 7, 1380, "Metrics/MethodLength: Method has too many lines. [32/10]", 1398903082], - [229, 7, 1380, "Metrics/PerceivedComplexity: Perceived complexity for `value_node` is too high. [9/8]", 1398903082], - [232, 9, 1306, "Metrics/BlockLength: Block has too many lines. [28/25]", 3342818997], - [286, 7, 496, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `pairs` is too high. [9/7]", 2741436417], - [286, 7, 496, "Metrics/PerceivedComplexity: Perceived complexity for `pairs` is too high. [9/8]", 2741436417], - [319, 7, 706, "Metrics/MethodLength: Method has too many lines. [22/10]", 2032215880], - [390, 7, 753, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `effective_end_line` is too high. [10/7]", 29395992], - [390, 7, 753, "Metrics/PerceivedComplexity: Perceived complexity for `effective_end_line` is too high. [10/8]", 29395992], - [414, 7, 2225, "Metrics/AbcSize: Assignment Branch Condition size for `compute_signature` is too high. [<9, 32, 24> 41/17]", 1299303855], - [414, 7, 2225, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_signature` is too high. [25/7]", 1299303855], - [414, 7, 2225, "Metrics/MethodLength: Method has too many lines. [39/10]", 1299303855], - [414, 7, 2225, "Metrics/PerceivedComplexity: Perceived complexity for `compute_signature` is too high. [16/8]", 1299303855], - [523, 7, 487, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `raw_pair_value_text` is too high. [8/7]", 3177077098], - [547, 7, 1503, "Metrics/AbcSize: Assignment Branch Condition size for `collect_inline_table_keys_recursive` is too high. [<7, 25, 18> 31.59/17]", 3778857543], - [547, 7, 1503, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_inline_table_keys_recursive` is too high. [17/7]", 3778857543], - [547, 7, 1503, "Metrics/MethodLength: Method has too many lines. [24/10]", 3778857543], - [547, 7, 1503, "Metrics/PerceivedComplexity: Perceived complexity for `collect_inline_table_keys_recursive` is too high. [18/8]", 3778857543], - [605, 7, 855, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_sibling_pairs_for_table` is too high. [8/7]", 3160731503], - [605, 7, 855, "Metrics/MethodLength: Method has too many lines. [14/10]", 3160731503], - [636, 7, 655, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_next_table_start_line` is too high. [9/7]", 1465728116], - [636, 7, 655, "Metrics/MethodLength: Method has too many lines. [12/10]", 1465728116], - [636, 7, 655, "Metrics/PerceivedComplexity: Perceived complexity for `find_next_table_start_line` is too high. [9/8]", 1465728116], - [665, 7, 861, "Metrics/MethodLength: Method has too many lines. [12/10]", 4202205110] - ], - "lib/toml/merge/smart_merger.rb:3624815957": [ - [39, 5, 9573, "Metrics/ClassLength: Class has too many lines. [190/100]", 1615610584], - [72, 7, 1283, "Metrics/MethodLength: Method has too many lines. [18/10]", 2597249100], - [72, 21, 427, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 1661881927], - [144, 7, 1347, "Metrics/AbcSize: Assignment Branch Condition size for `merge_with_debug` is too high. [<3, 20, 7> 21.4/17]", 2015540458], - [144, 7, 1347, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_with_debug` is too high. [8/7]", 2015540458], - [144, 7, 1347, "Metrics/MethodLength: Method has too many lines. [31/10]", 2015540458], - [248, 7, 1161, "Metrics/MethodLength: Method has too many lines. [26/10]", 1453116447] - ], - "lib/toml/merge/table_match_refiner.rb:1590173808": [ - [32, 5, 7338, "Metrics/ClassLength: Class has too many lines. [108/100]", 3006106276], - [113, 35, 50, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1492696344], - [147, 7, 410, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_table_name` is too high. [8/7]", 2032455294], - [217, 7, 659, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<11, 38, 8> 40.36/17]", 2658150371], - [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:3985149016": [ - [3, 1, 12320, "Metrics/BlockLength: Block has too many lines. [273/25]", 2102318823], - [34, 3, 2099, "Metrics/BlockLength: Block has too many lines. [27/25]", 677669008], - [233, 3, 1127, "Metrics/BlockLength: Block has too many lines. [27/25]", 3231986094] - ], - "toml-merge.gemspec:2519299257": [ - [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ] -} diff --git a/gems/toml-merge/Gemfile b/gems/toml-merge/Gemfile index 62597239a..5ae2e72c0 100644 --- a/gems/toml-merge/Gemfile +++ b/gems/toml-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source 'https://gem.coop' +source "https://gem.coop" git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,18 +19,62 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ['~> 1.0', '>= 1.0.8'] -gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ["~> 1.0", ">= 1.0.8"] +gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ast-merge tree_haver ] -direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') +direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? + +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) + direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") + direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == "nomono" } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + if nomono_locked + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] + end + end + Kernel.send(:gem, "nomono", *nomono_activation_requirements) + require "nomono/bundler" + if direct_sibling_templating && !direct_sibling_local + ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + end + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: "STRUCTUREDMERGE", + path_env: "STRUCTUREDMERGE_DEV", + root: ["src", "my", "structuredmerge"] + ) + rescue LoadError + warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + else + ENV.delete("STRUCTUREDMERGE_DEV") + end + end + end +end if direct_sibling_gems.any? && (direct_sibling_local || @@ -250,25 +294,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? # Debugging -eval_gemfile 'gemfiles/modular/debug.gemfile' +eval_gemfile "gemfiles/modular/debug.gemfile" # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile 'gemfiles/modular/coverage.gemfile' +eval_gemfile "gemfiles/modular/coverage.gemfile" # Linting -eval_gemfile 'gemfiles/modular/style.gemfile' +eval_gemfile "gemfiles/modular/style.gemfile" # Documentation -eval_gemfile 'gemfiles/modular/documentation.gemfile' +eval_gemfile "gemfiles/modular/documentation.gemfile" # Optional -eval_gemfile 'gemfiles/modular/optional.gemfile' +eval_gemfile "gemfiles/modular/optional.gemfile" ### Std Lib Extracted Gems -eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' +eval_gemfile "gemfiles/modular/x_std_libs.gemfile" # See unlocked_deps appraisal for more details on irb inclusion -gem 'irb', '~> 1.17' # ruby >= 2.7 +gem "irb", "~> 1.17" # ruby >= 2.7 diff --git a/gems/toml-merge/Gemfile.lock b/gems/toml-merge/Gemfile.lock index 87531476e..fef01f4f8 100644 --- a/gems/toml-merge/Gemfile.lock +++ b/gems/toml-merge/Gemfile.lock @@ -275,6 +275,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -308,7 +324,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -363,18 +378,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -538,22 +542,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -659,9 +659,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -739,7 +739,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -760,10 +759,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -838,13 +837,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/toml-merge/Rakefile b/gems/toml-merge/Rakefile index 1038ac780..4d0c02b16 100644 --- a/gems/toml-merge/Rakefile +++ b/gems/toml-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require 'kettle/drift' + require "kettle/drift" Kettle::Drift.install_tasks rescue LoadError - desc('(stub) kettle:drift:check is unavailable') - task('kettle:drift:check') do + desc("(stub) kettle:drift:check is unavailable") + task("kettle:drift:check") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:update is unavailable') - task('kettle:drift:update') do + desc("(stub) kettle:drift:update is unavailable") + task("kettle:drift:update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:force_update is unavailable') - task('kettle:drift:force_update') do + desc("(stub) kettle:drift:force_update is unavailable") + task("kettle:drift:force_update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift is unavailable') - task('kettle:drift' => 'kettle:drift:update') + desc("(stub) kettle:drift is unavailable") + task("kettle:drift" => "kettle:drift:update") end ### TEMPLATING TASKS diff --git a/gems/toml-merge/bin/yard b/gems/toml-merge/bin/yard index 5d516ad6f..a7e8b6eed 100755 --- a/gems/toml-merge/bin/yard +++ b/gems/toml-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec('bundle', 'exec', 'rake', 'yard') +exec("bundle", "exec", "rake", "yard") diff --git a/gems/toml-merge/lib/toml/merge/version.rb b/gems/toml-merge/lib/toml/merge/version.rb index d9074beaf..91c4e4d84 100644 --- a/gems/toml-merge/lib/toml/merge/version.rb +++ b/gems/toml-merge/lib/toml/merge/version.rb @@ -3,7 +3,7 @@ module Toml module Merge module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/yaml-merge/.kettle-drift.lock b/gems/yaml-merge/.kettle-drift.lock index 0161251a7..d3c2a2030 100644 --- a/gems/yaml-merge/.kettle-drift.lock +++ b/gems/yaml-merge/.kettle-drift.lock @@ -6,7 +6,8 @@ 80, 120, 160, - 200 + 200, + 240 ] } ], @@ -17,7 +18,8 @@ 91, 131, 171, - 211 + 211, + 251 ] } ], @@ -28,7 +30,8 @@ 81, 121, 161, - 201 + 201, + 241 ] } ], @@ -39,7 +42,8 @@ 93, 133, 173, - 213 + 213, + 253 ] } ], @@ -50,7 +54,8 @@ 96, 136, 176, - 216 + 216, + 256 ] } ], @@ -61,7 +66,8 @@ 82, 122, 162, - 202 + 202, + 242 ] } ], @@ -73,7 +79,8 @@ 100, 140, 180, - 220 + 220, + 260 ] } ], @@ -84,7 +91,8 @@ 101, 141, 181, - 221 + 221, + 261 ] } ], @@ -96,7 +104,8 @@ 87, 127, 167, - 207 + 207, + 247 ] } ], @@ -107,7 +116,8 @@ 110, 150, 190, - 230 + 230, + 270 ] } ], @@ -119,7 +129,8 @@ 79, 119, 159, - 199 + 199, + 239 ] } ], @@ -131,7 +142,8 @@ 109, 149, 189, - 229 + 229, + 269 ] } ], @@ -142,7 +154,8 @@ 85, 125, 165, - 205 + 205, + 245 ] } ], @@ -154,7 +167,8 @@ 92, 132, 172, - 212 + 212, + 252 ] } ], @@ -166,7 +180,8 @@ 88, 128, 168, - 208 + 208, + 248 ] } ], @@ -177,7 +192,8 @@ 86, 126, 166, - 206 + 206, + 246 ] } ], @@ -188,7 +204,8 @@ 103, 143, 183, - 223 + 223, + 263 ] } ], @@ -199,7 +216,8 @@ 102, 142, 182, - 222 + 222, + 262 ] } ], @@ -210,7 +228,8 @@ 97, 137, 177, - 217 + 217, + 257 ] } ], @@ -221,7 +240,8 @@ 106, 146, 186, - 226 + 226, + 266 ] } ], diff --git a/gems/yaml-merge/Gemfile b/gems/yaml-merge/Gemfile index a73be4685..d79b393f2 100644 --- a/gems/yaml-merge/Gemfile +++ b/gems/yaml-merge/Gemfile @@ -232,6 +232,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/yaml-merge/Gemfile.lock b/gems/yaml-merge/Gemfile.lock index 5ea0feeed..89d153c1b 100644 --- a/gems/yaml-merge/Gemfile.lock +++ b/gems/yaml-merge/Gemfile.lock @@ -17,39 +17,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -58,201 +26,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -260,21 +34,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -294,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +116,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +283,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +381,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,17 +406,12 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) yaml-merge! yard (~> 0.9, >= 0.9.44) @@ -704,35 +420,19 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +440,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +452,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +479,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +490,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +517,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +528,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,14 +541,10 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -879,7 +557,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From d462ce168daa1f113bec322075371bbe3497f696 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:36:22 -0600 Subject: [PATCH 198/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/go-merge/.kettle-drift.lock | 60 ++-- gems/go-merge/.rubocop_gradual.lock | 102 ------ gems/go-merge/Gemfile | 40 +++ gems/go-merge/Gemfile.lock | 59 ++-- gems/ruby-merge/.rubocop_gradual.lock | 390 ---------------------- gems/ruby-merge/Gemfile | 68 ++-- gems/ruby-merge/Gemfile.lock | 353 +------------------- gems/ruby-merge/Rakefile | 18 +- gems/toml-merge/.rubocop_gradual.lock | 258 ++++++++++++++ gems/toml-merge/Gemfile | 68 ++-- gems/toml-merge/Gemfile.lock | 378 ++------------------- gems/toml-merge/Rakefile | 18 +- gems/toml-merge/bin/yard | 2 +- gems/toml-merge/lib/toml/merge/version.rb | 2 +- gems/yaml-merge/Gemfile.lock | 30 +- 15 files changed, 499 insertions(+), 1347 deletions(-) delete mode 100644 gems/go-merge/.rubocop_gradual.lock delete mode 100644 gems/ruby-merge/.rubocop_gradual.lock create mode 100644 gems/toml-merge/.rubocop_gradual.lock diff --git a/gems/go-merge/.kettle-drift.lock b/gems/go-merge/.kettle-drift.lock index 0161251a7..d3c2a2030 100644 --- a/gems/go-merge/.kettle-drift.lock +++ b/gems/go-merge/.kettle-drift.lock @@ -6,7 +6,8 @@ 80, 120, 160, - 200 + 200, + 240 ] } ], @@ -17,7 +18,8 @@ 91, 131, 171, - 211 + 211, + 251 ] } ], @@ -28,7 +30,8 @@ 81, 121, 161, - 201 + 201, + 241 ] } ], @@ -39,7 +42,8 @@ 93, 133, 173, - 213 + 213, + 253 ] } ], @@ -50,7 +54,8 @@ 96, 136, 176, - 216 + 216, + 256 ] } ], @@ -61,7 +66,8 @@ 82, 122, 162, - 202 + 202, + 242 ] } ], @@ -73,7 +79,8 @@ 100, 140, 180, - 220 + 220, + 260 ] } ], @@ -84,7 +91,8 @@ 101, 141, 181, - 221 + 221, + 261 ] } ], @@ -96,7 +104,8 @@ 87, 127, 167, - 207 + 207, + 247 ] } ], @@ -107,7 +116,8 @@ 110, 150, 190, - 230 + 230, + 270 ] } ], @@ -119,7 +129,8 @@ 79, 119, 159, - 199 + 199, + 239 ] } ], @@ -131,7 +142,8 @@ 109, 149, 189, - 229 + 229, + 269 ] } ], @@ -142,7 +154,8 @@ 85, 125, 165, - 205 + 205, + 245 ] } ], @@ -154,7 +167,8 @@ 92, 132, 172, - 212 + 212, + 252 ] } ], @@ -166,7 +180,8 @@ 88, 128, 168, - 208 + 208, + 248 ] } ], @@ -177,7 +192,8 @@ 86, 126, 166, - 206 + 206, + 246 ] } ], @@ -188,7 +204,8 @@ 103, 143, 183, - 223 + 223, + 263 ] } ], @@ -199,7 +216,8 @@ 102, 142, 182, - 222 + 222, + 262 ] } ], @@ -210,7 +228,8 @@ 97, 137, 177, - 217 + 217, + 257 ] } ], @@ -221,7 +240,8 @@ 106, 146, 186, - 226 + 226, + 266 ] } ], diff --git a/gems/go-merge/.rubocop_gradual.lock b/gems/go-merge/.rubocop_gradual.lock deleted file mode 100644 index bb6039651..000000000 --- a/gems/go-merge/.rubocop_gradual.lock +++ /dev/null @@ -1,102 +0,0 @@ -{ - ".simplecov:203349166": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:522749197": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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:3413698974": [ - [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ], - "lib/go-merge.rb:1938991181": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`go-merge.rb`) should use snake_case.", 5381] - ], - "lib/go/merge.rb:547557749": [ - [10, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Go::Merge`.", 2866359175], - [10, 3, 7242, "Metrics/ModuleLength: Module has too many lines. [173/100]", 2713105462], - [11, 5, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631], - [72, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1491828652], - [79, 5, 1399, "Metrics/AbcSize: Assignment Branch Condition size for `merge_go` is too high. [<13, 32, 11> 36.25/17]", 3471957286], - [79, 5, 1399, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_go` is too high. [11/7]", 3471957286], - [79, 5, 1399, "Metrics/MethodLength: Method has too many lines. [22/10]", 3471957286], - [79, 5, 1399, "Metrics/PerceivedComplexity: Perceived complexity for `merge_go` is too high. [11/8]", 3471957286], - [98, 34, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], - [106, 5, 1419, "Metrics/AbcSize: Assignment Branch Condition size for `analyze_go_module` is too high. [<8, 19, 5> 21.21/17]", 525883462], - [106, 5, 1419, "Metrics/MethodLength: Method has too many lines. [40/10]", 525883462] - ], - "spec/fixtures_integration_spec.rb:2854818786": [ - [3, 1, 4677, "Metrics/BlockLength: Block has too many lines. [66/25]", 420437002], - [8, 3, 4420, "Metrics/BlockLength: Block has too many lines. [61/25]", 566085077] - ] -} diff --git a/gems/go-merge/Gemfile b/gems/go-merge/Gemfile index f6d039b30..9dbdcc96c 100644 --- a/gems/go-merge/Gemfile +++ b/gems/go-merge/Gemfile @@ -232,6 +232,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/go-merge/Gemfile.lock b/gems/go-merge/Gemfile.lock index c35a1d0fa..d218b78d8 100644 --- a/gems/go-merge/Gemfile.lock +++ b/gems/go-merge/Gemfile.lock @@ -275,6 +275,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -308,7 +324,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -363,18 +378,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -538,22 +542,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -659,9 +659,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -739,7 +739,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -760,10 +759,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -838,13 +837,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/ruby-merge/.rubocop_gradual.lock b/gems/ruby-merge/.rubocop_gradual.lock deleted file mode 100644 index 827b7fe9d..000000000 --- a/gems/ruby-merge/.rubocop_gradual.lock +++ /dev/null @@ -1,390 +0,0 @@ -{ - ".simplecov:3590623278": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:2768890125": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/ruby-merge.rb:2992445753": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`ruby-merge.rb`) should use snake_case.", 5381] - ], - "lib/ruby/merge.rb:1549201317": [ - [21, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Ruby::Merge`.", 2866359175], - [21, 3, 117385, "Metrics/ModuleLength: Module has too many lines. [2664/100]", 3496752980], - [42, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3061257365], - [103, 5, 841, "Metrics/AbcSize: Assignment Branch Condition size for `parse_ruby` is too high. [<4, 16, 6> 17.55/17]", 1071201699], - [103, 5, 841, "Metrics/MethodLength: Method has too many lines. [16/10]", 1071201699], - [128, 5, 2656, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_method_move_detection` is too high. [<17, 40, 18> 47.04/17]", 3779436399], - [128, 5, 2656, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_method_move_detection` is too high. [16/7]", 3779436399], - [128, 5, 2656, "Metrics/MethodLength: Method has too many lines. [45/10]", 3779436399], - [128, 5, 2656, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_method_move_detection` is too high. [16/8]", 3779436399], - [140, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 727785047], - [153, 121, 51, "Layout/LineLength: Line is too long. [171/120]", 3259664538], - [172, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], - [175, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], - [176, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 1976354608], - [180, 5, 4374, "Metrics/AbcSize: Assignment Branch Condition size for `merge_ruby` is too high. [<31, 63, 24> 74.2/17]", 2749692967], - [180, 5, 4374, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_ruby` is too high. [21/7]", 2749692967], - [180, 5, 4374, "Metrics/MethodLength: Method has too many lines. [83/10]", 2749692967], - [180, 5, 4374, "Metrics/PerceivedComplexity: Perceived complexity for `merge_ruby` is too high. [22/8]", 2749692967], - [239, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], - [278, 5, 1312, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_delegated_child_operations` is too high. [<10, 15, 6> 19/17]", 2246428949], - [278, 5, 1312, "Metrics/MethodLength: Method has too many lines. [28/10]", 2246428949], - [324, 5, 861, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_source_owner_identity_profile` is too high. [<5, 17, 2> 17.83/17]", 4129925341], - [324, 5, 861, "Metrics/MethodLength: Method has too many lines. [20/10]", 4129925341], - [347, 5, 2064, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_source_owner_identity_matches` is too high. [<17, 31, 11> 37.03/17]", 2780319153], - [347, 5, 2064, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_source_owner_identity_matches` is too high. [11/7]", 2780319153], - [347, 5, 2064, "Metrics/MethodLength: Method has too many lines. [37/10]", 2780319153], - [347, 5, 2064, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_source_owner_identity_matches` is too high. [11/8]", 2780319153], - [376, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], - [379, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], - [384, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1001816794], - [390, 5, 1314, "Metrics/MethodLength: Method has too many lines. [28/10]", 4183124680], - [423, 5, 786, "Metrics/MethodLength: Method has too many lines. [24/10]", 3631640245], - [450, 5, 916, "Metrics/MethodLength: Method has too many lines. [18/10]", 631485532], - [471, 5, 662, "Metrics/MethodLength: Method has too many lines. [15/10]", 2231086183], - [490, 5, 777, "Metrics/MethodLength: Method has too many lines. [18/10]", 895030114], - [511, 5, 727, "Metrics/MethodLength: Method has too many lines. [19/10]", 776483642], - [533, 5, 861, "Metrics/MethodLength: Method has too many lines. [29/10]", 537340961], - [565, 5, 655, "Metrics/MethodLength: Method has too many lines. [16/10]", 3756601977], - [584, 5, 1592, "Metrics/MethodLength: Method has too many lines. [25/10]", 3521052904], - [608, 121, 106, "Layout/LineLength: Line is too long. [226/120]", 2104286058], - [614, 5, 777, "Metrics/MethodLength: Method has too many lines. [14/10]", 2821246515], - [631, 5, 1429, "Metrics/MethodLength: Method has too many lines. [26/10]", 244346226], - [654, 121, 124, "Layout/LineLength: Line is too long. [244/120]", 13261232], - [660, 5, 1367, "Metrics/MethodLength: Method has too many lines. [41/10]", 3883814121], - [704, 5, 750, "Metrics/MethodLength: Method has too many lines. [22/10]", 764028624], - [730, 5, 1315, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_silent_data_loss_validation_report` is too high. [<8, 14, 7> 17.58/17]", 2039399818], - [730, 5, 1315, "Metrics/MethodLength: Method has too many lines. [31/10]", 2039399818], - [765, 5, 724, "Metrics/MethodLength: Method has too many lines. [14/10]", 1741779676], - [776, 121, 67, "Layout/LineLength: Line is too long. [187/120]", 1996508131], - [782, 5, 752, "Metrics/MethodLength: Method has too many lines. [21/10]", 3870096101], - [806, 5, 1052, "Metrics/MethodLength: Method has too many lines. [32/10]", 119279638], - [841, 5, 1588, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_interstitial_comment_attachment_report` is too high. [<11, 34, 17> 39.57/17]", 4112280260], - [841, 5, 1588, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_interstitial_comment_attachment_report` is too high. [14/7]", 4112280260], - [841, 5, 1588, "Metrics/MethodLength: Method has too many lines. [30/10]", 4112280260], - [841, 5, 1588, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_interstitial_comment_attachment_report` is too high. [15/8]", 4112280260], - [855, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 180543822], - [883, 5, 536, "Metrics/MethodLength: Method has too many lines. [13/10]", 245509059], - [899, 5, 2252, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_rename_detection` is too high. [<14, 32, 11> 36.62/17]", 2574664763], - [899, 5, 2252, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_rename_detection` is too high. [10/7]", 2574664763], - [899, 5, 2252, "Metrics/MethodLength: Method has too many lines. [46/10]", 2574664763], - [899, 5, 2252, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_rename_detection` is too high. [11/8]", 2574664763], - [942, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 4074688513], - [948, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], - [952, 5, 2254, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_rename_plus_edit_conflicts` is too high. [<15, 30, 13> 35.97/17]", 3664513828], - [952, 5, 2254, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_rename_plus_edit_conflicts` is too high. [10/7]", 3664513828], - [952, 5, 2254, "Metrics/MethodLength: Method has too many lines. [45/10]", 3664513828], - [952, 5, 2254, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_rename_plus_edit_conflicts` is too high. [11/8]", 3664513828], - [1004, 5, 1926, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_cross_container_method_move_detection` is too high. [<8, 18, 7> 20.9/17]", 1401333972], - [1004, 5, 1926, "Metrics/MethodLength: Method has too many lines. [44/10]", 1401333972], - [1047, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3474944396], - [1054, 5, 1488, "Metrics/AbcSize: Assignment Branch Condition size for `apply_ruby_delegated_child_outputs` is too high. [<16, 39, 12> 43.83/17]", 842348215], - [1054, 5, 1488, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_ruby_delegated_child_outputs` is too high. [12/7]", 842348215], - [1054, 5, 1488, "Metrics/MethodLength: Method has too many lines. [27/10]", 842348215], - [1054, 5, 1488, "Metrics/PerceivedComplexity: Perceived complexity for `apply_ruby_delegated_child_outputs` is too high. [13/8]", 842348215], - [1088, 5, 980, "Metrics/MethodLength: Method has too many lines. [23/10]", 1425119613], - [1115, 5, 1025, "Metrics/MethodLength: Method has too many lines. [23/10]", 2179557432], - [1143, 5, 757, "Metrics/MethodLength: Method has too many lines. [12/10]", 3975431355], - [1148, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 1956194284], - [1160, 5, 745, "Metrics/MethodLength: Method has too many lines. [12/10]", 1051086033], - [1165, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1636990749], - [1177, 5, 670, "Metrics/MethodLength: Method has too many lines. [11/10]", 3552666292], - [1182, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 3013228499], - [1193, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 1356230953], - [1198, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 3013228499], - [1209, 5, 2093, "Metrics/AbcSize: Assignment Branch Condition size for `analyze_ruby_document` is too high. [<21, 31, 12> 39.32/17]", 3298966582], - [1209, 5, 2093, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `analyze_ruby_document` is too high. [13/7]", 3298966582], - [1209, 5, 2093, "Metrics/MethodLength: Method has too many lines. [53/10]", 3298966582], - [1209, 5, 2093, "Metrics/PerceivedComplexity: Perceived complexity for `analyze_ruby_document` is too high. [13/8]", 3298966582], - [1215, 7, 1035, "Metrics/BlockLength: Block has too many lines. [27/25]", 2081528636], - [1284, 5, 427, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_file_footer_text` is too high. [<5, 17, 8> 19.44/17]", 1703748308], - [1311, 5, 806, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_process_analysis_from_tree` is too high. [10/7]", 1109735749], - [1311, 5, 806, "Metrics/MethodLength: Method has too many lines. [19/10]", 1109735749], - [1361, 5, 533, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_import_item_from_begin_node` is too high. [8/7]", 582163830], - [1383, 5, 487, "Metrics/MethodLength: Method has too many lines. [12/10]", 3257507103], - [1400, 5, 583, "Metrics/MethodLength: Method has too many lines. [15/10]", 4108141408], - [1443, 5, 645, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_import_span_for` is too high. [<6, 22, 9> 24.52/17]", 1779826452], - [1443, 5, 645, "Metrics/MethodLength: Method has too many lines. [12/10]", 1779826452], - [1495, 5, 1015, "Metrics/MethodLength: Method has too many lines. [16/10]", 1317835917], - [1501, 121, 173, "Layout/LineLength: Line is too long. [293/120]", 225499532], - [1528, 5, 518, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_tslp_claimed_line_indexes` is too high. [<6, 19, 5> 20.54/17]", 1455439838], - [1551, 5, 443, "Metrics/MethodLength: Method has too many lines. [12/10]", 4230588206], - [1568, 5, 363, "Metrics/MethodLength: Method has too many lines. [11/10]", 3068065572], - [1629, 5, 1849, "Metrics/AbcSize: Assignment Branch Condition size for `legacy_collect_ruby_declaration_entries` is too high. [<24, 26, 13> 37.7/17]", 3187770326], - [1629, 5, 1849, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `legacy_collect_ruby_declaration_entries` is too high. [11/7]", 3187770326], - [1629, 5, 1849, "Metrics/MethodLength: Method has too many lines. [54/10]", 3187770326], - [1629, 5, 1849, "Metrics/PerceivedComplexity: Perceived complexity for `legacy_collect_ruby_declaration_entries` is too high. [11/8]", 3187770326], - [1676, 13, 76, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 1356567820], - [1712, 5, 396, "Metrics/MethodLength: Method has too many lines. [11/10]", 1239008881], - [1727, 5, 681, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_process_declaration_entries` is too high. [<7, 17, 2> 18.49/17]", 2675999354], - [1727, 5, 681, "Metrics/MethodLength: Method has too many lines. [16/10]", 2675999354], - [1747, 5, 634, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_top_level_process_structure_items` is too high. [<5, 32, 14> 35.28/17]", 1120707166], - [1747, 5, 634, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_top_level_process_structure_items` is too high. [11/7]", 1120707166], - [1747, 5, 634, "Metrics/MethodLength: Method has too many lines. [11/10]", 1120707166], - [1747, 5, 634, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_top_level_process_structure_items` is too high. [11/8]", 1120707166], - [1759, 7, 11, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 848344986], - [1766, 7, 9, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 3648222389], - [1811, 5, 1284, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_intra_owner_merge_plan` is too high. [<8, 24, 9> 26.85/17]", 2388567699], - [1811, 5, 1284, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_intra_owner_merge_plan` is too high. [9/7]", 2388567699], - [1811, 5, 1284, "Metrics/MethodLength: Method has too many lines. [22/10]", 2388567699], - [1811, 5, 1284, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_intra_owner_merge_plan` is too high. [9/8]", 2388567699], - [1852, 5, 557, "Metrics/MethodLength: Method has too many lines. [11/10]", 3178341030], - [1910, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 895013151], - [1915, 5, 593, "Metrics/MethodLength: Method has too many lines. [13/10]", 2850316611], - [1916, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177625], - [1933, 5, 609, "Metrics/MethodLength: Method has too many lines. [12/10]", 784855730], - [1948, 5, 695, "Metrics/MethodLength: Method has too many lines. [14/10]", 3942458504], - [1985, 5, 1114, "Metrics/AbcSize: Assignment Branch Condition size for `merge_declaration_hash_constants` is too high. [<11, 22, 6> 25.32/17]", 3861922947], - [1985, 5, 1114, "Metrics/MethodLength: Method has too many lines. [17/10]", 3861922947], - [2007, 5, 794, "Metrics/AbcSize: Assignment Branch Condition size for `merge_declaration_body_constants` is too high. [<9, 14, 6> 17.69/17]", 1882117166], - [2037, 5, 1138, "Metrics/AbcSize: Assignment Branch Condition size for `merge_array_constant_text` is too high. [<9, 18, 7> 21.31/17]", 1448081799], - [2037, 5, 1138, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_array_constant_text` is too high. [8/7]", 1448081799], - [2037, 5, 1138, "Metrics/MethodLength: Method has too many lines. [15/10]", 1448081799], - [2043, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193434112], - [2050, 7, 8, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 359846632], - [2057, 5, 774, "Metrics/AbcSize: Assignment Branch Condition size for `merge_percent_array_constant_text` is too high. [<8, 16, 7> 19.21/17]", 625509828], - [2057, 5, 774, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_percent_array_constant_text` is too high. [8/7]", 625509828], - [2086, 5, 1060, "Metrics/AbcSize: Assignment Branch Condition size for `merge_multiline_array_constant_text` is too high. [<11, 23, 10> 27.39/17]", 2672751288], - [2086, 5, 1060, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_multiline_array_constant_text` is too high. [11/7]", 2672751288], - [2086, 5, 1060, "Metrics/MethodLength: Method has too many lines. [13/10]", 2672751288], - [2086, 5, 1060, "Metrics/PerceivedComplexity: Perceived complexity for `merge_multiline_array_constant_text` is too high. [11/8]", 2672751288], - [2095, 7, 8, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 359846632], - [2104, 5, 1605, "Metrics/AbcSize: Assignment Branch Condition size for `merge_declaration_body_methods` is too high. [<21, 28, 15> 38.08/17]", 2740924329], - [2104, 5, 1605, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_declaration_body_methods` is too high. [14/7]", 2740924329], - [2104, 5, 1605, "Metrics/MethodLength: Method has too many lines. [29/10]", 2740924329], - [2104, 5, 1605, "Metrics/PerceivedComplexity: Perceived complexity for `merge_declaration_body_methods` is too high. [15/8]", 2740924329], - [2111, 7, 8, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 359846632], - [2138, 5, 1076, "Metrics/AbcSize: Assignment Branch Condition size for `merge_nested_body_declarations` is too high. [<14, 24, 10> 29.53/17]", 1397199527], - [2138, 5, 1076, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_nested_body_declarations` is too high. [11/7]", 1397199527], - [2138, 5, 1076, "Metrics/MethodLength: Method has too many lines. [14/10]", 1397199527], - [2138, 5, 1076, "Metrics/PerceivedComplexity: Perceived complexity for `merge_nested_body_declarations` is too high. [11/8]", 1397199527], - [2177, 5, 2549, "Metrics/AbcSize: Assignment Branch Condition size for `top_level_source_region_owners` is too high. [<24, 33, 13> 42.83/17]", 1909271685], - [2177, 5, 2549, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `top_level_source_region_owners` is too high. [11/7]", 1909271685], - [2177, 5, 2549, "Metrics/MethodLength: Method has too many lines. [64/10]", 1909271685], - [2177, 5, 2549, "Metrics/PerceivedComplexity: Perceived complexity for `top_level_source_region_owners` is too high. [11/8]", 1909271685], - [2220, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861626], - [2235, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1695648499], - [2251, 5, 2126, "Metrics/AbcSize: Assignment Branch Condition size for `container_child_source_regions` is too high. [<23, 28, 11> 37.87/17]", 4031983731], - [2251, 5, 2126, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `container_child_source_regions` is too high. [10/7]", 4031983731], - [2251, 5, 2126, "Metrics/MethodLength: Method has too many lines. [56/10]", 4031983731], - [2251, 5, 2126, "Metrics/PerceivedComplexity: Perceived complexity for `container_child_source_regions` is too high. [10/8]", 4031983731], - [2317, 5, 996, "Metrics/AbcSize: Assignment Branch Condition size for `interleave_source_regions` is too high. [<8, 14, 6> 17.2/17]", 796443872], - [2317, 5, 996, "Metrics/MethodLength: Method has too many lines. [30/10]", 796443872], - [2355, 5, 1323, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `source_interstitial_region` is too high. [13/7]", 1970451685], - [2355, 5, 1323, "Metrics/MethodLength: Method has too many lines. [30/10]", 1970451685], - [2355, 5, 1323, "Metrics/PerceivedComplexity: Perceived complexity for `source_interstitial_region` is too high. [12/8]", 1970451685], - [2355, 35, 80, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2143999554], - [2390, 5, 396, "Metrics/MethodLength: Method has too many lines. [12/10]", 663734283], - [2406, 5, 890, "Metrics/AbcSize: Assignment Branch Condition size for `collect_blank_line_regions` is too high. [<4, 18, 7> 19.72/17]", 3362926457], - [2406, 5, 890, "Metrics/MethodLength: Method has too many lines. [20/10]", 3362926457], - [2465, 5, 30, "Style/Documentation: Missing top-level documentation comment for `class Ruby::Merge::RubyHashLiteralProjector`.", 2586933062], - [2465, 5, 5733, "Metrics/ClassLength: Class has too many lines. [144/100]", 48390292], - [2498, 7, 617, "Metrics/MethodLength: Method has too many lines. [15/10]", 1617225783], - [2522, 7, 943, "Metrics/AbcSize: Assignment Branch Condition size for `project_hash_key` is too high. [<1, 18, 8> 19.72/17]", 3538404248], - [2522, 7, 943, "Metrics/MethodLength: Method has too many lines. [26/10]", 3538404248], - [2580, 7, 616, "Metrics/AbcSize: Assignment Branch Condition size for `trailing_comma?` is too high. [<3, 20, 6> 21.1/17]", 1517912413], - [2645, 5, 1202, "Metrics/AbcSize: Assignment Branch Condition size for `constant_hash_blocks` is too high. [<19, 25, 6> 31.97/17]", 399214756], - [2645, 5, 1202, "Metrics/MethodLength: Method has too many lines. [36/10]", 399214756], - [2686, 5, 727, "Metrics/AbcSize: Assignment Branch Condition size for `hash_assignment_finish_line` is too high. [<11, 7, 12> 17.72/17]", 1215874404], - [2686, 5, 727, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `hash_assignment_finish_line` is too high. [9/7]", 1215874404], - [2686, 5, 727, "Metrics/MethodLength: Method has too many lines. [26/10]", 1215874404], - [2686, 5, 727, "Metrics/PerceivedComplexity: Perceived complexity for `hash_assignment_finish_line` is too high. [11/8]", 1215874404], - [2716, 5, 2007, "Metrics/AbcSize: Assignment Branch Condition size for `direct_body_method_entries` is too high. [<28, 33, 13> 45.19/17]", 2589282610], - [2716, 5, 2007, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `direct_body_method_entries` is too high. [12/7]", 2589282610], - [2716, 5, 2007, "Metrics/MethodLength: Method has too many lines. [56/10]", 2589282610], - [2716, 5, 2007, "Metrics/PerceivedComplexity: Perceived complexity for `direct_body_method_entries` is too high. [12/8]", 2589282610], - [2781, 5, 1221, "Metrics/AbcSize: Assignment Branch Condition size for `direct_body_constant_entries` is too high. [<16, 34, 10> 38.88/17]", 1588885504], - [2781, 5, 1221, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `direct_body_constant_entries` is too high. [9/7]", 1588885504], - [2781, 5, 1221, "Metrics/MethodLength: Method has too many lines. [35/10]", 1588885504], - [2781, 5, 1221, "Metrics/PerceivedComplexity: Perceived complexity for `direct_body_constant_entries` is too high. [9/8]", 1588885504], - [2824, 5, 708, "Metrics/AbcSize: Assignment Branch Condition size for `split_ruby_array_elements` is too high. [<11, 12, 11> 19.65/17]", 1344003748], - [2824, 5, 708, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split_ruby_array_elements` is too high. [9/7]", 1344003748], - [2824, 5, 708, "Metrics/MethodLength: Method has too many lines. [24/10]", 1344003748], - [2824, 5, 708, "Metrics/PerceivedComplexity: Perceived complexity for `split_ruby_array_elements` is too high. [11/8]", 1344003748], - [2868, 5, 977, "Metrics/AbcSize: Assignment Branch Condition size for `append_multiline_array_elements` is too high. [<12, 32, 9> 35.34/17]", 1316332112], - [2868, 5, 977, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `append_multiline_array_elements` is too high. [9/7]", 1316332112], - [2868, 5, 977, "Metrics/MethodLength: Method has too many lines. [16/10]", 1316332112], - [2868, 5, 977, "Metrics/PerceivedComplexity: Perceived complexity for `append_multiline_array_elements` is too high. [9/8]", 1316332112], - [2896, 5, 728, "Metrics/AbcSize: Assignment Branch Condition size for `array_assignment_finish_line` is too high. [<11, 7, 12> 17.72/17]", 1471354607], - [2896, 5, 728, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `array_assignment_finish_line` is too high. [9/7]", 1471354607], - [2896, 5, 728, "Metrics/MethodLength: Method has too many lines. [26/10]", 1471354607], - [2896, 5, 728, "Metrics/PerceivedComplexity: Perceived complexity for `array_assignment_finish_line` is too high. [11/8]", 1471354607], - [2932, 5, 1127, "Metrics/AbcSize: Assignment Branch Condition size for `direct_body_declaration_entries` is too high. [<14, 30, 7> 33.84/17]", 1223661118], - [2932, 5, 1127, "Metrics/MethodLength: Method has too many lines. [30/10]", 1223661118], - [2979, 5, 984, "Metrics/AbcSize: Assignment Branch Condition size for `insert_declaration_body_blocks` is too high. [<4, 23, 12> 26.25/17]", 159690081], - [2979, 5, 984, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `insert_declaration_body_blocks` is too high. [9/7]", 159690081], - [2979, 5, 984, "Metrics/MethodLength: Method has too many lines. [16/10]", 159690081], - [2979, 5, 984, "Metrics/PerceivedComplexity: Perceived complexity for `insert_declaration_body_blocks` is too high. [10/8]", 159690081], - [3024, 5, 1027, "Metrics/AbcSize: Assignment Branch Condition size for `merge_ruby_hash_literals` is too high. [<8, 30, 9> 32.33/17]", 2793745298], - [3024, 5, 1027, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_ruby_hash_literals` is too high. [9/7]", 2793745298], - [3024, 5, 1027, "Metrics/MethodLength: Method has too many lines. [19/10]", 2793745298], - [3024, 5, 1027, "Metrics/PerceivedComplexity: Perceived complexity for `merge_ruby_hash_literals` is too high. [10/8]", 2793745298], - [3046, 5, 636, "Metrics/AbcSize: Assignment Branch Condition size for `render_ruby_hash_literal` is too high. [<5, 19, 6> 20.54/17]", 1834383244], - [3086, 5, 491, "Metrics/MethodLength: Method has too many lines. [11/10]", 1799924605], - [3119, 5, 1125, "Metrics/AbcSize: Assignment Branch Condition size for `surfaces_for_owner` is too high. [<6, 19, 3> 20.15/17]", 4036098594], - [3119, 5, 1125, "Metrics/MethodLength: Method has too many lines. [20/10]", 4036098594], - [3144, 5, 1126, "Metrics/AbcSize: Assignment Branch Condition size for `example_surfaces_for` is too high. [<4, 20, 2> 20.49/17]", 757808110], - [3144, 5, 1126, "Metrics/MethodLength: Method has too many lines. [21/10]", 757808110] - ], - "lib/ruby/merge/block_directive_detector.rb:315354690": [ - [10, 5, 6220, "Metrics/ClassLength: Class has too many lines. [161/100]", 3182117306], - [83, 7, 1085, "Metrics/AbcSize: Assignment Branch Condition size for `detect_freeze_spans` is too high. [<10, 18, 6> 21.45/17]", 3827147306], - [83, 7, 1085, "Metrics/MethodLength: Method has too many lines. [27/10]", 3827147306], - [117, 7, 1508, "Metrics/AbcSize: Assignment Branch Condition size for `detect_nocov_spans` is too high. [<10, 30, 10> 33.17/17]", 3750116369], - [117, 7, 1508, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_nocov_spans` is too high. [9/7]", 3750116369], - [117, 7, 1508, "Metrics/MethodLength: Method has too many lines. [40/10]", 3750116369], - [117, 7, 1508, "Metrics/PerceivedComplexity: Perceived complexity for `detect_nocov_spans` is too high. [12/8]", 3750116369], - [125, 9, 1189, "Metrics/BlockLength: Block has too many lines. [30/25]", 431470454], - [165, 7, 921, "Metrics/AbcSize: Assignment Branch Condition size for `validate_no_crossing` is too high. [<8, 16, 8> 19.6/17]", 1072352384], - [165, 7, 921, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_no_crossing` is too high. [8/7]", 1072352384], - [165, 7, 921, "Metrics/MethodLength: Method has too many lines. [19/10]", 1072352384], - [193, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193343749], - [194, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860841] - ], - "lib/ruby/merge/doc_comment_support.rb:11585367": [ - [71, 7, 950, "Metrics/AbcSize: Assignment Branch Condition size for `example_blocks` is too high. [<8, 17, 8> 20.42/17]", 878231540], - [71, 7, 950, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `example_blocks` is too high. [8/7]", 878231540], - [71, 7, 950, "Metrics/MethodLength: Method has too many lines. [19/10]", 878231540] - ], - "lib/ruby/merge/gemspec_support.rb:672395758": [ - [5, 5, 21, "Style/Documentation: Missing top-level documentation comment for `module Ruby::Merge::GemspecSupport`.", 593910650] - ], - "lib/ruby/merge/magic_comment_support.rb:2193186223": [ - [26, 7, 1484, "Metrics/AbcSize: Assignment Branch Condition size for `comment_only_prefix_info` is too high. [<9, 38, 8> 39.86/17]", 1098666313], - [26, 7, 1484, "Metrics/MethodLength: Method has too many lines. [33/10]", 1098666313], - [69, 7, 693, "Metrics/AbcSize: Assignment Branch Condition size for `header_magic_comment_types_for_lines` is too high. [<10, 13, 9> 18.71/17]", 3693768719], - [69, 7, 693, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `header_magic_comment_types_for_lines` is too high. [8/7]", 3693768719], - [69, 7, 693, "Metrics/MethodLength: Method has too many lines. [16/10]", 3693768719], - [93, 7, 747, "Metrics/AbcSize: Assignment Branch Condition size for `prefix_comment_line_numbers_for_comments` is too high. [<10, 12, 7> 17.12/17]", 1181507516], - [93, 7, 747, "Metrics/MethodLength: Method has too many lines. [19/10]", 1181507516] - ], - "lib/ruby/merge/method_similarity.rb:3120642740": [ - [5, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ruby::Merge::MethodSimilarity`.", 3784960433], - [23, 7, 493, "Metrics/AbcSize: Assignment Branch Condition size for `param_similarity` is too high. [<4, 19, 4> 19.82/17]", 1175888813], - [45, 7, 738, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<13, 29, 8> 32.77/17]", 1085087702], - [45, 7, 738, "Metrics/MethodLength: Method has too many lines. [20/10]", 1085087702] - ], - "lib/ruby/merge/nocov_node_base.rb:1713613866": [ - [23, 21, 84, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3439911158], - [51, 7, 353, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `signature` is too high. [8/7]", 3442013923], - [51, 7, 353, "Metrics/PerceivedComplexity: Perceived complexity for `signature` is too high. [9/8]", 3442013923] - ], - "lib/ruby/merge/rescue_semantics.rb:2728370094": [ - [5, 5, 21, "Style/Documentation: Missing top-level documentation comment for `class Ruby::Merge::RescueSemantics`.", 4002082661], - [5, 5, 8140, "Metrics/ClassLength: Class has too many lines. [157/100]", 3302970297], - [10, 7, 812, "Metrics/AbcSize: Assignment Branch Condition size for `merge_ordered_clause_types` is too high. [<9, 17, 8> 20.83/17]", 391537814], - [10, 7, 812, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_ordered_clause_types` is too high. [8/7]", 391537814], - [10, 7, 812, "Metrics/MethodLength: Method has too many lines. [16/10]", 391537814], - [10, 7, 812, "Metrics/PerceivedComplexity: Perceived complexity for `merge_ordered_clause_types` is too high. [9/8]", 391537814], - [33, 7, 1470, "Metrics/AbcSize: Assignment Branch Condition size for `canonicalize_rescue_clause_order` is too high. [<18, 28, 14> 36.11/17]", 570708009], - [33, 7, 1470, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonicalize_rescue_clause_order` is too high. [14/7]", 570708009], - [33, 7, 1470, "Metrics/MethodLength: Method has too many lines. [24/10]", 570708009], - [33, 7, 1470, "Metrics/PerceivedComplexity: Perceived complexity for `canonicalize_rescue_clause_order` is too high. [14/8]", 570708009], - [113, 7, 1080, "Metrics/AbcSize: Assignment Branch Condition size for `source_defined_exception_hierarchy` is too high. [<9, 20, 10> 24.1/17]", 3196945148], - [113, 7, 1080, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `source_defined_exception_hierarchy` is too high. [10/7]", 3196945148], - [113, 7, 1080, "Metrics/MethodLength: Method has too many lines. [15/10]", 3196945148], - [113, 7, 1080, "Metrics/PerceivedComplexity: Perceived complexity for `source_defined_exception_hierarchy` is too high. [11/8]", 3196945148], - [126, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1806710570] - ], - "lib/ruby/merge/scaffold_chunk_support.rb:640658628": [ - [5, 5, 27, "Style/Documentation: Missing top-level documentation comment for `module Ruby::Merge::ScaffoldChunkSupport`.", 2416541725] - ], - "lib/ruby/merge/signature_support.rb:1167161535": [ - [5, 5, 23, "Style/Documentation: Missing top-level documentation comment for `module Ruby::Merge::SignatureSupport`.", 2080470772] - ], - "ruby-merge.gemspec:503862341": [ - [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ], - "spec/fixtures_integration_spec.rb:2791875397": [ - [7, 1, 71426, "Metrics/BlockLength: Block has too many lines. [1643/25]", 1328376978], - [8, 3, 94, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 4224869601], - [9, 3, 80, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3493759864], - [10, 3, 72, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 218819604], - [11, 3, 83, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3957977039], - [125, 3, 1207, "Metrics/BlockLength: Block has too many lines. [27/25]", 2841005266], - [206, 3, 1550, "Metrics/BlockLength: Block has too many lines. [44/25]", 1381861178], - [257, 3, 1209, "Metrics/BlockLength: Block has too many lines. [33/25]", 1745132505], - [297, 3, 61330, "Metrics/BlockLength: Block has too many lines. [1387/25]", 3444780370], - [693, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859109], - [1777, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3355833611], - [1784, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 38619260] - ], - "spec/hash_literal_projector_spec.rb:2425567956": [ - [13, 41, 31, "Lint/PercentStringArray: Within `%w`/`%W`, quotes and ',' are unnecessary and may be unwanted in the resulting strings.", 3214960854] - ], - "spec/rescue_semantics_spec.rb:2518131257": [ - [5, 1, 2150, "Metrics/BlockLength: Block has too many lines. [59/25]", 163524539] - ] -} diff --git a/gems/ruby-merge/Gemfile b/gems/ruby-merge/Gemfile index 2a659368c..b4bfd9736 100644 --- a/gems/ruby-merge/Gemfile +++ b/gems/ruby-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source "https://gem.coop" +source 'https://gem.coop' git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,58 +19,54 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ["~> 1.0", ">= 1.0.8"] -gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ['~> 1.0', '>= 1.0.8'] +gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ast-merge tree_haver ] -direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") +direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? if direct_sibling_gems.any? && - (direct_sibling_local || - ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) - direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") - direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) begin nomono_activation_requirements = nomono_requirements - nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) if File.file?(nomono_lockfile) nomono_locked_spec = Bundler::LockfileParser - .new(Bundler.read_file(nomono_lockfile)) - .specs - .find { |spec| spec.name == "nomono" } + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } nomono_locked = nomono_locked_spec && - Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) - if nomono_locked - nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] - end - end - Kernel.send(:gem, "nomono", *nomono_activation_requirements) - require "nomono/bundler" - if direct_sibling_templating && !direct_sibling_local - ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local eval_nomono_gems( gems: direct_sibling_gems, - prefix: "STRUCTUREDMERGE", - path_env: "STRUCTUREDMERGE_DEV", - root: ["src", "my", "structuredmerge"] + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] ) rescue LoadError - warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' ensure if direct_sibling_templating && !direct_sibling_local if direct_sibling_dev_was_set - ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original else - ENV.delete("STRUCTUREDMERGE_DEV") + ENV.delete('STRUCTUREDMERGE_DEV') end end end @@ -294,25 +290,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging -eval_gemfile "gemfiles/modular/debug.gemfile" +eval_gemfile 'gemfiles/modular/debug.gemfile' # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile "gemfiles/modular/coverage.gemfile" +eval_gemfile 'gemfiles/modular/coverage.gemfile' # Linting -eval_gemfile "gemfiles/modular/style.gemfile" +eval_gemfile 'gemfiles/modular/style.gemfile' # Documentation -eval_gemfile "gemfiles/modular/documentation.gemfile" +eval_gemfile 'gemfiles/modular/documentation.gemfile' # Optional -eval_gemfile "gemfiles/modular/optional.gemfile" +eval_gemfile 'gemfiles/modular/optional.gemfile' ### Std Lib Extracted Gems -eval_gemfile "gemfiles/modular/x_std_libs.gemfile" +eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' # See unlocked_deps appraisal for more details on irb inclusion -gem "irb", "~> 1.17" # ruby >= 2.7 +gem 'irb', '~> 1.17' # ruby >= 2.7 diff --git a/gems/ruby-merge/Gemfile.lock b/gems/ruby-merge/Gemfile.lock index 691f91a12..fb5b38919 100644 --- a/gems/ruby-merge/Gemfile.lock +++ b/gems/ruby-merge/Gemfile.lock @@ -16,265 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +40,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +103,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +131,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +270,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +322,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +373,22 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -687,52 +399,30 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0.0) ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +430,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +442,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +469,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +480,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -835,8 +511,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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +519,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +532,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +547,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ruby-merge/Rakefile b/gems/ruby-merge/Rakefile index c7b8a4b9e..c528d41ee 100644 --- a/gems/ruby-merge/Rakefile +++ b/gems/ruby-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require "kettle/drift" + require 'kettle/drift' Kettle::Drift.install_tasks rescue LoadError - desc("(stub) kettle:drift:check is unavailable") - task("kettle:drift:check") do + desc('(stub) kettle:drift:check is unavailable') + task('kettle:drift:check') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:update is unavailable") - task("kettle:drift:update") do + desc('(stub) kettle:drift:update is unavailable') + task('kettle:drift:update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:force_update is unavailable") - task("kettle:drift:force_update") do + desc('(stub) kettle:drift:force_update is unavailable') + task('kettle:drift:force_update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift is unavailable") - task("kettle:drift" => "kettle:drift:update") + desc('(stub) kettle:drift is unavailable') + task('kettle:drift' => 'kettle:drift:update') end ### TEMPLATING TASKS diff --git a/gems/toml-merge/.rubocop_gradual.lock b/gems/toml-merge/.rubocop_gradual.lock new file mode 100644 index 000000000..918c85d88 --- /dev/null +++ b/gems/toml-merge/.rubocop_gradual.lock @@ -0,0 +1,258 @@ +{ + ".simplecov:3682400110": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:133885645": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/toml-merge.rb:3814390984": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`toml-merge.rb`) should use snake_case.", 5381], + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "lib/toml/merge.rb:3069711497": [ + [39, 3, 12193, "Metrics/ModuleLength: Module has too many lines. [231/100]", 1479901406], + [114, 5, 9241, "Metrics/ClassLength: Class has too many lines. [205/100]", 349141169], + [156, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1773216188], + [165, 7, 709, "Metrics/MethodLength: Method has too many lines. [17/10]", 2355964538], + [191, 7, 1280, "Metrics/AbcSize: Assignment Branch Condition size for `merge_toml` is too high. [<6, 16, 6> 18.11/17]", 2322240506], + [191, 7, 1280, "Metrics/MethodLength: Method has too many lines. [25/10]", 2322240506], + [195, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1773216188], + [222, 7, 1401, "Metrics/AbcSize: Assignment Branch Condition size for `merge_toml_with_parser` is too high. [<6, 18, 6> 19.9/17]", 3118052892], + [222, 7, 1401, "Metrics/MethodLength: Method has too many lines. [24/10]", 3118052892], + [321, 9, 11, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 848344986] + ], + "lib/toml/merge/comment_tracker.rb:743656609": [ + [16, 5, 5242, "Metrics/ClassLength: Class has too many lines. [112/100]", 3014190138], + [28, 7, 990, "Metrics/MethodLength: Method has too many lines. [17/10]", 85804539], + [92, 7, 949, "Metrics/AbcSize: Assignment Branch Condition size for `build_toml_region` is too high. [<7, 21, 9> 23.9/17]", 552845000], + [92, 7, 949, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_toml_region` is too high. [9/7]", 552845000], + [92, 7, 949, "Metrics/MethodLength: Method has too many lines. [23/10]", 552845000], + [92, 7, 949, "Metrics/PerceivedComplexity: Perceived complexity for `build_toml_region` is too high. [9/8]", 552845000] + ], + "lib/toml/merge/conflict_resolver.rb:2699752146": [ + [11, 5, 42658, "Metrics/ClassLength: Class has too many lines. [791/100]", 2931993361], + [30, 7, 788, "Metrics/MethodLength: Method has too many lines. [13/10]", 2218400960], + [30, 21, 235, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 788504679], + [31, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3099130903], + [52, 7, 1676, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_batch` is too high. [<4, 24, 3> 24.52/17]", 623996510], + [52, 7, 1676, "Metrics/MethodLength: Method has too many lines. [29/10]", 623996510], + [53, 9, 1632, "Metrics/BlockLength: Block has too many lines. [27/25]", 3553849414], + [101, 7, 8464, "Metrics/AbcSize: Assignment Branch Condition size for `merge_node_lists_to_emitter` is too high. [<54, 88, 31> 107.8/17]", 3669765511], + [101, 7, 8464, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_node_lists_to_emitter` is too high. [27/7]", 3669765511], + [101, 7, 8464, "Metrics/MethodLength: Method has too many lines. [141/10]", 3669765511], + [101, 7, 8464, "Metrics/PerceivedComplexity: Perceived complexity for `merge_node_lists_to_emitter` is too high. [29/8]", 3669765511], + [146, 9, 5685, "Metrics/BlockLength: Block has too many lines. [102/25]", 464560406], + [286, 7, 2458, "Metrics/AbcSize: Assignment Branch Condition size for `merge_matched_nodes_to_emitter` is too high. [<6, 17, 10> 20.62/17]", 4036358483], + [286, 7, 2458, "Metrics/MethodLength: Method has too many lines. [49/10]", 4036358483], + [286, 7, 2458, "Metrics/PerceivedComplexity: Perceived complexity for `merge_matched_nodes_to_emitter` is too high. [9/8]", 4036358483], + [289, 11, 1647, "Metrics/BlockLength: Block has too many lines. [34/25]", 997955803], + [353, 7, 770, "Metrics/MethodLength: Method has too many lines. [21/10]", 543737609], + [387, 7, 1101, "Metrics/AbcSize: Assignment Branch Condition size for `build_refined_matches` is too high. [<11, 16, 8> 21/17]", 4236016583], + [387, 7, 1101, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_refined_matches` is too high. [9/7]", 4236016583], + [387, 7, 1101, "Metrics/MethodLength: Method has too many lines. [18/10]", 4236016583], + [387, 7, 1101, "Metrics/PerceivedComplexity: Perceived complexity for `build_refined_matches` is too high. [9/8]", 4236016583], + [427, 7, 642, "Metrics/AbcSize: Assignment Branch Condition size for `emit_removed_destination_node_inline_comments` is too high. [<4, 20, 5> 21/17]", 2624953678], + [427, 7, 642, "Metrics/MethodLength: Method has too many lines. [11/10]", 2624953678], + [462, 7, 720, "Metrics/MethodLength: Method has too many lines. [11/10]", 4270722493], + [499, 7, 1022, "Metrics/MethodLength: Method has too many lines. [17/10]", 3216685542], + [584, 7, 1854, "Metrics/AbcSize: Assignment Branch Condition size for `emit_leading_region` is too high. [<8, 28, 9> 30.48/17]", 377203837], + [584, 7, 1854, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_leading_region` is too high. [10/7]", 377203837], + [584, 7, 1854, "Metrics/MethodLength: Method has too many lines. [32/10]", 377203837], + [584, 7, 1854, "Metrics/PerceivedComplexity: Perceived complexity for `emit_leading_region` is too high. [10/8]", 377203837], + [685, 7, 1275, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_template_preamble_prefix_region` is too high. [<7, 24, 9> 26.57/17]", 1754222078], + [685, 7, 1275, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collapse_template_preamble_prefix_region` is too high. [8/7]", 1754222078], + [685, 7, 1275, "Metrics/MethodLength: Method has too many lines. [24/10]", 1754222078], + [716, 7, 662, "Metrics/AbcSize: Assignment Branch Condition size for `root_boundary_lines_for` is too high. [<4, 15, 10> 18.47/17]", 935744348], + [716, 7, 662, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `root_boundary_lines_for` is too high. [9/7]", 935744348], + [716, 7, 662, "Metrics/MethodLength: Method has too many lines. [14/10]", 935744348], + [736, 7, 343, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `region_lines_for` is too high. [8/7]", 399995706], + [753, 7, 614, "Metrics/AbcSize: Assignment Branch Condition size for `dedup_warning_context` is too high. [<0, 20, 10> 22.36/17]", 2011768288], + [753, 7, 614, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `dedup_warning_context` is too high. [11/7]", 2011768288], + [753, 7, 614, "Metrics/PerceivedComplexity: Perceived complexity for `dedup_warning_context` is too high. [11/8]", 2011768288], + [756, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [757, 41, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [757, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 3287405165], + [783, 7, 1426, "Metrics/MethodLength: Method has too many lines. [34/10]", 1351993853], + [849, 7, 955, "Metrics/MethodLength: Method has too many lines. [21/10]", 3080929417], + [877, 7, 1249, "Metrics/AbcSize: Assignment Branch Condition size for `emit_node_lines` is too high. [<6, 21, 6> 22.65/17]", 3195628693], + [877, 7, 1249, "Metrics/MethodLength: Method has too many lines. [21/10]", 3195628693], + [952, 7, 637, "Metrics/AbcSize: Assignment Branch Condition size for `inline_region_separator` is too high. [<5, 18, 7> 19.95/17]", 2029360360], + [952, 7, 637, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `inline_region_separator` is too high. [8/7]", 2029360360], + [952, 7, 637, "Metrics/MethodLength: Method has too many lines. [12/10]", 2029360360], + [969, 7, 465, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_interstitial_blank_lines` is too high. [9/7]", 1640065866], + [969, 7, 465, "Metrics/PerceivedComplexity: Perceived complexity for `emit_interstitial_blank_lines` is too high. [9/8]", 1640065866], + [981, 7, 620, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_gap_before_node` is too high. [12/7]", 2808239642], + [981, 7, 620, "Metrics/PerceivedComplexity: Perceived complexity for `emit_gap_before_node` is too high. [12/8]", 2808239642], + [983, 36, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [998, 7, 526, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_preceding_blank_lines` is too high. [8/7]", 3889743093], + [998, 7, 526, "Metrics/MethodLength: Method has too many lines. [11/10]", 3889743093] + ], + "lib/toml/merge/file_analysis.rb:2630402533": [ + [12, 5, 19537, "Metrics/ClassLength: Class has too many lines. [368/100]", 929433986], + [15, 7, 22, "Style/Documentation: Missing top-level documentation comment for `class Toml::Merge::FileAnalysis::CommentAugmenter`.", 2864244718], + [20, 9, 849, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<11, 13, 1> 17.06/17]", 1333266342], + [20, 9, 849, "Metrics/MethodLength: Method has too many lines. [16/10]", 1333266342], + [72, 7, 869, "Metrics/MethodLength: Method has too many lines. [13/10]", 1683071581], + [228, 7, 959, "Metrics/AbcSize: Assignment Branch Condition size for `root_pairs` is too high. [<10, 13, 16> 22.91/17]", 1481059821], + [228, 7, 959, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `root_pairs` is too high. [15/7]", 1481059821], + [228, 7, 959, "Metrics/MethodLength: Method has too many lines. [21/10]", 1481059821], + [228, 7, 959, "Metrics/PerceivedComplexity: Perceived complexity for `root_pairs` is too high. [15/8]", 1481059821], + [246, 9, 384, "Style/CombinableLoops: Combine this loop with the previous loop.", 2434692315], + [263, 7, 1743, "Metrics/AbcSize: Assignment Branch Condition size for `parse_toml` is too high. [<10, 12, 8> 17.55/17]", 1966830746], + [263, 7, 1743, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_toml` is too high. [9/7]", 1966830746], + [263, 7, 1743, "Metrics/MethodLength: Method has too many lines. [19/10]", 1966830746], + [331, 7, 596, "Metrics/MethodLength: Method has too many lines. [13/10]", 995924372], + [389, 7, 588, "Metrics/AbcSize: Assignment Branch Condition size for `comment_owner_end_line_for_augmenter` is too high. [<1, 20, 13> 23.87/17]", 1972553155], + [389, 7, 588, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `comment_owner_end_line_for_augmenter` is too high. [14/7]", 1972553155], + [389, 7, 588, "Metrics/PerceivedComplexity: Perceived complexity for `comment_owner_end_line_for_augmenter` is too high. [14/8]", 1972553155], + [448, 7, 1255, "Metrics/AbcSize: Assignment Branch Condition size for `scan_line_for_comment` is too high. [<16, 13, 17> 26.72/17]", 622981429], + [448, 7, 1255, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `scan_line_for_comment` is too high. [12/7]", 622981429], + [448, 7, 1255, "Metrics/MethodLength: Method has too many lines. [38/10]", 622981429], + [448, 7, 1255, "Metrics/PerceivedComplexity: Perceived complexity for `scan_line_for_comment` is too high. [13/8]", 622981429], + [496, 7, 319, "Metrics/MethodLength: Method has too many lines. [11/10]", 2890996257], + [535, 7, 416, "Metrics/MethodLength: Method has too many lines. [11/10]", 2416972242], + [576, 7, 464, "Metrics/AbcSize: Assignment Branch Condition size for `node_text` is too high. [<3, 16, 8> 18.14/17]", 2138809005], + [576, 7, 464, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `node_text` is too high. [8/7]", 2138809005] + ], + "lib/toml/merge/key_sorter.rb:829731466": [ + [59, 7, 1787, "Metrics/AbcSize: Assignment Branch Condition size for `partition_into_blocks` is too high. [<11, 23, 8> 26.72/17]", 3324132918], + [59, 7, 1787, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `partition_into_blocks` is too high. [8/7]", 3324132918], + [59, 7, 1787, "Metrics/MethodLength: Method has too many lines. [38/10]", 3324132918], + [59, 7, 1787, "Metrics/PerceivedComplexity: Perceived complexity for `partition_into_blocks` is too high. [9/8]", 3324132918] + ], + "lib/toml/merge/node_type_normalizer.rb:2171981470": [ + [67, 5, 7844, "Metrics/ModuleLength: Module has too many lines. [134/100]", 828548837], + [159, 11, 4, "Lint/BooleanSymbol: Symbol with a boolean name - you probably meant to use `true`.", 2087932467], + [160, 11, 5, "Lint/BooleanSymbol: Symbol with a boolean name - you probably meant to use `false`.", 170962968], + [215, 11, 4, "Lint/BooleanSymbol: Symbol with a boolean name - you probably meant to use `true`.", 2087932467], + [216, 11, 5, "Lint/BooleanSymbol: Symbol with a boolean name - you probably meant to use `false`.", 170962968] + ], + "lib/toml/merge/node_wrapper.rb:975742583": [ + [26, 5, 24084, "Metrics/ClassLength: Class has too many lines. [424/100]", 111672250], + [37, 9, 517, "Metrics/MethodLength: Method has too many lines. [11/10]", 3513234297], + [37, 17, 154, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2431837951], + [54, 7, 503, "Metrics/MethodLength: Method has too many lines. [12/10]", 2647031658], + [54, 21, 82, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2652802373], + [229, 7, 1380, "Metrics/AbcSize: Assignment Branch Condition size for `value_node` is too high. [<5, 16, 10> 19.52/17]", 1398903082], + [229, 7, 1380, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `value_node` is too high. [9/7]", 1398903082], + [229, 7, 1380, "Metrics/MethodLength: Method has too many lines. [32/10]", 1398903082], + [229, 7, 1380, "Metrics/PerceivedComplexity: Perceived complexity for `value_node` is too high. [9/8]", 1398903082], + [232, 9, 1306, "Metrics/BlockLength: Block has too many lines. [28/25]", 3342818997], + [286, 7, 496, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `pairs` is too high. [9/7]", 2741436417], + [286, 7, 496, "Metrics/PerceivedComplexity: Perceived complexity for `pairs` is too high. [9/8]", 2741436417], + [319, 7, 706, "Metrics/MethodLength: Method has too many lines. [22/10]", 2032215880], + [390, 7, 753, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `effective_end_line` is too high. [10/7]", 29395992], + [390, 7, 753, "Metrics/PerceivedComplexity: Perceived complexity for `effective_end_line` is too high. [10/8]", 29395992], + [414, 7, 2225, "Metrics/AbcSize: Assignment Branch Condition size for `compute_signature` is too high. [<9, 32, 24> 41/17]", 1299303855], + [414, 7, 2225, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_signature` is too high. [25/7]", 1299303855], + [414, 7, 2225, "Metrics/MethodLength: Method has too many lines. [39/10]", 1299303855], + [414, 7, 2225, "Metrics/PerceivedComplexity: Perceived complexity for `compute_signature` is too high. [16/8]", 1299303855], + [523, 7, 487, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `raw_pair_value_text` is too high. [8/7]", 3177077098], + [547, 7, 1503, "Metrics/AbcSize: Assignment Branch Condition size for `collect_inline_table_keys_recursive` is too high. [<7, 25, 18> 31.59/17]", 3778857543], + [547, 7, 1503, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_inline_table_keys_recursive` is too high. [17/7]", 3778857543], + [547, 7, 1503, "Metrics/MethodLength: Method has too many lines. [24/10]", 3778857543], + [547, 7, 1503, "Metrics/PerceivedComplexity: Perceived complexity for `collect_inline_table_keys_recursive` is too high. [18/8]", 3778857543], + [605, 7, 855, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_sibling_pairs_for_table` is too high. [8/7]", 3160731503], + [605, 7, 855, "Metrics/MethodLength: Method has too many lines. [14/10]", 3160731503], + [636, 7, 655, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_next_table_start_line` is too high. [9/7]", 1465728116], + [636, 7, 655, "Metrics/MethodLength: Method has too many lines. [12/10]", 1465728116], + [636, 7, 655, "Metrics/PerceivedComplexity: Perceived complexity for `find_next_table_start_line` is too high. [9/8]", 1465728116], + [665, 7, 861, "Metrics/MethodLength: Method has too many lines. [12/10]", 4202205110] + ], + "lib/toml/merge/smart_merger.rb:3624815957": [ + [39, 5, 9573, "Metrics/ClassLength: Class has too many lines. [190/100]", 1615610584], + [72, 7, 1283, "Metrics/MethodLength: Method has too many lines. [18/10]", 2597249100], + [72, 21, 427, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 1661881927], + [144, 7, 1347, "Metrics/AbcSize: Assignment Branch Condition size for `merge_with_debug` is too high. [<3, 20, 7> 21.4/17]", 2015540458], + [144, 7, 1347, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_with_debug` is too high. [8/7]", 2015540458], + [144, 7, 1347, "Metrics/MethodLength: Method has too many lines. [31/10]", 2015540458], + [248, 7, 1161, "Metrics/MethodLength: Method has too many lines. [26/10]", 1453116447] + ], + "lib/toml/merge/table_match_refiner.rb:1590173808": [ + [32, 5, 7338, "Metrics/ClassLength: Class has too many lines. [108/100]", 3006106276], + [113, 35, 50, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1492696344], + [147, 7, 410, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_table_name` is too high. [8/7]", 2032455294], + [217, 7, 659, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<11, 38, 8> 40.36/17]", 2658150371], + [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:3985149016": [ + [3, 1, 12320, "Metrics/BlockLength: Block has too many lines. [273/25]", 2102318823], + [34, 3, 2099, "Metrics/BlockLength: Block has too many lines. [27/25]", 677669008], + [233, 3, 1127, "Metrics/BlockLength: Block has too many lines. [27/25]", 3231986094] + ], + "toml-merge.gemspec:2519299257": [ + [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ] +} diff --git a/gems/toml-merge/Gemfile b/gems/toml-merge/Gemfile index 5ae2e72c0..a85d99fde 100644 --- a/gems/toml-merge/Gemfile +++ b/gems/toml-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source "https://gem.coop" +source 'https://gem.coop' git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,58 +19,54 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ["~> 1.0", ">= 1.0.8"] -gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ['~> 1.0', '>= 1.0.8'] +gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ast-merge tree_haver ] -direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") +direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? if direct_sibling_gems.any? && - (direct_sibling_local || - ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) - direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") - direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) begin nomono_activation_requirements = nomono_requirements - nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) if File.file?(nomono_lockfile) nomono_locked_spec = Bundler::LockfileParser - .new(Bundler.read_file(nomono_lockfile)) - .specs - .find { |spec| spec.name == "nomono" } + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } nomono_locked = nomono_locked_spec && - Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) - if nomono_locked - nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] - end - end - Kernel.send(:gem, "nomono", *nomono_activation_requirements) - require "nomono/bundler" - if direct_sibling_templating && !direct_sibling_local - ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local eval_nomono_gems( gems: direct_sibling_gems, - prefix: "STRUCTUREDMERGE", - path_env: "STRUCTUREDMERGE_DEV", - root: ["src", "my", "structuredmerge"] + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] ) rescue LoadError - warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' ensure if direct_sibling_templating && !direct_sibling_local if direct_sibling_dev_was_set - ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original else - ENV.delete("STRUCTUREDMERGE_DEV") + ENV.delete('STRUCTUREDMERGE_DEV') end end end @@ -294,25 +290,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging -eval_gemfile "gemfiles/modular/debug.gemfile" +eval_gemfile 'gemfiles/modular/debug.gemfile' # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile "gemfiles/modular/coverage.gemfile" +eval_gemfile 'gemfiles/modular/coverage.gemfile' # Linting -eval_gemfile "gemfiles/modular/style.gemfile" +eval_gemfile 'gemfiles/modular/style.gemfile' # Documentation -eval_gemfile "gemfiles/modular/documentation.gemfile" +eval_gemfile 'gemfiles/modular/documentation.gemfile' # Optional -eval_gemfile "gemfiles/modular/optional.gemfile" +eval_gemfile 'gemfiles/modular/optional.gemfile' ### Std Lib Extracted Gems -eval_gemfile "gemfiles/modular/x_std_libs.gemfile" +eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' # See unlocked_deps appraisal for more details on irb inclusion -gem "irb", "~> 1.17" # ruby >= 2.7 +gem 'irb', '~> 1.17' # ruby >= 2.7 diff --git a/gems/toml-merge/Gemfile.lock b/gems/toml-merge/Gemfile.lock index fef01f4f8..f4338c0b4 100644 --- a/gems/toml-merge/Gemfile.lock +++ b/gems/toml-merge/Gemfile.lock @@ -17,39 +17,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -58,193 +26,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -252,45 +34,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -310,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -324,6 +61,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -379,6 +117,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -397,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -537,23 +283,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -587,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +381,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,61 +406,40 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +452,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +479,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +490,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,19 +517,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,19 +541,15 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +557,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/toml-merge/Rakefile b/gems/toml-merge/Rakefile index 4d0c02b16..1038ac780 100644 --- a/gems/toml-merge/Rakefile +++ b/gems/toml-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require "kettle/drift" + require 'kettle/drift' Kettle::Drift.install_tasks rescue LoadError - desc("(stub) kettle:drift:check is unavailable") - task("kettle:drift:check") do + desc('(stub) kettle:drift:check is unavailable') + task('kettle:drift:check') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:update is unavailable") - task("kettle:drift:update") do + desc('(stub) kettle:drift:update is unavailable') + task('kettle:drift:update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:force_update is unavailable") - task("kettle:drift:force_update") do + desc('(stub) kettle:drift:force_update is unavailable') + task('kettle:drift:force_update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift is unavailable") - task("kettle:drift" => "kettle:drift:update") + desc('(stub) kettle:drift is unavailable') + task('kettle:drift' => 'kettle:drift:update') end ### TEMPLATING TASKS diff --git a/gems/toml-merge/bin/yard b/gems/toml-merge/bin/yard index a7e8b6eed..5d516ad6f 100755 --- a/gems/toml-merge/bin/yard +++ b/gems/toml-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec("bundle", "exec", "rake", "yard") +exec('bundle', 'exec', 'rake', 'yard') diff --git a/gems/toml-merge/lib/toml/merge/version.rb b/gems/toml-merge/lib/toml/merge/version.rb index 91c4e4d84..d9074beaf 100644 --- a/gems/toml-merge/lib/toml/merge/version.rb +++ b/gems/toml-merge/lib/toml/merge/version.rb @@ -3,7 +3,7 @@ module Toml module Merge module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/yaml-merge/Gemfile.lock b/gems/yaml-merge/Gemfile.lock index 89d153c1b..8b0e8ac0f 100644 --- a/gems/yaml-merge/Gemfile.lock +++ b/gems/yaml-merge/Gemfile.lock @@ -16,24 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -45,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -335,6 +322,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,7 +373,6 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - ast-merge! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) debug (>= 1.1) @@ -410,7 +401,6 @@ DEPENDENCIES standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - tree_haver! tree_sitter_language_pack! yaml-converter (~> 0.1) yaml-merge! From 599001178572b86ef23b507a169d292d9ae75bb7 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:36:25 -0600 Subject: [PATCH 199/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/go-merge/.rubocop_gradual.lock | 102 ++++++ gems/go-merge/Gemfile.lock | 378 ++-------------------- gems/ruby-merge/lib/ruby/merge/version.rb | 2 +- 3 files changed, 132 insertions(+), 350 deletions(-) create mode 100644 gems/go-merge/.rubocop_gradual.lock diff --git a/gems/go-merge/.rubocop_gradual.lock b/gems/go-merge/.rubocop_gradual.lock new file mode 100644 index 000000000..bb6039651 --- /dev/null +++ b/gems/go-merge/.rubocop_gradual.lock @@ -0,0 +1,102 @@ +{ + ".simplecov:203349166": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:522749197": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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:3413698974": [ + [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ], + "lib/go-merge.rb:1938991181": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`go-merge.rb`) should use snake_case.", 5381] + ], + "lib/go/merge.rb:547557749": [ + [10, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Go::Merge`.", 2866359175], + [10, 3, 7242, "Metrics/ModuleLength: Module has too many lines. [173/100]", 2713105462], + [11, 5, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631], + [72, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1491828652], + [79, 5, 1399, "Metrics/AbcSize: Assignment Branch Condition size for `merge_go` is too high. [<13, 32, 11> 36.25/17]", 3471957286], + [79, 5, 1399, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_go` is too high. [11/7]", 3471957286], + [79, 5, 1399, "Metrics/MethodLength: Method has too many lines. [22/10]", 3471957286], + [79, 5, 1399, "Metrics/PerceivedComplexity: Perceived complexity for `merge_go` is too high. [11/8]", 3471957286], + [98, 34, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], + [106, 5, 1419, "Metrics/AbcSize: Assignment Branch Condition size for `analyze_go_module` is too high. [<8, 19, 5> 21.21/17]", 525883462], + [106, 5, 1419, "Metrics/MethodLength: Method has too many lines. [40/10]", 525883462] + ], + "spec/fixtures_integration_spec.rb:2854818786": [ + [3, 1, 4677, "Metrics/BlockLength: Block has too many lines. [66/25]", 420437002], + [8, 3, 4420, "Metrics/BlockLength: Block has too many lines. [61/25]", 566085077] + ] +} diff --git a/gems/go-merge/Gemfile.lock b/gems/go-merge/Gemfile.lock index d218b78d8..87487fbe5 100644 --- a/gems/go-merge/Gemfile.lock +++ b/gems/go-merge/Gemfile.lock @@ -17,39 +17,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -58,193 +26,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -252,45 +34,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -310,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -324,6 +61,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -379,6 +117,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -397,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -537,23 +283,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -587,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +381,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,61 +407,39 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -757,22 +457,15 @@ CHECKSUMS io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +480,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +491,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,19 +518,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,19 +542,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +557,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ruby-merge/lib/ruby/merge/version.rb b/gems/ruby-merge/lib/ruby/merge/version.rb index 0dcd005a5..d88eae0c6 100644 --- a/gems/ruby-merge/lib/ruby/merge/version.rb +++ b/gems/ruby-merge/lib/ruby/merge/version.rb @@ -3,7 +3,7 @@ module Ruby module Merge module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end From 60576d30c39d8338070144dfea2d31c1faab9537 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:36:31 -0600 Subject: [PATCH 200/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/go-merge/Gemfile.lock | 327 ++++++++++++++++++++- gems/ruby-merge/.rubocop_gradual.lock | 390 ++++++++++++++++++++++++++ gems/ruby-merge/Gemfile.lock | 30 +- gems/toml-merge/Gemfile.lock | 327 ++++++++++++++++++++- gems/typescript-merge/Gemfile.lock | 353 ++++++++++++++++++++++- 5 files changed, 1403 insertions(+), 24 deletions(-) create mode 100644 gems/ruby-merge/.rubocop_gradual.lock diff --git a/gems/go-merge/Gemfile.lock b/gems/go-merge/Gemfile.lock index 87487fbe5..c35a1d0fa 100644 --- a/gems/go-merge/Gemfile.lock +++ b/gems/go-merge/Gemfile.lock @@ -17,7 +17,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -26,7 +58,193 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -34,6 +252,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -53,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,24 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -407,32 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -457,15 +758,22 @@ CHECKSUMS io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -480,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -491,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -518,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -529,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -542,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ruby-merge/.rubocop_gradual.lock b/gems/ruby-merge/.rubocop_gradual.lock new file mode 100644 index 000000000..827b7fe9d --- /dev/null +++ b/gems/ruby-merge/.rubocop_gradual.lock @@ -0,0 +1,390 @@ +{ + ".simplecov:3590623278": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:2768890125": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/ruby-merge.rb:2992445753": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`ruby-merge.rb`) should use snake_case.", 5381] + ], + "lib/ruby/merge.rb:1549201317": [ + [21, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Ruby::Merge`.", 2866359175], + [21, 3, 117385, "Metrics/ModuleLength: Module has too many lines. [2664/100]", 3496752980], + [42, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3061257365], + [103, 5, 841, "Metrics/AbcSize: Assignment Branch Condition size for `parse_ruby` is too high. [<4, 16, 6> 17.55/17]", 1071201699], + [103, 5, 841, "Metrics/MethodLength: Method has too many lines. [16/10]", 1071201699], + [128, 5, 2656, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_method_move_detection` is too high. [<17, 40, 18> 47.04/17]", 3779436399], + [128, 5, 2656, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_method_move_detection` is too high. [16/7]", 3779436399], + [128, 5, 2656, "Metrics/MethodLength: Method has too many lines. [45/10]", 3779436399], + [128, 5, 2656, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_method_move_detection` is too high. [16/8]", 3779436399], + [140, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 727785047], + [153, 121, 51, "Layout/LineLength: Line is too long. [171/120]", 3259664538], + [172, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], + [175, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], + [176, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 1976354608], + [180, 5, 4374, "Metrics/AbcSize: Assignment Branch Condition size for `merge_ruby` is too high. [<31, 63, 24> 74.2/17]", 2749692967], + [180, 5, 4374, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_ruby` is too high. [21/7]", 2749692967], + [180, 5, 4374, "Metrics/MethodLength: Method has too many lines. [83/10]", 2749692967], + [180, 5, 4374, "Metrics/PerceivedComplexity: Perceived complexity for `merge_ruby` is too high. [22/8]", 2749692967], + [239, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], + [278, 5, 1312, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_delegated_child_operations` is too high. [<10, 15, 6> 19/17]", 2246428949], + [278, 5, 1312, "Metrics/MethodLength: Method has too many lines. [28/10]", 2246428949], + [324, 5, 861, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_source_owner_identity_profile` is too high. [<5, 17, 2> 17.83/17]", 4129925341], + [324, 5, 861, "Metrics/MethodLength: Method has too many lines. [20/10]", 4129925341], + [347, 5, 2064, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_source_owner_identity_matches` is too high. [<17, 31, 11> 37.03/17]", 2780319153], + [347, 5, 2064, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_source_owner_identity_matches` is too high. [11/7]", 2780319153], + [347, 5, 2064, "Metrics/MethodLength: Method has too many lines. [37/10]", 2780319153], + [347, 5, 2064, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_source_owner_identity_matches` is too high. [11/8]", 2780319153], + [376, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], + [379, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], + [384, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1001816794], + [390, 5, 1314, "Metrics/MethodLength: Method has too many lines. [28/10]", 4183124680], + [423, 5, 786, "Metrics/MethodLength: Method has too many lines. [24/10]", 3631640245], + [450, 5, 916, "Metrics/MethodLength: Method has too many lines. [18/10]", 631485532], + [471, 5, 662, "Metrics/MethodLength: Method has too many lines. [15/10]", 2231086183], + [490, 5, 777, "Metrics/MethodLength: Method has too many lines. [18/10]", 895030114], + [511, 5, 727, "Metrics/MethodLength: Method has too many lines. [19/10]", 776483642], + [533, 5, 861, "Metrics/MethodLength: Method has too many lines. [29/10]", 537340961], + [565, 5, 655, "Metrics/MethodLength: Method has too many lines. [16/10]", 3756601977], + [584, 5, 1592, "Metrics/MethodLength: Method has too many lines. [25/10]", 3521052904], + [608, 121, 106, "Layout/LineLength: Line is too long. [226/120]", 2104286058], + [614, 5, 777, "Metrics/MethodLength: Method has too many lines. [14/10]", 2821246515], + [631, 5, 1429, "Metrics/MethodLength: Method has too many lines. [26/10]", 244346226], + [654, 121, 124, "Layout/LineLength: Line is too long. [244/120]", 13261232], + [660, 5, 1367, "Metrics/MethodLength: Method has too many lines. [41/10]", 3883814121], + [704, 5, 750, "Metrics/MethodLength: Method has too many lines. [22/10]", 764028624], + [730, 5, 1315, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_silent_data_loss_validation_report` is too high. [<8, 14, 7> 17.58/17]", 2039399818], + [730, 5, 1315, "Metrics/MethodLength: Method has too many lines. [31/10]", 2039399818], + [765, 5, 724, "Metrics/MethodLength: Method has too many lines. [14/10]", 1741779676], + [776, 121, 67, "Layout/LineLength: Line is too long. [187/120]", 1996508131], + [782, 5, 752, "Metrics/MethodLength: Method has too many lines. [21/10]", 3870096101], + [806, 5, 1052, "Metrics/MethodLength: Method has too many lines. [32/10]", 119279638], + [841, 5, 1588, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_interstitial_comment_attachment_report` is too high. [<11, 34, 17> 39.57/17]", 4112280260], + [841, 5, 1588, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_interstitial_comment_attachment_report` is too high. [14/7]", 4112280260], + [841, 5, 1588, "Metrics/MethodLength: Method has too many lines. [30/10]", 4112280260], + [841, 5, 1588, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_interstitial_comment_attachment_report` is too high. [15/8]", 4112280260], + [855, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 180543822], + [883, 5, 536, "Metrics/MethodLength: Method has too many lines. [13/10]", 245509059], + [899, 5, 2252, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_rename_detection` is too high. [<14, 32, 11> 36.62/17]", 2574664763], + [899, 5, 2252, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_rename_detection` is too high. [10/7]", 2574664763], + [899, 5, 2252, "Metrics/MethodLength: Method has too many lines. [46/10]", 2574664763], + [899, 5, 2252, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_rename_detection` is too high. [11/8]", 2574664763], + [942, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 4074688513], + [948, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], + [952, 5, 2254, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_rename_plus_edit_conflicts` is too high. [<15, 30, 13> 35.97/17]", 3664513828], + [952, 5, 2254, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_rename_plus_edit_conflicts` is too high. [10/7]", 3664513828], + [952, 5, 2254, "Metrics/MethodLength: Method has too many lines. [45/10]", 3664513828], + [952, 5, 2254, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_rename_plus_edit_conflicts` is too high. [11/8]", 3664513828], + [1004, 5, 1926, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_cross_container_method_move_detection` is too high. [<8, 18, 7> 20.9/17]", 1401333972], + [1004, 5, 1926, "Metrics/MethodLength: Method has too many lines. [44/10]", 1401333972], + [1047, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3474944396], + [1054, 5, 1488, "Metrics/AbcSize: Assignment Branch Condition size for `apply_ruby_delegated_child_outputs` is too high. [<16, 39, 12> 43.83/17]", 842348215], + [1054, 5, 1488, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_ruby_delegated_child_outputs` is too high. [12/7]", 842348215], + [1054, 5, 1488, "Metrics/MethodLength: Method has too many lines. [27/10]", 842348215], + [1054, 5, 1488, "Metrics/PerceivedComplexity: Perceived complexity for `apply_ruby_delegated_child_outputs` is too high. [13/8]", 842348215], + [1088, 5, 980, "Metrics/MethodLength: Method has too many lines. [23/10]", 1425119613], + [1115, 5, 1025, "Metrics/MethodLength: Method has too many lines. [23/10]", 2179557432], + [1143, 5, 757, "Metrics/MethodLength: Method has too many lines. [12/10]", 3975431355], + [1148, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 1956194284], + [1160, 5, 745, "Metrics/MethodLength: Method has too many lines. [12/10]", 1051086033], + [1165, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1636990749], + [1177, 5, 670, "Metrics/MethodLength: Method has too many lines. [11/10]", 3552666292], + [1182, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 3013228499], + [1193, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 1356230953], + [1198, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 3013228499], + [1209, 5, 2093, "Metrics/AbcSize: Assignment Branch Condition size for `analyze_ruby_document` is too high. [<21, 31, 12> 39.32/17]", 3298966582], + [1209, 5, 2093, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `analyze_ruby_document` is too high. [13/7]", 3298966582], + [1209, 5, 2093, "Metrics/MethodLength: Method has too many lines. [53/10]", 3298966582], + [1209, 5, 2093, "Metrics/PerceivedComplexity: Perceived complexity for `analyze_ruby_document` is too high. [13/8]", 3298966582], + [1215, 7, 1035, "Metrics/BlockLength: Block has too many lines. [27/25]", 2081528636], + [1284, 5, 427, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_file_footer_text` is too high. [<5, 17, 8> 19.44/17]", 1703748308], + [1311, 5, 806, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_process_analysis_from_tree` is too high. [10/7]", 1109735749], + [1311, 5, 806, "Metrics/MethodLength: Method has too many lines. [19/10]", 1109735749], + [1361, 5, 533, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_import_item_from_begin_node` is too high. [8/7]", 582163830], + [1383, 5, 487, "Metrics/MethodLength: Method has too many lines. [12/10]", 3257507103], + [1400, 5, 583, "Metrics/MethodLength: Method has too many lines. [15/10]", 4108141408], + [1443, 5, 645, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_import_span_for` is too high. [<6, 22, 9> 24.52/17]", 1779826452], + [1443, 5, 645, "Metrics/MethodLength: Method has too many lines. [12/10]", 1779826452], + [1495, 5, 1015, "Metrics/MethodLength: Method has too many lines. [16/10]", 1317835917], + [1501, 121, 173, "Layout/LineLength: Line is too long. [293/120]", 225499532], + [1528, 5, 518, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_tslp_claimed_line_indexes` is too high. [<6, 19, 5> 20.54/17]", 1455439838], + [1551, 5, 443, "Metrics/MethodLength: Method has too many lines. [12/10]", 4230588206], + [1568, 5, 363, "Metrics/MethodLength: Method has too many lines. [11/10]", 3068065572], + [1629, 5, 1849, "Metrics/AbcSize: Assignment Branch Condition size for `legacy_collect_ruby_declaration_entries` is too high. [<24, 26, 13> 37.7/17]", 3187770326], + [1629, 5, 1849, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `legacy_collect_ruby_declaration_entries` is too high. [11/7]", 3187770326], + [1629, 5, 1849, "Metrics/MethodLength: Method has too many lines. [54/10]", 3187770326], + [1629, 5, 1849, "Metrics/PerceivedComplexity: Perceived complexity for `legacy_collect_ruby_declaration_entries` is too high. [11/8]", 3187770326], + [1676, 13, 76, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 1356567820], + [1712, 5, 396, "Metrics/MethodLength: Method has too many lines. [11/10]", 1239008881], + [1727, 5, 681, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_process_declaration_entries` is too high. [<7, 17, 2> 18.49/17]", 2675999354], + [1727, 5, 681, "Metrics/MethodLength: Method has too many lines. [16/10]", 2675999354], + [1747, 5, 634, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_top_level_process_structure_items` is too high. [<5, 32, 14> 35.28/17]", 1120707166], + [1747, 5, 634, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_top_level_process_structure_items` is too high. [11/7]", 1120707166], + [1747, 5, 634, "Metrics/MethodLength: Method has too many lines. [11/10]", 1120707166], + [1747, 5, 634, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_top_level_process_structure_items` is too high. [11/8]", 1120707166], + [1759, 7, 11, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 848344986], + [1766, 7, 9, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 3648222389], + [1811, 5, 1284, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_intra_owner_merge_plan` is too high. [<8, 24, 9> 26.85/17]", 2388567699], + [1811, 5, 1284, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_intra_owner_merge_plan` is too high. [9/7]", 2388567699], + [1811, 5, 1284, "Metrics/MethodLength: Method has too many lines. [22/10]", 2388567699], + [1811, 5, 1284, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_intra_owner_merge_plan` is too high. [9/8]", 2388567699], + [1852, 5, 557, "Metrics/MethodLength: Method has too many lines. [11/10]", 3178341030], + [1910, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 895013151], + [1915, 5, 593, "Metrics/MethodLength: Method has too many lines. [13/10]", 2850316611], + [1916, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177625], + [1933, 5, 609, "Metrics/MethodLength: Method has too many lines. [12/10]", 784855730], + [1948, 5, 695, "Metrics/MethodLength: Method has too many lines. [14/10]", 3942458504], + [1985, 5, 1114, "Metrics/AbcSize: Assignment Branch Condition size for `merge_declaration_hash_constants` is too high. [<11, 22, 6> 25.32/17]", 3861922947], + [1985, 5, 1114, "Metrics/MethodLength: Method has too many lines. [17/10]", 3861922947], + [2007, 5, 794, "Metrics/AbcSize: Assignment Branch Condition size for `merge_declaration_body_constants` is too high. [<9, 14, 6> 17.69/17]", 1882117166], + [2037, 5, 1138, "Metrics/AbcSize: Assignment Branch Condition size for `merge_array_constant_text` is too high. [<9, 18, 7> 21.31/17]", 1448081799], + [2037, 5, 1138, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_array_constant_text` is too high. [8/7]", 1448081799], + [2037, 5, 1138, "Metrics/MethodLength: Method has too many lines. [15/10]", 1448081799], + [2043, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193434112], + [2050, 7, 8, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 359846632], + [2057, 5, 774, "Metrics/AbcSize: Assignment Branch Condition size for `merge_percent_array_constant_text` is too high. [<8, 16, 7> 19.21/17]", 625509828], + [2057, 5, 774, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_percent_array_constant_text` is too high. [8/7]", 625509828], + [2086, 5, 1060, "Metrics/AbcSize: Assignment Branch Condition size for `merge_multiline_array_constant_text` is too high. [<11, 23, 10> 27.39/17]", 2672751288], + [2086, 5, 1060, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_multiline_array_constant_text` is too high. [11/7]", 2672751288], + [2086, 5, 1060, "Metrics/MethodLength: Method has too many lines. [13/10]", 2672751288], + [2086, 5, 1060, "Metrics/PerceivedComplexity: Perceived complexity for `merge_multiline_array_constant_text` is too high. [11/8]", 2672751288], + [2095, 7, 8, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 359846632], + [2104, 5, 1605, "Metrics/AbcSize: Assignment Branch Condition size for `merge_declaration_body_methods` is too high. [<21, 28, 15> 38.08/17]", 2740924329], + [2104, 5, 1605, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_declaration_body_methods` is too high. [14/7]", 2740924329], + [2104, 5, 1605, "Metrics/MethodLength: Method has too many lines. [29/10]", 2740924329], + [2104, 5, 1605, "Metrics/PerceivedComplexity: Perceived complexity for `merge_declaration_body_methods` is too high. [15/8]", 2740924329], + [2111, 7, 8, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 359846632], + [2138, 5, 1076, "Metrics/AbcSize: Assignment Branch Condition size for `merge_nested_body_declarations` is too high. [<14, 24, 10> 29.53/17]", 1397199527], + [2138, 5, 1076, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_nested_body_declarations` is too high. [11/7]", 1397199527], + [2138, 5, 1076, "Metrics/MethodLength: Method has too many lines. [14/10]", 1397199527], + [2138, 5, 1076, "Metrics/PerceivedComplexity: Perceived complexity for `merge_nested_body_declarations` is too high. [11/8]", 1397199527], + [2177, 5, 2549, "Metrics/AbcSize: Assignment Branch Condition size for `top_level_source_region_owners` is too high. [<24, 33, 13> 42.83/17]", 1909271685], + [2177, 5, 2549, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `top_level_source_region_owners` is too high. [11/7]", 1909271685], + [2177, 5, 2549, "Metrics/MethodLength: Method has too many lines. [64/10]", 1909271685], + [2177, 5, 2549, "Metrics/PerceivedComplexity: Perceived complexity for `top_level_source_region_owners` is too high. [11/8]", 1909271685], + [2220, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861626], + [2235, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1695648499], + [2251, 5, 2126, "Metrics/AbcSize: Assignment Branch Condition size for `container_child_source_regions` is too high. [<23, 28, 11> 37.87/17]", 4031983731], + [2251, 5, 2126, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `container_child_source_regions` is too high. [10/7]", 4031983731], + [2251, 5, 2126, "Metrics/MethodLength: Method has too many lines. [56/10]", 4031983731], + [2251, 5, 2126, "Metrics/PerceivedComplexity: Perceived complexity for `container_child_source_regions` is too high. [10/8]", 4031983731], + [2317, 5, 996, "Metrics/AbcSize: Assignment Branch Condition size for `interleave_source_regions` is too high. [<8, 14, 6> 17.2/17]", 796443872], + [2317, 5, 996, "Metrics/MethodLength: Method has too many lines. [30/10]", 796443872], + [2355, 5, 1323, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `source_interstitial_region` is too high. [13/7]", 1970451685], + [2355, 5, 1323, "Metrics/MethodLength: Method has too many lines. [30/10]", 1970451685], + [2355, 5, 1323, "Metrics/PerceivedComplexity: Perceived complexity for `source_interstitial_region` is too high. [12/8]", 1970451685], + [2355, 35, 80, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2143999554], + [2390, 5, 396, "Metrics/MethodLength: Method has too many lines. [12/10]", 663734283], + [2406, 5, 890, "Metrics/AbcSize: Assignment Branch Condition size for `collect_blank_line_regions` is too high. [<4, 18, 7> 19.72/17]", 3362926457], + [2406, 5, 890, "Metrics/MethodLength: Method has too many lines. [20/10]", 3362926457], + [2465, 5, 30, "Style/Documentation: Missing top-level documentation comment for `class Ruby::Merge::RubyHashLiteralProjector`.", 2586933062], + [2465, 5, 5733, "Metrics/ClassLength: Class has too many lines. [144/100]", 48390292], + [2498, 7, 617, "Metrics/MethodLength: Method has too many lines. [15/10]", 1617225783], + [2522, 7, 943, "Metrics/AbcSize: Assignment Branch Condition size for `project_hash_key` is too high. [<1, 18, 8> 19.72/17]", 3538404248], + [2522, 7, 943, "Metrics/MethodLength: Method has too many lines. [26/10]", 3538404248], + [2580, 7, 616, "Metrics/AbcSize: Assignment Branch Condition size for `trailing_comma?` is too high. [<3, 20, 6> 21.1/17]", 1517912413], + [2645, 5, 1202, "Metrics/AbcSize: Assignment Branch Condition size for `constant_hash_blocks` is too high. [<19, 25, 6> 31.97/17]", 399214756], + [2645, 5, 1202, "Metrics/MethodLength: Method has too many lines. [36/10]", 399214756], + [2686, 5, 727, "Metrics/AbcSize: Assignment Branch Condition size for `hash_assignment_finish_line` is too high. [<11, 7, 12> 17.72/17]", 1215874404], + [2686, 5, 727, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `hash_assignment_finish_line` is too high. [9/7]", 1215874404], + [2686, 5, 727, "Metrics/MethodLength: Method has too many lines. [26/10]", 1215874404], + [2686, 5, 727, "Metrics/PerceivedComplexity: Perceived complexity for `hash_assignment_finish_line` is too high. [11/8]", 1215874404], + [2716, 5, 2007, "Metrics/AbcSize: Assignment Branch Condition size for `direct_body_method_entries` is too high. [<28, 33, 13> 45.19/17]", 2589282610], + [2716, 5, 2007, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `direct_body_method_entries` is too high. [12/7]", 2589282610], + [2716, 5, 2007, "Metrics/MethodLength: Method has too many lines. [56/10]", 2589282610], + [2716, 5, 2007, "Metrics/PerceivedComplexity: Perceived complexity for `direct_body_method_entries` is too high. [12/8]", 2589282610], + [2781, 5, 1221, "Metrics/AbcSize: Assignment Branch Condition size for `direct_body_constant_entries` is too high. [<16, 34, 10> 38.88/17]", 1588885504], + [2781, 5, 1221, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `direct_body_constant_entries` is too high. [9/7]", 1588885504], + [2781, 5, 1221, "Metrics/MethodLength: Method has too many lines. [35/10]", 1588885504], + [2781, 5, 1221, "Metrics/PerceivedComplexity: Perceived complexity for `direct_body_constant_entries` is too high. [9/8]", 1588885504], + [2824, 5, 708, "Metrics/AbcSize: Assignment Branch Condition size for `split_ruby_array_elements` is too high. [<11, 12, 11> 19.65/17]", 1344003748], + [2824, 5, 708, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split_ruby_array_elements` is too high. [9/7]", 1344003748], + [2824, 5, 708, "Metrics/MethodLength: Method has too many lines. [24/10]", 1344003748], + [2824, 5, 708, "Metrics/PerceivedComplexity: Perceived complexity for `split_ruby_array_elements` is too high. [11/8]", 1344003748], + [2868, 5, 977, "Metrics/AbcSize: Assignment Branch Condition size for `append_multiline_array_elements` is too high. [<12, 32, 9> 35.34/17]", 1316332112], + [2868, 5, 977, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `append_multiline_array_elements` is too high. [9/7]", 1316332112], + [2868, 5, 977, "Metrics/MethodLength: Method has too many lines. [16/10]", 1316332112], + [2868, 5, 977, "Metrics/PerceivedComplexity: Perceived complexity for `append_multiline_array_elements` is too high. [9/8]", 1316332112], + [2896, 5, 728, "Metrics/AbcSize: Assignment Branch Condition size for `array_assignment_finish_line` is too high. [<11, 7, 12> 17.72/17]", 1471354607], + [2896, 5, 728, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `array_assignment_finish_line` is too high. [9/7]", 1471354607], + [2896, 5, 728, "Metrics/MethodLength: Method has too many lines. [26/10]", 1471354607], + [2896, 5, 728, "Metrics/PerceivedComplexity: Perceived complexity for `array_assignment_finish_line` is too high. [11/8]", 1471354607], + [2932, 5, 1127, "Metrics/AbcSize: Assignment Branch Condition size for `direct_body_declaration_entries` is too high. [<14, 30, 7> 33.84/17]", 1223661118], + [2932, 5, 1127, "Metrics/MethodLength: Method has too many lines. [30/10]", 1223661118], + [2979, 5, 984, "Metrics/AbcSize: Assignment Branch Condition size for `insert_declaration_body_blocks` is too high. [<4, 23, 12> 26.25/17]", 159690081], + [2979, 5, 984, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `insert_declaration_body_blocks` is too high. [9/7]", 159690081], + [2979, 5, 984, "Metrics/MethodLength: Method has too many lines. [16/10]", 159690081], + [2979, 5, 984, "Metrics/PerceivedComplexity: Perceived complexity for `insert_declaration_body_blocks` is too high. [10/8]", 159690081], + [3024, 5, 1027, "Metrics/AbcSize: Assignment Branch Condition size for `merge_ruby_hash_literals` is too high. [<8, 30, 9> 32.33/17]", 2793745298], + [3024, 5, 1027, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_ruby_hash_literals` is too high. [9/7]", 2793745298], + [3024, 5, 1027, "Metrics/MethodLength: Method has too many lines. [19/10]", 2793745298], + [3024, 5, 1027, "Metrics/PerceivedComplexity: Perceived complexity for `merge_ruby_hash_literals` is too high. [10/8]", 2793745298], + [3046, 5, 636, "Metrics/AbcSize: Assignment Branch Condition size for `render_ruby_hash_literal` is too high. [<5, 19, 6> 20.54/17]", 1834383244], + [3086, 5, 491, "Metrics/MethodLength: Method has too many lines. [11/10]", 1799924605], + [3119, 5, 1125, "Metrics/AbcSize: Assignment Branch Condition size for `surfaces_for_owner` is too high. [<6, 19, 3> 20.15/17]", 4036098594], + [3119, 5, 1125, "Metrics/MethodLength: Method has too many lines. [20/10]", 4036098594], + [3144, 5, 1126, "Metrics/AbcSize: Assignment Branch Condition size for `example_surfaces_for` is too high. [<4, 20, 2> 20.49/17]", 757808110], + [3144, 5, 1126, "Metrics/MethodLength: Method has too many lines. [21/10]", 757808110] + ], + "lib/ruby/merge/block_directive_detector.rb:315354690": [ + [10, 5, 6220, "Metrics/ClassLength: Class has too many lines. [161/100]", 3182117306], + [83, 7, 1085, "Metrics/AbcSize: Assignment Branch Condition size for `detect_freeze_spans` is too high. [<10, 18, 6> 21.45/17]", 3827147306], + [83, 7, 1085, "Metrics/MethodLength: Method has too many lines. [27/10]", 3827147306], + [117, 7, 1508, "Metrics/AbcSize: Assignment Branch Condition size for `detect_nocov_spans` is too high. [<10, 30, 10> 33.17/17]", 3750116369], + [117, 7, 1508, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_nocov_spans` is too high. [9/7]", 3750116369], + [117, 7, 1508, "Metrics/MethodLength: Method has too many lines. [40/10]", 3750116369], + [117, 7, 1508, "Metrics/PerceivedComplexity: Perceived complexity for `detect_nocov_spans` is too high. [12/8]", 3750116369], + [125, 9, 1189, "Metrics/BlockLength: Block has too many lines. [30/25]", 431470454], + [165, 7, 921, "Metrics/AbcSize: Assignment Branch Condition size for `validate_no_crossing` is too high. [<8, 16, 8> 19.6/17]", 1072352384], + [165, 7, 921, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_no_crossing` is too high. [8/7]", 1072352384], + [165, 7, 921, "Metrics/MethodLength: Method has too many lines. [19/10]", 1072352384], + [193, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193343749], + [194, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860841] + ], + "lib/ruby/merge/doc_comment_support.rb:11585367": [ + [71, 7, 950, "Metrics/AbcSize: Assignment Branch Condition size for `example_blocks` is too high. [<8, 17, 8> 20.42/17]", 878231540], + [71, 7, 950, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `example_blocks` is too high. [8/7]", 878231540], + [71, 7, 950, "Metrics/MethodLength: Method has too many lines. [19/10]", 878231540] + ], + "lib/ruby/merge/gemspec_support.rb:672395758": [ + [5, 5, 21, "Style/Documentation: Missing top-level documentation comment for `module Ruby::Merge::GemspecSupport`.", 593910650] + ], + "lib/ruby/merge/magic_comment_support.rb:2193186223": [ + [26, 7, 1484, "Metrics/AbcSize: Assignment Branch Condition size for `comment_only_prefix_info` is too high. [<9, 38, 8> 39.86/17]", 1098666313], + [26, 7, 1484, "Metrics/MethodLength: Method has too many lines. [33/10]", 1098666313], + [69, 7, 693, "Metrics/AbcSize: Assignment Branch Condition size for `header_magic_comment_types_for_lines` is too high. [<10, 13, 9> 18.71/17]", 3693768719], + [69, 7, 693, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `header_magic_comment_types_for_lines` is too high. [8/7]", 3693768719], + [69, 7, 693, "Metrics/MethodLength: Method has too many lines. [16/10]", 3693768719], + [93, 7, 747, "Metrics/AbcSize: Assignment Branch Condition size for `prefix_comment_line_numbers_for_comments` is too high. [<10, 12, 7> 17.12/17]", 1181507516], + [93, 7, 747, "Metrics/MethodLength: Method has too many lines. [19/10]", 1181507516] + ], + "lib/ruby/merge/method_similarity.rb:3120642740": [ + [5, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ruby::Merge::MethodSimilarity`.", 3784960433], + [23, 7, 493, "Metrics/AbcSize: Assignment Branch Condition size for `param_similarity` is too high. [<4, 19, 4> 19.82/17]", 1175888813], + [45, 7, 738, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<13, 29, 8> 32.77/17]", 1085087702], + [45, 7, 738, "Metrics/MethodLength: Method has too many lines. [20/10]", 1085087702] + ], + "lib/ruby/merge/nocov_node_base.rb:1713613866": [ + [23, 21, 84, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3439911158], + [51, 7, 353, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `signature` is too high. [8/7]", 3442013923], + [51, 7, 353, "Metrics/PerceivedComplexity: Perceived complexity for `signature` is too high. [9/8]", 3442013923] + ], + "lib/ruby/merge/rescue_semantics.rb:2728370094": [ + [5, 5, 21, "Style/Documentation: Missing top-level documentation comment for `class Ruby::Merge::RescueSemantics`.", 4002082661], + [5, 5, 8140, "Metrics/ClassLength: Class has too many lines. [157/100]", 3302970297], + [10, 7, 812, "Metrics/AbcSize: Assignment Branch Condition size for `merge_ordered_clause_types` is too high. [<9, 17, 8> 20.83/17]", 391537814], + [10, 7, 812, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_ordered_clause_types` is too high. [8/7]", 391537814], + [10, 7, 812, "Metrics/MethodLength: Method has too many lines. [16/10]", 391537814], + [10, 7, 812, "Metrics/PerceivedComplexity: Perceived complexity for `merge_ordered_clause_types` is too high. [9/8]", 391537814], + [33, 7, 1470, "Metrics/AbcSize: Assignment Branch Condition size for `canonicalize_rescue_clause_order` is too high. [<18, 28, 14> 36.11/17]", 570708009], + [33, 7, 1470, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonicalize_rescue_clause_order` is too high. [14/7]", 570708009], + [33, 7, 1470, "Metrics/MethodLength: Method has too many lines. [24/10]", 570708009], + [33, 7, 1470, "Metrics/PerceivedComplexity: Perceived complexity for `canonicalize_rescue_clause_order` is too high. [14/8]", 570708009], + [113, 7, 1080, "Metrics/AbcSize: Assignment Branch Condition size for `source_defined_exception_hierarchy` is too high. [<9, 20, 10> 24.1/17]", 3196945148], + [113, 7, 1080, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `source_defined_exception_hierarchy` is too high. [10/7]", 3196945148], + [113, 7, 1080, "Metrics/MethodLength: Method has too many lines. [15/10]", 3196945148], + [113, 7, 1080, "Metrics/PerceivedComplexity: Perceived complexity for `source_defined_exception_hierarchy` is too high. [11/8]", 3196945148], + [126, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1806710570] + ], + "lib/ruby/merge/scaffold_chunk_support.rb:640658628": [ + [5, 5, 27, "Style/Documentation: Missing top-level documentation comment for `module Ruby::Merge::ScaffoldChunkSupport`.", 2416541725] + ], + "lib/ruby/merge/signature_support.rb:1167161535": [ + [5, 5, 23, "Style/Documentation: Missing top-level documentation comment for `module Ruby::Merge::SignatureSupport`.", 2080470772] + ], + "ruby-merge.gemspec:503862341": [ + [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ], + "spec/fixtures_integration_spec.rb:2791875397": [ + [7, 1, 71426, "Metrics/BlockLength: Block has too many lines. [1643/25]", 1328376978], + [8, 3, 94, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 4224869601], + [9, 3, 80, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3493759864], + [10, 3, 72, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 218819604], + [11, 3, 83, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3957977039], + [125, 3, 1207, "Metrics/BlockLength: Block has too many lines. [27/25]", 2841005266], + [206, 3, 1550, "Metrics/BlockLength: Block has too many lines. [44/25]", 1381861178], + [257, 3, 1209, "Metrics/BlockLength: Block has too many lines. [33/25]", 1745132505], + [297, 3, 61330, "Metrics/BlockLength: Block has too many lines. [1387/25]", 3444780370], + [693, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859109], + [1777, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3355833611], + [1784, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 38619260] + ], + "spec/hash_literal_projector_spec.rb:2425567956": [ + [13, 41, 31, "Lint/PercentStringArray: Within `%w`/`%W`, quotes and ',' are unnecessary and may be unwanted in the resulting strings.", 3214960854] + ], + "spec/rescue_semantics_spec.rb:2518131257": [ + [5, 1, 2150, "Metrics/BlockLength: Block has too many lines. [59/25]", 163524539] + ] +} diff --git a/gems/ruby-merge/Gemfile.lock b/gems/ruby-merge/Gemfile.lock index fb5b38919..5c643046a 100644 --- a/gems/ruby-merge/Gemfile.lock +++ b/gems/ruby-merge/Gemfile.lock @@ -16,6 +16,24 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +45,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -322,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -373,6 +381,7 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + ast-merge! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) debug (>= 1.1) @@ -402,6 +411,7 @@ DEPENDENCIES standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + tree_haver! tree_sitter_language_pack! yaml-converter (~> 0.1) yard (~> 0.9, >= 0.9.44) diff --git a/gems/toml-merge/Gemfile.lock b/gems/toml-merge/Gemfile.lock index f4338c0b4..87531476e 100644 --- a/gems/toml-merge/Gemfile.lock +++ b/gems/toml-merge/Gemfile.lock @@ -17,7 +17,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -26,7 +58,193 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -34,6 +252,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -53,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -406,33 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -479,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -490,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -517,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -528,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -541,15 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/typescript-merge/Gemfile.lock b/gems/typescript-merge/Gemfile.lock index de6a40e2a..776990eb1 100644 --- a/gems/typescript-merge/Gemfile.lock +++ b/gems/typescript-merge/Gemfile.lock @@ -16,6 +16,265 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -103,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -131,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -322,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -373,22 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -397,32 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -430,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -442,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -469,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -480,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -507,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -518,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -531,6 +859,9 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f @@ -540,6 +871,7 @@ CHECKSUMS unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -547,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 991ef4b49f0bfa5f41d0f3cf2ce7aece053be199 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:36:52 -0600 Subject: [PATCH 201/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-template/.kettle-drift.lock | 60 ++-- gems/ast-template/Gemfile | 70 +++- gems/ast-template/README.md | 1 + gems/ast-template/Rakefile | 18 +- gems/ast-template/lib/ast/template/version.rb | 2 +- gems/ruby-merge/Gemfile.lock | 30 +- gems/rust-merge/.kettle-drift.lock | 60 ++-- gems/rust-merge/Gemfile | 40 +++ gems/rust-merge/Gemfile.lock | 327 +----------------- 9 files changed, 200 insertions(+), 408 deletions(-) diff --git a/gems/ast-template/.kettle-drift.lock b/gems/ast-template/.kettle-drift.lock index 508d631d8..44ac5c29d 100644 --- a/gems/ast-template/.kettle-drift.lock +++ b/gems/ast-template/.kettle-drift.lock @@ -6,7 +6,8 @@ 79, 119, 159, - 199 + 199, + 239 ] } ], @@ -17,7 +18,8 @@ 90, 130, 170, - 210 + 210, + 250 ] } ], @@ -28,7 +30,8 @@ 80, 120, 160, - 200 + 200, + 240 ] } ], @@ -39,7 +42,8 @@ 92, 132, 172, - 212 + 212, + 252 ] } ], @@ -50,7 +54,8 @@ 95, 135, 175, - 215 + 215, + 255 ] } ], @@ -61,7 +66,8 @@ 81, 121, 161, - 201 + 201, + 241 ] } ], @@ -73,7 +79,8 @@ 99, 139, 179, - 219 + 219, + 259 ] } ], @@ -84,7 +91,8 @@ 100, 140, 180, - 220 + 220, + 260 ] } ], @@ -96,7 +104,8 @@ 86, 126, 166, - 206 + 206, + 246 ] } ], @@ -107,7 +116,8 @@ 109, 149, 189, - 229 + 229, + 269 ] } ], @@ -119,7 +129,8 @@ 78, 118, 158, - 198 + 198, + 238 ] } ], @@ -131,7 +142,8 @@ 108, 148, 188, - 228 + 228, + 268 ] } ], @@ -142,7 +154,8 @@ 84, 124, 164, - 204 + 204, + 244 ] } ], @@ -154,7 +167,8 @@ 91, 131, 171, - 211 + 211, + 251 ] } ], @@ -166,7 +180,8 @@ 87, 127, 167, - 207 + 207, + 247 ] } ], @@ -177,7 +192,8 @@ 85, 125, 165, - 205 + 205, + 245 ] } ], @@ -188,7 +204,8 @@ 102, 142, 182, - 222 + 222, + 262 ] } ], @@ -199,7 +216,8 @@ 101, 141, 181, - 221 + 221, + 261 ] } ], @@ -210,7 +228,8 @@ 96, 136, 176, - 216 + 216, + 256 ] } ], @@ -221,7 +240,8 @@ 105, 145, 185, - 225 + 225, + 265 ] } ], diff --git a/gems/ast-template/Gemfile b/gems/ast-template/Gemfile index 17d1d2512..802327a7d 100644 --- a/gems/ast-template/Gemfile +++ b/gems/ast-template/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source 'https://gem.coop' +source "https://gem.coop" git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,17 +19,61 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ['~> 1.0', '>= 1.0.8'] -gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ["~> 1.0", ">= 1.0.8"] +gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ast-merge ] -direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') +direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? + +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) + direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") + direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == "nomono" } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + if nomono_locked + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] + end + end + Kernel.send(:gem, "nomono", *nomono_activation_requirements) + require "nomono/bundler" + if direct_sibling_templating && !direct_sibling_local + ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + end + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: "STRUCTUREDMERGE", + path_env: "STRUCTUREDMERGE_DEV", + root: ["src", "my", "structuredmerge"] + ) + rescue LoadError + warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + else + ENV.delete("STRUCTUREDMERGE_DEV") + end + end + end +end if direct_sibling_gems.any? && (direct_sibling_local || @@ -249,25 +293,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? # Debugging -eval_gemfile 'gemfiles/modular/debug.gemfile' +eval_gemfile "gemfiles/modular/debug.gemfile" # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile 'gemfiles/modular/coverage.gemfile' +eval_gemfile "gemfiles/modular/coverage.gemfile" # Linting -eval_gemfile 'gemfiles/modular/style.gemfile' +eval_gemfile "gemfiles/modular/style.gemfile" # Documentation -eval_gemfile 'gemfiles/modular/documentation.gemfile' +eval_gemfile "gemfiles/modular/documentation.gemfile" # Optional -eval_gemfile 'gemfiles/modular/optional.gemfile' +eval_gemfile "gemfiles/modular/optional.gemfile" ### Std Lib Extracted Gems -eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' +eval_gemfile "gemfiles/modular/x_std_libs.gemfile" # See unlocked_deps appraisal for more details on irb inclusion -gem 'irb', '~> 1.17' # ruby >= 2.7 +gem "irb", "~> 1.17" # ruby >= 2.7 diff --git a/gems/ast-template/README.md b/gems/ast-template/README.md index 5d1bbc9a4..03a884453 100644 --- a/gems/ast-template/README.md +++ b/gems/ast-template/README.md @@ -245,6 +245,7 @@ If none of the available licenses suit your use case, please [contact us](mailto [🖐contrib-rocks]: https://contrib.rocks [🖐contributors]: https://github.com/structuredmerge/structuredmerge-ruby/graphs/contributors [🖐contributors-img]: https://contrib.rocks/image?repo=structuredmerge/structuredmerge-ruby +[🚎contributors-gl]: https://gitlab.com/structuredmerge/structuredmerge-ruby/-/graphs/main [🪇conduct]: https://github.com/structuredmerge/structuredmerge-ruby/blob/main/CODE_OF_CONDUCT.md [🪇conduct-img]: https://img.shields.io/badge/Contributor_Covenant-2.1-259D6C.svg [📌pvc]: http://guides.rubygems.org/patterns/#pessimistic-version-constraint diff --git a/gems/ast-template/Rakefile b/gems/ast-template/Rakefile index 1da755b67..193fad244 100644 --- a/gems/ast-template/Rakefile +++ b/gems/ast-template/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require 'kettle/drift' + require "kettle/drift" Kettle::Drift.install_tasks rescue LoadError - desc('(stub) kettle:drift:check is unavailable') - task('kettle:drift:check') do + desc("(stub) kettle:drift:check is unavailable") + task("kettle:drift:check") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:update is unavailable') - task('kettle:drift:update') do + desc("(stub) kettle:drift:update is unavailable") + task("kettle:drift:update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:force_update is unavailable') - task('kettle:drift:force_update') do + desc("(stub) kettle:drift:force_update is unavailable") + task("kettle:drift:force_update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift is unavailable') - task('kettle:drift' => 'kettle:drift:update') + desc("(stub) kettle:drift is unavailable") + task("kettle:drift" => "kettle:drift:update") end ### TEMPLATING TASKS diff --git a/gems/ast-template/lib/ast/template/version.rb b/gems/ast-template/lib/ast/template/version.rb index 0e1e7cf5d..2cf6f7536 100644 --- a/gems/ast-template/lib/ast/template/version.rb +++ b/gems/ast-template/lib/ast/template/version.rb @@ -3,7 +3,7 @@ module Ast module Template module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/ruby-merge/Gemfile.lock b/gems/ruby-merge/Gemfile.lock index 5c643046a..fb5b38919 100644 --- a/gems/ruby-merge/Gemfile.lock +++ b/gems/ruby-merge/Gemfile.lock @@ -16,24 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -45,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -335,6 +322,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,7 +373,6 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - ast-merge! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) debug (>= 1.1) @@ -411,7 +402,6 @@ DEPENDENCIES standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - tree_haver! tree_sitter_language_pack! yaml-converter (~> 0.1) yard (~> 0.9, >= 0.9.44) diff --git a/gems/rust-merge/.kettle-drift.lock b/gems/rust-merge/.kettle-drift.lock index 0161251a7..d3c2a2030 100644 --- a/gems/rust-merge/.kettle-drift.lock +++ b/gems/rust-merge/.kettle-drift.lock @@ -6,7 +6,8 @@ 80, 120, 160, - 200 + 200, + 240 ] } ], @@ -17,7 +18,8 @@ 91, 131, 171, - 211 + 211, + 251 ] } ], @@ -28,7 +30,8 @@ 81, 121, 161, - 201 + 201, + 241 ] } ], @@ -39,7 +42,8 @@ 93, 133, 173, - 213 + 213, + 253 ] } ], @@ -50,7 +54,8 @@ 96, 136, 176, - 216 + 216, + 256 ] } ], @@ -61,7 +66,8 @@ 82, 122, 162, - 202 + 202, + 242 ] } ], @@ -73,7 +79,8 @@ 100, 140, 180, - 220 + 220, + 260 ] } ], @@ -84,7 +91,8 @@ 101, 141, 181, - 221 + 221, + 261 ] } ], @@ -96,7 +104,8 @@ 87, 127, 167, - 207 + 207, + 247 ] } ], @@ -107,7 +116,8 @@ 110, 150, 190, - 230 + 230, + 270 ] } ], @@ -119,7 +129,8 @@ 79, 119, 159, - 199 + 199, + 239 ] } ], @@ -131,7 +142,8 @@ 109, 149, 189, - 229 + 229, + 269 ] } ], @@ -142,7 +154,8 @@ 85, 125, 165, - 205 + 205, + 245 ] } ], @@ -154,7 +167,8 @@ 92, 132, 172, - 212 + 212, + 252 ] } ], @@ -166,7 +180,8 @@ 88, 128, 168, - 208 + 208, + 248 ] } ], @@ -177,7 +192,8 @@ 86, 126, 166, - 206 + 206, + 246 ] } ], @@ -188,7 +204,8 @@ 103, 143, 183, - 223 + 223, + 263 ] } ], @@ -199,7 +216,8 @@ 102, 142, 182, - 222 + 222, + 262 ] } ], @@ -210,7 +228,8 @@ 97, 137, 177, - 217 + 217, + 257 ] } ], @@ -221,7 +240,8 @@ 106, 146, 186, - 226 + 226, + 266 ] } ], diff --git a/gems/rust-merge/Gemfile b/gems/rust-merge/Gemfile index 7ede34a4f..cfdf72694 100644 --- a/gems/rust-merge/Gemfile +++ b/gems/rust-merge/Gemfile @@ -232,6 +232,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/rust-merge/Gemfile.lock b/gems/rust-merge/Gemfile.lock index 53081f8da..6bc7926d0 100644 --- a/gems/rust-merge/Gemfile.lock +++ b/gems/rust-merge/Gemfile.lock @@ -17,39 +17,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -58,193 +26,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -252,29 +34,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -294,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +116,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +283,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +381,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +406,33 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +440,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +452,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +479,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +490,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +517,10 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +529,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +542,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +557,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 3d6bca98e117c012337dbb2e150629c27549eb76 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:37:04 -0600 Subject: [PATCH 202/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-template/Gemfile | 68 ++-- gems/ast-template/Gemfile.lock | 59 ++-- gems/ast-template/README.md | 1 - gems/ast-template/Rakefile | 18 +- gems/ast-template/lib/ast/template/version.rb | 2 +- gems/binary-merge/.kettle-drift.lock | 60 ++-- gems/binary-merge/.rubocop_gradual.lock | 91 ----- gems/binary-merge/Gemfile | 70 +++- gems/binary-merge/Gemfile.lock | 59 ++-- gems/binary-merge/Rakefile | 18 +- gems/binary-merge/bin/yard | 2 +- gems/binary-merge/lib/binary/merge/version.rb | 2 +- gems/rust-merge/Gemfile.lock | 30 +- gems/typescript-merge/.kettle-drift.lock | 60 ++-- gems/typescript-merge/Gemfile | 40 +++ gems/typescript-merge/Gemfile.lock | 327 +----------------- 16 files changed, 298 insertions(+), 609 deletions(-) delete mode 100644 gems/binary-merge/.rubocop_gradual.lock diff --git a/gems/ast-template/Gemfile b/gems/ast-template/Gemfile index 802327a7d..8fa827ea3 100644 --- a/gems/ast-template/Gemfile +++ b/gems/ast-template/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source "https://gem.coop" +source 'https://gem.coop' git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,57 +19,53 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ["~> 1.0", ">= 1.0.8"] -gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ['~> 1.0', '>= 1.0.8'] +gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ast-merge ] -direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") +direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? if direct_sibling_gems.any? && - (direct_sibling_local || - ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) - direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") - direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) begin nomono_activation_requirements = nomono_requirements - nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) if File.file?(nomono_lockfile) nomono_locked_spec = Bundler::LockfileParser - .new(Bundler.read_file(nomono_lockfile)) - .specs - .find { |spec| spec.name == "nomono" } + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } nomono_locked = nomono_locked_spec && - Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) - if nomono_locked - nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] - end - end - Kernel.send(:gem, "nomono", *nomono_activation_requirements) - require "nomono/bundler" - if direct_sibling_templating && !direct_sibling_local - ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local eval_nomono_gems( gems: direct_sibling_gems, - prefix: "STRUCTUREDMERGE", - path_env: "STRUCTUREDMERGE_DEV", - root: ["src", "my", "structuredmerge"] + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] ) rescue LoadError - warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' ensure if direct_sibling_templating && !direct_sibling_local if direct_sibling_dev_was_set - ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original else - ENV.delete("STRUCTUREDMERGE_DEV") + ENV.delete('STRUCTUREDMERGE_DEV') end end end @@ -293,25 +289,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging -eval_gemfile "gemfiles/modular/debug.gemfile" +eval_gemfile 'gemfiles/modular/debug.gemfile' # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile "gemfiles/modular/coverage.gemfile" +eval_gemfile 'gemfiles/modular/coverage.gemfile' # Linting -eval_gemfile "gemfiles/modular/style.gemfile" +eval_gemfile 'gemfiles/modular/style.gemfile' # Documentation -eval_gemfile "gemfiles/modular/documentation.gemfile" +eval_gemfile 'gemfiles/modular/documentation.gemfile' # Optional -eval_gemfile "gemfiles/modular/optional.gemfile" +eval_gemfile 'gemfiles/modular/optional.gemfile' ### Std Lib Extracted Gems -eval_gemfile "gemfiles/modular/x_std_libs.gemfile" +eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' # See unlocked_deps appraisal for more details on irb inclusion -gem "irb", "~> 1.17" # ruby >= 2.7 +gem 'irb', '~> 1.17' # ruby >= 2.7 diff --git a/gems/ast-template/Gemfile.lock b/gems/ast-template/Gemfile.lock index 3db99393b..530ee0633 100644 --- a/gems/ast-template/Gemfile.lock +++ b/gems/ast-template/Gemfile.lock @@ -275,6 +275,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -308,7 +324,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -363,18 +378,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -538,22 +542,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -659,9 +659,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -739,7 +739,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -760,10 +759,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -838,13 +837,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/ast-template/README.md b/gems/ast-template/README.md index 03a884453..5d1bbc9a4 100644 --- a/gems/ast-template/README.md +++ b/gems/ast-template/README.md @@ -245,7 +245,6 @@ If none of the available licenses suit your use case, please [contact us](mailto [🖐contrib-rocks]: https://contrib.rocks [🖐contributors]: https://github.com/structuredmerge/structuredmerge-ruby/graphs/contributors [🖐contributors-img]: https://contrib.rocks/image?repo=structuredmerge/structuredmerge-ruby -[🚎contributors-gl]: https://gitlab.com/structuredmerge/structuredmerge-ruby/-/graphs/main [🪇conduct]: https://github.com/structuredmerge/structuredmerge-ruby/blob/main/CODE_OF_CONDUCT.md [🪇conduct-img]: https://img.shields.io/badge/Contributor_Covenant-2.1-259D6C.svg [📌pvc]: http://guides.rubygems.org/patterns/#pessimistic-version-constraint diff --git a/gems/ast-template/Rakefile b/gems/ast-template/Rakefile index 193fad244..1da755b67 100644 --- a/gems/ast-template/Rakefile +++ b/gems/ast-template/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require "kettle/drift" + require 'kettle/drift' Kettle::Drift.install_tasks rescue LoadError - desc("(stub) kettle:drift:check is unavailable") - task("kettle:drift:check") do + desc('(stub) kettle:drift:check is unavailable') + task('kettle:drift:check') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:update is unavailable") - task("kettle:drift:update") do + desc('(stub) kettle:drift:update is unavailable') + task('kettle:drift:update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:force_update is unavailable") - task("kettle:drift:force_update") do + desc('(stub) kettle:drift:force_update is unavailable') + task('kettle:drift:force_update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift is unavailable") - task("kettle:drift" => "kettle:drift:update") + desc('(stub) kettle:drift is unavailable') + task('kettle:drift' => 'kettle:drift:update') end ### TEMPLATING TASKS diff --git a/gems/ast-template/lib/ast/template/version.rb b/gems/ast-template/lib/ast/template/version.rb index 2cf6f7536..0e1e7cf5d 100644 --- a/gems/ast-template/lib/ast/template/version.rb +++ b/gems/ast-template/lib/ast/template/version.rb @@ -3,7 +3,7 @@ module Ast module Template module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/binary-merge/.kettle-drift.lock b/gems/binary-merge/.kettle-drift.lock index 44ac5c29d..5b373dd8d 100644 --- a/gems/binary-merge/.kettle-drift.lock +++ b/gems/binary-merge/.kettle-drift.lock @@ -7,7 +7,8 @@ 119, 159, 199, - 239 + 239, + 279 ] } ], @@ -19,7 +20,8 @@ 130, 170, 210, - 250 + 250, + 290 ] } ], @@ -31,7 +33,8 @@ 120, 160, 200, - 240 + 240, + 280 ] } ], @@ -43,7 +46,8 @@ 132, 172, 212, - 252 + 252, + 292 ] } ], @@ -55,7 +59,8 @@ 135, 175, 215, - 255 + 255, + 295 ] } ], @@ -67,7 +72,8 @@ 121, 161, 201, - 241 + 241, + 281 ] } ], @@ -80,7 +86,8 @@ 139, 179, 219, - 259 + 259, + 299 ] } ], @@ -92,7 +99,8 @@ 140, 180, 220, - 260 + 260, + 300 ] } ], @@ -105,7 +113,8 @@ 126, 166, 206, - 246 + 246, + 286 ] } ], @@ -117,7 +126,8 @@ 149, 189, 229, - 269 + 269, + 309 ] } ], @@ -130,7 +140,8 @@ 118, 158, 198, - 238 + 238, + 278 ] } ], @@ -143,7 +154,8 @@ 148, 188, 228, - 268 + 268, + 308 ] } ], @@ -155,7 +167,8 @@ 124, 164, 204, - 244 + 244, + 284 ] } ], @@ -168,7 +181,8 @@ 131, 171, 211, - 251 + 251, + 291 ] } ], @@ -181,7 +195,8 @@ 127, 167, 207, - 247 + 247, + 287 ] } ], @@ -193,7 +208,8 @@ 125, 165, 205, - 245 + 245, + 285 ] } ], @@ -205,7 +221,8 @@ 142, 182, 222, - 262 + 262, + 302 ] } ], @@ -217,7 +234,8 @@ 141, 181, 221, - 261 + 261, + 301 ] } ], @@ -229,7 +247,8 @@ 136, 176, 216, - 256 + 256, + 296 ] } ], @@ -241,7 +260,8 @@ 145, 185, 225, - 265 + 265, + 305 ] } ], diff --git a/gems/binary-merge/.rubocop_gradual.lock b/gems/binary-merge/.rubocop_gradual.lock deleted file mode 100644 index 409104dc1..000000000 --- a/gems/binary-merge/.rubocop_gradual.lock +++ /dev/null @@ -1,91 +0,0 @@ -{ - ".simplecov:2434553742": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:273093165": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "binary-merge.gemspec:3582270982": [ - [127, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [142, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [143, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [150, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/binary-merge.rb:631889281": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`binary-merge.rb`) should use snake_case.", 5381] - ], - "lib/binary/merge.rb:1312582900": [ - [9, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Binary::Merge`.", 2866359175] - ], - "spec/fixtures_integration_spec.rb:2634773556": [ - [3, 1, 1275, "Metrics/BlockLength: Block has too many lines. [27/25]", 3473144817] - ] -} diff --git a/gems/binary-merge/Gemfile b/gems/binary-merge/Gemfile index e4df68b8d..f8ed362fc 100644 --- a/gems/binary-merge/Gemfile +++ b/gems/binary-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source 'https://gem.coop' +source "https://gem.coop" git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,17 +19,61 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ['~> 1.0', '>= 1.0.8'] -gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ["~> 1.0", ">= 1.0.8"] +gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ tree_haver ] -direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') +direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? + +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) + direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") + direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == "nomono" } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + if nomono_locked + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] + end + end + Kernel.send(:gem, "nomono", *nomono_activation_requirements) + require "nomono/bundler" + if direct_sibling_templating && !direct_sibling_local + ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + end + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: "STRUCTUREDMERGE", + path_env: "STRUCTUREDMERGE_DEV", + root: ["src", "my", "structuredmerge"] + ) + rescue LoadError + warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + else + ENV.delete("STRUCTUREDMERGE_DEV") + end + end + end +end if direct_sibling_gems.any? && (direct_sibling_local || @@ -289,25 +333,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? # Debugging -eval_gemfile 'gemfiles/modular/debug.gemfile' +eval_gemfile "gemfiles/modular/debug.gemfile" # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile 'gemfiles/modular/coverage.gemfile' +eval_gemfile "gemfiles/modular/coverage.gemfile" # Linting -eval_gemfile 'gemfiles/modular/style.gemfile' +eval_gemfile "gemfiles/modular/style.gemfile" # Documentation -eval_gemfile 'gemfiles/modular/documentation.gemfile' +eval_gemfile "gemfiles/modular/documentation.gemfile" # Optional -eval_gemfile 'gemfiles/modular/optional.gemfile' +eval_gemfile "gemfiles/modular/optional.gemfile" ### Std Lib Extracted Gems -eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' +eval_gemfile "gemfiles/modular/x_std_libs.gemfile" # See unlocked_deps appraisal for more details on irb inclusion -gem 'irb', '~> 1.17' # ruby >= 2.7 +gem "irb", "~> 1.17" # ruby >= 2.7 diff --git a/gems/binary-merge/Gemfile.lock b/gems/binary-merge/Gemfile.lock index 3962446a6..0436c868e 100644 --- a/gems/binary-merge/Gemfile.lock +++ b/gems/binary-merge/Gemfile.lock @@ -275,6 +275,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -308,7 +324,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -363,18 +378,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -538,22 +542,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -659,9 +659,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -739,7 +739,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -760,10 +759,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -838,13 +837,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/binary-merge/Rakefile b/gems/binary-merge/Rakefile index b29d3a04b..ea4ce831d 100644 --- a/gems/binary-merge/Rakefile +++ b/gems/binary-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require 'kettle/drift' + require "kettle/drift" Kettle::Drift.install_tasks rescue LoadError - desc('(stub) kettle:drift:check is unavailable') - task('kettle:drift:check') do + desc("(stub) kettle:drift:check is unavailable") + task("kettle:drift:check") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:update is unavailable') - task('kettle:drift:update') do + desc("(stub) kettle:drift:update is unavailable") + task("kettle:drift:update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:force_update is unavailable') - task('kettle:drift:force_update') do + desc("(stub) kettle:drift:force_update is unavailable") + task("kettle:drift:force_update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift is unavailable') - task('kettle:drift' => 'kettle:drift:update') + desc("(stub) kettle:drift is unavailable") + task("kettle:drift" => "kettle:drift:update") end ### TEMPLATING TASKS diff --git a/gems/binary-merge/bin/yard b/gems/binary-merge/bin/yard index 5d516ad6f..a7e8b6eed 100755 --- a/gems/binary-merge/bin/yard +++ b/gems/binary-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec('bundle', 'exec', 'rake', 'yard') +exec("bundle", "exec", "rake", "yard") diff --git a/gems/binary-merge/lib/binary/merge/version.rb b/gems/binary-merge/lib/binary/merge/version.rb index d8ae92dfa..bb78df888 100644 --- a/gems/binary-merge/lib/binary/merge/version.rb +++ b/gems/binary-merge/lib/binary/merge/version.rb @@ -3,7 +3,7 @@ module Binary module Merge module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/rust-merge/Gemfile.lock b/gems/rust-merge/Gemfile.lock index 6bc7926d0..cbf0a7bc9 100644 --- a/gems/rust-merge/Gemfile.lock +++ b/gems/rust-merge/Gemfile.lock @@ -16,24 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -45,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -335,6 +322,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,7 +373,6 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - ast-merge! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) debug (>= 1.1) @@ -411,7 +402,6 @@ DEPENDENCIES standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - tree_haver! tree_sitter_language_pack! yaml-converter (~> 0.1) yard (~> 0.9, >= 0.9.44) diff --git a/gems/typescript-merge/.kettle-drift.lock b/gems/typescript-merge/.kettle-drift.lock index 0161251a7..d3c2a2030 100644 --- a/gems/typescript-merge/.kettle-drift.lock +++ b/gems/typescript-merge/.kettle-drift.lock @@ -6,7 +6,8 @@ 80, 120, 160, - 200 + 200, + 240 ] } ], @@ -17,7 +18,8 @@ 91, 131, 171, - 211 + 211, + 251 ] } ], @@ -28,7 +30,8 @@ 81, 121, 161, - 201 + 201, + 241 ] } ], @@ -39,7 +42,8 @@ 93, 133, 173, - 213 + 213, + 253 ] } ], @@ -50,7 +54,8 @@ 96, 136, 176, - 216 + 216, + 256 ] } ], @@ -61,7 +66,8 @@ 82, 122, 162, - 202 + 202, + 242 ] } ], @@ -73,7 +79,8 @@ 100, 140, 180, - 220 + 220, + 260 ] } ], @@ -84,7 +91,8 @@ 101, 141, 181, - 221 + 221, + 261 ] } ], @@ -96,7 +104,8 @@ 87, 127, 167, - 207 + 207, + 247 ] } ], @@ -107,7 +116,8 @@ 110, 150, 190, - 230 + 230, + 270 ] } ], @@ -119,7 +129,8 @@ 79, 119, 159, - 199 + 199, + 239 ] } ], @@ -131,7 +142,8 @@ 109, 149, 189, - 229 + 229, + 269 ] } ], @@ -142,7 +154,8 @@ 85, 125, 165, - 205 + 205, + 245 ] } ], @@ -154,7 +167,8 @@ 92, 132, 172, - 212 + 212, + 252 ] } ], @@ -166,7 +180,8 @@ 88, 128, 168, - 208 + 208, + 248 ] } ], @@ -177,7 +192,8 @@ 86, 126, 166, - 206 + 206, + 246 ] } ], @@ -188,7 +204,8 @@ 103, 143, 183, - 223 + 223, + 263 ] } ], @@ -199,7 +216,8 @@ 102, 142, 182, - 222 + 222, + 262 ] } ], @@ -210,7 +228,8 @@ 97, 137, 177, - 217 + 217, + 257 ] } ], @@ -221,7 +240,8 @@ 106, 146, 186, - 226 + 226, + 266 ] } ], diff --git a/gems/typescript-merge/Gemfile b/gems/typescript-merge/Gemfile index e15702a35..2702c2467 100644 --- a/gems/typescript-merge/Gemfile +++ b/gems/typescript-merge/Gemfile @@ -232,6 +232,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/typescript-merge/Gemfile.lock b/gems/typescript-merge/Gemfile.lock index 776990eb1..2e94f97e9 100644 --- a/gems/typescript-merge/Gemfile.lock +++ b/gems/typescript-merge/Gemfile.lock @@ -17,39 +17,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -58,201 +26,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -260,21 +34,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -294,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +116,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +283,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +381,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +406,33 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +440,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +452,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +479,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +490,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +517,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +528,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,9 +541,6 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f @@ -871,7 +550,6 @@ CHECKSUMS unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +557,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From dd778575ad4a95eef5bb927189a7d9722e015444 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:37:05 -0600 Subject: [PATCH 203/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-template/Gemfile.lock | 392 +++------------------------------ 1 file changed, 33 insertions(+), 359 deletions(-) diff --git a/gems/ast-template/Gemfile.lock b/gems/ast-template/Gemfile.lock index 530ee0633..f8981d68e 100644 --- a/gems/ast-template/Gemfile.lock +++ b/gems/ast-template/Gemfile.lock @@ -16,39 +16,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -56,241 +24,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -310,12 +43,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -324,6 +51,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -379,6 +107,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -397,7 +134,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -537,23 +273,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -587,11 +325,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +376,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,61 +402,39 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +447,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +474,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +485,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,19 +512,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,19 +536,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +551,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 16e51951ea3f9ba3f80c29d331344038c37cfaa0 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:37:10 -0600 Subject: [PATCH 204/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-template/Gemfile.lock | 341 ++++++++++++++- gems/binary-merge/.rubocop_gradual.lock | 91 ++++ gems/binary-merge/Gemfile | 68 ++- gems/binary-merge/Gemfile.lock | 392 ++---------------- gems/binary-merge/Rakefile | 18 +- gems/binary-merge/bin/yard | 2 +- gems/binary-merge/lib/binary/merge/version.rb | 2 +- gems/typescript-merge/Gemfile.lock | 327 ++++++++++++++- 8 files changed, 822 insertions(+), 419 deletions(-) create mode 100644 gems/binary-merge/.rubocop_gradual.lock diff --git a/gems/ast-template/Gemfile.lock b/gems/ast-template/Gemfile.lock index f8981d68e..3db99393b 100644 --- a/gems/ast-template/Gemfile.lock +++ b/gems/ast-template/Gemfile.lock @@ -16,7 +16,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -24,6 +56,225 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -43,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -106,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -134,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -273,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -325,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -376,24 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -402,32 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -435,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -447,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -474,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -485,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -512,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -523,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -536,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -551,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/binary-merge/.rubocop_gradual.lock b/gems/binary-merge/.rubocop_gradual.lock new file mode 100644 index 000000000..409104dc1 --- /dev/null +++ b/gems/binary-merge/.rubocop_gradual.lock @@ -0,0 +1,91 @@ +{ + ".simplecov:2434553742": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:273093165": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "binary-merge.gemspec:3582270982": [ + [127, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [142, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [143, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [150, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/binary-merge.rb:631889281": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`binary-merge.rb`) should use snake_case.", 5381] + ], + "lib/binary/merge.rb:1312582900": [ + [9, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Binary::Merge`.", 2866359175] + ], + "spec/fixtures_integration_spec.rb:2634773556": [ + [3, 1, 1275, "Metrics/BlockLength: Block has too many lines. [27/25]", 3473144817] + ] +} diff --git a/gems/binary-merge/Gemfile b/gems/binary-merge/Gemfile index f8ed362fc..bb3d7d3d2 100644 --- a/gems/binary-merge/Gemfile +++ b/gems/binary-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source "https://gem.coop" +source 'https://gem.coop' git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,57 +19,53 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ["~> 1.0", ">= 1.0.8"] -gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ['~> 1.0', '>= 1.0.8'] +gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ tree_haver ] -direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") +direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? if direct_sibling_gems.any? && - (direct_sibling_local || - ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) - direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") - direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) begin nomono_activation_requirements = nomono_requirements - nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) if File.file?(nomono_lockfile) nomono_locked_spec = Bundler::LockfileParser - .new(Bundler.read_file(nomono_lockfile)) - .specs - .find { |spec| spec.name == "nomono" } + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } nomono_locked = nomono_locked_spec && - Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) - if nomono_locked - nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] - end - end - Kernel.send(:gem, "nomono", *nomono_activation_requirements) - require "nomono/bundler" - if direct_sibling_templating && !direct_sibling_local - ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local eval_nomono_gems( gems: direct_sibling_gems, - prefix: "STRUCTUREDMERGE", - path_env: "STRUCTUREDMERGE_DEV", - root: ["src", "my", "structuredmerge"] + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] ) rescue LoadError - warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' ensure if direct_sibling_templating && !direct_sibling_local if direct_sibling_dev_was_set - ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original else - ENV.delete("STRUCTUREDMERGE_DEV") + ENV.delete('STRUCTUREDMERGE_DEV') end end end @@ -333,25 +329,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging -eval_gemfile "gemfiles/modular/debug.gemfile" +eval_gemfile 'gemfiles/modular/debug.gemfile' # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile "gemfiles/modular/coverage.gemfile" +eval_gemfile 'gemfiles/modular/coverage.gemfile' # Linting -eval_gemfile "gemfiles/modular/style.gemfile" +eval_gemfile 'gemfiles/modular/style.gemfile' # Documentation -eval_gemfile "gemfiles/modular/documentation.gemfile" +eval_gemfile 'gemfiles/modular/documentation.gemfile' # Optional -eval_gemfile "gemfiles/modular/optional.gemfile" +eval_gemfile 'gemfiles/modular/optional.gemfile' ### Std Lib Extracted Gems -eval_gemfile "gemfiles/modular/x_std_libs.gemfile" +eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' # See unlocked_deps appraisal for more details on irb inclusion -gem "irb", "~> 1.17" # ruby >= 2.7 +gem 'irb', '~> 1.17' # ruby >= 2.7 diff --git a/gems/binary-merge/Gemfile.lock b/gems/binary-merge/Gemfile.lock index 0436c868e..98dd1bcd8 100644 --- a/gems/binary-merge/Gemfile.lock +++ b/gems/binary-merge/Gemfile.lock @@ -16,235 +16,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -252,45 +24,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -310,12 +43,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -324,6 +51,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -379,6 +107,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -397,7 +134,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -537,23 +273,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -584,14 +322,6 @@ GEM delegate (~> 0.1) rspec (~> 3.0) timecop (>= 0.7, < 1) - token-resolver (2.0.4) - parslet (~> 2.0) - version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +368,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,61 +393,39 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) - ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +438,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +465,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +476,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,19 +503,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -855,20 +526,14 @@ CHECKSUMS thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73 timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 - token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +541,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/binary-merge/Rakefile b/gems/binary-merge/Rakefile index ea4ce831d..b29d3a04b 100644 --- a/gems/binary-merge/Rakefile +++ b/gems/binary-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require "kettle/drift" + require 'kettle/drift' Kettle::Drift.install_tasks rescue LoadError - desc("(stub) kettle:drift:check is unavailable") - task("kettle:drift:check") do + desc('(stub) kettle:drift:check is unavailable') + task('kettle:drift:check') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:update is unavailable") - task("kettle:drift:update") do + desc('(stub) kettle:drift:update is unavailable') + task('kettle:drift:update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:force_update is unavailable") - task("kettle:drift:force_update") do + desc('(stub) kettle:drift:force_update is unavailable') + task('kettle:drift:force_update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift is unavailable") - task("kettle:drift" => "kettle:drift:update") + desc('(stub) kettle:drift is unavailable') + task('kettle:drift' => 'kettle:drift:update') end ### TEMPLATING TASKS diff --git a/gems/binary-merge/bin/yard b/gems/binary-merge/bin/yard index a7e8b6eed..5d516ad6f 100755 --- a/gems/binary-merge/bin/yard +++ b/gems/binary-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec("bundle", "exec", "rake", "yard") +exec('bundle', 'exec', 'rake', 'yard') diff --git a/gems/binary-merge/lib/binary/merge/version.rb b/gems/binary-merge/lib/binary/merge/version.rb index bb78df888..d8ae92dfa 100644 --- a/gems/binary-merge/lib/binary/merge/version.rb +++ b/gems/binary-merge/lib/binary/merge/version.rb @@ -3,7 +3,7 @@ module Binary module Merge module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/typescript-merge/Gemfile.lock b/gems/typescript-merge/Gemfile.lock index 2e94f97e9..776990eb1 100644 --- a/gems/typescript-merge/Gemfile.lock +++ b/gems/typescript-merge/Gemfile.lock @@ -17,7 +17,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -26,7 +58,201 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -34,6 +260,21 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -53,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -406,33 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -479,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -490,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -517,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -528,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -541,6 +859,9 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f @@ -550,6 +871,7 @@ CHECKSUMS unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 61923c153f6107369d6e0f0d909deb8c0b43c4bc Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:37:32 -0600 Subject: [PATCH 205/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/binary-merge/Gemfile.lock | 341 ++++++++++++++++++++++++- gems/toml-merge/Gemfile.lock | 353 +------------------------- gems/tree_haver/Gemfile.lock | 386 +++++++---------------------- gems/typescript-merge/Gemfile.lock | 353 +------------------------- gems/zip-merge/.kettle-drift.lock | 60 +++-- gems/zip-merge/Gemfile | 40 +++ gems/zip-merge/Gemfile.lock | 341 +------------------------ 7 files changed, 536 insertions(+), 1338 deletions(-) diff --git a/gems/binary-merge/Gemfile.lock b/gems/binary-merge/Gemfile.lock index 98dd1bcd8..3962446a6 100644 --- a/gems/binary-merge/Gemfile.lock +++ b/gems/binary-merge/Gemfile.lock @@ -16,7 +16,235 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -24,6 +252,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -43,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -106,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -134,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -273,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -322,6 +584,14 @@ GEM delegate (~> 0.1) rspec (~> 3.0) timecop (>= 0.7, < 1) + token-resolver (2.0.4) + parslet (~> 2.0) + version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -368,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -393,32 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) + ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -426,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -438,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -465,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -476,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -503,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -514,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -526,14 +858,20 @@ CHECKSUMS thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73 timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 + token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -541,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/toml-merge/Gemfile.lock b/gems/toml-merge/Gemfile.lock index 87531476e..1182f98db 100644 --- a/gems/toml-merge/Gemfile.lock +++ b/gems/toml-merge/Gemfile.lock @@ -16,265 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +40,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +103,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +131,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +270,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +322,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +373,22 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +397,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +430,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +442,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +469,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +480,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +507,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +518,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +531,15 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +547,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/tree_haver/Gemfile.lock b/gems/tree_haver/Gemfile.lock index 7ac4910fb..8e744e1af 100644 --- a/gems/tree_haver/Gemfile.lock +++ b/gems/tree_haver/Gemfile.lock @@ -7,288 +7,59 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /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) + ansi (1.6.0) + appraisal2 (3.2.0) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + ast (2.4.3) + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) ast-crispr-markdown-markly (7.1.0) ast-crispr (= 7.1.0) markly-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) prism (>= 1.0) version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: ast-merge (7.1.0) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: + backports (3.25.3) bash-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -GEM - remote: https://gem.coop/ - specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - ansi (1.6.0) - appraisal2 (3.2.0) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - 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) citrus (3.0.2) + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) cmdparse (3.0.7) commonmarker (2.9.0-aarch64-linux) commonmarker (2.9.0-aarch64-linux-musl) commonmarker (2.9.0-arm64-darwin) commonmarker (2.9.0-x86_64-linux) commonmarker (2.9.0-x86_64-linux-musl) + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -298,6 +69,10 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docile (1.4.1) + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -347,6 +122,10 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) @@ -354,6 +133,31 @@ GEM ruby-progressbar (~> 1.13) kettle-drift (1.0.5) version_gem (~> 1.1, >= 1.1.13) + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -377,12 +181,24 @@ GEM turbo_tests2 (~> 3.1, >= 3.1.12) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) 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.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -408,9 +224,18 @@ GEM prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) psych (5.4.0) date stringio + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -419,6 +244,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) rdoc (6.17.0) erb psych (>= 4.0.0) @@ -514,6 +344,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -573,6 +407,10 @@ GEM version_gem (~> 1.1, >= 1.1.13) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) @@ -596,6 +434,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.13) + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) yard (0.9.45) yard-fence (0.9.6) rdoc (>= 6.11, < 8) @@ -628,45 +470,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! + kettle-jem (>= 7.0) kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -675,27 +496,20 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml (~> 0.3) - toml-merge! toml-rb (~> 4.1) tree_haver! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -706,13 +520,10 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) @@ -743,7 +554,6 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 @@ -777,8 +587,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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 @@ -822,7 +630,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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -832,7 +639,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -855,7 +661,6 @@ CHECKSUMS tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) sha256=ad6743a373eeac954c1b659b17af3aff1c82918b3ce9c9dc572a7c70ff843cdd tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -868,7 +673,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/typescript-merge/Gemfile.lock b/gems/typescript-merge/Gemfile.lock index 776990eb1..de6a40e2a 100644 --- a/gems/typescript-merge/Gemfile.lock +++ b/gems/typescript-merge/Gemfile.lock @@ -16,265 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +40,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +103,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +131,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +270,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +322,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +373,22 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +397,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +430,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +442,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +469,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +480,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +507,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +518,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,9 +531,6 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f @@ -871,7 +540,6 @@ CHECKSUMS unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +547,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/zip-merge/.kettle-drift.lock b/gems/zip-merge/.kettle-drift.lock index 44ac5c29d..5b373dd8d 100644 --- a/gems/zip-merge/.kettle-drift.lock +++ b/gems/zip-merge/.kettle-drift.lock @@ -7,7 +7,8 @@ 119, 159, 199, - 239 + 239, + 279 ] } ], @@ -19,7 +20,8 @@ 130, 170, 210, - 250 + 250, + 290 ] } ], @@ -31,7 +33,8 @@ 120, 160, 200, - 240 + 240, + 280 ] } ], @@ -43,7 +46,8 @@ 132, 172, 212, - 252 + 252, + 292 ] } ], @@ -55,7 +59,8 @@ 135, 175, 215, - 255 + 255, + 295 ] } ], @@ -67,7 +72,8 @@ 121, 161, 201, - 241 + 241, + 281 ] } ], @@ -80,7 +86,8 @@ 139, 179, 219, - 259 + 259, + 299 ] } ], @@ -92,7 +99,8 @@ 140, 180, 220, - 260 + 260, + 300 ] } ], @@ -105,7 +113,8 @@ 126, 166, 206, - 246 + 246, + 286 ] } ], @@ -117,7 +126,8 @@ 149, 189, 229, - 269 + 269, + 309 ] } ], @@ -130,7 +140,8 @@ 118, 158, 198, - 238 + 238, + 278 ] } ], @@ -143,7 +154,8 @@ 148, 188, 228, - 268 + 268, + 308 ] } ], @@ -155,7 +167,8 @@ 124, 164, 204, - 244 + 244, + 284 ] } ], @@ -168,7 +181,8 @@ 131, 171, 211, - 251 + 251, + 291 ] } ], @@ -181,7 +195,8 @@ 127, 167, 207, - 247 + 247, + 287 ] } ], @@ -193,7 +208,8 @@ 125, 165, 205, - 245 + 245, + 285 ] } ], @@ -205,7 +221,8 @@ 142, 182, 222, - 262 + 262, + 302 ] } ], @@ -217,7 +234,8 @@ 141, 181, 221, - 261 + 261, + 301 ] } ], @@ -229,7 +247,8 @@ 136, 176, 216, - 256 + 256, + 296 ] } ], @@ -241,7 +260,8 @@ 145, 185, 225, - 265 + 265, + 305 ] } ], diff --git a/gems/zip-merge/Gemfile b/gems/zip-merge/Gemfile index 9a65b793e..1cb1cc398 100644 --- a/gems/zip-merge/Gemfile +++ b/gems/zip-merge/Gemfile @@ -271,6 +271,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/zip-merge/Gemfile.lock b/gems/zip-merge/Gemfile.lock index 9238afb04..6c7ddf202 100644 --- a/gems/zip-merge/Gemfile.lock +++ b/gems/zip-merge/Gemfile.lock @@ -16,242 +16,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -259,22 +24,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -294,12 +43,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +106,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +134,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +273,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -584,14 +322,6 @@ GEM delegate (~> 0.1) rspec (~> 3.0) timecop (>= 0.7, < 1) - token-resolver (2.0.4) - parslet (~> 2.0) - version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +368,22 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,19 +392,13 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) @@ -711,28 +412,12 @@ CHECKSUMS ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) - ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +425,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +437,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +464,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +475,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +502,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +513,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -858,20 +525,14 @@ CHECKSUMS thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73 timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 - token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd From 383e6bc56cdac62b3010896ef6b751409992ffac Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:37:45 -0600 Subject: [PATCH 206/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/citrus-toml-merge/.kettle-drift.lock | 60 ++-- gems/citrus-toml-merge/Gemfile | 40 +++ gems/citrus-toml-merge/Gemfile.lock | 341 +----------------- gems/parslet-toml-merge/.kettle-drift.lock | 60 ++-- gems/parslet-toml-merge/Gemfile | 40 +++ gems/parslet-toml-merge/Gemfile.lock | 59 ++-- gems/psych-merge/.kettle-drift.lock | 60 ++-- gems/psych-merge/.rubocop_gradual.lock | 372 -------------------- gems/psych-merge/Gemfile | 40 +++ gems/psych-merge/Gemfile.lock | 59 ++-- gems/psych-merge/lib/psych/merge/version.rb | 2 +- gems/zip-merge/Gemfile.lock | 341 +++++++++++++++++- 12 files changed, 648 insertions(+), 826 deletions(-) delete mode 100644 gems/psych-merge/.rubocop_gradual.lock diff --git a/gems/citrus-toml-merge/.kettle-drift.lock b/gems/citrus-toml-merge/.kettle-drift.lock index 508d631d8..44ac5c29d 100644 --- a/gems/citrus-toml-merge/.kettle-drift.lock +++ b/gems/citrus-toml-merge/.kettle-drift.lock @@ -6,7 +6,8 @@ 79, 119, 159, - 199 + 199, + 239 ] } ], @@ -17,7 +18,8 @@ 90, 130, 170, - 210 + 210, + 250 ] } ], @@ -28,7 +30,8 @@ 80, 120, 160, - 200 + 200, + 240 ] } ], @@ -39,7 +42,8 @@ 92, 132, 172, - 212 + 212, + 252 ] } ], @@ -50,7 +54,8 @@ 95, 135, 175, - 215 + 215, + 255 ] } ], @@ -61,7 +66,8 @@ 81, 121, 161, - 201 + 201, + 241 ] } ], @@ -73,7 +79,8 @@ 99, 139, 179, - 219 + 219, + 259 ] } ], @@ -84,7 +91,8 @@ 100, 140, 180, - 220 + 220, + 260 ] } ], @@ -96,7 +104,8 @@ 86, 126, 166, - 206 + 206, + 246 ] } ], @@ -107,7 +116,8 @@ 109, 149, 189, - 229 + 229, + 269 ] } ], @@ -119,7 +129,8 @@ 78, 118, 158, - 198 + 198, + 238 ] } ], @@ -131,7 +142,8 @@ 108, 148, 188, - 228 + 228, + 268 ] } ], @@ -142,7 +154,8 @@ 84, 124, 164, - 204 + 204, + 244 ] } ], @@ -154,7 +167,8 @@ 91, 131, 171, - 211 + 211, + 251 ] } ], @@ -166,7 +180,8 @@ 87, 127, 167, - 207 + 207, + 247 ] } ], @@ -177,7 +192,8 @@ 85, 125, 165, - 205 + 205, + 245 ] } ], @@ -188,7 +204,8 @@ 102, 142, 182, - 222 + 222, + 262 ] } ], @@ -199,7 +216,8 @@ 101, 141, 181, - 221 + 221, + 261 ] } ], @@ -210,7 +228,8 @@ 96, 136, 176, - 216 + 216, + 256 ] } ], @@ -221,7 +240,8 @@ 105, 145, 185, - 225 + 225, + 265 ] } ], diff --git a/gems/citrus-toml-merge/Gemfile b/gems/citrus-toml-merge/Gemfile index 582e63162..ecdfbadae 100644 --- a/gems/citrus-toml-merge/Gemfile +++ b/gems/citrus-toml-merge/Gemfile @@ -231,6 +231,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/citrus-toml-merge/Gemfile.lock b/gems/citrus-toml-merge/Gemfile.lock index 75bc67a58..eff6e8295 100644 --- a/gems/citrus-toml-merge/Gemfile.lock +++ b/gems/citrus-toml-merge/Gemfile.lock @@ -17,264 +17,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: toml-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +35,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +48,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +111,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +139,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +278,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +330,14 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +384,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +409,33 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +443,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +455,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +482,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +493,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +520,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +531,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +544,16 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +561,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/parslet-toml-merge/.kettle-drift.lock b/gems/parslet-toml-merge/.kettle-drift.lock index 508d631d8..44ac5c29d 100644 --- a/gems/parslet-toml-merge/.kettle-drift.lock +++ b/gems/parslet-toml-merge/.kettle-drift.lock @@ -6,7 +6,8 @@ 79, 119, 159, - 199 + 199, + 239 ] } ], @@ -17,7 +18,8 @@ 90, 130, 170, - 210 + 210, + 250 ] } ], @@ -28,7 +30,8 @@ 80, 120, 160, - 200 + 200, + 240 ] } ], @@ -39,7 +42,8 @@ 92, 132, 172, - 212 + 212, + 252 ] } ], @@ -50,7 +54,8 @@ 95, 135, 175, - 215 + 215, + 255 ] } ], @@ -61,7 +66,8 @@ 81, 121, 161, - 201 + 201, + 241 ] } ], @@ -73,7 +79,8 @@ 99, 139, 179, - 219 + 219, + 259 ] } ], @@ -84,7 +91,8 @@ 100, 140, 180, - 220 + 220, + 260 ] } ], @@ -96,7 +104,8 @@ 86, 126, 166, - 206 + 206, + 246 ] } ], @@ -107,7 +116,8 @@ 109, 149, 189, - 229 + 229, + 269 ] } ], @@ -119,7 +129,8 @@ 78, 118, 158, - 198 + 198, + 238 ] } ], @@ -131,7 +142,8 @@ 108, 148, 188, - 228 + 228, + 268 ] } ], @@ -142,7 +154,8 @@ 84, 124, 164, - 204 + 204, + 244 ] } ], @@ -154,7 +167,8 @@ 91, 131, 171, - 211 + 211, + 251 ] } ], @@ -166,7 +180,8 @@ 87, 127, 167, - 207 + 207, + 247 ] } ], @@ -177,7 +192,8 @@ 85, 125, 165, - 205 + 205, + 245 ] } ], @@ -188,7 +204,8 @@ 102, 142, 182, - 222 + 222, + 262 ] } ], @@ -199,7 +216,8 @@ 101, 141, 181, - 221 + 221, + 261 ] } ], @@ -210,7 +228,8 @@ 96, 136, 176, - 216 + 216, + 256 ] } ], @@ -221,7 +240,8 @@ 105, 145, 185, - 225 + 225, + 265 ] } ], diff --git a/gems/parslet-toml-merge/Gemfile b/gems/parslet-toml-merge/Gemfile index b3619a3fb..487394971 100644 --- a/gems/parslet-toml-merge/Gemfile +++ b/gems/parslet-toml-merge/Gemfile @@ -231,6 +231,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/parslet-toml-merge/Gemfile.lock b/gems/parslet-toml-merge/Gemfile.lock index 3293a63f0..5b536f6cd 100644 --- a/gems/parslet-toml-merge/Gemfile.lock +++ b/gems/parslet-toml-merge/Gemfile.lock @@ -275,6 +275,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -308,7 +324,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -363,18 +378,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -538,22 +542,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -659,9 +659,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -739,7 +739,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -760,10 +759,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -838,13 +837,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/psych-merge/.kettle-drift.lock b/gems/psych-merge/.kettle-drift.lock index dc90e28bc..47f738bf0 100644 --- a/gems/psych-merge/.kettle-drift.lock +++ b/gems/psych-merge/.kettle-drift.lock @@ -7,7 +7,8 @@ 121, 161, 201, - 241 + 241, + 281 ] } ], @@ -19,7 +20,8 @@ 132, 172, 212, - 252 + 252, + 292 ] } ], @@ -31,7 +33,8 @@ 122, 162, 202, - 242 + 242, + 282 ] } ], @@ -43,7 +46,8 @@ 134, 174, 214, - 254 + 254, + 294 ] } ], @@ -55,7 +59,8 @@ 137, 177, 217, - 257 + 257, + 297 ] } ], @@ -67,7 +72,8 @@ 123, 163, 203, - 243 + 243, + 283 ] } ], @@ -80,7 +86,8 @@ 141, 181, 221, - 261 + 261, + 301 ] } ], @@ -92,7 +99,8 @@ 142, 182, 222, - 262 + 262, + 302 ] } ], @@ -105,7 +113,8 @@ 128, 168, 208, - 248 + 248, + 288 ] } ], @@ -117,7 +126,8 @@ 151, 191, 231, - 271 + 271, + 311 ] } ], @@ -130,7 +140,8 @@ 120, 160, 200, - 240 + 240, + 280 ] } ], @@ -143,7 +154,8 @@ 150, 190, 230, - 270 + 270, + 310 ] } ], @@ -155,7 +167,8 @@ 126, 166, 206, - 246 + 246, + 286 ] } ], @@ -168,7 +181,8 @@ 133, 173, 213, - 253 + 253, + 293 ] } ], @@ -181,7 +195,8 @@ 129, 169, 209, - 249 + 249, + 289 ] } ], @@ -193,7 +208,8 @@ 127, 167, 207, - 247 + 247, + 287 ] } ], @@ -205,7 +221,8 @@ 144, 184, 224, - 264 + 264, + 304 ] } ], @@ -217,7 +234,8 @@ 143, 183, 223, - 263 + 263, + 303 ] } ], @@ -229,7 +247,8 @@ 138, 178, 218, - 258 + 258, + 298 ] } ], @@ -241,7 +260,8 @@ 147, 187, 227, - 267 + 267, + 307 ] } ], diff --git a/gems/psych-merge/.rubocop_gradual.lock b/gems/psych-merge/.rubocop_gradual.lock deleted file mode 100644 index 85e814fd4..000000000 --- a/gems/psych-merge/.rubocop_gradual.lock +++ /dev/null @@ -1,372 +0,0 @@ -{ - ".simplecov:2102217422": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:1368539789": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/psych-merge.rb:1330894360": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`psych-merge.rb`) should use snake_case.", 5381] - ], - "lib/psych/merge.rb:173660101": [ - [38, 3, 9398, "Metrics/ModuleLength: Module has too many lines. [188/100]", 2155600486], - [115, 5, 6353, "Metrics/ClassLength: Class has too many lines. [160/100]", 2805786752], - [171, 7, 1593, "Metrics/MethodLength: Method has too many lines. [26/10]", 162695378], - [171, 21, 295, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 2742902791], - [212, 7, 440, "Metrics/MethodLength: Method has too many lines. [11/10]", 4238054657], - [252, 7, 417, "Metrics/MethodLength: Method has too many lines. [11/10]", 3661776213], - [275, 7, 458, "Metrics/MethodLength: Method has too many lines. [15/10]", 1125262299] - ], - "lib/psych/merge/comment_tracker.rb:109829813": [ - [33, 7, 711, "Metrics/MethodLength: Method has too many lines. [24/10]", 4175176008], - [65, 48, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] - ], - "lib/psych/merge/conflict_resolver.rb:1439336560": [ - [24, 5, 98551, "Metrics/ClassLength: Class has too many lines. [1730/100]", 3470480790], - [48, 7, 1257, "Metrics/MethodLength: Method has too many lines. [18/10]", 2709727248], - [48, 21, 354, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [13/5]", 1127138839], - [49, 121, 141, "Layout/LineLength: Line is too long. [261/120]", 84971754], - [63, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1411495206], - [75, 7, 1316, "Metrics/MethodLength: Method has too many lines. [22/10]", 841707991], - [121, 7, 1128, "Metrics/AbcSize: Assignment Branch Condition size for `build_refined_matches` is too high. [<11, 16, 8> 21/17]", 4214539560], - [121, 7, 1128, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_refined_matches` is too high. [9/7]", 4214539560], - [121, 7, 1128, "Metrics/MethodLength: Method has too many lines. [18/10]", 4214539560], - [121, 7, 1128, "Metrics/PerceivedComplexity: Perceived complexity for `build_refined_matches` is too high. [9/8]", 4214539560], - [149, 7, 11524, "Metrics/AbcSize: Assignment Branch Condition size for `merge_nodes_to_emitter` is too high. [<57, 120, 50> 142/17]", 2474480422], - [149, 7, 11524, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_nodes_to_emitter` is too high. [43/7]", 2474480422], - [149, 7, 11524, "Metrics/MethodLength: Method has too many lines. [194/10]", 2474480422], - [149, 7, 11524, "Metrics/PerceivedComplexity: Perceived complexity for `merge_nodes_to_emitter` is too high. [49/8]", 2474480422], - [149, 33, 186, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 421356977], - [150, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 97621789], - [193, 24, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2944491302], - [204, 9, 7819, "Metrics/BlockLength: Block has too many lines. [136/25]", 519912312], - [205, 28, 36, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 345161915], - [263, 39, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3425527675], - [270, 39, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3425527675], - [286, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2818803335], - [330, 37, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3425527675], - [337, 37, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3425527675], - [376, 26, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2944491302], - [391, 24, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2944491302], - [436, 7, 1049, "Metrics/MethodLength: Method has too many lines. [14/10]", 2563450827], - [455, 7, 1990, "Metrics/AbcSize: Assignment Branch Condition size for `emit_supplemental_document_postlude` is too high. [<8, 20, 6> 22.36/17]", 1604415261], - [455, 7, 1990, "Metrics/MethodLength: Method has too many lines. [24/10]", 1604415261], - [501, 7, 982, "Metrics/AbcSize: Assignment Branch Condition size for `emit_nonpreferred_document_postlude_regions` is too high. [<5, 20, 10> 22.91/17]", 7588338], - [501, 7, 982, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_nonpreferred_document_postlude_regions` is too high. [10/7]", 7588338], - [501, 7, 982, "Metrics/MethodLength: Method has too many lines. [17/10]", 7588338], - [501, 7, 982, "Metrics/PerceivedComplexity: Perceived complexity for `emit_nonpreferred_document_postlude_regions` is too high. [11/8]", 7588338], - [523, 7, 429, "Metrics/MethodLength: Method has too many lines. [11/10]", 2317545285], - [551, 7, 1153, "Metrics/MethodLength: Method has too many lines. [27/10]", 2050460902], - [581, 7, 1164, "Metrics/MethodLength: Method has too many lines. [16/10]", 293708573], - [602, 7, 1132, "Metrics/MethodLength: Method has too many lines. [15/10]", 2657257420], - [610, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193417991], - [624, 68, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [627, 19, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [630, 7, 718, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preference_for_pair` is too high. [8/7]", 3339910669], - [630, 7, 718, "Metrics/MethodLength: Method has too many lines. [12/10]", 3339910669], - [656, 7, 1442, "Metrics/MethodLength: Method has too many lines. [34/10]", 3775627321], - [723, 7, 1439, "Metrics/AbcSize: Assignment Branch Condition size for `can_merge_recursively?` is too high. [<0, 18, 13> 22.2/17]", 3986446452], - [723, 7, 1439, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `can_merge_recursively?` is too high. [13/7]", 3986446452], - [723, 7, 1439, "Metrics/MethodLength: Method has too many lines. [11/10]", 3986446452], - [723, 7, 1439, "Metrics/PerceivedComplexity: Perceived complexity for `can_merge_recursively?` is too high. [14/8]", 3986446452], - [754, 7, 368, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `flow_sequence?` is too high. [9/7]", 13791150], - [754, 7, 368, "Metrics/PerceivedComplexity: Perceived complexity for `flow_sequence?` is too high. [9/8]", 13791150], - [765, 7, 452, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `flow_mapping?` is too high. [11/7]", 4104291177], - [765, 7, 452, "Metrics/PerceivedComplexity: Perceived complexity for `flow_mapping?` is too high. [11/8]", 4104291177], - [802, 7, 705, "Metrics/AbcSize: Assignment Branch Condition size for `bare_dash_sequence_item_mapping?` is too high. [<5, 18, 8> 20.32/17]", 625586302], - [802, 7, 705, "Metrics/MethodLength: Method has too many lines. [11/10]", 625586302], - [829, 7, 2511, "Metrics/AbcSize: Assignment Branch Condition size for `emit_recursive_merge` is too high. [<0, 19, 10> 21.47/17]", 3873511358], - [829, 7, 2511, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_recursive_merge` is too high. [9/7]", 3873511358], - [829, 7, 2511, "Metrics/MethodLength: Method has too many lines. [49/10]", 3873511358], - [829, 7, 2511, "Metrics/PerceivedComplexity: Perceived complexity for `emit_recursive_merge` is too high. [11/8]", 3873511358], - [830, 9, 2388, "Metrics/BlockLength: Block has too many lines. [47/25]", 1655278799], - [906, 7, 2400, "Metrics/AbcSize: Assignment Branch Condition size for `emit_recursive_mapping_merge` is too high. [<15, 29, 14> 35.52/17]", 1648233163], - [906, 7, 2400, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_recursive_mapping_merge` is too high. [15/7]", 1648233163], - [906, 7, 2400, "Metrics/MethodLength: Method has too many lines. [44/10]", 1648233163], - [906, 7, 2400, "Metrics/PerceivedComplexity: Perceived complexity for `emit_recursive_mapping_merge` is too high. [17/8]", 1648233163], - [974, 7, 6966, "Metrics/AbcSize: Assignment Branch Condition size for `emit_recursive_sequence_merge` is too high. [<35, 84, 35> 97.5/17]", 2427419647], - [974, 7, 6966, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_recursive_sequence_merge` is too high. [30/7]", 2427419647], - [974, 7, 6966, "Metrics/MethodLength: Method has too many lines. [113/10]", 2427419647], - [974, 7, 6966, "Metrics/PerceivedComplexity: Perceived complexity for `emit_recursive_sequence_merge` is too high. [37/8]", 2427419647], - [1020, 74, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2678193523], - [1023, 9, 3871, "Metrics/BlockLength: Block has too many lines. [72/25]", 4174342864], - [1036, 28, 31, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1010804247], - [1048, 37, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2630532814], - [1064, 28, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2630532814], - [1077, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2582359665], - [1102, 76, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2678193523], - [1111, 74, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2678193523], - [1115, 7, 1262, "Metrics/AbcSize: Assignment Branch Condition size for `build_sequence_item_matches` is too high. [<11, 13, 2> 17.15/17]", 3127840652], - [1115, 7, 1262, "Metrics/MethodLength: Method has too many lines. [21/10]", 3127840652], - [1146, 7, 3065, "Metrics/AbcSize: Assignment Branch Condition size for `build_refined_sequence_observation_matches` is too high. [<19, 51, 17> 57.02/17]", 2950540403], - [1146, 7, 3065, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_refined_sequence_observation_matches` is too high. [18/7]", 2950540403], - [1146, 7, 3065, "Metrics/MethodLength: Method has too many lines. [55/10]", 2950540403], - [1146, 7, 3065, "Metrics/PerceivedComplexity: Perceived complexity for `build_refined_sequence_observation_matches` is too high. [18/8]", 2950540403], - [1209, 9, 24, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 32301403], - [1261, 7, 901, "Metrics/MethodLength: Method has too many lines. [14/10]", 3298193773], - [1261, 29, 147, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3718416672], - [1285, 7, 1642, "Metrics/AbcSize: Assignment Branch Condition size for `emit_node` is too high. [<4, 22, 10> 24.49/17]", 518692521], - [1285, 7, 1642, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_node` is too high. [11/7]", 518692521], - [1285, 7, 1642, "Metrics/MethodLength: Method has too many lines. [32/10]", 518692521], - [1285, 7, 1642, "Metrics/PerceivedComplexity: Perceived complexity for `emit_node` is too high. [11/8]", 518692521], - [1285, 20, 138, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 109777589], - [1331, 7, 1577, "Metrics/AbcSize: Assignment Branch Condition size for `emit_mapping_entry` is too high. [<6, 17, 15> 23.45/17]", 3927797439], - [1331, 7, 1577, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_mapping_entry` is too high. [13/7]", 3927797439], - [1331, 7, 1577, "Metrics/MethodLength: Method has too many lines. [28/10]", 3927797439], - [1331, 7, 1577, "Metrics/PerceivedComplexity: Perceived complexity for `emit_mapping_entry` is too high. [13/8]", 3927797439], - [1331, 29, 148, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2283756321], - [1375, 7, 1975, "Metrics/AbcSize: Assignment Branch Condition size for `emit_mapping_entry_prelude` is too high. [<9, 26, 16> 31.83/17]", 3449491730], - [1375, 7, 1975, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_mapping_entry_prelude` is too high. [16/7]", 3449491730], - [1375, 7, 1975, "Metrics/MethodLength: Method has too many lines. [35/10]", 3449491730], - [1375, 7, 1975, "Metrics/PerceivedComplexity: Perceived complexity for `emit_mapping_entry_prelude` is too high. [16/8]", 3449491730], - [1419, 7, 1550, "Metrics/AbcSize: Assignment Branch Condition size for `emit_node_prelude` is too high. [<6, 17, 9> 20.15/17]", 4132652846], - [1419, 7, 1550, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_node_prelude` is too high. [10/7]", 4132652846], - [1419, 7, 1550, "Metrics/MethodLength: Method has too many lines. [26/10]", 4132652846], - [1419, 7, 1550, "Metrics/PerceivedComplexity: Perceived complexity for `emit_node_prelude` is too high. [10/8]", 4132652846], - [1463, 7, 1256, "Metrics/AbcSize: Assignment Branch Condition size for `emit_node_first_line` is too high. [<3, 16, 5> 17.03/17]", 809936874], - [1463, 7, 1256, "Metrics/MethodLength: Method has too many lines. [24/10]", 809936874], - [1492, 7, 838, "Metrics/AbcSize: Assignment Branch Condition size for `emit_removed_destination_node_comments` is too high. [<3, 16, 7> 17.72/17]", 1801654574], - [1492, 7, 838, "Metrics/MethodLength: Method has too many lines. [13/10]", 1801654574], - [1531, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2088091358], - [1551, 7, 587, "Metrics/MethodLength: Method has too many lines. [14/10]", 1778584112], - [1594, 7, 1089, "Metrics/AbcSize: Assignment Branch Condition size for `canonical_sequence_item_value` is too high. [<7, 20, 8> 22.65/17]", 2923924756], - [1594, 7, 1089, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonical_sequence_item_value` is too high. [9/7]", 2923924756], - [1594, 7, 1089, "Metrics/MethodLength: Method has too many lines. [15/10]", 2923924756], - [1594, 7, 1089, "Metrics/PerceivedComplexity: Perceived complexity for `canonical_sequence_item_value` is too high. [9/8]", 2923924756], - [1621, 7, 918, "Metrics/AbcSize: Assignment Branch Condition size for `sequence_item_observations` is too high. [<7, 26, 9> 28.39/17]", 1736204122], - [1621, 7, 918, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `sequence_item_observations` is too high. [10/7]", 1736204122], - [1621, 7, 918, "Metrics/MethodLength: Method has too many lines. [15/10]", 1736204122], - [1621, 7, 918, "Metrics/PerceivedComplexity: Perceived complexity for `sequence_item_observations` is too high. [10/8]", 1736204122], - [1626, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3762412176], - [1635, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 4096127909], - [1656, 7, 901, "Metrics/AbcSize: Assignment Branch Condition size for `trimmed_sequence_item_lines` is too high. [<11, 26, 10> 29.95/17]", 4091201884], - [1656, 7, 901, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trimmed_sequence_item_lines` is too high. [10/7]", 4091201884], - [1656, 7, 901, "Metrics/MethodLength: Method has too many lines. [15/10]", 4091201884], - [1656, 7, 901, "Metrics/PerceivedComplexity: Perceived complexity for `trimmed_sequence_item_lines` is too high. [10/8]", 4091201884], - [1678, 7, 713, "Metrics/AbcSize: Assignment Branch Condition size for `sequence_item_start_line` is too high. [<5, 22, 8> 23.94/17]", 2061460995], - [1712, 11, 61, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1718502596], - [1718, 7, 629, "Metrics/AbcSize: Assignment Branch Condition size for `effective_end_line` is too high. [<4, 14, 10> 17.66/17]", 2226115349], - [1718, 7, 629, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `effective_end_line` is too high. [10/7]", 2226115349], - [1718, 7, 629, "Metrics/PerceivedComplexity: Perceived complexity for `effective_end_line` is too high. [10/8]", 2226115349], - [1722, 41, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [1764, 7, 1381, "Metrics/AbcSize: Assignment Branch Condition size for `region_already_emitted?` is too high. [<11, 32, 14> 36.62/17]", 2166775868], - [1764, 7, 1381, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `region_already_emitted?` is too high. [13/7]", 2166775868], - [1764, 7, 1381, "Metrics/MethodLength: Method has too many lines. [26/10]", 2166775868], - [1764, 7, 1381, "Metrics/PerceivedComplexity: Perceived complexity for `region_already_emitted?` is too high. [14/8]", 2166775868], - [1804, 7, 2218, "Metrics/AbcSize: Assignment Branch Condition size for `emit_document_postlude` is too high. [<17, 30, 14> 37.22/17]", 1397438331], - [1804, 7, 2218, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_document_postlude` is too high. [15/7]", 1397438331], - [1804, 7, 2218, "Metrics/MethodLength: Method has too many lines. [27/10]", 1397438331], - [1804, 7, 2218, "Metrics/PerceivedComplexity: Perceived complexity for `emit_document_postlude` is too high. [15/8]", 1397438331], - [1848, 7, 1304, "Metrics/AbcSize: Assignment Branch Condition size for `emit_document_prelude` is too high. [<8, 28, 11> 31.13/17]", 325827008], - [1848, 7, 1304, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_document_prelude` is too high. [12/7]", 325827008], - [1848, 7, 1304, "Metrics/MethodLength: Method has too many lines. [24/10]", 325827008], - [1848, 7, 1304, "Metrics/PerceivedComplexity: Perceived complexity for `emit_document_prelude` is too high. [13/8]", 325827008], - [1896, 9, 48, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2339197345], - [1899, 7, 691, "Metrics/AbcSize: Assignment Branch Condition size for `document_leading_regions_for` is too high. [<5, 19, 14> 24.12/17]", 796439642], - [1899, 7, 691, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `document_leading_regions_for` is too high. [14/7]", 796439642], - [1899, 7, 691, "Metrics/MethodLength: Method has too many lines. [12/10]", 796439642], - [1899, 7, 691, "Metrics/PerceivedComplexity: Perceived complexity for `document_leading_regions_for` is too high. [14/8]", 796439642], - [1928, 7, 646, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonical_leading_comment_region` is too high. [10/7]", 1342472091], - [1928, 7, 646, "Metrics/PerceivedComplexity: Perceived complexity for `canonical_leading_comment_region` is too high. [10/8]", 1342472091], - [1942, 7, 1410, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_template_preamble_prefix_region` is too high. [<7, 25, 15> 29.98/17]", 449550851], - [1942, 7, 1410, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collapse_template_preamble_prefix_region` is too high. [11/7]", 449550851], - [1942, 7, 1410, "Metrics/MethodLength: Method has too many lines. [27/10]", 449550851], - [1942, 7, 1410, "Metrics/PerceivedComplexity: Perceived complexity for `collapse_template_preamble_prefix_region` is too high. [11/8]", 449550851], - [1975, 7, 991, "Metrics/AbcSize: Assignment Branch Condition size for `duplicated_template_preamble_prefix_in_first_node_leading_region?` is too high. [<7, 25, 14> 29.5/17]", 4012549279], - [1975, 7, 991, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `duplicated_template_preamble_prefix_in_first_node_leading_region?` is too high. [12/7]", 4012549279], - [1975, 7, 991, "Metrics/MethodLength: Method has too many lines. [13/10]", 4012549279], - [1975, 7, 991, "Metrics/PerceivedComplexity: Perceived complexity for `duplicated_template_preamble_prefix_in_first_node_leading_region?` is too high. [12/8]", 4012549279], - [2030, 7, 956, "Metrics/AbcSize: Assignment Branch Condition size for `document_trailing_regions_for` is too high. [<6, 16, 12> 20.88/17]", 3560026445], - [2030, 7, 956, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `document_trailing_regions_for` is too high. [12/7]", 3560026445], - [2030, 7, 956, "Metrics/PerceivedComplexity: Perceived complexity for `document_trailing_regions_for` is too high. [12/8]", 3560026445], - [2053, 7, 456, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `deflated_content_end_line` is too high. [8/7]", 3297059340], - [2089, 7, 614, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `leading_gap_line_count_for` is too high. [9/7]", 1127644346], - [2089, 7, 614, "Metrics/PerceivedComplexity: Perceived complexity for `leading_gap_line_count_for` is too high. [10/8]", 1127644346], - [2093, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 2290159738], - [2139, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [2168, 31, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [2175, 55, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [2183, 54, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [2191, 56, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [2196, 7, 822, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preferred_leading_comment_region` is too high. [10/7]", 1272157667], - [2196, 7, 822, "Metrics/PerceivedComplexity: Perceived complexity for `preferred_leading_comment_region` is too high. [10/8]", 1272157667], - [2308, 7, 465, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_interstitial_blank_lines` is too high. [9/7]", 1640065866], - [2308, 7, 465, "Metrics/PerceivedComplexity: Perceived complexity for `emit_interstitial_blank_lines` is too high. [9/8]", 1640065866], - [2320, 7, 586, "Metrics/MethodLength: Method has too many lines. [12/10]", 3310131662] - ], - "lib/psych/merge/debug_logger.rb:110646504": [ - [26, 9, 680, "Metrics/MethodLength: Method has too many lines. [12/10]", 1981451425] - ], - "lib/psych/merge/diff_mapper.rb:844380236": [ - [20, 5, 7887, "Metrics/ClassLength: Class has too many lines. [118/100]", 3492547573], - [34, 7, 471, "Metrics/MethodLength: Method has too many lines. [11/10]", 577300188], - [75, 7, 627, "Metrics/MethodLength: Method has too many lines. [12/10]", 2362564224], - [102, 7, 786, "Metrics/MethodLength: Method has too many lines. [11/10]", 1096016446], - [131, 7, 1613, "Metrics/AbcSize: Assignment Branch Condition size for `find_nested_path` is too high. [<12, 27, 20> 35.68/17]", 4005634231], - [131, 7, 1613, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_nested_path` is too high. [17/7]", 4005634231], - [131, 7, 1613, "Metrics/MethodLength: Method has too many lines. [30/10]", 4005634231], - [131, 7, 1613, "Metrics/PerceivedComplexity: Perceived complexity for `find_nested_path` is too high. [18/8]", 4005634231], - [183, 7, 758, "Metrics/MethodLength: Method has too many lines. [13/10]", 2773539171], - [204, 20, 11, "Style/NumericPredicate: Use `indent.zero?` instead of `indent == 0`.", 1189613385] - ], - "lib/psych/merge/emitter.rb:2851865662": [ - [14, 5, 7357, "Metrics/ClassLength: Class has too many lines. [147/100]", 579415518], - [138, 42, 6, "Lint/UnusedMethodArgument: Unused method argument - `region`.", 2124512157], - [151, 55, 12, "Lint/UnusedMethodArgument: Unused method argument - `current_line`.", 2091263933], - [166, 7, 560, "Metrics/AbcSize: Assignment Branch Condition size for `repeated_region_segment_length` is too high. [<6, 14, 8> 17.2/17]", 800046942], - [194, 7, 596, "Metrics/MethodLength: Method has too many lines. [12/10]", 2092207138], - [228, 7, 662, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `needs_quoting?` is too high. [10/7]", 172072954], - [228, 7, 662, "Metrics/PerceivedComplexity: Perceived complexity for `needs_quoting?` is too high. [10/8]", 172072954] - ], - "lib/psych/merge/file_analysis.rb:1868572144": [ - [13, 5, 14981, "Metrics/ClassLength: Class has too many lines. [251/100]", 3755372144], - [37, 7, 1080, "Metrics/MethodLength: Method has too many lines. [15/10]", 4243676919], - [203, 7, 533, "Metrics/MethodLength: Method has too many lines. [11/10]", 2772113363], - [237, 7, 998, "Metrics/AbcSize: Assignment Branch Condition size for `mapping_entry_attachment` is too high. [<5, 23, 7> 24.56/17]", 3001873728], - [237, 7, 998, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `mapping_entry_attachment` is too high. [8/7]", 3001873728], - [237, 7, 998, "Metrics/MethodLength: Method has too many lines. [13/10]", 3001873728], - [267, 7, 809, "Metrics/AbcSize: Assignment Branch Condition size for `full_line_comment_blocks_before` is too high. [<9, 16, 6> 19.31/17]", 2033268754], - [267, 7, 809, "Metrics/MethodLength: Method has too many lines. [22/10]", 2033268754], - [329, 7, 1353, "Metrics/AbcSize: Assignment Branch Condition size for `extract_freeze_blocks` is too high. [<12, 20, 12> 26.23/17]", 4244924302], - [329, 7, 1353, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_freeze_blocks` is too high. [10/7]", 4244924302], - [329, 7, 1353, "Metrics/MethodLength: Method has too many lines. [27/10]", 4244924302], - [329, 7, 1353, "Metrics/PerceivedComplexity: Perceived complexity for `extract_freeze_blocks` is too high. [11/8]", 4244924302], - [370, 7, 1756, "Metrics/AbcSize: Assignment Branch Condition size for `integrate_nodes_and_freeze_blocks` is too high. [<11, 28, 19> 35.58/17]", 1233865722], - [370, 7, 1756, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `integrate_nodes_and_freeze_blocks` is too high. [18/7]", 1233865722], - [370, 7, 1756, "Metrics/MethodLength: Method has too many lines. [31/10]", 1233865722], - [370, 7, 1756, "Metrics/PerceivedComplexity: Perceived complexity for `integrate_nodes_and_freeze_blocks` is too high. [19/8]", 1233865722] - ], - "lib/psych/merge/freeze_node.rb:3007012923": [ - [33, 21, 127, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1948779238] - ], - "lib/psych/merge/mapping_match_refiner.rb:3428808618": [ - [29, 5, 7580, "Metrics/ClassLength: Class has too many lines. [111/100]", 3764504760], - [121, 7, 800, "Metrics/MethodLength: Method has too many lines. [13/10]", 2814728338], - [150, 15, 20, "Style/ClassEqualityComparison: Use `instance_of?(node2.class)` instead of comparing classes.", 1212490233], - [193, 7, 270, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `sequence_similarity` is too high. [9/7]", 724822377], - [193, 7, 270, "Metrics/PerceivedComplexity: Perceived complexity for `sequence_similarity` is too high. [9/8]", 724822377], - [197, 23, 9, "Style/NumericPredicate: Use `len1.zero?` instead of `len1 == 0`.", 913205219], - [197, 36, 9, "Style/NumericPredicate: Use `len2.zero?` instead of `len2 == 0`.", 871697920], - [198, 23, 9, "Style/NumericPredicate: Use `len1.zero?` instead of `len1 == 0`.", 913205219], - [198, 36, 9, "Style/NumericPredicate: Use `len2.zero?` instead of `len2 == 0`.", 871697920], - [225, 7, 854, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<13, 29, 8> 32.77/17]", 2946547420], - [225, 7, 854, "Metrics/MethodLength: Method has too many lines. [20/10]", 2946547420] - ], - "lib/psych/merge/merge_result.rb:4276173304": [ - [140, 7, 421, "Metrics/MethodLength: Method has too many lines. [11/10]", 2459390040] - ], - "lib/psych/merge/node_wrapper.rb:1997974804": [ - [12, 5, 12280, "Metrics/ClassLength: Class has too many lines. [222/100]", 463540785], - [42, 7, 2039, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `initialize` is too high. [8/7]", 338533329], - [42, 21, 274, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 2646089467], - [144, 7, 699, "Metrics/MethodLength: Method has too many lines. [20/10]", 2676695829], - [210, 7, 985, "Metrics/MethodLength: Method has too many lines. [16/10]", 59427073], - [256, 7, 686, "Metrics/AbcSize: Assignment Branch Condition size for `compute_signature` is too high. [<4, 21, 13> 25.02/17]", 2657240579], - [256, 7, 686, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_signature` is too high. [14/7]", 2657240579], - [256, 7, 686, "Metrics/MethodLength: Method has too many lines. [18/10]", 2657240579], - [256, 7, 686, "Metrics/PerceivedComplexity: Perceived complexity for `compute_signature` is too high. [10/8]", 2657240579], - [277, 7, 425, "Metrics/MethodLength: Method has too many lines. [11/10]", 3170039988], - [310, 7, 1150, "Metrics/MethodLength: Method has too many lines. [24/10]", 647387009], - [321, 31, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [340, 7, 484, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `clamp_end_line_to_next_sibling!` is too high. [10/7]", 953824779], - [340, 7, 484, "Metrics/PerceivedComplexity: Perceived complexity for `clamp_end_line_to_next_sibling!` is too high. [10/8]", 953824779] - ], - "lib/psych/merge/smart_merger.rb:1750771088": [ - [45, 5, 10514, "Metrics/ClassLength: Class has too many lines. [192/100]", 4260193581], - [81, 7, 1336, "Metrics/MethodLength: Method has too many lines. [18/10]", 1713606127], - [81, 21, 557, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [16/5]", 1646356108], - [153, 7, 1440, "Metrics/AbcSize: Assignment Branch Condition size for `merge_with_debug` is too high. [<3, 24, 7> 25.18/17]", 695369520], - [153, 7, 1440, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_with_debug` is too high. [8/7]", 695369520], - [153, 7, 1440, "Metrics/MethodLength: Method has too many lines. [32/10]", 695369520], - [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:914772787": [ - [129, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [144, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [145, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [152, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ], - "spec/fixtures_integration_spec.rb:1717446685": [ - [3, 1, 9786, "Metrics/BlockLength: Block has too many lines. [222/25]", 1649396447], - [16, 3, 1302, "Metrics/BlockLength: Block has too many lines. [32/25]", 1546514966], - [52, 3, 2159, "Metrics/BlockLength: Block has too many lines. [28/25]", 270765486], - [109, 3, 1594, "Metrics/BlockLength: Block has too many lines. [41/25]", 568154065], - [227, 3, 1413, "Metrics/BlockLength: Block has too many lines. [29/25]", 1847754351] - ], - "spec/reproducible_merge_spec.rb:2168097366": [ - [3, 1, 5699, "Metrics/BlockLength: Block has too many lines. [107/25]", 3775945048], - [4, 3, 61, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1575360142], - [6, 3, 4847, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3343843514], - [47, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 3440433042], - [53, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3187380084] - ] -} diff --git a/gems/psych-merge/Gemfile b/gems/psych-merge/Gemfile index 10c6f0b22..c950901a0 100644 --- a/gems/psych-merge/Gemfile +++ b/gems/psych-merge/Gemfile @@ -273,6 +273,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/psych-merge/Gemfile.lock b/gems/psych-merge/Gemfile.lock index a12016d3e..9fa08b960 100644 --- a/gems/psych-merge/Gemfile.lock +++ b/gems/psych-merge/Gemfile.lock @@ -275,6 +275,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -308,7 +324,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -363,18 +378,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -538,22 +542,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -659,9 +659,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -739,7 +739,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -760,10 +759,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -838,13 +837,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/psych-merge/lib/psych/merge/version.rb b/gems/psych-merge/lib/psych/merge/version.rb index aa65219d4..518f12da4 100644 --- a/gems/psych-merge/lib/psych/merge/version.rb +++ b/gems/psych-merge/lib/psych/merge/version.rb @@ -3,7 +3,7 @@ module Psych module Merge module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/zip-merge/Gemfile.lock b/gems/zip-merge/Gemfile.lock index 6c7ddf202..9238afb04 100644 --- a/gems/zip-merge/Gemfile.lock +++ b/gems/zip-merge/Gemfile.lock @@ -16,7 +16,242 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -24,6 +259,22 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -43,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -106,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -134,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -273,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -322,6 +584,14 @@ GEM delegate (~> 0.1) rspec (~> 3.0) timecop (>= 0.7, < 1) + token-resolver (2.0.4) + parslet (~> 2.0) + version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -368,22 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -392,13 +685,19 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) @@ -412,12 +711,28 @@ CHECKSUMS ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) + ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -425,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -437,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -464,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -475,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -502,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -513,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -525,14 +858,20 @@ CHECKSUMS thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73 timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 + token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd From 214e68388c7eba72c0d89c1c28c94d8b85d7a0a7 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:37:48 -0600 Subject: [PATCH 207/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/parslet-toml-merge/Gemfile.lock | 393 ++------------------ gems/psych-merge/lib/psych/merge/version.rb | 2 +- 2 files changed, 39 insertions(+), 356 deletions(-) diff --git a/gems/parslet-toml-merge/Gemfile.lock b/gems/parslet-toml-merge/Gemfile.lock index 5b536f6cd..3217bd106 100644 --- a/gems/parslet-toml-merge/Gemfile.lock +++ b/gems/parslet-toml-merge/Gemfile.lock @@ -17,280 +17,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: toml-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -302,6 +35,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -310,12 +48,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -324,6 +56,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -379,6 +112,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -397,7 +139,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -537,23 +278,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -589,9 +332,11 @@ GEM version_gem (~> 1.1, >= 1.1.13) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +383,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,61 +408,39 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +453,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,13 +481,10 @@ CHECKSUMS parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 parslet-toml-merge (7.1.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +492,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,19 +519,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -858,17 +545,14 @@ CHECKSUMS token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +560,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/psych-merge/lib/psych/merge/version.rb b/gems/psych-merge/lib/psych/merge/version.rb index 518f12da4..aa65219d4 100644 --- a/gems/psych-merge/lib/psych/merge/version.rb +++ b/gems/psych-merge/lib/psych/merge/version.rb @@ -3,7 +3,7 @@ module Psych module Merge module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end From 2ccd22f49e8a458f29cdc2eb2e59c97b3fde0866 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:37:52 -0600 Subject: [PATCH 208/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/citrus-toml-merge/Gemfile.lock | 341 ++++++++++++++++++++++- gems/parslet-toml-merge/Gemfile.lock | 342 ++++++++++++++++++++++- gems/psych-merge/.rubocop_gradual.lock | 372 +++++++++++++++++++++++++ gems/psych-merge/Gemfile.lock | 369 ++---------------------- 4 files changed, 1063 insertions(+), 361 deletions(-) create mode 100644 gems/psych-merge/.rubocop_gradual.lock diff --git a/gems/citrus-toml-merge/Gemfile.lock b/gems/citrus-toml-merge/Gemfile.lock index eff6e8295..75bc67a58 100644 --- a/gems/citrus-toml-merge/Gemfile.lock +++ b/gems/citrus-toml-merge/Gemfile.lock @@ -17,13 +17,264 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: toml-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -35,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -48,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -111,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -139,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -278,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -330,14 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -384,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -409,33 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -443,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -455,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -482,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -493,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -520,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -531,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -544,16 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -561,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) 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 3217bd106..3293a63f0 100644 --- a/gems/parslet-toml-merge/Gemfile.lock +++ b/gems/parslet-toml-merge/Gemfile.lock @@ -17,13 +17,264 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: toml-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -35,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -48,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -111,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -139,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -278,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -332,11 +589,9 @@ GEM version_gem (~> 1.1, >= 1.1.13) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -383,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -408,32 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -441,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -453,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -481,10 +789,13 @@ CHECKSUMS parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 parslet-toml-merge (7.1.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -492,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -519,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -530,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -545,14 +861,17 @@ CHECKSUMS token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -560,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/psych-merge/.rubocop_gradual.lock b/gems/psych-merge/.rubocop_gradual.lock new file mode 100644 index 000000000..85e814fd4 --- /dev/null +++ b/gems/psych-merge/.rubocop_gradual.lock @@ -0,0 +1,372 @@ +{ + ".simplecov:2102217422": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:1368539789": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/psych-merge.rb:1330894360": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`psych-merge.rb`) should use snake_case.", 5381] + ], + "lib/psych/merge.rb:173660101": [ + [38, 3, 9398, "Metrics/ModuleLength: Module has too many lines. [188/100]", 2155600486], + [115, 5, 6353, "Metrics/ClassLength: Class has too many lines. [160/100]", 2805786752], + [171, 7, 1593, "Metrics/MethodLength: Method has too many lines. [26/10]", 162695378], + [171, 21, 295, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 2742902791], + [212, 7, 440, "Metrics/MethodLength: Method has too many lines. [11/10]", 4238054657], + [252, 7, 417, "Metrics/MethodLength: Method has too many lines. [11/10]", 3661776213], + [275, 7, 458, "Metrics/MethodLength: Method has too many lines. [15/10]", 1125262299] + ], + "lib/psych/merge/comment_tracker.rb:109829813": [ + [33, 7, 711, "Metrics/MethodLength: Method has too many lines. [24/10]", 4175176008], + [65, 48, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] + ], + "lib/psych/merge/conflict_resolver.rb:1439336560": [ + [24, 5, 98551, "Metrics/ClassLength: Class has too many lines. [1730/100]", 3470480790], + [48, 7, 1257, "Metrics/MethodLength: Method has too many lines. [18/10]", 2709727248], + [48, 21, 354, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [13/5]", 1127138839], + [49, 121, 141, "Layout/LineLength: Line is too long. [261/120]", 84971754], + [63, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1411495206], + [75, 7, 1316, "Metrics/MethodLength: Method has too many lines. [22/10]", 841707991], + [121, 7, 1128, "Metrics/AbcSize: Assignment Branch Condition size for `build_refined_matches` is too high. [<11, 16, 8> 21/17]", 4214539560], + [121, 7, 1128, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_refined_matches` is too high. [9/7]", 4214539560], + [121, 7, 1128, "Metrics/MethodLength: Method has too many lines. [18/10]", 4214539560], + [121, 7, 1128, "Metrics/PerceivedComplexity: Perceived complexity for `build_refined_matches` is too high. [9/8]", 4214539560], + [149, 7, 11524, "Metrics/AbcSize: Assignment Branch Condition size for `merge_nodes_to_emitter` is too high. [<57, 120, 50> 142/17]", 2474480422], + [149, 7, 11524, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_nodes_to_emitter` is too high. [43/7]", 2474480422], + [149, 7, 11524, "Metrics/MethodLength: Method has too many lines. [194/10]", 2474480422], + [149, 7, 11524, "Metrics/PerceivedComplexity: Perceived complexity for `merge_nodes_to_emitter` is too high. [49/8]", 2474480422], + [149, 33, 186, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 421356977], + [150, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 97621789], + [193, 24, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2944491302], + [204, 9, 7819, "Metrics/BlockLength: Block has too many lines. [136/25]", 519912312], + [205, 28, 36, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 345161915], + [263, 39, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3425527675], + [270, 39, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3425527675], + [286, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2818803335], + [330, 37, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3425527675], + [337, 37, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3425527675], + [376, 26, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2944491302], + [391, 24, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2944491302], + [436, 7, 1049, "Metrics/MethodLength: Method has too many lines. [14/10]", 2563450827], + [455, 7, 1990, "Metrics/AbcSize: Assignment Branch Condition size for `emit_supplemental_document_postlude` is too high. [<8, 20, 6> 22.36/17]", 1604415261], + [455, 7, 1990, "Metrics/MethodLength: Method has too many lines. [24/10]", 1604415261], + [501, 7, 982, "Metrics/AbcSize: Assignment Branch Condition size for `emit_nonpreferred_document_postlude_regions` is too high. [<5, 20, 10> 22.91/17]", 7588338], + [501, 7, 982, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_nonpreferred_document_postlude_regions` is too high. [10/7]", 7588338], + [501, 7, 982, "Metrics/MethodLength: Method has too many lines. [17/10]", 7588338], + [501, 7, 982, "Metrics/PerceivedComplexity: Perceived complexity for `emit_nonpreferred_document_postlude_regions` is too high. [11/8]", 7588338], + [523, 7, 429, "Metrics/MethodLength: Method has too many lines. [11/10]", 2317545285], + [551, 7, 1153, "Metrics/MethodLength: Method has too many lines. [27/10]", 2050460902], + [581, 7, 1164, "Metrics/MethodLength: Method has too many lines. [16/10]", 293708573], + [602, 7, 1132, "Metrics/MethodLength: Method has too many lines. [15/10]", 2657257420], + [610, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193417991], + [624, 68, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [627, 19, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [630, 7, 718, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preference_for_pair` is too high. [8/7]", 3339910669], + [630, 7, 718, "Metrics/MethodLength: Method has too many lines. [12/10]", 3339910669], + [656, 7, 1442, "Metrics/MethodLength: Method has too many lines. [34/10]", 3775627321], + [723, 7, 1439, "Metrics/AbcSize: Assignment Branch Condition size for `can_merge_recursively?` is too high. [<0, 18, 13> 22.2/17]", 3986446452], + [723, 7, 1439, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `can_merge_recursively?` is too high. [13/7]", 3986446452], + [723, 7, 1439, "Metrics/MethodLength: Method has too many lines. [11/10]", 3986446452], + [723, 7, 1439, "Metrics/PerceivedComplexity: Perceived complexity for `can_merge_recursively?` is too high. [14/8]", 3986446452], + [754, 7, 368, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `flow_sequence?` is too high. [9/7]", 13791150], + [754, 7, 368, "Metrics/PerceivedComplexity: Perceived complexity for `flow_sequence?` is too high. [9/8]", 13791150], + [765, 7, 452, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `flow_mapping?` is too high. [11/7]", 4104291177], + [765, 7, 452, "Metrics/PerceivedComplexity: Perceived complexity for `flow_mapping?` is too high. [11/8]", 4104291177], + [802, 7, 705, "Metrics/AbcSize: Assignment Branch Condition size for `bare_dash_sequence_item_mapping?` is too high. [<5, 18, 8> 20.32/17]", 625586302], + [802, 7, 705, "Metrics/MethodLength: Method has too many lines. [11/10]", 625586302], + [829, 7, 2511, "Metrics/AbcSize: Assignment Branch Condition size for `emit_recursive_merge` is too high. [<0, 19, 10> 21.47/17]", 3873511358], + [829, 7, 2511, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_recursive_merge` is too high. [9/7]", 3873511358], + [829, 7, 2511, "Metrics/MethodLength: Method has too many lines. [49/10]", 3873511358], + [829, 7, 2511, "Metrics/PerceivedComplexity: Perceived complexity for `emit_recursive_merge` is too high. [11/8]", 3873511358], + [830, 9, 2388, "Metrics/BlockLength: Block has too many lines. [47/25]", 1655278799], + [906, 7, 2400, "Metrics/AbcSize: Assignment Branch Condition size for `emit_recursive_mapping_merge` is too high. [<15, 29, 14> 35.52/17]", 1648233163], + [906, 7, 2400, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_recursive_mapping_merge` is too high. [15/7]", 1648233163], + [906, 7, 2400, "Metrics/MethodLength: Method has too many lines. [44/10]", 1648233163], + [906, 7, 2400, "Metrics/PerceivedComplexity: Perceived complexity for `emit_recursive_mapping_merge` is too high. [17/8]", 1648233163], + [974, 7, 6966, "Metrics/AbcSize: Assignment Branch Condition size for `emit_recursive_sequence_merge` is too high. [<35, 84, 35> 97.5/17]", 2427419647], + [974, 7, 6966, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_recursive_sequence_merge` is too high. [30/7]", 2427419647], + [974, 7, 6966, "Metrics/MethodLength: Method has too many lines. [113/10]", 2427419647], + [974, 7, 6966, "Metrics/PerceivedComplexity: Perceived complexity for `emit_recursive_sequence_merge` is too high. [37/8]", 2427419647], + [1020, 74, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2678193523], + [1023, 9, 3871, "Metrics/BlockLength: Block has too many lines. [72/25]", 4174342864], + [1036, 28, 31, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1010804247], + [1048, 37, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2630532814], + [1064, 28, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2630532814], + [1077, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2582359665], + [1102, 76, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2678193523], + [1111, 74, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2678193523], + [1115, 7, 1262, "Metrics/AbcSize: Assignment Branch Condition size for `build_sequence_item_matches` is too high. [<11, 13, 2> 17.15/17]", 3127840652], + [1115, 7, 1262, "Metrics/MethodLength: Method has too many lines. [21/10]", 3127840652], + [1146, 7, 3065, "Metrics/AbcSize: Assignment Branch Condition size for `build_refined_sequence_observation_matches` is too high. [<19, 51, 17> 57.02/17]", 2950540403], + [1146, 7, 3065, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_refined_sequence_observation_matches` is too high. [18/7]", 2950540403], + [1146, 7, 3065, "Metrics/MethodLength: Method has too many lines. [55/10]", 2950540403], + [1146, 7, 3065, "Metrics/PerceivedComplexity: Perceived complexity for `build_refined_sequence_observation_matches` is too high. [18/8]", 2950540403], + [1209, 9, 24, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 32301403], + [1261, 7, 901, "Metrics/MethodLength: Method has too many lines. [14/10]", 3298193773], + [1261, 29, 147, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3718416672], + [1285, 7, 1642, "Metrics/AbcSize: Assignment Branch Condition size for `emit_node` is too high. [<4, 22, 10> 24.49/17]", 518692521], + [1285, 7, 1642, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_node` is too high. [11/7]", 518692521], + [1285, 7, 1642, "Metrics/MethodLength: Method has too many lines. [32/10]", 518692521], + [1285, 7, 1642, "Metrics/PerceivedComplexity: Perceived complexity for `emit_node` is too high. [11/8]", 518692521], + [1285, 20, 138, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 109777589], + [1331, 7, 1577, "Metrics/AbcSize: Assignment Branch Condition size for `emit_mapping_entry` is too high. [<6, 17, 15> 23.45/17]", 3927797439], + [1331, 7, 1577, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_mapping_entry` is too high. [13/7]", 3927797439], + [1331, 7, 1577, "Metrics/MethodLength: Method has too many lines. [28/10]", 3927797439], + [1331, 7, 1577, "Metrics/PerceivedComplexity: Perceived complexity for `emit_mapping_entry` is too high. [13/8]", 3927797439], + [1331, 29, 148, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2283756321], + [1375, 7, 1975, "Metrics/AbcSize: Assignment Branch Condition size for `emit_mapping_entry_prelude` is too high. [<9, 26, 16> 31.83/17]", 3449491730], + [1375, 7, 1975, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_mapping_entry_prelude` is too high. [16/7]", 3449491730], + [1375, 7, 1975, "Metrics/MethodLength: Method has too many lines. [35/10]", 3449491730], + [1375, 7, 1975, "Metrics/PerceivedComplexity: Perceived complexity for `emit_mapping_entry_prelude` is too high. [16/8]", 3449491730], + [1419, 7, 1550, "Metrics/AbcSize: Assignment Branch Condition size for `emit_node_prelude` is too high. [<6, 17, 9> 20.15/17]", 4132652846], + [1419, 7, 1550, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_node_prelude` is too high. [10/7]", 4132652846], + [1419, 7, 1550, "Metrics/MethodLength: Method has too many lines. [26/10]", 4132652846], + [1419, 7, 1550, "Metrics/PerceivedComplexity: Perceived complexity for `emit_node_prelude` is too high. [10/8]", 4132652846], + [1463, 7, 1256, "Metrics/AbcSize: Assignment Branch Condition size for `emit_node_first_line` is too high. [<3, 16, 5> 17.03/17]", 809936874], + [1463, 7, 1256, "Metrics/MethodLength: Method has too many lines. [24/10]", 809936874], + [1492, 7, 838, "Metrics/AbcSize: Assignment Branch Condition size for `emit_removed_destination_node_comments` is too high. [<3, 16, 7> 17.72/17]", 1801654574], + [1492, 7, 838, "Metrics/MethodLength: Method has too many lines. [13/10]", 1801654574], + [1531, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2088091358], + [1551, 7, 587, "Metrics/MethodLength: Method has too many lines. [14/10]", 1778584112], + [1594, 7, 1089, "Metrics/AbcSize: Assignment Branch Condition size for `canonical_sequence_item_value` is too high. [<7, 20, 8> 22.65/17]", 2923924756], + [1594, 7, 1089, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonical_sequence_item_value` is too high. [9/7]", 2923924756], + [1594, 7, 1089, "Metrics/MethodLength: Method has too many lines. [15/10]", 2923924756], + [1594, 7, 1089, "Metrics/PerceivedComplexity: Perceived complexity for `canonical_sequence_item_value` is too high. [9/8]", 2923924756], + [1621, 7, 918, "Metrics/AbcSize: Assignment Branch Condition size for `sequence_item_observations` is too high. [<7, 26, 9> 28.39/17]", 1736204122], + [1621, 7, 918, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `sequence_item_observations` is too high. [10/7]", 1736204122], + [1621, 7, 918, "Metrics/MethodLength: Method has too many lines. [15/10]", 1736204122], + [1621, 7, 918, "Metrics/PerceivedComplexity: Perceived complexity for `sequence_item_observations` is too high. [10/8]", 1736204122], + [1626, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3762412176], + [1635, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 4096127909], + [1656, 7, 901, "Metrics/AbcSize: Assignment Branch Condition size for `trimmed_sequence_item_lines` is too high. [<11, 26, 10> 29.95/17]", 4091201884], + [1656, 7, 901, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trimmed_sequence_item_lines` is too high. [10/7]", 4091201884], + [1656, 7, 901, "Metrics/MethodLength: Method has too many lines. [15/10]", 4091201884], + [1656, 7, 901, "Metrics/PerceivedComplexity: Perceived complexity for `trimmed_sequence_item_lines` is too high. [10/8]", 4091201884], + [1678, 7, 713, "Metrics/AbcSize: Assignment Branch Condition size for `sequence_item_start_line` is too high. [<5, 22, 8> 23.94/17]", 2061460995], + [1712, 11, 61, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1718502596], + [1718, 7, 629, "Metrics/AbcSize: Assignment Branch Condition size for `effective_end_line` is too high. [<4, 14, 10> 17.66/17]", 2226115349], + [1718, 7, 629, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `effective_end_line` is too high. [10/7]", 2226115349], + [1718, 7, 629, "Metrics/PerceivedComplexity: Perceived complexity for `effective_end_line` is too high. [10/8]", 2226115349], + [1722, 41, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [1764, 7, 1381, "Metrics/AbcSize: Assignment Branch Condition size for `region_already_emitted?` is too high. [<11, 32, 14> 36.62/17]", 2166775868], + [1764, 7, 1381, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `region_already_emitted?` is too high. [13/7]", 2166775868], + [1764, 7, 1381, "Metrics/MethodLength: Method has too many lines. [26/10]", 2166775868], + [1764, 7, 1381, "Metrics/PerceivedComplexity: Perceived complexity for `region_already_emitted?` is too high. [14/8]", 2166775868], + [1804, 7, 2218, "Metrics/AbcSize: Assignment Branch Condition size for `emit_document_postlude` is too high. [<17, 30, 14> 37.22/17]", 1397438331], + [1804, 7, 2218, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_document_postlude` is too high. [15/7]", 1397438331], + [1804, 7, 2218, "Metrics/MethodLength: Method has too many lines. [27/10]", 1397438331], + [1804, 7, 2218, "Metrics/PerceivedComplexity: Perceived complexity for `emit_document_postlude` is too high. [15/8]", 1397438331], + [1848, 7, 1304, "Metrics/AbcSize: Assignment Branch Condition size for `emit_document_prelude` is too high. [<8, 28, 11> 31.13/17]", 325827008], + [1848, 7, 1304, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_document_prelude` is too high. [12/7]", 325827008], + [1848, 7, 1304, "Metrics/MethodLength: Method has too many lines. [24/10]", 325827008], + [1848, 7, 1304, "Metrics/PerceivedComplexity: Perceived complexity for `emit_document_prelude` is too high. [13/8]", 325827008], + [1896, 9, 48, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2339197345], + [1899, 7, 691, "Metrics/AbcSize: Assignment Branch Condition size for `document_leading_regions_for` is too high. [<5, 19, 14> 24.12/17]", 796439642], + [1899, 7, 691, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `document_leading_regions_for` is too high. [14/7]", 796439642], + [1899, 7, 691, "Metrics/MethodLength: Method has too many lines. [12/10]", 796439642], + [1899, 7, 691, "Metrics/PerceivedComplexity: Perceived complexity for `document_leading_regions_for` is too high. [14/8]", 796439642], + [1928, 7, 646, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonical_leading_comment_region` is too high. [10/7]", 1342472091], + [1928, 7, 646, "Metrics/PerceivedComplexity: Perceived complexity for `canonical_leading_comment_region` is too high. [10/8]", 1342472091], + [1942, 7, 1410, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_template_preamble_prefix_region` is too high. [<7, 25, 15> 29.98/17]", 449550851], + [1942, 7, 1410, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collapse_template_preamble_prefix_region` is too high. [11/7]", 449550851], + [1942, 7, 1410, "Metrics/MethodLength: Method has too many lines. [27/10]", 449550851], + [1942, 7, 1410, "Metrics/PerceivedComplexity: Perceived complexity for `collapse_template_preamble_prefix_region` is too high. [11/8]", 449550851], + [1975, 7, 991, "Metrics/AbcSize: Assignment Branch Condition size for `duplicated_template_preamble_prefix_in_first_node_leading_region?` is too high. [<7, 25, 14> 29.5/17]", 4012549279], + [1975, 7, 991, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `duplicated_template_preamble_prefix_in_first_node_leading_region?` is too high. [12/7]", 4012549279], + [1975, 7, 991, "Metrics/MethodLength: Method has too many lines. [13/10]", 4012549279], + [1975, 7, 991, "Metrics/PerceivedComplexity: Perceived complexity for `duplicated_template_preamble_prefix_in_first_node_leading_region?` is too high. [12/8]", 4012549279], + [2030, 7, 956, "Metrics/AbcSize: Assignment Branch Condition size for `document_trailing_regions_for` is too high. [<6, 16, 12> 20.88/17]", 3560026445], + [2030, 7, 956, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `document_trailing_regions_for` is too high. [12/7]", 3560026445], + [2030, 7, 956, "Metrics/PerceivedComplexity: Perceived complexity for `document_trailing_regions_for` is too high. [12/8]", 3560026445], + [2053, 7, 456, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `deflated_content_end_line` is too high. [8/7]", 3297059340], + [2089, 7, 614, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `leading_gap_line_count_for` is too high. [9/7]", 1127644346], + [2089, 7, 614, "Metrics/PerceivedComplexity: Perceived complexity for `leading_gap_line_count_for` is too high. [10/8]", 1127644346], + [2093, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 2290159738], + [2139, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [2168, 31, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [2175, 55, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [2183, 54, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [2191, 56, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [2196, 7, 822, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preferred_leading_comment_region` is too high. [10/7]", 1272157667], + [2196, 7, 822, "Metrics/PerceivedComplexity: Perceived complexity for `preferred_leading_comment_region` is too high. [10/8]", 1272157667], + [2308, 7, 465, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_interstitial_blank_lines` is too high. [9/7]", 1640065866], + [2308, 7, 465, "Metrics/PerceivedComplexity: Perceived complexity for `emit_interstitial_blank_lines` is too high. [9/8]", 1640065866], + [2320, 7, 586, "Metrics/MethodLength: Method has too many lines. [12/10]", 3310131662] + ], + "lib/psych/merge/debug_logger.rb:110646504": [ + [26, 9, 680, "Metrics/MethodLength: Method has too many lines. [12/10]", 1981451425] + ], + "lib/psych/merge/diff_mapper.rb:844380236": [ + [20, 5, 7887, "Metrics/ClassLength: Class has too many lines. [118/100]", 3492547573], + [34, 7, 471, "Metrics/MethodLength: Method has too many lines. [11/10]", 577300188], + [75, 7, 627, "Metrics/MethodLength: Method has too many lines. [12/10]", 2362564224], + [102, 7, 786, "Metrics/MethodLength: Method has too many lines. [11/10]", 1096016446], + [131, 7, 1613, "Metrics/AbcSize: Assignment Branch Condition size for `find_nested_path` is too high. [<12, 27, 20> 35.68/17]", 4005634231], + [131, 7, 1613, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_nested_path` is too high. [17/7]", 4005634231], + [131, 7, 1613, "Metrics/MethodLength: Method has too many lines. [30/10]", 4005634231], + [131, 7, 1613, "Metrics/PerceivedComplexity: Perceived complexity for `find_nested_path` is too high. [18/8]", 4005634231], + [183, 7, 758, "Metrics/MethodLength: Method has too many lines. [13/10]", 2773539171], + [204, 20, 11, "Style/NumericPredicate: Use `indent.zero?` instead of `indent == 0`.", 1189613385] + ], + "lib/psych/merge/emitter.rb:2851865662": [ + [14, 5, 7357, "Metrics/ClassLength: Class has too many lines. [147/100]", 579415518], + [138, 42, 6, "Lint/UnusedMethodArgument: Unused method argument - `region`.", 2124512157], + [151, 55, 12, "Lint/UnusedMethodArgument: Unused method argument - `current_line`.", 2091263933], + [166, 7, 560, "Metrics/AbcSize: Assignment Branch Condition size for `repeated_region_segment_length` is too high. [<6, 14, 8> 17.2/17]", 800046942], + [194, 7, 596, "Metrics/MethodLength: Method has too many lines. [12/10]", 2092207138], + [228, 7, 662, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `needs_quoting?` is too high. [10/7]", 172072954], + [228, 7, 662, "Metrics/PerceivedComplexity: Perceived complexity for `needs_quoting?` is too high. [10/8]", 172072954] + ], + "lib/psych/merge/file_analysis.rb:1868572144": [ + [13, 5, 14981, "Metrics/ClassLength: Class has too many lines. [251/100]", 3755372144], + [37, 7, 1080, "Metrics/MethodLength: Method has too many lines. [15/10]", 4243676919], + [203, 7, 533, "Metrics/MethodLength: Method has too many lines. [11/10]", 2772113363], + [237, 7, 998, "Metrics/AbcSize: Assignment Branch Condition size for `mapping_entry_attachment` is too high. [<5, 23, 7> 24.56/17]", 3001873728], + [237, 7, 998, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `mapping_entry_attachment` is too high. [8/7]", 3001873728], + [237, 7, 998, "Metrics/MethodLength: Method has too many lines. [13/10]", 3001873728], + [267, 7, 809, "Metrics/AbcSize: Assignment Branch Condition size for `full_line_comment_blocks_before` is too high. [<9, 16, 6> 19.31/17]", 2033268754], + [267, 7, 809, "Metrics/MethodLength: Method has too many lines. [22/10]", 2033268754], + [329, 7, 1353, "Metrics/AbcSize: Assignment Branch Condition size for `extract_freeze_blocks` is too high. [<12, 20, 12> 26.23/17]", 4244924302], + [329, 7, 1353, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_freeze_blocks` is too high. [10/7]", 4244924302], + [329, 7, 1353, "Metrics/MethodLength: Method has too many lines. [27/10]", 4244924302], + [329, 7, 1353, "Metrics/PerceivedComplexity: Perceived complexity for `extract_freeze_blocks` is too high. [11/8]", 4244924302], + [370, 7, 1756, "Metrics/AbcSize: Assignment Branch Condition size for `integrate_nodes_and_freeze_blocks` is too high. [<11, 28, 19> 35.58/17]", 1233865722], + [370, 7, 1756, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `integrate_nodes_and_freeze_blocks` is too high. [18/7]", 1233865722], + [370, 7, 1756, "Metrics/MethodLength: Method has too many lines. [31/10]", 1233865722], + [370, 7, 1756, "Metrics/PerceivedComplexity: Perceived complexity for `integrate_nodes_and_freeze_blocks` is too high. [19/8]", 1233865722] + ], + "lib/psych/merge/freeze_node.rb:3007012923": [ + [33, 21, 127, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1948779238] + ], + "lib/psych/merge/mapping_match_refiner.rb:3428808618": [ + [29, 5, 7580, "Metrics/ClassLength: Class has too many lines. [111/100]", 3764504760], + [121, 7, 800, "Metrics/MethodLength: Method has too many lines. [13/10]", 2814728338], + [150, 15, 20, "Style/ClassEqualityComparison: Use `instance_of?(node2.class)` instead of comparing classes.", 1212490233], + [193, 7, 270, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `sequence_similarity` is too high. [9/7]", 724822377], + [193, 7, 270, "Metrics/PerceivedComplexity: Perceived complexity for `sequence_similarity` is too high. [9/8]", 724822377], + [197, 23, 9, "Style/NumericPredicate: Use `len1.zero?` instead of `len1 == 0`.", 913205219], + [197, 36, 9, "Style/NumericPredicate: Use `len2.zero?` instead of `len2 == 0`.", 871697920], + [198, 23, 9, "Style/NumericPredicate: Use `len1.zero?` instead of `len1 == 0`.", 913205219], + [198, 36, 9, "Style/NumericPredicate: Use `len2.zero?` instead of `len2 == 0`.", 871697920], + [225, 7, 854, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<13, 29, 8> 32.77/17]", 2946547420], + [225, 7, 854, "Metrics/MethodLength: Method has too many lines. [20/10]", 2946547420] + ], + "lib/psych/merge/merge_result.rb:4276173304": [ + [140, 7, 421, "Metrics/MethodLength: Method has too many lines. [11/10]", 2459390040] + ], + "lib/psych/merge/node_wrapper.rb:1997974804": [ + [12, 5, 12280, "Metrics/ClassLength: Class has too many lines. [222/100]", 463540785], + [42, 7, 2039, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `initialize` is too high. [8/7]", 338533329], + [42, 21, 274, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 2646089467], + [144, 7, 699, "Metrics/MethodLength: Method has too many lines. [20/10]", 2676695829], + [210, 7, 985, "Metrics/MethodLength: Method has too many lines. [16/10]", 59427073], + [256, 7, 686, "Metrics/AbcSize: Assignment Branch Condition size for `compute_signature` is too high. [<4, 21, 13> 25.02/17]", 2657240579], + [256, 7, 686, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_signature` is too high. [14/7]", 2657240579], + [256, 7, 686, "Metrics/MethodLength: Method has too many lines. [18/10]", 2657240579], + [256, 7, 686, "Metrics/PerceivedComplexity: Perceived complexity for `compute_signature` is too high. [10/8]", 2657240579], + [277, 7, 425, "Metrics/MethodLength: Method has too many lines. [11/10]", 3170039988], + [310, 7, 1150, "Metrics/MethodLength: Method has too many lines. [24/10]", 647387009], + [321, 31, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [340, 7, 484, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `clamp_end_line_to_next_sibling!` is too high. [10/7]", 953824779], + [340, 7, 484, "Metrics/PerceivedComplexity: Perceived complexity for `clamp_end_line_to_next_sibling!` is too high. [10/8]", 953824779] + ], + "lib/psych/merge/smart_merger.rb:1750771088": [ + [45, 5, 10514, "Metrics/ClassLength: Class has too many lines. [192/100]", 4260193581], + [81, 7, 1336, "Metrics/MethodLength: Method has too many lines. [18/10]", 1713606127], + [81, 21, 557, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [16/5]", 1646356108], + [153, 7, 1440, "Metrics/AbcSize: Assignment Branch Condition size for `merge_with_debug` is too high. [<3, 24, 7> 25.18/17]", 695369520], + [153, 7, 1440, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_with_debug` is too high. [8/7]", 695369520], + [153, 7, 1440, "Metrics/MethodLength: Method has too many lines. [32/10]", 695369520], + [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:914772787": [ + [129, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [144, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [145, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [152, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ], + "spec/fixtures_integration_spec.rb:1717446685": [ + [3, 1, 9786, "Metrics/BlockLength: Block has too many lines. [222/25]", 1649396447], + [16, 3, 1302, "Metrics/BlockLength: Block has too many lines. [32/25]", 1546514966], + [52, 3, 2159, "Metrics/BlockLength: Block has too many lines. [28/25]", 270765486], + [109, 3, 1594, "Metrics/BlockLength: Block has too many lines. [41/25]", 568154065], + [227, 3, 1413, "Metrics/BlockLength: Block has too many lines. [29/25]", 1847754351] + ], + "spec/reproducible_merge_spec.rb:2168097366": [ + [3, 1, 5699, "Metrics/BlockLength: Block has too many lines. [107/25]", 3775945048], + [4, 3, 61, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1575360142], + [6, 3, 4847, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3343843514], + [47, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 3440433042], + [53, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3187380084] + ] +} diff --git a/gems/psych-merge/Gemfile.lock b/gems/psych-merge/Gemfile.lock index 9fa08b960..2a1e618a8 100644 --- a/gems/psych-merge/Gemfile.lock +++ b/gems/psych-merge/Gemfile.lock @@ -18,39 +18,7 @@ PATH yaml-merge (= 7.1.0) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -59,192 +27,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -253,44 +36,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: yaml-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -310,12 +62,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -324,6 +70,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -379,6 +126,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -397,7 +153,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -537,23 +292,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -587,11 +344,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +390,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,17 +416,12 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) yaml-merge! yard (~> 0.9, >= 0.9.44) @@ -704,42 +430,26 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +462,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,12 +489,9 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 @@ -802,7 +501,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,19 +528,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,14 +552,10 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -876,7 +568,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 6905933dca3dccf3c68bae895cb382db2aa00a59 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:38:13 -0600 Subject: [PATCH 209/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/commonmarker-merge/.kettle-drift.lock | 60 ++-- gems/commonmarker-merge/Gemfile | 40 +++ gems/commonmarker-merge/Gemfile.lock | 333 +------------------ gems/prism-merge/Gemfile.lock | 356 ++++++++++++++++++++- gems/psych-merge/Gemfile.lock | 43 +-- 5 files changed, 447 insertions(+), 385 deletions(-) diff --git a/gems/commonmarker-merge/.kettle-drift.lock b/gems/commonmarker-merge/.kettle-drift.lock index 508d631d8..44ac5c29d 100644 --- a/gems/commonmarker-merge/.kettle-drift.lock +++ b/gems/commonmarker-merge/.kettle-drift.lock @@ -6,7 +6,8 @@ 79, 119, 159, - 199 + 199, + 239 ] } ], @@ -17,7 +18,8 @@ 90, 130, 170, - 210 + 210, + 250 ] } ], @@ -28,7 +30,8 @@ 80, 120, 160, - 200 + 200, + 240 ] } ], @@ -39,7 +42,8 @@ 92, 132, 172, - 212 + 212, + 252 ] } ], @@ -50,7 +54,8 @@ 95, 135, 175, - 215 + 215, + 255 ] } ], @@ -61,7 +66,8 @@ 81, 121, 161, - 201 + 201, + 241 ] } ], @@ -73,7 +79,8 @@ 99, 139, 179, - 219 + 219, + 259 ] } ], @@ -84,7 +91,8 @@ 100, 140, 180, - 220 + 220, + 260 ] } ], @@ -96,7 +104,8 @@ 86, 126, 166, - 206 + 206, + 246 ] } ], @@ -107,7 +116,8 @@ 109, 149, 189, - 229 + 229, + 269 ] } ], @@ -119,7 +129,8 @@ 78, 118, 158, - 198 + 198, + 238 ] } ], @@ -131,7 +142,8 @@ 108, 148, 188, - 228 + 228, + 268 ] } ], @@ -142,7 +154,8 @@ 84, 124, 164, - 204 + 204, + 244 ] } ], @@ -154,7 +167,8 @@ 91, 131, 171, - 211 + 211, + 251 ] } ], @@ -166,7 +180,8 @@ 87, 127, 167, - 207 + 207, + 247 ] } ], @@ -177,7 +192,8 @@ 85, 125, 165, - 205 + 205, + 245 ] } ], @@ -188,7 +204,8 @@ 102, 142, 182, - 222 + 222, + 262 ] } ], @@ -199,7 +216,8 @@ 101, 141, 181, - 221 + 221, + 261 ] } ], @@ -210,7 +228,8 @@ 96, 136, 176, - 216 + 216, + 256 ] } ], @@ -221,7 +240,8 @@ 105, 145, 185, - 225 + 225, + 265 ] } ], diff --git a/gems/commonmarker-merge/Gemfile b/gems/commonmarker-merge/Gemfile index 4ac2ff4d0..e83cbb7e8 100644 --- a/gems/commonmarker-merge/Gemfile +++ b/gems/commonmarker-merge/Gemfile @@ -231,6 +231,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/commonmarker-merge/Gemfile.lock b/gems/commonmarker-merge/Gemfile.lock index a7bd19904..9f517c718 100644 --- a/gems/commonmarker-merge/Gemfile.lock +++ b/gems/commonmarker-merge/Gemfile.lock @@ -17,264 +17,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +35,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -363,8 +117,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +145,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +284,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +336,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +387,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,46 +413,30 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca @@ -740,7 +452,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +464,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +492,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +503,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +530,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +541,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +554,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +569,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/prism-merge/Gemfile.lock b/gems/prism-merge/Gemfile.lock index 8a93d0713..09fa20d97 100644 --- a/gems/prism-merge/Gemfile.lock +++ b/gems/prism-merge/Gemfile.lock @@ -16,6 +16,265 @@ PATH ruby-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -103,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -131,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -267,13 +530,11 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -326,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -377,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -402,31 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -434,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -446,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -473,11 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -485,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -516,6 +835,8 @@ 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -524,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -537,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -552,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/psych-merge/Gemfile.lock b/gems/psych-merge/Gemfile.lock index 2a1e618a8..8ba6f6b35 100644 --- a/gems/psych-merge/Gemfile.lock +++ b/gems/psych-merge/Gemfile.lock @@ -17,32 +17,6 @@ PATH version_gem (~> 1.1, >= 1.1.9) yaml-merge (= 7.1.0) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -54,6 +28,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -344,6 +323,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -358,6 +342,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.13) + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) yard (0.9.45) yard-fence (0.9.6) rdoc (>= 6.11, < 8) @@ -390,7 +378,6 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - ast-merge! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) debug (>= 1.1) @@ -420,10 +407,8 @@ DEPENDENCIES standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - tree_haver! tree_sitter_language_pack! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) From adb06f9c073393c1161ba93142aafe83ec87788a Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:38:27 -0600 Subject: [PATCH 210/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/commonmarker-merge/Gemfile.lock | 333 +++++++++- gems/kramdown-merge/.kettle-drift.lock | 60 +- gems/kramdown-merge/Gemfile | 40 ++ gems/kramdown-merge/Gemfile.lock | 345 +--------- gems/prism-merge/.kettle-drift.lock | 60 +- gems/prism-merge/.rubocop_gradual.lock | 690 -------------------- gems/prism-merge/Gemfile | 70 +- gems/prism-merge/Gemfile.lock | 59 +- gems/prism-merge/Rakefile | 18 +- gems/prism-merge/bin/yard | 2 +- gems/prism-merge/lib/prism/merge/version.rb | 2 +- 11 files changed, 549 insertions(+), 1130 deletions(-) delete mode 100644 gems/prism-merge/.rubocop_gradual.lock diff --git a/gems/commonmarker-merge/Gemfile.lock b/gems/commonmarker-merge/Gemfile.lock index 9f517c718..a7bd19904 100644 --- a/gems/commonmarker-merge/Gemfile.lock +++ b/gems/commonmarker-merge/Gemfile.lock @@ -17,13 +17,264 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: markdown-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -35,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -117,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -145,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -284,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -336,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -387,24 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -413,30 +685,46 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca @@ -452,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -464,20 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -492,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -503,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -530,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -541,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -554,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -569,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/kramdown-merge/.kettle-drift.lock b/gems/kramdown-merge/.kettle-drift.lock index 508d631d8..44ac5c29d 100644 --- a/gems/kramdown-merge/.kettle-drift.lock +++ b/gems/kramdown-merge/.kettle-drift.lock @@ -6,7 +6,8 @@ 79, 119, 159, - 199 + 199, + 239 ] } ], @@ -17,7 +18,8 @@ 90, 130, 170, - 210 + 210, + 250 ] } ], @@ -28,7 +30,8 @@ 80, 120, 160, - 200 + 200, + 240 ] } ], @@ -39,7 +42,8 @@ 92, 132, 172, - 212 + 212, + 252 ] } ], @@ -50,7 +54,8 @@ 95, 135, 175, - 215 + 215, + 255 ] } ], @@ -61,7 +66,8 @@ 81, 121, 161, - 201 + 201, + 241 ] } ], @@ -73,7 +79,8 @@ 99, 139, 179, - 219 + 219, + 259 ] } ], @@ -84,7 +91,8 @@ 100, 140, 180, - 220 + 220, + 260 ] } ], @@ -96,7 +104,8 @@ 86, 126, 166, - 206 + 206, + 246 ] } ], @@ -107,7 +116,8 @@ 109, 149, 189, - 229 + 229, + 269 ] } ], @@ -119,7 +129,8 @@ 78, 118, 158, - 198 + 198, + 238 ] } ], @@ -131,7 +142,8 @@ 108, 148, 188, - 228 + 228, + 268 ] } ], @@ -142,7 +154,8 @@ 84, 124, 164, - 204 + 204, + 244 ] } ], @@ -154,7 +167,8 @@ 91, 131, 171, - 211 + 211, + 251 ] } ], @@ -166,7 +180,8 @@ 87, 127, 167, - 207 + 207, + 247 ] } ], @@ -177,7 +192,8 @@ 85, 125, 165, - 205 + 205, + 245 ] } ], @@ -188,7 +204,8 @@ 102, 142, 182, - 222 + 222, + 262 ] } ], @@ -199,7 +216,8 @@ 101, 141, 181, - 221 + 221, + 261 ] } ], @@ -210,7 +228,8 @@ 96, 136, 176, - 216 + 216, + 256 ] } ], @@ -221,7 +240,8 @@ 105, 145, 185, - 225 + 225, + 265 ] } ], diff --git a/gems/kramdown-merge/Gemfile b/gems/kramdown-merge/Gemfile index 266a10cbf..992ae9d98 100644 --- a/gems/kramdown-merge/Gemfile +++ b/gems/kramdown-merge/Gemfile @@ -231,6 +231,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/kramdown-merge/Gemfile.lock b/gems/kramdown-merge/Gemfile.lock index 59d980821..4bd6f7840 100644 --- a/gems/kramdown-merge/Gemfile.lock +++ b/gems/kramdown-merge/Gemfile.lock @@ -17,264 +17,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -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.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +35,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +48,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +111,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +139,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +278,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +330,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +381,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +407,31 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +439,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,15 +451,11 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 @@ -772,8 +466,6 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +480,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +491,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +518,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +529,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +542,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +557,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/prism-merge/.kettle-drift.lock b/gems/prism-merge/.kettle-drift.lock index 508d631d8..44ac5c29d 100644 --- a/gems/prism-merge/.kettle-drift.lock +++ b/gems/prism-merge/.kettle-drift.lock @@ -6,7 +6,8 @@ 79, 119, 159, - 199 + 199, + 239 ] } ], @@ -17,7 +18,8 @@ 90, 130, 170, - 210 + 210, + 250 ] } ], @@ -28,7 +30,8 @@ 80, 120, 160, - 200 + 200, + 240 ] } ], @@ -39,7 +42,8 @@ 92, 132, 172, - 212 + 212, + 252 ] } ], @@ -50,7 +54,8 @@ 95, 135, 175, - 215 + 215, + 255 ] } ], @@ -61,7 +66,8 @@ 81, 121, 161, - 201 + 201, + 241 ] } ], @@ -73,7 +79,8 @@ 99, 139, 179, - 219 + 219, + 259 ] } ], @@ -84,7 +91,8 @@ 100, 140, 180, - 220 + 220, + 260 ] } ], @@ -96,7 +104,8 @@ 86, 126, 166, - 206 + 206, + 246 ] } ], @@ -107,7 +116,8 @@ 109, 149, 189, - 229 + 229, + 269 ] } ], @@ -119,7 +129,8 @@ 78, 118, 158, - 198 + 198, + 238 ] } ], @@ -131,7 +142,8 @@ 108, 148, 188, - 228 + 228, + 268 ] } ], @@ -142,7 +154,8 @@ 84, 124, 164, - 204 + 204, + 244 ] } ], @@ -154,7 +167,8 @@ 91, 131, 171, - 211 + 211, + 251 ] } ], @@ -166,7 +180,8 @@ 87, 127, 167, - 207 + 207, + 247 ] } ], @@ -177,7 +192,8 @@ 85, 125, 165, - 205 + 205, + 245 ] } ], @@ -188,7 +204,8 @@ 102, 142, 182, - 222 + 222, + 262 ] } ], @@ -199,7 +216,8 @@ 101, 141, 181, - 221 + 221, + 261 ] } ], @@ -210,7 +228,8 @@ 96, 136, 176, - 216 + 216, + 256 ] } ], @@ -221,7 +240,8 @@ 105, 145, 185, - 225 + 225, + 265 ] } ], diff --git a/gems/prism-merge/.rubocop_gradual.lock b/gems/prism-merge/.rubocop_gradual.lock deleted file mode 100644 index e28d99e64..000000000 --- a/gems/prism-merge/.rubocop_gradual.lock +++ /dev/null @@ -1,690 +0,0 @@ -{ - ".simplecov:3138125134": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:22363789": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/prism-merge.rb:226590672": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`prism-merge.rb`) should use snake_case.", 5381] - ], - "lib/prism/merge.rb:3389866865": [ - [12, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Prism::Merge`.", 2866359175], - [12, 3, 52319, "Metrics/ModuleLength: Module has too many lines. [1195/100]", 1955834049], - [13, 5, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631], - [24, 5, 16, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::ParseError`.", 362242086], - [120, 5, 1996, "Metrics/MethodLength: Method has too many lines. [42/10]", 709892915], - [165, 5, 1804, "Metrics/MethodLength: Method has too many lines. [37/10]", 3641862107], - [205, 5, 1012, "Metrics/MethodLength: Method has too many lines. [23/10]", 3112984532], - [243, 5, 695, "Metrics/MethodLength: Method has too many lines. [17/10]", 321495946], - [263, 5, 1801, "Metrics/MethodLength: Method has too many lines. [37/10]", 3355654893], - [264, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 180584319], - [303, 5, 7357, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_structured_edit_batch_report_projection` is too high. [<1, 31, 0> 31.02/17]", 2583247591], - [303, 5, 7357, "Metrics/MethodLength: Method has too many lines. [139/10]", 2583247591], - [304, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 180584319], - [323, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 949635646], - [361, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1330685294], - [445, 5, 893, "Metrics/AbcSize: Assignment Branch Condition size for `parse_ruby` is too high. [<3, 17, 7> 18.63/17]", 2894794051], - [445, 5, 893, "Metrics/MethodLength: Method has too many lines. [21/10]", 2894794051], - [471, 5, 491, "Metrics/MethodLength: Method has too many lines. [12/10]", 3211170428], - [486, 5, 3294, "Metrics/AbcSize: Assignment Branch Condition size for `parse_ruby_normalized` is too high. [<20, 68, 28> 76.21/17]", 3878823268], - [486, 5, 3294, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_ruby_normalized` is too high. [23/7]", 3878823268], - [486, 5, 3294, "Metrics/MethodLength: Method has too many lines. [70/10]", 3878823268], - [486, 5, 3294, "Metrics/PerceivedComplexity: Perceived complexity for `parse_ruby_normalized` is too high. [23/8]", 3878823268], - [566, 5, 3671, "Metrics/AbcSize: Assignment Branch Condition size for `apply_edit_projection` is too high. [<14, 62, 19> 66.34/17]", 1859418783], - [566, 5, 3671, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_edit_projection` is too high. [12/7]", 1859418783], - [566, 5, 3671, "Metrics/MethodLength: Method has too many lines. [66/10]", 1859418783], - [566, 5, 3671, "Metrics/PerceivedComplexity: Perceived complexity for `apply_edit_projection` is too high. [13/8]", 1859418783], - [612, 18, 176, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 3247522762], - [645, 5, 1505, "Metrics/MethodLength: Method has too many lines. [33/10]", 2499202345], - [645, 19, 292, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 676979469], - [706, 5, 583, "Metrics/MethodLength: Method has too many lines. [13/10]", 1484312517], - [723, 5, 551, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_ruby_require_aliases` is too high. [<11, 15, 7> 19.87/17]", 2507514607], - [723, 5, 551, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_ruby_require_aliases` is too high. [8/7]", 2507514607], - [723, 5, 551, "Metrics/MethodLength: Method has too many lines. [17/10]", 2507514607], - [744, 5, 304, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_dsl_call_node` is too high. [8/7]", 2466841613], - [767, 5, 1305, "Metrics/AbcSize: Assignment Branch Condition size for `merge_ruby_with_reviewed_nested_outputs` is too high. [<7, 17, 5> 19.05/17]", 3657868136], - [767, 5, 1305, "Metrics/MethodLength: Method has too many lines. [27/10]", 3657868136], - [767, 48, 140, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 132256850], - [800, 5, 1015, "Metrics/MethodLength: Method has too many lines. [17/10]", 757789356], - [810, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 1956194284], - [823, 5, 928, "Metrics/MethodLength: Method has too many lines. [16/10]", 1039420596], - [833, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 3013228499], - [845, 5, 1003, "Metrics/MethodLength: Method has too many lines. [17/10]", 3313354796], - [855, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1636990749], - [868, 5, 936, "Metrics/MethodLength: Method has too many lines. [16/10]", 2825710110], - [878, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 3013228499], - [902, 5, 662, "Metrics/MethodLength: Method has too many lines. [19/10]", 772959042], - [923, 7, 11, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 848344986], - [926, 5, 849, "Metrics/AbcSize: Assignment Branch Condition size for `prism_ruby_discovered_surfaces` is too high. [<12, 16, 6> 20.88/17]", 2509812469], - [926, 5, 849, "Metrics/MethodLength: Method has too many lines. [23/10]", 2509812469], - [957, 5, 1195, "Metrics/AbcSize: Assignment Branch Condition size for `prism_ruby_surfaces_for_owner` is too high. [<6, 19, 3> 20.15/17]", 1713430182], - [957, 5, 1195, "Metrics/MethodLength: Method has too many lines. [20/10]", 1713430182], - [982, 5, 1216, "Metrics/AbcSize: Assignment Branch Condition size for `prism_ruby_example_surfaces` is too high. [<4, 20, 2> 20.49/17]", 2225356615], - [982, 5, 1216, "Metrics/MethodLength: Method has too many lines. [22/10]", 2225356615], - [1054, 5, 421, "Metrics/MethodLength: Method has too many lines. [14/10]", 26440736], - [1085, 5, 827, "Metrics/MethodLength: Method has too many lines. [18/10]", 4288402374], - [1126, 5, 876, "Metrics/MethodLength: Method has too many lines. [23/10]", 3423854231], - [1164, 5, 1155, "Metrics/AbcSize: Assignment Branch Condition size for `prism_comment_node` is too high. [<1, 22, 0> 22.02/17]", 4287909739], - [1164, 5, 1155, "Metrics/MethodLength: Method has too many lines. [28/10]", 4287909739], - [1195, 5, 888, "Metrics/MethodLength: Method has too many lines. [27/10]", 3798554661], - [1247, 5, 920, "Metrics/MethodLength: Method has too many lines. [23/10]", 917985568] - ], - "lib/prism/merge/begin_node_clause_body_merger.rb:1042804537": [ - [5, 5, 31, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::BeginNodeClauseBodyMerger`.", 1242162299], - [19, 7, 1511, "Metrics/AbcSize: Assignment Branch Condition size for `merge` is too high. [<5, 37, 1> 37.35/17]", 3275719934], - [19, 7, 1511, "Metrics/MethodLength: Method has too many lines. [32/10]", 3275719934] - ], - "lib/prism/merge/begin_node_clause_body_support.rb:787370708": [ - [5, 5, 32, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::BeginNodeClauseBodySupport`.", 3341069278], - [5, 5, 7504, "Metrics/ClassLength: Class has too many lines. [142/100]", 1403116805], - [8, 21, 100, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 4145084810], - [22, 7, 937, "Metrics/AbcSize: Assignment Branch Condition size for `clause_header_end_line` is too high. [<5, 29, 16> 33.5/17]", 2050282033], - [22, 7, 937, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `clause_header_end_line` is too high. [16/7]", 2050282033], - [22, 7, 937, "Metrics/MethodLength: Method has too many lines. [14/10]", 2050282033], - [22, 7, 937, "Metrics/PerceivedComplexity: Perceived complexity for `clause_header_end_line` is too high. [16/8]", 2050282033], - [35, 63, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [55, 9, 23, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 1178765246], - [58, 7, 419, "Metrics/MethodLength: Method has too many lines. [11/10]", 3825428834], - [81, 7, 2396, "Metrics/AbcSize: Assignment Branch Condition size for `clause_body_components` is too high. [<11, 30, 16> 35.74/17]", 199420029], - [81, 7, 2396, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `clause_body_components` is too high. [13/7]", 199420029], - [81, 7, 2396, "Metrics/MethodLength: Method has too many lines. [39/10]", 199420029], - [81, 7, 2396, "Metrics/PerceivedComplexity: Perceived complexity for `clause_body_components` is too high. [14/8]", 199420029], - [126, 30, 23, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 1178765246], - [164, 7, 862, "Metrics/AbcSize: Assignment Branch Condition size for `clause_bodies_have_matching_statements?` is too high. [<3, 19, 2> 19.34/17]", 4182083840], - [164, 7, 862, "Metrics/MethodLength: Method has too many lines. [15/10]", 4182083840] - ], - "lib/prism/merge/begin_node_clause_header_emitter.rb:2991300768": [ - [5, 5, 34, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::BeginNodeClauseHeaderEmitter`.", 217025096], - [14, 7, 1600, "Metrics/AbcSize: Assignment Branch Condition size for `emit` is too high. [<10, 22, 17> 29.55/17]", 4242535078], - [14, 7, 1600, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit` is too high. [11/7]", 4242535078], - [14, 7, 1600, "Metrics/MethodLength: Method has too many lines. [25/10]", 4242535078], - [14, 7, 1600, "Metrics/PerceivedComplexity: Perceived complexity for `emit` is too high. [11/8]", 4242535078], - [14, 15, 164, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2644486585] - ], - "lib/prism/merge/begin_node_merge_planner.rb:3840396716": [ - [5, 5, 27, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::BeginNodeMergePlanner`.", 3356052894], - [5, 5, 9876, "Metrics/ClassLength: Class has too many lines. [185/100]", 148070692], - [30, 7, 2144, "Metrics/AbcSize: Assignment Branch Condition size for `plan` is too high. [<15, 34, 11> 38.76/17]", 3596380485], - [30, 7, 2144, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `plan` is too high. [10/7]", 3596380485], - [30, 7, 2144, "Metrics/MethodLength: Method has too many lines. [39/10]", 3596380485], - [30, 7, 2144, "Metrics/PerceivedComplexity: Perceived complexity for `plan` is too high. [11/8]", 3596380485], - [84, 7, 4383, "Metrics/AbcSize: Assignment Branch Condition size for `build_shared_clause_step` is too high. [<19, 70, 24> 76.4/17]", 2837542267], - [84, 7, 4383, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_shared_clause_step` is too high. [16/7]", 2837542267], - [84, 7, 4383, "Metrics/MethodLength: Method has too many lines. [73/10]", 2837542267], - [84, 7, 4383, "Metrics/PerceivedComplexity: Perceived complexity for `build_shared_clause_step` is too high. [18/8]", 2837542267], - [103, 121, 59, "Layout/LineLength: Line is too long. [179/120]", 357928082], - [105, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 1163790852], - [142, 121, 35, "Layout/LineLength: Line is too long. [155/120]", 3447647282], - [143, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 1267386383], - [167, 7, 2428, "Metrics/AbcSize: Assignment Branch Condition size for `build_unmatched_clause_step` is too high. [<2, 28, 21> 35.06/17]", 2984621385], - [167, 7, 2428, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_unmatched_clause_step` is too high. [17/7]", 2984621385], - [167, 7, 2428, "Metrics/MethodLength: Method has too many lines. [38/10]", 2984621385], - [167, 7, 2428, "Metrics/PerceivedComplexity: Perceived complexity for `build_unmatched_clause_step` is too high. [19/8]", 2984621385], - [188, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 549521717], - [198, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 619697310] - ], - "lib/prism/merge/begin_node_plan_emitter.rb:372252499": [ - [5, 5, 26, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::BeginNodePlanEmitter`.", 926648201], - [14, 7, 740, "Metrics/MethodLength: Method has too many lines. [16/10]", 2040521865], - [14, 15, 105, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1812434716], - [36, 7, 1205, "Metrics/MethodLength: Method has too many lines. [24/10]", 4164487211], - [36, 20, 127, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 466430575], - [76, 7, 1308, "Metrics/AbcSize: Assignment Branch Condition size for `emit_copied_unmatched_clause` is too high. [<6, 30, 11> 32.51/17]", 1339054986], - [76, 7, 1308, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_copied_unmatched_clause` is too high. [10/7]", 1339054986], - [76, 7, 1308, "Metrics/MethodLength: Method has too many lines. [21/10]", 1339054986], - [76, 7, 1308, "Metrics/PerceivedComplexity: Perceived complexity for `emit_copied_unmatched_clause` is too high. [10/8]", 1339054986], - [76, 39, 146, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2474530127] - ], - "lib/prism/merge/begin_node_rescue_semantics.rb:2746062857": [ - [5, 5, 30, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::BeginNodeRescueSemantics`.", 4100560642], - [5, 5, 9687, "Metrics/ClassLength: Class has too many lines. [194/100]", 4227917508], - [13, 7, 1953, "Metrics/AbcSize: Assignment Branch Condition size for `normalized_clause_body_and_header_source` is too high. [<9, 13, 21> 26.29/17]", 1895019213], - [13, 7, 1953, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalized_clause_body_and_header_source` is too high. [15/7]", 1895019213], - [13, 7, 1953, "Metrics/MethodLength: Method has too many lines. [26/10]", 1895019213], - [13, 7, 1953, "Metrics/PerceivedComplexity: Perceived complexity for `normalized_clause_body_and_header_source` is too high. [17/8]", 1895019213], - [80, 7, 530, "Metrics/AbcSize: Assignment Branch Condition size for `local_variable_read_names_in` is too high. [<1, 16, 9> 18.38/17]", 2555890222], - [80, 7, 530, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `local_variable_read_names_in` is too high. [8/7]", 2555890222], - [80, 7, 530, "Metrics/MethodLength: Method has too many lines. [12/10]", 2555890222], - [80, 7, 530, "Metrics/PerceivedComplexity: Perceived complexity for `local_variable_read_names_in` is too high. [9/8]", 2555890222], - [132, 7, 618, "Metrics/AbcSize: Assignment Branch Condition size for `rewrite_local_reference_in_source` is too high. [<6, 16, 9> 19.31/17]", 1195871443], - [132, 7, 618, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `rewrite_local_reference_in_source` is too high. [9/7]", 1195871443], - [132, 7, 618, "Metrics/PerceivedComplexity: Perceived complexity for `rewrite_local_reference_in_source` is too high. [9/8]", 1195871443], - [178, 85, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [190, 7, 1233, "Metrics/AbcSize: Assignment Branch Condition size for `collect_source_defined_exception_definitions` is too high. [<4, 22, 9> 24.1/17]", 1970916346], - [190, 7, 1233, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_source_defined_exception_definitions` is too high. [10/7]", 1970916346], - [190, 7, 1233, "Metrics/MethodLength: Method has too many lines. [24/10]", 1970916346] - ], - "lib/prism/merge/begin_node_structure.rb:1232724245": [ - [5, 5, 24, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::BeginNodeStructure`.", 3506219929], - [5, 5, 4080, "Metrics/ClassLength: Class has too many lines. [101/100]", 1611393241], - [21, 7, 375, "Metrics/AbcSize: Assignment Branch Condition size for `boundary_lines` is too high. [<0, 28, 7> 28.86/17]", 3399008793], - [21, 7, 375, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `boundary_lines` is too high. [8/7]", 3399008793], - [33, 7, 251, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `clause_start_line` is too high. [8/7]", 1553904487], - [43, 7, 407, "Metrics/MethodLength: Method has too many lines. [12/10]", 3851339415], - [59, 7, 1089, "Metrics/AbcSize: Assignment Branch Condition size for `clause_regions` is too high. [<9, 38, 9> 40.07/17]", 1916795013], - [59, 7, 1089, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `clause_regions` is too high. [10/7]", 1916795013], - [59, 7, 1089, "Metrics/MethodLength: Method has too many lines. [22/10]", 1916795013], - [59, 7, 1089, "Metrics/PerceivedComplexity: Perceived complexity for `clause_regions` is too high. [10/8]", 1916795013], - [86, 7, 613, "Metrics/AbcSize: Assignment Branch Condition size for `clause_nodes_by_type` is too high. [<9, 19, 4> 21.4/17]", 1693909219], - [86, 7, 613, "Metrics/MethodLength: Method has too many lines. [12/10]", 1693909219], - [102, 11, 19, "Naming/PredicatePrefix: Rename `has_clause_or_body?` to `clause_or_body?`.", 2163996991], - [106, 7, 598, "Metrics/AbcSize: Assignment Branch Condition size for `line_map_for` is too high. [<13, 15, 6> 20.74/17]", 191778789] - ], - "lib/prism/merge/block_directive_detector.rb:3698866715": [ - [9, 5, 5028, "Metrics/ClassLength: Class has too many lines. [121/100]", 2587374670], - [10, 7, 1976, "Metrics/AbcSize: Assignment Branch Condition size for `promote_spans_to_nodes` is too high. [<23, 42, 32> 57.59/17]", 1038475655], - [10, 7, 1976, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `promote_spans_to_nodes` is too high. [24/7]", 1038475655], - [10, 7, 1976, "Metrics/MethodLength: Method has too many lines. [37/10]", 1038475655], - [10, 7, 1976, "Metrics/PerceivedComplexity: Perceived complexity for `promote_spans_to_nodes` is too high. [25/8]", 1038475655], - [35, 11, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], - [108, 7, 832, "Metrics/MethodLength: Method has too many lines. [23/10]", 3204610677], - [134, 7, 722, "Metrics/AbcSize: Assignment Branch Condition size for `rebuild_statements` is too high. [<15, 17, 9> 24.39/17]", 3809085226], - [134, 7, 722, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `rebuild_statements` is too high. [10/7]", 3809085226], - [134, 7, 722, "Metrics/MethodLength: Method has too many lines. [15/10]", 3809085226], - [134, 7, 722, "Metrics/PerceivedComplexity: Perceived complexity for `rebuild_statements` is too high. [10/8]", 3809085226] - ], - "lib/prism/merge/comment/block.rb:3606937725": [ - [65, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1573406415] - ], - "lib/prism/merge/comment/parser.rb:1277632686": [ - [31, 9, 1747, "Metrics/AbcSize: Assignment Branch Condition size for `parse` is too high. [<10, 28, 8> 30.79/17]", 2837146927], - [31, 9, 1747, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse` is too high. [8/7]", 2837146927], - [31, 9, 1747, "Metrics/MethodLength: Method has too many lines. [34/10]", 2837146927], - [31, 9, 1747, "Metrics/PerceivedComplexity: Perceived complexity for `parse` is too high. [9/8]", 2837146927], - [38, 11, 1390, "Metrics/BlockLength: Block has too many lines. [26/25]", 1396583578] - ], - "lib/prism/merge/comment_only_file_merger.rb:808070956": [ - [5, 5, 27, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::CommentOnlyFileMerger`.", 1927029952], - [5, 5, 11907, "Metrics/ClassLength: Class has too many lines. [256/100]", 2729825792], - [27, 7, 1628, "Metrics/AbcSize: Assignment Branch Condition size for `merge` is too high. [<15, 32, 8> 36.24/17]", 2481561114], - [27, 7, 1628, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge` is too high. [8/7]", 2481561114], - [27, 7, 1628, "Metrics/MethodLength: Method has too many lines. [34/10]", 2481561114], - [78, 7, 661, "Metrics/MethodLength: Method has too many lines. [18/10]", 1523408112], - [100, 7, 1781, "Metrics/AbcSize: Assignment Branch Condition size for `build_output_plan` is too high. [<10, 34, 20> 40.69/17]", 994360926], - [100, 7, 1781, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_output_plan` is too high. [17/7]", 994360926], - [100, 7, 1781, "Metrics/MethodLength: Method has too many lines. [30/10]", 994360926], - [100, 7, 1781, "Metrics/PerceivedComplexity: Perceived complexity for `build_output_plan` is too high. [19/8]", 994360926], - [123, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 530225423], - [149, 7, 1486, "Metrics/AbcSize: Assignment Branch Condition size for `add_comment_node_to_result` is too high. [<7, 34, 22> 41.1/17]", 1181795760], - [149, 7, 1486, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `add_comment_node_to_result` is too high. [16/7]", 1181795760], - [149, 7, 1486, "Metrics/MethodLength: Method has too many lines. [29/10]", 1181795760], - [149, 7, 1486, "Metrics/PerceivedComplexity: Perceived complexity for `add_comment_node_to_result` is too high. [20/8]", 1181795760], - [185, 7, 693, "Metrics/MethodLength: Method has too many lines. [16/10]", 3008008109], - [205, 7, 1035, "Metrics/AbcSize: Assignment Branch Condition size for `emit_layout_gap_to_result` is too high. [<6, 24, 11> 27.07/17]", 3441550295], - [205, 7, 1035, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_layout_gap_to_result` is too high. [9/7]", 3441550295], - [205, 7, 1035, "Metrics/MethodLength: Method has too many lines. [17/10]", 3441550295], - [205, 7, 1035, "Metrics/PerceivedComplexity: Perceived complexity for `emit_layout_gap_to_result` is too high. [10/8]", 3441550295], - [230, 7, 665, "Metrics/AbcSize: Assignment Branch Condition size for `emit_comment_only_prefix_lines` is too high. [<5, 21, 4> 21.95/17]", 1939505075], - [243, 7, 942, "Metrics/MethodLength: Method has too many lines. [19/10]", 2012616838] - ], - "lib/prism/merge/file_analysis.rb:4241124500": [ - [16, 5, 55504, "Metrics/ClassLength: Class has too many lines. [614/100]", 2951008665], - [19, 7, 28, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::FileAnalysis::NativeCommentAugmenter`.", 2321467727], - [19, 7, 5712, "Metrics/ClassLength: Class has too many lines. [121/100]", 3225634005], - [22, 9, 605, "Metrics/MethodLength: Method has too many lines. [16/10]", 3935631704], - [47, 9, 2672, "Metrics/AbcSize: Assignment Branch Condition size for `build!` is too high. [<19, 55, 23> 62.57/17]", 3140666915], - [47, 9, 2672, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build!` is too high. [22/7]", 3140666915], - [47, 9, 2672, "Metrics/MethodLength: Method has too many lines. [47/10]", 3140666915], - [47, 9, 2672, "Metrics/PerceivedComplexity: Perceived complexity for `build!` is too high. [22/8]", 3140666915], - [120, 9, 779, "Metrics/AbcSize: Assignment Branch Condition size for `attach_orphan_region_to_nearest_owner` is too high. [<4, 18, 3> 18.68/17]", 714646861], - [120, 9, 779, "Metrics/MethodLength: Method has too many lines. [15/10]", 714646861], - [212, 7, 1593, "Metrics/MethodLength: Method has too many lines. [17/10]", 3233444968], - [345, 7, 1177, "Metrics/MethodLength: Method has too many lines. [23/10]", 853358252], - [387, 7, 587, "Metrics/MethodLength: Method has too many lines. [13/10]", 241044926], - [453, 7, 1099, "Metrics/AbcSize: Assignment Branch Condition size for `frozen_node?` is too high. [<3, 16, 7> 17.72/17]", 1886536218], - [453, 7, 1099, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `frozen_node?` is too high. [8/7]", 1886536218], - [587, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858904], - [588, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 442686854], - [659, 7, 779, "Metrics/AbcSize: Assignment Branch Condition size for `split_first_owner_preamble_entries` is too high. [<9, 20, 10> 24.1/17]", 2477766314], - [659, 7, 779, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split_first_owner_preamble_entries` is too high. [9/7]", 2477766314], - [659, 7, 779, "Metrics/MethodLength: Method has too many lines. [11/10]", 2477766314], - [659, 7, 779, "Metrics/PerceivedComplexity: Perceived complexity for `split_first_owner_preamble_entries` is too high. [9/8]", 2477766314], - [669, 9, 11, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 848344986], - [716, 7, 768, "Metrics/MethodLength: Method has too many lines. [15/10]", 3855207561], - [742, 7, 609, "Metrics/MethodLength: Method has too many lines. [15/10]", 3157294863], - [828, 7, 2509, "Metrics/AbcSize: Assignment Branch Condition size for `extract_and_integrate_all_nodes` is too high. [<11, 29, 16> 34.9/17]", 1138957888], - [828, 7, 2509, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_and_integrate_all_nodes` is too high. [14/7]", 1138957888], - [828, 7, 2509, "Metrics/MethodLength: Method has too many lines. [32/10]", 1138957888], - [828, 7, 2509, "Metrics/PerceivedComplexity: Perceived complexity for `extract_and_integrate_all_nodes` is too high. [16/8]", 1138957888], - [897, 7, 1325, "Metrics/AbcSize: Assignment Branch Condition size for `extract_nodes_with_comments` is too high. [<3, 25, 7> 26.13/17]", 1498557944], - [897, 7, 1325, "Metrics/MethodLength: Method has too many lines. [23/10]", 1498557944], - [1009, 7, 11892, "Metrics/AbcSize: Assignment Branch Condition size for `compute_node_signature` is too high. [<19, 176, 83> 195.5/17]", 2654183611], - [1009, 7, 11892, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_node_signature` is too high. [75/7]", 2654183611], - [1009, 7, 11892, "Metrics/MethodLength: Method has too many lines. [132/10]", 2654183611], - [1009, 7, 11892, "Metrics/PerceivedComplexity: Perceived complexity for `compute_node_signature` is too high. [61/8]", 2654183611], - [1070, 88, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [1074, 24, 300, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 2690302041], - [1074, 55, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [1285, 7, 680, "Metrics/AbcSize: Assignment Branch Condition size for `detect_gemspec_block_var` is too high. [<3, 22, 15> 26.8/17]", 3676370299], - [1285, 7, 680, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_gemspec_block_var` is too high. [14/7]", 3676370299], - [1285, 7, 680, "Metrics/MethodLength: Method has too many lines. [14/10]", 3676370299], - [1285, 7, 680, "Metrics/PerceivedComplexity: Perceived complexity for `detect_gemspec_block_var` is too high. [14/8]", 3676370299] - ], - "lib/prism/merge/freeze_node.rb:2471800311": [ - [67, 7, 577, "Metrics/MethodLength: Method has too many lines. [11/10]", 2189574632], - [67, 21, 186, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1006469938], - [124, 7, 2888, "Metrics/AbcSize: Assignment Branch Condition size for `validate_structure!` is too high. [<13, 32, 33> 47.77/17]", 3621186151], - [124, 7, 2888, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_structure!` is too high. [24/7]", 3621186151], - [124, 7, 2888, "Metrics/MethodLength: Method has too many lines. [38/10]", 3621186151], - [124, 7, 2888, "Metrics/PerceivedComplexity: Perceived complexity for `validate_structure!` is too high. [25/8]", 3621186151] - ], - "lib/prism/merge/merge_result.rb:1970522956": [ - [9, 5, 12561, "Metrics/ClassLength: Class has too many lines. [238/100]", 3020348188], - [67, 7, 5058, "Metrics/AbcSize: Assignment Branch Condition size for `add_node` is too high. [<25, 54, 38> 70.6/17]", 2165268226], - [67, 7, 5058, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `add_node` is too high. [22/7]", 2165268226], - [67, 7, 5058, "Metrics/MethodLength: Method has too many lines. [94/10]", 2165268226], - [67, 7, 5058, "Metrics/PerceivedComplexity: Perceived complexity for `add_node` is too high. [31/8]", 2165268226], - [74, 9, 1617, "Metrics/BlockLength: Block has too many lines. [34/25]", 3544860826], - [175, 38, 40, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 3558364074], - [193, 9, 24, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 1750147806], - [219, 7, 901, "Metrics/AbcSize: Assignment Branch Condition size for `debug_output` is too high. [<5, 29, 5> 29.85/17]", 2776830125], - [219, 7, 901, "Metrics/MethodLength: Method has too many lines. [25/10]", 2776830125], - [296, 7, 903, "Metrics/MethodLength: Method has too many lines. [18/10]", 2752342414] - ], - "lib/prism/merge/method_match_refiner.rb:1593340636": [ - [103, 7, 705, "Metrics/AbcSize: Assignment Branch Condition size for `extract_param_names` is too high. [<2, 37, 16> 40.36/17]", 3200522215], - [103, 7, 705, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_param_names` is too high. [17/7]", 3200522215], - [103, 7, 705, "Metrics/MethodLength: Method has too many lines. [11/10]", 3200522215], - [103, 7, 705, "Metrics/PerceivedComplexity: Perceived complexity for `extract_param_names` is too high. [17/8]", 3200522215], - [111, 49, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [114, 65, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] - ], - "lib/prism/merge/nested_statement_walker.rb:3826169704": [ - [24, 7, 695, "Metrics/MethodLength: Method has too many lines. [16/10]", 3744912119], - [45, 7, 518, "Metrics/MethodLength: Method has too many lines. [12/10]", 2978518157] - ], - "lib/prism/merge/nocov_node.rb:2336029940": [ - [52, 19, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] - ], - "lib/prism/merge/node_body_layout.rb:1642074264": [ - [5, 5, 20, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::NodeBodyLayout`.", 1262407425], - [5, 5, 5858, "Metrics/ClassLength: Class has too many lines. [127/100]", 2663802475], - [14, 7, 413, "Metrics/AbcSize: Assignment Branch Condition size for `body_text` is too high. [<2, 17, 5> 17.83/17]", 1825622248], - [28, 9, 23, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 1178765246], - [31, 7, 241, "Metrics/AbcSize: Assignment Branch Condition size for `opening_line_text` is too high. [<0, 17, 1> 17.03/17]", 1468915915], - [37, 7, 237, "Metrics/AbcSize: Assignment Branch Condition size for `closing_line_text` is too high. [<0, 18, 1> 18.03/17]", 4077830027], - [73, 7, 1058, "Metrics/AbcSize: Assignment Branch Condition size for `statements_node` is too high. [<1, 30, 11> 31.97/17]", 4004813764], - [73, 7, 1058, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `statements_node` is too high. [12/7]", 4004813764], - [73, 7, 1058, "Metrics/MethodLength: Method has too many lines. [20/10]", 4004813764], - [73, 7, 1058, "Metrics/PerceivedComplexity: Perceived complexity for `statements_node` is too high. [10/8]", 4004813764], - [100, 7, 567, "Metrics/AbcSize: Assignment Branch Condition size for `body_start_line` is too high. [<1, 24, 4> 24.35/17]", 2388795687], - [103, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 503895268], - [111, 7, 863, "Metrics/AbcSize: Assignment Branch Condition size for `body_end_line` is too high. [<2, 38, 7> 38.69/17]", 60007760], - [111, 7, 863, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `body_end_line` is too high. [8/7]", 60007760], - [111, 7, 863, "Metrics/MethodLength: Method has too many lines. [11/10]", 60007760], - [114, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2068513341], - [116, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 270242779] - ], - "lib/prism/merge/node_emission_support.rb:388716709": [ - [5, 5, 25, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::NodeEmissionSupport`.", 1335077453], - [5, 5, 42322, "Metrics/ClassLength: Class has too many lines. [775/100]", 2081266710], - [14, 7, 2734, "Metrics/AbcSize: Assignment Branch Condition size for `emit_dest_prefix_lines` is too high. [<18, 54, 18> 59.7/17]", 4241256208], - [14, 7, 2734, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_dest_prefix_lines` is too high. [16/7]", 4241256208], - [14, 7, 2734, "Metrics/MethodLength: Method has too many lines. [54/10]", 4241256208], - [14, 7, 2734, "Metrics/PerceivedComplexity: Perceived complexity for `emit_dest_prefix_lines` is too high. [17/8]", 4241256208], - [19, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177656], - [20, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3503445075], - [81, 7, 2526, "Metrics/AbcSize: Assignment Branch Condition size for `emit_removed_destination_node_comments` is too high. [<15, 38, 6> 41.29/17]", 3275408633], - [81, 7, 2526, "Metrics/MethodLength: Method has too many lines. [63/10]", 3275408633], - [153, 7, 1430, "Metrics/AbcSize: Assignment Branch Condition size for `emit_dest_gap_lines` is too high. [<7, 19, 11> 23.04/17]", 2013951205], - [153, 7, 1430, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_dest_gap_lines` is too high. [9/7]", 2013951205], - [153, 7, 1430, "Metrics/MethodLength: Method has too many lines. [27/10]", 2013951205], - [153, 7, 1430, "Metrics/PerceivedComplexity: Perceived complexity for `emit_dest_gap_lines` is too high. [9/8]", 2013951205], - [154, 36, 21, "Style/NumericPredicate: Use `last_output_line.zero?` instead of `last_output_line == 0`.", 1942859694], - [160, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3276957001], - [187, 7, 9316, "Metrics/AbcSize: Assignment Branch Condition size for `emit_matched_template_node` is too high. [<52, 122, 45> 140.0/17]", 605812917], - [187, 7, 9316, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_matched_template_node` is too high. [43/7]", 605812917], - [187, 7, 9316, "Metrics/MethodLength: Method has too many lines. [151/10]", 605812917], - [187, 7, 9316, "Metrics/PerceivedComplexity: Perceived complexity for `emit_matched_template_node` is too high. [45/8]", 605812917], - [269, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 2775680224], - [301, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 249577804], - [331, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2267103911], - [361, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 988398654], - [373, 7, 6908, "Metrics/AbcSize: Assignment Branch Condition size for `emit_node` is too high. [<44, 90, 54> 113.8/17]", 2848614159], - [373, 7, 6908, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_node` is too high. [38/7]", 2848614159], - [373, 7, 6908, "Metrics/MethodLength: Method has too many lines. [135/10]", 2848614159], - [373, 7, 6908, "Metrics/PerceivedComplexity: Perceived complexity for `emit_node` is too high. [44/8]", 2848614159], - [388, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 3628174615], - [475, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 650150522], - [480, 15, 379, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 3006808047], - [519, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2020907649], - [536, 7, 1166, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `filter_previous_destination_owned_template_leading_comments` is too high. [8/7]", 2076094754], - [536, 7, 1166, "Metrics/MethodLength: Method has too many lines. [15/10]", 2076094754], - [536, 71, 13, "Lint/UnusedMethodArgument: Unused method argument - `template_node`.", 1616609802], - [587, 7, 973, "Metrics/MethodLength: Method has too many lines. [15/10]", 1892360110], - [587, 60, 172, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2784840176], - [588, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 169966263], - [614, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087656651], - [627, 7, 873, "Metrics/AbcSize: Assignment Branch Condition size for `previous_template_gap_already_precedes_leading_comments?` is too high. [<5, 19, 11> 22.52/17]", 268778340], - [627, 7, 873, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `previous_template_gap_already_precedes_leading_comments?` is too high. [9/7]", 268778340], - [627, 7, 873, "Metrics/MethodLength: Method has too many lines. [13/10]", 268778340], - [627, 7, 873, "Metrics/PerceivedComplexity: Perceived complexity for `previous_template_gap_already_precedes_leading_comments?` is too high. [9/8]", 268778340], - [636, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 618947799], - [696, 7, 457, "Metrics/MethodLength: Method has too many lines. [11/10]", 349820622], - [724, 7, 758, "Metrics/AbcSize: Assignment Branch Condition size for `partial_same_line_node?` is too high. [<8, 31, 5> 32.4/17]", 1768803955], - [775, 7, 597, "Metrics/MethodLength: Method has too many lines. [12/10]", 2742538822], - [775, 40, 67, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 725821220], - [792, 7, 552, "Metrics/MethodLength: Method has too many lines. [12/10]", 4255654885], - [815, 7, 845, "Metrics/MethodLength: Method has too many lines. [13/10]", 3468050888], - [846, 7, 1097, "Metrics/AbcSize: Assignment Branch Condition size for `filter_emitted_template_leading_comments` is too high. [<6, 18, 3> 19.21/17]", 2091395187], - [846, 7, 1097, "Metrics/MethodLength: Method has too many lines. [17/10]", 2091395187], - [882, 7, 822, "Metrics/MethodLength: Method has too many lines. [13/10]", 3499946440], - [899, 7, 1359, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_matched_template_leading_prefix` is too high. [<7, 22, 10> 25.16/17]", 3976364089], - [899, 7, 1359, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collapse_matched_template_leading_prefix` is too high. [9/7]", 3976364089], - [899, 7, 1359, "Metrics/MethodLength: Method has too many lines. [21/10]", 3976364089], - [899, 7, 1359, "Metrics/PerceivedComplexity: Perceived complexity for `collapse_matched_template_leading_prefix` is too high. [9/8]", 3976364089], - [943, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 3703011298], - [947, 7, 746, "Metrics/MethodLength: Method has too many lines. [17/10]", 3532927627] - ], - "lib/prism/merge/partial_template_merger.rb:2303997532": [ - [14, 7, 826, "Metrics/MethodLength: Method has too many lines. [14/10]", 713706122], - [14, 21, 329, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [12/5]", 2768355468], - [55, 7, 487, "Metrics/MethodLength: Method has too many lines. [11/10]", 447766477], - [75, 7, 520, "Metrics/AbcSize: Assignment Branch Condition size for `node_to_text` is too high. [<1, 19, 6> 19.95/17]", 1593952791], - [84, 46, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] - ], - "lib/prism/merge/recursive_merge_policy.rb:4204303290": [ - [5, 5, 26, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::RecursiveMergePolicy`.", 1329613257], - [12, 7, 1132, "Metrics/AbcSize: Assignment Branch Condition size for `should_merge?` is too high. [<4, 25, 15> 29.43/17]", 4123619949], - [12, 7, 1132, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `should_merge?` is too high. [14/7]", 4123619949], - [12, 7, 1132, "Metrics/MethodLength: Method has too many lines. [20/10]", 4123619949], - [12, 7, 1132, "Metrics/PerceivedComplexity: Perceived complexity for `should_merge?` is too high. [13/8]", 4123619949], - [47, 7, 398, "Metrics/MethodLength: Method has too many lines. [18/10]", 385694759] - ], - "lib/prism/merge/recursive_node_body_merger.rb:1132596837": [ - [5, 5, 29, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::RecursiveNodeBodyMerger`.", 3703318859], - [5, 5, 18505, "Metrics/ClassLength: Class has too many lines. [333/100]", 3196902308], - [12, 7, 12756, "Metrics/AbcSize: Assignment Branch Condition size for `merge` is too high. [<78, 262, 90> 287.8/17]", 1909933362], - [12, 7, 12756, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge` is too high. [70/7]", 1909933362], - [12, 7, 12756, "Metrics/MethodLength: Method has too many lines. [215/10]", 1909933362], - [12, 7, 12756, "Metrics/PerceivedComplexity: Perceived complexity for `merge` is too high. [75/8]", 1909933362], - [27, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 929875726], - [62, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 518709914], - [67, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 366676207], - [266, 7, 1221, "Metrics/AbcSize: Assignment Branch Condition size for `remap_inner_unresolved_review_state!` is too high. [<8, 22, 6> 24.17/17]", 3210674006], - [266, 7, 1221, "Metrics/MethodLength: Method has too many lines. [21/10]", 3210674006], - [293, 7, 1121, "Metrics/AbcSize: Assignment Branch Condition size for `remap_inner_unresolved_case` is too high. [<6, 24, 0> 24.74/17]", 3468635549], - [293, 7, 1121, "Metrics/MethodLength: Method has too many lines. [15/10]", 3468635549], - [376, 7, 826, "Metrics/AbcSize: Assignment Branch Condition size for `emit_trailing_layout_gap_lines` is too high. [<6, 18, 9> 21/17]", 2158299973], - [376, 7, 826, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_trailing_layout_gap_lines` is too high. [8/7]", 2158299973], - [376, 7, 826, "Metrics/MethodLength: Method has too many lines. [17/10]", 2158299973], - [376, 7, 826, "Metrics/PerceivedComplexity: Perceived complexity for `emit_trailing_layout_gap_lines` is too high. [9/8]", 2158299973] - ], - "lib/prism/merge/ruby_doc_surface_analyzer.rb:3389668357": [ - [7, 5, 7100, "Metrics/ClassLength: Class has too many lines. [162/100]", 77379508], - [50, 7, 1408, "Metrics/AbcSize: Assignment Branch Condition size for `build_doc_comment_surface` is too high. [<10, 25, 5> 27.39/17]", 2414553577], - [50, 7, 1408, "Metrics/MethodLength: Method has too many lines. [28/10]", 2414553577], - [91, 7, 1256, "Metrics/AbcSize: Assignment Branch Condition size for `build_example_surface` is too high. [<4, 23, 2> 23.43/17]", 4074178203], - [91, 7, 1256, "Metrics/MethodLength: Method has too many lines. [25/10]", 4074178203], - [131, 7, 555, "Metrics/AbcSize: Assignment Branch Condition size for `doc_comment_entries` is too high. [<8, 18, 6> 20.59/17]", 358090808] - ], - "lib/prism/merge/scaffold_chunk_remover.rb:174131146": [ - [34, 7, 1958, "Metrics/AbcSize: Assignment Branch Condition size for `call` is too high. [<21, 60, 22> 67.27/17]", 1919383090], - [34, 7, 1958, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `call` is too high. [21/7]", 1919383090], - [34, 7, 1958, "Metrics/MethodLength: Method has too many lines. [37/10]", 1919383090], - [34, 7, 1958, "Metrics/PerceivedComplexity: Perceived complexity for `call` is too high. [21/8]", 1919383090] - ], - "lib/prism/merge/smart_merger.rb:3814529034": [ - [48, 5, 42561, "Metrics/ClassLength: Class has too many lines. [603/100]", 3828655257], - [96, 7, 2032, "Metrics/MethodLength: Method has too many lines. [24/10]", 4118525224], - [96, 21, 595, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [18/5]", 1562155096], - [171, 7, 1325, "Metrics/AbcSize: Assignment Branch Condition size for `merge_with_debug` is too high. [<3, 24, 19> 30.76/17]", 605983530], - [171, 7, 1325, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_with_debug` is too high. [20/7]", 605983530], - [171, 7, 1325, "Metrics/MethodLength: Method has too many lines. [27/10]", 605983530], - [171, 7, 1325, "Metrics/PerceivedComplexity: Perceived complexity for `merge_with_debug` is too high. [20/8]", 605983530], - [310, 7, 664, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `frozen_node?` is too high. [8/7]", 2577924190], - [352, 7, 508, "Metrics/MethodLength: Method has too many lines. [13/10]", 1368018500], - [442, 7, 1155, "Metrics/AbcSize: Assignment Branch Condition size for `build_signature_map` is too high. [<11, 16, 8> 21/17]", 3956321005], - [442, 7, 1155, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_signature_map` is too high. [8/7]", 3956321005], - [442, 7, 1155, "Metrics/MethodLength: Method has too many lines. [16/10]", 3956321005], - [483, 7, 2731, "Metrics/AbcSize: Assignment Branch Condition size for `preference_for_node` is too high. [<7, 22, 20> 30.55/17]", 1325207598], - [483, 7, 2731, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preference_for_node` is too high. [21/7]", 1325207598], - [483, 7, 2731, "Metrics/MethodLength: Method has too many lines. [25/10]", 1325207598], - [483, 7, 2731, "Metrics/PerceivedComplexity: Perceived complexity for `preference_for_node` is too high. [21/8]", 1325207598], - [659, 32, 73, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2261515417], - [670, 35, 79, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1350141395], - [681, 42, 63, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2615605084], - [852, 35, 213, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 720547751] - ], - "lib/prism/merge/source_line_lookup.rb:1098479933": [ - [5, 5, 23, "Style/Documentation: Missing top-level documentation comment for `module Prism::Merge::SourceLineLookup`.", 2168434862] - ], - "lib/prism/merge/top_level_merge_runner.rb:3009983916": [ - [38, 5, 59959, "Metrics/ClassLength: Class has too many lines. [1124/100]", 2689943302], - [66, 7, 5196, "Metrics/AbcSize: Assignment Branch Condition size for `merge` is too high. [<22, 68, 9> 72.03/17]", 176450457], - [66, 7, 5196, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge` is too high. [9/7]", 176450457], - [66, 7, 5196, "Metrics/MethodLength: Method has too many lines. [75/10]", 176450457], - [66, 7, 5196, "Metrics/PerceivedComplexity: Perceived complexity for `merge` is too high. [10/8]", 176450457], - [162, 7, 2023, "Metrics/AbcSize: Assignment Branch Condition size for `start_runtime_session!` is too high. [<5, 48, 1> 48.27/17]", 2943824289], - [162, 7, 2023, "Metrics/MethodLength: Method has too many lines. [44/10]", 2943824289], - [212, 7, 1765, "Metrics/AbcSize: Assignment Branch Condition size for `complete_runtime_session!` is too high. [<2, 21, 9> 22.93/17]", 2968004900], - [212, 7, 1765, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `complete_runtime_session!` is too high. [8/7]", 2968004900], - [212, 7, 1765, "Metrics/MethodLength: Method has too many lines. [36/10]", 2968004900], - [212, 7, 1765, "Metrics/PerceivedComplexity: Perceived complexity for `complete_runtime_session!` is too high. [10/8]", 2968004900], - [229, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3907470478], - [254, 7, 584, "Metrics/MethodLength: Method has too many lines. [14/10]", 1615217394], - [272, 7, 589, "Metrics/AbcSize: Assignment Branch Condition size for `runtime_document_surface` is too high. [<1, 19, 1> 19.05/17]", 1835005228], - [272, 7, 589, "Metrics/MethodLength: Method has too many lines. [12/10]", 1835005228], - [288, 7, 3192, "Metrics/AbcSize: Assignment Branch Condition size for `register_discovered_surface_operations!` is too high. [<12, 60, 9> 61.85/17]", 3059111269], - [288, 7, 3192, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `register_discovered_surface_operations!` is too high. [10/7]", 3059111269], - [288, 7, 3192, "Metrics/MethodLength: Method has too many lines. [65/10]", 3059111269], - [288, 7, 3192, "Metrics/PerceivedComplexity: Perceived complexity for `register_discovered_surface_operations!` is too high. [10/8]", 3059111269], - [297, 9, 2237, "Metrics/BlockLength: Block has too many lines. [44/25]", 809738986], - [399, 7, 1643, "Metrics/AbcSize: Assignment Branch Condition size for `execute_child_operations!` is too high. [<5, 33, 5> 33.75/17]", 1049305146], - [399, 7, 1643, "Metrics/MethodLength: Method has too many lines. [36/10]", 1049305146], - [400, 9, 1570, "Metrics/BlockLength: Block has too many lines. [29/25]", 1597985402], - [404, 9, 31, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 3553388257], - [448, 7, 631, "Metrics/MethodLength: Method has too many lines. [15/10]", 1652116821], - [466, 7, 1306, "Metrics/AbcSize: Assignment Branch Condition size for `merge_runtime_surface` is too high. [<2, 18, 4> 18.55/17]", 1347264970], - [466, 7, 1306, "Metrics/MethodLength: Method has too many lines. [29/10]", 1347264970], - [500, 7, 1393, "Metrics/AbcSize: Assignment Branch Condition size for `merge_runtime_doc_comment_surface` is too high. [<4, 23, 5> 23.87/17]", 3745645404], - [500, 7, 1393, "Metrics/MethodLength: Method has too many lines. [29/10]", 3745645404], - [534, 7, 826, "Metrics/AbcSize: Assignment Branch Condition size for `apply_runtime_doc_children` is too high. [<5, 24, 7> 25.5/17]", 1386022126], - [534, 7, 826, "Metrics/MethodLength: Method has too many lines. [15/10]", 1386022126], - [542, 16, 27, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 1443167664], - [546, 9, 24, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 644874689], - [554, 7, 1438, "Metrics/AbcSize: Assignment Branch Condition size for `apply_runtime_example_child` is too high. [<10, 44, 10> 46.22/17]", 2594444962], - [554, 7, 1438, "Metrics/MethodLength: Method has too many lines. [25/10]", 2594444962], - [556, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3651736697], - [599, 7, 518, "Metrics/MethodLength: Method has too many lines. [11/10]", 523939757], - [623, 7, 753, "Metrics/MethodLength: Method has too many lines. [15/10]", 3406860674], - [683, 7, 1514, "Metrics/AbcSize: Assignment Branch Condition size for `compute_similarity_pairs` is too high. [<17, 42, 11> 46.63/17]", 103276977], - [683, 7, 1514, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_similarity_pairs` is too high. [11/7]", 103276977], - [683, 7, 1514, "Metrics/MethodLength: Method has too many lines. [27/10]", 103276977], - [683, 7, 1514, "Metrics/PerceivedComplexity: Perceived complexity for `compute_similarity_pairs` is too high. [11/8]", 103276977], - [735, 7, 545, "Metrics/MethodLength: Method has too many lines. [12/10]", 398381329], - [763, 7, 586, "Metrics/MethodLength: Method has too many lines. [11/10]", 1559638959], - [843, 7, 640, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_nested_signatures` is too high. [10/7]", 3947424552], - [843, 7, 640, "Metrics/MethodLength: Method has too many lines. [13/10]", 3947424552], - [843, 7, 640, "Metrics/PerceivedComplexity: Perceived complexity for `collect_nested_signatures` is too high. [10/8]", 3947424552], - [845, 12, 9, "Style/NumericPredicate: Use `depth.positive?` instead of `depth > 0`.", 2180768870], - [869, 7, 1297, "Metrics/AbcSize: Assignment Branch Condition size for `nested_statement_children` is too high. [<2, 50, 17> 52.85/17]", 3818826989], - [869, 7, 1297, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `nested_statement_children` is too high. [17/7]", 3818826989], - [869, 7, 1297, "Metrics/MethodLength: Method has too many lines. [19/10]", 3818826989], - [869, 7, 1297, "Metrics/PerceivedComplexity: Perceived complexity for `nested_statement_children` is too high. [15/8]", 3818826989], - [877, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 3315454453], - [882, 93, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [883, 89, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [884, 93, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [899, 7, 754, "Metrics/AbcSize: Assignment Branch Condition size for `prepare_comment_augmenters!` is too high. [<1, 19, 0> 19.03/17]", 311364642], - [899, 7, 754, "Metrics/MethodLength: Method has too many lines. [12/10]", 311364642], - [1003, 7, 1707, "Metrics/AbcSize: Assignment Branch Condition size for `retained_owner_plan` is too high. [<16, 40, 12> 44.72/17]", 375532236], - [1003, 7, 1707, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `retained_owner_plan` is too high. [13/7]", 375532236], - [1003, 7, 1707, "Metrics/MethodLength: Method has too many lines. [33/10]", 375532236], - [1003, 7, 1707, "Metrics/PerceivedComplexity: Perceived complexity for `retained_owner_plan` is too high. [13/8]", 375532236], - [1003, 55, 17, "Lint/UnusedMethodArgument: Unused method argument - `dest_by_signature`.", 379778684], - [1024, 9, 250, "Style/CombinableLoops: Combine this loop with the previous loop.", 3315024098], - [1031, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 180543822], - [1048, 7, 4375, "Metrics/AbcSize: Assignment Branch Condition size for `process_dest_node` is too high. [<23, 66, 14> 71.28/17]", 329713352], - [1048, 7, 4375, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `process_dest_node` is too high. [11/7]", 329713352], - [1048, 7, 4375, "Metrics/MethodLength: Method has too many lines. [80/10]", 329713352], - [1048, 7, 4375, "Metrics/PerceivedComplexity: Perceived complexity for `process_dest_node` is too high. [15/8]", 329713352], - [1048, 28, 279, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 2321512478], - [1153, 7, 757, "Metrics/MethodLength: Method has too many lines. [19/10]", 3306507447], - [1191, 44, 189, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 215272527], - [1222, 7, 888, "Metrics/MethodLength: Method has too many lines. [17/10]", 2638200013], - [1222, 31, 189, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 50070642], - [1244, 7, 719, "Metrics/MethodLength: Method has too many lines. [13/10]", 530865591], - [1262, 7, 1393, "Metrics/AbcSize: Assignment Branch Condition size for `process_non_recursive_match` is too high. [<10, 23, 7> 26.04/17]", 324106576], - [1262, 7, 1393, "Metrics/MethodLength: Method has too many lines. [29/10]", 324106576], - [1296, 7, 1106, "Metrics/AbcSize: Assignment Branch Condition size for `process_unresolved_non_recursive_match` is too high. [<3, 19, 3> 19.47/17]", 1476652897], - [1296, 7, 1106, "Metrics/MethodLength: Method has too many lines. [26/10]", 1476652897], - [1337, 7, 1935, "Metrics/AbcSize: Assignment Branch Condition size for `record_unresolved_match_case!` is too high. [<4, 26, 3> 26.48/17]", 456739474], - [1337, 7, 1935, "Metrics/MethodLength: Method has too many lines. [37/10]", 456739474], - [1422, 7, 1067, "Metrics/AbcSize: Assignment Branch Condition size for `advance_last_output_dest_line` is too high. [<6, 19, 6> 20.81/17]", 331135500], - [1422, 7, 1067, "Metrics/MethodLength: Method has too many lines. [11/10]", 331135500], - [1422, 40, 181, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2038823112] - ], - "lib/prism/merge/wrapper_comment_support.rb:3046735928": [ - [5, 5, 27, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::WrapperCommentSupport`.", 2211657316], - [5, 5, 17765, "Metrics/ClassLength: Class has too many lines. [358/100]", 370100972], - [14, 7, 3072, "Metrics/AbcSize: Assignment Branch Condition size for `filtered_leading_comments_for` is too high. [<26, 58, 27> 69.06/17]", 934788024], - [14, 7, 3072, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `filtered_leading_comments_for` is too high. [24/7]", 934788024], - [14, 7, 3072, "Metrics/MethodLength: Method has too many lines. [48/10]", 934788024], - [14, 7, 3072, "Metrics/PerceivedComplexity: Perceived complexity for `filtered_leading_comments_for` is too high. [27/8]", 934788024], - [24, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 366676207], - [65, 11, 68, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 2360366291], - [74, 73, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [95, 7, 1446, "Metrics/AbcSize: Assignment Branch Condition size for `emit_leading_comments` is too high. [<8, 16, 13> 22.11/17]", 86315238], - [95, 7, 1446, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_leading_comments` is too high. [9/7]", 86315238], - [95, 7, 1446, "Metrics/MethodLength: Method has too many lines. [31/10]", 86315238], - [95, 7, 1446, "Metrics/PerceivedComplexity: Perceived complexity for `emit_leading_comments` is too high. [11/8]", 86315238], - [95, 32, 73, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2261515417], - [98, 9, 1234, "Metrics/BlockLength: Block has too many lines. [28/25]", 357181412], - [134, 7, 953, "Metrics/MethodLength: Method has too many lines. [19/10]", 3183807785], - [134, 35, 79, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1350141395], - [162, 7, 1228, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_comment_region` is too high. [10/7]", 2201645681], - [162, 7, 1228, "Metrics/MethodLength: Method has too many lines. [31/10]", 2201645681], - [162, 7, 1228, "Metrics/PerceivedComplexity: Perceived complexity for `emit_comment_region` is too high. [11/8]", 2201645681], - [162, 30, 67, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 191987245], - [163, 29, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [202, 7, 777, "Metrics/MethodLength: Method has too many lines. [18/10]", 4073303022], - [202, 30, 68, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3851519454], - [208, 9, 8, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 359222635], - [226, 7, 1080, "Metrics/MethodLength: Method has too many lines. [27/10]", 296167644], - [226, 42, 63, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2615605084], - [260, 7, 689, "Metrics/AbcSize: Assignment Branch Condition size for `append_inline_comment_entries` is too high. [<7, 19, 8> 21.77/17]", 1575903523], - [260, 7, 689, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `append_inline_comment_entries` is too high. [8/7]", 1575903523], - [260, 7, 689, "Metrics/MethodLength: Method has too many lines. [16/10]", 1575903523], - [260, 7, 689, "Metrics/PerceivedComplexity: Perceived complexity for `append_inline_comment_entries` is too high. [9/8]", 1575903523], - [288, 7, 607, "Metrics/AbcSize: Assignment Branch Condition size for `line_inline_comment_entries` is too high. [<3, 18, 7> 19.54/17]", 2131701672], - [288, 7, 607, "Metrics/MethodLength: Method has too many lines. [12/10]", 2131701672], - [338, 7, 1023, "Metrics/MethodLength: Method has too many lines. [19/10]", 2409125040], - [363, 7, 854, "Metrics/AbcSize: Assignment Branch Condition size for `runtime_doc_comment_operation_for` is too high. [<4, 24, 13> 27.59/17]", 1109173425], - [363, 7, 854, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `runtime_doc_comment_operation_for` is too high. [10/7]", 1109173425], - [363, 7, 854, "Metrics/MethodLength: Method has too many lines. [11/10]", 1109173425], - [363, 7, 854, "Metrics/PerceivedComplexity: Perceived complexity for `runtime_doc_comment_operation_for` is too high. [10/8]", 1109173425], - [373, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 1843406524], - [381, 7, 755, "Metrics/AbcSize: Assignment Branch Condition size for `build_runtime_leading_region` is too high. [<5, 18, 4> 19.1/17]", 3130034424], - [381, 7, 755, "Metrics/MethodLength: Method has too many lines. [14/10]", 3130034424], - [411, 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:2052428369": [ - [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ], - "spec/fixtures/reproducible/04_gemspec_duplication/destination.rb:971498360": [ - [25, 1, 8292, "Metrics/BlockLength: Block has too many lines. [110/25]", 1251580584], - [32, 121, 317, "Layout/LineLength: Line is too long. [437/120]", 1870252497], - [184, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4147388508], - [199, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [200, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [207, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ], - "spec/fixtures/reproducible/04_gemspec_duplication/template.rb:1741222365": [ - [19, 1, 4121, "Metrics/BlockLength: Block has too many lines. [71/25]", 547880907], - [26, 121, 317, "Layout/LineLength: Line is too long. [437/120]", 1870252497] - ], - "spec/fixtures/reproducible/05_gemspec_orphan_duplication/destination.rb:2573186797": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177634] - ], - "spec/fixtures/reproducible/05_gemspec_orphan_duplication/result.rb:2573186797": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177634] - ], - "spec/fixtures/reproducible/05_gemspec_orphan_duplication/template.rb:1825302441": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177634] - ], - "spec/fixtures_integration_spec.rb:4053275636": [ - [7, 1, 21570, "Metrics/BlockLength: Block has too many lines. [483/25]", 416378449], - [66, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1448895712], - [72, 3, 1302, "Metrics/BlockLength: Block has too many lines. [30/25]", 2973641144], - [106, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [113, 3, 1679, "Metrics/BlockLength: Block has too many lines. [38/25]", 2954972744], - [373, 3, 7512, "Metrics/BlockLength: Block has too many lines. [149/25]", 2278210376] - ], - "spec/reproducible_merge_spec.rb:2334824632": [ - [6, 1, 2420, "Metrics/BlockLength: Block has too many lines. [50/25]", 2207509489], - [39, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1416718429] - ] -} diff --git a/gems/prism-merge/Gemfile b/gems/prism-merge/Gemfile index 4b3ea84a3..b5e6027e0 100644 --- a/gems/prism-merge/Gemfile +++ b/gems/prism-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source 'https://gem.coop' +source "https://gem.coop" git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,17 +19,61 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ['~> 1.0', '>= 1.0.8'] -gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ["~> 1.0", ">= 1.0.8"] +gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ruby-merge ] -direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') +direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? + +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) + direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") + direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == "nomono" } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + if nomono_locked + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] + end + end + Kernel.send(:gem, "nomono", *nomono_activation_requirements) + require "nomono/bundler" + if direct_sibling_templating && !direct_sibling_local + ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + end + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: "STRUCTUREDMERGE", + path_env: "STRUCTUREDMERGE_DEV", + root: ["src", "my", "structuredmerge"] + ) + rescue LoadError + warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + else + ENV.delete("STRUCTUREDMERGE_DEV") + end + end + end +end if direct_sibling_gems.any? && (direct_sibling_local || @@ -249,25 +293,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? # Debugging -eval_gemfile 'gemfiles/modular/debug.gemfile' +eval_gemfile "gemfiles/modular/debug.gemfile" # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile 'gemfiles/modular/coverage.gemfile' +eval_gemfile "gemfiles/modular/coverage.gemfile" # Linting -eval_gemfile 'gemfiles/modular/style.gemfile' +eval_gemfile "gemfiles/modular/style.gemfile" # Documentation -eval_gemfile 'gemfiles/modular/documentation.gemfile' +eval_gemfile "gemfiles/modular/documentation.gemfile" # Optional -eval_gemfile 'gemfiles/modular/optional.gemfile' +eval_gemfile "gemfiles/modular/optional.gemfile" ### Std Lib Extracted Gems -eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' +eval_gemfile "gemfiles/modular/x_std_libs.gemfile" # See unlocked_deps appraisal for more details on irb inclusion -gem 'irb', '~> 1.17' # ruby >= 2.7 +gem "irb", "~> 1.17" # ruby >= 2.7 diff --git a/gems/prism-merge/Gemfile.lock b/gems/prism-merge/Gemfile.lock index 09fa20d97..858d63811 100644 --- a/gems/prism-merge/Gemfile.lock +++ b/gems/prism-merge/Gemfile.lock @@ -275,6 +275,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -308,7 +324,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -363,18 +378,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -538,22 +542,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -659,9 +659,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -739,7 +739,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -760,10 +759,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -838,13 +837,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/prism-merge/Rakefile b/gems/prism-merge/Rakefile index 0413b973d..3ceda1211 100644 --- a/gems/prism-merge/Rakefile +++ b/gems/prism-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require 'kettle/drift' + require "kettle/drift" Kettle::Drift.install_tasks rescue LoadError - desc('(stub) kettle:drift:check is unavailable') - task('kettle:drift:check') do + desc("(stub) kettle:drift:check is unavailable") + task("kettle:drift:check") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:update is unavailable') - task('kettle:drift:update') do + desc("(stub) kettle:drift:update is unavailable") + task("kettle:drift:update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:force_update is unavailable') - task('kettle:drift:force_update') do + desc("(stub) kettle:drift:force_update is unavailable") + task("kettle:drift:force_update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift is unavailable') - task('kettle:drift' => 'kettle:drift:update') + desc("(stub) kettle:drift is unavailable") + task("kettle:drift" => "kettle:drift:update") end ### TEMPLATING TASKS diff --git a/gems/prism-merge/bin/yard b/gems/prism-merge/bin/yard index 5d516ad6f..a7e8b6eed 100755 --- a/gems/prism-merge/bin/yard +++ b/gems/prism-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec('bundle', 'exec', 'rake', 'yard') +exec("bundle", "exec", "rake", "yard") diff --git a/gems/prism-merge/lib/prism/merge/version.rb b/gems/prism-merge/lib/prism/merge/version.rb index 29398c390..c5d5bca42 100644 --- a/gems/prism-merge/lib/prism/merge/version.rb +++ b/gems/prism-merge/lib/prism/merge/version.rb @@ -3,7 +3,7 @@ module Prism module Merge module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end From 3823644e14ef78ad8fdc5a47aa231d79f6dfc0cc Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:38:35 -0600 Subject: [PATCH 211/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/kramdown-merge/Gemfile.lock | 13 +- gems/prism-merge/.rubocop_gradual.lock | 690 ++++++++++++++++++++ gems/prism-merge/Gemfile | 68 +- gems/prism-merge/Gemfile.lock | 396 ++--------- gems/prism-merge/Rakefile | 18 +- gems/prism-merge/bin/yard | 2 +- gems/prism-merge/lib/prism/merge/version.rb | 2 +- 7 files changed, 775 insertions(+), 414 deletions(-) create mode 100644 gems/prism-merge/.rubocop_gradual.lock diff --git a/gems/kramdown-merge/Gemfile.lock b/gems/kramdown-merge/Gemfile.lock index 4bd6f7840..c83dc2cdc 100644 --- a/gems/kramdown-merge/Gemfile.lock +++ b/gems/kramdown-merge/Gemfile.lock @@ -16,14 +16,6 @@ PATH markdown-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -139,6 +131,10 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -394,7 +390,6 @@ DEPENDENCIES kramdown (~> 2.5, >= 2.5.1) kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) rake (~> 13.0) diff --git a/gems/prism-merge/.rubocop_gradual.lock b/gems/prism-merge/.rubocop_gradual.lock new file mode 100644 index 000000000..e28d99e64 --- /dev/null +++ b/gems/prism-merge/.rubocop_gradual.lock @@ -0,0 +1,690 @@ +{ + ".simplecov:3138125134": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:22363789": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/prism-merge.rb:226590672": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`prism-merge.rb`) should use snake_case.", 5381] + ], + "lib/prism/merge.rb:3389866865": [ + [12, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Prism::Merge`.", 2866359175], + [12, 3, 52319, "Metrics/ModuleLength: Module has too many lines. [1195/100]", 1955834049], + [13, 5, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631], + [24, 5, 16, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::ParseError`.", 362242086], + [120, 5, 1996, "Metrics/MethodLength: Method has too many lines. [42/10]", 709892915], + [165, 5, 1804, "Metrics/MethodLength: Method has too many lines. [37/10]", 3641862107], + [205, 5, 1012, "Metrics/MethodLength: Method has too many lines. [23/10]", 3112984532], + [243, 5, 695, "Metrics/MethodLength: Method has too many lines. [17/10]", 321495946], + [263, 5, 1801, "Metrics/MethodLength: Method has too many lines. [37/10]", 3355654893], + [264, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 180584319], + [303, 5, 7357, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_structured_edit_batch_report_projection` is too high. [<1, 31, 0> 31.02/17]", 2583247591], + [303, 5, 7357, "Metrics/MethodLength: Method has too many lines. [139/10]", 2583247591], + [304, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 180584319], + [323, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 949635646], + [361, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1330685294], + [445, 5, 893, "Metrics/AbcSize: Assignment Branch Condition size for `parse_ruby` is too high. [<3, 17, 7> 18.63/17]", 2894794051], + [445, 5, 893, "Metrics/MethodLength: Method has too many lines. [21/10]", 2894794051], + [471, 5, 491, "Metrics/MethodLength: Method has too many lines. [12/10]", 3211170428], + [486, 5, 3294, "Metrics/AbcSize: Assignment Branch Condition size for `parse_ruby_normalized` is too high. [<20, 68, 28> 76.21/17]", 3878823268], + [486, 5, 3294, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_ruby_normalized` is too high. [23/7]", 3878823268], + [486, 5, 3294, "Metrics/MethodLength: Method has too many lines. [70/10]", 3878823268], + [486, 5, 3294, "Metrics/PerceivedComplexity: Perceived complexity for `parse_ruby_normalized` is too high. [23/8]", 3878823268], + [566, 5, 3671, "Metrics/AbcSize: Assignment Branch Condition size for `apply_edit_projection` is too high. [<14, 62, 19> 66.34/17]", 1859418783], + [566, 5, 3671, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_edit_projection` is too high. [12/7]", 1859418783], + [566, 5, 3671, "Metrics/MethodLength: Method has too many lines. [66/10]", 1859418783], + [566, 5, 3671, "Metrics/PerceivedComplexity: Perceived complexity for `apply_edit_projection` is too high. [13/8]", 1859418783], + [612, 18, 176, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 3247522762], + [645, 5, 1505, "Metrics/MethodLength: Method has too many lines. [33/10]", 2499202345], + [645, 19, 292, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 676979469], + [706, 5, 583, "Metrics/MethodLength: Method has too many lines. [13/10]", 1484312517], + [723, 5, 551, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_ruby_require_aliases` is too high. [<11, 15, 7> 19.87/17]", 2507514607], + [723, 5, 551, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_ruby_require_aliases` is too high. [8/7]", 2507514607], + [723, 5, 551, "Metrics/MethodLength: Method has too many lines. [17/10]", 2507514607], + [744, 5, 304, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_dsl_call_node` is too high. [8/7]", 2466841613], + [767, 5, 1305, "Metrics/AbcSize: Assignment Branch Condition size for `merge_ruby_with_reviewed_nested_outputs` is too high. [<7, 17, 5> 19.05/17]", 3657868136], + [767, 5, 1305, "Metrics/MethodLength: Method has too many lines. [27/10]", 3657868136], + [767, 48, 140, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 132256850], + [800, 5, 1015, "Metrics/MethodLength: Method has too many lines. [17/10]", 757789356], + [810, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 1956194284], + [823, 5, 928, "Metrics/MethodLength: Method has too many lines. [16/10]", 1039420596], + [833, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 3013228499], + [845, 5, 1003, "Metrics/MethodLength: Method has too many lines. [17/10]", 3313354796], + [855, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1636990749], + [868, 5, 936, "Metrics/MethodLength: Method has too many lines. [16/10]", 2825710110], + [878, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 3013228499], + [902, 5, 662, "Metrics/MethodLength: Method has too many lines. [19/10]", 772959042], + [923, 7, 11, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 848344986], + [926, 5, 849, "Metrics/AbcSize: Assignment Branch Condition size for `prism_ruby_discovered_surfaces` is too high. [<12, 16, 6> 20.88/17]", 2509812469], + [926, 5, 849, "Metrics/MethodLength: Method has too many lines. [23/10]", 2509812469], + [957, 5, 1195, "Metrics/AbcSize: Assignment Branch Condition size for `prism_ruby_surfaces_for_owner` is too high. [<6, 19, 3> 20.15/17]", 1713430182], + [957, 5, 1195, "Metrics/MethodLength: Method has too many lines. [20/10]", 1713430182], + [982, 5, 1216, "Metrics/AbcSize: Assignment Branch Condition size for `prism_ruby_example_surfaces` is too high. [<4, 20, 2> 20.49/17]", 2225356615], + [982, 5, 1216, "Metrics/MethodLength: Method has too many lines. [22/10]", 2225356615], + [1054, 5, 421, "Metrics/MethodLength: Method has too many lines. [14/10]", 26440736], + [1085, 5, 827, "Metrics/MethodLength: Method has too many lines. [18/10]", 4288402374], + [1126, 5, 876, "Metrics/MethodLength: Method has too many lines. [23/10]", 3423854231], + [1164, 5, 1155, "Metrics/AbcSize: Assignment Branch Condition size for `prism_comment_node` is too high. [<1, 22, 0> 22.02/17]", 4287909739], + [1164, 5, 1155, "Metrics/MethodLength: Method has too many lines. [28/10]", 4287909739], + [1195, 5, 888, "Metrics/MethodLength: Method has too many lines. [27/10]", 3798554661], + [1247, 5, 920, "Metrics/MethodLength: Method has too many lines. [23/10]", 917985568] + ], + "lib/prism/merge/begin_node_clause_body_merger.rb:1042804537": [ + [5, 5, 31, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::BeginNodeClauseBodyMerger`.", 1242162299], + [19, 7, 1511, "Metrics/AbcSize: Assignment Branch Condition size for `merge` is too high. [<5, 37, 1> 37.35/17]", 3275719934], + [19, 7, 1511, "Metrics/MethodLength: Method has too many lines. [32/10]", 3275719934] + ], + "lib/prism/merge/begin_node_clause_body_support.rb:787370708": [ + [5, 5, 32, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::BeginNodeClauseBodySupport`.", 3341069278], + [5, 5, 7504, "Metrics/ClassLength: Class has too many lines. [142/100]", 1403116805], + [8, 21, 100, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 4145084810], + [22, 7, 937, "Metrics/AbcSize: Assignment Branch Condition size for `clause_header_end_line` is too high. [<5, 29, 16> 33.5/17]", 2050282033], + [22, 7, 937, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `clause_header_end_line` is too high. [16/7]", 2050282033], + [22, 7, 937, "Metrics/MethodLength: Method has too many lines. [14/10]", 2050282033], + [22, 7, 937, "Metrics/PerceivedComplexity: Perceived complexity for `clause_header_end_line` is too high. [16/8]", 2050282033], + [35, 63, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [55, 9, 23, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 1178765246], + [58, 7, 419, "Metrics/MethodLength: Method has too many lines. [11/10]", 3825428834], + [81, 7, 2396, "Metrics/AbcSize: Assignment Branch Condition size for `clause_body_components` is too high. [<11, 30, 16> 35.74/17]", 199420029], + [81, 7, 2396, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `clause_body_components` is too high. [13/7]", 199420029], + [81, 7, 2396, "Metrics/MethodLength: Method has too many lines. [39/10]", 199420029], + [81, 7, 2396, "Metrics/PerceivedComplexity: Perceived complexity for `clause_body_components` is too high. [14/8]", 199420029], + [126, 30, 23, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 1178765246], + [164, 7, 862, "Metrics/AbcSize: Assignment Branch Condition size for `clause_bodies_have_matching_statements?` is too high. [<3, 19, 2> 19.34/17]", 4182083840], + [164, 7, 862, "Metrics/MethodLength: Method has too many lines. [15/10]", 4182083840] + ], + "lib/prism/merge/begin_node_clause_header_emitter.rb:2991300768": [ + [5, 5, 34, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::BeginNodeClauseHeaderEmitter`.", 217025096], + [14, 7, 1600, "Metrics/AbcSize: Assignment Branch Condition size for `emit` is too high. [<10, 22, 17> 29.55/17]", 4242535078], + [14, 7, 1600, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit` is too high. [11/7]", 4242535078], + [14, 7, 1600, "Metrics/MethodLength: Method has too many lines. [25/10]", 4242535078], + [14, 7, 1600, "Metrics/PerceivedComplexity: Perceived complexity for `emit` is too high. [11/8]", 4242535078], + [14, 15, 164, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2644486585] + ], + "lib/prism/merge/begin_node_merge_planner.rb:3840396716": [ + [5, 5, 27, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::BeginNodeMergePlanner`.", 3356052894], + [5, 5, 9876, "Metrics/ClassLength: Class has too many lines. [185/100]", 148070692], + [30, 7, 2144, "Metrics/AbcSize: Assignment Branch Condition size for `plan` is too high. [<15, 34, 11> 38.76/17]", 3596380485], + [30, 7, 2144, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `plan` is too high. [10/7]", 3596380485], + [30, 7, 2144, "Metrics/MethodLength: Method has too many lines. [39/10]", 3596380485], + [30, 7, 2144, "Metrics/PerceivedComplexity: Perceived complexity for `plan` is too high. [11/8]", 3596380485], + [84, 7, 4383, "Metrics/AbcSize: Assignment Branch Condition size for `build_shared_clause_step` is too high. [<19, 70, 24> 76.4/17]", 2837542267], + [84, 7, 4383, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_shared_clause_step` is too high. [16/7]", 2837542267], + [84, 7, 4383, "Metrics/MethodLength: Method has too many lines. [73/10]", 2837542267], + [84, 7, 4383, "Metrics/PerceivedComplexity: Perceived complexity for `build_shared_clause_step` is too high. [18/8]", 2837542267], + [103, 121, 59, "Layout/LineLength: Line is too long. [179/120]", 357928082], + [105, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 1163790852], + [142, 121, 35, "Layout/LineLength: Line is too long. [155/120]", 3447647282], + [143, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 1267386383], + [167, 7, 2428, "Metrics/AbcSize: Assignment Branch Condition size for `build_unmatched_clause_step` is too high. [<2, 28, 21> 35.06/17]", 2984621385], + [167, 7, 2428, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_unmatched_clause_step` is too high. [17/7]", 2984621385], + [167, 7, 2428, "Metrics/MethodLength: Method has too many lines. [38/10]", 2984621385], + [167, 7, 2428, "Metrics/PerceivedComplexity: Perceived complexity for `build_unmatched_clause_step` is too high. [19/8]", 2984621385], + [188, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 549521717], + [198, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 619697310] + ], + "lib/prism/merge/begin_node_plan_emitter.rb:372252499": [ + [5, 5, 26, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::BeginNodePlanEmitter`.", 926648201], + [14, 7, 740, "Metrics/MethodLength: Method has too many lines. [16/10]", 2040521865], + [14, 15, 105, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1812434716], + [36, 7, 1205, "Metrics/MethodLength: Method has too many lines. [24/10]", 4164487211], + [36, 20, 127, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 466430575], + [76, 7, 1308, "Metrics/AbcSize: Assignment Branch Condition size for `emit_copied_unmatched_clause` is too high. [<6, 30, 11> 32.51/17]", 1339054986], + [76, 7, 1308, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_copied_unmatched_clause` is too high. [10/7]", 1339054986], + [76, 7, 1308, "Metrics/MethodLength: Method has too many lines. [21/10]", 1339054986], + [76, 7, 1308, "Metrics/PerceivedComplexity: Perceived complexity for `emit_copied_unmatched_clause` is too high. [10/8]", 1339054986], + [76, 39, 146, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2474530127] + ], + "lib/prism/merge/begin_node_rescue_semantics.rb:2746062857": [ + [5, 5, 30, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::BeginNodeRescueSemantics`.", 4100560642], + [5, 5, 9687, "Metrics/ClassLength: Class has too many lines. [194/100]", 4227917508], + [13, 7, 1953, "Metrics/AbcSize: Assignment Branch Condition size for `normalized_clause_body_and_header_source` is too high. [<9, 13, 21> 26.29/17]", 1895019213], + [13, 7, 1953, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalized_clause_body_and_header_source` is too high. [15/7]", 1895019213], + [13, 7, 1953, "Metrics/MethodLength: Method has too many lines. [26/10]", 1895019213], + [13, 7, 1953, "Metrics/PerceivedComplexity: Perceived complexity for `normalized_clause_body_and_header_source` is too high. [17/8]", 1895019213], + [80, 7, 530, "Metrics/AbcSize: Assignment Branch Condition size for `local_variable_read_names_in` is too high. [<1, 16, 9> 18.38/17]", 2555890222], + [80, 7, 530, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `local_variable_read_names_in` is too high. [8/7]", 2555890222], + [80, 7, 530, "Metrics/MethodLength: Method has too many lines. [12/10]", 2555890222], + [80, 7, 530, "Metrics/PerceivedComplexity: Perceived complexity for `local_variable_read_names_in` is too high. [9/8]", 2555890222], + [132, 7, 618, "Metrics/AbcSize: Assignment Branch Condition size for `rewrite_local_reference_in_source` is too high. [<6, 16, 9> 19.31/17]", 1195871443], + [132, 7, 618, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `rewrite_local_reference_in_source` is too high. [9/7]", 1195871443], + [132, 7, 618, "Metrics/PerceivedComplexity: Perceived complexity for `rewrite_local_reference_in_source` is too high. [9/8]", 1195871443], + [178, 85, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [190, 7, 1233, "Metrics/AbcSize: Assignment Branch Condition size for `collect_source_defined_exception_definitions` is too high. [<4, 22, 9> 24.1/17]", 1970916346], + [190, 7, 1233, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_source_defined_exception_definitions` is too high. [10/7]", 1970916346], + [190, 7, 1233, "Metrics/MethodLength: Method has too many lines. [24/10]", 1970916346] + ], + "lib/prism/merge/begin_node_structure.rb:1232724245": [ + [5, 5, 24, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::BeginNodeStructure`.", 3506219929], + [5, 5, 4080, "Metrics/ClassLength: Class has too many lines. [101/100]", 1611393241], + [21, 7, 375, "Metrics/AbcSize: Assignment Branch Condition size for `boundary_lines` is too high. [<0, 28, 7> 28.86/17]", 3399008793], + [21, 7, 375, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `boundary_lines` is too high. [8/7]", 3399008793], + [33, 7, 251, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `clause_start_line` is too high. [8/7]", 1553904487], + [43, 7, 407, "Metrics/MethodLength: Method has too many lines. [12/10]", 3851339415], + [59, 7, 1089, "Metrics/AbcSize: Assignment Branch Condition size for `clause_regions` is too high. [<9, 38, 9> 40.07/17]", 1916795013], + [59, 7, 1089, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `clause_regions` is too high. [10/7]", 1916795013], + [59, 7, 1089, "Metrics/MethodLength: Method has too many lines. [22/10]", 1916795013], + [59, 7, 1089, "Metrics/PerceivedComplexity: Perceived complexity for `clause_regions` is too high. [10/8]", 1916795013], + [86, 7, 613, "Metrics/AbcSize: Assignment Branch Condition size for `clause_nodes_by_type` is too high. [<9, 19, 4> 21.4/17]", 1693909219], + [86, 7, 613, "Metrics/MethodLength: Method has too many lines. [12/10]", 1693909219], + [102, 11, 19, "Naming/PredicatePrefix: Rename `has_clause_or_body?` to `clause_or_body?`.", 2163996991], + [106, 7, 598, "Metrics/AbcSize: Assignment Branch Condition size for `line_map_for` is too high. [<13, 15, 6> 20.74/17]", 191778789] + ], + "lib/prism/merge/block_directive_detector.rb:3698866715": [ + [9, 5, 5028, "Metrics/ClassLength: Class has too many lines. [121/100]", 2587374670], + [10, 7, 1976, "Metrics/AbcSize: Assignment Branch Condition size for `promote_spans_to_nodes` is too high. [<23, 42, 32> 57.59/17]", 1038475655], + [10, 7, 1976, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `promote_spans_to_nodes` is too high. [24/7]", 1038475655], + [10, 7, 1976, "Metrics/MethodLength: Method has too many lines. [37/10]", 1038475655], + [10, 7, 1976, "Metrics/PerceivedComplexity: Perceived complexity for `promote_spans_to_nodes` is too high. [25/8]", 1038475655], + [35, 11, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], + [108, 7, 832, "Metrics/MethodLength: Method has too many lines. [23/10]", 3204610677], + [134, 7, 722, "Metrics/AbcSize: Assignment Branch Condition size for `rebuild_statements` is too high. [<15, 17, 9> 24.39/17]", 3809085226], + [134, 7, 722, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `rebuild_statements` is too high. [10/7]", 3809085226], + [134, 7, 722, "Metrics/MethodLength: Method has too many lines. [15/10]", 3809085226], + [134, 7, 722, "Metrics/PerceivedComplexity: Perceived complexity for `rebuild_statements` is too high. [10/8]", 3809085226] + ], + "lib/prism/merge/comment/block.rb:3606937725": [ + [65, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1573406415] + ], + "lib/prism/merge/comment/parser.rb:1277632686": [ + [31, 9, 1747, "Metrics/AbcSize: Assignment Branch Condition size for `parse` is too high. [<10, 28, 8> 30.79/17]", 2837146927], + [31, 9, 1747, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse` is too high. [8/7]", 2837146927], + [31, 9, 1747, "Metrics/MethodLength: Method has too many lines. [34/10]", 2837146927], + [31, 9, 1747, "Metrics/PerceivedComplexity: Perceived complexity for `parse` is too high. [9/8]", 2837146927], + [38, 11, 1390, "Metrics/BlockLength: Block has too many lines. [26/25]", 1396583578] + ], + "lib/prism/merge/comment_only_file_merger.rb:808070956": [ + [5, 5, 27, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::CommentOnlyFileMerger`.", 1927029952], + [5, 5, 11907, "Metrics/ClassLength: Class has too many lines. [256/100]", 2729825792], + [27, 7, 1628, "Metrics/AbcSize: Assignment Branch Condition size for `merge` is too high. [<15, 32, 8> 36.24/17]", 2481561114], + [27, 7, 1628, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge` is too high. [8/7]", 2481561114], + [27, 7, 1628, "Metrics/MethodLength: Method has too many lines. [34/10]", 2481561114], + [78, 7, 661, "Metrics/MethodLength: Method has too many lines. [18/10]", 1523408112], + [100, 7, 1781, "Metrics/AbcSize: Assignment Branch Condition size for `build_output_plan` is too high. [<10, 34, 20> 40.69/17]", 994360926], + [100, 7, 1781, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_output_plan` is too high. [17/7]", 994360926], + [100, 7, 1781, "Metrics/MethodLength: Method has too many lines. [30/10]", 994360926], + [100, 7, 1781, "Metrics/PerceivedComplexity: Perceived complexity for `build_output_plan` is too high. [19/8]", 994360926], + [123, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 530225423], + [149, 7, 1486, "Metrics/AbcSize: Assignment Branch Condition size for `add_comment_node_to_result` is too high. [<7, 34, 22> 41.1/17]", 1181795760], + [149, 7, 1486, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `add_comment_node_to_result` is too high. [16/7]", 1181795760], + [149, 7, 1486, "Metrics/MethodLength: Method has too many lines. [29/10]", 1181795760], + [149, 7, 1486, "Metrics/PerceivedComplexity: Perceived complexity for `add_comment_node_to_result` is too high. [20/8]", 1181795760], + [185, 7, 693, "Metrics/MethodLength: Method has too many lines. [16/10]", 3008008109], + [205, 7, 1035, "Metrics/AbcSize: Assignment Branch Condition size for `emit_layout_gap_to_result` is too high. [<6, 24, 11> 27.07/17]", 3441550295], + [205, 7, 1035, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_layout_gap_to_result` is too high. [9/7]", 3441550295], + [205, 7, 1035, "Metrics/MethodLength: Method has too many lines. [17/10]", 3441550295], + [205, 7, 1035, "Metrics/PerceivedComplexity: Perceived complexity for `emit_layout_gap_to_result` is too high. [10/8]", 3441550295], + [230, 7, 665, "Metrics/AbcSize: Assignment Branch Condition size for `emit_comment_only_prefix_lines` is too high. [<5, 21, 4> 21.95/17]", 1939505075], + [243, 7, 942, "Metrics/MethodLength: Method has too many lines. [19/10]", 2012616838] + ], + "lib/prism/merge/file_analysis.rb:4241124500": [ + [16, 5, 55504, "Metrics/ClassLength: Class has too many lines. [614/100]", 2951008665], + [19, 7, 28, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::FileAnalysis::NativeCommentAugmenter`.", 2321467727], + [19, 7, 5712, "Metrics/ClassLength: Class has too many lines. [121/100]", 3225634005], + [22, 9, 605, "Metrics/MethodLength: Method has too many lines. [16/10]", 3935631704], + [47, 9, 2672, "Metrics/AbcSize: Assignment Branch Condition size for `build!` is too high. [<19, 55, 23> 62.57/17]", 3140666915], + [47, 9, 2672, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build!` is too high. [22/7]", 3140666915], + [47, 9, 2672, "Metrics/MethodLength: Method has too many lines. [47/10]", 3140666915], + [47, 9, 2672, "Metrics/PerceivedComplexity: Perceived complexity for `build!` is too high. [22/8]", 3140666915], + [120, 9, 779, "Metrics/AbcSize: Assignment Branch Condition size for `attach_orphan_region_to_nearest_owner` is too high. [<4, 18, 3> 18.68/17]", 714646861], + [120, 9, 779, "Metrics/MethodLength: Method has too many lines. [15/10]", 714646861], + [212, 7, 1593, "Metrics/MethodLength: Method has too many lines. [17/10]", 3233444968], + [345, 7, 1177, "Metrics/MethodLength: Method has too many lines. [23/10]", 853358252], + [387, 7, 587, "Metrics/MethodLength: Method has too many lines. [13/10]", 241044926], + [453, 7, 1099, "Metrics/AbcSize: Assignment Branch Condition size for `frozen_node?` is too high. [<3, 16, 7> 17.72/17]", 1886536218], + [453, 7, 1099, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `frozen_node?` is too high. [8/7]", 1886536218], + [587, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858904], + [588, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 442686854], + [659, 7, 779, "Metrics/AbcSize: Assignment Branch Condition size for `split_first_owner_preamble_entries` is too high. [<9, 20, 10> 24.1/17]", 2477766314], + [659, 7, 779, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split_first_owner_preamble_entries` is too high. [9/7]", 2477766314], + [659, 7, 779, "Metrics/MethodLength: Method has too many lines. [11/10]", 2477766314], + [659, 7, 779, "Metrics/PerceivedComplexity: Perceived complexity for `split_first_owner_preamble_entries` is too high. [9/8]", 2477766314], + [669, 9, 11, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 848344986], + [716, 7, 768, "Metrics/MethodLength: Method has too many lines. [15/10]", 3855207561], + [742, 7, 609, "Metrics/MethodLength: Method has too many lines. [15/10]", 3157294863], + [828, 7, 2509, "Metrics/AbcSize: Assignment Branch Condition size for `extract_and_integrate_all_nodes` is too high. [<11, 29, 16> 34.9/17]", 1138957888], + [828, 7, 2509, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_and_integrate_all_nodes` is too high. [14/7]", 1138957888], + [828, 7, 2509, "Metrics/MethodLength: Method has too many lines. [32/10]", 1138957888], + [828, 7, 2509, "Metrics/PerceivedComplexity: Perceived complexity for `extract_and_integrate_all_nodes` is too high. [16/8]", 1138957888], + [897, 7, 1325, "Metrics/AbcSize: Assignment Branch Condition size for `extract_nodes_with_comments` is too high. [<3, 25, 7> 26.13/17]", 1498557944], + [897, 7, 1325, "Metrics/MethodLength: Method has too many lines. [23/10]", 1498557944], + [1009, 7, 11892, "Metrics/AbcSize: Assignment Branch Condition size for `compute_node_signature` is too high. [<19, 176, 83> 195.5/17]", 2654183611], + [1009, 7, 11892, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_node_signature` is too high. [75/7]", 2654183611], + [1009, 7, 11892, "Metrics/MethodLength: Method has too many lines. [132/10]", 2654183611], + [1009, 7, 11892, "Metrics/PerceivedComplexity: Perceived complexity for `compute_node_signature` is too high. [61/8]", 2654183611], + [1070, 88, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [1074, 24, 300, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 2690302041], + [1074, 55, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [1285, 7, 680, "Metrics/AbcSize: Assignment Branch Condition size for `detect_gemspec_block_var` is too high. [<3, 22, 15> 26.8/17]", 3676370299], + [1285, 7, 680, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_gemspec_block_var` is too high. [14/7]", 3676370299], + [1285, 7, 680, "Metrics/MethodLength: Method has too many lines. [14/10]", 3676370299], + [1285, 7, 680, "Metrics/PerceivedComplexity: Perceived complexity for `detect_gemspec_block_var` is too high. [14/8]", 3676370299] + ], + "lib/prism/merge/freeze_node.rb:2471800311": [ + [67, 7, 577, "Metrics/MethodLength: Method has too many lines. [11/10]", 2189574632], + [67, 21, 186, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1006469938], + [124, 7, 2888, "Metrics/AbcSize: Assignment Branch Condition size for `validate_structure!` is too high. [<13, 32, 33> 47.77/17]", 3621186151], + [124, 7, 2888, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_structure!` is too high. [24/7]", 3621186151], + [124, 7, 2888, "Metrics/MethodLength: Method has too many lines. [38/10]", 3621186151], + [124, 7, 2888, "Metrics/PerceivedComplexity: Perceived complexity for `validate_structure!` is too high. [25/8]", 3621186151] + ], + "lib/prism/merge/merge_result.rb:1970522956": [ + [9, 5, 12561, "Metrics/ClassLength: Class has too many lines. [238/100]", 3020348188], + [67, 7, 5058, "Metrics/AbcSize: Assignment Branch Condition size for `add_node` is too high. [<25, 54, 38> 70.6/17]", 2165268226], + [67, 7, 5058, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `add_node` is too high. [22/7]", 2165268226], + [67, 7, 5058, "Metrics/MethodLength: Method has too many lines. [94/10]", 2165268226], + [67, 7, 5058, "Metrics/PerceivedComplexity: Perceived complexity for `add_node` is too high. [31/8]", 2165268226], + [74, 9, 1617, "Metrics/BlockLength: Block has too many lines. [34/25]", 3544860826], + [175, 38, 40, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 3558364074], + [193, 9, 24, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 1750147806], + [219, 7, 901, "Metrics/AbcSize: Assignment Branch Condition size for `debug_output` is too high. [<5, 29, 5> 29.85/17]", 2776830125], + [219, 7, 901, "Metrics/MethodLength: Method has too many lines. [25/10]", 2776830125], + [296, 7, 903, "Metrics/MethodLength: Method has too many lines. [18/10]", 2752342414] + ], + "lib/prism/merge/method_match_refiner.rb:1593340636": [ + [103, 7, 705, "Metrics/AbcSize: Assignment Branch Condition size for `extract_param_names` is too high. [<2, 37, 16> 40.36/17]", 3200522215], + [103, 7, 705, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_param_names` is too high. [17/7]", 3200522215], + [103, 7, 705, "Metrics/MethodLength: Method has too many lines. [11/10]", 3200522215], + [103, 7, 705, "Metrics/PerceivedComplexity: Perceived complexity for `extract_param_names` is too high. [17/8]", 3200522215], + [111, 49, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [114, 65, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] + ], + "lib/prism/merge/nested_statement_walker.rb:3826169704": [ + [24, 7, 695, "Metrics/MethodLength: Method has too many lines. [16/10]", 3744912119], + [45, 7, 518, "Metrics/MethodLength: Method has too many lines. [12/10]", 2978518157] + ], + "lib/prism/merge/nocov_node.rb:2336029940": [ + [52, 19, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] + ], + "lib/prism/merge/node_body_layout.rb:1642074264": [ + [5, 5, 20, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::NodeBodyLayout`.", 1262407425], + [5, 5, 5858, "Metrics/ClassLength: Class has too many lines. [127/100]", 2663802475], + [14, 7, 413, "Metrics/AbcSize: Assignment Branch Condition size for `body_text` is too high. [<2, 17, 5> 17.83/17]", 1825622248], + [28, 9, 23, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 1178765246], + [31, 7, 241, "Metrics/AbcSize: Assignment Branch Condition size for `opening_line_text` is too high. [<0, 17, 1> 17.03/17]", 1468915915], + [37, 7, 237, "Metrics/AbcSize: Assignment Branch Condition size for `closing_line_text` is too high. [<0, 18, 1> 18.03/17]", 4077830027], + [73, 7, 1058, "Metrics/AbcSize: Assignment Branch Condition size for `statements_node` is too high. [<1, 30, 11> 31.97/17]", 4004813764], + [73, 7, 1058, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `statements_node` is too high. [12/7]", 4004813764], + [73, 7, 1058, "Metrics/MethodLength: Method has too many lines. [20/10]", 4004813764], + [73, 7, 1058, "Metrics/PerceivedComplexity: Perceived complexity for `statements_node` is too high. [10/8]", 4004813764], + [100, 7, 567, "Metrics/AbcSize: Assignment Branch Condition size for `body_start_line` is too high. [<1, 24, 4> 24.35/17]", 2388795687], + [103, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 503895268], + [111, 7, 863, "Metrics/AbcSize: Assignment Branch Condition size for `body_end_line` is too high. [<2, 38, 7> 38.69/17]", 60007760], + [111, 7, 863, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `body_end_line` is too high. [8/7]", 60007760], + [111, 7, 863, "Metrics/MethodLength: Method has too many lines. [11/10]", 60007760], + [114, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2068513341], + [116, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 270242779] + ], + "lib/prism/merge/node_emission_support.rb:388716709": [ + [5, 5, 25, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::NodeEmissionSupport`.", 1335077453], + [5, 5, 42322, "Metrics/ClassLength: Class has too many lines. [775/100]", 2081266710], + [14, 7, 2734, "Metrics/AbcSize: Assignment Branch Condition size for `emit_dest_prefix_lines` is too high. [<18, 54, 18> 59.7/17]", 4241256208], + [14, 7, 2734, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_dest_prefix_lines` is too high. [16/7]", 4241256208], + [14, 7, 2734, "Metrics/MethodLength: Method has too many lines. [54/10]", 4241256208], + [14, 7, 2734, "Metrics/PerceivedComplexity: Perceived complexity for `emit_dest_prefix_lines` is too high. [17/8]", 4241256208], + [19, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177656], + [20, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3503445075], + [81, 7, 2526, "Metrics/AbcSize: Assignment Branch Condition size for `emit_removed_destination_node_comments` is too high. [<15, 38, 6> 41.29/17]", 3275408633], + [81, 7, 2526, "Metrics/MethodLength: Method has too many lines. [63/10]", 3275408633], + [153, 7, 1430, "Metrics/AbcSize: Assignment Branch Condition size for `emit_dest_gap_lines` is too high. [<7, 19, 11> 23.04/17]", 2013951205], + [153, 7, 1430, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_dest_gap_lines` is too high. [9/7]", 2013951205], + [153, 7, 1430, "Metrics/MethodLength: Method has too many lines. [27/10]", 2013951205], + [153, 7, 1430, "Metrics/PerceivedComplexity: Perceived complexity for `emit_dest_gap_lines` is too high. [9/8]", 2013951205], + [154, 36, 21, "Style/NumericPredicate: Use `last_output_line.zero?` instead of `last_output_line == 0`.", 1942859694], + [160, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3276957001], + [187, 7, 9316, "Metrics/AbcSize: Assignment Branch Condition size for `emit_matched_template_node` is too high. [<52, 122, 45> 140.0/17]", 605812917], + [187, 7, 9316, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_matched_template_node` is too high. [43/7]", 605812917], + [187, 7, 9316, "Metrics/MethodLength: Method has too many lines. [151/10]", 605812917], + [187, 7, 9316, "Metrics/PerceivedComplexity: Perceived complexity for `emit_matched_template_node` is too high. [45/8]", 605812917], + [269, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 2775680224], + [301, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 249577804], + [331, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2267103911], + [361, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 988398654], + [373, 7, 6908, "Metrics/AbcSize: Assignment Branch Condition size for `emit_node` is too high. [<44, 90, 54> 113.8/17]", 2848614159], + [373, 7, 6908, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_node` is too high. [38/7]", 2848614159], + [373, 7, 6908, "Metrics/MethodLength: Method has too many lines. [135/10]", 2848614159], + [373, 7, 6908, "Metrics/PerceivedComplexity: Perceived complexity for `emit_node` is too high. [44/8]", 2848614159], + [388, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 3628174615], + [475, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 650150522], + [480, 15, 379, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 3006808047], + [519, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2020907649], + [536, 7, 1166, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `filter_previous_destination_owned_template_leading_comments` is too high. [8/7]", 2076094754], + [536, 7, 1166, "Metrics/MethodLength: Method has too many lines. [15/10]", 2076094754], + [536, 71, 13, "Lint/UnusedMethodArgument: Unused method argument - `template_node`.", 1616609802], + [587, 7, 973, "Metrics/MethodLength: Method has too many lines. [15/10]", 1892360110], + [587, 60, 172, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2784840176], + [588, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 169966263], + [614, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087656651], + [627, 7, 873, "Metrics/AbcSize: Assignment Branch Condition size for `previous_template_gap_already_precedes_leading_comments?` is too high. [<5, 19, 11> 22.52/17]", 268778340], + [627, 7, 873, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `previous_template_gap_already_precedes_leading_comments?` is too high. [9/7]", 268778340], + [627, 7, 873, "Metrics/MethodLength: Method has too many lines. [13/10]", 268778340], + [627, 7, 873, "Metrics/PerceivedComplexity: Perceived complexity for `previous_template_gap_already_precedes_leading_comments?` is too high. [9/8]", 268778340], + [636, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 618947799], + [696, 7, 457, "Metrics/MethodLength: Method has too many lines. [11/10]", 349820622], + [724, 7, 758, "Metrics/AbcSize: Assignment Branch Condition size for `partial_same_line_node?` is too high. [<8, 31, 5> 32.4/17]", 1768803955], + [775, 7, 597, "Metrics/MethodLength: Method has too many lines. [12/10]", 2742538822], + [775, 40, 67, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 725821220], + [792, 7, 552, "Metrics/MethodLength: Method has too many lines. [12/10]", 4255654885], + [815, 7, 845, "Metrics/MethodLength: Method has too many lines. [13/10]", 3468050888], + [846, 7, 1097, "Metrics/AbcSize: Assignment Branch Condition size for `filter_emitted_template_leading_comments` is too high. [<6, 18, 3> 19.21/17]", 2091395187], + [846, 7, 1097, "Metrics/MethodLength: Method has too many lines. [17/10]", 2091395187], + [882, 7, 822, "Metrics/MethodLength: Method has too many lines. [13/10]", 3499946440], + [899, 7, 1359, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_matched_template_leading_prefix` is too high. [<7, 22, 10> 25.16/17]", 3976364089], + [899, 7, 1359, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collapse_matched_template_leading_prefix` is too high. [9/7]", 3976364089], + [899, 7, 1359, "Metrics/MethodLength: Method has too many lines. [21/10]", 3976364089], + [899, 7, 1359, "Metrics/PerceivedComplexity: Perceived complexity for `collapse_matched_template_leading_prefix` is too high. [9/8]", 3976364089], + [943, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 3703011298], + [947, 7, 746, "Metrics/MethodLength: Method has too many lines. [17/10]", 3532927627] + ], + "lib/prism/merge/partial_template_merger.rb:2303997532": [ + [14, 7, 826, "Metrics/MethodLength: Method has too many lines. [14/10]", 713706122], + [14, 21, 329, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [12/5]", 2768355468], + [55, 7, 487, "Metrics/MethodLength: Method has too many lines. [11/10]", 447766477], + [75, 7, 520, "Metrics/AbcSize: Assignment Branch Condition size for `node_to_text` is too high. [<1, 19, 6> 19.95/17]", 1593952791], + [84, 46, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] + ], + "lib/prism/merge/recursive_merge_policy.rb:4204303290": [ + [5, 5, 26, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::RecursiveMergePolicy`.", 1329613257], + [12, 7, 1132, "Metrics/AbcSize: Assignment Branch Condition size for `should_merge?` is too high. [<4, 25, 15> 29.43/17]", 4123619949], + [12, 7, 1132, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `should_merge?` is too high. [14/7]", 4123619949], + [12, 7, 1132, "Metrics/MethodLength: Method has too many lines. [20/10]", 4123619949], + [12, 7, 1132, "Metrics/PerceivedComplexity: Perceived complexity for `should_merge?` is too high. [13/8]", 4123619949], + [47, 7, 398, "Metrics/MethodLength: Method has too many lines. [18/10]", 385694759] + ], + "lib/prism/merge/recursive_node_body_merger.rb:1132596837": [ + [5, 5, 29, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::RecursiveNodeBodyMerger`.", 3703318859], + [5, 5, 18505, "Metrics/ClassLength: Class has too many lines. [333/100]", 3196902308], + [12, 7, 12756, "Metrics/AbcSize: Assignment Branch Condition size for `merge` is too high. [<78, 262, 90> 287.8/17]", 1909933362], + [12, 7, 12756, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge` is too high. [70/7]", 1909933362], + [12, 7, 12756, "Metrics/MethodLength: Method has too many lines. [215/10]", 1909933362], + [12, 7, 12756, "Metrics/PerceivedComplexity: Perceived complexity for `merge` is too high. [75/8]", 1909933362], + [27, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 929875726], + [62, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 518709914], + [67, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 366676207], + [266, 7, 1221, "Metrics/AbcSize: Assignment Branch Condition size for `remap_inner_unresolved_review_state!` is too high. [<8, 22, 6> 24.17/17]", 3210674006], + [266, 7, 1221, "Metrics/MethodLength: Method has too many lines. [21/10]", 3210674006], + [293, 7, 1121, "Metrics/AbcSize: Assignment Branch Condition size for `remap_inner_unresolved_case` is too high. [<6, 24, 0> 24.74/17]", 3468635549], + [293, 7, 1121, "Metrics/MethodLength: Method has too many lines. [15/10]", 3468635549], + [376, 7, 826, "Metrics/AbcSize: Assignment Branch Condition size for `emit_trailing_layout_gap_lines` is too high. [<6, 18, 9> 21/17]", 2158299973], + [376, 7, 826, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_trailing_layout_gap_lines` is too high. [8/7]", 2158299973], + [376, 7, 826, "Metrics/MethodLength: Method has too many lines. [17/10]", 2158299973], + [376, 7, 826, "Metrics/PerceivedComplexity: Perceived complexity for `emit_trailing_layout_gap_lines` is too high. [9/8]", 2158299973] + ], + "lib/prism/merge/ruby_doc_surface_analyzer.rb:3389668357": [ + [7, 5, 7100, "Metrics/ClassLength: Class has too many lines. [162/100]", 77379508], + [50, 7, 1408, "Metrics/AbcSize: Assignment Branch Condition size for `build_doc_comment_surface` is too high. [<10, 25, 5> 27.39/17]", 2414553577], + [50, 7, 1408, "Metrics/MethodLength: Method has too many lines. [28/10]", 2414553577], + [91, 7, 1256, "Metrics/AbcSize: Assignment Branch Condition size for `build_example_surface` is too high. [<4, 23, 2> 23.43/17]", 4074178203], + [91, 7, 1256, "Metrics/MethodLength: Method has too many lines. [25/10]", 4074178203], + [131, 7, 555, "Metrics/AbcSize: Assignment Branch Condition size for `doc_comment_entries` is too high. [<8, 18, 6> 20.59/17]", 358090808] + ], + "lib/prism/merge/scaffold_chunk_remover.rb:174131146": [ + [34, 7, 1958, "Metrics/AbcSize: Assignment Branch Condition size for `call` is too high. [<21, 60, 22> 67.27/17]", 1919383090], + [34, 7, 1958, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `call` is too high. [21/7]", 1919383090], + [34, 7, 1958, "Metrics/MethodLength: Method has too many lines. [37/10]", 1919383090], + [34, 7, 1958, "Metrics/PerceivedComplexity: Perceived complexity for `call` is too high. [21/8]", 1919383090] + ], + "lib/prism/merge/smart_merger.rb:3814529034": [ + [48, 5, 42561, "Metrics/ClassLength: Class has too many lines. [603/100]", 3828655257], + [96, 7, 2032, "Metrics/MethodLength: Method has too many lines. [24/10]", 4118525224], + [96, 21, 595, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [18/5]", 1562155096], + [171, 7, 1325, "Metrics/AbcSize: Assignment Branch Condition size for `merge_with_debug` is too high. [<3, 24, 19> 30.76/17]", 605983530], + [171, 7, 1325, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_with_debug` is too high. [20/7]", 605983530], + [171, 7, 1325, "Metrics/MethodLength: Method has too many lines. [27/10]", 605983530], + [171, 7, 1325, "Metrics/PerceivedComplexity: Perceived complexity for `merge_with_debug` is too high. [20/8]", 605983530], + [310, 7, 664, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `frozen_node?` is too high. [8/7]", 2577924190], + [352, 7, 508, "Metrics/MethodLength: Method has too many lines. [13/10]", 1368018500], + [442, 7, 1155, "Metrics/AbcSize: Assignment Branch Condition size for `build_signature_map` is too high. [<11, 16, 8> 21/17]", 3956321005], + [442, 7, 1155, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_signature_map` is too high. [8/7]", 3956321005], + [442, 7, 1155, "Metrics/MethodLength: Method has too many lines. [16/10]", 3956321005], + [483, 7, 2731, "Metrics/AbcSize: Assignment Branch Condition size for `preference_for_node` is too high. [<7, 22, 20> 30.55/17]", 1325207598], + [483, 7, 2731, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preference_for_node` is too high. [21/7]", 1325207598], + [483, 7, 2731, "Metrics/MethodLength: Method has too many lines. [25/10]", 1325207598], + [483, 7, 2731, "Metrics/PerceivedComplexity: Perceived complexity for `preference_for_node` is too high. [21/8]", 1325207598], + [659, 32, 73, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2261515417], + [670, 35, 79, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1350141395], + [681, 42, 63, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2615605084], + [852, 35, 213, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 720547751] + ], + "lib/prism/merge/source_line_lookup.rb:1098479933": [ + [5, 5, 23, "Style/Documentation: Missing top-level documentation comment for `module Prism::Merge::SourceLineLookup`.", 2168434862] + ], + "lib/prism/merge/top_level_merge_runner.rb:3009983916": [ + [38, 5, 59959, "Metrics/ClassLength: Class has too many lines. [1124/100]", 2689943302], + [66, 7, 5196, "Metrics/AbcSize: Assignment Branch Condition size for `merge` is too high. [<22, 68, 9> 72.03/17]", 176450457], + [66, 7, 5196, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge` is too high. [9/7]", 176450457], + [66, 7, 5196, "Metrics/MethodLength: Method has too many lines. [75/10]", 176450457], + [66, 7, 5196, "Metrics/PerceivedComplexity: Perceived complexity for `merge` is too high. [10/8]", 176450457], + [162, 7, 2023, "Metrics/AbcSize: Assignment Branch Condition size for `start_runtime_session!` is too high. [<5, 48, 1> 48.27/17]", 2943824289], + [162, 7, 2023, "Metrics/MethodLength: Method has too many lines. [44/10]", 2943824289], + [212, 7, 1765, "Metrics/AbcSize: Assignment Branch Condition size for `complete_runtime_session!` is too high. [<2, 21, 9> 22.93/17]", 2968004900], + [212, 7, 1765, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `complete_runtime_session!` is too high. [8/7]", 2968004900], + [212, 7, 1765, "Metrics/MethodLength: Method has too many lines. [36/10]", 2968004900], + [212, 7, 1765, "Metrics/PerceivedComplexity: Perceived complexity for `complete_runtime_session!` is too high. [10/8]", 2968004900], + [229, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3907470478], + [254, 7, 584, "Metrics/MethodLength: Method has too many lines. [14/10]", 1615217394], + [272, 7, 589, "Metrics/AbcSize: Assignment Branch Condition size for `runtime_document_surface` is too high. [<1, 19, 1> 19.05/17]", 1835005228], + [272, 7, 589, "Metrics/MethodLength: Method has too many lines. [12/10]", 1835005228], + [288, 7, 3192, "Metrics/AbcSize: Assignment Branch Condition size for `register_discovered_surface_operations!` is too high. [<12, 60, 9> 61.85/17]", 3059111269], + [288, 7, 3192, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `register_discovered_surface_operations!` is too high. [10/7]", 3059111269], + [288, 7, 3192, "Metrics/MethodLength: Method has too many lines. [65/10]", 3059111269], + [288, 7, 3192, "Metrics/PerceivedComplexity: Perceived complexity for `register_discovered_surface_operations!` is too high. [10/8]", 3059111269], + [297, 9, 2237, "Metrics/BlockLength: Block has too many lines. [44/25]", 809738986], + [399, 7, 1643, "Metrics/AbcSize: Assignment Branch Condition size for `execute_child_operations!` is too high. [<5, 33, 5> 33.75/17]", 1049305146], + [399, 7, 1643, "Metrics/MethodLength: Method has too many lines. [36/10]", 1049305146], + [400, 9, 1570, "Metrics/BlockLength: Block has too many lines. [29/25]", 1597985402], + [404, 9, 31, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 3553388257], + [448, 7, 631, "Metrics/MethodLength: Method has too many lines. [15/10]", 1652116821], + [466, 7, 1306, "Metrics/AbcSize: Assignment Branch Condition size for `merge_runtime_surface` is too high. [<2, 18, 4> 18.55/17]", 1347264970], + [466, 7, 1306, "Metrics/MethodLength: Method has too many lines. [29/10]", 1347264970], + [500, 7, 1393, "Metrics/AbcSize: Assignment Branch Condition size for `merge_runtime_doc_comment_surface` is too high. [<4, 23, 5> 23.87/17]", 3745645404], + [500, 7, 1393, "Metrics/MethodLength: Method has too many lines. [29/10]", 3745645404], + [534, 7, 826, "Metrics/AbcSize: Assignment Branch Condition size for `apply_runtime_doc_children` is too high. [<5, 24, 7> 25.5/17]", 1386022126], + [534, 7, 826, "Metrics/MethodLength: Method has too many lines. [15/10]", 1386022126], + [542, 16, 27, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 1443167664], + [546, 9, 24, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 644874689], + [554, 7, 1438, "Metrics/AbcSize: Assignment Branch Condition size for `apply_runtime_example_child` is too high. [<10, 44, 10> 46.22/17]", 2594444962], + [554, 7, 1438, "Metrics/MethodLength: Method has too many lines. [25/10]", 2594444962], + [556, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3651736697], + [599, 7, 518, "Metrics/MethodLength: Method has too many lines. [11/10]", 523939757], + [623, 7, 753, "Metrics/MethodLength: Method has too many lines. [15/10]", 3406860674], + [683, 7, 1514, "Metrics/AbcSize: Assignment Branch Condition size for `compute_similarity_pairs` is too high. [<17, 42, 11> 46.63/17]", 103276977], + [683, 7, 1514, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_similarity_pairs` is too high. [11/7]", 103276977], + [683, 7, 1514, "Metrics/MethodLength: Method has too many lines. [27/10]", 103276977], + [683, 7, 1514, "Metrics/PerceivedComplexity: Perceived complexity for `compute_similarity_pairs` is too high. [11/8]", 103276977], + [735, 7, 545, "Metrics/MethodLength: Method has too many lines. [12/10]", 398381329], + [763, 7, 586, "Metrics/MethodLength: Method has too many lines. [11/10]", 1559638959], + [843, 7, 640, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_nested_signatures` is too high. [10/7]", 3947424552], + [843, 7, 640, "Metrics/MethodLength: Method has too many lines. [13/10]", 3947424552], + [843, 7, 640, "Metrics/PerceivedComplexity: Perceived complexity for `collect_nested_signatures` is too high. [10/8]", 3947424552], + [845, 12, 9, "Style/NumericPredicate: Use `depth.positive?` instead of `depth > 0`.", 2180768870], + [869, 7, 1297, "Metrics/AbcSize: Assignment Branch Condition size for `nested_statement_children` is too high. [<2, 50, 17> 52.85/17]", 3818826989], + [869, 7, 1297, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `nested_statement_children` is too high. [17/7]", 3818826989], + [869, 7, 1297, "Metrics/MethodLength: Method has too many lines. [19/10]", 3818826989], + [869, 7, 1297, "Metrics/PerceivedComplexity: Perceived complexity for `nested_statement_children` is too high. [15/8]", 3818826989], + [877, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 3315454453], + [882, 93, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [883, 89, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [884, 93, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [899, 7, 754, "Metrics/AbcSize: Assignment Branch Condition size for `prepare_comment_augmenters!` is too high. [<1, 19, 0> 19.03/17]", 311364642], + [899, 7, 754, "Metrics/MethodLength: Method has too many lines. [12/10]", 311364642], + [1003, 7, 1707, "Metrics/AbcSize: Assignment Branch Condition size for `retained_owner_plan` is too high. [<16, 40, 12> 44.72/17]", 375532236], + [1003, 7, 1707, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `retained_owner_plan` is too high. [13/7]", 375532236], + [1003, 7, 1707, "Metrics/MethodLength: Method has too many lines. [33/10]", 375532236], + [1003, 7, 1707, "Metrics/PerceivedComplexity: Perceived complexity for `retained_owner_plan` is too high. [13/8]", 375532236], + [1003, 55, 17, "Lint/UnusedMethodArgument: Unused method argument - `dest_by_signature`.", 379778684], + [1024, 9, 250, "Style/CombinableLoops: Combine this loop with the previous loop.", 3315024098], + [1031, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 180543822], + [1048, 7, 4375, "Metrics/AbcSize: Assignment Branch Condition size for `process_dest_node` is too high. [<23, 66, 14> 71.28/17]", 329713352], + [1048, 7, 4375, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `process_dest_node` is too high. [11/7]", 329713352], + [1048, 7, 4375, "Metrics/MethodLength: Method has too many lines. [80/10]", 329713352], + [1048, 7, 4375, "Metrics/PerceivedComplexity: Perceived complexity for `process_dest_node` is too high. [15/8]", 329713352], + [1048, 28, 279, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 2321512478], + [1153, 7, 757, "Metrics/MethodLength: Method has too many lines. [19/10]", 3306507447], + [1191, 44, 189, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 215272527], + [1222, 7, 888, "Metrics/MethodLength: Method has too many lines. [17/10]", 2638200013], + [1222, 31, 189, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 50070642], + [1244, 7, 719, "Metrics/MethodLength: Method has too many lines. [13/10]", 530865591], + [1262, 7, 1393, "Metrics/AbcSize: Assignment Branch Condition size for `process_non_recursive_match` is too high. [<10, 23, 7> 26.04/17]", 324106576], + [1262, 7, 1393, "Metrics/MethodLength: Method has too many lines. [29/10]", 324106576], + [1296, 7, 1106, "Metrics/AbcSize: Assignment Branch Condition size for `process_unresolved_non_recursive_match` is too high. [<3, 19, 3> 19.47/17]", 1476652897], + [1296, 7, 1106, "Metrics/MethodLength: Method has too many lines. [26/10]", 1476652897], + [1337, 7, 1935, "Metrics/AbcSize: Assignment Branch Condition size for `record_unresolved_match_case!` is too high. [<4, 26, 3> 26.48/17]", 456739474], + [1337, 7, 1935, "Metrics/MethodLength: Method has too many lines. [37/10]", 456739474], + [1422, 7, 1067, "Metrics/AbcSize: Assignment Branch Condition size for `advance_last_output_dest_line` is too high. [<6, 19, 6> 20.81/17]", 331135500], + [1422, 7, 1067, "Metrics/MethodLength: Method has too many lines. [11/10]", 331135500], + [1422, 40, 181, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2038823112] + ], + "lib/prism/merge/wrapper_comment_support.rb:3046735928": [ + [5, 5, 27, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::WrapperCommentSupport`.", 2211657316], + [5, 5, 17765, "Metrics/ClassLength: Class has too many lines. [358/100]", 370100972], + [14, 7, 3072, "Metrics/AbcSize: Assignment Branch Condition size for `filtered_leading_comments_for` is too high. [<26, 58, 27> 69.06/17]", 934788024], + [14, 7, 3072, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `filtered_leading_comments_for` is too high. [24/7]", 934788024], + [14, 7, 3072, "Metrics/MethodLength: Method has too many lines. [48/10]", 934788024], + [14, 7, 3072, "Metrics/PerceivedComplexity: Perceived complexity for `filtered_leading_comments_for` is too high. [27/8]", 934788024], + [24, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 366676207], + [65, 11, 68, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 2360366291], + [74, 73, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [95, 7, 1446, "Metrics/AbcSize: Assignment Branch Condition size for `emit_leading_comments` is too high. [<8, 16, 13> 22.11/17]", 86315238], + [95, 7, 1446, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_leading_comments` is too high. [9/7]", 86315238], + [95, 7, 1446, "Metrics/MethodLength: Method has too many lines. [31/10]", 86315238], + [95, 7, 1446, "Metrics/PerceivedComplexity: Perceived complexity for `emit_leading_comments` is too high. [11/8]", 86315238], + [95, 32, 73, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2261515417], + [98, 9, 1234, "Metrics/BlockLength: Block has too many lines. [28/25]", 357181412], + [134, 7, 953, "Metrics/MethodLength: Method has too many lines. [19/10]", 3183807785], + [134, 35, 79, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1350141395], + [162, 7, 1228, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_comment_region` is too high. [10/7]", 2201645681], + [162, 7, 1228, "Metrics/MethodLength: Method has too many lines. [31/10]", 2201645681], + [162, 7, 1228, "Metrics/PerceivedComplexity: Perceived complexity for `emit_comment_region` is too high. [11/8]", 2201645681], + [162, 30, 67, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 191987245], + [163, 29, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [202, 7, 777, "Metrics/MethodLength: Method has too many lines. [18/10]", 4073303022], + [202, 30, 68, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3851519454], + [208, 9, 8, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 359222635], + [226, 7, 1080, "Metrics/MethodLength: Method has too many lines. [27/10]", 296167644], + [226, 42, 63, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2615605084], + [260, 7, 689, "Metrics/AbcSize: Assignment Branch Condition size for `append_inline_comment_entries` is too high. [<7, 19, 8> 21.77/17]", 1575903523], + [260, 7, 689, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `append_inline_comment_entries` is too high. [8/7]", 1575903523], + [260, 7, 689, "Metrics/MethodLength: Method has too many lines. [16/10]", 1575903523], + [260, 7, 689, "Metrics/PerceivedComplexity: Perceived complexity for `append_inline_comment_entries` is too high. [9/8]", 1575903523], + [288, 7, 607, "Metrics/AbcSize: Assignment Branch Condition size for `line_inline_comment_entries` is too high. [<3, 18, 7> 19.54/17]", 2131701672], + [288, 7, 607, "Metrics/MethodLength: Method has too many lines. [12/10]", 2131701672], + [338, 7, 1023, "Metrics/MethodLength: Method has too many lines. [19/10]", 2409125040], + [363, 7, 854, "Metrics/AbcSize: Assignment Branch Condition size for `runtime_doc_comment_operation_for` is too high. [<4, 24, 13> 27.59/17]", 1109173425], + [363, 7, 854, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `runtime_doc_comment_operation_for` is too high. [10/7]", 1109173425], + [363, 7, 854, "Metrics/MethodLength: Method has too many lines. [11/10]", 1109173425], + [363, 7, 854, "Metrics/PerceivedComplexity: Perceived complexity for `runtime_doc_comment_operation_for` is too high. [10/8]", 1109173425], + [373, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 1843406524], + [381, 7, 755, "Metrics/AbcSize: Assignment Branch Condition size for `build_runtime_leading_region` is too high. [<5, 18, 4> 19.1/17]", 3130034424], + [381, 7, 755, "Metrics/MethodLength: Method has too many lines. [14/10]", 3130034424], + [411, 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:2052428369": [ + [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ], + "spec/fixtures/reproducible/04_gemspec_duplication/destination.rb:971498360": [ + [25, 1, 8292, "Metrics/BlockLength: Block has too many lines. [110/25]", 1251580584], + [32, 121, 317, "Layout/LineLength: Line is too long. [437/120]", 1870252497], + [184, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4147388508], + [199, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [200, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [207, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ], + "spec/fixtures/reproducible/04_gemspec_duplication/template.rb:1741222365": [ + [19, 1, 4121, "Metrics/BlockLength: Block has too many lines. [71/25]", 547880907], + [26, 121, 317, "Layout/LineLength: Line is too long. [437/120]", 1870252497] + ], + "spec/fixtures/reproducible/05_gemspec_orphan_duplication/destination.rb:2573186797": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177634] + ], + "spec/fixtures/reproducible/05_gemspec_orphan_duplication/result.rb:2573186797": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177634] + ], + "spec/fixtures/reproducible/05_gemspec_orphan_duplication/template.rb:1825302441": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177634] + ], + "spec/fixtures_integration_spec.rb:4053275636": [ + [7, 1, 21570, "Metrics/BlockLength: Block has too many lines. [483/25]", 416378449], + [66, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1448895712], + [72, 3, 1302, "Metrics/BlockLength: Block has too many lines. [30/25]", 2973641144], + [106, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [113, 3, 1679, "Metrics/BlockLength: Block has too many lines. [38/25]", 2954972744], + [373, 3, 7512, "Metrics/BlockLength: Block has too many lines. [149/25]", 2278210376] + ], + "spec/reproducible_merge_spec.rb:2334824632": [ + [6, 1, 2420, "Metrics/BlockLength: Block has too many lines. [50/25]", 2207509489], + [39, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1416718429] + ] +} diff --git a/gems/prism-merge/Gemfile b/gems/prism-merge/Gemfile index b5e6027e0..904597caf 100644 --- a/gems/prism-merge/Gemfile +++ b/gems/prism-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source "https://gem.coop" +source 'https://gem.coop' git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,57 +19,53 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ["~> 1.0", ">= 1.0.8"] -gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ['~> 1.0', '>= 1.0.8'] +gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ruby-merge ] -direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") +direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? if direct_sibling_gems.any? && - (direct_sibling_local || - ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) - direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") - direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) begin nomono_activation_requirements = nomono_requirements - nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) if File.file?(nomono_lockfile) nomono_locked_spec = Bundler::LockfileParser - .new(Bundler.read_file(nomono_lockfile)) - .specs - .find { |spec| spec.name == "nomono" } + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } nomono_locked = nomono_locked_spec && - Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) - if nomono_locked - nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] - end - end - Kernel.send(:gem, "nomono", *nomono_activation_requirements) - require "nomono/bundler" - if direct_sibling_templating && !direct_sibling_local - ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local eval_nomono_gems( gems: direct_sibling_gems, - prefix: "STRUCTUREDMERGE", - path_env: "STRUCTUREDMERGE_DEV", - root: ["src", "my", "structuredmerge"] + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] ) rescue LoadError - warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' ensure if direct_sibling_templating && !direct_sibling_local if direct_sibling_dev_was_set - ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original else - ENV.delete("STRUCTUREDMERGE_DEV") + ENV.delete('STRUCTUREDMERGE_DEV') end end end @@ -293,25 +289,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging -eval_gemfile "gemfiles/modular/debug.gemfile" +eval_gemfile 'gemfiles/modular/debug.gemfile' # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile "gemfiles/modular/coverage.gemfile" +eval_gemfile 'gemfiles/modular/coverage.gemfile' # Linting -eval_gemfile "gemfiles/modular/style.gemfile" +eval_gemfile 'gemfiles/modular/style.gemfile' # Documentation -eval_gemfile "gemfiles/modular/documentation.gemfile" +eval_gemfile 'gemfiles/modular/documentation.gemfile' # Optional -eval_gemfile "gemfiles/modular/optional.gemfile" +eval_gemfile 'gemfiles/modular/optional.gemfile' ### Std Lib Extracted Gems -eval_gemfile "gemfiles/modular/x_std_libs.gemfile" +eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' # See unlocked_deps appraisal for more details on irb inclusion -gem "irb", "~> 1.17" # ruby >= 2.7 +gem 'irb', '~> 1.17' # ruby >= 2.7 diff --git a/gems/prism-merge/Gemfile.lock b/gems/prism-merge/Gemfile.lock index 858d63811..049018dd0 100644 --- a/gems/prism-merge/Gemfile.lock +++ b/gems/prism-merge/Gemfile.lock @@ -17,280 +17,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -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.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -302,6 +35,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -310,12 +48,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -324,6 +56,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -379,6 +112,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -397,7 +139,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -537,23 +278,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -587,11 +330,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +381,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -687,59 +408,37 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0.0) ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +451,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +478,11 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +490,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -834,15 +521,14 @@ 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,19 +542,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +557,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/prism-merge/Rakefile b/gems/prism-merge/Rakefile index 3ceda1211..0413b973d 100644 --- a/gems/prism-merge/Rakefile +++ b/gems/prism-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require "kettle/drift" + require 'kettle/drift' Kettle::Drift.install_tasks rescue LoadError - desc("(stub) kettle:drift:check is unavailable") - task("kettle:drift:check") do + desc('(stub) kettle:drift:check is unavailable') + task('kettle:drift:check') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:update is unavailable") - task("kettle:drift:update") do + desc('(stub) kettle:drift:update is unavailable') + task('kettle:drift:update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:force_update is unavailable") - task("kettle:drift:force_update") do + desc('(stub) kettle:drift:force_update is unavailable') + task('kettle:drift:force_update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift is unavailable") - task("kettle:drift" => "kettle:drift:update") + desc('(stub) kettle:drift is unavailable') + task('kettle:drift' => 'kettle:drift:update') end ### TEMPLATING TASKS diff --git a/gems/prism-merge/bin/yard b/gems/prism-merge/bin/yard index a7e8b6eed..5d516ad6f 100755 --- a/gems/prism-merge/bin/yard +++ b/gems/prism-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec("bundle", "exec", "rake", "yard") +exec('bundle', 'exec', 'rake', 'yard') diff --git a/gems/prism-merge/lib/prism/merge/version.rb b/gems/prism-merge/lib/prism/merge/version.rb index c5d5bca42..29398c390 100644 --- a/gems/prism-merge/lib/prism/merge/version.rb +++ b/gems/prism-merge/lib/prism/merge/version.rb @@ -3,7 +3,7 @@ module Prism module Merge module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end From 6837cff20481b7bb25dc80d34161e7327bbee2b3 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:43:49 -0600 Subject: [PATCH 212/347] Match positional blocks by content identity --- .../lib/ast/merge/file_aligner_base.rb | 19 ++++++ .../spec/ast/merge/file_aligner_base_spec.rb | 60 +++++++++++++++++++ 2 files changed, 79 insertions(+) diff --git a/gems/ast-merge/lib/ast/merge/file_aligner_base.rb b/gems/ast-merge/lib/ast/merge/file_aligner_base.rb index 4d5ced880..f77d2f744 100644 --- a/gems/ast-merge/lib/ast/merge/file_aligner_base.rb +++ b/gems/ast-merge/lib/ast/merge/file_aligner_base.rb @@ -42,6 +42,7 @@ def align template_indices.zip(dest_indices).each do |t_idx, d_idx| next unless t_idx && d_idx + next if matched_template.include?(t_idx) || matched_dest.include?(d_idx) alignment << build_match_entry( signature: sig, @@ -128,12 +129,30 @@ def build_signature_map(statements, analysis) statements.each_with_index do |statement, idx| signature = signature_for(analysis, idx) map[signature] << idx if signature + content_signature = content_identity_signature(statement) + map[content_signature] << idx if content_signature && content_signature != signature add_signature_aliases(map, statement, idx, analysis) end map end + def content_identity_signature(statement) + content = statement_value(statement, :normalized_content) || statement_value(statement, 'normalized_content') + content = content.to_s + return if content.empty? + + [:content_identity, content] + end + + def statement_value(statement, key) + if statement.respond_to?(key) + statement.public_send(key) + elsif statement.respond_to?(:[]) + statement[key] + end + end + def build_match_entry(signature:, template_index:, dest_index:, template_statement:, dest_statement:) { :type => :match, diff --git a/gems/ast-merge/spec/ast/merge/file_aligner_base_spec.rb b/gems/ast-merge/spec/ast/merge/file_aligner_base_spec.rb index ad352419f..6e4c83a22 100644 --- a/gems/ast-merge/spec/ast/merge/file_aligner_base_spec.rb +++ b/gems/ast-merge/spec/ast/merge/file_aligner_base_spec.rb @@ -14,6 +14,15 @@ def generate_signature(node) node[:signature] end end) + stub_const('FixtureAnalysis', Struct.new(:statements) do + def signature_at(index) + statements.fetch(index).fetch(:primary_signature) + end + + def generate_signature(node) + node.fetch(:primary_signature) + end + end) stub_const('TestAligner', Class.new(described_class) do attr_reader :logged_alignment @@ -131,6 +140,57 @@ def add_signature_aliases(map, statement, index, _analysis) expect(result.count { |entry| entry[:type] == :template_only }).to eq(1) end + it 'does not duplicate matches through content aliases after primary signatures match' do + template_statement = { name: :template, normalized_content: 'same' } + dest_statement = { name: :dest, normalized_content: 'same' } + template_analysis = Analysis.new([template_statement], { 0 => [:primary] }) + dest_analysis = Analysis.new([dest_statement], { 0 => [:primary] }) + + result = BaseAligner.new(template_analysis, dest_analysis).align + + expect(result).to eq([ + { + type: :match, + template_index: 0, + dest_index: 0, + signature: [:primary], + template_node: template_statement, + dest_node: dest_statement + } + ]) + end + + it 'matches identical content when opaque primary signatures differ by source position' do + fixture_path = Pathname(__dir__).join( + '..', + '..', + '..', + '..', + '..', + '..', + 'fixtures', + 'diagnostics', + 'slice-904-content-identity-positional-signature', + 'content-identity-positional-signature.json' + ).expand_path + fixture = Ast::Merge.normalize_value(JSON.parse(fixture_path.read)) + template_analysis = FixtureAnalysis.new(fixture.dig(:matching, :template_nodes)) + dest_analysis = FixtureAnalysis.new(fixture.dig(:matching, :destination_nodes)) + + result = BaseAligner.new(template_analysis, dest_analysis).align + + expect(result.count { |entry| entry[:type] == :match }).to eq(fixture.dig(:expected, :match_count)) + expect(result.count { |entry| entry[:type] == :template_only }).to eq( + fixture.dig(:expected, :template_only_count) + ) + expect(result.count { |entry| entry[:type] == :dest_only }).to eq(fixture.dig(:expected, :dest_only_count)) + match = result.find { |entry| entry[:type] == :match } + expected_signature = fixture.dig(:expected, :first_match_signature) + expect(match[:signature]).to eq([expected_signature.first.to_sym, *expected_signature.drop(1)]) + expect(match[:template_index]).to eq(fixture.dig(:expected, :first_template_index)) + expect(match[:dest_index]).to eq(fixture.dig(:expected, :first_dest_index)) + end + it 'supports optional fuzzy refinement for otherwise unmatched statements' do template_statement = { name: :template_table } dest_statement = { name: :dest_table } From 85d88b26a28d137685cfc06372775cc88dfa3720 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 22:48:01 -0600 Subject: [PATCH 213/347] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20deps=20path=20norm?= =?UTF-8?q?alizing?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/prism-merge/Gemfile.lock | 345 ++++++++++++++++++++++++++++++++-- 1 file changed, 334 insertions(+), 11 deletions(-) diff --git a/gems/prism-merge/Gemfile.lock b/gems/prism-merge/Gemfile.lock index 049018dd0..09fa20d97 100644 --- a/gems/prism-merge/Gemfile.lock +++ b/gems/prism-merge/Gemfile.lock @@ -17,13 +17,264 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: ruby-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -35,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -48,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -111,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -139,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -278,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -330,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -408,30 +687,52 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0.0) ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -439,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -451,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -478,11 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -490,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -521,6 +835,8 @@ 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -529,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -542,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 93fda6e116e8ec10b666fceaf386db79ff4970f7 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 23:04:17 -0600 Subject: [PATCH 214/347] =?UTF-8?q?=F0=9F=93=9D=20Document=20nomono=20acti?= =?UTF-8?q?vation=20bootstrap?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/kettle-jem/CHANGELOG.md | 2 ++ .../gemfiles/modular/coverage_local.gemfile.example | 8 ++++++++ .../gemfiles/modular/documentation_local.gemfile.example | 8 ++++++++ .../gemfiles/modular/style_local.gemfile.example | 8 ++++++++ .../gemfiles/modular/templating_local.gemfile.example | 8 ++++++++ 5 files changed, 34 insertions(+) diff --git a/gems/kettle-jem/CHANGELOG.md b/gems/kettle-jem/CHANGELOG.md index 533918fb3..afa2270d7 100644 --- a/gems/kettle-jem/CHANGELOG.md +++ b/gems/kettle-jem/CHANGELOG.md @@ -38,6 +38,8 @@ Please file a bug if you notice a violation of semantic versioning. - Added the repo-local `bin/kettle-jem-workflow-pins` maintenance script to update the GitHub Actions SHA pin index used by generated workflow templates via `kettle-gha-sha-pins`. +- Generated local Gemfile templates now document why `nomono` is explicitly + activated before requiring `nomono/bundler`. - `kettle-jem install` now generates a curated `bin/appraisal` binstub for the `appraisal2` executable. - Added a default-off `readme.badges.fossa` template option for managed FOSSA 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 be2d34212..a055ba51e 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 @@ -3,6 +3,14 @@ # Local path overrides for development. # Loaded by the associated non-local gemfile when KETTLE_RB_DEV != "false". +# Bootstrapping nomono here cannot rely on a plain `gem "nomono", ...` line. +# Bundler records that dependency during Gemfile evaluation, but it does not +# activate that exact version before the immediate `require "nomono/bundler"`. +# If multiple compatible nomono versions are installed, RubyGems may activate +# the newest installed version while Gemfile.lock pins an older compatible one; +# Bundler then aborts with "already activated nomono X, but your Gemfile +# requires nomono Y". Prefer the locked compatible version when present, then +# activate it explicitly before requiring the Bundler DSL extension used below. nomono_activation_requirements = ["~> 1.0", ">= 1.0.8"] nomono_lockfile = File.expand_path("../../Gemfile.lock", __dir__) if File.file?(nomono_lockfile) diff --git a/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/documentation_local.gemfile.example b/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/documentation_local.gemfile.example index bcad7e81b..12580dc38 100644 --- a/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/documentation_local.gemfile.example +++ b/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/documentation_local.gemfile.example @@ -3,6 +3,14 @@ # Local path overrides for development. # Loaded by the associated non-local gemfile when GALTZO_FLOSS_DEV != "false". +# Bootstrapping nomono here cannot rely on a plain `gem "nomono", ...` line. +# Bundler records that dependency during Gemfile evaluation, but it does not +# activate that exact version before the immediate `require "nomono/bundler"`. +# If multiple compatible nomono versions are installed, RubyGems may activate +# the newest installed version while Gemfile.lock pins an older compatible one; +# Bundler then aborts with "already activated nomono X, but your Gemfile +# requires nomono Y". Prefer the locked compatible version when present, then +# activate it explicitly before requiring the Bundler DSL extension used below. nomono_activation_requirements = ["~> 1.0", ">= 1.0.8"] nomono_lockfile = File.expand_path("../../Gemfile.lock", __dir__) if File.file?(nomono_lockfile) diff --git a/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/style_local.gemfile.example b/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/style_local.gemfile.example index 87530cc01..2b80e1397 100644 --- a/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/style_local.gemfile.example +++ b/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/style_local.gemfile.example @@ -6,6 +6,14 @@ # Local path overrides for development. # Loaded by the associated non-local gemfile when RUBOCOP_LTS_LOCAL != "false". +# Bootstrapping nomono here cannot rely on a plain `gem "nomono", ...` line. +# Bundler records that dependency during Gemfile evaluation, but it does not +# activate that exact version before the immediate `require "nomono/bundler"`. +# If multiple compatible nomono versions are installed, RubyGems may activate +# the newest installed version while Gemfile.lock pins an older compatible one; +# Bundler then aborts with "already activated nomono X, but your Gemfile +# requires nomono Y". Prefer the locked compatible version when present, then +# activate it explicitly before requiring the Bundler DSL extension used below. nomono_activation_requirements = ["~> 1.0", ">= 1.0.8"] nomono_lockfile = File.expand_path("../../Gemfile.lock", __dir__) if File.file?(nomono_lockfile) 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 9ae70f292..bbf6c8417 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 @@ -4,6 +4,14 @@ # Loaded by the associated non-local gemfile when STRUCTUREDMERGE_DEV or KETTLE_RB_DEV # is not "false". +# Bootstrapping nomono here cannot rely on a plain `gem "nomono", ...` line. +# Bundler records that dependency during Gemfile evaluation, but it does not +# activate that exact version before the immediate `require "nomono/bundler"`. +# If multiple compatible nomono versions are installed, RubyGems may activate +# the newest installed version while Gemfile.lock pins an older compatible one; +# Bundler then aborts with "already activated nomono X, but your Gemfile +# requires nomono Y". Prefer the locked compatible version when present, then +# activate it explicitly before requiring the Bundler DSL extension used below. nomono_activation_requirements = ["~> 1.0", ">= 1.0.8"] nomono_lockfile = File.expand_path("../../Gemfile.lock", __dir__) if File.file?(nomono_lockfile) From 1cc85df0c92b3c99c31c38c8fbf30198e77c7c53 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sat, 18 Jul 2026 23:17:12 -0600 Subject: [PATCH 215/347] =?UTF-8?q?=E2=9C=A8=20Add=20kettle-jem=20dependen?= =?UTF-8?q?cy=20floor=20updater?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/kettle-jem/CHANGELOG.md | 2 + gems/kettle-jem/bin/kettle-jem-deps-floor | 350 ++++++++++++++++++ gems/kettle-jem/lib/kettle/jem.rb | 4 +- .../kettle/jem/templates/gem.gemspec.example | 4 +- .../gemfiles/modular/coverage.gemfile.example | 2 +- .../modular/documentation.gemfile.example | 6 +- .../modular/erb/r3/v5.0.gemfile.example | 2 +- .../modular/erb/r4/v5.0.gemfile.example | 2 +- .../gemfiles/modular/style.gemfile.example | 6 +- .../spec/bin/kettle_jem_deps_floor_spec.rb | 175 +++++++++ .../kettle-jem/spec/release_packaging_spec.rb | 2 + 11 files changed, 542 insertions(+), 13 deletions(-) create mode 100755 gems/kettle-jem/bin/kettle-jem-deps-floor create mode 100644 gems/kettle-jem/spec/bin/kettle_jem_deps_floor_spec.rb diff --git a/gems/kettle-jem/CHANGELOG.md b/gems/kettle-jem/CHANGELOG.md index afa2270d7..d92efeab4 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. via `kettle-gha-sha-pins`. - Generated local Gemfile templates now document why `nomono` is explicitly activated before requiring `nomono/bundler`. +- Added the repo-local `bin/kettle-jem-deps-floor` maintenance script to scan + dependency-bearing kettle-jem templates and update their dependency floors. - `kettle-jem install` now generates a curated `bin/appraisal` binstub for the `appraisal2` executable. - Added a default-off `readme.badges.fossa` template option for managed FOSSA diff --git a/gems/kettle-jem/bin/kettle-jem-deps-floor b/gems/kettle-jem/bin/kettle-jem-deps-floor new file mode 100755 index 000000000..73b744c5f --- /dev/null +++ b/gems/kettle-jem/bin/kettle-jem-deps-floor @@ -0,0 +1,350 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +require "json" +require "optparse" +require "pathname" + +require_relative "../lib/kettle/jem" + +# Repository-local maintenance tool for updating dependency floors owned by +# kettle-jem templates. +class KettleJemDepsFloor + VALID_UPGRADE_LEVELS = %w[major minor patch].freeze + DEFAULT_UPGRADE_LEVEL = "major" + DEFAULT_PROJECT_ROOT = File.expand_path("..", __dir__) + + SOURCE_GLOBS = [ + "lib/kettle/jem/templates/Appraisal.root.gemfile.example", + "lib/kettle/jem/templates/Appraisals.example", + "lib/kettle/jem/templates/Gemfile.example", + "lib/kettle/jem/templates/gem.gemspec.example", + "lib/kettle/jem/templates/gemfiles/**/*.gemfile.example", + "lib/kettle/jem/templates/shim/Gemfile.example", + "lib/kettle/jem/templates/shim/gem.gemspec.example" + ].freeze + EXTRA_SOURCE_FILES = [ + "lib/kettle/jem.rb" + ].freeze + + def initialize(project_root:, resolver: Kettle::Jem::RubyGemsResolver.new, options: {}) + @project_root = File.expand_path(project_root) + @resolver = resolver + @options = { + write: false, + check: false, + json: false, + upgrade: DEFAULT_UPGRADE_LEVEL + }.merge(options.transform_keys(&:to_sym)) + end + + def self.run(argv = ARGV, out: $stdout, err: $stderr) + options = parse_options(argv) + result = new(project_root: options.delete(:project_root), options: options).run + if options[:json] + out.puts(JSON.pretty_generate(result)) + else + out.puts("deps-floor: #{result.fetch(:updates)} update#{"s" unless result.fetch(:updates) == 1}") + result.fetch(:planned_changes, []).each do |change| + out.puts( + " #{change.fetch(:name)} #{change.fetch(:relative_path)} " \ + "#{change.fetch(:current_pessimistic)}, >= #{change.fetch(:current_floor)} -> " \ + "#{change.fetch(:new_pessimistic)}, >= #{change.fetch(:new_floor)}" + ) + end + end + 0 + rescue OptionParser::ParseError, ArgumentError => error + err.puts(error.message) + err.puts(parser) + 2 + rescue => error + err.puts("#{error.class}: #{error.message}") + 1 + end + + def self.parse_options(argv) + options = { + project_root: DEFAULT_PROJECT_ROOT, + write: false, + check: false, + json: false, + upgrade: DEFAULT_UPGRADE_LEVEL + } + parser.parse!(argv, into: options) + options[:project_root] = argv.shift || DEFAULT_PROJECT_ROOT + raise OptionParser::InvalidArgument, "Expected at most one PROJECT_ROOT" unless argv.empty? + + options + end + + def self.parser + OptionParser.new do |opts| + opts.banner = "Usage: bin/kettle-jem-deps-floor [PROJECT_ROOT] [--json] [--write] [--check] [--upgrade LEVEL]" + opts.on("-w", "--write", "Write updates to kettle-jem template sources.") { |value| value } + opts.on("--check", "Fail when managed dependency floors are stale.") { |value| value } + opts.on("--json", "Print the machine-readable report as JSON.") { |value| value } + opts.on("--upgrade LEVEL", "Upgrade strategy: major, minor, patch (default: #{DEFAULT_UPGRADE_LEVEL})") { |value| value } + end + end + + def run + upgrade = @options.fetch(:upgrade, DEFAULT_UPGRADE_LEVEL).to_s + unless VALID_UPGRADE_LEVELS.include?(upgrade) + raise ArgumentError, "Invalid --upgrade value #{upgrade.inspect}; use one of: #{VALID_UPGRADE_LEVELS.join(", ")}" + end + + records = dependency_records + planned_changes = planned_dependency_changes(records, upgrade) + apply_changes(planned_changes) if @options[:write] && planned_changes.any? + + if @options[:check] && planned_changes.any? + raise "Managed dependency floors are stale; run bin/kettle-jem-deps-floor --write --upgrade #{upgrade}" + end + + { + mode: @options[:write] ? "write" : "dry-run", + check: !!@options[:check], + upgrade: upgrade, + discovered_dependencies: records.map { |record| record.fetch(:name) }.uniq.sort, + updates: planned_changes.length, + updated_dependencies: planned_changes.map { |change| change.fetch(:name) }.uniq.sort, + planned_changes: planned_changes.map { |change| serializable_change(change) } + } + end + + private + + attr_reader :project_root, :resolver + + def dependency_records + dedupe_records(dependency_source_paths.flat_map { |relative_path| dependency_records_for_path(relative_path) }) + end + + def dependency_source_paths + paths = self.class::SOURCE_GLOBS.flat_map do |pattern| + Dir.glob(File.join(project_root, pattern), File::FNM_DOTMATCH).select { |path| File.file?(path) } + end + paths.concat(self.class::EXTRA_SOURCE_FILES.map { |relative_path| File.join(project_root, relative_path) }) + paths.uniq.sort.map { |path| Pathname(path).relative_path_from(Pathname(project_root)).to_s } + end + + def dependency_records_for_path(relative_path) + path = File.join(project_root, relative_path) + content = File.read(path) + [ + *ruby_dependency_records(content, relative_path), + *text_dependency_records(content, relative_path) + ] + end + + def ruby_dependency_records(content, relative_path) + [ + *ruby_call_dependency_records(content, relative_path), + *ruby_requirement_assignment_records(content, relative_path) + ] + end + + def ruby_call_dependency_records(content, relative_path) + Kettle::Jem.ruby_call_records(content, nil).filter_map do |call| + next unless ruby_dependency_call?(call) + + name = Kettle::Jem.ruby_string_argument(call) + next unless real_gem_name?(name) + + requirement_arguments = Array(call.arguments&.arguments).drop(1).select do |argument| + argument.is_a?(::Prism::StringNode) + end + record_from_arguments(relative_path, name, requirement_arguments, source_kind: "ruby") + end + end + + def ruby_dependency_call?(call) + return true if call.receiver.nil? && call.name == :gem + return true if %i[add_dependency add_runtime_dependency add_development_dependency].include?(call.name) + + false + end + + def ruby_requirement_assignment_records(content, relative_path) + result = Kettle::Jem.prism_parse_success(content) + return [] unless result + + result.value.breadth_first_search_all do |node| + node.is_a?(::Prism::LocalVariableWriteNode) && + %i[nomono_requirements nomono_activation_requirements].include?(node.name) + end.filter_map do |node| + values = Array(node.value&.elements).select { |element| element.is_a?(::Prism::StringNode) } + record_from_arguments(relative_path, "nomono", values, source_kind: "ruby") + end + end + + def record_from_arguments(relative_path, name, arguments, source_kind:) + return unless real_gem_name?(name) + + pessimistic = arguments.find { |argument| Kettle::Jem.ruby_static_string_value(argument).to_s.start_with?("~>") } + floor = arguments.find { |argument| Kettle::Jem.ruby_static_string_value(argument).to_s.start_with?(">=") } + return unless pessimistic && floor + + { + relative_path: relative_path, + name: name, + source_kind: source_kind, + current_pessimistic: Kettle::Jem.ruby_static_string_value(pessimistic), + current_floor: Kettle::Jem.ruby_static_string_value(floor), + pessimistic_range: range_for(pessimistic), + floor_range: range_for(floor) + } + end + + def range_for(node) + { + start_offset: node.location.start_offset, + end_offset: node.location.end_offset + } + end + + def text_dependency_records(content, relative_path) + lines = content.lines + lines.each_with_index.filter_map do |line, index| + name = text_dependency_name(line) + next unless real_gem_name?(name) + + current_pessimistic, pessimistic_range = text_requirement_record(content, lines, index, line, "~>") + current_floor, floor_range = text_requirement_record(content, lines, index, line, ">=") + next unless current_pessimistic && current_floor + + { + relative_path: relative_path, + name: name, + source_kind: "text", + current_pessimistic: current_pessimistic, + current_floor: current_floor, + pessimistic_range: pessimistic_range, + floor_range: floor_range + } + end + end + + def text_dependency_name(line) + stripped = line.lstrip + return if stripped.start_with?("#") + return "nomono" if stripped.start_with?("nomono_requirements =", "nomono_activation_requirements =") + + match = stripped.match(/\A(?:gem|spec\.add_dependency|spec\.add_runtime_dependency|spec\.add_development_dependency)\(?\s*"([^"]+)"/) + return match[1] if match + + match = stripped.match(/source:\s*%\(gem "([^"]+)"/) + match && match[1] + end + + def real_gem_name?(name) + name.to_s.match?(/\A[a-zA-Z0-9_.-]+\z/) + end + + def text_requirement_record(content, lines, index, line, operator) + match = line.match(/"#{Regexp.escape(operator)} [^"]+"/) + return unless match + + line_start = lines.take(index).join.bytesize + value = match[0][1...-1] + [ + value, + { + start_offset: line_start + match.begin(0), + end_offset: line_start + match.end(0) + } + ] + end + + def dedupe_records(records) + seen = {} + records.select do |record| + key = [ + record.fetch(:relative_path), + record.fetch(:name), + record.fetch(:pessimistic_range).fetch(:start_offset), + record.fetch(:floor_range).fetch(:start_offset) + ] + next false if seen.include?(key) + + seen[key] = true + true + end + end + + def planned_dependency_changes(records, upgrade) + records.filter_map do |record| + current_floor = floor_version(record.fetch(:current_floor)) + latest = latest_version_for(record.fetch(:name), current_floor, upgrade) + next unless latest && latest > current_floor + + { + **record, + current_floor_version: current_floor, + new_floor_version: latest, + new_pessimistic: pessimistic_requirement_for(latest) + } + end + end + + def latest_version_for(name, current_floor, upgrade) + resolver.versions(name, requirements: requirement_for_upgrade(current_floor, upgrade)).map do |entry| + Gem::Version.new((entry[:number] || entry["number"]).to_s) + end.max + end + + def requirement_for_upgrade(current_floor, upgrade) + major = current_floor.segments.fetch(0) + minor = current_floor.segments.fetch(1, 0) + case upgrade + when "patch" + [">= #{current_floor}", "~> #{major}.#{minor}.0"] + when "minor" + [">= #{current_floor}", "~> #{major}.0"] + else + [">= #{current_floor}"] + end + end + + def floor_version(requirement) + parsed = Gem::Requirement.new(requirement).requirements.find { |operator, _version| operator == ">=" } + raise ArgumentError, "Expected >= requirement, got #{requirement.inspect}" unless parsed + + parsed.last + end + + def pessimistic_requirement_for(version) + segments = version.segments + "~> #{segments.fetch(0)}.#{segments.fetch(1, 0)}" + end + + def apply_changes(changes) + changes.group_by { |change| change.fetch(:relative_path) }.each do |relative_path, path_changes| + path = File.join(project_root, relative_path) + replacements = path_changes.flat_map do |change| + [ + change.fetch(:pessimistic_range).merge(replacement: JSON.generate(change.fetch(:new_pessimistic))), + change.fetch(:floor_range).merge(replacement: JSON.generate(">= #{change.fetch(:new_floor_version)}")) + ] + end + original = File.read(path) + updated = Kettle::Jem.replace_source_offsets(original, replacements) + File.write(path, updated) if updated != original + end + end + + def serializable_change(change) + { + name: change.fetch(:name), + relative_path: change.fetch(:relative_path), + source_kind: change.fetch(:source_kind), + current_pessimistic: change.fetch(:current_pessimistic), + new_pessimistic: change.fetch(:new_pessimistic), + current_floor: change.fetch(:current_floor_version).to_s, + new_floor: change.fetch(:new_floor_version).to_s + } + end +end + +exit(KettleJemDepsFloor.run(ARGV, out: $stdout, err: $stderr)) if $PROGRAM_NAME == __FILE__ diff --git a/gems/kettle-jem/lib/kettle/jem.rb b/gems/kettle-jem/lib/kettle/jem.rb index e827da9e1..893986b78 100644 --- a/gems/kettle-jem/lib/kettle/jem.rb +++ b/gems/kettle-jem/lib/kettle/jem.rb @@ -3642,7 +3642,7 @@ def ensure_monorepo_root_gemfile_dependencies(content) def monorepo_root_gemfile_dependency_lines [ - {name: "appraisal2", source: %(gem "appraisal2", "~> 3.1", ">= 3.1.4"\n)}, + {name: "appraisal2", source: %(gem "appraisal2", "~> 3.2", ">= 3.2.0"\n)}, {name: "bundler-audit", source: %(gem "bundler-audit", "~> 0.9.3"\n)}, {name: "kettle-dev", source: %(gem "kettle-dev", "~> 2.3", ">= 2.3.7"\n)}, {name: "kettle-drift", source: %(gem "kettle-drift", "~> 1.0", ">= 1.0.5"\n)}, @@ -3651,7 +3651,7 @@ def monorepo_root_gemfile_dependency_lines {name: "rake", source: %(gem "rake", "~> 13.0"\n)}, {name: "rspec", source: %(gem "rspec", "~> 3.0"\n)}, {name: "stone_checksums", source: %(gem "stone_checksums", "~> 1.0", ">= 1.0.6"\n)}, - {name: "turbo_tests2", source: %(gem "turbo_tests2", "~> 3.1", ">= 3.1.14"\n)} + {name: "turbo_tests2", source: %(gem "turbo_tests2", "~> 3.2", ">= 3.2.0"\n)} ].freeze end 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 febd7ac20..32305d678 100644 --- a/gems/kettle-jem/lib/kettle/jem/templates/gem.gemspec.example +++ b/gems/kettle-jem/lib/kettle/jem/templates/gem.gemspec.example @@ -124,9 +124,9 @@ Gem::Specification.new do |spec| spec.add_development_dependency("require_bench", "~> 1.0", ">= 1.0.4") # ruby >= 2.2.0 # Testing - spec.add_development_dependency("appraisal2", "~> 3.1", ">= 3.1.4") # ruby >= 1.8.7, for testing against multiple versions of dependencies + spec.add_development_dependency("appraisal2", "~> 3.2", ">= 3.2.0") # ruby >= 1.8.7, for testing against multiple versions of dependencies spec.add_development_dependency("kettle-test", "~> 2.0", ">= 2.0.11") # ruby >= {KJ|MIN_TEST_RUBY} - spec.add_development_dependency("turbo_tests2", "~> 3.1", ">= 3.1.14") # ruby >= 2.4.0, default kettle-test runner + spec.add_development_dependency("turbo_tests2", "~> 3.2", ">= 3.2.0") # ruby >= 2.4.0, default kettle-test runner # Releasing spec.add_development_dependency("ruby-progressbar", "~> 1.13") # ruby >= 0 diff --git a/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/coverage.gemfile.example b/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/coverage.gemfile.example index bcc758e2f..ab859db48 100755 --- a/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/coverage.gemfile.example +++ b/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/coverage.gemfile.example @@ -7,7 +7,7 @@ if ENV.fetch("KETTLE_RB_DEV", "false").casecmp("false").zero? # Coverage (remote/released) platform :mri do - gem "kettle-soup-cover", "~> 3.0", ">= 3.0.0", require: false + gem "kettle-soup-cover", "~> 3.0", ">= 3.0.1", require: false end else eval_gemfile "coverage_local.gemfile" diff --git a/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/documentation.gemfile.example b/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/documentation.gemfile.example index 1f30bb2e8..d8215416e 100755 --- a/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/documentation.gemfile.example +++ b/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/documentation.gemfile.example @@ -7,16 +7,16 @@ # # Documentation -gem "kramdown", "~> 2.5", ">= 2.5.1", require: false # Ruby >= 2.5 +gem "kramdown", "~> 2.5", ">= 2.5.2", require: false # Ruby >= 2.5 gem "kramdown-parser-gfm", "~> 1.1", require: false # Ruby >= 2.3 gem "yaml-converter", "~> 0.2", ">= 0.2.3", require: false # Ruby >= 3.2 -gem "yard", "~> 0.9", ">= 0.9.44", require: false +gem "yard", "~> 0.9", ">= 0.9.45", require: false gem "yard-junk", "~> 0.1", ">= 0.1.0", require: false # Ruby >= 3.1 gem "yard-relative_markdown_links", "~> 0.6", require: false if ENV.fetch("GALTZO_FLOSS_DEV", "false").casecmp("false").zero? gem "yard-fence", "~> 0.9", ">= 0.9.6", require: false # Ruby >= 3.2 - gem "yard-timekeeper", "~> 0.2", ">= 0.2.3", require: false + gem "yard-timekeeper", "~> 0.2", ">= 0.2.4", require: false gem "yard-yaml", "~> 0.2", ">= 0.2.3", require: false else eval_gemfile "documentation_local.gemfile" diff --git a/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/erb/r3/v5.0.gemfile.example b/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/erb/r3/v5.0.gemfile.example index 765396835..5bde0e077 100644 --- a/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/erb/r3/v5.0.gemfile.example +++ b/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/erb/r3/v5.0.gemfile.example @@ -1 +1 @@ -gem "erb", "~> 6.0", ">= 6.0.4" # ruby >= 3.2.0 +gem "erb", "~> 6.0", ">= 6.0.5" # ruby >= 3.2.0 diff --git a/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/erb/r4/v5.0.gemfile.example b/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/erb/r4/v5.0.gemfile.example index 765396835..5bde0e077 100644 --- a/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/erb/r4/v5.0.gemfile.example +++ b/gems/kettle-jem/lib/kettle/jem/templates/gemfiles/modular/erb/r4/v5.0.gemfile.example @@ -1 +1 @@ -gem "erb", "~> 6.0", ">= 6.0.4" # ruby >= 3.2.0 +gem "erb", "~> 6.0", ">= 6.0.5" # ruby >= 3.2.0 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 d79b3d1e6..12a02795c 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 @@ -14,16 +14,16 @@ gem "reek", "~> 6.5", ">= 6.5.0" platform :mri do gem "appraisal2-rubocop", "~> 1.0", ">= 1.0.0", require: false gem "rubocop-gradual", "~> 0.4", ">= 0.4.0" - gem "rubocop-minitest", "~> 0.38", ">= 0.38.1" + gem "rubocop-minitest", "~> 0.39", ">= 0.39.1" gem "rubocop-on-rbs", "~> 2.0", ">= 2.0.0" # ruby >= 3.2.0 # gem "rubocop", "~> 1.73", ">= 1.73.2" # constrained by standard gem "rubocop-packaging", "~> 0.6", ">= 0.6.0" - gem "standard", "~> 1.54", ">= 1.54.0" + gem "standard", "~> 1.56", ">= 1.56.0" if ENV.fetch("RUBOCOP_LTS_LOCAL", "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.4" unless declared_gems.include?("rubocop-lts-rspec") + gem "rubocop-lts-rspec", "~> 1.0", ">= 1.0.5" 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") diff --git a/gems/kettle-jem/spec/bin/kettle_jem_deps_floor_spec.rb b/gems/kettle-jem/spec/bin/kettle_jem_deps_floor_spec.rb new file mode 100644 index 000000000..0c3620b32 --- /dev/null +++ b/gems/kettle-jem/spec/bin/kettle_jem_deps_floor_spec.rb @@ -0,0 +1,175 @@ +# frozen_string_literal: true + +require "spec_helper" + +load File.expand_path("../../bin/kettle-jem-deps-floor", __dir__) + +RSpec.describe KettleJemDepsFloor do + let(:project_root) { Dir.mktmpdir } + let(:resolver) do + FakeDepsFloorResolver.new( + "example_dep" => %w[1.2.3 1.2.9 1.3.0 2.0.0], + "embedded_dep" => %w[4.5.6 4.5.7], + "other_dep" => %w[3.0.0 3.0.1 3.1.0], + "nomono" => %w[1.0.8 1.0.9], + "yard-timekeeper" => %w[0.2.3 0.2.4] + ) + end + + before do + stub_const( + "FakeDepsFloorResolver", + Class.new do + def initialize(versions) + @versions = versions + @requests = [] + end + + attr_reader :requests + + def versions(gem_name, requirements: nil) + @requests << [gem_name, requirements] + requirement = Gem::Requirement.new(requirements || [">= 0"]) + Array(@versions.fetch(gem_name)).select do |version| + requirement.satisfied_by?(Gem::Version.new(version)) + end.map { |version| {number: version} } + end + end + ) + stub_const( + "#{described_class}::SOURCE_GLOBS", + [ + "template/valid.gemfile.example", + "template/tokenized.gemspec.example", + "template/local.gemfile.example", + "template/documentation.gemfile.example", + "lib/embedded.rb" + ] + ) + stub_const( + "#{described_class}::EXTRA_SOURCE_FILES", + [] + ) + write_file("template/valid.gemfile.example", <<~RUBY) + # frozen_string_literal: true + + gem "example_dep", "~> 1.2", ">= 1.2.3", require: false + spec.add_development_dependency("other_dep", "~> 3.0", ">= 3.0.0") + # gem "ignored_dep", "~> 1.0", ">= 1.0.0" + RUBY + write_file("template/tokenized.gemspec.example", <<~RUBY) + # frozen_string_literal: true + + {KJ|TOKEN} + spec.add_development_dependency("{KJ|TOKENIZED_GEM}", "~> 9.0", ">= 9.0.0") + spec.add_development_dependency("example_dep", "~> 1.2", ">= 1.2.3") + RUBY + write_file("template/local.gemfile.example", <<~RUBY) + # frozen_string_literal: true + + nomono_activation_requirements = ["~> 1.0", ">= 1.0.8"] + Kernel.send(:gem, "nomono", *nomono_activation_requirements) + require "nomono/bundler" + RUBY + write_file("template/documentation.gemfile.example", <<~RUBY) + # frozen_string_literal: true + + gem "yard-timekeeper", "~> 0.2", ">= 0.2.3", require: false + RUBY + write_file("lib/embedded.rb", <<~RUBY) + # frozen_string_literal: true + + {name: "embedded_dep", source: %(gem "embedded_dep", "~> 4.5", ">= 4.5.6"\\n)} + RUBY + end + + after do + FileUtils.rm_rf(project_root) + end + + def write_file(relative_path, content) + path = File.join(project_root, relative_path) + FileUtils.mkdir_p(File.dirname(path)) + File.write(path, content) + end + + def read_file(relative_path) + File.read(File.join(project_root, relative_path)) + end + + it "defaults the project root to the gem root relative to the bin script" do + options = described_class.parse_options([]) + + expect(options.fetch(:project_root)).to eq(File.expand_path("../..", __dir__)) + end + + it "reports patch updates without writing files" do + result = described_class.new(project_root: project_root, resolver: resolver, options: {upgrade: "patch"}).run + + expect(result[:updates]).to eq(6) + expect(result[:updated_dependencies]).to eq(%w[embedded_dep example_dep nomono other_dep yard-timekeeper]) + expect(result[:planned_changes]).to include( + hash_including( + name: "example_dep", + relative_path: "template/valid.gemfile.example", + current_floor: "1.2.3", + new_floor: "1.2.9", + new_pessimistic: "~> 1.2" + ) + ) + expect(result[:planned_changes]).to include( + hash_including( + name: "yard-timekeeper", + relative_path: "template/documentation.gemfile.example", + current_floor: "0.2.3", + new_floor: "0.2.4" + ) + ) + expect(read_file("template/valid.gemfile.example")).to include('gem "example_dep", "~> 1.2", ">= 1.2.3"') + end + + it "updates parseable Ruby and tokenized template files when writing" do + result = described_class.new(project_root: project_root, resolver: resolver, options: {write: true, upgrade: "minor"}).run + + expect(result[:updates]).to eq(6) + expect(read_file("lib/embedded.rb")).to include('{name: "embedded_dep", source: %(gem "embedded_dep", "~> 4.5", ">= 4.5.7"\\n)}') + expect(read_file("template/valid.gemfile.example")).to include('gem "example_dep", "~> 1.3", ">= 1.3.0"') + expect(read_file("template/valid.gemfile.example")).to include('spec.add_development_dependency("other_dep", "~> 3.1", ">= 3.1.0")') + expect(read_file("template/valid.gemfile.example")).to include('# gem "ignored_dep", "~> 1.0", ">= 1.0.0"') + expect(read_file("template/tokenized.gemspec.example")).to include('spec.add_development_dependency("example_dep", "~> 1.3", ">= 1.3.0")') + expect(read_file("template/tokenized.gemspec.example")).to include('spec.add_development_dependency("{KJ|TOKENIZED_GEM}", "~> 9.0", ">= 9.0.0")') + expect(read_file("template/local.gemfile.example")).to include('nomono_activation_requirements = ["~> 1.0", ">= 1.0.9"]') + expect(read_file("template/documentation.gemfile.example")).to include('gem "yard-timekeeper", "~> 0.2", ">= 0.2.4", require: false') + end + + it "allows the caller to select major updates" do + result = described_class.new(project_root: project_root, resolver: resolver, options: {write: true, upgrade: "major"}).run + + expect(result[:planned_changes]).to include( + hash_including( + name: "example_dep", + new_floor: "2.0.0", + new_pessimistic: "~> 2.0" + ) + ) + expect(read_file("template/valid.gemfile.example")).to include('gem "example_dep", "~> 2.0", ">= 2.0.0"') + end + + it "fails check mode when managed floors are stale" do + expect { + described_class.new(project_root: project_root, resolver: resolver, options: {check: true}).run + }.to raise_error(RuntimeError, /Managed dependency floors are stale/) + end + + it "reports discovered dependencies without requiring an allow-list" do + result = described_class.new(project_root: project_root, resolver: resolver, options: {upgrade: "patch"}).run + + expect(result[:discovered_dependencies]).to eq(%w[embedded_dep example_dep nomono other_dep yard-timekeeper]) + end + + it "rejects unsupported upgrade levels" do + expect { + described_class.new(project_root: project_root, resolver: resolver, options: {upgrade: "micro"}).run + }.to raise_error(ArgumentError, /Invalid --upgrade value/) + end +end diff --git a/gems/kettle-jem/spec/release_packaging_spec.rb b/gems/kettle-jem/spec/release_packaging_spec.rb index 2388e736e..57f48e524 100644 --- a/gems/kettle-jem/spec/release_packaging_spec.rb +++ b/gems/kettle-jem/spec/release_packaging_spec.rb @@ -39,9 +39,11 @@ def clean_subprocess_env(overrides = {}) expect(spec.metadata["homepage_uri"]).to eq("https://structuredmerge.org") expect(spec.executables).to eq(["kettle-jem"]) 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) expect(expected_template_files).not_to be_empty expect(files).to include(*expected_template_files) + expect(files).not_to include("bin/kettle-jem-deps-floor") expect(files).not_to include("bin/kettle-jem-workflow-pins") expect(files).to include( "lib/kettle/jem/tasks.rb", From 37b5050cbd261f714e33f55eed806ee114ee502f Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:24:31 -0600 Subject: [PATCH 216/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-crispr-ruby-prism/.kettle-drift.lock | 60 ++- gems/ast-crispr-ruby-prism/Gemfile | 40 ++ gems/ast-crispr-ruby-prism/Gemfile.lock | 338 +------------ gems/ast-crispr/.kettle-drift.lock | 60 ++- gems/ast-crispr/.rubocop_gradual.lock | 213 -------- gems/ast-crispr/Gemfile | 40 ++ gems/ast-crispr/Gemfile.lock | 59 ++- gems/tree_haver/.rubocop_gradual.lock | 467 ------------------ gems/tree_haver/Gemfile.lock | 445 ++++++++++++----- 9 files changed, 520 insertions(+), 1202 deletions(-) delete mode 100644 gems/ast-crispr/.rubocop_gradual.lock delete mode 100644 gems/tree_haver/.rubocop_gradual.lock diff --git a/gems/ast-crispr-ruby-prism/.kettle-drift.lock b/gems/ast-crispr-ruby-prism/.kettle-drift.lock index 44ac5c29d..5b373dd8d 100644 --- a/gems/ast-crispr-ruby-prism/.kettle-drift.lock +++ b/gems/ast-crispr-ruby-prism/.kettle-drift.lock @@ -7,7 +7,8 @@ 119, 159, 199, - 239 + 239, + 279 ] } ], @@ -19,7 +20,8 @@ 130, 170, 210, - 250 + 250, + 290 ] } ], @@ -31,7 +33,8 @@ 120, 160, 200, - 240 + 240, + 280 ] } ], @@ -43,7 +46,8 @@ 132, 172, 212, - 252 + 252, + 292 ] } ], @@ -55,7 +59,8 @@ 135, 175, 215, - 255 + 255, + 295 ] } ], @@ -67,7 +72,8 @@ 121, 161, 201, - 241 + 241, + 281 ] } ], @@ -80,7 +86,8 @@ 139, 179, 219, - 259 + 259, + 299 ] } ], @@ -92,7 +99,8 @@ 140, 180, 220, - 260 + 260, + 300 ] } ], @@ -105,7 +113,8 @@ 126, 166, 206, - 246 + 246, + 286 ] } ], @@ -117,7 +126,8 @@ 149, 189, 229, - 269 + 269, + 309 ] } ], @@ -130,7 +140,8 @@ 118, 158, 198, - 238 + 238, + 278 ] } ], @@ -143,7 +154,8 @@ 148, 188, 228, - 268 + 268, + 308 ] } ], @@ -155,7 +167,8 @@ 124, 164, 204, - 244 + 244, + 284 ] } ], @@ -168,7 +181,8 @@ 131, 171, 211, - 251 + 251, + 291 ] } ], @@ -181,7 +195,8 @@ 127, 167, 207, - 247 + 247, + 287 ] } ], @@ -193,7 +208,8 @@ 125, 165, 205, - 245 + 245, + 285 ] } ], @@ -205,7 +221,8 @@ 142, 182, 222, - 262 + 262, + 302 ] } ], @@ -217,7 +234,8 @@ 141, 181, 221, - 261 + 261, + 301 ] } ], @@ -229,7 +247,8 @@ 136, 176, 216, - 256 + 256, + 296 ] } ], @@ -241,7 +260,8 @@ 145, 185, 225, - 265 + 265, + 305 ] } ], diff --git a/gems/ast-crispr-ruby-prism/Gemfile b/gems/ast-crispr-ruby-prism/Gemfile index 9a7dbfd3c..86cb14176 100644 --- a/gems/ast-crispr-ruby-prism/Gemfile +++ b/gems/ast-crispr-ruby-prism/Gemfile @@ -271,6 +271,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/ast-crispr-ruby-prism/Gemfile.lock b/gems/ast-crispr-ruby-prism/Gemfile.lock index de85587b4..244546417 100644 --- a/gems/ast-crispr-ruby-prism/Gemfile.lock +++ b/gems/ast-crispr-ruby-prism/Gemfile.lock @@ -17,264 +17,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) ast-merge (= 7.1.0) service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +35,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,8 +48,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -359,8 +111,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -389,7 +139,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-x86_64-linux-gnu) racc (~> 1.4) @@ -575,11 +324,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -606,7 +355,7 @@ GEM yard yard-relative_markdown_links (0.6.0) nokogiri (>= 1.14.3, < 2) - yard-timekeeper (0.2.3) + yard-timekeeper (0.2.4) version_gem (~> 1.1, >= 1.1.13) yard-yaml (0.2.3) version_gem (~> 1.1, >= 1.1.13) @@ -622,44 +371,23 @@ DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -668,26 +396,18 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -695,23 +415,14 @@ CHECKSUMS appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -719,7 +430,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -732,27 +442,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-x86_64-linux-gnu) sha256=379fae440b28915e3f19d752ce2dcf8465ed2b2fbefd2a7ca0dd497bc981a06a nokogiri (1.19.4-x86_64-linux-musl) sha256=17dfb7c1fa194ae02fbf7c51a7afc8d278045ab3fdacfd86f91d02d7b274470b @@ -763,14 +465,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -778,7 +476,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -806,11 +503,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -820,7 +515,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -834,27 +528,21 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd yard-relative_markdown_links (0.6.0) sha256=3e5ffa85cbad9bac70bee5421774b190fb25d3bdf489323a5b3534f647d1a70e - yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 + yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ast-crispr/.kettle-drift.lock b/gems/ast-crispr/.kettle-drift.lock index 44ac5c29d..5b373dd8d 100644 --- a/gems/ast-crispr/.kettle-drift.lock +++ b/gems/ast-crispr/.kettle-drift.lock @@ -7,7 +7,8 @@ 119, 159, 199, - 239 + 239, + 279 ] } ], @@ -19,7 +20,8 @@ 130, 170, 210, - 250 + 250, + 290 ] } ], @@ -31,7 +33,8 @@ 120, 160, 200, - 240 + 240, + 280 ] } ], @@ -43,7 +46,8 @@ 132, 172, 212, - 252 + 252, + 292 ] } ], @@ -55,7 +59,8 @@ 135, 175, 215, - 255 + 255, + 295 ] } ], @@ -67,7 +72,8 @@ 121, 161, 201, - 241 + 241, + 281 ] } ], @@ -80,7 +86,8 @@ 139, 179, 219, - 259 + 259, + 299 ] } ], @@ -92,7 +99,8 @@ 140, 180, 220, - 260 + 260, + 300 ] } ], @@ -105,7 +113,8 @@ 126, 166, 206, - 246 + 246, + 286 ] } ], @@ -117,7 +126,8 @@ 149, 189, 229, - 269 + 269, + 309 ] } ], @@ -130,7 +140,8 @@ 118, 158, 198, - 238 + 238, + 278 ] } ], @@ -143,7 +154,8 @@ 148, 188, 228, - 268 + 268, + 308 ] } ], @@ -155,7 +167,8 @@ 124, 164, 204, - 244 + 244, + 284 ] } ], @@ -168,7 +181,8 @@ 131, 171, 211, - 251 + 251, + 291 ] } ], @@ -181,7 +195,8 @@ 127, 167, 207, - 247 + 247, + 287 ] } ], @@ -193,7 +208,8 @@ 125, 165, 205, - 245 + 245, + 285 ] } ], @@ -205,7 +221,8 @@ 142, 182, 222, - 262 + 262, + 302 ] } ], @@ -217,7 +234,8 @@ 141, 181, 221, - 261 + 261, + 301 ] } ], @@ -229,7 +247,8 @@ 136, 176, 216, - 256 + 256, + 296 ] } ], @@ -241,7 +260,8 @@ 145, 185, 225, - 265 + 265, + 305 ] } ], diff --git a/gems/ast-crispr/.rubocop_gradual.lock b/gems/ast-crispr/.rubocop_gradual.lock deleted file mode 100644 index d920cf89f..000000000 --- a/gems/ast-crispr/.rubocop_gradual.lock +++ /dev/null @@ -1,213 +0,0 @@ -{ - ".simplecov:3928423310": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:918344237": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "ast-crispr.gemspec:2262341056": [ - [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/ast-crispr.rb:247837913": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`ast-crispr.rb`) should use snake_case.", 5381] - ], - "lib/ast/crispr.rb:3730230259": [ - [12, 5, 11, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Error`.", 62528179], - [22, 5, 11, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Limit`.", 51888158], - [47, 7, 622, "Metrics/MethodLength: Method has too many lines. [14/10]", 2816807495], - [61, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], - [65, 7, 1168, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_hash` is too high. [<6, 29, 10> 31.26/17]", 3515286222], - [65, 7, 1168, "Metrics/MethodLength: Method has too many lines. [27/10]", 3515286222], - [90, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3685471369], - [96, 7, 822, "Metrics/AbcSize: Assignment Branch Condition size for `constraint_for_operator` is too high. [<5, 11, 13> 17.75/17]", 1402705503], - [96, 7, 822, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `constraint_for_operator` is too high. [8/7]", 1402705503], - [96, 7, 822, "Metrics/MethodLength: Method has too many lines. [19/10]", 1402705503], - [124, 5, 11, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Match`.", 52676120], - [127, 21, 73, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 344717847], - [172, 5, 18, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::MatchProfile`.", 365273299], - [172, 5, 4350, "Metrics/ClassLength: Class has too many lines. [115/100]", 1575766989], - [273, 7, 596, "Metrics/MethodLength: Method has too many lines. [14/10]", 2070486858], - [314, 5, 24, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::DestinationProfile`.", 3442102524], - [314, 5, 4581, "Metrics/ClassLength: Class has too many lines. [119/100]", 3503477661], - [352, 21, 126, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 931636409], - [417, 7, 667, "Metrics/MethodLength: Method has too many lines. [15/10]", 4004247638], - [460, 5, 27, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::DestinationResolution`.", 1305107769], - [474, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::StructureProfile`.", 614380405], - [512, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::SelectionProfile`.", 2464089216], - [531, 21, 165, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1182500333], - [566, 7, 585, "Metrics/MethodLength: Method has too many lines. [13/10]", 13786997], - [583, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::OperationProfile`.", 1974079861], - [607, 21, 188, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2526147676], - [662, 7, 478, "Metrics/MethodLength: Method has too many lines. [11/10]", 795235914], - [695, 7, 10, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Adapters::Null`.", 3515430288], - [728, 5, 21, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::DocumentContext`.", 594998459], - [788, 5, 19, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::OwnerSelector`.", 3092459999], - [791, 21, 81, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2293822273], - [853, 7, 606, "Metrics/MethodLength: Method has too many lines. [16/10]", 422136278], - [883, 5, 16, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::Selectors`.", 2133324825], - [883, 5, 5586, "Metrics/ModuleLength: Module has too many lines. [130/100]", 3440946513], - [886, 7, 1642, "Metrics/AbcSize: Assignment Branch Condition size for `owner_filter` is too high. [<6, 18, 11> 21.93/17]", 3224577904], - [886, 7, 1642, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `owner_filter` is too high. [10/7]", 3224577904], - [886, 7, 1642, "Metrics/MethodLength: Method has too many lines. [37/10]", 3224577904], - [886, 7, 1642, "Metrics/PerceivedComplexity: Perceived complexity for `owner_filter` is too high. [11/8]", 3224577904], - [886, 23, 135, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3231562627], - [930, 7, 1936, "Metrics/AbcSize: Assignment Branch Condition size for `comment_region_owned_owner` is too high. [<7, 16, 7> 18.81/17]", 2629441148], - [930, 7, 1936, "Metrics/MethodLength: Method has too many lines. [40/10]", 2629441148], - [930, 37, 190, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 4159525724], - [931, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 940069302], - [975, 7, 1731, "Metrics/AbcSize: Assignment Branch Condition size for `line_block` is too high. [<12, 22, 14> 28.71/17]", 1307990669], - [975, 7, 1731, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `line_block` is too high. [12/7]", 1307990669], - [975, 7, 1731, "Metrics/MethodLength: Method has too many lines. [38/10]", 1307990669], - [975, 7, 1731, "Metrics/PerceivedComplexity: Perceived complexity for `line_block` is too high. [12/8]", 1307990669], - [975, 21, 130, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 515174999], - [1027, 5, 23, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::OperationSupport`.", 343849029], - [1027, 5, 6491, "Metrics/ModuleLength: Module has too many lines. [139/100]", 2271788056], - [1072, 7, 1758, "Metrics/AbcSize: Assignment Branch Condition size for `insertion_from` is too high. [<5, 21, 11> 24.23/17]", 29011294], - [1072, 7, 1758, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `insertion_from` is too high. [9/7]", 29011294], - [1072, 7, 1758, "Metrics/MethodLength: Method has too many lines. [28/10]", 29011294], - [1072, 7, 1758, "Metrics/PerceivedComplexity: Perceived complexity for `insertion_from` is too high. [10/8]", 29011294], - [1115, 7, 827, "Metrics/AbcSize: Assignment Branch Condition size for `splice_after_anchor` is too high. [<4, 19, 2> 19.52/17]", 14691010], - [1115, 7, 827, "Metrics/MethodLength: Method has too many lines. [16/10]", 14691010], - [1119, 9, 72, "Style/RaiseArgs: Provide an exception class and message as arguments to `raise`.", 789091243], - [1121, 23, 72, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 2503424841], - [1153, 9, 25, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 768340433], - [1197, 5, 26, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::OperationProfilable`.", 4114431854], - [1206, 7, 19, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::OperationProfilable::ClassMethods`.", 3606528253], - [1218, 5, 13, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Replace`.", 1563590855], - [1243, 7, 643, "Metrics/AbcSize: Assignment Branch Condition size for `call` is too high. [<10, 32, 3> 33.66/17]", 3656683885], - [1243, 7, 643, "Metrics/MethodLength: Method has too many lines. [14/10]", 3656683885], - [1262, 5, 12, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Delete`.", 2011475922], - [1286, 7, 538, "Metrics/AbcSize: Assignment Branch Condition size for `call` is too high. [<7, 21, 1> 22.16/17]", 2655200768], - [1286, 7, 538, "Metrics/MethodLength: Method has too many lines. [13/10]", 2655200768], - [1304, 5, 12, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Insert`.", 1590185308], - [1338, 5, 10, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Move`.", 3515667002], - [1366, 7, 1182, "Metrics/AbcSize: Assignment Branch Condition size for `call` is too high. [<14, 40, 7> 42.95/17]", 172197360], - [1366, 7, 1182, "Metrics/MethodLength: Method has too many lines. [22/10]", 172197360], - [1383, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2688172402], - [1396, 3, 13, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr`.", 315644438], - [1396, 3, 12758, "Metrics/ModuleLength: Module has too many lines. [180/100]", 2662313186], - [1397, 5, 33, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::ProfileReportCompatibility`.", 3039519892], - [1419, 5, 18, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::MatchProfile`.", 365273299], - [1431, 7, 28, "Lint/DuplicateMethods: Method `Ast::Crispr::MatchProfile#normalize_start_boundary` is defined at both lib/ast/crispr.rb:292 and lib/ast/crispr.rb:1431.", 2362701855], - [1435, 7, 26, "Lint/DuplicateMethods: Method `Ast::Crispr::MatchProfile#normalize_end_boundary` is defined at both lib/ast/crispr.rb:299 and lib/ast/crispr.rb:1435.", 2613594544], - [1439, 7, 26, "Lint/DuplicateMethods: Method `Ast::Crispr::MatchProfile#normalize_payload_kind` is defined at both lib/ast/crispr.rb:306 and lib/ast/crispr.rb:1439.", 2604742721], - [1444, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::SelectionProfile`.", 2464089216], - [1466, 7, 14, "Lint/DuplicateMethods: Method `Ast::Crispr::SelectionProfile#initialize` is defined at both lib/ast/crispr.rb:531 and lib/ast/crispr.rb:1466.", 956205738], - [1466, 7, 773, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `initialize` is too high. [8/7]", 771809109], - [1466, 7, 773, "Metrics/MethodLength: Method has too many lines. [11/10]", 771809109], - [1466, 21, 190, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 4167448336], - [1481, 7, 1286, "Metrics/AbcSize: Assignment Branch Condition size for `report` is too high. [<5, 29, 13> 32.17/17]", 1720478959], - [1481, 7, 1286, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report` is too high. [11/7]", 1720478959], - [1481, 7, 1286, "Metrics/MethodLength: Method has too many lines. [17/10]", 1720478959], - [1481, 7, 1286, "Metrics/PerceivedComplexity: Perceived complexity for `report` is too high. [11/8]", 1720478959], - [1496, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 1470192175], - [1520, 5, 24, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::DestinationProfile`.", 3442102524], - [1534, 7, 29, "Lint/DuplicateMethods: Method `Ast::Crispr::DestinationProfile#normalize_resolution_kind` is defined at both lib/ast/crispr.rb:437 and lib/ast/crispr.rb:1534.", 99310177], - [1538, 7, 31, "Lint/DuplicateMethods: Method `Ast::Crispr::DestinationProfile#normalize_resolution_source` is defined at both lib/ast/crispr.rb:444 and lib/ast/crispr.rb:1538.", 1692065396], - [1542, 7, 29, "Lint/DuplicateMethods: Method `Ast::Crispr::DestinationProfile#normalize_anchor_boundary` is defined at both lib/ast/crispr.rb:452 and lib/ast/crispr.rb:1542.", 3028754726], - [1547, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::OperationProfile`.", 1974079861], - [1550, 7, 733, "Metrics/MethodLength: Method has too many lines. [13/10]", 2619513218], - [1570, 7, 25, "Lint/DuplicateMethods: Method `Ast::Crispr::OperationProfile#normalize_requirement` is defined at both lib/ast/crispr.rb:678 and lib/ast/crispr.rb:1570.", 440444039], - [1574, 7, 32, "Lint/DuplicateMethods: Method `Ast::Crispr::OperationProfile#normalize_replacement_source` is defined at both lib/ast/crispr.rb:686 and lib/ast/crispr.rb:1574.", 3533021156], - [1579, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::StructureProfile`.", 614380405], - [1595, 5, 6309, "Metrics/ClassLength: Class has too many lines. [172/100]", 1270437788], - [1600, 7, 2717, "Metrics/MethodLength: Method has too many lines. [67/10]", 1469599129], - [1665, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 259030389], - [1678, 28, 247, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3385598543], - [1710, 28, 242, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1038219895] - ], - "lib/ast/crispr/rspec/shared_examples/destination_profile.rb:2529475135": [ - [3, 1, 2386, "Metrics/BlockLength: Block has too many lines. [28/25]", 2846758965], - [4, 3, 2311, "Metrics/BlockLength: Block has too many lines. [26/25]", 2123267236] - ], - "lib/ast/crispr/rspec/shared_examples/match_profile.rb:2566447993": [ - [3, 1, 1997, "Metrics/BlockLength: Block has too many lines. [26/25]", 1032277788] - ], - "lib/ast/crispr/rspec/shared_examples/operation_profile.rb:3583567850": [ - [3, 1, 2148, "Metrics/BlockLength: Block has too many lines. [26/25]", 2745151209] - ], - "spec/old_runtime_spec.rb:1564590841": [ - [3, 1, 17728, "Metrics/BlockLength: Block has too many lines. [383/25]", 205400157], - [4, 3, 69, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3712453399], - [5, 3, 68, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1429320782], - [6, 3, 59, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 253007150], - [8, 3, 891, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 361389624], - [18, 37, 11, "Lint/UnusedMethodArgument: Unused method argument - `owner_scope`.", 3846606321], - [22, 46, 6, "Lint/UnusedMethodArgument: Unused method argument - `region`.", 2124512157], - [22, 64, 11, "Lint/UnusedMethodArgument: Unused method argument - `owner_scope`.", 3846606321], - [73, 3, 8534, "Metrics/BlockLength: Block has too many lines. [176/25]", 3042299525], - [313, 3, 3640, "Metrics/BlockLength: Block has too many lines. [72/25]", 1133370152], - [418, 3, 1663, "Metrics/BlockLength: Block has too many lines. [41/25]", 115074475] - ] -} diff --git a/gems/ast-crispr/Gemfile b/gems/ast-crispr/Gemfile index a04db0753..20ffdcaed 100644 --- a/gems/ast-crispr/Gemfile +++ b/gems/ast-crispr/Gemfile @@ -271,6 +271,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/ast-crispr/Gemfile.lock b/gems/ast-crispr/Gemfile.lock index 37fdf3f15..7478fbf81 100644 --- a/gems/ast-crispr/Gemfile.lock +++ b/gems/ast-crispr/Gemfile.lock @@ -275,6 +275,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -308,7 +324,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -363,18 +378,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -538,22 +542,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -659,9 +659,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -739,7 +739,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -760,10 +759,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -838,13 +837,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/tree_haver/.rubocop_gradual.lock b/gems/tree_haver/.rubocop_gradual.lock deleted file mode 100644 index 2a04c6a43..000000000 --- a/gems/tree_haver/.rubocop_gradual.lock +++ /dev/null @@ -1,467 +0,0 @@ -{ - ".simplecov:3575099246": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Gemfile:31081928": [ - [28, 1, 59, "Lint/EmptyConditionalBody: Avoid `if` branches without a body.", 4279378582] - ], - "Rakefile:1868927885": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/tree_haver.rb:2762889207": [ - [49, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465], - [49, 1, 15892, "Metrics/ModuleLength: Module has too many lines. [421/100]", 2307494458], - [67, 3, 566, "Metrics/MethodLength: Method has too many lines. [12/10]", 1536513137], - [124, 3, 272, "Metrics/MethodLength: Method has too many lines. [11/10]", 505877912], - [156, 3, 543, "Metrics/MethodLength: Method has too many lines. [14/10]", 3733215372], - [221, 3, 458, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `backend_module` is too high. [9/7]", 73937708], - [221, 3, 458, "Metrics/MethodLength: Method has too many lines. [12/10]", 73937708], - [221, 3, 458, "Metrics/PerceivedComplexity: Perceived complexity for `backend_module` is too high. [9/8]", 73937708], - [257, 3, 1024, "Metrics/AbcSize: Assignment Branch Condition size for `register_language` is too high. [<0, 20, 10> 22.36/17]", 53014028], - [257, 3, 1024, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `register_language` is too high. [11/7]", 53014028], - [257, 3, 1024, "Metrics/MethodLength: Method has too many lines. [12/10]", 53014028], - [257, 3, 1024, "Metrics/PerceivedComplexity: Perceived complexity for `register_language` is too high. [11/8]", 53014028], - [257, 24, 150, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 893242366], - [282, 3, 1521, "Metrics/AbcSize: Assignment Branch Condition size for `parser_for` is too high. [<12, 27, 14> 32.7/17]", 498764853], - [282, 3, 1521, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parser_for` is too high. [15/7]", 498764853], - [282, 3, 1521, "Metrics/MethodLength: Method has too many lines. [30/10]", 498764853], - [282, 3, 1521, "Metrics/PerceivedComplexity: Perceived complexity for `parser_for` is too high. [15/8]", 498764853], - [325, 3, 2089, "Metrics/MethodLength: Method has too many lines. [51/10]", 2791676388], - [379, 3, 704, "Metrics/AbcSize: Assignment Branch Condition size for `requested_backend_type` is too high. [<4, 17, 9> 19.65/17]", 3087691662], - [379, 3, 704, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `requested_backend_type` is too high. [8/7]", 3087691662], - [379, 3, 704, "Metrics/MethodLength: Method has too many lines. [14/10]", 3087691662], - [379, 3, 704, "Metrics/PerceivedComplexity: Perceived complexity for `requested_backend_type` is too high. [9/8]", 3087691662], - [409, 3, 696, "Metrics/MethodLength: Method has too many lines. [14/10]", 307274721], - [502, 3, 489, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `backend_module_for` is too high. [10/7]", 3448932255], - [502, 3, 489, "Metrics/MethodLength: Method has too many lines. [22/10]", 3448932255] - ], - "lib/tree_haver/backend_api.rb:3354059061": [ - [30, 3, 12181, "Metrics/ModuleLength: Module has too many lines. [243/100]", 205645546], - [139, 5, 8882, "Metrics/ClassLength: Class has too many lines. [180/100]", 4281605197], - [145, 7, 1502, "Metrics/AbcSize: Assignment Branch Condition size for `validate` is too high. [<4, 22, 10> 24.49/17]", 747017743], - [145, 7, 1502, "Metrics/MethodLength: Method has too many lines. [31/10]", 747017743], - [145, 7, 1502, "Metrics/PerceivedComplexity: Perceived complexity for `validate` is too high. [11/8]", 747017743], - [213, 7, 903, "Metrics/MethodLength: Method has too many lines. [24/10]", 3041411230], - [261, 7, 1271, "Metrics/AbcSize: Assignment Branch Condition size for `validate_capabilities_hash` is too high. [<7, 27, 7> 28.76/17]", 3965262932], - [261, 7, 1271, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_capabilities_hash` is too high. [8/7]", 3965262932], - [261, 7, 1271, "Metrics/MethodLength: Method has too many lines. [25/10]", 3965262932], - [277, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2253399502], - [296, 7, 908, "Metrics/AbcSize: Assignment Branch Condition size for `validate_language` is too high. [<6, 17, 4> 18.47/17]", 733551867], - [315, 7, 797, "Metrics/AbcSize: Assignment Branch Condition size for `validate_parser` is too high. [<5, 16, 7> 18.17/17]", 1229041751], - [315, 7, 797, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_parser` is too high. [8/7]", 1229041751], - [315, 7, 797, "Metrics/MethodLength: Method has too many lines. [15/10]", 1229041751], - [349, 7, 862, "Metrics/AbcSize: Assignment Branch Condition size for `validate_node_class` is too high. [<8, 18, 8> 21.26/17]", 1873188195], - [349, 7, 862, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_node_class` is too high. [8/7]", 1873188195], - [349, 7, 862, "Metrics/MethodLength: Method has too many lines. [20/10]", 1873188195], - [349, 7, 862, "Metrics/PerceivedComplexity: Perceived complexity for `validate_node_class` is too high. [9/8]", 1873188195], - [375, 11, 20, "Naming/PredicatePrefix: Rename `has_method_or_alias?` to `method_or_alias?`.", 285116235] - ], - "lib/tree_haver/backend_context.rb:159197618": [ - [3, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465] - ], - "lib/tree_haver/backend_registry.rb:4046212912": [ - [4, 3, 22, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver::BackendRegistry`.", 733935278], - [4, 3, 5121, "Metrics/ModuleLength: Module has too many lines. [152/100]", 1483988260], - [39, 5, 382, "Metrics/MethodLength: Method has too many lines. [11/10]", 2000730238], - [48, 16, 1, "Style/DoubleNegation: Avoid the use of double negation (`!!`).", 177540], - [55, 5, 889, "Metrics/AbcSize: Assignment Branch Condition size for `register_tag` is too high. [<5, 20, 5> 21.21/17]", 2276764069], - [55, 5, 889, "Metrics/MethodLength: Method has too many lines. [18/10]", 2276764069], - [105, 5, 397, "Metrics/MethodLength: Method has too many lines. [11/10]", 4007185633] - ], - "lib/tree_haver/backends/citrus.rb:3181984499": [ - [40, 9, 449, "Metrics/MethodLength: Method has too many lines. [11/10]", 1138819533], - [173, 11, 1133, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [11/7]", 2613019266], - [173, 11, 1133, "Metrics/MethodLength: Method has too many lines. [16/10]", 2613019266], - [173, 11, 1133, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [11/8]", 2613019266], - [230, 9, 597, "Metrics/MethodLength: Method has too many lines. [12/10]", 3923424594], - [403, 9, 810, "Metrics/AbcSize: Assignment Branch Condition size for `structural?` is too high. [<3, 19, 8> 20.83/17]", 3166173256], - [403, 9, 810, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structural?` is too high. [9/7]", 3166173256], - [403, 9, 810, "Metrics/MethodLength: Method has too many lines. [12/10]", 3166173256], - [403, 9, 810, "Metrics/PerceivedComplexity: Perceived complexity for `structural?` is too high. [9/8]", 3166173256], - [436, 9, 1272, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_type_from_event` is too high. [9/7]", 2022108773], - [436, 9, 1272, "Metrics/MethodLength: Method has too many lines. [16/10]", 2022108773], - [436, 9, 1272, "Metrics/PerceivedComplexity: Perceived complexity for `extract_type_from_event` is too high. [10/8]", 2022108773], - [460, 11, 207, "Style/CaseLikeIf: Convert `if-elsif` to `case-when`.", 1995588659], - [476, 61, 10, "Style/NumericPredicate: Use `offset.positive?` instead of `offset > 0`.", 2454414278] - ], - "lib/tree_haver/backends/ffi.rb:691415497": [ - [83, 9, 853, "Metrics/MethodLength: Method has too many lines. [15/10]", 1876257977], - [147, 7, 7352, "Metrics/ModuleLength: Module has too many lines. [111/100]", 4125377349], - [148, 9, 7320, "Metrics/ClassLength: Class has too many lines. [109/100]", 1130902814], - [183, 11, 559, "Metrics/MethodLength: Method has too many lines. [11/10]", 678018999], - [232, 11, 4265, "Metrics/AbcSize: Assignment Branch Condition size for `try_load!` is too high. [<11, 40, 10> 42.67/17]", 2312962113], - [232, 11, 4265, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `try_load!` is too high. [10/7]", 2312962113], - [232, 11, 4265, "Metrics/MethodLength: Method has too many lines. [58/10]", 2312962113], - [232, 11, 4265, "Metrics/PerceivedComplexity: Perceived complexity for `try_load!` is too high. [11/8]", 2312962113], - [260, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2086221887], - [262, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2163360042], - [367, 9, 312, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `<=>` is too high. [8/7]", 2433292528], - [437, 11, 4377, "Metrics/AbcSize: Assignment Branch Condition size for `from_library` is too high. [<16, 30, 18> 38.47/17]", 3403850855], - [437, 11, 4377, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [17/7]", 3403850855], - [437, 11, 4377, "Metrics/MethodLength: Method has too many lines. [43/10]", 3403850855], - [437, 11, 4377, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [19/8]", 3403850855], - [437, 47, 4, "Lint/UnusedMethodArgument: Unused method argument - `name`.", 2087876002], - [502, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2415433817], - [554, 9, 3159, "Metrics/AbcSize: Assignment Branch Condition size for `language=` is too high. [<4, 44, 11> 45.53/17]", 1815427493], - [554, 9, 3159, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `language=` is too high. [10/7]", 1815427493], - [554, 9, 3159, "Metrics/MethodLength: Method has too many lines. [40/10]", 1815427493], - [554, 9, 3159, "Metrics/PerceivedComplexity: Perceived complexity for `language=` is too high. [10/8]", 1815427493], - [715, 7, 10494, "Metrics/ClassLength: Class has too many lines. [129/100]", 3710916551], - [744, 45, 9, "Style/NumericPredicate: Use `index.negative?` instead of `index < 0`.", 4215255415], - [807, 13, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183], - [889, 21, 9, "Style/NumericPredicate: Use `index.negative?` instead of `index < 0`.", 4215255415], - [933, 9, 694, "Metrics/AbcSize: Assignment Branch Condition size for `descendant_for_point_range` is too high. [<7, 21, 5> 22.69/17]", 979329510], - [953, 9, 706, "Metrics/AbcSize: Assignment Branch Condition size for `named_descendant_for_point_range` is too high. [<7, 21, 5> 22.69/17]", 2494446138] - ], - "lib/tree_haver/backends/java.rb:3360169733": [ - [134, 7, 815, "Metrics/AbcSize: Assignment Branch Condition size for `configure_native_library_path!` is too high. [<4, 17, 6> 18.47/17]", 1362415302], - [227, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3409700051], - [260, 7, 9885, "Metrics/ClassLength: Class has too many lines. [114/100]", 136252046], - [292, 9, 312, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `<=>` is too high. [8/7]", 2433292528], - [340, 11, 4098, "Metrics/AbcSize: Assignment Branch Condition size for `from_library` is too high. [<19, 32, 14> 39.76/17]", 3050250526], - [340, 11, 4098, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [14/7]", 3050250526], - [340, 11, 4098, "Metrics/MethodLength: Method has too many lines. [48/10]", 3050250526], - [340, 11, 4098, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [16/8]", 3050250526], - [426, 11, 2084, "Metrics/AbcSize: Assignment Branch Condition size for `load_by_name` is too high. [<11, 17, 6> 21.12/17]", 226213748], - [426, 11, 2084, "Metrics/MethodLength: Method has too many lines. [35/10]", 226213748], - [542, 9, 1016, "Metrics/MethodLength: Method has too many lines. [17/10]", 4123264427], - [649, 9, 702, "Metrics/MethodLength: Method has too many lines. [14/10]", 1334016319], - [649, 17, 89, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3152137646], - [728, 9, 583, "Metrics/MethodLength: Method has too many lines. [11/10]", 2457478600], - [816, 13, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183] - ], - "lib/tree_haver/backends/mri.rb:863330290": [ - [59, 9, 916, "Metrics/MethodLength: Method has too many lines. [15/10]", 749971754], - [179, 9, 312, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `<=>` is too high. [8/7]", 2433292528], - [232, 11, 1562, "Metrics/MethodLength: Method has too many lines. [11/10]", 3858647816] - ], - "lib/tree_haver/backends/parslet.rb:4170691266": [ - [41, 9, 323, "Metrics/MethodLength: Method has too many lines. [11/10]", 694290592], - [108, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193340030], - [172, 11, 1133, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [11/7]", 2613019266], - [172, 11, 1133, "Metrics/MethodLength: Method has too many lines. [16/10]", 2613019266], - [172, 11, 1133, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [11/8]", 2613019266], - [246, 9, 591, "Metrics/MethodLength: Method has too many lines. [12/10]", 3007454066], - [335, 7, 6287, "Metrics/ClassLength: Class has too many lines. [155/100]", 3100555518], - [362, 9, 452, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `start_byte` is too high. [8/7]", 2663206926], - [362, 9, 452, "Metrics/MethodLength: Method has too many lines. [12/10]", 2663206926], - [380, 9, 557, "Metrics/MethodLength: Method has too many lines. [12/10]", 2982914846], - [443, 9, 404, "Metrics/MethodLength: Method has too many lines. [11/10]", 1111982079], - [495, 61, 10, "Style/NumericPredicate: Use `offset.positive?` instead of `offset > 0`.", 2454414278], - [501, 9, 313, "Metrics/MethodLength: Method has too many lines. [13/10]", 1927903077], - [519, 9, 448, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_first_slice` is too high. [8/7]", 229178429], - [519, 9, 448, "Metrics/MethodLength: Method has too many lines. [16/10]", 229178429], - [524, 17, 11, "Style/HashEachMethods: Use `each_value` instead of `values.each`.", 236538172], - [539, 9, 461, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_last_slice` is too high. [8/7]", 3960808114], - [539, 9, 461, "Metrics/MethodLength: Method has too many lines. [16/10]", 3960808114] - ], - "lib/tree_haver/backends/prism.rb:265399087": [ - [39, 9, 448, "Metrics/MethodLength: Method has too many lines. [11/10]", 2383415890], - [70, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 721867551], - [71, 9, 712, "Metrics/MethodLength: Method has too many lines. [12/10]", 1576927704], - [145, 41, 6, "Lint/UnusedMethodArgument: Unused method argument - `symbol`.", 2153517219], - [182, 9, 554, "Metrics/MethodLength: Method has too many lines. [16/10]", 3452414947], - [250, 13, 11, "Naming/PredicatePrefix: Rename `has_errors?` to `errors?`.", 1181419252], - [275, 69, 27, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1979346241], - [301, 13, 64, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1942915391], - [305, 9, 519, "Metrics/AbcSize: Assignment Branch Condition size for `classify_comment_hint` is too high. [<5, 20, 5> 21.21/17]", 869270335], - [485, 13, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183], - [554, 24, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] - ], - "lib/tree_haver/backends/psych.rb:1528613408": [ - [30, 9, 448, "Metrics/MethodLength: Method has too many lines. [11/10]", 2367418678], - [59, 9, 601, "Metrics/MethodLength: Method has too many lines. [11/10]", 2824278890], - [342, 9, 901, "Metrics/AbcSize: Assignment Branch Condition size for `extract_text_from_location` is too high. [<8, 23, 18> 30.28/17]", 1252700264], - [342, 9, 901, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_text_from_location` is too high. [14/7]", 1252700264], - [342, 9, 901, "Metrics/MethodLength: Method has too many lines. [22/10]", 1252700264], - [342, 9, 901, "Metrics/PerceivedComplexity: Perceived complexity for `extract_text_from_location` is too high. [16/8]", 1252700264] - ], - "lib/tree_haver/backends/rust.rb:3784474048": [ - [52, 9, 548, "Metrics/MethodLength: Method has too many lines. [15/10]", 3791803966], - [156, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548] - ], - "lib/tree_haver/backends/tslp.rb:1702759733": [ - [18, 9, 559, "Metrics/MethodLength: Method has too many lines. [14/10]", 1306507697], - [68, 7, 14, "Style/Documentation: Missing top-level documentation comment for `class TreeHaver::Backends::Tslp::Language`.", 3674592793], - [80, 7, 12, "Style/Documentation: Missing top-level documentation comment for `class TreeHaver::Backends::Tslp::Parser`.", 2485220908], - [81, 9, 582, "Metrics/AbcSize: Assignment Branch Condition size for `parse` is too high. [<2, 17, 4> 17.58/17]", 103430155], - [103, 7, 10, "Style/Documentation: Missing top-level documentation comment for `class TreeHaver::Backends::Tslp::Tree`.", 3516465773], - [109, 7, 10, "Style/Documentation: Missing top-level documentation comment for `class TreeHaver::Backends::Tslp::Node`.", 3515419275], - [143, 13, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183] - ], - "lib/tree_haver/base/comment.rb:699160654": [ - [10, 5, 8183, "Metrics/ClassLength: Class has too many lines. [152/100]", 4001235397] - ], - "lib/tree_haver/base/node.rb:586469776": [ - [36, 5, 7668, "Metrics/ClassLength: Class has too many lines. [156/100]", 171773185], - [162, 11, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183], - [208, 27, 8, "Style/NumericPredicate: Use `cmp.zero?` instead of `cmp == 0`.", 736104011], - [239, 7, 888, "Metrics/AbcSize: Assignment Branch Condition size for `source_position` is too high. [<6, 20, 12> 24.08/17]", 3968023659], - [239, 7, 888, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `source_position` is too high. [9/7]", 3968023659], - [239, 7, 888, "Metrics/MethodLength: Method has too many lines. [28/10]", 3968023659], - [239, 7, 888, "Metrics/PerceivedComplexity: Perceived complexity for `source_position` is too high. [13/8]", 3968023659], - [306, 7, 355, "Metrics/MethodLength: Method has too many lines. [11/10]", 1012295608] - ], - "lib/tree_haver/base/tree.rb:3081630142": [ - [89, 15, 145, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1155535733], - [103, 11, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183] - ], - "lib/tree_haver/citrus_grammar_finder.rb:2540014236": [ - [31, 3, 7013, "Metrics/ClassLength: Class has too many lines. [102/100]", 245808593], - [66, 5, 3770, "Metrics/AbcSize: Assignment Branch Condition size for `available?` is too high. [<16, 52, 21> 58.32/17]", 3886463212], - [66, 5, 3770, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `available?` is too high. [22/7]", 3886463212], - [66, 5, 3770, "Metrics/MethodLength: Method has too many lines. [50/10]", 3886463212], - [66, 5, 3770, "Metrics/PerceivedComplexity: Perceived complexity for `available?` is too high. [22/8]", 3886463212], - [94, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858894] - ], - "lib/tree_haver/contracts.rb:1571706604": [ - [3, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465], - [3, 1, 28139, "Metrics/ModuleLength: Module has too many lines. [924/100]", 3701899480], - [91, 5, 732, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 18, 2> 18.11/17]", 3031678572], - [91, 5, 732, "Metrics/MethodLength: Method has too many lines. [17/10]", 3031678572], - [170, 5, 697, "Metrics/MethodLength: Method has too many lines. [18/10]", 389212725], - [231, 5, 507, "Metrics/MethodLength: Method has too many lines. [13/10]", 2631332781], - [329, 5, 580, "Metrics/MethodLength: Method has too many lines. [13/10]", 2166080747], - [558, 5, 558, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 17, 4> 17.46/17]", 2109105399], - [558, 5, 558, "Metrics/MethodLength: Method has too many lines. [18/10]", 2109105399], - [610, 3, 780, "Metrics/AbcSize: Assignment Branch Condition size for `library_path_errors` is too high. [<3, 20, 10> 22.56/17]", 1003454820], - [610, 3, 780, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `library_path_errors` is too high. [10/7]", 1003454820], - [610, 3, 780, "Metrics/MethodLength: Method has too many lines. [14/10]", 1003454820], - [610, 3, 780, "Metrics/PerceivedComplexity: Perceived complexity for `library_path_errors` is too high. [10/8]", 1003454820], - [652, 3, 686, "Metrics/MethodLength: Method has too many lines. [16/10]", 2530945134], - [674, 3, 483, "Metrics/MethodLength: Method has too many lines. [15/10]", 3654427448], - [693, 3, 511, "Metrics/MethodLength: Method has too many lines. [16/10]", 145071639], - [770, 5, 384, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 19, 6> 19.92/17]", 1287649270], - [841, 5, 449, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [10/7]", 1722332092], - [841, 5, 449, "Metrics/PerceivedComplexity: Perceived complexity for `to_h` is too high. [10/8]", 1722332092], - [873, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177610], - [874, 5, 420, "Metrics/MethodLength: Method has too many lines. [12/10]", 722580369], - [914, 42, 8, "Lint/StructNewOverride: `:entries` member overrides `Struct#entries` and it may be unexpected.", 999966509], - [937, 3, 473, "Metrics/MethodLength: Method has too many lines. [18/10]", 1284459726], - [958, 3, 655, "Metrics/AbcSize: Assignment Branch Condition size for `byte_offset_for_point` is too high. [<7, 25, 14> 29.5/17]", 1278853347], - [958, 3, 655, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `byte_offset_for_point` is too high. [9/7]", 1278853347], - [958, 3, 655, "Metrics/MethodLength: Method has too many lines. [17/10]", 1278853347], - [958, 3, 655, "Metrics/PerceivedComplexity: Perceived complexity for `byte_offset_for_point` is too high. [10/8]", 1278853347] - ], - "lib/tree_haver/grammar_finder.rb:3107533528": [ - [55, 3, 13660, "Metrics/ClassLength: Class has too many lines. [200/100]", 1847629568], - [155, 5, 1710, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_library_path` is too high. [8/7]", 4164717952], - [155, 5, 1710, "Metrics/MethodLength: Method has too many lines. [25/10]", 4164717952], - [269, 7, 845, "Metrics/MethodLength: Method has too many lines. [12/10]", 916567473], - [315, 5, 577, "Metrics/MethodLength: Method has too many lines. [16/10]", 651056353], - [340, 5, 623, "Metrics/MethodLength: Method has too many lines. [14/10]", 1438381615], - [360, 5, 846, "Metrics/MethodLength: Method has too many lines. [12/10]", 667615068], - [398, 5, 653, "Metrics/MethodLength: Method has too many lines. [12/10]", 1765172995] - ], - "lib/tree_haver/kaitai_backend.rb:335397596": [ - [3, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465] - ], - "lib/tree_haver/language.rb:2775049278": [ - [39, 3, 12087, "Metrics/ModuleLength: Module has too many lines. [115/100]", 221887443], - [40, 5, 12061, "Metrics/ClassLength: Class has too many lines. [113/100]", 309443185], - [89, 7, 1966, "Metrics/AbcSize: Assignment Branch Condition size for `from_library` is too high. [<4, 20, 10> 22.72/17]", 980659500], - [89, 7, 1966, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [9/7]", 980659500], - [89, 7, 1966, "Metrics/MethodLength: Method has too many lines. [31/10]", 980659500], - [89, 7, 1966, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [11/8]", 980659500], - [114, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177538], - [156, 7, 4289, "Metrics/AbcSize: Assignment Branch Condition size for `method_missing` is too high. [<10, 39, 30> 50.21/17]", 1314689525], - [156, 7, 4289, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `method_missing` is too high. [24/7]", 1314689525], - [156, 7, 4289, "Metrics/MethodLength: Method has too many lines. [56/10]", 1314689525], - [156, 7, 4289, "Metrics/PerceivedComplexity: Perceived complexity for `method_missing` is too high. [26/8]", 1314689525], - [274, 7, 786, "Metrics/MethodLength: Method has too many lines. [12/10]", 3697766033] - ], - "lib/tree_haver/language_pack.rb:3024861237": [ - [3, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465] - ], - "lib/tree_haver/language_registry.rb:3950096220": [ - [83, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861089] - ], - "lib/tree_haver/library_path_utils.rb:1552423902": [ - [32, 5, 861, "Metrics/MethodLength: Method has too many lines. [12/10]", 1638068630] - ], - "lib/tree_haver/node.rb:715762930": [ - [62, 3, 16601, "Metrics/ClassLength: Class has too many lines. [237/100]", 2290466920], - [136, 5, 708, "Metrics/AbcSize: Assignment Branch Condition size for `start_point` is too high. [<2, 19, 7> 20.35/17]", 2066418249], - [136, 5, 708, "Metrics/MethodLength: Method has too many lines. [17/10]", 2066418249], - [161, 5, 694, "Metrics/AbcSize: Assignment Branch Condition size for `end_point` is too high. [<2, 19, 7> 20.35/17]", 2127773446], - [161, 5, 694, "Metrics/MethodLength: Method has too many lines. [17/10]", 2127773446], - [232, 5, 948, "Metrics/AbcSize: Assignment Branch Condition size for `text` is too high. [<1, 14, 11> 17.83/17]", 748349201], - [232, 5, 948, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `text` is too high. [9/7]", 748349201], - [232, 5, 948, "Metrics/MethodLength: Method has too many lines. [16/10]", 748349201], - [232, 5, 948, "Metrics/PerceivedComplexity: Perceived complexity for `text` is too high. [11/8]", 748349201], - [259, 9, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183], - [328, 5, 994, "Metrics/AbcSize: Assignment Branch Condition size for `named_child` is too high. [<6, 13, 10> 17.46/17]", 3449163117], - [328, 5, 994, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `named_child` is too high. [9/7]", 3449163117], - [328, 5, 994, "Metrics/MethodLength: Method has too many lines. [21/10]", 3449163117], - [328, 5, 994, "Metrics/PerceivedComplexity: Perceived complexity for `named_child` is too high. [10/8]", 3449163117], - [366, 5, 734, "Metrics/MethodLength: Method has too many lines. [15/10]", 3099919150], - [425, 7, 4, "Style/EmptyElse: Redundant `else`-clause.", 2087423834] - ], - "lib/tree_haver/parser.rb:1959976510": [ - [71, 3, 15231, "Metrics/ClassLength: Class has too many lines. [181/100]", 2262931609], - [84, 5, 938, "Metrics/MethodLength: Method has too many lines. [13/10]", 569209133], - [116, 5, 844, "Metrics/MethodLength: Method has too many lines. [11/10]", 3700471369], - [141, 5, 583, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `backend` is too high. [9/7]", 942469984], - [141, 5, 583, "Metrics/MethodLength: Method has too many lines. [20/10]", 942469984], - [237, 5, 1114, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_string` is too high. [8/7]", 2146281390], - [237, 5, 1114, "Metrics/MethodLength: Method has too many lines. [16/10]", 2146281390], - [237, 5, 1114, "Metrics/PerceivedComplexity: Perceived complexity for `parse_string` is too high. [10/8]", 2146281390], - [273, 5, 1162, "Metrics/AbcSize: Assignment Branch Condition size for `switch_backend_for_language` is too high. [<10, 11, 11> 18.49/17]", 3918477333], - [273, 5, 1162, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `switch_backend_for_language` is too high. [11/7]", 3918477333], - [273, 5, 1162, "Metrics/MethodLength: Method has too many lines. [26/10]", 3918477333], - [273, 5, 1162, "Metrics/PerceivedComplexity: Perceived complexity for `switch_backend_for_language` is too high. [9/8]", 3918477333], - [320, 5, 3598, "Metrics/AbcSize: Assignment Branch Condition size for `unwrap_language` is too high. [<4, 32, 32> 45.43/17]", 2683894777], - [320, 5, 3598, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `unwrap_language` is too high. [29/7]", 2683894777], - [320, 5, 3598, "Metrics/MethodLength: Method has too many lines. [55/10]", 2683894777], - [320, 5, 3598, "Metrics/PerceivedComplexity: Perceived complexity for `unwrap_language` is too high. [23/8]", 2683894777], - [414, 5, 892, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `try_reload_language_for_backend` is too high. [9/7]", 1872419716], - [414, 5, 892, "Metrics/MethodLength: Method has too many lines. [14/10]", 1872419716], - [414, 5, 892, "Metrics/PerceivedComplexity: Perceived complexity for `try_reload_language_for_backend` is too high. [9/8]", 1872419716] - ], - "lib/tree_haver/parslet_grammar_finder.rb:756779364": [ - [32, 3, 6418, "Metrics/ClassLength: Class has too many lines. [105/100]", 2916347470], - [67, 5, 2630, "Metrics/AbcSize: Assignment Branch Condition size for `available?` is too high. [<14, 39, 19> 45.59/17]", 1827795944], - [67, 5, 2630, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `available?` is too high. [20/7]", 1827795944], - [67, 5, 2630, "Metrics/MethodLength: Method has too many lines. [43/10]", 1827795944], - [67, 5, 2630, "Metrics/PerceivedComplexity: Perceived complexity for `available?` is too high. [20/8]", 1827795944] - ], - "lib/tree_haver/path_validator.rb:1827441298": [ - [31, 3, 11571, "Metrics/ModuleLength: Module has too many lines. [133/100]", 3916793077], - [71, 5, 1048, "Metrics/AbcSize: Assignment Branch Condition size for `trusted_directories` is too high. [<4, 16, 5> 17.23/17]", 2683168069], - [71, 5, 1048, "Metrics/MethodLength: Method has too many lines. [13/10]", 2683168069], - [182, 5, 1000, "Metrics/AbcSize: Assignment Branch Condition size for `safe_library_path?` is too high. [<1, 15, 15> 21.24/17]", 3331427816], - [182, 5, 1000, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `safe_library_path?` is too high. [15/7]", 3331427816], - [182, 5, 1000, "Metrics/MethodLength: Method has too many lines. [11/10]", 3331427816], - [182, 5, 1000, "Metrics/PerceivedComplexity: Perceived complexity for `safe_library_path?` is too high. [15/8]", 3331427816], - [314, 5, 911, "Metrics/AbcSize: Assignment Branch Condition size for `validation_errors` is too high. [<2, 21, 13> 24.78/17]", 1249065882], - [314, 5, 911, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validation_errors` is too high. [13/7]", 1249065882], - [314, 5, 911, "Metrics/MethodLength: Method has too many lines. [14/10]", 1249065882], - [314, 5, 911, "Metrics/PerceivedComplexity: Perceived complexity for `validation_errors` is too high. [13/8]", 1249065882], - [345, 9, 20, "Naming/PredicatePrefix: Rename `has_valid_extension?` to `valid_extension?`.", 2041908655] - ], - "lib/tree_haver/peg_backends.rb:2882446693": [ - [3, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465], - [37, 3, 611, "Metrics/MethodLength: Method has too many lines. [21/10]", 2394303132], - [39, 11, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [61, 3, 377, "Metrics/MethodLength: Method has too many lines. [13/10]", 1137341195] - ], - "lib/tree_haver/rspec/dependency_tags.rb:2954930617": [ - [7, 5, 21, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver::RSpec::DependencyTags`.", 2626933713] - ], - "lib/tree_haver/tree.rb:3332079774": [ - [129, 5, 1443, "Metrics/AbcSize: Assignment Branch Condition size for `edit` is too high. [<8, 18, 7> 20.9/17]", 4208399016], - [129, 5, 1443, "Metrics/MethodLength: Method has too many lines. [24/10]", 4208399016], - [129, 13, 89, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3152137646] - ], - "spec/backend_registry_spec.rb:229950927": [ - [5, 1, 3102, "Metrics/BlockLength: Block has too many lines. [62/25]", 3416335650] - ], - "spec/backends/tslp_spec.rb:1444201405": [ - [5, 1, 5497, "Metrics/BlockLength: Block has too many lines. [121/25]", 4279461260], - [30, 3, 1477, "Metrics/BlockLength: Block has too many lines. [32/25]", 2492475187], - [112, 3, 1352, "Metrics/BlockLength: Block has too many lines. [29/25]", 2972556266] - ], - "spec/fixtures_integration_spec.rb:3457821347": [ - [3, 1, 48556, "Metrics/BlockLength: Block has too many lines. [1006/25]", 2138474637], - [108, 3, 1282, "Metrics/BlockLength: Block has too many lines. [29/25]", 505243730], - [141, 3, 1840, "Metrics/BlockLength: Block has too many lines. [35/25]", 1365684528], - [180, 3, 1365, "Metrics/BlockLength: Block has too many lines. [33/25]", 1597100003], - [247, 3, 2110, "Metrics/BlockLength: Block has too many lines. [41/25]", 219204301], - [294, 3, 2166, "Metrics/BlockLength: Block has too many lines. [27/25]", 2219571348], - [354, 3, 1786, "Metrics/BlockLength: Block has too many lines. [30/25]", 1655451032], - [432, 3, 1345, "Metrics/BlockLength: Block has too many lines. [26/25]", 1188499098], - [534, 3, 3250, "Metrics/BlockLength: Block has too many lines. [64/25]", 2852118886], - [589, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 2115564430], - [602, 3, 752, "Metrics/AbcSize: Assignment Branch Condition size for `normalized_tree_node` is too high. [<0, 19, 4> 19.42/17]", 1725197185], - [602, 3, 752, "Metrics/MethodLength: Method has too many lines. [18/10]", 1725197185], - [623, 3, 850, "Metrics/AbcSize: Assignment Branch Condition size for `backend_capability` is too high. [<0, 20, 0> 20/17]", 3278569026], - [623, 3, 850, "Metrics/MethodLength: Method has too many lines. [14/10]", 3278569026], - [640, 3, 744, "Metrics/MethodLength: Method has too many lines. [13/10]", 1675624229], - [679, 3, 492, "Metrics/MethodLength: Method has too many lines. [11/10]", 4123526878], - [714, 3, 566, "Metrics/AbcSize: Assignment Branch Condition size for `parse_error_tolerance` is too high. [<1, 17, 1> 17.06/17]", 933590597], - [714, 3, 566, "Metrics/MethodLength: Method has too many lines. [14/10]", 933590597], - [739, 3, 2652, "Metrics/BlockLength: Block has too many lines. [47/25]", 214520278], - [1039, 7, 87, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3860036845], - [1045, 7, 60, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1411318317], - [1063, 3, 1334, "Metrics/BlockLength: Block has too many lines. [41/25]", 1427111445], - [1069, 7, 134, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1166944291], - [1075, 7, 60, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1411318317], - [1085, 7, 134, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1166944291], - [1091, 7, 60, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1411318317] - ], - "tree_haver.gemspec:665267582": [ - [16, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1512975621], - [129, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [146, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [147, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [154, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ] -} diff --git a/gems/tree_haver/Gemfile.lock b/gems/tree_haver/Gemfile.lock index 8e744e1af..7191bd2b0 100644 --- a/gems/tree_haver/Gemfile.lock +++ b/gems/tree_haver/Gemfile.lock @@ -7,59 +7,304 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -GEM - remote: https://gem.coop/ +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - ansi (1.6.0) - appraisal2 (3.2.0) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - ast (2.4.3) - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) ast-crispr-markdown-markly (7.1.0) ast-crispr (= 7.1.0) markly-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) prism (>= 1.0) version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: ast-merge (7.1.0) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) - backports (3.25.3) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: bash-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + +GEM + remote: https://gem.coop/ + specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + ansi (1.6.0) + appraisal2 (3.2.0) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + 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) citrus (3.0.2) - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) cmdparse (3.0.7) commonmarker (2.9.0-aarch64-linux) commonmarker (2.9.0-aarch64-linux-musl) commonmarker (2.9.0-arm64-darwin) commonmarker (2.9.0-x86_64-linux) commonmarker (2.9.0-x86_64-linux-musl) - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -68,11 +313,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -122,52 +362,12 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -181,24 +381,12 @@ GEM turbo_tests2 (~> 3.1, >= 3.1.12) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) 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.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -224,18 +412,9 @@ GEM prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) psych (5.4.0) date stringio - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -244,11 +423,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) rdoc (6.17.0) erb psych (>= 4.0.0) @@ -344,10 +518,6 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -356,22 +526,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -407,10 +573,6 @@ GEM version_gem (~> 1.1, >= 1.1.13) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) @@ -434,10 +596,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.13) - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) yard (0.9.45) yard-fence (0.9.6) rdoc (>= 6.11, < 8) @@ -470,24 +628,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem (>= 7.0) - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-drift! + kettle-jem! + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -496,20 +675,27 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml (~> 0.3) + toml-merge! toml-rb (~> 4.1) tree_haver! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -520,10 +706,13 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) @@ -540,7 +729,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -554,16 +742,17 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -587,6 +776,8 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 @@ -630,15 +821,15 @@ 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -661,6 +852,7 @@ CHECKSUMS tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) sha256=ad6743a373eeac954c1b659b17af3aff1c82918b3ce9c9dc572a7c70ff843cdd tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -673,6 +865,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From ba98c1c532053b40f55378ed6df3f27acb902d7a Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:24:34 -0600 Subject: [PATCH 217/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-crispr/.rubocop_gradual.lock | 213 +++++++++++ gems/ast-crispr/Gemfile.lock | 392 ++------------------ gems/ast-merge/Gemfile | 70 +++- gems/ast-merge/README.md | 1 + gems/ast-merge/Rakefile | 18 +- gems/ast-merge/lib/ast/merge/version.rb | 2 +- gems/tree_haver/.rubocop_gradual.lock | 467 ++++++++++++++++++++++++ 7 files changed, 783 insertions(+), 380 deletions(-) create mode 100644 gems/ast-crispr/.rubocop_gradual.lock create mode 100644 gems/tree_haver/.rubocop_gradual.lock diff --git a/gems/ast-crispr/.rubocop_gradual.lock b/gems/ast-crispr/.rubocop_gradual.lock new file mode 100644 index 000000000..d920cf89f --- /dev/null +++ b/gems/ast-crispr/.rubocop_gradual.lock @@ -0,0 +1,213 @@ +{ + ".simplecov:3928423310": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:918344237": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "ast-crispr.gemspec:2262341056": [ + [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/ast-crispr.rb:247837913": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`ast-crispr.rb`) should use snake_case.", 5381] + ], + "lib/ast/crispr.rb:3730230259": [ + [12, 5, 11, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Error`.", 62528179], + [22, 5, 11, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Limit`.", 51888158], + [47, 7, 622, "Metrics/MethodLength: Method has too many lines. [14/10]", 2816807495], + [61, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], + [65, 7, 1168, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_hash` is too high. [<6, 29, 10> 31.26/17]", 3515286222], + [65, 7, 1168, "Metrics/MethodLength: Method has too many lines. [27/10]", 3515286222], + [90, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3685471369], + [96, 7, 822, "Metrics/AbcSize: Assignment Branch Condition size for `constraint_for_operator` is too high. [<5, 11, 13> 17.75/17]", 1402705503], + [96, 7, 822, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `constraint_for_operator` is too high. [8/7]", 1402705503], + [96, 7, 822, "Metrics/MethodLength: Method has too many lines. [19/10]", 1402705503], + [124, 5, 11, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Match`.", 52676120], + [127, 21, 73, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 344717847], + [172, 5, 18, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::MatchProfile`.", 365273299], + [172, 5, 4350, "Metrics/ClassLength: Class has too many lines. [115/100]", 1575766989], + [273, 7, 596, "Metrics/MethodLength: Method has too many lines. [14/10]", 2070486858], + [314, 5, 24, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::DestinationProfile`.", 3442102524], + [314, 5, 4581, "Metrics/ClassLength: Class has too many lines. [119/100]", 3503477661], + [352, 21, 126, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 931636409], + [417, 7, 667, "Metrics/MethodLength: Method has too many lines. [15/10]", 4004247638], + [460, 5, 27, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::DestinationResolution`.", 1305107769], + [474, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::StructureProfile`.", 614380405], + [512, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::SelectionProfile`.", 2464089216], + [531, 21, 165, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1182500333], + [566, 7, 585, "Metrics/MethodLength: Method has too many lines. [13/10]", 13786997], + [583, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::OperationProfile`.", 1974079861], + [607, 21, 188, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2526147676], + [662, 7, 478, "Metrics/MethodLength: Method has too many lines. [11/10]", 795235914], + [695, 7, 10, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Adapters::Null`.", 3515430288], + [728, 5, 21, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::DocumentContext`.", 594998459], + [788, 5, 19, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::OwnerSelector`.", 3092459999], + [791, 21, 81, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2293822273], + [853, 7, 606, "Metrics/MethodLength: Method has too many lines. [16/10]", 422136278], + [883, 5, 16, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::Selectors`.", 2133324825], + [883, 5, 5586, "Metrics/ModuleLength: Module has too many lines. [130/100]", 3440946513], + [886, 7, 1642, "Metrics/AbcSize: Assignment Branch Condition size for `owner_filter` is too high. [<6, 18, 11> 21.93/17]", 3224577904], + [886, 7, 1642, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `owner_filter` is too high. [10/7]", 3224577904], + [886, 7, 1642, "Metrics/MethodLength: Method has too many lines. [37/10]", 3224577904], + [886, 7, 1642, "Metrics/PerceivedComplexity: Perceived complexity for `owner_filter` is too high. [11/8]", 3224577904], + [886, 23, 135, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3231562627], + [930, 7, 1936, "Metrics/AbcSize: Assignment Branch Condition size for `comment_region_owned_owner` is too high. [<7, 16, 7> 18.81/17]", 2629441148], + [930, 7, 1936, "Metrics/MethodLength: Method has too many lines. [40/10]", 2629441148], + [930, 37, 190, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 4159525724], + [931, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 940069302], + [975, 7, 1731, "Metrics/AbcSize: Assignment Branch Condition size for `line_block` is too high. [<12, 22, 14> 28.71/17]", 1307990669], + [975, 7, 1731, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `line_block` is too high. [12/7]", 1307990669], + [975, 7, 1731, "Metrics/MethodLength: Method has too many lines. [38/10]", 1307990669], + [975, 7, 1731, "Metrics/PerceivedComplexity: Perceived complexity for `line_block` is too high. [12/8]", 1307990669], + [975, 21, 130, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 515174999], + [1027, 5, 23, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::OperationSupport`.", 343849029], + [1027, 5, 6491, "Metrics/ModuleLength: Module has too many lines. [139/100]", 2271788056], + [1072, 7, 1758, "Metrics/AbcSize: Assignment Branch Condition size for `insertion_from` is too high. [<5, 21, 11> 24.23/17]", 29011294], + [1072, 7, 1758, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `insertion_from` is too high. [9/7]", 29011294], + [1072, 7, 1758, "Metrics/MethodLength: Method has too many lines. [28/10]", 29011294], + [1072, 7, 1758, "Metrics/PerceivedComplexity: Perceived complexity for `insertion_from` is too high. [10/8]", 29011294], + [1115, 7, 827, "Metrics/AbcSize: Assignment Branch Condition size for `splice_after_anchor` is too high. [<4, 19, 2> 19.52/17]", 14691010], + [1115, 7, 827, "Metrics/MethodLength: Method has too many lines. [16/10]", 14691010], + [1119, 9, 72, "Style/RaiseArgs: Provide an exception class and message as arguments to `raise`.", 789091243], + [1121, 23, 72, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 2503424841], + [1153, 9, 25, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 768340433], + [1197, 5, 26, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::OperationProfilable`.", 4114431854], + [1206, 7, 19, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::OperationProfilable::ClassMethods`.", 3606528253], + [1218, 5, 13, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Replace`.", 1563590855], + [1243, 7, 643, "Metrics/AbcSize: Assignment Branch Condition size for `call` is too high. [<10, 32, 3> 33.66/17]", 3656683885], + [1243, 7, 643, "Metrics/MethodLength: Method has too many lines. [14/10]", 3656683885], + [1262, 5, 12, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Delete`.", 2011475922], + [1286, 7, 538, "Metrics/AbcSize: Assignment Branch Condition size for `call` is too high. [<7, 21, 1> 22.16/17]", 2655200768], + [1286, 7, 538, "Metrics/MethodLength: Method has too many lines. [13/10]", 2655200768], + [1304, 5, 12, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Insert`.", 1590185308], + [1338, 5, 10, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Move`.", 3515667002], + [1366, 7, 1182, "Metrics/AbcSize: Assignment Branch Condition size for `call` is too high. [<14, 40, 7> 42.95/17]", 172197360], + [1366, 7, 1182, "Metrics/MethodLength: Method has too many lines. [22/10]", 172197360], + [1383, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2688172402], + [1396, 3, 13, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr`.", 315644438], + [1396, 3, 12758, "Metrics/ModuleLength: Module has too many lines. [180/100]", 2662313186], + [1397, 5, 33, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::ProfileReportCompatibility`.", 3039519892], + [1419, 5, 18, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::MatchProfile`.", 365273299], + [1431, 7, 28, "Lint/DuplicateMethods: Method `Ast::Crispr::MatchProfile#normalize_start_boundary` is defined at both lib/ast/crispr.rb:292 and lib/ast/crispr.rb:1431.", 2362701855], + [1435, 7, 26, "Lint/DuplicateMethods: Method `Ast::Crispr::MatchProfile#normalize_end_boundary` is defined at both lib/ast/crispr.rb:299 and lib/ast/crispr.rb:1435.", 2613594544], + [1439, 7, 26, "Lint/DuplicateMethods: Method `Ast::Crispr::MatchProfile#normalize_payload_kind` is defined at both lib/ast/crispr.rb:306 and lib/ast/crispr.rb:1439.", 2604742721], + [1444, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::SelectionProfile`.", 2464089216], + [1466, 7, 14, "Lint/DuplicateMethods: Method `Ast::Crispr::SelectionProfile#initialize` is defined at both lib/ast/crispr.rb:531 and lib/ast/crispr.rb:1466.", 956205738], + [1466, 7, 773, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `initialize` is too high. [8/7]", 771809109], + [1466, 7, 773, "Metrics/MethodLength: Method has too many lines. [11/10]", 771809109], + [1466, 21, 190, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 4167448336], + [1481, 7, 1286, "Metrics/AbcSize: Assignment Branch Condition size for `report` is too high. [<5, 29, 13> 32.17/17]", 1720478959], + [1481, 7, 1286, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report` is too high. [11/7]", 1720478959], + [1481, 7, 1286, "Metrics/MethodLength: Method has too many lines. [17/10]", 1720478959], + [1481, 7, 1286, "Metrics/PerceivedComplexity: Perceived complexity for `report` is too high. [11/8]", 1720478959], + [1496, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 1470192175], + [1520, 5, 24, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::DestinationProfile`.", 3442102524], + [1534, 7, 29, "Lint/DuplicateMethods: Method `Ast::Crispr::DestinationProfile#normalize_resolution_kind` is defined at both lib/ast/crispr.rb:437 and lib/ast/crispr.rb:1534.", 99310177], + [1538, 7, 31, "Lint/DuplicateMethods: Method `Ast::Crispr::DestinationProfile#normalize_resolution_source` is defined at both lib/ast/crispr.rb:444 and lib/ast/crispr.rb:1538.", 1692065396], + [1542, 7, 29, "Lint/DuplicateMethods: Method `Ast::Crispr::DestinationProfile#normalize_anchor_boundary` is defined at both lib/ast/crispr.rb:452 and lib/ast/crispr.rb:1542.", 3028754726], + [1547, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::OperationProfile`.", 1974079861], + [1550, 7, 733, "Metrics/MethodLength: Method has too many lines. [13/10]", 2619513218], + [1570, 7, 25, "Lint/DuplicateMethods: Method `Ast::Crispr::OperationProfile#normalize_requirement` is defined at both lib/ast/crispr.rb:678 and lib/ast/crispr.rb:1570.", 440444039], + [1574, 7, 32, "Lint/DuplicateMethods: Method `Ast::Crispr::OperationProfile#normalize_replacement_source` is defined at both lib/ast/crispr.rb:686 and lib/ast/crispr.rb:1574.", 3533021156], + [1579, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::StructureProfile`.", 614380405], + [1595, 5, 6309, "Metrics/ClassLength: Class has too many lines. [172/100]", 1270437788], + [1600, 7, 2717, "Metrics/MethodLength: Method has too many lines. [67/10]", 1469599129], + [1665, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 259030389], + [1678, 28, 247, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3385598543], + [1710, 28, 242, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1038219895] + ], + "lib/ast/crispr/rspec/shared_examples/destination_profile.rb:2529475135": [ + [3, 1, 2386, "Metrics/BlockLength: Block has too many lines. [28/25]", 2846758965], + [4, 3, 2311, "Metrics/BlockLength: Block has too many lines. [26/25]", 2123267236] + ], + "lib/ast/crispr/rspec/shared_examples/match_profile.rb:2566447993": [ + [3, 1, 1997, "Metrics/BlockLength: Block has too many lines. [26/25]", 1032277788] + ], + "lib/ast/crispr/rspec/shared_examples/operation_profile.rb:3583567850": [ + [3, 1, 2148, "Metrics/BlockLength: Block has too many lines. [26/25]", 2745151209] + ], + "spec/old_runtime_spec.rb:1564590841": [ + [3, 1, 17728, "Metrics/BlockLength: Block has too many lines. [383/25]", 205400157], + [4, 3, 69, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3712453399], + [5, 3, 68, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1429320782], + [6, 3, 59, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 253007150], + [8, 3, 891, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 361389624], + [18, 37, 11, "Lint/UnusedMethodArgument: Unused method argument - `owner_scope`.", 3846606321], + [22, 46, 6, "Lint/UnusedMethodArgument: Unused method argument - `region`.", 2124512157], + [22, 64, 11, "Lint/UnusedMethodArgument: Unused method argument - `owner_scope`.", 3846606321], + [73, 3, 8534, "Metrics/BlockLength: Block has too many lines. [176/25]", 3042299525], + [313, 3, 3640, "Metrics/BlockLength: Block has too many lines. [72/25]", 1133370152], + [418, 3, 1663, "Metrics/BlockLength: Block has too many lines. [41/25]", 115074475] + ] +} diff --git a/gems/ast-crispr/Gemfile.lock b/gems/ast-crispr/Gemfile.lock index 7478fbf81..04588f03b 100644 --- a/gems/ast-crispr/Gemfile.lock +++ b/gems/ast-crispr/Gemfile.lock @@ -17,31 +17,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -49,248 +25,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -310,12 +44,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -324,6 +52,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -379,6 +108,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -397,7 +135,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -542,18 +279,22 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -587,11 +328,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -618,7 +359,7 @@ GEM yard yard-relative_markdown_links (0.6.0) nokogiri (>= 1.14.3, < 2) - yard-timekeeper (0.2.3) + yard-timekeeper (0.2.4) version_gem (~> 1.1, >= 1.1.13) yard-yaml (0.2.3) version_gem (~> 1.1, >= 1.1.13) @@ -639,44 +380,23 @@ DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,26 +405,18 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -712,34 +424,20 @@ CHECKSUMS appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +450,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +477,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +488,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,19 +515,18 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,27 +540,21 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd yard-relative_markdown_links (0.6.0) sha256=3e5ffa85cbad9bac70bee5421774b190fb25d3bdf489323a5b3534f647d1a70e - yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 + yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ast-merge/Gemfile b/gems/ast-merge/Gemfile index 8b094b8a5..424fd7944 100644 --- a/gems/ast-merge/Gemfile +++ b/gems/ast-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source 'https://gem.coop' +source "https://gem.coop" git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,17 +19,61 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ['~> 1.0', '>= 1.0.8'] -gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ["~> 1.0", ">= 1.0.8"] +gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ tree_haver ] -direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') +direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? + +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) + direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") + direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == "nomono" } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + if nomono_locked + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] + end + end + Kernel.send(:gem, "nomono", *nomono_activation_requirements) + require "nomono/bundler" + if direct_sibling_templating && !direct_sibling_local + ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + end + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: "STRUCTUREDMERGE", + path_env: "STRUCTUREDMERGE_DEV", + root: ["src", "my", "structuredmerge"] + ) + rescue LoadError + warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + else + ENV.delete("STRUCTUREDMERGE_DEV") + end + end + end +end if direct_sibling_gems.any? && (direct_sibling_local || @@ -289,25 +333,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? # Debugging -eval_gemfile 'gemfiles/modular/debug.gemfile' +eval_gemfile "gemfiles/modular/debug.gemfile" # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile 'gemfiles/modular/coverage.gemfile' +eval_gemfile "gemfiles/modular/coverage.gemfile" # Linting -eval_gemfile 'gemfiles/modular/style.gemfile' +eval_gemfile "gemfiles/modular/style.gemfile" # Documentation -eval_gemfile 'gemfiles/modular/documentation.gemfile' +eval_gemfile "gemfiles/modular/documentation.gemfile" # Optional -eval_gemfile 'gemfiles/modular/optional.gemfile' +eval_gemfile "gemfiles/modular/optional.gemfile" ### Std Lib Extracted Gems -eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' +eval_gemfile "gemfiles/modular/x_std_libs.gemfile" # See unlocked_deps appraisal for more details on irb inclusion -gem 'irb', '~> 1.17' # ruby >= 2.7 +gem "irb", "~> 1.17" # ruby >= 2.7 diff --git a/gems/ast-merge/README.md b/gems/ast-merge/README.md index 19257e522..f4089c7d5 100644 --- a/gems/ast-merge/README.md +++ b/gems/ast-merge/README.md @@ -576,6 +576,7 @@ If none of the available licenses suit your use case, please [contact us](mailto [🖐contrib-rocks]: https://contrib.rocks [🖐contributors]: https://github.com/structuredmerge/structuredmerge-ruby/graphs/contributors [🖐contributors-img]: https://contrib.rocks/image?repo=structuredmerge/structuredmerge-ruby +[🚎contributors-gl]: https://gitlab.com/structuredmerge/structuredmerge-ruby/-/graphs/main [🪇conduct]: https://github.com/structuredmerge/structuredmerge-ruby/blob/main/CODE_OF_CONDUCT.md [🪇conduct-img]: https://img.shields.io/badge/Contributor_Covenant-2.1-259D6C.svg [📌pvc]: http://guides.rubygems.org/patterns/#pessimistic-version-constraint diff --git a/gems/ast-merge/Rakefile b/gems/ast-merge/Rakefile index 339c9a3cb..6b4e21dec 100644 --- a/gems/ast-merge/Rakefile +++ b/gems/ast-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require 'kettle/drift' + require "kettle/drift" Kettle::Drift.install_tasks rescue LoadError - desc('(stub) kettle:drift:check is unavailable') - task('kettle:drift:check') do + desc("(stub) kettle:drift:check is unavailable") + task("kettle:drift:check") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:update is unavailable') - task('kettle:drift:update') do + desc("(stub) kettle:drift:update is unavailable") + task("kettle:drift:update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:force_update is unavailable') - task('kettle:drift:force_update') do + desc("(stub) kettle:drift:force_update is unavailable") + task("kettle:drift:force_update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift is unavailable') - task('kettle:drift' => 'kettle:drift:update') + desc("(stub) kettle:drift is unavailable") + task("kettle:drift" => "kettle:drift:update") end ### TEMPLATING TASKS diff --git a/gems/ast-merge/lib/ast/merge/version.rb b/gems/ast-merge/lib/ast/merge/version.rb index 6e7dc90f7..3ef823f4d 100644 --- a/gems/ast-merge/lib/ast/merge/version.rb +++ b/gems/ast-merge/lib/ast/merge/version.rb @@ -3,7 +3,7 @@ module Ast module Merge module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/tree_haver/.rubocop_gradual.lock b/gems/tree_haver/.rubocop_gradual.lock new file mode 100644 index 000000000..2a04c6a43 --- /dev/null +++ b/gems/tree_haver/.rubocop_gradual.lock @@ -0,0 +1,467 @@ +{ + ".simplecov:3575099246": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Gemfile:31081928": [ + [28, 1, 59, "Lint/EmptyConditionalBody: Avoid `if` branches without a body.", 4279378582] + ], + "Rakefile:1868927885": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/tree_haver.rb:2762889207": [ + [49, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465], + [49, 1, 15892, "Metrics/ModuleLength: Module has too many lines. [421/100]", 2307494458], + [67, 3, 566, "Metrics/MethodLength: Method has too many lines. [12/10]", 1536513137], + [124, 3, 272, "Metrics/MethodLength: Method has too many lines. [11/10]", 505877912], + [156, 3, 543, "Metrics/MethodLength: Method has too many lines. [14/10]", 3733215372], + [221, 3, 458, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `backend_module` is too high. [9/7]", 73937708], + [221, 3, 458, "Metrics/MethodLength: Method has too many lines. [12/10]", 73937708], + [221, 3, 458, "Metrics/PerceivedComplexity: Perceived complexity for `backend_module` is too high. [9/8]", 73937708], + [257, 3, 1024, "Metrics/AbcSize: Assignment Branch Condition size for `register_language` is too high. [<0, 20, 10> 22.36/17]", 53014028], + [257, 3, 1024, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `register_language` is too high. [11/7]", 53014028], + [257, 3, 1024, "Metrics/MethodLength: Method has too many lines. [12/10]", 53014028], + [257, 3, 1024, "Metrics/PerceivedComplexity: Perceived complexity for `register_language` is too high. [11/8]", 53014028], + [257, 24, 150, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 893242366], + [282, 3, 1521, "Metrics/AbcSize: Assignment Branch Condition size for `parser_for` is too high. [<12, 27, 14> 32.7/17]", 498764853], + [282, 3, 1521, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parser_for` is too high. [15/7]", 498764853], + [282, 3, 1521, "Metrics/MethodLength: Method has too many lines. [30/10]", 498764853], + [282, 3, 1521, "Metrics/PerceivedComplexity: Perceived complexity for `parser_for` is too high. [15/8]", 498764853], + [325, 3, 2089, "Metrics/MethodLength: Method has too many lines. [51/10]", 2791676388], + [379, 3, 704, "Metrics/AbcSize: Assignment Branch Condition size for `requested_backend_type` is too high. [<4, 17, 9> 19.65/17]", 3087691662], + [379, 3, 704, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `requested_backend_type` is too high. [8/7]", 3087691662], + [379, 3, 704, "Metrics/MethodLength: Method has too many lines. [14/10]", 3087691662], + [379, 3, 704, "Metrics/PerceivedComplexity: Perceived complexity for `requested_backend_type` is too high. [9/8]", 3087691662], + [409, 3, 696, "Metrics/MethodLength: Method has too many lines. [14/10]", 307274721], + [502, 3, 489, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `backend_module_for` is too high. [10/7]", 3448932255], + [502, 3, 489, "Metrics/MethodLength: Method has too many lines. [22/10]", 3448932255] + ], + "lib/tree_haver/backend_api.rb:3354059061": [ + [30, 3, 12181, "Metrics/ModuleLength: Module has too many lines. [243/100]", 205645546], + [139, 5, 8882, "Metrics/ClassLength: Class has too many lines. [180/100]", 4281605197], + [145, 7, 1502, "Metrics/AbcSize: Assignment Branch Condition size for `validate` is too high. [<4, 22, 10> 24.49/17]", 747017743], + [145, 7, 1502, "Metrics/MethodLength: Method has too many lines. [31/10]", 747017743], + [145, 7, 1502, "Metrics/PerceivedComplexity: Perceived complexity for `validate` is too high. [11/8]", 747017743], + [213, 7, 903, "Metrics/MethodLength: Method has too many lines. [24/10]", 3041411230], + [261, 7, 1271, "Metrics/AbcSize: Assignment Branch Condition size for `validate_capabilities_hash` is too high. [<7, 27, 7> 28.76/17]", 3965262932], + [261, 7, 1271, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_capabilities_hash` is too high. [8/7]", 3965262932], + [261, 7, 1271, "Metrics/MethodLength: Method has too many lines. [25/10]", 3965262932], + [277, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2253399502], + [296, 7, 908, "Metrics/AbcSize: Assignment Branch Condition size for `validate_language` is too high. [<6, 17, 4> 18.47/17]", 733551867], + [315, 7, 797, "Metrics/AbcSize: Assignment Branch Condition size for `validate_parser` is too high. [<5, 16, 7> 18.17/17]", 1229041751], + [315, 7, 797, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_parser` is too high. [8/7]", 1229041751], + [315, 7, 797, "Metrics/MethodLength: Method has too many lines. [15/10]", 1229041751], + [349, 7, 862, "Metrics/AbcSize: Assignment Branch Condition size for `validate_node_class` is too high. [<8, 18, 8> 21.26/17]", 1873188195], + [349, 7, 862, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_node_class` is too high. [8/7]", 1873188195], + [349, 7, 862, "Metrics/MethodLength: Method has too many lines. [20/10]", 1873188195], + [349, 7, 862, "Metrics/PerceivedComplexity: Perceived complexity for `validate_node_class` is too high. [9/8]", 1873188195], + [375, 11, 20, "Naming/PredicatePrefix: Rename `has_method_or_alias?` to `method_or_alias?`.", 285116235] + ], + "lib/tree_haver/backend_context.rb:159197618": [ + [3, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465] + ], + "lib/tree_haver/backend_registry.rb:4046212912": [ + [4, 3, 22, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver::BackendRegistry`.", 733935278], + [4, 3, 5121, "Metrics/ModuleLength: Module has too many lines. [152/100]", 1483988260], + [39, 5, 382, "Metrics/MethodLength: Method has too many lines. [11/10]", 2000730238], + [48, 16, 1, "Style/DoubleNegation: Avoid the use of double negation (`!!`).", 177540], + [55, 5, 889, "Metrics/AbcSize: Assignment Branch Condition size for `register_tag` is too high. [<5, 20, 5> 21.21/17]", 2276764069], + [55, 5, 889, "Metrics/MethodLength: Method has too many lines. [18/10]", 2276764069], + [105, 5, 397, "Metrics/MethodLength: Method has too many lines. [11/10]", 4007185633] + ], + "lib/tree_haver/backends/citrus.rb:3181984499": [ + [40, 9, 449, "Metrics/MethodLength: Method has too many lines. [11/10]", 1138819533], + [173, 11, 1133, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [11/7]", 2613019266], + [173, 11, 1133, "Metrics/MethodLength: Method has too many lines. [16/10]", 2613019266], + [173, 11, 1133, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [11/8]", 2613019266], + [230, 9, 597, "Metrics/MethodLength: Method has too many lines. [12/10]", 3923424594], + [403, 9, 810, "Metrics/AbcSize: Assignment Branch Condition size for `structural?` is too high. [<3, 19, 8> 20.83/17]", 3166173256], + [403, 9, 810, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structural?` is too high. [9/7]", 3166173256], + [403, 9, 810, "Metrics/MethodLength: Method has too many lines. [12/10]", 3166173256], + [403, 9, 810, "Metrics/PerceivedComplexity: Perceived complexity for `structural?` is too high. [9/8]", 3166173256], + [436, 9, 1272, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_type_from_event` is too high. [9/7]", 2022108773], + [436, 9, 1272, "Metrics/MethodLength: Method has too many lines. [16/10]", 2022108773], + [436, 9, 1272, "Metrics/PerceivedComplexity: Perceived complexity for `extract_type_from_event` is too high. [10/8]", 2022108773], + [460, 11, 207, "Style/CaseLikeIf: Convert `if-elsif` to `case-when`.", 1995588659], + [476, 61, 10, "Style/NumericPredicate: Use `offset.positive?` instead of `offset > 0`.", 2454414278] + ], + "lib/tree_haver/backends/ffi.rb:691415497": [ + [83, 9, 853, "Metrics/MethodLength: Method has too many lines. [15/10]", 1876257977], + [147, 7, 7352, "Metrics/ModuleLength: Module has too many lines. [111/100]", 4125377349], + [148, 9, 7320, "Metrics/ClassLength: Class has too many lines. [109/100]", 1130902814], + [183, 11, 559, "Metrics/MethodLength: Method has too many lines. [11/10]", 678018999], + [232, 11, 4265, "Metrics/AbcSize: Assignment Branch Condition size for `try_load!` is too high. [<11, 40, 10> 42.67/17]", 2312962113], + [232, 11, 4265, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `try_load!` is too high. [10/7]", 2312962113], + [232, 11, 4265, "Metrics/MethodLength: Method has too many lines. [58/10]", 2312962113], + [232, 11, 4265, "Metrics/PerceivedComplexity: Perceived complexity for `try_load!` is too high. [11/8]", 2312962113], + [260, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2086221887], + [262, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2163360042], + [367, 9, 312, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `<=>` is too high. [8/7]", 2433292528], + [437, 11, 4377, "Metrics/AbcSize: Assignment Branch Condition size for `from_library` is too high. [<16, 30, 18> 38.47/17]", 3403850855], + [437, 11, 4377, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [17/7]", 3403850855], + [437, 11, 4377, "Metrics/MethodLength: Method has too many lines. [43/10]", 3403850855], + [437, 11, 4377, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [19/8]", 3403850855], + [437, 47, 4, "Lint/UnusedMethodArgument: Unused method argument - `name`.", 2087876002], + [502, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2415433817], + [554, 9, 3159, "Metrics/AbcSize: Assignment Branch Condition size for `language=` is too high. [<4, 44, 11> 45.53/17]", 1815427493], + [554, 9, 3159, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `language=` is too high. [10/7]", 1815427493], + [554, 9, 3159, "Metrics/MethodLength: Method has too many lines. [40/10]", 1815427493], + [554, 9, 3159, "Metrics/PerceivedComplexity: Perceived complexity for `language=` is too high. [10/8]", 1815427493], + [715, 7, 10494, "Metrics/ClassLength: Class has too many lines. [129/100]", 3710916551], + [744, 45, 9, "Style/NumericPredicate: Use `index.negative?` instead of `index < 0`.", 4215255415], + [807, 13, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183], + [889, 21, 9, "Style/NumericPredicate: Use `index.negative?` instead of `index < 0`.", 4215255415], + [933, 9, 694, "Metrics/AbcSize: Assignment Branch Condition size for `descendant_for_point_range` is too high. [<7, 21, 5> 22.69/17]", 979329510], + [953, 9, 706, "Metrics/AbcSize: Assignment Branch Condition size for `named_descendant_for_point_range` is too high. [<7, 21, 5> 22.69/17]", 2494446138] + ], + "lib/tree_haver/backends/java.rb:3360169733": [ + [134, 7, 815, "Metrics/AbcSize: Assignment Branch Condition size for `configure_native_library_path!` is too high. [<4, 17, 6> 18.47/17]", 1362415302], + [227, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3409700051], + [260, 7, 9885, "Metrics/ClassLength: Class has too many lines. [114/100]", 136252046], + [292, 9, 312, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `<=>` is too high. [8/7]", 2433292528], + [340, 11, 4098, "Metrics/AbcSize: Assignment Branch Condition size for `from_library` is too high. [<19, 32, 14> 39.76/17]", 3050250526], + [340, 11, 4098, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [14/7]", 3050250526], + [340, 11, 4098, "Metrics/MethodLength: Method has too many lines. [48/10]", 3050250526], + [340, 11, 4098, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [16/8]", 3050250526], + [426, 11, 2084, "Metrics/AbcSize: Assignment Branch Condition size for `load_by_name` is too high. [<11, 17, 6> 21.12/17]", 226213748], + [426, 11, 2084, "Metrics/MethodLength: Method has too many lines. [35/10]", 226213748], + [542, 9, 1016, "Metrics/MethodLength: Method has too many lines. [17/10]", 4123264427], + [649, 9, 702, "Metrics/MethodLength: Method has too many lines. [14/10]", 1334016319], + [649, 17, 89, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3152137646], + [728, 9, 583, "Metrics/MethodLength: Method has too many lines. [11/10]", 2457478600], + [816, 13, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183] + ], + "lib/tree_haver/backends/mri.rb:863330290": [ + [59, 9, 916, "Metrics/MethodLength: Method has too many lines. [15/10]", 749971754], + [179, 9, 312, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `<=>` is too high. [8/7]", 2433292528], + [232, 11, 1562, "Metrics/MethodLength: Method has too many lines. [11/10]", 3858647816] + ], + "lib/tree_haver/backends/parslet.rb:4170691266": [ + [41, 9, 323, "Metrics/MethodLength: Method has too many lines. [11/10]", 694290592], + [108, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193340030], + [172, 11, 1133, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [11/7]", 2613019266], + [172, 11, 1133, "Metrics/MethodLength: Method has too many lines. [16/10]", 2613019266], + [172, 11, 1133, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [11/8]", 2613019266], + [246, 9, 591, "Metrics/MethodLength: Method has too many lines. [12/10]", 3007454066], + [335, 7, 6287, "Metrics/ClassLength: Class has too many lines. [155/100]", 3100555518], + [362, 9, 452, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `start_byte` is too high. [8/7]", 2663206926], + [362, 9, 452, "Metrics/MethodLength: Method has too many lines. [12/10]", 2663206926], + [380, 9, 557, "Metrics/MethodLength: Method has too many lines. [12/10]", 2982914846], + [443, 9, 404, "Metrics/MethodLength: Method has too many lines. [11/10]", 1111982079], + [495, 61, 10, "Style/NumericPredicate: Use `offset.positive?` instead of `offset > 0`.", 2454414278], + [501, 9, 313, "Metrics/MethodLength: Method has too many lines. [13/10]", 1927903077], + [519, 9, 448, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_first_slice` is too high. [8/7]", 229178429], + [519, 9, 448, "Metrics/MethodLength: Method has too many lines. [16/10]", 229178429], + [524, 17, 11, "Style/HashEachMethods: Use `each_value` instead of `values.each`.", 236538172], + [539, 9, 461, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_last_slice` is too high. [8/7]", 3960808114], + [539, 9, 461, "Metrics/MethodLength: Method has too many lines. [16/10]", 3960808114] + ], + "lib/tree_haver/backends/prism.rb:265399087": [ + [39, 9, 448, "Metrics/MethodLength: Method has too many lines. [11/10]", 2383415890], + [70, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 721867551], + [71, 9, 712, "Metrics/MethodLength: Method has too many lines. [12/10]", 1576927704], + [145, 41, 6, "Lint/UnusedMethodArgument: Unused method argument - `symbol`.", 2153517219], + [182, 9, 554, "Metrics/MethodLength: Method has too many lines. [16/10]", 3452414947], + [250, 13, 11, "Naming/PredicatePrefix: Rename `has_errors?` to `errors?`.", 1181419252], + [275, 69, 27, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1979346241], + [301, 13, 64, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1942915391], + [305, 9, 519, "Metrics/AbcSize: Assignment Branch Condition size for `classify_comment_hint` is too high. [<5, 20, 5> 21.21/17]", 869270335], + [485, 13, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183], + [554, 24, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] + ], + "lib/tree_haver/backends/psych.rb:1528613408": [ + [30, 9, 448, "Metrics/MethodLength: Method has too many lines. [11/10]", 2367418678], + [59, 9, 601, "Metrics/MethodLength: Method has too many lines. [11/10]", 2824278890], + [342, 9, 901, "Metrics/AbcSize: Assignment Branch Condition size for `extract_text_from_location` is too high. [<8, 23, 18> 30.28/17]", 1252700264], + [342, 9, 901, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_text_from_location` is too high. [14/7]", 1252700264], + [342, 9, 901, "Metrics/MethodLength: Method has too many lines. [22/10]", 1252700264], + [342, 9, 901, "Metrics/PerceivedComplexity: Perceived complexity for `extract_text_from_location` is too high. [16/8]", 1252700264] + ], + "lib/tree_haver/backends/rust.rb:3784474048": [ + [52, 9, 548, "Metrics/MethodLength: Method has too many lines. [15/10]", 3791803966], + [156, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548] + ], + "lib/tree_haver/backends/tslp.rb:1702759733": [ + [18, 9, 559, "Metrics/MethodLength: Method has too many lines. [14/10]", 1306507697], + [68, 7, 14, "Style/Documentation: Missing top-level documentation comment for `class TreeHaver::Backends::Tslp::Language`.", 3674592793], + [80, 7, 12, "Style/Documentation: Missing top-level documentation comment for `class TreeHaver::Backends::Tslp::Parser`.", 2485220908], + [81, 9, 582, "Metrics/AbcSize: Assignment Branch Condition size for `parse` is too high. [<2, 17, 4> 17.58/17]", 103430155], + [103, 7, 10, "Style/Documentation: Missing top-level documentation comment for `class TreeHaver::Backends::Tslp::Tree`.", 3516465773], + [109, 7, 10, "Style/Documentation: Missing top-level documentation comment for `class TreeHaver::Backends::Tslp::Node`.", 3515419275], + [143, 13, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183] + ], + "lib/tree_haver/base/comment.rb:699160654": [ + [10, 5, 8183, "Metrics/ClassLength: Class has too many lines. [152/100]", 4001235397] + ], + "lib/tree_haver/base/node.rb:586469776": [ + [36, 5, 7668, "Metrics/ClassLength: Class has too many lines. [156/100]", 171773185], + [162, 11, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183], + [208, 27, 8, "Style/NumericPredicate: Use `cmp.zero?` instead of `cmp == 0`.", 736104011], + [239, 7, 888, "Metrics/AbcSize: Assignment Branch Condition size for `source_position` is too high. [<6, 20, 12> 24.08/17]", 3968023659], + [239, 7, 888, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `source_position` is too high. [9/7]", 3968023659], + [239, 7, 888, "Metrics/MethodLength: Method has too many lines. [28/10]", 3968023659], + [239, 7, 888, "Metrics/PerceivedComplexity: Perceived complexity for `source_position` is too high. [13/8]", 3968023659], + [306, 7, 355, "Metrics/MethodLength: Method has too many lines. [11/10]", 1012295608] + ], + "lib/tree_haver/base/tree.rb:3081630142": [ + [89, 15, 145, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1155535733], + [103, 11, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183] + ], + "lib/tree_haver/citrus_grammar_finder.rb:2540014236": [ + [31, 3, 7013, "Metrics/ClassLength: Class has too many lines. [102/100]", 245808593], + [66, 5, 3770, "Metrics/AbcSize: Assignment Branch Condition size for `available?` is too high. [<16, 52, 21> 58.32/17]", 3886463212], + [66, 5, 3770, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `available?` is too high. [22/7]", 3886463212], + [66, 5, 3770, "Metrics/MethodLength: Method has too many lines. [50/10]", 3886463212], + [66, 5, 3770, "Metrics/PerceivedComplexity: Perceived complexity for `available?` is too high. [22/8]", 3886463212], + [94, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858894] + ], + "lib/tree_haver/contracts.rb:1571706604": [ + [3, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465], + [3, 1, 28139, "Metrics/ModuleLength: Module has too many lines. [924/100]", 3701899480], + [91, 5, 732, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 18, 2> 18.11/17]", 3031678572], + [91, 5, 732, "Metrics/MethodLength: Method has too many lines. [17/10]", 3031678572], + [170, 5, 697, "Metrics/MethodLength: Method has too many lines. [18/10]", 389212725], + [231, 5, 507, "Metrics/MethodLength: Method has too many lines. [13/10]", 2631332781], + [329, 5, 580, "Metrics/MethodLength: Method has too many lines. [13/10]", 2166080747], + [558, 5, 558, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 17, 4> 17.46/17]", 2109105399], + [558, 5, 558, "Metrics/MethodLength: Method has too many lines. [18/10]", 2109105399], + [610, 3, 780, "Metrics/AbcSize: Assignment Branch Condition size for `library_path_errors` is too high. [<3, 20, 10> 22.56/17]", 1003454820], + [610, 3, 780, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `library_path_errors` is too high. [10/7]", 1003454820], + [610, 3, 780, "Metrics/MethodLength: Method has too many lines. [14/10]", 1003454820], + [610, 3, 780, "Metrics/PerceivedComplexity: Perceived complexity for `library_path_errors` is too high. [10/8]", 1003454820], + [652, 3, 686, "Metrics/MethodLength: Method has too many lines. [16/10]", 2530945134], + [674, 3, 483, "Metrics/MethodLength: Method has too many lines. [15/10]", 3654427448], + [693, 3, 511, "Metrics/MethodLength: Method has too many lines. [16/10]", 145071639], + [770, 5, 384, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 19, 6> 19.92/17]", 1287649270], + [841, 5, 449, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [10/7]", 1722332092], + [841, 5, 449, "Metrics/PerceivedComplexity: Perceived complexity for `to_h` is too high. [10/8]", 1722332092], + [873, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177610], + [874, 5, 420, "Metrics/MethodLength: Method has too many lines. [12/10]", 722580369], + [914, 42, 8, "Lint/StructNewOverride: `:entries` member overrides `Struct#entries` and it may be unexpected.", 999966509], + [937, 3, 473, "Metrics/MethodLength: Method has too many lines. [18/10]", 1284459726], + [958, 3, 655, "Metrics/AbcSize: Assignment Branch Condition size for `byte_offset_for_point` is too high. [<7, 25, 14> 29.5/17]", 1278853347], + [958, 3, 655, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `byte_offset_for_point` is too high. [9/7]", 1278853347], + [958, 3, 655, "Metrics/MethodLength: Method has too many lines. [17/10]", 1278853347], + [958, 3, 655, "Metrics/PerceivedComplexity: Perceived complexity for `byte_offset_for_point` is too high. [10/8]", 1278853347] + ], + "lib/tree_haver/grammar_finder.rb:3107533528": [ + [55, 3, 13660, "Metrics/ClassLength: Class has too many lines. [200/100]", 1847629568], + [155, 5, 1710, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_library_path` is too high. [8/7]", 4164717952], + [155, 5, 1710, "Metrics/MethodLength: Method has too many lines. [25/10]", 4164717952], + [269, 7, 845, "Metrics/MethodLength: Method has too many lines. [12/10]", 916567473], + [315, 5, 577, "Metrics/MethodLength: Method has too many lines. [16/10]", 651056353], + [340, 5, 623, "Metrics/MethodLength: Method has too many lines. [14/10]", 1438381615], + [360, 5, 846, "Metrics/MethodLength: Method has too many lines. [12/10]", 667615068], + [398, 5, 653, "Metrics/MethodLength: Method has too many lines. [12/10]", 1765172995] + ], + "lib/tree_haver/kaitai_backend.rb:335397596": [ + [3, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465] + ], + "lib/tree_haver/language.rb:2775049278": [ + [39, 3, 12087, "Metrics/ModuleLength: Module has too many lines. [115/100]", 221887443], + [40, 5, 12061, "Metrics/ClassLength: Class has too many lines. [113/100]", 309443185], + [89, 7, 1966, "Metrics/AbcSize: Assignment Branch Condition size for `from_library` is too high. [<4, 20, 10> 22.72/17]", 980659500], + [89, 7, 1966, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [9/7]", 980659500], + [89, 7, 1966, "Metrics/MethodLength: Method has too many lines. [31/10]", 980659500], + [89, 7, 1966, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [11/8]", 980659500], + [114, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177538], + [156, 7, 4289, "Metrics/AbcSize: Assignment Branch Condition size for `method_missing` is too high. [<10, 39, 30> 50.21/17]", 1314689525], + [156, 7, 4289, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `method_missing` is too high. [24/7]", 1314689525], + [156, 7, 4289, "Metrics/MethodLength: Method has too many lines. [56/10]", 1314689525], + [156, 7, 4289, "Metrics/PerceivedComplexity: Perceived complexity for `method_missing` is too high. [26/8]", 1314689525], + [274, 7, 786, "Metrics/MethodLength: Method has too many lines. [12/10]", 3697766033] + ], + "lib/tree_haver/language_pack.rb:3024861237": [ + [3, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465] + ], + "lib/tree_haver/language_registry.rb:3950096220": [ + [83, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861089] + ], + "lib/tree_haver/library_path_utils.rb:1552423902": [ + [32, 5, 861, "Metrics/MethodLength: Method has too many lines. [12/10]", 1638068630] + ], + "lib/tree_haver/node.rb:715762930": [ + [62, 3, 16601, "Metrics/ClassLength: Class has too many lines. [237/100]", 2290466920], + [136, 5, 708, "Metrics/AbcSize: Assignment Branch Condition size for `start_point` is too high. [<2, 19, 7> 20.35/17]", 2066418249], + [136, 5, 708, "Metrics/MethodLength: Method has too many lines. [17/10]", 2066418249], + [161, 5, 694, "Metrics/AbcSize: Assignment Branch Condition size for `end_point` is too high. [<2, 19, 7> 20.35/17]", 2127773446], + [161, 5, 694, "Metrics/MethodLength: Method has too many lines. [17/10]", 2127773446], + [232, 5, 948, "Metrics/AbcSize: Assignment Branch Condition size for `text` is too high. [<1, 14, 11> 17.83/17]", 748349201], + [232, 5, 948, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `text` is too high. [9/7]", 748349201], + [232, 5, 948, "Metrics/MethodLength: Method has too many lines. [16/10]", 748349201], + [232, 5, 948, "Metrics/PerceivedComplexity: Perceived complexity for `text` is too high. [11/8]", 748349201], + [259, 9, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183], + [328, 5, 994, "Metrics/AbcSize: Assignment Branch Condition size for `named_child` is too high. [<6, 13, 10> 17.46/17]", 3449163117], + [328, 5, 994, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `named_child` is too high. [9/7]", 3449163117], + [328, 5, 994, "Metrics/MethodLength: Method has too many lines. [21/10]", 3449163117], + [328, 5, 994, "Metrics/PerceivedComplexity: Perceived complexity for `named_child` is too high. [10/8]", 3449163117], + [366, 5, 734, "Metrics/MethodLength: Method has too many lines. [15/10]", 3099919150], + [425, 7, 4, "Style/EmptyElse: Redundant `else`-clause.", 2087423834] + ], + "lib/tree_haver/parser.rb:1959976510": [ + [71, 3, 15231, "Metrics/ClassLength: Class has too many lines. [181/100]", 2262931609], + [84, 5, 938, "Metrics/MethodLength: Method has too many lines. [13/10]", 569209133], + [116, 5, 844, "Metrics/MethodLength: Method has too many lines. [11/10]", 3700471369], + [141, 5, 583, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `backend` is too high. [9/7]", 942469984], + [141, 5, 583, "Metrics/MethodLength: Method has too many lines. [20/10]", 942469984], + [237, 5, 1114, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_string` is too high. [8/7]", 2146281390], + [237, 5, 1114, "Metrics/MethodLength: Method has too many lines. [16/10]", 2146281390], + [237, 5, 1114, "Metrics/PerceivedComplexity: Perceived complexity for `parse_string` is too high. [10/8]", 2146281390], + [273, 5, 1162, "Metrics/AbcSize: Assignment Branch Condition size for `switch_backend_for_language` is too high. [<10, 11, 11> 18.49/17]", 3918477333], + [273, 5, 1162, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `switch_backend_for_language` is too high. [11/7]", 3918477333], + [273, 5, 1162, "Metrics/MethodLength: Method has too many lines. [26/10]", 3918477333], + [273, 5, 1162, "Metrics/PerceivedComplexity: Perceived complexity for `switch_backend_for_language` is too high. [9/8]", 3918477333], + [320, 5, 3598, "Metrics/AbcSize: Assignment Branch Condition size for `unwrap_language` is too high. [<4, 32, 32> 45.43/17]", 2683894777], + [320, 5, 3598, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `unwrap_language` is too high. [29/7]", 2683894777], + [320, 5, 3598, "Metrics/MethodLength: Method has too many lines. [55/10]", 2683894777], + [320, 5, 3598, "Metrics/PerceivedComplexity: Perceived complexity for `unwrap_language` is too high. [23/8]", 2683894777], + [414, 5, 892, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `try_reload_language_for_backend` is too high. [9/7]", 1872419716], + [414, 5, 892, "Metrics/MethodLength: Method has too many lines. [14/10]", 1872419716], + [414, 5, 892, "Metrics/PerceivedComplexity: Perceived complexity for `try_reload_language_for_backend` is too high. [9/8]", 1872419716] + ], + "lib/tree_haver/parslet_grammar_finder.rb:756779364": [ + [32, 3, 6418, "Metrics/ClassLength: Class has too many lines. [105/100]", 2916347470], + [67, 5, 2630, "Metrics/AbcSize: Assignment Branch Condition size for `available?` is too high. [<14, 39, 19> 45.59/17]", 1827795944], + [67, 5, 2630, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `available?` is too high. [20/7]", 1827795944], + [67, 5, 2630, "Metrics/MethodLength: Method has too many lines. [43/10]", 1827795944], + [67, 5, 2630, "Metrics/PerceivedComplexity: Perceived complexity for `available?` is too high. [20/8]", 1827795944] + ], + "lib/tree_haver/path_validator.rb:1827441298": [ + [31, 3, 11571, "Metrics/ModuleLength: Module has too many lines. [133/100]", 3916793077], + [71, 5, 1048, "Metrics/AbcSize: Assignment Branch Condition size for `trusted_directories` is too high. [<4, 16, 5> 17.23/17]", 2683168069], + [71, 5, 1048, "Metrics/MethodLength: Method has too many lines. [13/10]", 2683168069], + [182, 5, 1000, "Metrics/AbcSize: Assignment Branch Condition size for `safe_library_path?` is too high. [<1, 15, 15> 21.24/17]", 3331427816], + [182, 5, 1000, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `safe_library_path?` is too high. [15/7]", 3331427816], + [182, 5, 1000, "Metrics/MethodLength: Method has too many lines. [11/10]", 3331427816], + [182, 5, 1000, "Metrics/PerceivedComplexity: Perceived complexity for `safe_library_path?` is too high. [15/8]", 3331427816], + [314, 5, 911, "Metrics/AbcSize: Assignment Branch Condition size for `validation_errors` is too high. [<2, 21, 13> 24.78/17]", 1249065882], + [314, 5, 911, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validation_errors` is too high. [13/7]", 1249065882], + [314, 5, 911, "Metrics/MethodLength: Method has too many lines. [14/10]", 1249065882], + [314, 5, 911, "Metrics/PerceivedComplexity: Perceived complexity for `validation_errors` is too high. [13/8]", 1249065882], + [345, 9, 20, "Naming/PredicatePrefix: Rename `has_valid_extension?` to `valid_extension?`.", 2041908655] + ], + "lib/tree_haver/peg_backends.rb:2882446693": [ + [3, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465], + [37, 3, 611, "Metrics/MethodLength: Method has too many lines. [21/10]", 2394303132], + [39, 11, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [61, 3, 377, "Metrics/MethodLength: Method has too many lines. [13/10]", 1137341195] + ], + "lib/tree_haver/rspec/dependency_tags.rb:2954930617": [ + [7, 5, 21, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver::RSpec::DependencyTags`.", 2626933713] + ], + "lib/tree_haver/tree.rb:3332079774": [ + [129, 5, 1443, "Metrics/AbcSize: Assignment Branch Condition size for `edit` is too high. [<8, 18, 7> 20.9/17]", 4208399016], + [129, 5, 1443, "Metrics/MethodLength: Method has too many lines. [24/10]", 4208399016], + [129, 13, 89, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3152137646] + ], + "spec/backend_registry_spec.rb:229950927": [ + [5, 1, 3102, "Metrics/BlockLength: Block has too many lines. [62/25]", 3416335650] + ], + "spec/backends/tslp_spec.rb:1444201405": [ + [5, 1, 5497, "Metrics/BlockLength: Block has too many lines. [121/25]", 4279461260], + [30, 3, 1477, "Metrics/BlockLength: Block has too many lines. [32/25]", 2492475187], + [112, 3, 1352, "Metrics/BlockLength: Block has too many lines. [29/25]", 2972556266] + ], + "spec/fixtures_integration_spec.rb:3457821347": [ + [3, 1, 48556, "Metrics/BlockLength: Block has too many lines. [1006/25]", 2138474637], + [108, 3, 1282, "Metrics/BlockLength: Block has too many lines. [29/25]", 505243730], + [141, 3, 1840, "Metrics/BlockLength: Block has too many lines. [35/25]", 1365684528], + [180, 3, 1365, "Metrics/BlockLength: Block has too many lines. [33/25]", 1597100003], + [247, 3, 2110, "Metrics/BlockLength: Block has too many lines. [41/25]", 219204301], + [294, 3, 2166, "Metrics/BlockLength: Block has too many lines. [27/25]", 2219571348], + [354, 3, 1786, "Metrics/BlockLength: Block has too many lines. [30/25]", 1655451032], + [432, 3, 1345, "Metrics/BlockLength: Block has too many lines. [26/25]", 1188499098], + [534, 3, 3250, "Metrics/BlockLength: Block has too many lines. [64/25]", 2852118886], + [589, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 2115564430], + [602, 3, 752, "Metrics/AbcSize: Assignment Branch Condition size for `normalized_tree_node` is too high. [<0, 19, 4> 19.42/17]", 1725197185], + [602, 3, 752, "Metrics/MethodLength: Method has too many lines. [18/10]", 1725197185], + [623, 3, 850, "Metrics/AbcSize: Assignment Branch Condition size for `backend_capability` is too high. [<0, 20, 0> 20/17]", 3278569026], + [623, 3, 850, "Metrics/MethodLength: Method has too many lines. [14/10]", 3278569026], + [640, 3, 744, "Metrics/MethodLength: Method has too many lines. [13/10]", 1675624229], + [679, 3, 492, "Metrics/MethodLength: Method has too many lines. [11/10]", 4123526878], + [714, 3, 566, "Metrics/AbcSize: Assignment Branch Condition size for `parse_error_tolerance` is too high. [<1, 17, 1> 17.06/17]", 933590597], + [714, 3, 566, "Metrics/MethodLength: Method has too many lines. [14/10]", 933590597], + [739, 3, 2652, "Metrics/BlockLength: Block has too many lines. [47/25]", 214520278], + [1039, 7, 87, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3860036845], + [1045, 7, 60, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1411318317], + [1063, 3, 1334, "Metrics/BlockLength: Block has too many lines. [41/25]", 1427111445], + [1069, 7, 134, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1166944291], + [1075, 7, 60, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1411318317], + [1085, 7, 134, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1166944291], + [1091, 7, 60, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1411318317] + ], + "tree_haver.gemspec:665267582": [ + [16, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1512975621], + [129, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [146, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [147, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [154, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ] +} From d0f06fe1077700a23d1e8e56bb89ec135e718a4b Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:24:37 -0600 Subject: [PATCH 218/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-crispr-ruby-prism/Gemfile.lock | 334 ++- gems/ast-merge/.kettle-drift.lock | 60 +- gems/ast-merge/.rubocop_gradual.lock | 2838 ----------------------- gems/ast-merge/Gemfile.lock | 59 +- gems/ast-merge/README.md | 1 - gems/ast-merge/bin/yard | 2 +- gems/tree_haver/Gemfile.lock | 449 +--- 7 files changed, 520 insertions(+), 3223 deletions(-) delete mode 100644 gems/ast-merge/.rubocop_gradual.lock diff --git a/gems/ast-crispr-ruby-prism/Gemfile.lock b/gems/ast-crispr-ruby-prism/Gemfile.lock index 244546417..753787e1c 100644 --- a/gems/ast-crispr-ruby-prism/Gemfile.lock +++ b/gems/ast-crispr-ruby-prism/Gemfile.lock @@ -17,13 +17,264 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: ast-crispr (7.1.0) ast-merge (= 7.1.0) service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -35,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -48,6 +294,8 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -111,6 +359,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -139,6 +389,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-x86_64-linux-gnu) racc (~> 1.4) @@ -324,11 +575,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -371,23 +622,44 @@ DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -396,18 +668,26 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -415,14 +695,23 @@ CHECKSUMS appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -430,6 +719,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -442,19 +732,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-x86_64-linux-gnu) sha256=379fae440b28915e3f19d752ce2dcf8465ed2b2fbefd2a7ca0dd497bc981a06a nokogiri (1.19.4-x86_64-linux-musl) sha256=17dfb7c1fa194ae02fbf7c51a7afc8d278045ab3fdacfd86f91d02d7b274470b @@ -465,10 +763,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -476,6 +778,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -503,9 +806,11 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -515,6 +820,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -528,14 +834,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -543,6 +854,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ast-merge/.kettle-drift.lock b/gems/ast-merge/.kettle-drift.lock index 5fbedf92b..7854ba3b4 100644 --- a/gems/ast-merge/.kettle-drift.lock +++ b/gems/ast-merge/.kettle-drift.lock @@ -7,7 +7,8 @@ 119, 159, 199, - 239 + 239, + 279 ] } ], @@ -19,7 +20,8 @@ 130, 170, 210, - 250 + 250, + 290 ] } ], @@ -31,7 +33,8 @@ 120, 160, 200, - 240 + 240, + 280 ] } ], @@ -43,7 +46,8 @@ 132, 172, 212, - 252 + 252, + 292 ] } ], @@ -55,7 +59,8 @@ 135, 175, 215, - 255 + 255, + 295 ] } ], @@ -67,7 +72,8 @@ 121, 161, 201, - 241 + 241, + 281 ] } ], @@ -80,7 +86,8 @@ 139, 179, 219, - 259 + 259, + 299 ] } ], @@ -92,7 +99,8 @@ 140, 180, 220, - 260 + 260, + 300 ] } ], @@ -105,7 +113,8 @@ 126, 166, 206, - 246 + 246, + 286 ] } ], @@ -117,7 +126,8 @@ 149, 189, 229, - 269 + 269, + 309 ] } ], @@ -130,7 +140,8 @@ 118, 158, 198, - 238 + 238, + 278 ] } ], @@ -143,7 +154,8 @@ 148, 188, 228, - 268 + 268, + 308 ] } ], @@ -155,7 +167,8 @@ 124, 164, 204, - 244 + 244, + 284 ] } ], @@ -168,7 +181,8 @@ 131, 171, 211, - 251 + 251, + 291 ] } ], @@ -181,7 +195,8 @@ 127, 167, 207, - 247 + 247, + 287 ] } ], @@ -193,7 +208,8 @@ 125, 165, 205, - 245 + 245, + 285 ] } ], @@ -205,7 +221,8 @@ 142, 182, 222, - 262 + 262, + 302 ] } ], @@ -217,7 +234,8 @@ 141, 181, 221, - 261 + 261, + 301 ] } ], @@ -229,7 +247,8 @@ 136, 176, 216, - 256 + 256, + 296 ] } ], @@ -241,7 +260,8 @@ 145, 185, 225, - 265 + 265, + 305 ] } ], diff --git a/gems/ast-merge/.rubocop_gradual.lock b/gems/ast-merge/.rubocop_gradual.lock deleted file mode 100644 index f8391bc5b..000000000 --- a/gems/ast-merge/.rubocop_gradual.lock +++ /dev/null @@ -1,2838 +0,0 @@ -{ - ".simplecov:3463276878": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:429706125": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "ast-merge.gemspec:1182320030": [ - [16, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1168797721], - [129, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [144, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [145, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [152, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/ast-merge.rb:3005639624": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`ast-merge.rb`) should use snake_case.", 5381] - ], - "lib/ast/merge.rb:3429747270": [ - [11, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge`.", 2866359175], - [11, 3, 270037, "Metrics/ModuleLength: Module has too many lines. [5702/100]", 2847709439], - [22, 5, 16, "Style/Documentation: Missing top-level documentation comment for `class Ast::Merge::ParseError`.", 362242086], - [33, 7, 362, "Metrics/AbcSize: Assignment Branch Condition size for `build_message` is too high. [<2, 16, 6> 17.2/17]", 3988736327], - [47, 5, 31, "Style/Documentation: Missing top-level documentation comment for `class Ast::Merge::PlaceholderCollisionError`.", 218924302], - [161, 7, 337, "Metrics/MethodLength: Method has too many lines. [11/10]", 2388996629], - [178, 7, 327, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [8/7]", 979795121], - [309, 7, 383, "Metrics/MethodLength: Method has too many lines. [11/10]", 634650261], - [473, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 3450568485], - [474, 7, 461, "Metrics/MethodLength: Method has too many lines. [12/10]", 43929779], - [491, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1299979089], - [492, 7, 377, "Metrics/MethodLength: Method has too many lines. [11/10]", 3704151253], - [508, 121, 39, "Layout/LineLength: Line is too long. [159/120]", 85503958], - [509, 7, 447, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [8/7]", 298553749], - [509, 7, 447, "Metrics/MethodLength: Method has too many lines. [12/10]", 298553749], - [538, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1441148616], - [539, 7, 453, "Metrics/MethodLength: Method has too many lines. [14/10]", 1899007021], - [558, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193342990], - [559, 7, 400, "Metrics/MethodLength: Method has too many lines. [11/10]", 298553749], - [588, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860750], - [589, 7, 411, "Metrics/MethodLength: Method has too many lines. [12/10]", 2893925621], - [606, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3137791633], - [607, 7, 454, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [8/7]", 298553749], - [607, 7, 454, "Metrics/MethodLength: Method has too many lines. [12/10]", 298553749], - [666, 7, 385, "Metrics/MethodLength: Method has too many lines. [11/10]", 794265461], - [703, 7, 419, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [10/7]", 3313546353], - [703, 7, 419, "Metrics/PerceivedComplexity: Perceived complexity for `to_h` is too high. [10/8]", 3313546353], - [753, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 398187770], - [765, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 2746783933], - [812, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860841], - [820, 121, 156, "Layout/LineLength: Line is too long. [276/120]", 1149525480], - [825, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 2538424426], - [837, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 2285382915], - [847, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3962419360], - [860, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 398187770], - [862, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3195178507], - [866, 121, 85, "Layout/LineLength: Line is too long. [205/120]", 4238980637], - [868, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 2678411233], - [870, 121, 39, "Layout/LineLength: Line is too long. [159/120]", 4028520110], - [881, 121, 110, "Layout/LineLength: Line is too long. [230/120]", 3837814921], - [895, 5, 2283, "Metrics/MethodLength: Method has too many lines. [57/10]", 2282416447], - [955, 5, 2654, "Metrics/MethodLength: Method has too many lines. [63/10]", 2491520565], - [1006, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1823519875], - [1015, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1874311968], - [1021, 5, 10660, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_downstream_merge_gem_feature_matrix` is too high. [<0, 21, 0> 21/17]", 2277322577], - [1021, 5, 10660, "Metrics/MethodLength: Method has too many lines. [248/10]", 2277322577], - [1272, 5, 1546, "Metrics/MethodLength: Method has too many lines. [37/10]", 208933754], - [1306, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 2658452668], - [1312, 5, 4206, "Metrics/MethodLength: Method has too many lines. [96/10]", 1997530776], - [1389, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 183246985], - [1405, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 3268438356], - [1411, 5, 1598, "Metrics/MethodLength: Method has too many lines. [46/10]", 849757258], - [1454, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1323237892], - [1460, 5, 1164, "Metrics/MethodLength: Method has too many lines. [36/10]", 1477831421], - [1493, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 931876829], - [1499, 5, 1699, "Metrics/MethodLength: Method has too many lines. [43/10]", 1125544678], - [1545, 5, 1016, "Metrics/MethodLength: Method has too many lines. [27/10]", 2194427985], - [1575, 5, 1058, "Metrics/MethodLength: Method has too many lines. [30/10]", 47860722], - [1608, 5, 1186, "Metrics/MethodLength: Method has too many lines. [31/10]", 676863486], - [1636, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 2689509078], - [1642, 5, 1517, "Metrics/MethodLength: Method has too many lines. [41/10]", 3855445172], - [1655, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 817380904], - [1680, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 409671963], - [1686, 5, 2116, "Metrics/MethodLength: Method has too many lines. [61/10]", 524104794], - [1750, 5, 820, "Metrics/MethodLength: Method has too many lines. [12/10]", 1888457180], - [1750, 37, 298, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 789483382], - [1751, 121, 100, "Layout/LineLength: Line is too long. [220/120]", 3288750271], - [1766, 5, 3595, "Metrics/AbcSize: Assignment Branch Condition size for `initial_profile_promotion_policy` is too high. [<9, 20, 0> 21.93/17]", 83685787], - [1766, 5, 3595, "Metrics/MethodLength: Method has too many lines. [77/10]", 83685787], - [1846, 5, 768, "Metrics/MethodLength: Method has too many lines. [17/10]", 314059802], - [1867, 5, 1493, "Metrics/AbcSize: Assignment Branch Condition size for `evaluate_profile_selection_requirement` is too high. [<7, 23, 9> 25.67/17]", 3177555163], - [1867, 5, 1493, "Metrics/MethodLength: Method has too many lines. [29/10]", 3177555163], - [1868, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2145168012], - [1875, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 683002336], - [1909, 5, 985, "Metrics/AbcSize: Assignment Branch Condition size for `profile_promotion_blocking_reasons` is too high. [<4, 25, 13> 28.46/17]", 1146627465], - [1909, 5, 985, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `profile_promotion_blocking_reasons` is too high. [10/7]", 1146627465], - [1909, 5, 985, "Metrics/MethodLength: Method has too many lines. [18/10]", 1146627465], - [1909, 5, 985, "Metrics/PerceivedComplexity: Perceived complexity for `profile_promotion_blocking_reasons` is too high. [10/8]", 1146627465], - [1930, 5, 3173, "Metrics/AbcSize: Assignment Branch Condition size for `validate_language_backend_profile` is too high. [<25, 68, 20> 75.16/17]", 2100389324], - [1930, 5, 3173, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_language_backend_profile` is too high. [21/7]", 2100389324], - [1930, 5, 3173, "Metrics/MethodLength: Method has too many lines. [60/10]", 2100389324], - [1930, 5, 3173, "Metrics/PerceivedComplexity: Perceived complexity for `validate_language_backend_profile` is too high. [23/8]", 2100389324], - [2002, 5, 1523, "Metrics/AbcSize: Assignment Branch Condition size for `validate_backend_inventory` is too high. [<13, 38, 13> 42.21/17]", 1899037537], - [2002, 5, 1523, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_backend_inventory` is too high. [13/7]", 1899037537], - [2002, 5, 1523, "Metrics/MethodLength: Method has too many lines. [25/10]", 1899037537], - [2002, 5, 1523, "Metrics/PerceivedComplexity: Perceived complexity for `validate_backend_inventory` is too high. [13/8]", 1899037537], - [2045, 5, 906, "Metrics/MethodLength: Method has too many lines. [20/10]", 3137959843], - [2068, 5, 2744, "Metrics/AbcSize: Assignment Branch Condition size for `detect_raw_merge_inconsistencies` is too high. [<8, 43, 21> 48.52/17]", 3717440692], - [2068, 5, 2744, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_raw_merge_inconsistencies` is too high. [17/7]", 3717440692], - [2068, 5, 2744, "Metrics/MethodLength: Method has too many lines. [53/10]", 3717440692], - [2068, 5, 2744, "Metrics/PerceivedComplexity: Perceived complexity for `detect_raw_merge_inconsistencies` is too high. [17/8]", 3717440692], - [2083, 7, 1894, "Metrics/BlockLength: Block has too many lines. [33/25]", 758887611], - [2129, 5, 762, "Metrics/MethodLength: Method has too many lines. [11/10]", 3021402342], - [2143, 5, 490, "Metrics/MethodLength: Method has too many lines. [11/10]", 578473475], - [2157, 5, 881, "Metrics/AbcSize: Assignment Branch Condition size for `execute_independent_commutative_insertions` is too high. [<6, 16, 7> 18.47/17]", 259417386], - [2157, 5, 881, "Metrics/MethodLength: Method has too many lines. [21/10]", 259417386], - [2184, 5, 1107, "Metrics/AbcSize: Assignment Branch Condition size for `execute_independent_keyed_member_edits` is too high. [<10, 31, 15> 35.86/17]", 4271501385], - [2184, 5, 1107, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `execute_independent_keyed_member_edits` is too high. [14/7]", 4271501385], - [2184, 5, 1107, "Metrics/MethodLength: Method has too many lines. [24/10]", 4271501385], - [2184, 5, 1107, "Metrics/PerceivedComplexity: Perceived complexity for `execute_independent_keyed_member_edits` is too high. [14/8]", 4271501385], - [2228, 5, 3149, "Metrics/AbcSize: Assignment Branch Condition size for `parse_compact_ruleset` is too high. [<16, 68, 24> 73.86/17]", 3149098803], - [2228, 5, 3149, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_compact_ruleset` is too high. [22/7]", 3149098803], - [2228, 5, 3149, "Metrics/MethodLength: Method has too many lines. [67/10]", 3149098803], - [2228, 5, 3149, "Metrics/PerceivedComplexity: Perceived complexity for `parse_compact_ruleset` is too high. [23/8]", 3149098803], - [2234, 7, 2544, "Metrics/BlockLength: Block has too many lines. [50/25]", 2484860466], - [2261, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193420054], - [2307, 5, 2658, "Metrics/AbcSize: Assignment Branch Condition size for `compact_ruleset_feature_profile` is too high. [<11, 67, 38> 77.81/17]", 4022599673], - [2307, 5, 2658, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compact_ruleset_feature_profile` is too high. [29/7]", 4022599673], - [2307, 5, 2658, "Metrics/MethodLength: Method has too many lines. [66/10]", 4022599673], - [2307, 5, 2658, "Metrics/PerceivedComplexity: Perceived complexity for `compact_ruleset_feature_profile` is too high. [16/8]", 4022599673], - [2325, 7, 2243, "Metrics/BlockLength: Block has too many lines. [47/25]", 965041772], - [2392, 5, 2733, "Metrics/AbcSize: Assignment Branch Condition size for `classify_template_target_path` is too high. [<4, 36, 23> 42.91/17]", 3661828596], - [2392, 5, 2733, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `classify_template_target_path` is too high. [21/7]", 3661828596], - [2392, 5, 2733, "Metrics/MethodLength: Method has too many lines. [39/10]", 3661828596], - [2392, 5, 2733, "Metrics/PerceivedComplexity: Perceived complexity for `classify_template_target_path` is too high. [17/8]", 3661828596], - [2424, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [2438, 5, 416, "Metrics/MethodLength: Method has too many lines. [12/10]", 1388641773], - [2481, 5, 388, "Metrics/MethodLength: Method has too many lines. [12/10]", 2360583514], - [2510, 5, 820, "Metrics/MethodLength: Method has too many lines. [13/10]", 354674808], - [2526, 5, 929, "Metrics/AbcSize: Assignment Branch Condition size for `enrich_template_plan_entries` is too high. [<9, 12, 10> 18.03/17]", 2666747528], - [2526, 5, 929, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `enrich_template_plan_entries` is too high. [9/7]", 2666747528], - [2526, 5, 929, "Metrics/MethodLength: Method has too many lines. [19/10]", 2666747528], - [2526, 5, 929, "Metrics/PerceivedComplexity: Perceived complexity for `enrich_template_plan_entries` is too high. [10/8]", 2666747528], - [2549, 5, 1245, "Metrics/AbcSize: Assignment Branch Condition size for `enrich_template_plan_entries_with_token_state` is too high. [<11, 23, 14> 29.09/17]", 1507113977], - [2549, 5, 1245, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `enrich_template_plan_entries_with_token_state` is too high. [13/7]", 1507113977], - [2549, 5, 1245, "Metrics/MethodLength: Method has too many lines. [19/10]", 1507113977], - [2549, 5, 1245, "Metrics/PerceivedComplexity: Perceived complexity for `enrich_template_plan_entries_with_token_state` is too high. [13/8]", 1507113977], - [2573, 5, 1353, "Metrics/AbcSize: Assignment Branch Condition size for `prepare_template_entries` is too high. [<6, 18, 11> 21.93/17]", 2774310942], - [2573, 5, 1353, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `prepare_template_entries` is too high. [11/7]", 2774310942], - [2573, 5, 1353, "Metrics/MethodLength: Method has too many lines. [24/10]", 2774310942], - [2573, 5, 1353, "Metrics/PerceivedComplexity: Perceived complexity for `prepare_template_entries` is too high. [12/8]", 2774310942], - [2603, 5, 1494, "Metrics/AbcSize: Assignment Branch Condition size for `plan_template_execution` is too high. [<8, 22, 17> 28.93/17]", 3876421385], - [2603, 5, 1494, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `plan_template_execution` is too high. [14/7]", 3876421385], - [2603, 5, 1494, "Metrics/MethodLength: Method has too many lines. [29/10]", 3876421385], - [2603, 5, 1494, "Metrics/PerceivedComplexity: Perceived complexity for `plan_template_execution` is too high. [15/8]", 3876421385], - [2604, 7, 1421, "Metrics/BlockLength: Block has too many lines. [27/25]", 2887810383], - [2637, 5, 822, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 2749235529], - [2637, 37, 220, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 447165880], - [2638, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 518382509], - [2652, 5, 2060, "Metrics/AbcSize: Assignment Branch Condition size for `preview_template_execution` is too high. [<11, 42, 26> 50.61/17]", 2270817206], - [2652, 5, 2060, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preview_template_execution` is too high. [25/7]", 2270817206], - [2652, 5, 2060, "Metrics/MethodLength: Method has too many lines. [39/10]", 2270817206], - [2652, 5, 2060, "Metrics/PerceivedComplexity: Perceived complexity for `preview_template_execution` is too high. [23/8]", 2270817206], - [2662, 7, 1809, "Metrics/BlockLength: Block has too many lines. [28/25]", 310337564], - [2700, 5, 2513, "Metrics/AbcSize: Assignment Branch Condition size for `apply_template_execution` is too high. [<14, 50, 25> 57.63/17]", 177708331], - [2700, 5, 2513, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_template_execution` is too high. [26/7]", 177708331], - [2700, 5, 2513, "Metrics/MethodLength: Method has too many lines. [50/10]", 177708331], - [2700, 5, 2513, "Metrics/PerceivedComplexity: Perceived complexity for `apply_template_execution` is too high. [23/8]", 177708331], - [2711, 7, 2239, "Metrics/BlockLength: Block has too many lines. [38/25]", 1651205014], - [2761, 5, 1696, "Metrics/AbcSize: Assignment Branch Condition size for `evaluate_template_tree_convergence` is too high. [<11, 29, 17> 35.37/17]", 2507998041], - [2761, 5, 1696, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `evaluate_template_tree_convergence` is too high. [17/7]", 2507998041], - [2761, 5, 1696, "Metrics/MethodLength: Method has too many lines. [35/10]", 2507998041], - [2761, 5, 1696, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 2507998041], - [2761, 5, 1696, "Metrics/PerceivedComplexity: Perceived complexity for `evaluate_template_tree_convergence` is too high. [17/8]", 2507998041], - [2761, 43, 198, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 4214374277], - [2762, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 2983874608], - [2804, 5, 688, "Metrics/MethodLength: Method has too many lines. [15/10]", 3064253784], - [2804, 5, 688, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 3064253784], - [2804, 36, 216, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 448029307], - [2805, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3840139076], - [2848, 5, 664, "Metrics/MethodLength: Method has too many lines. [13/10]", 995637868], - [2848, 5, 664, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 995637868], - [2848, 53, 202, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 4227116196], - [2849, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 418683952], - [2866, 5, 649, "Metrics/MethodLength: Method has too many lines. [13/10]", 1831524792], - [2866, 5, 649, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 1831524792], - [2866, 54, 178, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2962381850], - [2867, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 3690915627], - [2884, 5, 1280, "Metrics/AbcSize: Assignment Branch Condition size for `apply_template_tree_execution_to_directory` is too high. [<6, 16, 6> 18.11/17]", 305449363], - [2884, 5, 1280, "Metrics/MethodLength: Method has too many lines. [23/10]", 305449363], - [2884, 5, 1280, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 305449363], - [2884, 51, 200, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1352434212], - [2885, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 1139621482], - [2913, 5, 2199, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_tree_run` is too high. [<15, 42, 31> 54.31/17]", 975627723], - [2913, 5, 2199, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_tree_run` is too high. [25/7]", 975627723], - [2913, 5, 2199, "Metrics/MethodLength: Method has too many lines. [38/10]", 975627723], - [2913, 5, 2199, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_tree_run` is too high. [26/8]", 975627723], - [2957, 5, 1515, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_apply` is too high. [<13, 35, 21> 42.84/17]", 3710254295], - [2957, 5, 1515, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_directory_apply` is too high. [17/7]", 3710254295], - [2957, 5, 1515, "Metrics/MethodLength: Method has too many lines. [26/10]", 3710254295], - [2957, 5, 1515, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_directory_apply` is too high. [17/8]", 3710254295], - [2972, 20, 1, "Style/DoubleNegation: Avoid the use of double negation (`!!`).", 177540], - [2989, 5, 1656, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_plan` is too high. [<11, 24, 25> 36.36/17]", 2946319293], - [2989, 5, 1656, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_directory_plan` is too high. [18/7]", 2946319293], - [2989, 5, 1656, "Metrics/MethodLength: Method has too many lines. [36/10]", 2946319293], - [2989, 5, 1656, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_directory_plan` is too high. [16/8]", 2946319293], - [3061, 7, 9, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 3648222389], - [3082, 5, 410, "Metrics/MethodLength: Method has too many lines. [12/10]", 248324428], - [3088, 7, 11, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 848344986], - [3132, 5, 712, "Metrics/MethodLength: Method has too many lines. [12/10]", 2500743043], - [3132, 27, 178, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 873705194], - [3132, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3023611470], - [3158, 42, 167, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2002181571], - [3171, 5, 1097, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structured_edit_selection_profile` is too high. [8/7]", 1149325233], - [3171, 5, 1097, "Metrics/MethodLength: Method has too many lines. [14/10]", 1149325233], - [3171, 42, 311, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 3814063337], - [3172, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 198450264], - [3185, 34, 47, "Style/SafeNavigation: Use safe navigation (`&.`) instead of checking if an object exists before calling the method.", 3204815976], - [3190, 5, 869, "Metrics/MethodLength: Method has too many lines. [11/10]", 83957392], - [3190, 41, 250, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1486072775], - [3191, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1967186495], - [3201, 36, 47, "Style/SafeNavigation: Use safe navigation (`&.`) instead of checking if an object exists before calling the method.", 3204815976], - [3206, 5, 1156, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structured_edit_match_profile` is too high. [10/7]", 4112674787], - [3206, 5, 1156, "Metrics/MethodLength: Method has too many lines. [15/10]", 4112674787], - [3206, 5, 1156, "Metrics/PerceivedComplexity: Perceived complexity for `structured_edit_match_profile` is too high. [10/8]", 4112674787], - [3206, 38, 321, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [12/5]", 823565876], - [3207, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859667], - [3208, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3673982236], - [3226, 5, 933, "Metrics/MethodLength: Method has too many lines. [14/10]", 2099388915], - [3226, 37, 319, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [12/5]", 250907892], - [3227, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177545], - [3228, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 4154814685], - [3245, 5, 907, "Metrics/MethodLength: Method has too many lines. [12/10]", 2242846328], - [3245, 42, 275, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 246196330], - [3246, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1439117336], - [3262, 5, 1057, "Metrics/MethodLength: Method has too many lines. [14/10]", 2891607970], - [3262, 44, 323, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 1386547750], - [3263, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1676243675], - [3264, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 4154814685], - [3281, 5, 1375, "Metrics/AbcSize: Assignment Branch Condition size for `structured_edit_request` is too high. [<11, 25, 10> 29.09/17]", 4153786554], - [3281, 5, 1375, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structured_edit_request` is too high. [11/7]", 4153786554], - [3281, 5, 1375, "Metrics/MethodLength: Method has too many lines. [16/10]", 4153786554], - [3281, 5, 1375, "Metrics/PerceivedComplexity: Perceived complexity for `structured_edit_request` is too high. [11/8]", 4153786554], - [3281, 32, 370, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [13/5]", 2381882467], - [3282, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177545], - [3303, 5, 728, "Metrics/MethodLength: Method has too many lines. [11/10]", 4026157473], - [3303, 31, 175, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 773121544], - [3335, 5, 597, "Metrics/MethodLength: Method has too many lines. [11/10]", 4143495860], - [3374, 5, 577, "Metrics/MethodLength: Method has too many lines. [11/10]", 4169131743], - [3389, 5, 1011, "Metrics/AbcSize: Assignment Branch Condition size for `structured_edit_execution_report` is too high. [<7, 16, 7> 18.81/17]", 876221899], - [3389, 5, 1011, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structured_edit_execution_report` is too high. [8/7]", 876221899], - [3389, 5, 1011, "Metrics/MethodLength: Method has too many lines. [12/10]", 876221899], - [3389, 41, 245, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 2484440861], - [3390, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 4036992717], - [3415, 55, 170, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 668161765], - [3438, 5, 819, "Metrics/MethodLength: Method has too many lines. [12/10]", 2287133436], - [3438, 56, 217, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3198032135], - [3439, 121, 51, "Layout/LineLength: Line is too long. [171/120]", 3526181051], - [3472, 5, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 1853778635], - [3481, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], - [3513, 5, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 1132214891], - [3522, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], - [3544, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 556747511], - [3553, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1808630920], - [3575, 5, 708, "Metrics/MethodLength: Method has too many lines. [11/10]", 3590891170], - [3584, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1367166441], - [3607, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 689748855], - [3616, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1808630920], - [3638, 5, 708, "Metrics/MethodLength: Method has too many lines. [11/10]", 1478642210], - [3647, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1367166441], - [3671, 5, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 239506091], - [3680, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], - [3702, 5, 693, "Metrics/MethodLength: Method has too many lines. [11/10]", 3803476550], - [3711, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], - [3734, 5, 728, "Metrics/MethodLength: Method has too many lines. [11/10]", 748161230], - [3743, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 2807086497], - [3765, 5, 758, "Metrics/MethodLength: Method has too many lines. [11/10]", 3900524558], - [3774, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3463884836], - [3798, 5, 748, "Metrics/MethodLength: Method has too many lines. [11/10]", 2076716686], - [3807, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 609414023], - [3829, 5, 778, "Metrics/MethodLength: Method has too many lines. [11/10]", 867958318], - [3833, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193343749], - [3838, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 1202823007], - [3862, 5, 728, "Metrics/MethodLength: Method has too many lines. [11/10]", 2078323790], - [3871, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 2807086497], - [3893, 5, 758, "Metrics/MethodLength: Method has too many lines. [11/10]", 121025422], - [3902, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3463884836], - [3924, 5, 733, "Metrics/MethodLength: Method has too many lines. [11/10]", 1216456558], - [3933, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 145839927], - [3955, 5, 763, "Metrics/MethodLength: Method has too many lines. [11/10]", 2946525998], - [3964, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 275709226], - [3988, 5, 768, "Metrics/MethodLength: Method has too many lines. [11/10]", 3281402414], - [3992, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177656], - [3997, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 1427340581], - [4034, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3673982236], - [4091, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193417070], - [4102, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2768444], - [4109, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3833204035], - [4117, 5, 863, "Metrics/MethodLength: Method has too many lines. [11/10]", 3731153486], - [4121, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 4054494590], - [4126, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 2084326338], - [4132, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 4201858364], - [4136, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861122], - [4140, 5, 873, "Metrics/MethodLength: Method has too many lines. [11/10]", 1866057614], - [4144, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3893180930], - [4149, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 863421408], - [4155, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 3247130491], - [4159, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1171438608], - [4163, 5, 883, "Metrics/MethodLength: Method has too many lines. [11/10]", 2352924462], - [4163, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860841], - [4164, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861334], - [4167, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 465221046], - [4172, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 1922522532], - [4188, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 4067226670], - [4192, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2033573170], - [4196, 5, 893, "Metrics/MethodLength: Method has too many lines. [11/10]", 1633175534], - [4196, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087926422], - [4197, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087421565], - [4200, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 615151909], - [4205, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 884393597], - [4231, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 417844693], - [4235, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1233681340], - [4239, 5, 903, "Metrics/MethodLength: Method has too many lines. [11/10]", 3964877742], - [4239, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873471], - [4240, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1322899615], - [4243, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 3471008807], - [4248, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 627945471], - [4254, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 2960084092], - [4258, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2148514258], - [4262, 5, 913, "Metrics/MethodLength: Method has too many lines. [11/10]", 385546958], - [4262, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2970472935], - [4263, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3808956371], - [4266, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 3412499338], - [4271, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 3274208144], - [4277, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 4275923717], - [4285, 5, 848, "Metrics/MethodLength: Method has too many lines. [11/10]", 457851502], - [4289, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 413805135], - [4294, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 951908917], - [4300, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 1859200227], - [4308, 5, 808, "Metrics/MethodLength: Method has too many lines. [11/10]", 884695726], - [4312, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 2011807620], - [4317, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 384138219], - [4323, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1176320663], - [4331, 5, 798, "Metrics/MethodLength: Method has too many lines. [11/10]", 1422521838], - [4335, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3247420006], - [4340, 121, 35, "Layout/LineLength: Line is too long. [155/120]", 1408316702], - [4346, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 938465266], - [4354, 5, 803, "Metrics/MethodLength: Method has too many lines. [11/10]", 2370839950], - [4358, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 74128911], - [4363, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 1364659899], - [4369, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2059517661], - [4377, 5, 803, "Metrics/MethodLength: Method has too many lines. [11/10]", 3379336814], - [4381, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 74128911], - [4386, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 1364659899], - [4434, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 4281772560], - [4442, 5, 833, "Metrics/MethodLength: Method has too many lines. [11/10]", 3245498510], - [4446, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3542644754], - [4451, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1916814773], - [4457, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 859690879], - [4465, 5, 833, "Metrics/MethodLength: Method has too many lines. [11/10]", 4138830126], - [4469, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3542644754], - [4474, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1916814773], - [4480, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3880141603], - [4488, 5, 828, "Metrics/MethodLength: Method has too many lines. [11/10]", 3621010990], - [4492, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3917260126], - [4497, 121, 41, "Layout/LineLength: Line is too long. [161/120]", 1879260859], - [4503, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1776611011], - [4511, 5, 838, "Metrics/MethodLength: Method has too many lines. [11/10]", 514585454], - [4515, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1353518231], - [4520, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 1228459824], - [4526, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 3932349968], - [4530, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087903307], - [4534, 5, 878, "Metrics/MethodLength: Method has too many lines. [11/10]", 1525737454], - [4534, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], - [4535, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177538], - [4538, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 2895681070], - [4543, 121, 51, "Layout/LineLength: Line is too long. [171/120]", 4040662298], - [4549, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 66929045], - [4557, 5, 808, "Metrics/MethodLength: Method has too many lines. [11/10]", 1626746606], - [4561, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 2011807620], - [4566, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 384138219], - [4580, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 849230508], - [4588, 5, 838, "Metrics/MethodLength: Method has too many lines. [11/10]", 3531122670], - [4592, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1353518231], - [4597, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 1228459824], - [4612, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1176320663], - [4620, 5, 798, "Metrics/MethodLength: Method has too many lines. [11/10]", 1118421486], - [4624, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3247420006], - [4629, 121, 35, "Layout/LineLength: Line is too long. [155/120]", 1408316702], - [4651, 5, 693, "Metrics/MethodLength: Method has too many lines. [11/10]", 1668406662], - [4660, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], - [4674, 5, 648, "Metrics/MethodLength: Method has too many lines. [11/10]", 3479836893], - [4683, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193343749], - [4705, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 3147549879], - [4714, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1808630920], - [4749, 5, 677, "Metrics/MethodLength: Method has too many lines. [11/10]", 1206941784], - [4758, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3937819337], - [4781, 5, 672, "Metrics/MethodLength: Method has too many lines. [11/10]", 3634903061], - [4790, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], - [4812, 5, 683, "Metrics/MethodLength: Method has too many lines. [11/10]", 3417053461], - [4821, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], - [4845, 5, 668, "Metrics/MethodLength: Method has too many lines. [11/10]", 1540762726], - [4854, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1808630920], - [4876, 5, 698, "Metrics/MethodLength: Method has too many lines. [11/10]", 2804825893], - [4885, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1367166441], - [4908, 5, 683, "Metrics/MethodLength: Method has too many lines. [11/10]", 3165010613], - [4917, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], - [4939, 5, 713, "Metrics/MethodLength: Method has too many lines. [11/10]", 2795628035], - [4948, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 497133415], - [4954, 5, 864, "Metrics/MethodLength: Method has too many lines. [12/10]", 1086224878], - [4954, 50, 268, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 4022739767], - [4955, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1607400384], - [4979, 5, 658, "Metrics/MethodLength: Method has too many lines. [11/10]", 3999796489], - [4988, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 102058825], - [5002, 59, 179, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1569981428], - [5003, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 1515849732], - [5034, 5, 694, "Metrics/MethodLength: Method has too many lines. [11/10]", 3830236120], - [5043, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2250857971], - [5057, 5, 673, "Metrics/MethodLength: Method has too many lines. [11/10]", 2413908653], - [5066, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1225026887], - [5080, 5, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 3935895659], - [5089, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], - [5103, 5, 692, "Metrics/MethodLength: Method has too many lines. [11/10]", 3660669627], - [5112, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3558241761], - [5126, 5, 612, "Metrics/MethodLength: Method has too many lines. [11/10]", 100391811], - [5165, 5, 693, "Metrics/MethodLength: Method has too many lines. [11/10]", 3138587622], - [5174, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], - [5196, 5, 688, "Metrics/MethodLength: Method has too many lines. [11/10]", 2736088861], - [5205, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1992103013], - [5228, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 2275602867], - [5237, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3598350322], - [5260, 5, 602, "Metrics/MethodLength: Method has too many lines. [11/10]", 3023166371], - [5275, 36, 181, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1071580945], - [5288, 5, 787, "Metrics/AbcSize: Assignment Branch Condition size for `group_projected_child_review_cases` is too high. [<4, 17, 4> 17.92/17]", 3391527151], - [5288, 5, 787, "Metrics/MethodLength: Method has too many lines. [18/10]", 3391527151], - [5312, 5, 705, "Metrics/MethodLength: Method has too many lines. [13/10]", 2629923275], - [5339, 5, 547, "Metrics/MethodLength: Method has too many lines. [12/10]", 1911190850], - [5364, 5, 1516, "Metrics/AbcSize: Assignment Branch Condition size for `review_projected_child_groups` is too high. [<11, 21, 9> 25.36/17]", 3333110579], - [5364, 5, 1516, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `review_projected_child_groups` is too high. [8/7]", 3333110579], - [5364, 5, 1516, "Metrics/MethodLength: Method has too many lines. [39/10]", 3333110579], - [5364, 5, 1516, "Metrics/PerceivedComplexity: Perceived complexity for `review_projected_child_groups` is too high. [9/8]", 3333110579], - [5398, 7, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], - [5410, 5, 562, "Metrics/MethodLength: Method has too many lines. [14/10]", 3083915102], - [5429, 5, 1898, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_delegated_child_outputs` is too high. [<11, 21, 6> 24.45/17]", 2739722546], - [5429, 5, 1898, "Metrics/MethodLength: Method has too many lines. [49/10]", 2739722546], - [5484, 5, 942, "Metrics/AbcSize: Assignment Branch Condition size for `execute_nested_merge` is too high. [<3, 17, 6> 18.28/17]", 766157172], - [5484, 5, 942, "Metrics/MethodLength: Method has too many lines. [20/10]", 766157172], - [5484, 29, 144, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1404367793], - [5511, 5, 652, "Metrics/MethodLength: Method has too many lines. [13/10]", 2105803856], - [5530, 38, 140, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1682835820], - [5560, 5, 577, "Metrics/MethodLength: Method has too many lines. [12/10]", 2659610443], - [5629, 5, 569, "Metrics/MethodLength: Method has too many lines. [14/10]", 20616641], - [5657, 5, 772, "Metrics/AbcSize: Assignment Branch Condition size for `conformance_manifest_review_request_ids` is too high. [<7, 16, 8> 19.21/17]", 3577418475], - [5657, 5, 772, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `conformance_manifest_review_request_ids` is too high. [9/7]", 3577418475], - [5657, 5, 772, "Metrics/MethodLength: Method has too many lines. [14/10]", 3577418475], - [5657, 5, 772, "Metrics/PerceivedComplexity: Perceived complexity for `conformance_manifest_review_request_ids` is too high. [9/8]", 3577418475], - [5711, 5, 606, "Metrics/MethodLength: Method has too many lines. [11/10]", 2675086662], - [5726, 5, 562, "Metrics/MethodLength: Method has too many lines. [11/10]", 3811715870], - [5741, 5, 578, "Metrics/MethodLength: Method has too many lines. [11/10]", 1776197415], - [5756, 5, 1298, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_conformance_family_context` is too high. [<7, 28, 9> 30.23/17]", 4265202259], - [5756, 5, 1298, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `resolve_conformance_family_context` is too high. [10/7]", 4265202259], - [5756, 5, 1298, "Metrics/MethodLength: Method has too many lines. [23/10]", 4265202259], - [5756, 5, 1298, "Metrics/PerceivedComplexity: Perceived complexity for `resolve_conformance_family_context` is too high. [10/8]", 4265202259], - [5785, 5, 1994, "Metrics/AbcSize: Assignment Branch Condition size for `review_conformance_family_context` is too high. [<12, 24, 10> 28.64/17]", 2834851944], - [5785, 5, 1994, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `review_conformance_family_context` is too high. [10/7]", 2834851944], - [5785, 5, 1994, "Metrics/MethodLength: Method has too many lines. [41/10]", 2834851944], - [5785, 5, 1994, "Metrics/PerceivedComplexity: Perceived complexity for `review_conformance_family_context` is too high. [11/8]", 2834851944], - [5808, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 641612328], - [5845, 5, 1844, "Metrics/AbcSize: Assignment Branch Condition size for `select_conformance_case` is too high. [<2, 43, 14> 45.27/17]", 670673209], - [5845, 5, 1844, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `select_conformance_case` is too high. [14/7]", 670673209], - [5845, 5, 1844, "Metrics/MethodLength: Method has too many lines. [30/10]", 670673209], - [5845, 5, 1844, "Metrics/PerceivedComplexity: Perceived complexity for `select_conformance_case` is too high. [16/8]", 670673209], - [5850, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 2135503892], - [5852, 121, 41, "Layout/LineLength: Line is too long. [161/120]", 3932054828], - [5861, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 3169124957], - [5883, 5, 509, "Metrics/MethodLength: Method has too many lines. [11/10]", 3552283123], - [5972, 5, 4195, "Metrics/AbcSize: Assignment Branch Condition size for `review_conformance_manifest` is too high. [<37, 63, 16> 74.79/17]", 2166560528], - [5972, 5, 4195, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `review_conformance_manifest` is too high. [14/7]", 2166560528], - [5972, 5, 4195, "Metrics/MethodLength: Method has too many lines. [89/10]", 2166560528], - [5972, 5, 4195, "Metrics/PerceivedComplexity: Perceived complexity for `review_conformance_manifest` is too high. [17/8]", 2166560528], - [6037, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2746826653], - [6053, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 3035993839], - [6075, 5, 676, "Metrics/MethodLength: Method has too many lines. [15/10]", 3048335475], - [6098, 5, 1054, "Metrics/AbcSize: Assignment Branch Condition size for `plan_conformance_suite` is too high. [<11, 18, 8> 22.56/17]", 1855254788], - [6098, 5, 1054, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `plan_conformance_suite` is too high. [8/7]", 1855254788], - [6098, 5, 1054, "Metrics/MethodLength: Method has too many lines. [25/10]", 1855254788], - [6098, 31, 84, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 172854173], - [6163, 5, 1274, "Metrics/AbcSize: Assignment Branch Condition size for `plan_named_conformance_suites_with_diagnostics` is too high. [<11, 21, 7> 24.72/17]", 3991300730], - [6163, 5, 1274, "Metrics/MethodLength: Method has too many lines. [27/10]", 3991300730], - [6190, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 3035993839], - [6255, 5, 2071, "Metrics/AbcSize: Assignment Branch Condition size for `review_decision_for_family_context` is too high. [<7, 22, 16> 28.09/17]", 4245377184], - [6255, 5, 2071, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `review_decision_for_family_context` is too high. [12/7]", 4245377184], - [6255, 5, 2071, "Metrics/MethodLength: Method has too many lines. [46/10]", 4245377184], - [6255, 5, 2071, "Metrics/PerceivedComplexity: Perceived complexity for `review_decision_for_family_context` is too high. [12/8]", 4245377184], - [6260, 7, 1766, "Metrics/BlockLength: Block has too many lines. [40/25]", 65448241], - [6312, 5, 686, "Metrics/MethodLength: Method has too many lines. [13/10]", 4030291682] - ], - "lib/ast/merge/ast_node.rb:2037773320": [ - [44, 5, 7086, "Metrics/ClassLength: Class has too many lines. [114/100]", 201314721], - [220, 11, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183] - ], - "lib/ast/merge/comment/attachment.rb:2388154769": [ - [42, 23, 180, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3775370530], - [75, 24, 2, "Lint/SafeNavigationConsistency: Use `.` instead of unnecessary `&.`.", 5858765], - [81, 25, 2, "Lint/SafeNavigationConsistency: Use `.` instead of unnecessary `&.`.", 5858765], - [114, 9, 410, "Metrics/AbcSize: Assignment Branch Condition size for `inspect` is too high. [<1, 17, 4> 17.49/17]", 605978105], - [115, 32, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] - ], - "lib/ast/merge/comment/augmenter.rb:633395157": [ - [12, 7, 13967, "Metrics/ClassLength: Class has too many lines. [291/100]", 2806660144], - [33, 9, 721, "Metrics/MethodLength: Method has too many lines. [16/10]", 200402816], - [33, 23, 91, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2938734913], - [64, 9, 1335, "Metrics/AbcSize: Assignment Branch Condition size for `build!` is too high. [<12, 29, 6> 31.95/17]", 3904283188], - [64, 9, 1335, "Metrics/MethodLength: Method has too many lines. [22/10]", 3904283188], - [94, 9, 867, "Metrics/AbcSize: Assignment Branch Condition size for `infer_leading_comments` is too high. [<8, 19, 14> 24.92/17]", 1941464872], - [94, 9, 867, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_leading_comments` is too high. [11/7]", 1941464872], - [94, 9, 867, "Metrics/MethodLength: Method has too many lines. [20/10]", 1941464872], - [94, 9, 867, "Metrics/PerceivedComplexity: Perceived complexity for `infer_leading_comments` is too high. [12/8]", 1941464872], - [122, 9, 429, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_inline_comments` is too high. [8/7]", 2688935834], - [133, 9, 934, "Metrics/AbcSize: Assignment Branch Condition size for `infer_trailing_comments` is too high. [<8, 21, 18> 28.79/17]", 1551855281], - [133, 9, 934, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_trailing_comments` is too high. [15/7]", 1551855281], - [133, 9, 934, "Metrics/MethodLength: Method has too many lines. [20/10]", 1551855281], - [133, 9, 934, "Metrics/PerceivedComplexity: Perceived complexity for `infer_trailing_comments` is too high. [15/8]", 1551855281], - [160, 9, 488, "Metrics/AbcSize: Assignment Branch Condition size for `infer_postlude!` is too high. [<5, 17, 8> 19.44/17]", 2562637949], - [160, 9, 488, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_postlude!` is too high. [8/7]", 2562637949], - [173, 9, 1529, "Metrics/AbcSize: Assignment Branch Condition size for `infer_remaining_regions!` is too high. [<12, 27, 23> 37.44/17]", 3911657050], - [173, 9, 1529, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_remaining_regions!` is too high. [18/7]", 3911657050], - [173, 9, 1529, "Metrics/MethodLength: Method has too many lines. [28/10]", 3911657050], - [173, 9, 1529, "Metrics/PerceivedComplexity: Perceived complexity for `infer_remaining_regions!` is too high. [20/8]", 3911657050], - [216, 9, 507, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split_preamble_group` is too high. [8/7]", 336784898], - [231, 9, 588, "Metrics/MethodLength: Method has too many lines. [17/10]", 3445626532], - [274, 9, 965, "Metrics/AbcSize: Assignment Branch Condition size for `build_region` is too high. [<6, 17, 7> 19.34/17]", 344809006], - [274, 9, 965, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_region` is too high. [8/7]", 344809006], - [274, 9, 965, "Metrics/MethodLength: Method has too many lines. [24/10]", 344809006] - ], - "lib/ast/merge/comment/block.rb:3806757604": [ - [31, 7, 6754, "Metrics/ClassLength: Class has too many lines. [106/100]", 2308582303], - [57, 9, 1059, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<12, 13, 14> 22.56/17]", 2656171724], - [57, 9, 1059, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `initialize` is too high. [14/7]", 2656171724], - [57, 9, 1059, "Metrics/MethodLength: Method has too many lines. [21/10]", 2656171724], - [57, 9, 1059, "Metrics/PerceivedComplexity: Perceived complexity for `initialize` is too high. [15/8]", 2656171724], - [113, 9, 511, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `freeze_action` is too high. [9/7]", 55014877], - [113, 9, 511, "Metrics/MethodLength: Method has too many lines. [12/10]", 55014877], - [113, 9, 511, "Metrics/PerceivedComplexity: Perceived complexity for `freeze_action` is too high. [9/8]", 55014877], - [181, 9, 439, "Metrics/AbcSize: Assignment Branch Condition size for `first_meaningful_content` is too high. [<2, 16, 11> 19.52/17]", 680479883], - [181, 9, 439, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `first_meaningful_content` is too high. [11/7]", 680479883], - [181, 9, 439, "Metrics/PerceivedComplexity: Perceived complexity for `first_meaningful_content` is too high. [12/8]", 680479883], - [197, 9, 765, "Metrics/AbcSize: Assignment Branch Condition size for `extract_block_content` is too high. [<7, 24, 9> 26.57/17]", 621871624], - [197, 9, 765, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_block_content` is too high. [9/7]", 621871624], - [197, 9, 765, "Metrics/PerceivedComplexity: Perceived complexity for `extract_block_content` is too high. [9/8]", 621871624] - ], - "lib/ast/merge/comment/c_style_tracker_base.rb:1569556520": [ - [22, 7, 15053, "Metrics/ClassLength: Class has too many lines. [284/100]", 3599183270], - [83, 9, 509, "Metrics/MethodLength: Method has too many lines. [11/10]", 1639553915], - [102, 9, 492, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `leading_comments_before` is too high. [8/7]", 3127043491], - [102, 9, 492, "Metrics/MethodLength: Method has too many lines. [11/10]", 3127043491], - [124, 9, 487, "Metrics/MethodLength: Method has too many lines. [11/10]", 1869933531], - [176, 9, 713, "Metrics/AbcSize: Assignment Branch Condition size for `trailing_comments_after` is too high. [<6, 12, 13> 18.68/17]", 543703521], - [176, 9, 713, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trailing_comments_after` is too high. [11/7]", 543703521], - [176, 9, 713, "Metrics/MethodLength: Method has too many lines. [14/10]", 543703521], - [176, 9, 713, "Metrics/PerceivedComplexity: Perceived complexity for `trailing_comments_after` is too high. [11/8]", 543703521], - [184, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177549], - [202, 9, 598, "Metrics/MethodLength: Method has too many lines. [12/10]", 1628921093], - [222, 9, 1271, "Metrics/MethodLength: Method has too many lines. [21/10]", 612335469], - [222, 35, 137, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1823300034], - [329, 35, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [348, 9, 2271, "Metrics/AbcSize: Assignment Branch Condition size for `extract_comments` is too high. [<17, 32, 13> 38.5/17]", 2751274968], - [348, 9, 2271, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_comments` is too high. [14/7]", 2751274968], - [348, 9, 2271, "Metrics/MethodLength: Method has too many lines. [59/10]", 2751274968], - [348, 9, 2271, "Metrics/PerceivedComplexity: Perceived complexity for `extract_comments` is too high. [14/8]", 2751274968], - [353, 11, 2045, "Metrics/BlockLength: Block has too many lines. [52/25]", 575665179], - [418, 9, 659, "Metrics/MethodLength: Method has too many lines. [15/10]", 177254901], - [439, 71, 4, "Lint/UnusedMethodArgument: Unused method argument - `line`.", 2087656651], - [439, 78, 8, "Lint/UnusedMethodArgument: Unused method argument - `line_num`.", 622661090] - ], - "lib/ast/merge/comment/hash_tracker_base.rb:861186417": [ - [32, 7, 19362, "Metrics/ClassLength: Class has too many lines. [221/100]", 1031055222], - [118, 9, 444, "Metrics/MethodLength: Method has too many lines. [11/10]", 3347260807], - [142, 9, 921, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `leading_comments_before` is too high. [8/7]", 415734636], - [142, 9, 921, "Metrics/MethodLength: Method has too many lines. [11/10]", 415734636], - [172, 9, 440, "Metrics/MethodLength: Method has too many lines. [11/10]", 2464474004], - [225, 9, 623, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trailing_comments_after` is too high. [10/7]", 543703521], - [225, 9, 623, "Metrics/MethodLength: Method has too many lines. [12/10]", 543703521], - [225, 9, 623, "Metrics/PerceivedComplexity: Perceived complexity for `trailing_comments_after` is too high. [10/8]", 543703521], - [249, 9, 551, "Metrics/MethodLength: Method has too many lines. [12/10]", 2783654570], - [278, 9, 1271, "Metrics/MethodLength: Method has too many lines. [21/10]", 612335469], - [278, 35, 137, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1823300034], - [374, 35, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [439, 9, 826, "Metrics/MethodLength: Method has too many lines. [12/10]", 1706632542] - ], - "lib/ast/merge/comment/parser.rb:2674748021": [ - [34, 7, 8372, "Metrics/ClassLength: Class has too many lines. [141/100]", 2541983664], - [84, 9, 357, "Metrics/MethodLength: Method has too many lines. [12/10]", 2265493710], - [104, 9, 545, "Metrics/AbcSize: Assignment Branch Condition size for `auto_detect_style` is too high. [<5, 17, 7> 19.05/17]", 868366444], - [104, 9, 545, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `auto_detect_style` is too high. [8/7]", 868366444], - [125, 9, 1650, "Metrics/AbcSize: Assignment Branch Condition size for `parse_line_comments` is too high. [<8, 28, 7> 29.95/17]", 1511562163], - [125, 9, 1650, "Metrics/MethodLength: Method has too many lines. [31/10]", 1511562163], - [176, 9, 2670, "Metrics/AbcSize: Assignment Branch Condition size for `parse_with_block_comments` is too high. [<15, 47, 15> 51.57/17]", 2963765048], - [176, 9, 2670, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_with_block_comments` is too high. [15/7]", 2963765048], - [176, 9, 2670, "Metrics/MethodLength: Method has too many lines. [47/10]", 2963765048], - [176, 9, 2670, "Metrics/PerceivedComplexity: Perceived complexity for `parse_with_block_comments` is too high. [16/8]", 2963765048], - [181, 11, 2390, "Metrics/BlockLength: Block has too many lines. [40/25]", 3720582340] - ], - "lib/ast/merge/comment/quoted_hash_line_parser.rb:2878420841": [ - [74, 9, 458, "Metrics/MethodLength: Method has too many lines. [11/10]", 1526360697], - [91, 9, 620, "Metrics/AbcSize: Assignment Branch Condition size for `inline_result` is too high. [<3, 16, 6> 17.35/17]", 2706755447], - [91, 9, 620, "Metrics/MethodLength: Method has too many lines. [14/10]", 2706755447] - ], - "lib/ast/merge/comment/region_merge_policy.rb:176745155": [ - [23, 23, 98, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1029631546], - [55, 9, 423, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `freeze_sensitive?` is too high. [8/7]", 4102661282], - [61, 41, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [61, 85, 2, "Lint/SafeNavigationConsistency: Use `.` instead of unnecessary `&.`.", 5858765], - [96, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3491399903] - ], - "lib/ast/merge/comment/style.rb:3045051983": [ - [27, 7, 9109, "Metrics/ClassLength: Class has too many lines. [143/100]", 131723516], - [142, 11, 911, "Metrics/MethodLength: Method has too many lines. [17/10]", 355862493], - [142, 23, 164, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 668558018], - [203, 23, 164, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 668558018] - ], - "lib/ast/merge/comment/tracked_hash_adapter.rb:3235547929": [ - [99, 11, 553, "Metrics/AbcSize: Assignment Branch Condition size for `line_text_from` is too high. [<4, 20, 4> 20.78/17]", 2680273536], - [99, 11, 553, "Metrics/MethodLength: Method has too many lines. [13/10]", 2680273536] - ], - "lib/ast/merge/composite_match_refiner.rb:1718969703": [ - [58, 7, 668, "Metrics/MethodLength: Method has too many lines. [14/10]", 2649148714] - ], - "lib/ast/merge/conflict_resolver_base.rb:765343263": [ - [69, 5, 14959, "Metrics/ClassLength: Class has too many lines. [170/100]", 633092728], - [156, 7, 919, "Metrics/MethodLength: Method has too many lines. [13/10]", 1701319380], - [156, 21, 200, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3369976202], - [367, 7, 972, "Metrics/MethodLength: Method has too many lines. [22/10]", 2870739148], - [434, 47, 13, "Style/NumericPredicate: Use `recursive.positive?` instead of `recursive > 0`.", 462999281], - [436, 99, 14, "Style/NumericPredicate: Use `recursive.zero?` instead of `recursive == 0`.", 2394069519] - ], - "lib/ast/merge/content_match_refiner.rb:3628272158": [ - [47, 5, 7719, "Metrics/ClassLength: Class has too many lines. [108/100]", 651494487], - [87, 7, 750, "Metrics/MethodLength: Method has too many lines. [17/10]", 3624290009], - [165, 37, 48, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 953994744], - [232, 7, 846, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<13, 29, 8> 32.77/17]", 3597737347], - [232, 7, 846, "Metrics/MethodLength: Method has too many lines. [20/10]", 3597737347] - ], - "lib/ast/merge/debug_logger.rb:1783610128": [ - [72, 5, 7614, "Metrics/ModuleLength: Module has too many lines. [118/100]", 736598454], - [85, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 941621], - [206, 7, 584, "Metrics/AbcSize: Assignment Branch Condition size for `time` is too high. [<3, 17, 2> 17.38/17]", 3468868523], - [206, 7, 584, "Metrics/MethodLength: Method has too many lines. [14/10]", 3468868523], - [269, 7, 450, "Metrics/PerceivedComplexity: Perceived complexity for `extract_lines` is too high. [9/8]", 680738666], - [287, 7, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631] - ], - "lib/ast/merge/detector/base.rb:343830240": [ - [175, 25, 73, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2991095115] - ], - "lib/ast/merge/detector/fenced_code_block.rb:3555142063": [ - [36, 7, 6302, "Metrics/ClassLength: Class has too many lines. [116/100]", 852968953], - [71, 9, 2492, "Metrics/AbcSize: Assignment Branch Condition size for `detect_all` is too high. [<31, 28, 12> 43.46/17]", 3575218793], - [71, 9, 2492, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_all` is too high. [11/7]", 3575218793], - [71, 9, 2492, "Metrics/MethodLength: Method has too many lines. [54/10]", 3575218793], - [71, 9, 2492, "Metrics/PerceivedComplexity: Perceived complexity for `detect_all` is too high. [13/8]", 3575218793], - [84, 11, 2060, "Metrics/BlockLength: Block has too many lines. [41/25]", 1744553779] - ], - "lib/ast/merge/detector/mergeable.rb:354817747": [ - [54, 7, 11933, "Metrics/ModuleLength: Module has too many lines. [140/100]", 1453034870], - [162, 9, 601, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_region_configs` is too high. [8/7]", 1278024890], - [162, 9, 601, "Metrics/MethodLength: Method has too many lines. [16/10]", 1278024890], - [189, 9, 1054, "Metrics/AbcSize: Assignment Branch Condition size for `extract_regions` is too high. [<11, 16, 3> 19.65/17]", 663241096], - [189, 9, 1054, "Metrics/MethodLength: Method has too many lines. [20/10]", 663241096], - [285, 9, 1005, "Metrics/AbcSize: Assignment Branch Condition size for `merge_and_substitute_regions` is too high. [<16, 19, 4> 25.16/17]", 4123525156], - [285, 9, 1005, "Metrics/MethodLength: Method has too many lines. [16/10]", 4123525156], - [318, 9, 1369, "Metrics/AbcSize: Assignment Branch Condition size for `merge_region` is too high. [<11, 20, 14> 26.78/17]", 746321843], - [318, 9, 1369, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_region` is too high. [15/7]", 746321843], - [318, 9, 1369, "Metrics/MethodLength: Method has too many lines. [16/10]", 746321843], - [318, 9, 1369, "Metrics/PerceivedComplexity: Perceived complexity for `merge_region` is too high. [15/8]", 746321843] - ], - "lib/ast/merge/detector/toml_frontmatter.rb:3255696517": [ - [50, 9, 892, "Metrics/MethodLength: Method has too many lines. [20/10]", 3132005303] - ], - "lib/ast/merge/detector/yaml_frontmatter.rb:2551474823": [ - [49, 9, 958, "Metrics/MethodLength: Method has too many lines. [20/10]", 3132005303] - ], - "lib/ast/merge/diff_mapper_base.rb:3204989377": [ - [22, 5, 7793, "Metrics/ClassLength: Class has too many lines. [141/100]", 2217731166], - [80, 7, 2598, "Metrics/AbcSize: Assignment Branch Condition size for `parse_diff` is too high. [<21, 31, 15> 40.34/17]", 939898835], - [80, 7, 2598, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_diff` is too high. [16/7]", 939898835], - [80, 7, 2598, "Metrics/MethodLength: Method has too many lines. [65/10]", 939898835], - [80, 7, 2598, "Metrics/PerceivedComplexity: Perceived complexity for `parse_diff` is too high. [12/8]", 939898835], - [90, 9, 2162, "Metrics/BlockLength: Block has too many lines. [50/25]", 3403609416], - [169, 7, 394, "Metrics/MethodLength: Method has too many lines. [11/10]", 2028641628] - ], - "lib/ast/merge/emitter_base.rb:655463559": [ - [26, 5, 14449, "Metrics/ClassLength: Class has too many lines. [226/100]", 2015391034], - [95, 7, 653, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_comment_region` is too high. [9/7]", 24580929], - [95, 7, 653, "Metrics/MethodLength: Method has too many lines. [12/10]", 24580929], - [95, 7, 653, "Metrics/PerceivedComplexity: Perceived complexity for `emit_comment_region` is too high. [9/8]", 24580929], - [120, 7, 1311, "Metrics/AbcSize: Assignment Branch Condition size for `emit_comment_attachment` is too high. [<5, 25, 16> 30.1/17]", 964928813], - [120, 7, 1311, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_comment_attachment` is too high. [17/7]", 964928813], - [120, 7, 1311, "Metrics/MethodLength: Method has too many lines. [17/10]", 964928813], - [120, 7, 1311, "Metrics/PerceivedComplexity: Perceived complexity for `emit_comment_attachment` is too high. [17/8]", 964928813], - [120, 34, 127, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 628879795], - [152, 7, 984, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_layout_gap` is too high. [8/7]", 1954418889], - [152, 7, 984, "Metrics/MethodLength: Method has too many lines. [13/10]", 1954418889], - [152, 7, 984, "Metrics/PerceivedComplexity: Perceived complexity for `emit_layout_gap` is too high. [9/8]", 1954418889], - [152, 26, 136, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3839882587], - [183, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861198], - [184, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087656651], - [186, 7, 1307, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_layout_attachment` is too high. [9/7]", 708408665], - [186, 7, 1307, "Metrics/MethodLength: Method has too many lines. [26/10]", 708408665], - [186, 7, 1307, "Metrics/PerceivedComplexity: Perceived complexity for `emit_layout_attachment` is too high. [9/8]", 708408665], - [186, 33, 218, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1552587384], - [187, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 1763090185], - [189, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1371312610], - [256, 31, 17, "Style/NumericPredicate: Use `@indent_level.positive?` instead of `@indent_level > 0`.", 1892475678], - [302, 56, 12, "Lint/UnusedMethodArgument: Unused method argument - `current_line`. You can also write as `inline_comment_region_target_column(*)` if you want the method to accept any arguments but don't care about them.", 2091263933], - [306, 42, 6, "Lint/UnusedMethodArgument: Unused method argument - `region`.", 2124512157], - [306, 51, 13, "Lint/UnusedMethodArgument: Unused method argument - `target_column`.", 3246375805], - [321, 7, 1141, "Metrics/AbcSize: Assignment Branch Condition size for `inline_comment_node_text` is too high. [<6, 29, 8> 30.68/17]", 2583471562], - [321, 7, 1141, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `inline_comment_node_text` is too high. [9/7]", 2583471562], - [321, 7, 1141, "Metrics/MethodLength: Method has too many lines. [22/10]", 2583471562], - [321, 7, 1141, "Metrics/PerceivedComplexity: Perceived complexity for `inline_comment_node_text` is too high. [9/8]", 2583471562], - [339, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861626], - [350, 7, 510, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_region_gap_lines` is too high. [8/7]", 1999747697], - [350, 7, 510, "Metrics/PerceivedComplexity: Perceived complexity for `emit_region_gap_lines` is too high. [9/8]", 1999747697] - ], - "lib/ast/merge/emitter_line_metadata_support.rb:3153033769": [ - [5, 5, 33, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::EmitterLineMetadataSupport`.", 2926748997], - [23, 7, 541, "Metrics/MethodLength: Method has too many lines. [12/10]", 2407359355] - ], - "lib/ast/merge/file_aligner_base.rb:4032045257": [ - [13, 5, 7473, "Metrics/ClassLength: Class has too many lines. [187/100]", 1391880441], - [27, 7, 2244, "Metrics/AbcSize: Assignment Branch Condition size for `align` is too high. [<19, 37, 12> 43.29/17]", 1243937217], - [27, 7, 2244, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `align` is too high. [12/7]", 1243937217], - [27, 7, 2244, "Metrics/MethodLength: Method has too many lines. [55/10]", 1243937217], - [27, 7, 2244, "Metrics/PerceivedComplexity: Perceived complexity for `align` is too high. [12/8]", 1243937217], - [148, 7, 655, "Metrics/MethodLength: Method has too many lines. [14/10]", 2468821688], - [180, 7, 455, "Metrics/MethodLength: Method has too many lines. [13/10]", 2361153066], - [199, 7, 1557, "Metrics/AbcSize: Assignment Branch Condition size for `apply_match_refiner!` is too high. [<10, 28, 12> 32.06/17]", 2386945712], - [199, 7, 1557, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_match_refiner!` is too high. [13/7]", 2386945712], - [199, 7, 1557, "Metrics/MethodLength: Method has too many lines. [31/10]", 2386945712], - [199, 7, 1557, "Metrics/PerceivedComplexity: Perceived complexity for `apply_match_refiner!` is too high. [13/8]", 2386945712] - ], - "lib/ast/merge/file_analyzable.rb:607555963": [ - [36, 5, 31229, "Metrics/ModuleLength: Module has too many lines. [316/100]", 1247752256], - [99, 19, 9, "Style/NumericPredicate: Use `index.negative?` instead of `index < 0`.", 4215255415], - [148, 7, 793, "Metrics/MethodLength: Method has too many lines. [22/10]", 1467470910], - [202, 7, 771, "Metrics/MethodLength: Method has too many lines. [16/10]", 1412317163], - [344, 7, 844, "Metrics/MethodLength: Method has too many lines. [12/10]", 2335919661], - [369, 7, 730, "Metrics/MethodLength: Method has too many lines. [11/10]", 1047958652], - [431, 7, 863, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_layout_owned_comment_attachment` is too high. [<0, 20, 4> 20.4/17]", 3284843691], - [431, 7, 863, "Metrics/MethodLength: Method has too many lines. [17/10]", 3284843691], - [481, 7, 683, "Metrics/MethodLength: Method has too many lines. [15/10]", 241044926], - [520, 14, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [614, 7, 6095, "Metrics/AbcSize: Assignment Branch Condition size for `generate_signature` is too high. [<4, 21, 13> 25.02/17]", 2828809875], - [614, 7, 6095, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `generate_signature` is too high. [11/7]", 2828809875], - [614, 7, 6095, "Metrics/MethodLength: Method has too many lines. [30/10]", 2828809875], - [614, 7, 6095, "Metrics/PerceivedComplexity: Perceived complexity for `generate_signature` is too high. [14/8]", 2828809875], - [676, 24, 390, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 3279112483] - ], - "lib/ast/merge/freeze_node_base.rb:2110274026": [ - [59, 5, 14572, "Metrics/ClassLength: Class has too many lines. [171/100]", 3038607603], - [108, 25, 545, "Style/MutableConstant: Freeze mutable objects assigned to constants.", 2366014160], - [186, 9, 1100, "Metrics/MethodLength: Method has too many lines. [15/10]", 2506841532], - [288, 7, 758, "Metrics/MethodLength: Method has too many lines. [11/10]", 136868205], - [288, 21, 276, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 1720059801], - [335, 7, 660, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `reason` is too high. [8/7]", 3127566048], - [418, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] - ], - "lib/ast/merge/healer.rb:3642412735": [ - [18, 7, 588, "Metrics/MethodLength: Method has too many lines. [15/10]", 3172269921], - [18, 17, 84, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1781025196], - [41, 7, 687, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `filter_items` is too high. [8/7]", 1200842691], - [41, 7, 687, "Metrics/MethodLength: Method has too many lines. [17/10]", 1200842691], - [41, 7, 687, "Metrics/PerceivedComplexity: Perceived complexity for `filter_items` is too high. [9/8]", 1200842691], - [41, 23, 130, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 33939503] - ], - "lib/ast/merge/jaccard_similarity.rb:678558736": [ - [87, 19, 1, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 177604], - [87, 22, 1, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 177607] - ], - "lib/ast/merge/key_path_partial_template_merger_base.rb:1818613864": [ - [22, 5, 6114, "Metrics/ClassLength: Class has too many lines. [155/100]", 1269962119], - [43, 21, 214, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 3637591635], - [68, 7, 489, "Metrics/MethodLength: Method has too many lines. [12/10]", 3170411580], - [118, 7, 640, "Metrics/AbcSize: Assignment Branch Condition size for `find_key_path` is too high. [<8, 14, 10> 18.97/17]", 2613403604], - [118, 7, 640, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_key_path` is too high. [8/7]", 2613403604], - [118, 7, 640, "Metrics/MethodLength: Method has too many lines. [16/10]", 2613403604], - [118, 7, 640, "Metrics/PerceivedComplexity: Perceived complexity for `find_key_path` is too high. [9/8]", 2613403604], - [140, 7, 536, "Metrics/MethodLength: Method has too many lines. [17/10]", 3598062652], - [168, 7, 804, "Metrics/MethodLength: Method has too many lines. [19/10]", 2773364183] - ], - "lib/ast/merge/layout.rb:3670500101": [ - [23, 36, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] - ], - "lib/ast/merge/layout/augmenter.rb:2556116722": [ - [8, 7, 5498, "Metrics/ClassLength: Class has too many lines. [129/100]", 3693754698], - [21, 23, 125, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 3395039982], - [53, 9, 1795, "Metrics/AbcSize: Assignment Branch Condition size for `build!` is too high. [<20, 32, 17> 41.39/17]", 3542913254], - [53, 9, 1795, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build!` is too high. [15/7]", 3542913254], - [53, 9, 1795, "Metrics/MethodLength: Method has too many lines. [43/10]", 3542913254], - [53, 9, 1795, "Metrics/PerceivedComplexity: Perceived complexity for `build!` is too high. [15/8]", 3542913254], - [58, 11, 1227, "Metrics/BlockLength: Block has too many lines. [29/25]", 55360131], - [105, 9, 504, "Metrics/MethodLength: Method has too many lines. [16/10]", 1953725517] - ], - "lib/ast/merge/layout/gap.rb:1678106201": [ - [11, 7, 7558, "Metrics/ClassLength: Class has too many lines. [151/100]", 2254377349], - [23, 9, 655, "Metrics/MethodLength: Method has too many lines. [11/10]", 3584854768], - [23, 23, 146, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 361396001], - [157, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859545], - [162, 9, 303, "Metrics/MethodLength: Method has too many lines. [12/10]", 2236444774], - [203, 9, 688, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_adjacency!` is too high. [10/7]", 1112786311], - [203, 9, 688, "Metrics/MethodLength: Method has too many lines. [13/10]", 1112786311] - ], - "lib/ast/merge/match_refiner_base.rb:1760054866": [ - [248, 7, 503, "Metrics/MethodLength: Method has too many lines. [11/10]", 2844230268], - [275, 7, 1056, "Metrics/AbcSize: Assignment Branch Condition size for `greedy_match` is too high. [<9, 24, 8> 26.85/17]", 2497617815], - [275, 7, 1056, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `greedy_match` is too high. [8/7]", 2497617815], - [275, 7, 1056, "Metrics/MethodLength: Method has too many lines. [24/10]", 2497617815] - ], - "lib/ast/merge/merge_result_base.rb:764500297": [ - [17, 5, 18646, "Metrics/ClassLength: Class has too many lines. [335/100]", 314460772], - [88, 21, 187, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1067369198], - [187, 7, 843, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_blank_line_runs!` is too high. [<12, 12, 10> 19.7/17]", 2347011594], - [187, 7, 843, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_blank_line_runs!` is too high. [9/7]", 2347011594], - [187, 7, 843, "Metrics/MethodLength: Method has too many lines. [22/10]", 2347011594], - [187, 7, 843, "Metrics/PerceivedComplexity: Perceived complexity for `normalize_blank_line_runs!` is too high. [10/8]", 2347011594], - [227, 7, 1004, "Metrics/MethodLength: Method has too many lines. [21/10]", 59539336], - [227, 35, 211, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 709487711], - [266, 7, 602, "Metrics/MethodLength: Method has too many lines. [13/10]", 320027623], - [341, 7, 927, "Metrics/AbcSize: Assignment Branch Condition size for `validate_review_state_compatibility!` is too high. [<8, 15, 4> 17.46/17]", 1596840080], - [341, 7, 927, "Metrics/MethodLength: Method has too many lines. [16/10]", 1596840080], - [403, 7, 936, "Metrics/AbcSize: Assignment Branch Condition size for `review_state_metadata` is too high. [<7, 18, 4> 19.72/17]", 4128292066], - [403, 7, 936, "Metrics/MethodLength: Method has too many lines. [14/10]", 4128292066], - [413, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 20421901], - [438, 7, 1194, "Metrics/MethodLength: Method has too many lines. [21/10]", 4289697646], - [448, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3342583337] - ], - "lib/ast/merge/merger_config.rb:3582657829": [ - [46, 5, 10581, "Metrics/ClassLength: Class has too many lines. [148/100]", 1598770872], - [96, 21, 234, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 720509970] - ], - "lib/ast/merge/navigable/injection_point_finder.rb:4117743218": [ - [45, 9, 1707, "Metrics/AbcSize: Assignment Branch Condition size for `find` is too high. [<9, 18, 17> 26.34/17]", 1445381162], - [45, 9, 1707, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find` is too high. [15/7]", 1445381162], - [45, 9, 1707, "Metrics/MethodLength: Method has too many lines. [28/10]", 1445381162], - [45, 9, 1707, "Metrics/PerceivedComplexity: Perceived complexity for `find` is too high. [16/8]", 1445381162], - [45, 17, 156, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 3876813166] - ], - "lib/ast/merge/navigable/statement.rb:3050515622": [ - [42, 7, 11078, "Metrics/ClassLength: Class has too many lines. [179/100]", 2550894515], - [96, 11, 550, "Metrics/AbcSize: Assignment Branch Condition size for `find_matching` is too high. [<7, 16, 12> 21.19/17]", 3492534565], - [96, 11, 550, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_matching` is too high. [12/7]", 3492534565], - [96, 11, 550, "Metrics/PerceivedComplexity: Perceived complexity for `find_matching` is too high. [12/8]", 3492534565], - [222, 13, 20, "Naming/PredicatePrefix: Rename `has_tree_navigation?` to `tree_navigation?`.", 733442156] - ], - "lib/ast/merge/node_typing.rb:4008165135": [ - [175, 9, 694, "Metrics/MethodLength: Method has too many lines. [12/10]", 777909930], - [213, 9, 891, "Metrics/AbcSize: Assignment Branch Condition size for `find_typing_callable` is too high. [<3, 23, 13> 26.59/17]", 3835052858], - [213, 9, 891, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_typing_callable` is too high. [14/7]", 3835052858], - [213, 9, 891, "Metrics/PerceivedComplexity: Perceived complexity for `find_typing_callable` is too high. [14/8]", 3835052858] - ], - "lib/ast/merge/node_wrapper_base.rb:3796877358": [ - [62, 5, 10228, "Metrics/ClassLength: Class has too many lines. [135/100]", 3832956007], - [92, 21, 81, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 4261369704] - ], - "lib/ast/merge/owner_selection.rb:2568070127": [ - [9, 7, 757, "Metrics/MethodLength: Method has too many lines. [13/10]", 2069564552] - ], - "lib/ast/merge/partial_template_merger_base.rb:2252899061": [ - [27, 5, 16780, "Metrics/ClassLength: Class has too many lines. [266/100]", 2205844189], - [48, 23, 81, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2112244807], - [106, 7, 757, "Metrics/MethodLength: Method has too many lines. [11/10]", 571708764], - [106, 21, 293, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 871709580], - [135, 7, 788, "Metrics/AbcSize: Assignment Branch Condition size for `merge` is too high. [<4, 19, 5> 20.05/17]", 467674580], - [135, 7, 788, "Metrics/MethodLength: Method has too many lines. [13/10]", 467674580], - [213, 7, 533, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_matcher` is too high. [<7, 20, 6> 22.02/17]", 1798972396], - [238, 7, 922, "Metrics/MethodLength: Method has too many lines. [25/10]", 1846154069], - [242, 25, 37, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 939456830], - [251, 25, 31, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 1024894473], - [268, 7, 1905, "Metrics/AbcSize: Assignment Branch Condition size for `perform_section_merge` is too high. [<13, 15, 2> 19.95/17]", 2711014340], - [268, 7, 1905, "Metrics/MethodLength: Method has too many lines. [34/10]", 2711014340], - [316, 50, 15, "Lint/UnusedMethodArgument: Unused method argument - `section_context`.", 2872123372], - [334, 7, 690, "Metrics/MethodLength: Method has too many lines. [14/10]", 1807124523], - [367, 7, 1122, "Metrics/AbcSize: Assignment Branch Condition size for `build_merged_content` is too high. [<1, 29, 14> 32.22/17]", 3938410418], - [367, 7, 1122, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_merged_content` is too high. [15/7]", 3938410418], - [367, 7, 1122, "Metrics/MethodLength: Method has too many lines. [18/10]", 3938410418], - [367, 7, 1122, "Metrics/PerceivedComplexity: Perceived complexity for `build_merged_content` is too high. [15/8]", 3938410418], - [397, 7, 596, "Metrics/MethodLength: Method has too many lines. [12/10]", 2602121883], - [397, 32, 144, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1463491208], - [414, 7, 1589, "Metrics/AbcSize: Assignment Branch Condition size for `source_splice_plan_for` is too high. [<6, 18, 9> 21/17]", 2889667289], - [414, 7, 1589, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `source_splice_plan_for` is too high. [9/7]", 2889667289], - [414, 7, 1589, "Metrics/MethodLength: Method has too many lines. [30/10]", 2889667289], - [414, 7, 1589, "Metrics/PerceivedComplexity: Perceived complexity for `source_splice_plan_for` is too high. [9/8]", 2889667289] - ], - "lib/ast/merge/recipe/config.rb:3990762705": [ - [54, 7, 14970, "Metrics/ClassLength: Class has too many lines. [296/100]", 2492031021], - [142, 9, 673, "Metrics/MethodLength: Method has too many lines. [12/10]", 3011978845], - [170, 9, 484, "Metrics/MethodLength: Method has too many lines. [15/10]", 183356432], - [246, 9, 710, "Metrics/AbcSize: Assignment Branch Condition size for `parse_injection` is too high. [<8, 13, 8> 17.23/17]", 641239814], - [246, 9, 710, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_injection` is too high. [9/7]", 641239814], - [246, 9, 710, "Metrics/MethodLength: Method has too many lines. [16/10]", 641239814], - [246, 9, 710, "Metrics/PerceivedComplexity: Perceived complexity for `parse_injection` is too high. [9/8]", 641239814], - [278, 9, 871, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_step` is too high. [8/7]", 3989307721], - [278, 9, 871, "Metrics/MethodLength: Method has too many lines. [20/10]", 3989307721], - [338, 9, 1758, "Metrics/AbcSize: Assignment Branch Condition size for `parse_step_merge_overrides` is too high. [<11, 43, 25> 50.94/17]", 806370438], - [338, 9, 1758, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_step_merge_overrides` is too high. [22/7]", 806370438], - [338, 9, 1758, "Metrics/MethodLength: Method has too many lines. [30/10]", 806370438], - [338, 9, 1758, "Metrics/PerceivedComplexity: Perceived complexity for `parse_step_merge_overrides` is too high. [22/8]", 806370438], - [373, 9, 566, "Metrics/MethodLength: Method has too many lines. [14/10]", 3671206955], - [391, 9, 547, "Metrics/MethodLength: Method has too many lines. [16/10]", 3273587697], - [459, 9, 799, "Metrics/AbcSize: Assignment Branch Condition size for `validate_injection!` is too high. [<2, 15, 12> 19.31/17]", 1665903587], - [459, 9, 799, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_injection!` is too high. [13/7]", 1665903587], - [459, 9, 799, "Metrics/MethodLength: Method has too many lines. [11/10]", 1665903587], - [459, 9, 799, "Metrics/PerceivedComplexity: Perceived complexity for `validate_injection!` is too high. [13/8]", 1665903587] - ], - "lib/ast/merge/recipe/preset.rb:2311326866": [ - [195, 9, 662, "Metrics/MethodLength: Method has too many lines. [12/10]", 1640897447] - ], - "lib/ast/merge/recipe/runner.rb:2243867806": [ - [27, 7, 28612, "Metrics/ClassLength: Class has too many lines. [547/100]", 79000832], - [73, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1411864995], - [77, 23, 136, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1636278032], - [92, 9, 849, "Metrics/MethodLength: Method has too many lines. [14/10]", 3083064345], - [128, 24, 129, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2642826282], - [210, 9, 788, "Metrics/MethodLength: Method has too many lines. [23/10]", 743008161], - [241, 9, 3397, "Metrics/AbcSize: Assignment Branch Condition size for `create_partial_template_merger` is too high. [<3, 52, 16> 54.49/17]", 2086180075], - [241, 9, 3397, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `create_partial_template_merger` is too high. [14/7]", 2086180075], - [241, 9, 3397, "Metrics/MethodLength: Method has too many lines. [63/10]", 2086180075], - [241, 9, 3397, "Metrics/PerceivedComplexity: Perceived complexity for `create_partial_template_merger` is too high. [13/8]", 2086180075], - [250, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2857356312], - [274, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177538], - [312, 9, 2210, "Metrics/AbcSize: Assignment Branch Condition size for `create_smart_merger` is too high. [<1, 39, 7> 39.64/17]", 1694660188], - [312, 9, 2210, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `create_smart_merger` is too high. [8/7]", 1694660188], - [312, 9, 2210, "Metrics/MethodLength: Method has too many lines. [45/10]", 1694660188], - [357, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 195423462], - [370, 9, 1087, "Metrics/MethodLength: Method has too many lines. [24/10]", 3850049530], - [370, 31, 124, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3466458723], - [401, 9, 1008, "Metrics/MethodLength: Method has too many lines. [19/10]", 2010895303], - [401, 25, 143, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2360959504], - [424, 9, 1263, "Metrics/AbcSize: Assignment Branch Condition size for `execute_partial_merge_step` is too high. [<3, 22, 1> 22.23/17]", 2850918453], - [424, 9, 1263, "Metrics/MethodLength: Method has too many lines. [25/10]", 2850918453], - [453, 9, 835, "Metrics/MethodLength: Method has too many lines. [14/10]", 1478843287], - [471, 9, 808, "Metrics/MethodLength: Method has too many lines. [15/10]", 1127254660], - [471, 37, 155, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 838578768], - [491, 9, 1126, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_smart_merge_result` is too high. [<8, 17, 12> 22.29/17]", 1786697339], - [491, 9, 1126, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_smart_merge_result` is too high. [9/7]", 1786697339], - [491, 9, 1126, "Metrics/MethodLength: Method has too many lines. [23/10]", 1786697339], - [491, 9, 1126, "Metrics/PerceivedComplexity: Perceived complexity for `normalize_smart_merge_result` is too high. [11/8]", 1786697339], - [518, 9, 2523, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_script_step_result` is too high. [<5, 40, 32> 51.47/17]", 2162420067], - [518, 9, 2523, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_script_step_result` is too high. [26/7]", 2162420067], - [518, 9, 2523, "Metrics/MethodLength: Method has too many lines. [48/10]", 2162420067], - [518, 9, 2523, "Metrics/PerceivedComplexity: Perceived complexity for `normalize_script_step_result` is too high. [29/8]", 2162420067], - [547, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 93872446], - [556, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 1527250939], - [586, 11, 155, "Style/HashTransformKeys: Prefer `transform_keys` over `each_with_object`.", 837503672], - [591, 9, 698, "Metrics/MethodLength: Method has too many lines. [11/10]", 1116310304], - [635, 9, 2582, "Metrics/AbcSize: Assignment Branch Condition size for `create_result_from_steps` is too high. [<8, 30, 31> 43.87/17]", 2040042265], - [635, 9, 2582, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `create_result_from_steps` is too high. [23/7]", 2040042265], - [635, 9, 2582, "Metrics/MethodLength: Method has too many lines. [60/10]", 2040042265], - [635, 9, 2582, "Metrics/PerceivedComplexity: Perceived complexity for `create_result_from_steps` is too high. [27/8]", 2040042265], - [635, 37, 133, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 789257106], - [649, 42, 40, "Style/SymbolProc: Pass `&:has_anchor` as an argument to `any?` instead of a block.", 4233626321] - ], - "lib/ast/merge/recipe/script_loader.rb:1397873218": [ - [145, 9, 1126, "Metrics/AbcSize: Assignment Branch Condition size for `load_script_file` is too high. [<6, 19, 4> 20.32/17]", 3417625171], - [145, 9, 1126, "Metrics/MethodLength: Method has too many lines. [17/10]", 3417625171] - ], - "lib/ast/merge/rspec/comment_behavior_matrix_adapters.rb:3429217018": [ - [9, 46, 341, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 532439002], - [31, 9, 901, "Metrics/MethodLength: Method has too many lines. [11/10]", 584608092], - [31, 59, 308, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 883491898], - [54, 9, 1269, "Metrics/MethodLength: Method has too many lines. [20/10]", 1021031182], - [65, 51, 6, "Lint/UnusedBlockArgument: Unused block argument - `inline`. If it's necessary, use `_` or `_inline` as an argument name to indicate that it won't be used.", 1605470060], - [69, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 4226982364], - [70, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1440420861] - ], - "lib/ast/merge/rspec/conformance_fixtures.rb:1295759615": [ - [6, 7, 26, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::RSpec::ConformanceFixtures`.", 90066768], - [9, 9, 1432, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_conformance_fixture_support` is too high. [<10, 30, 33> 45.71/17]", 518714108], - [9, 9, 1432, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_conformance_fixture_support` is too high. [33/7]", 518714108], - [9, 9, 1432, "Metrics/MethodLength: Method has too many lines. [25/10]", 518714108], - [9, 9, 1432, "Metrics/PerceivedComplexity: Perceived complexity for `normalize_conformance_fixture_support` is too high. [31/8]", 518714108] - ], - "lib/ast/merge/rspec/dependency_tags_config.rb:3604516304": [ - [30, 1, 2102, "Metrics/BlockLength: Block has too many lines. [26/25]", 113766065] - ], - "lib/ast/merge/rspec/merge_gem_registry.rb:3009576030": [ - [58, 7, 12129, "Metrics/ModuleLength: Module has too many lines. [158/100]", 335549747], - [90, 9, 780, "Metrics/MethodLength: Method has too many lines. [14/10]", 978965737], - [90, 21, 99, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3580433546], - [118, 9, 650, "Metrics/MethodLength: Method has too many lines. [12/10]", 3143160805], - [118, 31, 130, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2575863904], - [143, 9, 823, "Metrics/MethodLength: Method has too many lines. [17/10]", 4033116153], - [200, 9, 765, "Metrics/AbcSize: Assignment Branch Condition size for `register_known_gems` is too high. [<3, 17, 3> 17.52/17]", 1367620151], - [200, 9, 765, "Metrics/MethodLength: Method has too many lines. [17/10]", 1367620151] - ], - "lib/ast/merge/rspec/shared_examples.rb:2878318351": [ - [29, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 330577472] - ], - "lib/ast/merge/rspec/shared_examples/comment_behavior_matrix.rb:3695671858": [ - [36, 1, 27847, "Metrics/BlockLength: Block has too many lines. [540/25]", 3796645407], - [38, 55, 15, "Style/SymbolProc: Pass `&:value` as an argument to `lambda` instead of a block.", 1808354951], - [42, 64, 23, "Style/SymbolProc: Pass `&:statements` as an argument to `lambda` instead of a block.", 277221641], - [69, 3, 4455, "Metrics/BlockLength: Block has too many lines. [82/25]", 3672334777], - [72, 5, 1763, "Metrics/BlockLength: Block has too many lines. [34/25]", 164750821], - [165, 3, 22093, "Metrics/BlockLength: Block has too many lines. [429/25]", 229312375], - [292, 5, 1918, "Metrics/BlockLength: Block has too many lines. [29/25]", 1312741055], - [323, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1902517440], - [325, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 173482512], - [328, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 167607404], - [476, 5, 1605, "Metrics/BlockLength: Block has too many lines. [35/25]", 1943633697], - [677, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1902517440] - ], - "lib/ast/merge/rspec/shared_examples/conflict_resolver_base.rb:624045197": [ - [30, 1, 7893, "Metrics/BlockLength: Block has too many lines. [197/25]", 3450672926], - [37, 3, 1372, "Metrics/BlockLength: Block has too many lines. [33/25]", 3389152504], - [83, 3, 1206, "Metrics/BlockLength: Block has too many lines. [35/25]", 1580202348], - [128, 3, 1177, "Metrics/BlockLength: Block has too many lines. [33/25]", 2178974049], - [215, 3, 2443, "Metrics/BlockLength: Block has too many lines. [51/25]", 2538475273], - [219, 5, 1909, "Metrics/BlockLength: Block has too many lines. [35/25]", 880175101], - [279, 1, 2518, "Metrics/BlockLength: Block has too many lines. [74/25]", 958151448], - [286, 3, 2235, "Metrics/BlockLength: Block has too many lines. [70/25]", 2123260684], - [391, 1, 1317, "Metrics/BlockLength: Block has too many lines. [37/25]", 2321517041], - [439, 1, 1639, "Metrics/BlockLength: Block has too many lines. [37/25]", 276150366] - ], - "lib/ast/merge/rspec/shared_examples/debug_logger.rb:2747003588": [ - [23, 1, 4741, "Metrics/BlockLength: Block has too many lines. [121/25]", 3341338388], - [47, 3, 976, "Metrics/BlockLength: Block has too many lines. [27/25]", 2640321404], - [85, 3, 1452, "Metrics/BlockLength: Block has too many lines. [34/25]", 554663062] - ], - "lib/ast/merge/rspec/shared_examples/feature_profile.rb:4172143324": [ - [30, 1, 4249, "Metrics/BlockLength: Block has too many lines. [53/25]", 3787230403] - ], - "lib/ast/merge/rspec/shared_examples/file_analyzable.rb:2391547213": [ - [44, 1, 6468, "Metrics/BlockLength: Block has too many lines. [145/25]", 3744642916] - ], - "lib/ast/merge/rspec/shared_examples/freeze_node_base.rb:1711126715": [ - [23, 1, 5952, "Metrics/BlockLength: Block has too many lines. [157/25]", 3152271039], - [29, 3, 2836, "Metrics/BlockLength: Block has too many lines. [69/25]", 2082270913], - [115, 3, 1552, "Metrics/BlockLength: Block has too many lines. [46/25]", 4180117745] - ], - "lib/ast/merge/rspec/shared_examples/layout_attachment.rb:4130619694": [ - [30, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 1263574869], - [31, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 4282300883] - ], - "lib/ast/merge/rspec/shared_examples/layout_augmenter.rb:1928277603": [ - [18, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1311107624], - [19, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1311107624] - ], - "lib/ast/merge/rspec/shared_examples/merge_result_base.rb:2962043558": [ - [18, 1, 2330, "Metrics/BlockLength: Block has too many lines. [67/25]", 3496673178], - [53, 3, 1271, "Metrics/BlockLength: Block has too many lines. [42/25]", 2278976858] - ], - "lib/ast/merge/rspec/shared_examples/merger_config.rb:2413785902": [ - [18, 1, 8240, "Metrics/BlockLength: Block has too many lines. [193/25]", 3665443345], - [57, 3, 1628, "Metrics/BlockLength: Block has too many lines. [32/25]", 7828299], - [98, 3, 1266, "Metrics/BlockLength: Block has too many lines. [28/25]", 317929439], - [159, 3, 1740, "Metrics/BlockLength: Block has too many lines. [42/25]", 1736487820], - [217, 3, 1373, "Metrics/BlockLength: Block has too many lines. [30/25]", 442933563] - ], - "lib/ast/merge/rspec/shared_examples/recipe_preset_contract.rb:1495545061": [ - [7, 1, 2558, "Metrics/BlockLength: Block has too many lines. [51/25]", 4091815632] - ], - "lib/ast/merge/rspec/shared_examples/removal_mode_compliance.rb:3645548199": [ - [24, 1, 1860, "Metrics/BlockLength: Block has too many lines. [33/25]", 1115825136] - ], - "lib/ast/merge/rspec/shared_examples/reproducible_merge.rb:2276592459": [ - [51, 1, 2030, "Metrics/BlockLength: Block has too many lines. [52/25]", 563553381] - ], - "lib/ast/merge/rspec/shared_examples/reproducible_partial_merge.rb:524436129": [ - [3, 1, 2321, "Metrics/BlockLength: Block has too many lines. [44/25]", 3206099540] - ], - "lib/ast/merge/rspec/shared_examples/runtime_debug_contract.rb:4244040583": [ - [8, 1, 2808, "Metrics/BlockLength: Block has too many lines. [48/25]", 3274492878] - ], - "lib/ast/merge/rspec/shared_examples/unresolved_helper_contract.rb:2916431464": [ - [9, 1, 5998, "Metrics/BlockLength: Block has too many lines. [126/25]", 4174562424], - [94, 3, 1515, "Metrics/BlockLength: Block has too many lines. [32/25]", 1928238376] - ], - "lib/ast/merge/rspec/shared_examples/unresolved_review_state_transport_contract.rb:3368966854": [ - [14, 1, 3386, "Metrics/BlockLength: Block has too many lines. [68/25]", 2910343214], - [65, 3, 317, "Metrics/MethodLength: Method has too many lines. [12/10]", 2653897690] - ], - "lib/ast/merge/rspec/shared_examples/unresolved_runtime_contract.rb:1424234700": [ - [10, 1, 2652, "Metrics/BlockLength: Block has too many lines. [42/25]", 960283638], - [31, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2892620242], - [46, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193437756] - ], - "lib/ast/merge/rspec/shared_examples/unresolved_runtime_debug_contract.rb:2897026147": [ - [25, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2418171787], - [26, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 235635831] - ], - "lib/ast/merge/ruleset/config.rb:4242726919": [ - [7, 7, 3664, "Metrics/ClassLength: Class has too many lines. [101/100]", 1968929597], - [36, 9, 933, "Metrics/MethodLength: Method has too many lines. [15/10]", 3334511209], - [36, 23, 319, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [15/5]", 1652945408], - [65, 9, 515, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 18, 3> 18.25/17]", 2614325513], - [65, 9, 515, "Metrics/MethodLength: Method has too many lines. [14/10]", 2614325513] - ], - "lib/ast/merge/ruleset/feature_profile.rb:3980745364": [ - [12, 7, 6054, "Metrics/ClassLength: Class has too many lines. [155/100]", 2818730231], - [29, 9, 1351, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<17, 18, 7> 25.73/17]", 2248702332], - [29, 9, 1351, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `initialize` is too high. [8/7]", 2248702332], - [29, 9, 1351, "Metrics/MethodLength: Method has too many lines. [17/10]", 2248702332], - [29, 23, 422, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 1415781648], - [138, 9, 1509, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 36, 6> 36.5/17]", 3793816437], - [138, 9, 1509, "Metrics/MethodLength: Method has too many lines. [31/10]", 3793816437] - ], - "lib/ast/merge/ruleset/parser.rb:698282871": [ - [7, 7, 9396, "Metrics/ClassLength: Class has too many lines. [199/100]", 1305123525], - [43, 9, 473, "Metrics/AbcSize: Assignment Branch Condition size for `parse` is too high. [<0, 17, 2> 17.12/17]", 1400394586], - [43, 9, 473, "Metrics/MethodLength: Method has too many lines. [12/10]", 1400394586], - [71, 9, 1053, "Metrics/MethodLength: Method has too many lines. [24/10]", 1569959910], - [101, 9, 1123, "Metrics/AbcSize: Assignment Branch Condition size for `parse_single_value_directive!` is too high. [<7, 13, 10> 17.83/17]", 706129883], - [101, 9, 1123, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_single_value_directive!` is too high. [8/7]", 706129883], - [101, 9, 1123, "Metrics/MethodLength: Method has too many lines. [24/10]", 706129883], - [170, 9, 605, "Metrics/MethodLength: Method has too many lines. [11/10]", 336127382], - [186, 9, 687, "Metrics/MethodLength: Method has too many lines. [11/10]", 2962844982] - ], - "lib/ast/merge/ruleset/profile_vocabulary.rb:2359837647": [ - [7, 7, 3956, "Metrics/ModuleLength: Module has too many lines. [107/100]", 1680256705] - ], - "lib/ast/merge/ruleset/runtime_declaration.rb:1016848190": [ - [18, 9, 819, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<11, 13, 5> 17.75/17]", 4043304883], - [18, 9, 819, "Metrics/MethodLength: Method has too many lines. [11/10]", 4043304883], - [18, 23, 240, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 3868000276], - [49, 9, 551, "Metrics/MethodLength: Method has too many lines. [13/10]", 448215861] - ], - "lib/ast/merge/ruleset/runtime_translator.rb:3255492631": [ - [9, 11, 816, "Metrics/MethodLength: Method has too many lines. [19/10]", 225301385], - [31, 11, 986, "Metrics/AbcSize: Assignment Branch Condition size for `feature_profile` is too high. [<1, 17, 0> 17.03/17]", 1395467476], - [31, 11, 986, "Metrics/MethodLength: Method has too many lines. [19/10]", 1395467476] - ], - "lib/ast/merge/ruleset/support_style_resolver.rb:508975884": [ - [9, 11, 864, "Metrics/MethodLength: Method has too many lines. [22/10]", 3902551296] - ], - "lib/ast/merge/runtime/child_result.rb:4083710804": [ - [16, 9, 698, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<7, 16, 2> 17.58/17]", 2208366179], - [16, 23, 227, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 3688358290], - [38, 9, 584, "Metrics/MethodLength: Method has too many lines. [11/10]", 3113479157], - [55, 11, 106, "Style/HashTransformKeys: Prefer `transform_keys` over `each_with_object`.", 4262612225] - ], - "lib/ast/merge/runtime/delegate.rb:3607371286": [ - [17, 23, 285, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 2793452069] - ], - "lib/ast/merge/runtime/diagnostic.rb:805162185": [ - [10, 23, 72, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1875462867] - ], - "lib/ast/merge/runtime/operation.rb:1030261783": [ - [20, 9, 767, "Metrics/MethodLength: Method has too many lines. [11/10]", 2728174753], - [20, 23, 278, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 694444911], - [100, 9, 617, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<2, 24, 6> 24.82/17]", 1175382849], - [100, 9, 617, "Metrics/MethodLength: Method has too many lines. [11/10]", 1175382849] - ], - "lib/ast/merge/runtime/resolution_case.rb:250040454": [ - [8, 9, 707, "Metrics/AbcSize: Assignment Branch Condition size for `from_h` is too high. [<1, 19, 6> 19.95/17]", 2592154170], - [29, 23, 189, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 818714714], - [81, 11, 111, "Style/HashTransformKeys: Prefer `transform_keys` over `each_with_object`.", 2712537644] - ], - "lib/ast/merge/runtime/root_session_support.rb:1917388966": [ - [10, 9, 2153, "Metrics/AbcSize: Assignment Branch Condition size for `start_runtime_root_session!` is too high. [<5, 20, 3> 20.83/17]", 1888056651], - [10, 9, 2153, "Metrics/MethodLength: Method has too many lines. [41/10]", 1888056651], - [10, 40, 421, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 2297301282], - [60, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2312419928], - [68, 9, 771, "Metrics/MethodLength: Method has too many lines. [13/10]", 1787620786], - [68, 43, 191, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3635875424] - ], - "lib/ast/merge/runtime/session.rb:628419040": [ - [66, 9, 1203, "Metrics/AbcSize: Assignment Branch Condition size for `summary` is too high. [<5, 43, 13> 45.2/17]", 550888870], - [66, 9, 1203, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `summary` is too high. [14/7]", 550888870], - [66, 9, 1203, "Metrics/MethodLength: Method has too many lines. [20/10]", 550888870], - [66, 9, 1203, "Metrics/PerceivedComplexity: Perceived complexity for `summary` is too high. [14/8]", 550888870] - ], - "lib/ast/merge/runtime/surface.rb:3684795905": [ - [17, 23, 230, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 469229117], - [44, 9, 418, "Metrics/MethodLength: Method has too many lines. [11/10]", 998969973] - ], - "lib/ast/merge/section_typing.rb:4261989256": [ - [112, 9, 710, "Metrics/MethodLength: Method has too many lines. [15/10]", 3600335459], - [176, 9, 67, "Lint/MissingSuper: Call `super` to initialize state of the parent class.", 4077537758], - [216, 9, 85, "Lint/MissingSuper: Call `super` to initialize state of the parent class.", 3648782014], - [245, 9, 1446, "Metrics/AbcSize: Assignment Branch Condition size for `merge_sections` is too high. [<13, 20, 12> 26.7/17]", 525095633], - [245, 9, 1446, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_sections` is too high. [12/7]", 525095633], - [245, 9, 1446, "Metrics/MethodLength: Method has too many lines. [28/10]", 525095633], - [245, 9, 1446, "Metrics/PerceivedComplexity: Perceived complexity for `merge_sections` is too high. [13/8]", 525095633] - ], - "lib/ast/merge/smart_merger_base.rb:4189972287": [ - [109, 5, 15324, "Metrics/ClassLength: Class has too many lines. [172/100]", 3547407870], - [214, 7, 1974, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<20, 14, 5> 24.92/17]", 2211610736], - [214, 7, 1974, "Metrics/MethodLength: Method has too many lines. [23/10]", 2211610736], - [214, 21, 443, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [15/5]", 1530523783], - [424, 7, 1312, "Metrics/AbcSize: Assignment Branch Condition size for `parse_and_analyze` is too high. [<7, 25, 11> 28.2/17]", 1640248187], - [424, 7, 1312, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_and_analyze` is too high. [10/7]", 1640248187], - [424, 7, 1312, "Metrics/MethodLength: Method has too many lines. [15/10]", 1640248187], - [424, 7, 1312, "Metrics/PerceivedComplexity: Perceived complexity for `parse_and_analyze` is too high. [10/8]", 1640248187], - [517, 12, 52, "Style/NumericPredicate: Use `result_class.instance_method(:initialize).arity.zero?` instead of `result_class.instance_method(:initialize).arity == 0`.", 1312375552] - ], - "lib/ast/merge/structural_edit/boundary.rb:2838060197": [ - [20, 23, 93, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3901214537], - [41, 38, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [51, 38, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [60, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087440865] - ], - "lib/ast/merge/structural_edit/boundary_support.rb:2036464761": [ - [31, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861061], - [32, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 97596930] - ], - "lib/ast/merge/structural_edit/plan_set.rb:538463647": [ - [116, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 2855200692] - ], - "lib/ast/merge/structural_edit/rehome_plan.rb:2152178780": [ - [23, 23, 123, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3433617242], - [100, 9, 519, "Metrics/MethodLength: Method has too many lines. [11/10]", 318006380], - [136, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 2367140872] - ], - "lib/ast/merge/structural_edit/remove_plan.rb:1189569486": [ - [11, 7, 9717, "Metrics/ClassLength: Class has too many lines. [160/100]", 3652701475], - [25, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861091], - [27, 9, 1409, "Metrics/MethodLength: Method has too many lines. [22/10]", 3344870777], - [27, 23, 255, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 3970946607], - [28, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 1637059282], - [36, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859104], - [196, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 1617827253], - [224, 9, 1032, "Metrics/MethodLength: Method has too many lines. [20/10]", 968444047] - ], - "lib/ast/merge/structural_edit/remove_plan_support.rb:877461974": [ - [9, 9, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631], - [19, 9, 1429, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_remove_plan` is too high. [8/7]", 4091314919], - [19, 9, 1429, "Metrics/MethodLength: Method has too many lines. [32/10]", 4091314919] - ], - "lib/ast/merge/structural_edit/splice_plan.rb:2675806114": [ - [39, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1683893295], - [42, 23, 203, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3653221702], - [113, 9, 517, "Metrics/MethodLength: Method has too many lines. [11/10]", 634912361] - ], - "lib/ast/merge/structured_emitter_provenance_support.rb:445323365": [ - [5, 5, 41, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::StructuredEmitterProvenanceSupport`.", 3548518830] - ], - "lib/ast/merge/structured_review_apply_support.rb:3649736380": [ - [5, 5, 35, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::StructuredReviewApplySupport`.", 1282380463], - [22, 7, 782, "Metrics/AbcSize: Assignment Branch Condition size for `current_output_span_for` is too high. [<6, 19, 11> 22.76/17]", 4137750179], - [22, 7, 782, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `current_output_span_for` is too high. [8/7]", 4137750179], - [22, 7, 782, "Metrics/MethodLength: Method has too many lines. [14/10]", 4137750179], - [42, 7, 595, "Metrics/MethodLength: Method has too many lines. [12/10]", 2080934521], - [60, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3151172498] - ], - "lib/ast/merge/text/conflict_resolver.rb:989169286": [ - [19, 7, 9182, "Metrics/ClassLength: Class has too many lines. [159/100]", 1070563745], - [28, 23, 211, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2639535499], - [53, 9, 2507, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_batch` is too high. [<15, 34, 5> 37.5/17]", 825130797], - [53, 9, 2507, "Metrics/MethodLength: Method has too many lines. [44/10]", 825130797], - [196, 9, 2458, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_matched_pair` is too high. [<2, 30, 11> 32.02/17]", 4037214978], - [196, 9, 2458, "Metrics/MethodLength: Method has too many lines. [46/10]", 4037214978] - ], - "lib/ast/merge/text/file_analysis.rb:1530312707": [ - [106, 9, 1484, "Metrics/AbcSize: Assignment Branch Condition size for `parse_statements` is too high. [<11, 15, 6> 19.54/17]", 1858083071], - [106, 9, 1484, "Metrics/MethodLength: Method has too many lines. [34/10]", 1858083071], - [160, 9, 449, "Metrics/MethodLength: Method has too many lines. [11/10]", 1902035813] - ], - "lib/ast/merge/text/line_node.rb:3385927013": [ - [145, 9, 699, "Metrics/MethodLength: Method has too many lines. [17/10]", 2201872249] - ], - "lib/ast/merge/text/section_splitter.rb:129704488": [ - [141, 9, 1442, "Metrics/AbcSize: Assignment Branch Condition size for `merge_section_lists` is too high. [<13, 20, 6> 24.6/17]", 3551729170], - [141, 9, 1442, "Metrics/MethodLength: Method has too many lines. [23/10]", 3551729170], - [322, 9, 1767, "Metrics/AbcSize: Assignment Branch Condition size for `split` is too high. [<11, 29, 10> 32.59/17]", 2207922758], - [322, 9, 1767, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split` is too high. [10/7]", 2207922758], - [322, 9, 1767, "Metrics/MethodLength: Method has too many lines. [46/10]", 2207922758], - [322, 9, 1767, "Metrics/PerceivedComplexity: Perceived complexity for `split` is too high. [13/8]", 2207922758], - [328, 11, 1019, "Metrics/BlockLength: Block has too many lines. [26/25]", 1561634792] - ], - "lib/ast/merge/text/smart_merger.rb:2405807903": [ - [67, 9, 831, "Metrics/MethodLength: Method has too many lines. [12/10]", 584426022], - [67, 23, 350, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 3074172637] - ], - "lib/ast/merge/trailing_groups/alignment_sort.rb:2593404330": [ - [40, 9, 513, "Metrics/MethodLength: Method has too many lines. [12/10]", 89360683] - ], - "lib/ast/merge/trailing_groups/core.rb:4231959665": [ - [61, 9, 812, "Metrics/MethodLength: Method has too many lines. [17/10]", 1777526069], - [101, 9, 998, "Metrics/AbcSize: Assignment Branch Condition size for `flush_ready_trailing_groups` is too high. [<8, 18, 15> 24.76/17]", 2397698441], - [101, 9, 998, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `flush_ready_trailing_groups` is too high. [13/7]", 2397698441], - [101, 9, 998, "Metrics/MethodLength: Method has too many lines. [17/10]", 2397698441], - [101, 9, 998, "Metrics/PerceivedComplexity: Perceived complexity for `flush_ready_trailing_groups` is too high. [13/8]", 2397698441] - ], - "lib/ast/merge/trailing_groups/dest_iterate.rb:3897205087": [ - [69, 9, 751, "Metrics/MethodLength: Method has too many lines. [12/10]", 3915657972], - [69, 47, 199, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2545849044] - ], - "lib/ast/merge/unresolved_support.rb:2881272494": [ - [7, 5, 24, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::UnresolvedSupport`.", 990281691], - [7, 5, 4392, "Metrics/ModuleLength: Module has too many lines. [116/100]", 3475162940], - [32, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [67, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [85, 7, 1038, "Metrics/MethodLength: Method has too many lines. [14/10]", 3139619197], - [85, 40, 338, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 71164914] - ], - "spec/ast/merge/ast_node_spec.rb:1362065144": [ - [3, 1, 8199, "Metrics/BlockLength: Block has too many lines. [254/25]", 1649868231], - [18, 3, 1030, "Metrics/BlockLength: Block has too many lines. [33/25]", 1409835577] - ], - "spec/ast/merge/block_directive_spec.rb:2305756581": [ - [3, 1, 5181, "Metrics/BlockLength: Block has too many lines. [138/25]", 1887900896], - [128, 3, 1391, "Metrics/BlockLength: Block has too many lines. [39/25]", 3626371694] - ], - "spec/ast/merge/comment/attachment_spec.rb:2571833836": [ - [3, 1, 5536, "Metrics/BlockLength: Block has too many lines. [150/25]", 1841571757], - [93, 3, 1639, "Metrics/BlockLength: Block has too many lines. [37/25]", 212730671] - ], - "spec/ast/merge/comment/augmenter_spec.rb:4266625483": [ - [3, 1, 9141, "Metrics/BlockLength: Block has too many lines. [212/25]", 530365996], - [16, 3, 6849, "Metrics/BlockLength: Block has too many lines. [154/25]", 503152628], - [200, 3, 1244, "Metrics/BlockLength: Block has too many lines. [33/25]", 3565041107] - ], - "spec/ast/merge/comment/block_spec.rb:4138473890": [ - [3, 1, 9021, "Metrics/BlockLength: Block has too many lines. [250/25]", 1617505173], - [8, 3, 1115, "Metrics/BlockLength: Block has too many lines. [27/25]", 2958989619], - [93, 3, 1127, "Metrics/BlockLength: Block has too many lines. [33/25]", 196340527], - [123, 45, 16, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 155572628], - [159, 3, 1432, "Metrics/BlockLength: Block has too many lines. [35/25]", 281400319] - ], - "spec/ast/merge/comment/c_style_tracker_base_spec.rb:3154319400": [ - [3, 1, 5816, "Metrics/BlockLength: Block has too many lines. [133/25]", 680831933], - [100, 3, 1450, "Metrics/BlockLength: Block has too many lines. [35/25]", 4153882185] - ], - "spec/ast/merge/comment/capability_spec.rb:2763521225": [ - [3, 1, 3522, "Metrics/BlockLength: Block has too many lines. [89/25]", 1487980773], - [4, 3, 1954, "Metrics/BlockLength: Block has too many lines. [41/25]", 160187362] - ], - "spec/ast/merge/comment/empty_spec.rb:1801324640": [ - [3, 1, 2584, "Metrics/BlockLength: Block has too many lines. [70/25]", 270179899], - [4, 3, 1047, "Metrics/BlockLength: Block has too many lines. [27/25]", 3056449816] - ], - "spec/ast/merge/comment/hash_tracker_base_spec.rb:3624528747": [ - [3, 1, 9653, "Metrics/BlockLength: Block has too many lines. [271/25]", 3748659406], - [8, 3, 1210, "Metrics/BlockLength: Block has too many lines. [37/25]", 2566766302], - [21, 7, 872, "Metrics/AbcSize: Assignment Branch Condition size for `extract_comments` is too high. [<7, 24, 5> 25.5/17]", 1213080161], - [21, 7, 872, "Metrics/MethodLength: Method has too many lines. [25/10]", 1213080161], - [275, 3, 1171, "Metrics/BlockLength: Block has too many lines. [29/25]", 1425466742] - ], - "spec/ast/merge/comment/line_spec.rb:1487829548": [ - [3, 1, 5291, "Metrics/BlockLength: Block has too many lines. [128/25]", 587604747], - [6, 3, 1573, "Metrics/BlockLength: Block has too many lines. [37/25]", 4105920006] - ], - "spec/ast/merge/comment/parser_spec.rb:2443973508": [ - [3, 1, 9855, "Metrics/BlockLength: Block has too many lines. [237/25]", 404174977], - [4, 3, 1013, "Metrics/BlockLength: Block has too many lines. [26/25]", 182655397], - [38, 3, 1282, "Metrics/BlockLength: Block has too many lines. [28/25]", 2303702609] - ], - "spec/ast/merge/comment/quoted_hash_line_parser_spec.rb:3795390831": [ - [3, 1, 1810, "Metrics/BlockLength: Block has too many lines. [44/25]", 2575838586], - [6, 3, 1700, "Metrics/BlockLength: Block has too many lines. [41/25]", 1553834548] - ], - "spec/ast/merge/comment/region_merge_policy_spec.rb:4175996936": [ - [3, 1, 3618, "Metrics/BlockLength: Block has too many lines. [75/25]", 4006378358], - [11, 3, 2752, "Metrics/BlockLength: Block has too many lines. [52/25]", 494211987] - ], - "spec/ast/merge/comment/region_spec.rb:2674736508": [ - [3, 1, 4033, "Metrics/BlockLength: Block has too many lines. [91/25]", 1828104331] - ], - "spec/ast/merge/comment/style_spec.rb:1875195890": [ - [3, 1, 4040, "Metrics/BlockLength: Block has too many lines. [101/25]", 2759361650] - ], - "spec/ast/merge/comment/support_style_spec.rb:1350169032": [ - [3, 1, 1577, "Metrics/BlockLength: Block has too many lines. [39/25]", 3414039011] - ], - "spec/ast/merge/comment/tracked_hash_adapter_spec.rb:1256807736": [ - [3, 1, 4482, "Metrics/BlockLength: Block has too many lines. [97/25]", 264417763], - [4, 3, 3101, "Metrics/BlockLength: Block has too many lines. [63/25]", 1050939978], - [81, 3, 1313, "Metrics/BlockLength: Block has too many lines. [30/25]", 515655104] - ], - "spec/ast/merge/comment_spec.rb:81945459": [ - [3, 1, 15888, "Metrics/BlockLength: Block has too many lines. [384/25]", 2229554982], - [4, 3, 3957, "Metrics/BlockLength: Block has too many lines. [84/25]", 660667217], - [5, 5, 1187, "Metrics/BlockLength: Block has too many lines. [26/25]", 241562105], - [105, 3, 1371, "Metrics/BlockLength: Block has too many lines. [30/25]", 1901983597], - [159, 3, 1296, "Metrics/BlockLength: Block has too many lines. [30/25]", 1749880380], - [239, 3, 1151, "Metrics/BlockLength: Block has too many lines. [28/25]", 183967322], - [272, 3, 2004, "Metrics/BlockLength: Block has too many lines. [45/25]", 2594323837], - [349, 3, 3220, "Metrics/BlockLength: Block has too many lines. [83/25]", 790417809], - [350, 5, 2347, "Metrics/BlockLength: Block has too many lines. [60/25]", 4016801881] - ], - "spec/ast/merge/composite_match_refiner_spec.rb:2888297870": [ - [3, 1, 6152, "Metrics/BlockLength: Block has too many lines. [143/25]", 3308692548], - [55, 3, 4118, "Metrics/BlockLength: Block has too many lines. [87/25]", 1405655464] - ], - "spec/ast/merge/conflict_resolver_base_spec.rb:3331938447": [ - [5, 1, 20643, "Metrics/BlockLength: Block has too many lines. [516/25]", 3129196558], - [14, 59, 14, "Lint/UnusedMethodArgument: Unused method argument - `template_index`.", 1809801172], - [14, 76, 10, "Lint/UnusedMethodArgument: Unused method argument - `dest_index`.", 2703999490], - [47, 61, 14, "Lint/UnusedMethodArgument: Unused method argument - `template_index`. You can also write as `resolve_node_pair(*)` if you want the method to accept any arguments but don't care about them.", 1809801172], - [47, 78, 10, "Lint/UnusedMethodArgument: Unused method argument - `dest_index`. You can also write as `resolve_node_pair(*)` if you want the method to accept any arguments but don't care about them.", 2703999490], - [105, 3, 17203, "Metrics/BlockLength: Block has too many lines. [425/25]", 1114912980], - [154, 5, 1797, "Metrics/BlockLength: Block has too many lines. [37/25]", 515146940], - [203, 5, 1373, "Metrics/BlockLength: Block has too many lines. [32/25]", 603210832], - [292, 5, 2874, "Metrics/BlockLength: Block has too many lines. [77/25]", 3918129775], - [341, 7, 1292, "Metrics/BlockLength: Block has too many lines. [34/25]", 1769555944], - [402, 5, 1857, "Metrics/BlockLength: Block has too many lines. [44/25]", 1516406612], - [456, 5, 1209, "Metrics/BlockLength: Block has too many lines. [31/25]", 430489898], - [514, 5, 2021, "Metrics/BlockLength: Block has too many lines. [37/25]", 144128170], - [515, 7, 1953, "Metrics/BlockLength: Block has too many lines. [35/25]", 1574966248], - [567, 5, 1500, "Metrics/BlockLength: Block has too many lines. [40/25]", 2509466150] - ], - "spec/ast/merge/content_match_refiner_spec.rb:4058001158": [ - [3, 1, 14348, "Metrics/BlockLength: Block has too many lines. [318/25]", 1171164704], - [25, 3, 1238, "Metrics/BlockLength: Block has too many lines. [29/25]", 2139810386], - [63, 3, 4077, "Metrics/BlockLength: Block has too many lines. [95/25]", 3471153375], - [325, 3, 2213, "Metrics/BlockLength: Block has too many lines. [37/25]", 3370370915] - ], - "spec/ast/merge/debug_logger_spec.rb:429510168": [ - [3, 1, 17306, "Metrics/BlockLength: Block has too many lines. [358/25]", 2287792973], - [251, 3, 1598, "Metrics/BlockLength: Block has too many lines. [27/25]", 3227542816], - [358, 3, 5118, "Metrics/BlockLength: Block has too many lines. [77/25]", 1759761803] - ], - "spec/ast/merge/detector/base_spec.rb:4157102211": [ - [3, 1, 3172, "Metrics/BlockLength: Block has too many lines. [100/25]", 3745104028], - [11, 7, 498, "Metrics/MethodLength: Method has too many lines. [13/10]", 3178368155], - [49, 3, 900, "Metrics/BlockLength: Block has too many lines. [28/25]", 2333048204] - ], - "spec/ast/merge/detector/fenced_code_block_spec.rb:495797689": [ - [3, 1, 11589, "Metrics/BlockLength: Block has too many lines. [363/25]", 3764545134], - [38, 3, 4467, "Metrics/BlockLength: Block has too many lines. [150/25]", 1597401000], - [41, 5, 1077, "Metrics/BlockLength: Block has too many lines. [31/25]", 2269642514], - [115, 5, 848, "Metrics/BlockLength: Block has too many lines. [27/25]", 1704866975], - [220, 3, 4815, "Metrics/BlockLength: Block has too many lines. [146/25]", 3797214474] - ], - "spec/ast/merge/detector/mergeable_spec.rb:1307688846": [ - [3, 1, 23175, "Metrics/BlockLength: Block has too many lines. [654/25]", 2932391114], - [77, 3, 2079, "Metrics/BlockLength: Block has too many lines. [53/25]", 1093085347], - [177, 3, 2217, "Metrics/BlockLength: Block has too many lines. [69/25]", 926985871], - [188, 5, 948, "Metrics/BlockLength: Block has too many lines. [26/25]", 4186135901], - [225, 5, 898, "Metrics/BlockLength: Block has too many lines. [31/25]", 513446836], - [266, 3, 1168, "Metrics/BlockLength: Block has too many lines. [29/25]", 774699411], - [304, 3, 1188, "Metrics/BlockLength: Block has too many lines. [27/25]", 4282853126], - [339, 3, 918, "Metrics/BlockLength: Block has too many lines. [28/25]", 1759590109], - [372, 3, 870, "Metrics/BlockLength: Block has too many lines. [28/25]", 131542026], - [410, 3, 3768, "Metrics/BlockLength: Block has too many lines. [111/25]", 181819560], - [483, 5, 1536, "Metrics/BlockLength: Block has too many lines. [47/25]", 385085357], - [540, 3, 1891, "Metrics/BlockLength: Block has too many lines. [52/25]", 602757329], - [664, 3, 1927, "Metrics/BlockLength: Block has too many lines. [56/25]", 48062261], - [691, 5, 1146, "Metrics/BlockLength: Block has too many lines. [31/25]", 1961728737], - [721, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3104497040], - [729, 3, 1625, "Metrics/BlockLength: Block has too many lines. [46/25]", 1570579215] - ], - "spec/ast/merge/detector/region_spec.rb:594725562": [ - [3, 1, 8128, "Metrics/BlockLength: Block has too many lines. [290/25]", 1984713692], - [4, 3, 806, "Metrics/BlockLength: Block has too many lines. [28/25]", 1515087192], - [58, 3, 1236, "Metrics/BlockLength: Block has too many lines. [45/25]", 2464968707], - [128, 3, 1063, "Metrics/BlockLength: Block has too many lines. [33/25]", 239148700], - [250, 3, 2010, "Metrics/BlockLength: Block has too many lines. [76/25]", 2595033382] - ], - "spec/ast/merge/detector/toml_frontmatter_spec.rb:1135160129": [ - [3, 1, 6717, "Metrics/BlockLength: Block has too many lines. [218/25]", 2273975625], - [12, 3, 5534, "Metrics/BlockLength: Block has too many lines. [187/25]", 538920673], - [13, 5, 1456, "Metrics/BlockLength: Block has too many lines. [38/25]", 3113759139] - ], - "spec/ast/merge/detector/yaml_frontmatter_spec.rb:2467934365": [ - [3, 1, 6702, "Metrics/BlockLength: Block has too many lines. [213/25]", 3083039982], - [12, 3, 5056, "Metrics/BlockLength: Block has too many lines. [170/25]", 1889948780], - [13, 5, 1438, "Metrics/BlockLength: Block has too many lines. [38/25]", 1736912391], - [219, 3, 1396, "Metrics/BlockLength: Block has too many lines. [33/25]", 2446467851] - ], - "spec/ast/merge/diff_mapper_base_spec.rb:1771546518": [ - [5, 1, 8521, "Metrics/BlockLength: Block has too many lines. [248/25]", 1057580573], - [22, 9, 44, "Style/InverseMethods: Use `reject` instead of inverting `select`.", 3063843489], - [46, 3, 3878, "Metrics/BlockLength: Block has too many lines. [116/25]", 2874032080], - [47, 5, 1938, "Metrics/BlockLength: Block has too many lines. [48/25]", 1904497583], - [191, 3, 1488, "Metrics/BlockLength: Block has too many lines. [43/25]", 1632956840] - ], - "spec/ast/merge/emitter_base_spec.rb:4197360291": [ - [3, 1, 11215, "Metrics/BlockLength: Block has too many lines. [282/25]", 4254840781], - [30, 3, 4393, "Metrics/BlockLength: Block has too many lines. [102/25]", 3992142376], - [134, 58, 12, "Lint/UnusedMethodArgument: Unused method argument - `current_line`. You can also write as `inline_comment_region_target_column(*)` if you want the method to accept any arguments but don't care about them.", 2091263933], - [138, 44, 6, "Lint/UnusedMethodArgument: Unused method argument - `region`.", 2124512157], - [159, 3, 1815, "Metrics/BlockLength: Block has too many lines. [39/25]", 719023387], - [206, 3, 2233, "Metrics/BlockLength: Block has too many lines. [62/25]", 3754339775], - [312, 3, 1059, "Metrics/BlockLength: Block has too many lines. [26/25]", 375007123] - ], - "spec/ast/merge/fictive_language_harness_spec.rb:1179155480": [ - [6, 1, 6693, "Metrics/BlockLength: Block has too many lines. [143/25]", 245088433], - [7, 3, 1968, "Metrics/BlockLength: Block has too many lines. [36/25]", 4161580169], - [58, 3, 1230, "Metrics/BlockLength: Block has too many lines. [34/25]", 990452676], - [103, 3, 2668, "Metrics/BlockLength: Block has too many lines. [51/25]", 1755027956] - ], - "spec/ast/merge/file_aligner_base_spec.rb:610089304": [ - [5, 1, 7287, "Metrics/BlockLength: Block has too many lines. [164/25]", 597898988], - [6, 3, 1237, "Metrics/BlockLength: Block has too many lines. [37/25]", 1284505259], - [86, 3, 5087, "Metrics/BlockLength: Block has too many lines. [84/25]", 119873771], - [94, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3749416415] - ], - "spec/ast/merge/file_analyzable_spec.rb:3816965829": [ - [3, 1, 12458, "Metrics/BlockLength: Block has too many lines. [272/25]", 216138965], - [25, 3, 9603, "Metrics/BlockLength: Block has too many lines. [202/25]", 2508188172], - [297, 3, 1214, "Metrics/BlockLength: Block has too many lines. [30/25]", 777182624] - ], - "spec/ast/merge/freezable_spec.rb:559280324": [ - [5, 1, 5033, "Metrics/BlockLength: Block has too many lines. [123/25]", 3070666859], - [6, 3, 1199, "Metrics/BlockLength: Block has too many lines. [34/25]", 4058875636], - [66, 3, 1530, "Metrics/BlockLength: Block has too many lines. [31/25]", 1670675428] - ], - "spec/ast/merge/freeze_node_base_spec.rb:2962962931": [ - [3, 1, 21887, "Metrics/BlockLength: Block has too many lines. [560/25]", 567315021], - [48, 3, 1369, "Metrics/BlockLength: Block has too many lines. [38/25]", 3363160391], - [131, 3, 2739, "Metrics/BlockLength: Block has too many lines. [56/25]", 2008289622], - [205, 3, 1586, "Metrics/BlockLength: Block has too many lines. [35/25]", 4179606047], - [251, 3, 977, "Metrics/BlockLength: Block has too many lines. [26/25]", 1240612851], - [287, 3, 1130, "Metrics/BlockLength: Block has too many lines. [28/25]", 2511265379], - [322, 3, 5029, "Metrics/BlockLength: Block has too many lines. [126/25]", 739537566], - [598, 3, 3055, "Metrics/BlockLength: Block has too many lines. [81/25]", 145217296] - ], - "spec/ast/merge/healer_spec.rb:877829793": [ - [3, 1, 4896, "Metrics/BlockLength: Block has too many lines. [148/25]", 1074378773], - [19, 3, 1333, "Metrics/BlockLength: Block has too many lines. [38/25]", 2940878263], - [24, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193432399], - [61, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085379023], - [67, 3, 2985, "Metrics/BlockLength: Block has too many lines. [93/25]", 4032786576] - ], - "spec/ast/merge/jaccard_similarity_spec.rb:3984307047": [ - [3, 1, 2659, "Metrics/BlockLength: Block has too many lines. [71/25]", 1122516612], - [6, 3, 1484, "Metrics/BlockLength: Block has too many lines. [38/25]", 3367914637], - [55, 3, 1090, "Metrics/BlockLength: Block has too many lines. [28/25]", 2629339264] - ], - "spec/ast/merge/key_path_partial_template_merger_base_spec.rb:2189485360": [ - [5, 1, 5955, "Metrics/BlockLength: Block has too many lines. [138/25]", 91542958], - [35, 3, 1217, "Metrics/BlockLength: Block has too many lines. [33/25]", 2663081123], - [97, 3, 3019, "Metrics/BlockLength: Block has too many lines. [54/25]", 1411952192] - ], - "spec/ast/merge/layout/attachment_spec.rb:3814294426": [ - [3, 1, 1799, "Metrics/BlockLength: Block has too many lines. [34/25]", 1283153367] - ], - "spec/ast/merge/layout/augmenter_spec.rb:3633045915": [ - [3, 1, 4412, "Metrics/BlockLength: Block has too many lines. [92/25]", 2690553031], - [20, 3, 2725, "Metrics/BlockLength: Block has too many lines. [54/25]", 3645203819] - ], - "spec/ast/merge/layout/gap_spec.rb:4232058283": [ - [3, 1, 2758, "Metrics/BlockLength: Block has too many lines. [72/25]", 2052697931], - [9, 3, 1290, "Metrics/BlockLength: Block has too many lines. [28/25]", 3175967312] - ], - "spec/ast/merge/match_refiner_base_spec.rb:3961767223": [ - [3, 1, 10604, "Metrics/BlockLength: Block has too many lines. [301/25]", 4290485382], - [4, 3, 1146, "Metrics/BlockLength: Block has too many lines. [37/25]", 108051658], - [50, 3, 1005, "Metrics/BlockLength: Block has too many lines. [28/25]", 3807648246], - [125, 3, 1026, "Metrics/BlockLength: Block has too many lines. [27/25]", 2896086726], - [162, 3, 4464, "Metrics/BlockLength: Block has too many lines. [114/25]", 2878217135], - [218, 5, 1112, "Metrics/BlockLength: Block has too many lines. [30/25]", 1605825436], - [224, 11, 104, "Style/HashLikeCase: Consider replacing `case-when` with a hash lookup.", 4220899731], - [247, 11, 132, "Style/HashLikeCase: Consider replacing `case-when` with a hash lookup.", 3401820780], - [258, 5, 1642, "Metrics/BlockLength: Block has too many lines. [35/25]", 1288881729], - [337, 3, 1108, "Metrics/BlockLength: Block has too many lines. [33/25]", 2139263963] - ], - "spec/ast/merge/match_score_base_spec.rb:2340739872": [ - [3, 1, 15213, "Metrics/BlockLength: Block has too many lines. [372/25]", 1512747000], - [4, 3, 1553, "Metrics/BlockLength: Block has too many lines. [41/25]", 2789289940], - [43, 20, 2, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 5862747], - [43, 24, 2, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 5862744], - [56, 3, 1041, "Metrics/BlockLength: Block has too many lines. [29/25]", 3729310115], - [152, 3, 3259, "Metrics/BlockLength: Block has too many lines. [82/25]", 1438003770], - [258, 3, 2199, "Metrics/BlockLength: Block has too many lines. [43/25]", 3386602801], - [320, 3, 1684, "Metrics/BlockLength: Block has too many lines. [35/25]", 3807719546], - [365, 14, 16, "Lint/FloatComparison: Avoid equality comparisons of floats as they are unreliable.", 3787748956], - [369, 3, 1696, "Metrics/BlockLength: Block has too many lines. [36/25]", 3172214426], - [417, 3, 1792, "Metrics/BlockLength: Block has too many lines. [45/25]", 3557977606], - [438, 5, 1121, "Metrics/BlockLength: Block has too many lines. [26/25]", 4236927298] - ], - "spec/ast/merge/merge_result_base_spec.rb:2262708492": [ - [3, 1, 19471, "Metrics/BlockLength: Block has too many lines. [529/25]", 4106058751], - [38, 3, 2735, "Metrics/BlockLength: Block has too many lines. [80/25]", 1103243845], - [279, 3, 1611, "Metrics/BlockLength: Block has too many lines. [39/25]", 1928511417], - [280, 5, 1203, "Metrics/BlockLength: Block has too many lines. [26/25]", 857223227], - [326, 3, 2070, "Metrics/BlockLength: Block has too many lines. [48/25]", 2552826824], - [385, 3, 5769, "Metrics/BlockLength: Block has too many lines. [140/25]", 1457747735], - [511, 5, 1306, "Metrics/BlockLength: Block has too many lines. [29/25]", 2980786372], - [574, 3, 1308, "Metrics/BlockLength: Block has too many lines. [32/25]", 1342704008] - ], - "spec/ast/merge/merger_config_spec.rb:663896662": [ - [5, 1, 7314, "Metrics/BlockLength: Block has too many lines. [189/25]", 1279589310], - [11, 3, 1180, "Metrics/BlockLength: Block has too many lines. [26/25]", 1014009176], - [45, 3, 1151, "Metrics/BlockLength: Block has too many lines. [26/25]", 785276703], - [79, 3, 3574, "Metrics/BlockLength: Block has too many lines. [97/25]", 969726064], - [126, 5, 1158, "Metrics/BlockLength: Block has too many lines. [29/25]", 389808524] - ], - "spec/ast/merge/navigable/injection_point_finder_spec.rb:3693754765": [ - [3, 1, 5152, "Metrics/BlockLength: Block has too many lines. [123/25]", 3265221808], - [15, 3, 4026, "Metrics/BlockLength: Block has too many lines. [96/25]", 1482695302], - [63, 5, 2337, "Metrics/BlockLength: Block has too many lines. [54/25]", 2678200297] - ], - "spec/ast/merge/navigable/injection_point_spec.rb:3295717447": [ - [3, 1, 6032, "Metrics/BlockLength: Block has too many lines. [161/25]", 805025024], - [77, 3, 1083, "Metrics/BlockLength: Block has too many lines. [28/25]", 3091139104] - ], - "spec/ast/merge/navigable/statement_spec.rb:2965726260": [ - [3, 1, 18289, "Metrics/BlockLength: Block has too many lines. [510/25]", 4119203121], - [102, 3, 3570, "Metrics/BlockLength: Block has too many lines. [97/25]", 3287535168], - [156, 5, 2030, "Metrics/BlockLength: Block has too many lines. [51/25]", 3299963733], - [251, 3, 1338, "Metrics/BlockLength: Block has too many lines. [37/25]", 844559624], - [411, 3, 1550, "Metrics/BlockLength: Block has too many lines. [42/25]", 3851790429], - [465, 3, 1372, "Metrics/BlockLength: Block has too many lines. [41/25]", 3782869383] - ], - "spec/ast/merge/node_typing/frozen_wrapper_spec.rb:3823345520": [ - [3, 1, 4532, "Metrics/BlockLength: Block has too many lines. [117/25]", 3944573785] - ], - "spec/ast/merge/node_typing/normalizer_spec.rb:1976431423": [ - [4, 1, 8679, "Metrics/BlockLength: Block has too many lines. [219/25]", 938207310], - [65, 3, 1137, "Metrics/BlockLength: Block has too many lines. [26/25]", 3180807289], - [101, 3, 1404, "Metrics/BlockLength: Block has too many lines. [28/25]", 1094334251], - [216, 3, 875, "Metrics/BlockLength: Block has too many lines. [26/25]", 2755551247] - ], - "spec/ast/merge/node_typing/wrapper_spec.rb:3211588263": [ - [3, 1, 3469, "Metrics/BlockLength: Block has too many lines. [92/25]", 638644563] - ], - "spec/ast/merge/node_typing_spec.rb:4080661389": [ - [3, 1, 12728, "Metrics/BlockLength: Block has too many lines. [333/25]", 3927571381], - [132, 3, 3704, "Metrics/BlockLength: Block has too many lines. [98/25]", 2130243754], - [208, 5, 1267, "Metrics/BlockLength: Block has too many lines. [31/25]", 2816753725], - [265, 3, 1298, "Metrics/BlockLength: Block has too many lines. [33/25]", 3320876250], - [311, 3, 3803, "Metrics/BlockLength: Block has too many lines. [100/25]", 2743470911] - ], - "spec/ast/merge/node_wrapper_base_spec.rb:2252820285": [ - [3, 1, 11681, "Metrics/BlockLength: Block has too many lines. [307/25]", 1698593962], - [32, 3, 2341, "Metrics/BlockLength: Block has too many lines. [68/25]", 1594381363], - [179, 3, 2568, "Metrics/BlockLength: Block has too many lines. [51/25]", 1269052990], - [294, 3, 1252, "Metrics/BlockLength: Block has too many lines. [26/25]", 4220822180], - [329, 3, 1963, "Metrics/BlockLength: Block has too many lines. [39/25]", 1623030031] - ], - "spec/ast/merge/owner_selection_spec.rb:1894901093": [ - [3, 1, 1356, "Metrics/BlockLength: Block has too many lines. [35/25]", 1030003775] - ], - "spec/ast/merge/partial_template_merger_base_spec.rb:3412991027": [ - [3, 1, 7073, "Metrics/BlockLength: Block has too many lines. [145/25]", 3415302240], - [16, 9, 43, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3196404056], - [22, 9, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 4116824817], - [48, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [96, 3, 4220, "Metrics/BlockLength: Block has too many lines. [68/25]", 3464417459], - [97, 5, 2029, "Metrics/BlockLength: Block has too many lines. [27/25]", 3297854360], - [138, 5, 2122, "Metrics/BlockLength: Block has too many lines. [37/25]", 1592076374] - ], - "spec/ast/merge/recipe/config_spec.rb:3917288551": [ - [3, 1, 21041, "Metrics/BlockLength: Block has too many lines. [611/25]", 2431235923], - [72, 3, 1653, "Metrics/BlockLength: Block has too many lines. [36/25]", 2702780755], - [174, 3, 1465, "Metrics/BlockLength: Block has too many lines. [44/25]", 2326126933], - [226, 3, 3419, "Metrics/BlockLength: Block has too many lines. [89/25]", 798604841], - [327, 3, 1398, "Metrics/BlockLength: Block has too many lines. [34/25]", 3113267700], - [474, 3, 1184, "Metrics/BlockLength: Block has too many lines. [39/25]", 2599756030], - [519, 3, 4630, "Metrics/BlockLength: Block has too many lines. [147/25]", 1245526575] - ], - "spec/ast/merge/recipe/preset_spec.rb:818394232": [ - [3, 1, 6696, "Metrics/BlockLength: Block has too many lines. [173/25]", 3205615892] - ], - "spec/ast/merge/recipe/runner_spec.rb:3689194117": [ - [3, 1, 46798, "Metrics/BlockLength: Block has too many lines. [1104/25]", 3220015076], - [48, 3, 1128, "Metrics/BlockLength: Block has too many lines. [26/25]", 910457645], - [108, 3, 3036, "Metrics/BlockLength: Block has too many lines. [92/25]", 2112378918], - [132, 5, 881, "Metrics/BlockLength: Block has too many lines. [27/25]", 3842010356], - [177, 5, 918, "Metrics/BlockLength: Block has too many lines. [27/25]", 2152367239], - [295, 3, 1383, "Metrics/BlockLength: Block has too many lines. [41/25]", 2141027559], - [362, 3, 1653, "Metrics/BlockLength: Block has too many lines. [33/25]", 1536472295], - [449, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3960802027], - [497, 3, 7959, "Metrics/BlockLength: Block has too many lines. [200/25]", 3739116912], - [556, 5, 1225, "Metrics/BlockLength: Block has too many lines. [31/25]", 195497726], - [740, 3, 6977, "Metrics/BlockLength: Block has too many lines. [145/25]", 2805535296], - [748, 5, 2241, "Metrics/BlockLength: Block has too many lines. [49/25]", 2552233173], - [805, 5, 3007, "Metrics/BlockLength: Block has too many lines. [59/25]", 708771722], - [877, 5, 1444, "Metrics/BlockLength: Block has too many lines. [26/25]", 3274225022], - [911, 3, 3258, "Metrics/BlockLength: Block has too many lines. [85/25]", 2346849758], - [1012, 3, 2710, "Metrics/BlockLength: Block has too many lines. [71/25]", 3801821877], - [1029, 5, 1547, "Metrics/BlockLength: Block has too many lines. [42/25]", 2962020615], - [1109, 3, 2240, "Metrics/BlockLength: Block has too many lines. [35/25]", 1139957345], - [1115, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], - [1117, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], - [1119, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1801369636], - [1121, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2652710920], - [1123, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1375785821], - [1125, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 632755459], - [1160, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], - [1162, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], - [1164, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1375785821], - [1176, 3, 1472, "Metrics/BlockLength: Block has too many lines. [31/25]", 844153987], - [1181, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1239303812], - [1183, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1251336963], - [1216, 3, 2277, "Metrics/BlockLength: Block has too many lines. [43/25]", 4287127386], - [1221, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], - [1223, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2652710920], - [1225, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1375785821], - [1227, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 632755459], - [1274, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3420615328] - ], - "spec/ast/merge/recipe/script_loader_spec.rb:2136892097": [ - [3, 1, 8554, "Metrics/BlockLength: Block has too many lines. [237/25]", 2314425369], - [45, 3, 2842, "Metrics/BlockLength: Block has too many lines. [75/25]", 168902852], - [155, 3, 1400, "Metrics/BlockLength: Block has too many lines. [39/25]", 1611123964] - ], - "spec/ast/merge/rspec/shared_examples/feature_profile_spec.rb:2654837708": [ - [5, 1, 1140, "Metrics/BlockLength: Block has too many lines. [31/25]", 678325840] - ], - "spec/ast/merge/rspec/shared_examples/file_analyzable_spec.rb:1833922303": [ - [58, 3, 970, "Metrics/AbcSize: Assignment Branch Condition size for `detect_freeze_blocks` is too high. [<16, 9, 5> 19.03/17]", 1533823667], - [58, 3, 970, "Metrics/MethodLength: Method has too many lines. [31/10]", 1533823667], - [104, 1, 1216, "Metrics/BlockLength: Block has too many lines. [39/25]", 1009012120], - [105, 3, 1159, "Metrics/BlockLength: Block has too many lines. [38/25]", 1361521205] - ], - "spec/ast/merge/rspec/shared_examples/layout_attachment_spec.rb:714796658": [ - [8, 1, 957, "Metrics/BlockLength: Block has too many lines. [28/25]", 3738990548] - ], - "spec/ast/merge/rspec/shared_examples/recipe_preset_contract_spec.rb:669158728": [ - [6, 1, 1577, "Metrics/BlockLength: Block has too many lines. [41/25]", 2157464290], - [7, 3, 1512, "Metrics/BlockLength: Block has too many lines. [39/25]", 1968160370], - [44, 5, 401, "Metrics/AbcSize: Assignment Branch Condition size for `run_verify_loaded_preset` is too high. [<0, 26, 0> 26/17]", 2960760840] - ], - "spec/ast/merge/rspec/shared_examples/removal_mode_compliance_spec.rb:31388352": [ - [6, 22, 2, "Style/MutableConstant: Freeze mutable objects assigned to constants.", 5861859], - [44, 1, 2546, "Metrics/BlockLength: Block has too many lines. [77/25]", 3740028971], - [45, 3, 1350, "Metrics/BlockLength: Block has too many lines. [41/25]", 2793151667], - [94, 3, 1128, "Metrics/BlockLength: Block has too many lines. [32/25]", 2527000512], - [95, 5, 1081, "Metrics/BlockLength: Block has too many lines. [30/25]", 3825359844] - ], - "spec/ast/merge/rspec/shared_examples/reproducible_partial_merge_spec.rb:2862326360": [ - [19, 3, 600, "Metrics/MethodLength: Method has too many lines. [13/10]", 1542875905] - ], - "spec/ast/merge/ruleset/config_spec.rb:1860949041": [ - [3, 1, 9431, "Metrics/BlockLength: Block has too many lines. [236/25]", 4015119559], - [24, 3, 5341, "Metrics/BlockLength: Block has too many lines. [149/25]", 2361087446], - [25, 5, 1064, "Metrics/BlockLength: Block has too many lines. [26/25]", 603056104], - [226, 3, 2125, "Metrics/BlockLength: Block has too many lines. [36/25]", 1640873170] - ], - "spec/ast/merge/ruleset/declaration_objects_spec.rb:3827892270": [ - [3, 1, 1881, "Metrics/BlockLength: Block has too many lines. [47/25]", 1770376910] - ], - "spec/ast/merge/ruleset/feature_profile_spec.rb:2241111096": [ - [3, 1, 4189, "Metrics/BlockLength: Block has too many lines. [86/25]", 1116963550], - [4, 3, 4129, "Metrics/BlockLength: Block has too many lines. [84/25]", 117079811], - [5, 5, 2391, "Metrics/BlockLength: Block has too many lines. [45/25]", 1800077283] - ], - "spec/ast/merge/ruleset/parser_spec.rb:386407767": [ - [3, 1, 5670, "Metrics/BlockLength: Block has too many lines. [144/25]", 3425850453], - [4, 3, 5618, "Metrics/BlockLength: Block has too many lines. [143/25]", 246633759] - ], - "spec/ast/merge/ruleset/profile_vocabulary_spec.rb:2570869276": [ - [3, 1, 2095, "Metrics/BlockLength: Block has too many lines. [46/25]", 3214342662] - ], - "spec/ast/merge/ruleset/support_style_resolver_spec.rb:640167644": [ - [3, 1, 1625, "Metrics/BlockLength: Block has too many lines. [49/25]", 2066834885], - [4, 3, 1559, "Metrics/BlockLength: Block has too many lines. [47/25]", 1169495477] - ], - "spec/ast/merge/runtime_spec.rb:3962589694": [ - [5, 1, 24649, "Metrics/BlockLength: Block has too many lines. [664/25]", 2634021188], - [76, 3, 1459, "Metrics/BlockLength: Block has too many lines. [41/25]", 3744002593], - [125, 3, 1417, "Metrics/BlockLength: Block has too many lines. [33/25]", 4087615381], - [166, 3, 2549, "Metrics/BlockLength: Block has too many lines. [69/25]", 3150260095], - [175, 5, 1068, "Metrics/BlockLength: Block has too many lines. [26/25]", 2933114685], - [247, 3, 1668, "Metrics/BlockLength: Block has too many lines. [39/25]", 2386637993], - [259, 5, 1265, "Metrics/BlockLength: Block has too many lines. [27/25]", 3157806167], - [321, 3, 10884, "Metrics/BlockLength: Block has too many lines. [295/25]", 1889265918], - [322, 5, 1879, "Metrics/BlockLength: Block has too many lines. [46/25]", 2536583521], - [373, 5, 3938, "Metrics/BlockLength: Block has too many lines. [108/25]", 340276027], - [486, 5, 1270, "Metrics/BlockLength: Block has too many lines. [38/25]", 3844174392], - [528, 5, 3728, "Metrics/BlockLength: Block has too many lines. [95/25]", 3779381786], - [630, 3, 3240, "Metrics/BlockLength: Block has too many lines. [84/25]", 3856725067], - [656, 5, 1649, "Metrics/BlockLength: Block has too many lines. [40/25]", 3713662683] - ], - "spec/ast/merge/section_typing_spec.rb:2580971307": [ - [3, 1, 14786, "Metrics/BlockLength: Block has too many lines. [344/25]", 2925587076], - [4, 3, 1940, "Metrics/BlockLength: Block has too many lines. [50/25]", 3362429388], - [67, 3, 3684, "Metrics/BlockLength: Block has too many lines. [96/25]", 3864076664], - [120, 5, 1998, "Metrics/BlockLength: Block has too many lines. [50/25]", 411620722], - [183, 3, 1415, "Metrics/BlockLength: Block has too many lines. [37/25]", 3323012675], - [192, 5, 1124, "Metrics/BlockLength: Block has too many lines. [28/25]", 966216762], - [229, 3, 1610, "Metrics/BlockLength: Block has too many lines. [38/25]", 1499957007], - [229, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 1025596574], - [279, 3, 4437, "Metrics/BlockLength: Block has too many lines. [80/25]", 423587151], - [356, 36, 23, "Style/SymbolProc: Pass `&:unclassified?` as an argument to `find` instead of a block.", 563945984], - [369, 36, 23, "Style/SymbolProc: Pass `&:unclassified?` as an argument to `find` instead of a block.", 563945984], - [375, 3, 1630, "Metrics/BlockLength: Block has too many lines. [31/25]", 1675144727] - ], - "spec/ast/merge/smart_merger_base_spec.rb:1904727390": [ - [3, 1, 13253, "Metrics/BlockLength: Block has too many lines. [398/25]", 3611753358], - [30, 9, 10, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 1099697163], - [87, 3, 1851, "Metrics/BlockLength: Block has too many lines. [40/25]", 3729571903], - [210, 3, 925, "Metrics/BlockLength: Block has too many lines. [35/25]", 2001100899], - [344, 3, 709, "Metrics/BlockLength: Block has too many lines. [27/25]", 3041950416], - [415, 3, 1074, "Metrics/BlockLength: Block has too many lines. [35/25]", 956635689], - [416, 5, 1026, "Metrics/BlockLength: Block has too many lines. [33/25]", 1993879652], - [461, 3, 1031, "Metrics/BlockLength: Block has too many lines. [31/25]", 35315996] - ], - "spec/ast/merge/structural_edit/boundary_support_spec.rb:863387845": [ - [3, 1, 4226, "Metrics/BlockLength: Block has too many lines. [86/25]", 1889771490], - [16, 9, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1304492024], - [22, 9, 41, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3828424401], - [59, 3, 1294, "Metrics/BlockLength: Block has too many lines. [26/25]", 3038774774] - ], - "spec/ast/merge/structural_edit/plan_set_spec.rb:3633263362": [ - [3, 1, 5945, "Metrics/BlockLength: Block has too many lines. [180/25]", 3883285271], - [14, 3, 2139, "Metrics/BlockLength: Block has too many lines. [72/25]", 3558415255], - [128, 3, 1412, "Metrics/BlockLength: Block has too many lines. [39/25]", 1216754705] - ], - "spec/ast/merge/structural_edit/remove_plan_spec.rb:3569534665": [ - [3, 1, 6442, "Metrics/BlockLength: Block has too many lines. [134/25]", 3440814588], - [39, 3, 3768, "Metrics/BlockLength: Block has too many lines. [75/25]", 876721813], - [127, 3, 1439, "Metrics/BlockLength: Block has too many lines. [29/25]", 3378195351] - ], - "spec/ast/merge/structural_edit/remove_plan_support_spec.rb:800158061": [ - [3, 1, 2893, "Metrics/BlockLength: Block has too many lines. [62/25]", 3748446914], - [16, 9, 43, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3196404056], - [22, 9, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 4116824817], - [29, 3, 2091, "Metrics/BlockLength: Block has too many lines. [39/25]", 1684933040], - [30, 5, 1653, "Metrics/BlockLength: Block has too many lines. [27/25]", 2456404305] - ], - "spec/ast/merge/structural_edit/splice_plan_spec.rb:3331205681": [ - [3, 1, 3159, "Metrics/BlockLength: Block has too many lines. [83/25]", 2234926397], - [16, 3, 1837, "Metrics/BlockLength: Block has too many lines. [46/25]", 2935991482], - [42, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860750] - ], - "spec/ast/merge/text/conflict_resolver_spec.rb:3810004132": [ - [5, 1, 9102, "Metrics/BlockLength: Block has too many lines. [218/25]", 672115618], - [33, 3, 8206, "Metrics/BlockLength: Block has too many lines. [194/25]", 259803246], - [78, 5, 1920, "Metrics/BlockLength: Block has too many lines. [45/25]", 3965182334], - [139, 5, 1918, "Metrics/BlockLength: Block has too many lines. [44/25]", 3707046125] - ], - "spec/ast/merge/text/file_analysis_spec.rb:3430380445": [ - [5, 1, 8842, "Metrics/BlockLength: Block has too many lines. [205/25]", 4255187284], - [6, 3, 1323, "Metrics/BlockLength: Block has too many lines. [29/25]", 2518912953], - [47, 3, 1830, "Metrics/BlockLength: Block has too many lines. [43/25]", 3685770590], - [135, 3, 1620, "Metrics/BlockLength: Block has too many lines. [35/25]", 3089951119] - ], - "spec/ast/merge/text/line_node_spec.rb:1757790485": [ - [5, 1, 4739, "Metrics/BlockLength: Block has too many lines. [131/25]", 1487875238] - ], - "spec/ast/merge/text/merge_result_spec.rb:589380024": [ - [5, 1, 1541, "Metrics/BlockLength: Block has too many lines. [40/25]", 2828087992] - ], - "spec/ast/merge/text/section_splitter_spec.rb:804308722": [ - [4, 1, 5705, "Metrics/BlockLength: Block has too many lines. [209/25]", 4175363685], - [5, 3, 794, "Metrics/BlockLength: Block has too many lines. [28/25]", 2386862842], - [42, 3, 1126, "Metrics/BlockLength: Block has too many lines. [45/25]", 1507887296], - [95, 3, 746, "Metrics/BlockLength: Block has too many lines. [30/25]", 1759029412], - [131, 3, 1169, "Metrics/BlockLength: Block has too many lines. [45/25]", 1412318991], - [184, 3, 754, "Metrics/BlockLength: Block has too many lines. [30/25]", 2717556691], - [246, 1, 16648, "Metrics/BlockLength: Block has too many lines. [428/25]", 3166834694], - [370, 3, 1640, "Metrics/BlockLength: Block has too many lines. [46/25]", 2049342960], - [424, 3, 3237, "Metrics/BlockLength: Block has too many lines. [102/25]", 2357275144], - [540, 3, 3505, "Metrics/BlockLength: Block has too many lines. [67/25]", 2112469350], - [619, 3, 3586, "Metrics/BlockLength: Block has too many lines. [90/25]", 3866409298], - [620, 5, 1650, "Metrics/BlockLength: Block has too many lines. [48/25]", 289235626], - [622, 9, 1474, "Metrics/AbcSize: Assignment Branch Condition size for `split` is too high. [<8, 21, 7> 23.54/17]", 557655357], - [622, 9, 1474, "Metrics/MethodLength: Method has too many lines. [41/10]", 557655357], - [622, 9, 1474, "Metrics/PerceivedComplexity: Perceived complexity for `split` is too high. [9/8]", 557655357], - [628, 11, 1237, "Metrics/BlockLength: Block has too many lines. [33/25]", 1134667672], - [717, 29, 44, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 2169354946], - [723, 29, 44, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 2169354946], - [751, 1, 3128, "Metrics/BlockLength: Block has too many lines. [85/25]", 2082776744], - [769, 3, 1744, "Metrics/BlockLength: Block has too many lines. [46/25]", 223880162], - [770, 5, 1258, "Metrics/BlockLength: Block has too many lines. [31/25]", 2245422869] - ], - "spec/ast/merge/text/smart_merger_spec.rb:4128732567": [ - [3, 1, 8057, "Metrics/BlockLength: Block has too many lines. [210/25]", 1690443322], - [4, 3, 1135, "Metrics/BlockLength: Block has too many lines. [28/25]", 3788979655], - [58, 3, 4438, "Metrics/BlockLength: Block has too many lines. [106/25]", 2613192474], - [187, 3, 1053, "Metrics/BlockLength: Block has too many lines. [26/25]", 803567817], - [220, 3, 892, "Metrics/BlockLength: Block has too many lines. [28/25]", 2001100899] - ], - "spec/ast/merge/text/word_node_spec.rb:1457011521": [ - [5, 1, 3264, "Metrics/BlockLength: Block has too many lines. [74/25]", 677733430] - ], - "spec/ast/merge/token_match_refiner_spec.rb:3180314913": [ - [3, 1, 4000, "Metrics/BlockLength: Block has too many lines. [80/25]", 1630791278], - [8, 3, 2912, "Metrics/BlockLength: Block has too many lines. [60/25]", 529772148] - ], - "spec/ast/merge/trailing_groups/alignment_sort_spec.rb:1594915480": [ - [5, 1, 4710, "Metrics/BlockLength: Block has too many lines. [114/25]", 2499296583], - [14, 3, 2140, "Metrics/BlockLength: Block has too many lines. [47/25]", 3871799493], - [95, 3, 1482, "Metrics/BlockLength: Block has too many lines. [35/25]", 1088314263] - ], - "spec/ast/merge/trailing_groups/core_spec.rb:2651131504": [ - [5, 1, 9601, "Metrics/BlockLength: Block has too many lines. [242/25]", 598045669], - [22, 3, 3728, "Metrics/BlockLength: Block has too many lines. [87/25]", 1304580063], - [119, 3, 3931, "Metrics/BlockLength: Block has too many lines. [99/25]", 2464218479], - [186, 5, 1322, "Metrics/BlockLength: Block has too many lines. [30/25]", 427915501], - [187, 7, 1267, "Metrics/BlockLength: Block has too many lines. [28/25]", 861882691], - [245, 3, 1306, "Metrics/BlockLength: Block has too many lines. [34/25]", 86572459] - ], - "spec/ast/merge/trailing_groups/dest_iterate_spec.rb:3632880085": [ - [5, 1, 5523, "Metrics/BlockLength: Block has too many lines. [131/25]", 3077369183], - [19, 3, 3990, "Metrics/BlockLength: Block has too many lines. [91/25]", 593259616], - [39, 35, 12, "Style/SymbolProc: Pass `&:sig` as an argument to `lambda` instead of a block.", 3587754320], - [54, 33, 23, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 384283629], - [89, 35, 13, "Style/SymbolProc: Pass `&:name` as an argument to `lambda` instead of a block.", 3561384234], - [98, 35, 12, "Style/SymbolProc: Pass `&:sig` as an argument to `lambda` instead of a block.", 3587754320], - [113, 35, 12, "Style/SymbolProc: Pass `&:sig` as an argument to `lambda` instead of a block.", 3587754320] - ], - "spec/ast/merge/unresolved_policy_spec.rb:2561713656": [ - [3, 1, 1333, "Metrics/BlockLength: Block has too many lines. [33/25]", 4109547889] - ], - "spec/ast/merge/unresolved_review_state_spec.rb:3186871217": [ - [3, 1, 1038, "Metrics/BlockLength: Block has too many lines. [31/25]", 1325553035] - ], - "spec/ast/merge_rspec_conformance_fixtures_spec.rb:251774004": [ - [5, 1, 2119, "Metrics/BlockLength: Block has too many lines. [55/25]", 1724925683], - [6, 3, 1203, "Metrics/BlockLength: Block has too many lines. [29/25]", 3306863581] - ], - "spec/ast/merge_spec.rb:664670069": [ - [3, 1, 3113, "Metrics/BlockLength: Block has too many lines. [74/25]", 4034649501], - [9, 3, 2227, "Metrics/BlockLength: Block has too many lines. [51/25]", 578300230], - [10, 5, 2182, "Metrics/BlockLength: Block has too many lines. [49/25]", 2758871265] - ], - "spec/base_substrate_spec.rb:2864492094": [ - [5, 1, 5800, "Metrics/BlockLength: Block has too many lines. [143/25]", 784801982], - [6, 3, 192, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 680981873], - [13, 3, 378, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1223797442], - [31, 3, 628, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 2123191050], - [53, 3, 429, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3536712197], - [69, 3, 24, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 2280792512], - [70, 3, 78, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 604224776], - [72, 3, 146, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3315091322] - ], - "spec/fixtures_integration_spec.rb:1145500459": [ - [595, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859109], - [758, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 576909008], - [881, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087900170], - [1806, 3, 816, "Metrics/MethodLength: Method has too many lines. [13/10]", 170960660], - [1806, 39, 213, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 635200700], - [1807, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3976306097], - [1831, 38, 80, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3297939075], - [1916, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1745553512], - [1917, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 118067488], - [1918, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 196190368], - [1919, 121, 41, "Layout/LineLength: Line is too long. [161/120]", 3371256193], - [2090, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3241114703], - [2428, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], - [2567, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], - [2991, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3697593604], - [2992, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], - [3113, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179435314], - [3122, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1182194285], - [3124, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 3886107031], - [3151, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1751849111], - [3152, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1519587684], - [3153, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 4086262880], - [3170, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3568081822], - [3171, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1776876782], - [3173, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [3174, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1751849111], - [3176, 121, 73, "Layout/LineLength: Line is too long. [193/120]", 3322243646], - [3178, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1715153206], - [3179, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [3180, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 504997180], - [3181, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 1146860021], - [3182, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 2312101607], - [3183, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1423779161], - [3184, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1900897138], - [3185, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 1689840383], - [3186, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 1589056236], - [3188, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 763176550], - [3194, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3957871310], - [3196, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 763176550], - [3198, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 919916608], - [3199, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 919916608], - [3200, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3957871310], - [3201, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 4073040612], - [3202, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 763176550], - [3203, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 667593075], - [3205, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1310972770], - [3206, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 311387795], - [3207, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 724840266], - [3208, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 2555878310], - [3209, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1781078972], - [3210, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [3213, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [3214, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1658060570], - [3215, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 3085728851], - [3216, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3129400559], - [3217, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3197516464], - [3218, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087771520], - [3219, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3837194228], - [3220, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1312323543], - [3221, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 2356847623], - [3222, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [3223, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3428073441], - [3224, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 2891080552], - [3225, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3080737172], - [3226, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 170445026], - [3227, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3240051869], - [3228, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 4266052680], - [3229, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3376297786], - [3230, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 398435913], - [3231, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 4134940256], - [3232, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 30370035], - [3233, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 2862546359], - [3234, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1901388514], - [3235, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 838864274], - [3236, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 3437460384], - [3237, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1567003152], - [3238, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2609066305], - [3239, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 4043187090], - [3240, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3866430009], - [3241, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 2182699083], - [3242, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 3958792129], - [3243, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3449926560], - [3244, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 399774089], - [3245, 121, 68, "Layout/LineLength: Line is too long. [188/120]", 2119246799], - [3247, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3592658842], - [3248, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2905723409], - [3249, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 3930305198], - [3250, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 4186230052], - [3251, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [3252, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2700200720], - [3253, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 1630526402], - [3254, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3669244926], - [3255, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2814234644], - [3256, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3109415933], - [3257, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3643275044], - [3258, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 3825290660], - [3259, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1751849111], - [3260, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 4112285398], - [3261, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 1684279672], - [3262, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 1616506266], - [3264, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [3265, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1330093223], - [3266, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 4084555566], - [3267, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 2466867154], - [3268, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 4088314613], - [3269, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 2416893689], - [3270, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 683312682], - [3271, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 2516517934], - [3272, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2414563355], - [3273, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 2232595211], - [3274, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 2940789369], - [3275, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 941259913], - [3276, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2133508098], - [3277, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1621975014], - [3278, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 35985461], - [3279, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 746016305], - [3280, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 435488100], - [3281, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 2581129172], - [3282, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 3495900774], - [3283, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1413120342], - [3284, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [3285, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2333800791], - [3286, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 2576906206], - [3287, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 2986659874], - [3288, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2811932564], - [3289, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 1970813291], - [3290, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 2904941246], - [3291, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3745922508], - [3292, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 735247237], - [3293, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3731320885], - [3294, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 3896022034], - [3295, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 2827048584], - [3296, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 2548596663], - [3297, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 3812352018], - [3298, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 1280243910], - [3299, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 1742643292], - [3300, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 3056442430], - [3301, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 3144363287], - [3302, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 477297993], - [3303, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 3657857971], - [3304, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3913984414], - [3305, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 336201058], - [3306, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 485418789], - [3307, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 453253839], - [3308, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3673833034], - [3309, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 1552836890], - [3310, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 2714635965], - [3311, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 9336999], - [3312, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 584857208], - [3313, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1394865213], - [3314, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 3973222761], - [3315, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 2020040051], - [3316, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 3060994335], - [3317, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 196286917], - [3318, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 4168514178], - [3319, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 810581246], - [3320, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 1473417372], - [3321, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 3008376885], - [3322, 121, 84, "Layout/LineLength: Line is too long. [204/120]", 454816400], - [3323, 121, 88, "Layout/LineLength: Line is too long. [208/120]", 1416223705], - [3324, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 2896813919], - [3325, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 957293983], - [3326, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 2118117430], - [3327, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 1367404612], - [3328, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 2459902188], - [3329, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 461483815], - [3330, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 2791596520], - [3331, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 203085787], - [3332, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 2942095139], - [3333, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 131861965], - [3334, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 3340827551], - [3335, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 102582610], - [3336, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 762789354], - [3337, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 3478337442], - [3338, 121, 112, "Layout/LineLength: Line is too long. [232/120]", 4010607435], - [3339, 121, 132, "Layout/LineLength: Line is too long. [252/120]", 3754747587], - [3340, 121, 136, "Layout/LineLength: Line is too long. [256/120]", 379336923], - [3341, 121, 108, "Layout/LineLength: Line is too long. [228/120]", 3366353902], - [3342, 121, 128, "Layout/LineLength: Line is too long. [248/120]", 1686898289], - [3343, 121, 132, "Layout/LineLength: Line is too long. [252/120]", 2005192241], - [3344, 121, 104, "Layout/LineLength: Line is too long. [224/120]", 1868634464], - [3345, 121, 124, "Layout/LineLength: Line is too long. [244/120]", 3939743614], - [3346, 121, 128, "Layout/LineLength: Line is too long. [248/120]", 2978506702], - [3347, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 3909866928], - [3348, 121, 118, "Layout/LineLength: Line is too long. [238/120]", 2853032177], - [3349, 121, 122, "Layout/LineLength: Line is too long. [242/120]", 2968366309], - [3350, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 1753663643], - [3351, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 3387619436], - [3352, 121, 106, "Layout/LineLength: Line is too long. [226/120]", 197895496], - [3353, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 576181861], - [3354, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 2809313444], - [3355, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 3963067112], - [3356, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 1121380327], - [3357, 121, 100, "Layout/LineLength: Line is too long. [220/120]", 31591211], - [3358, 121, 104, "Layout/LineLength: Line is too long. [224/120]", 1946129497], - [3359, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 767185096], - [3360, 121, 100, "Layout/LineLength: Line is too long. [220/120]", 1092646020], - [3361, 121, 104, "Layout/LineLength: Line is too long. [224/120]", 1328841270], - [3362, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 2663749624], - [3363, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 430318647], - [3364, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 1650234037], - [3365, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 1082269805], - [3366, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 316397809], - [3367, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 3145391348], - [3368, 121, 112, "Layout/LineLength: Line is too long. [232/120]", 2808088654], - [3369, 121, 116, "Layout/LineLength: Line is too long. [236/120]", 1035513748], - [3370, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 2552800539], - [3371, 121, 112, "Layout/LineLength: Line is too long. [232/120]", 1727699169], - [3372, 121, 116, "Layout/LineLength: Line is too long. [236/120]", 1171566267], - [3373, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 2994775049], - [3374, 121, 110, "Layout/LineLength: Line is too long. [230/120]", 3860489151], - [3375, 121, 114, "Layout/LineLength: Line is too long. [234/120]", 959496607], - [3376, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 1694222439], - [3377, 121, 114, "Layout/LineLength: Line is too long. [234/120]", 1501186331], - [3378, 121, 118, "Layout/LineLength: Line is too long. [238/120]", 4059659418], - [3379, 121, 110, "Layout/LineLength: Line is too long. [230/120]", 1899868779], - [3380, 121, 130, "Layout/LineLength: Line is too long. [250/120]", 323324279], - [3381, 121, 134, "Layout/LineLength: Line is too long. [254/120]", 3956414359], - [3382, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 3506644741], - [3383, 121, 116, "Layout/LineLength: Line is too long. [236/120]", 936139074], - [3384, 121, 136, "Layout/LineLength: Line is too long. [256/120]", 4153213512], - [3385, 121, 140, "Layout/LineLength: Line is too long. [260/120]", 1491976338], - [3386, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 4061753206], - [3387, 121, 106, "Layout/LineLength: Line is too long. [226/120]", 2410434304], - [3388, 121, 124, "Layout/LineLength: Line is too long. [244/120]", 3518300264], - [3389, 121, 144, "Layout/LineLength: Line is too long. [264/120]", 1040696046], - [3390, 121, 148, "Layout/LineLength: Line is too long. [268/120]", 139604188], - [3391, 121, 120, "Layout/LineLength: Line is too long. [240/120]", 231937793], - [3392, 121, 140, "Layout/LineLength: Line is too long. [260/120]", 1835509805], - [3393, 121, 144, "Layout/LineLength: Line is too long. [264/120]", 1629218396], - [3394, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 2312875700], - [3395, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 2933374083], - [3396, 121, 106, "Layout/LineLength: Line is too long. [226/120]", 1719349671], - [3397, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 2555579810], - [3398, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 2023551624], - [3399, 121, 114, "Layout/LineLength: Line is too long. [234/120]", 955231924], - [3400, 121, 118, "Layout/LineLength: Line is too long. [238/120]", 4232993781], - [3401, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 3472954835], - [3402, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 3211922285], - [3403, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 2874956332], - [3404, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 1360335840], - [3405, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2135379556], - [3406, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3242768475], - [3407, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 2789115918], - [3408, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3346448124], - [3409, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1538469817], - [3410, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1543041113], - [3411, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 3344741438], - [3412, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2188404009], - [3413, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1330398779], - [3414, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 332468826], - [3415, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 1905397598], - [3416, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 438831062], - [3417, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 3377667334], - [3418, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3232541734], - [3420, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2130930429], - [3421, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 3684939371], - [3423, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2361951097], - [3424, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 1211447462], - [3425, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3309872691], - [3426, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 360053761], - [3427, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 1310136493], - [3428, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1950686342], - [3429, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 1397845826], - [3430, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 4191304724], - [3431, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2354128498], - [3432, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 1865717453], - [3433, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 24220542], - [3434, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 2618612673], - [3437, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3422918867], - [3438, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3689431739], - [3482, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 4093564799], - [3488, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1662653970], - [3489, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3967501655], - [3490, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2178516622], - [3491, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 1345346561], - [3505, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193466072], - [3625, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 3612393276], - [3626, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 797303985], - [3629, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1606320605], - [3649, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1776876782], - [3653, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 828742791], - [3673, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3294617581], - [3683, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3519842846], - [3693, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1966440909], - [3694, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053864], - [3700, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1606320605], - [3723, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 1340744311], - [3742, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1741893077], - [3743, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053865], - [3747, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193405204], - [3761, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1401226501], - [3764, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085352569], - [3767, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 696523922], - [3782, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], - [3792, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2746826653], - [4208, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1138870161], - [4770, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], - [4781, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 2132299307], - [4828, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087775098], - [4839, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 757851079], - [4875, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], - [4886, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 441649198], - [4909, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087903295], - [4921, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 170442008], - [4930, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], - [4932, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1888875443], - [4969, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 398433651], - [4980, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3921367744], - [5003, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2422819473], - [5009, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 194583095], - [5015, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1901385496], - [5024, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 490810486], - [5026, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 586287746], - [5030, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1310969752], - [5050, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087389205], - [5062, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2609063547], - [5071, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], - [5073, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1370761696], - [5096, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 2208661169], - [5102, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1862604658], - [5108, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 3958789371], - [5117, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3449594464], - [5119, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 692050524], - [5123, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 802172558], - [5193, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2406691660], - [5228, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], - [5239, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1811982742], - [5266, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2562189319], - [5272, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193430346], - [5278, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2814237166], - [5287, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2189106693], - [5289, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 3874870868], - [5293, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179474914], - [5326, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1751845165], - [5337, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2617230371], - [5341, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], - [5382, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], - [5393, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3793790598], - [5428, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 4088312783], - [5439, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3220724736], - [5443, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087899888], - [5462, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2552888401], - [5468, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 194583095], - [5474, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2414559905], - [5483, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 626762179], - [5485, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3969284923], - [5489, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 1893261414], - [5521, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2133507320], - [5532, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 2101353476], - [5536, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087685705], - [5555, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2431380437], - [5561, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 194583095], - [5567, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 435489438], - [5576, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 1520878209], - [5578, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 2238995076], - [5582, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 2789405913], - [5615, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], - [5626, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3409328196], - [5649, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087858069], - [5661, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2811935086], - [5670, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], - [5672, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1113346693], - [5676, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3227128786], - [5696, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 48793812], - [5702, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 338440584], - [5708, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 735248703], - [5717, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 927473097], - [5719, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 1394536741], - [5723, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3134012967], - [5742, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 2967615316], - [5748, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 2810710931], - [5754, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 2548594701], - [5757, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860796], - [5759, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], - [5763, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3549194295], - [5765, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 1074004741], - [5769, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 2874423564], - [5772, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087576526], - [5774, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], - [5789, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 1696848307], - [5795, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 2883501659], - [5801, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 3056443076], - [5806, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193405204], - [5810, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 1487412605], - [5812, 121, 51, "Layout/LineLength: Line is too long. [171/120]", 2021571284], - [5816, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1975782995], - [5819, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860796], - [5821, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193405204], - [5826, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 183236849], - [5835, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 856018753], - [5838, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], - [5841, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 2146546324], - [5847, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3913983076], - [5850, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 3491931666], - [5852, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3536323546], - [5856, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 356581191], - [5858, 121, 63, "Layout/LineLength: Line is too long. [183/120]", 4144657639], - [5862, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 1478616653], - [5865, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1774852021], - [5867, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3536323546], - [5882, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3884289787], - [5888, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 1001503687], - [5894, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3673836976], - [5903, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 3164908550], - [5905, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 1134300778], - [5909, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1797165224], - [5928, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 2508143995], - [5934, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 3002532188], - [5940, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 584857986], - [5943, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860796], - [5945, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], - [5949, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 749691384], - [5951, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 3389354954], - [5955, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 3402045699], - [5958, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087576526], - [5960, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], - [5974, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 2447716612], - [5980, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3201685099], - [5986, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 3060990885], - [5995, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 29396315], - [5997, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 1228645365], - [6001, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1436742837], - [6020, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 716917214], - [6026, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 2175814211], - [6032, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 1473420390], - [6035, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193433391], - [6037, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1422839111], - [6041, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 1571170198], - [6043, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 2175059093], - [6047, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3886666417], - [6050, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 176753677], - [6052, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1422839111], - [6068, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 3471319495], - [6074, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 1274038477], - [6080, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 2896814693], - [6083, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087576526], - [6085, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114086530], - [6089, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 250433828], - [6091, 121, 59, "Layout/LineLength: Line is too long. [179/120]", 3910556848], - [6095, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4002014976], - [6098, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 3491931666], - [6100, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114086530], - [6194, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861664], - [6208, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087932582], - [6222, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861664], - [6238, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 876012844], - [6240, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1756764194], - [6241, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 4173216735], - [6244, 121, 75, "Layout/LineLength: Line is too long. [195/120]", 911964425], - [6245, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 173266907], - [6246, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1412705933], - [6249, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1756764194], - [6250, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 2605683750], - [6253, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 3182252139], - [6255, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1652557742], - [6259, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 2240437058], - [6260, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 173266907], - [6261, 121, 101, "Layout/LineLength: Line is too long. [221/120]", 3694598076], - [6263, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861152], - [6264, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179079542], - [6265, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 3528944411], - [6268, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3020159378], - [6270, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1652557742], - [6276, 121, 84, "Layout/LineLength: Line is too long. [204/120]", 420843234], - [6278, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1401226501], - [6279, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 442915368], - [6282, 121, 79, "Layout/LineLength: Line is too long. [199/120]", 4212444955], - [6283, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053864], - [6284, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1373660924], - [6287, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1401226501], - [6288, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 1539225758], - [6291, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3020159378], - [6293, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 4240691845], - [6297, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 674553335], - [6298, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053864], - [6299, 121, 105, "Layout/LineLength: Line is too long. [225/120]", 4163432287], - [6301, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2089555761], - [6302, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2034687276], - [6303, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 3710905302], - [6306, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 4204667212], - [6308, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 4240691845], - [6314, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 2071493433], - [6316, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085352569], - [6317, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 2853066942], - [6320, 121, 71, "Layout/LineLength: Line is too long. [191/120]", 2771467828], - [6321, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193425976], - [6322, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3025157142], - [6325, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085352569], - [6326, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 3340824101], - [6329, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 3999804761], - [6331, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1999310973], - [6335, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 835016333], - [6336, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193425976], - [6337, 121, 97, "Layout/LineLength: Line is too long. [217/120]", 3575893945], - [6340, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193405945], - [6341, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 1755858308], - [6344, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 3182252139], - [6346, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1999310973], - [6352, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 3033080032], - [6354, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177549], - [6355, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 2720985203], - [6358, 121, 65, "Layout/LineLength: Line is too long. [185/120]", 3233424320], - [6360, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873483], - [6363, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177549], - [6364, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 131859703], - [6367, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1943494546], - [6369, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 4016166830], - [6373, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 1350760977], - [6375, 121, 91, "Layout/LineLength: Line is too long. [211/120]", 4098706554], - [6379, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 4059724765], - [6382, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1651955548], - [6384, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 4016166830], - [6390, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 1057495720], - [6393, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1621971220], - [6396, 121, 49, "Layout/LineLength: Line is too long. [169/120]", 1585717593], - [6402, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 2942094233], - [6405, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2624667704], - [6407, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2317051977], - [6411, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 1321610634], - [6413, 121, 75, "Layout/LineLength: Line is too long. [195/120]", 2854688831], - [6417, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 4185465554], - [6420, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1169781875], - [6422, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2317051977], - [6428, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 1916545020], - [6431, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1422839111], - [6434, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 910134593], - [6440, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 203086561], - [6443, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2939363812], - [6445, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3155638331], - [6449, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 1955758062], - [6451, 121, 71, "Layout/LineLength: Line is too long. [191/120]", 3737424359], - [6455, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 3597620692], - [6458, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2624667704], - [6460, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3155638331], - [6466, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 1036052399], - [6469, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114086530], - [6472, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 1268266488], - [6478, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 2791598354], - [6481, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1302589368], - [6483, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3533902728], - [6487, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 3942276897], - [6489, 121, 73, "Layout/LineLength: Line is too long. [193/120]", 1175941460], - [6493, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 679697318], - [6496, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 28126263], - [6498, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3533902728], - [6499, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 181895237], - [6504, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 4057848448], - [6507, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114086530], - [6510, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 4067769399], - [6516, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 461482909], - [6519, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1302589368], - [6521, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3533902728], - [6525, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 3561204590], - [6527, 121, 73, "Layout/LineLength: Line is too long. [193/120]", 880160795], - [6531, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 1614719145], - [6534, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 28126263], - [6536, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3533902728], - [6537, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 181895237], - [6584, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193432306], - [6598, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 1645945966], - [6601, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3212740609], - [6604, 121, 59, "Layout/LineLength: Line is too long. [179/120]", 3982698123], - [6606, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193425997], - [6610, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 2663750402], - [6613, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2420297272], - [6615, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1164389943], - [6619, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 3483121581], - [6621, 121, 85, "Layout/LineLength: Line is too long. [205/120]", 2271668600], - [6625, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 804794365], - [6628, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3659367004], - [6630, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1164389943], - [6631, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 561395486], - [6636, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 1251661057], - [6639, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3212740609], - [6642, 121, 59, "Layout/LineLength: Line is too long. [179/120]", 3210109508], - [6644, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193425997], - [6648, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 430316685], - [6651, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2420297272], - [6653, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1164389943], - [6657, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 2428160226], - [6659, 121, 85, "Layout/LineLength: Line is too long. [205/120]", 2663295671], - [6663, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 2822109938], - [6666, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3659367004], - [6668, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1164389943], - [6669, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 561395486], - [6674, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 857639785], - [6677, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3669622788], - [6680, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 140453799], - [6682, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860765], - [6686, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 1650236431], - [6689, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 150699323], - [6691, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 50618962], - [6695, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 4205571164], - [6697, 121, 83, "Layout/LineLength: Line is too long. [203/120]", 1549528021], - [6701, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 1325488145], - [6704, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1510711065], - [6706, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 50618962], - [6712, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 3043205563], - [6715, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2381137493], - [6718, 121, 61, "Layout/LineLength: Line is too long. [181/120]", 2200345195], - [6720, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087926498], - [6724, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 1082269527], - [6727, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1510711065], - [6729, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1104064739], - [6733, 121, 68, "Layout/LineLength: Line is too long. [188/120]", 1652941658], - [6735, 121, 87, "Layout/LineLength: Line is too long. [207/120]", 1440323819], - [6739, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 802896260], - [6742, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1943494546], - [6744, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1104064739], - [6750, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 788730815], - [6752, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2034687276], - [6753, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 4226330106], - [6756, 121, 77, "Layout/LineLength: Line is too long. [197/120]", 2414796320], - [6757, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873470], - [6758, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3090817832], - [6761, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2034687276], - [6762, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 2839148677], - [6765, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 2393983240], - [6767, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 2581936864], - [6771, 121, 84, "Layout/LineLength: Line is too long. [204/120]", 3923254945], - [6772, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873470], - [6773, 121, 103, "Layout/LineLength: Line is too long. [223/120]", 580639726], - [6775, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193419246], - [6776, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1756764194], - [6777, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 3202758044], - [6780, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 912651721], - [6782, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 2581936864], - [6786, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1164293389], - [6799, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860840], - [6800, 121, 88, "Layout/LineLength: Line is too long. [208/120]", 574552570], - [6802, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3845073641], - [6803, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 543375177], - [6806, 121, 83, "Layout/LineLength: Line is too long. [203/120]", 222410330], - [6807, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3025157219], - [6808, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1904561434], - [6811, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 489872984], - [6812, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 97325617], - [6815, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 4204667212], - [6817, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 4062673070], - [6821, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 1451915960], - [6822, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3025157219], - [6823, 121, 109, "Layout/LineLength: Line is too long. [229/120]", 4200529758], - [6825, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1497831350], - [6826, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 4214367244], - [6827, 121, 84, "Layout/LineLength: Line is too long. [204/120]", 399603517], - [6830, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3423548875], - [6832, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 4062673070], - [6836, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3279830097], - [6848, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 659167322], - [6860, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087926423], - [6861, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 3300294193], - [6863, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3172850966], - [6864, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 2396187736], - [6867, 121, 87, "Layout/LineLength: Line is too long. [207/120]", 1991888901], - [6868, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1954380402], - [6869, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2589970962], - [6872, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 42340644], - [6873, 121, 67, "Layout/LineLength: Line is too long. [187/120]", 479235996], - [6876, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3423548875], - [6878, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1462541970], - [6882, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 1373978781], - [6883, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1954380402], - [6884, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 280641011], - [6886, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1664110553], - [6887, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1009650381], - [6888, 121, 88, "Layout/LineLength: Line is too long. [208/120]", 909329343], - [6891, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 2977589831], - [6893, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1462541970], - [6898, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873470], - [6899, 121, 61, "Layout/LineLength: Line is too long. [181/120]", 1904101094], - [6901, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2229256255], - [6902, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 1839090017], - [6905, 121, 91, "Layout/LineLength: Line is too long. [211/120]", 4260980907], - [6906, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 4253118453], - [6907, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1536690221], - [6909, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861152], - [6910, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 209824656], - [6911, 121, 71, "Layout/LineLength: Line is too long. [191/120]", 1530496074], - [6914, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 2977589831], - [6916, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3261436902], - [6920, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 3762694917], - [6921, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 4253118453], - [6922, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 3196230010], - [6924, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3165598659], - [6925, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 4264469493], - [6926, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 3140690958], - [6929, 121, 35, "Layout/LineLength: Line is too long. [155/120]", 2999583208], - [6931, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3261436902], - [6937, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 326070599], - [6940, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1621971220], - [6943, 121, 49, "Layout/LineLength: Line is too long. [169/120]", 1689000214], - [6949, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 2459904022], - [6952, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2624667704], - [6954, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2317051977], - [6958, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 2842872837], - [6960, 121, 75, "Layout/LineLength: Line is too long. [195/120]", 423884656], - [6964, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 2673769885], - [6967, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1169781875], - [6969, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2317051977], - [6970, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2126253911], - [6986, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 2388292564], - [6989, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2381137493], - [6992, 121, 61, "Layout/LineLength: Line is too long. [181/120]", 1136762660], - [6994, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087926498], - [6998, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 2555581016], - [7001, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1510711065], - [7003, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1104064739], - [7007, 121, 68, "Layout/LineLength: Line is too long. [188/120]", 1986812885], - [7009, 121, 87, "Layout/LineLength: Line is too long. [207/120]", 1864036132], - [7013, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 3590180043], - [7016, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1943494546], - [7018, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1104064739], - [7019, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2382712010], - [7029, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1791534645], - [7034, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 2403815412], - [7037, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1422839111], - [7040, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 4046048864], - [7046, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 3472955113], - [7049, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2939363812], - [7051, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3155638331], - [7055, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3911469720], - [7057, 121, 71, "Layout/LineLength: Line is too long. [191/120]", 272433263], - [7061, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 634420444], - [7064, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2624667704], - [7066, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3155638331], - [7067, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2088324682], - [7080, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087906711], - [7092, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2135380894], - [7101, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], - [7103, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 4280757685], - [7107, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 161599970], - [7141, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053789], - [7176, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2188407955], - [7187, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3692322233], - [7191, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087557694], - [7214, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3197512522], - [7223, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858840], - [7225, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 85298067], - [7282, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193418403], - [7288, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193418403], - [7311, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087432474], - [7323, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2361949763], - [7332, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], - [7334, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 581045160], - [7338, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 4235011647], - [7357, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1898147766], - [7363, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177560], - [7369, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 1310140439], - [7378, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 681770239], - [7380, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3821940657], - [7384, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], - [7404, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861292], - [7416, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2354124424], - [7425, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087922021], - [7427, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 3921370162], - [8020, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 4083054536], - [8048, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 4083054536], - [8077, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 4083054536], - [8135, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 632953222], - [8164, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 732995265], - [8214, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 1886249927], - [8376, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 578751979], - [8377, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3803540269], - [8386, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2238403955], - [8387, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1028441932], - [8388, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 1975950909], - [8443, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1244043798] - ], - "spec/integration/freeze_node_edge_cases_spec.rb:3416491031": [ - [6, 1, 28959, "Metrics/BlockLength: Block has too many lines. [663/25]", 3473768018], - [7, 3, 2985, "Metrics/BlockLength: Block has too many lines. [57/25]", 436154415], - [8, 5, 2934, "Metrics/BlockLength: Block has too many lines. [55/25]", 1963918102], - [78, 3, 6091, "Metrics/BlockLength: Block has too many lines. [136/25]", 232153494], - [98, 5, 3053, "Metrics/BlockLength: Block has too many lines. [69/25]", 1442974101], - [202, 5, 1691, "Metrics/BlockLength: Block has too many lines. [29/25]", 985654389], - [241, 3, 8515, "Metrics/BlockLength: Block has too many lines. [176/25]", 2776676526], - [473, 3, 2024, "Metrics/BlockLength: Block has too many lines. [55/25]", 1048101963], - [474, 5, 890, "Metrics/BlockLength: Block has too many lines. [26/25]", 753961540], - [543, 3, 4511, "Metrics/BlockLength: Block has too many lines. [116/25]", 1227615145], - [693, 3, 1660, "Metrics/BlockLength: Block has too many lines. [43/25]", 1881888061], - [694, 5, 1107, "Metrics/BlockLength: Block has too many lines. [26/25]", 368095693] - ], - "spec/integration/gem_family_section_merge_spec.rb:1744383089": [ - [164, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 93655697] - ], - "spec/integration/integration_spec.rb:2239247043": [ - [14, 1, 4488, "Metrics/BlockLength: Block has too many lines. [88/25]", 206207480], - [15, 3, 3267, "Metrics/BlockLength: Block has too many lines. [62/25]", 1323899085], - [40, 5, 2263, "Metrics/BlockLength: Block has too many lines. [48/25]", 3172595581] - ], - "spec/integration/link_reference_preservation_spec.rb:3764298162": [ - [6, 1, 2646, "Metrics/BlockLength: Block has too many lines. [48/25]", 3396410609], - [19, 3, 2058, "Metrics/BlockLength: Block has too many lines. [33/25]", 163363949] - ], - "spec/integration/markly_merge_spec.rb:3076950975": [ - [3, 1, 22886, "Metrics/BlockLength: Block has too many lines. [670/25]", 1408138744], - [62, 3, 7192, "Metrics/BlockLength: Block has too many lines. [189/25]", 1890889324], - [63, 5, 1678, "Metrics/BlockLength: Block has too many lines. [41/25]", 2587582896], - [115, 5, 1808, "Metrics/BlockLength: Block has too many lines. [48/25]", 3381172795], - [147, 46, 21, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 451071547], - [171, 5, 1134, "Metrics/BlockLength: Block has too many lines. [30/25]", 2526618199], - [220, 5, 1335, "Metrics/BlockLength: Block has too many lines. [32/25]", 2790596215], - [311, 3, 2008, "Metrics/BlockLength: Block has too many lines. [66/25]", 2640155627], - [394, 3, 1052, "Metrics/BlockLength: Block has too many lines. [27/25]", 3988836255], - [440, 3, 2950, "Metrics/BlockLength: Block has too many lines. [89/25]", 961031348], - [441, 5, 1352, "Metrics/BlockLength: Block has too many lines. [37/25]", 1952365669], - [495, 5, 1550, "Metrics/BlockLength: Block has too many lines. [48/25]", 2400197001], - [561, 3, 1665, "Metrics/BlockLength: Block has too many lines. [52/25]", 3884776329], - [650, 3, 1919, "Metrics/BlockLength: Block has too many lines. [57/25]", 2594646583], - [725, 3, 1644, "Metrics/BlockLength: Block has too many lines. [45/25]", 2348710811], - [791, 3, 1600, "Metrics/BlockLength: Block has too many lines. [46/25]", 3683503747] - ], - "spec/integration/partial_template_merger_table_merge_spec.rb:3504046892": [ - [7, 1, 7402, "Metrics/BlockLength: Block has too many lines. [164/25]", 3368892126], - [9, 3, 2986, "Metrics/BlockLength: Block has too many lines. [67/25]", 2267114449], - [65, 5, 1359, "Metrics/BlockLength: Block has too many lines. [28/25]", 3145143002], - [102, 3, 997, "Metrics/BlockLength: Block has too many lines. [26/25]", 3156068215], - [147, 3, 3009, "Metrics/BlockLength: Block has too many lines. [65/25]", 994160212], - [202, 5, 1401, "Metrics/BlockLength: Block has too many lines. [28/25]", 3038951618] - ], - "spec/integration/table_formatting_preservation_spec.rb:3943985446": [ - [6, 1, 3086, "Metrics/BlockLength: Block has too many lines. [56/25]", 2210897849], - [19, 3, 2374, "Metrics/BlockLength: Block has too many lines. [40/25]", 668961519], - [33, 5, 1847, "Metrics/BlockLength: Block has too many lines. [28/25]", 3433318963] - ], - "spec/integration/text_merge_spec.rb:884566200": [ - [6, 1, 7747, "Metrics/BlockLength: Block has too many lines. [204/25]", 2372984305], - [60, 3, 1113, "Metrics/BlockLength: Block has too many lines. [34/25]", 3399970957], - [67, 5, 860, "Metrics/BlockLength: Block has too many lines. [27/25]", 2337191560], - [103, 3, 916, "Metrics/BlockLength: Block has too many lines. [28/25]", 4082963348], - [149, 3, 3001, "Metrics/BlockLength: Block has too many lines. [74/25]", 7776854] - ], - "spec/support/fictive_language_harness.rb:1770581700": [ - [85, 7, 733, "Metrics/AbcSize: Assignment Branch Condition size for `extract_comments` is too high. [<5, 16, 5> 17.49/17]", 1127096515], - [85, 7, 733, "Metrics/MethodLength: Method has too many lines. [22/10]", 1127096515], - [117, 21, 129, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 681912759], - [182, 7, 1084, "Metrics/AbcSize: Assignment Branch Condition size for `parse_statements` is too high. [<9, 28, 7> 30.23/17]", 3123785685], - [182, 7, 1084, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_statements` is too high. [8/7]", 3123785685], - [182, 7, 1084, "Metrics/MethodLength: Method has too many lines. [24/10]", 3123785685], - [233, 5, 9879, "Metrics/ClassLength: Class has too many lines. [228/100]", 3231256134], - [236, 21, 208, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2970487173], - [257, 7, 1981, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_batch` is too high. [<16, 32, 4> 36/17]", 4125392918], - [257, 7, 1981, "Metrics/MethodLength: Method has too many lines. [42/10]", 4125392918], - [342, 7, 778, "Metrics/MethodLength: Method has too many lines. [18/10]", 4189873983], - [364, 7, 844, "Metrics/MethodLength: Method has too many lines. [19/10]", 526186683], - [449, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087956942], - [464, 7, 1065, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_template_preamble_prefix_region` is too high. [<6, 24, 11> 27.07/17]", 2332280467], - [464, 7, 1065, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collapse_template_preamble_prefix_region` is too high. [10/7]", 2332280467], - [464, 7, 1065, "Metrics/MethodLength: Method has too many lines. [20/10]", 2332280467], - [464, 7, 1065, "Metrics/PerceivedComplexity: Perceived complexity for `collapse_template_preamble_prefix_region` is too high. [10/8]", 2332280467] - ], - "spec/support/testable_node.rb:1110514732": [ - [10, 7, 573, "Metrics/MethodLength: Method has too many lines. [12/10]", 798847435], - [10, 22, 226, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 2319398994], - [40, 7, 642, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<11, 14, 6> 18.79/17]", 2249578474], - [40, 21, 131, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 1786967686] - ] -} diff --git a/gems/ast-merge/Gemfile.lock b/gems/ast-merge/Gemfile.lock index b418a067c..40333e45c 100644 --- a/gems/ast-merge/Gemfile.lock +++ b/gems/ast-merge/Gemfile.lock @@ -275,6 +275,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -308,7 +324,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -363,18 +378,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -538,22 +542,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -659,9 +659,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -739,7 +739,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -760,10 +759,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -838,13 +837,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/ast-merge/README.md b/gems/ast-merge/README.md index f4089c7d5..19257e522 100644 --- a/gems/ast-merge/README.md +++ b/gems/ast-merge/README.md @@ -576,7 +576,6 @@ If none of the available licenses suit your use case, please [contact us](mailto [🖐contrib-rocks]: https://contrib.rocks [🖐contributors]: https://github.com/structuredmerge/structuredmerge-ruby/graphs/contributors [🖐contributors-img]: https://contrib.rocks/image?repo=structuredmerge/structuredmerge-ruby -[🚎contributors-gl]: https://gitlab.com/structuredmerge/structuredmerge-ruby/-/graphs/main [🪇conduct]: https://github.com/structuredmerge/structuredmerge-ruby/blob/main/CODE_OF_CONDUCT.md [🪇conduct-img]: https://img.shields.io/badge/Contributor_Covenant-2.1-259D6C.svg [📌pvc]: http://guides.rubygems.org/patterns/#pessimistic-version-constraint diff --git a/gems/ast-merge/bin/yard b/gems/ast-merge/bin/yard index 5d516ad6f..a7e8b6eed 100755 --- a/gems/ast-merge/bin/yard +++ b/gems/ast-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec('bundle', 'exec', 'rake', 'yard') +exec("bundle", "exec", "rake", "yard") diff --git a/gems/tree_haver/Gemfile.lock b/gems/tree_haver/Gemfile.lock index 7191bd2b0..3fc8fdf81 100644 --- a/gems/tree_haver/Gemfile.lock +++ b/gems/tree_haver/Gemfile.lock @@ -7,304 +7,59 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /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) + ansi (1.6.0) + appraisal2 (3.2.0) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + ast (2.4.3) + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) ast-crispr-markdown-markly (7.1.0) ast-crispr (= 7.1.0) markly-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) prism (>= 1.0) version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: ast-merge (7.1.0) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: + backports (3.25.3) bash-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - -GEM - remote: https://gem.coop/ - specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - ansi (1.6.0) - appraisal2 (3.2.0) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - 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) citrus (3.0.2) + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) cmdparse (3.0.7) commonmarker (2.9.0-aarch64-linux) commonmarker (2.9.0-aarch64-linux-musl) commonmarker (2.9.0-arm64-darwin) commonmarker (2.9.0-x86_64-linux) commonmarker (2.9.0-x86_64-linux-musl) + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -313,6 +68,11 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -362,12 +122,52 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -381,12 +181,24 @@ GEM turbo_tests2 (~> 3.1, >= 3.1.12) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) 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.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -412,9 +224,18 @@ GEM prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) psych (5.4.0) date stringio + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -423,6 +244,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) rdoc (6.17.0) erb psych (>= 4.0.0) @@ -518,6 +344,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -526,18 +356,22 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -573,6 +407,10 @@ GEM version_gem (~> 1.1, >= 1.1.13) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) @@ -596,6 +434,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.13) + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) yard (0.9.45) yard-fence (0.9.6) rdoc (>= 6.11, < 8) @@ -608,7 +450,7 @@ GEM yard yard-relative_markdown_links (0.6.0) nokogiri (>= 1.14.3, < 2) - yard-timekeeper (0.2.3) + yard-timekeeper (0.2.4) version_gem (~> 1.1, >= 1.1.13) yard-yaml (0.2.3) version_gem (~> 1.1, >= 1.1.13) @@ -628,45 +470,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem (>= 7.0) + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -675,27 +496,20 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml (~> 0.3) - toml-merge! toml-rb (~> 4.1) tree_haver! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -706,13 +520,10 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) @@ -729,6 +540,7 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -742,17 +554,16 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -776,8 +587,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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 @@ -821,15 +630,15 @@ 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -852,7 +661,6 @@ CHECKSUMS tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) sha256=ad6743a373eeac954c1b659b17af3aff1c82918b3ce9c9dc572a7c70ff843cdd tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -862,10 +670,9 @@ CHECKSUMS yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd yard-relative_markdown_links (0.6.0) sha256=3e5ffa85cbad9bac70bee5421774b190fb25d3bdf489323a5b3534f647d1a70e - yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 + yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 3e343c4b2a938eea6ffbf7dfd13ae48e7b36dd87 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:25:21 -0600 Subject: [PATCH 219/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../.kettle-drift.lock | 60 +- gems/ast-crispr-markdown-markly/Gemfile | 40 ++ gems/ast-crispr-markdown-markly/Gemfile.lock | 59 +- gems/ast-crispr/Gemfile.lock | 15 +- gems/markdown-merge/.kettle-drift.lock | 60 +- gems/markdown-merge/.rubocop_gradual.lock | 608 ------------------ gems/markdown-merge/Gemfile | 40 ++ gems/markdown-merge/Gemfile.lock | 404 ++++++++++-- gems/markly-merge/.kettle-drift.lock | 60 +- gems/markly-merge/Gemfile | 40 ++ gems/markly-merge/Gemfile.lock | 347 +--------- 11 files changed, 653 insertions(+), 1080 deletions(-) delete mode 100644 gems/markdown-merge/.rubocop_gradual.lock diff --git a/gems/ast-crispr-markdown-markly/.kettle-drift.lock b/gems/ast-crispr-markdown-markly/.kettle-drift.lock index d3c2a2030..98e9f541b 100644 --- a/gems/ast-crispr-markdown-markly/.kettle-drift.lock +++ b/gems/ast-crispr-markdown-markly/.kettle-drift.lock @@ -7,7 +7,8 @@ 120, 160, 200, - 240 + 240, + 280 ] } ], @@ -19,7 +20,8 @@ 131, 171, 211, - 251 + 251, + 291 ] } ], @@ -31,7 +33,8 @@ 121, 161, 201, - 241 + 241, + 281 ] } ], @@ -43,7 +46,8 @@ 133, 173, 213, - 253 + 253, + 293 ] } ], @@ -55,7 +59,8 @@ 136, 176, 216, - 256 + 256, + 296 ] } ], @@ -67,7 +72,8 @@ 122, 162, 202, - 242 + 242, + 282 ] } ], @@ -80,7 +86,8 @@ 140, 180, 220, - 260 + 260, + 300 ] } ], @@ -92,7 +99,8 @@ 141, 181, 221, - 261 + 261, + 301 ] } ], @@ -105,7 +113,8 @@ 127, 167, 207, - 247 + 247, + 287 ] } ], @@ -117,7 +126,8 @@ 150, 190, 230, - 270 + 270, + 310 ] } ], @@ -130,7 +140,8 @@ 119, 159, 199, - 239 + 239, + 279 ] } ], @@ -143,7 +154,8 @@ 149, 189, 229, - 269 + 269, + 309 ] } ], @@ -155,7 +167,8 @@ 125, 165, 205, - 245 + 245, + 285 ] } ], @@ -168,7 +181,8 @@ 132, 172, 212, - 252 + 252, + 292 ] } ], @@ -181,7 +195,8 @@ 128, 168, 208, - 248 + 248, + 288 ] } ], @@ -193,7 +208,8 @@ 126, 166, 206, - 246 + 246, + 286 ] } ], @@ -205,7 +221,8 @@ 143, 183, 223, - 263 + 263, + 303 ] } ], @@ -217,7 +234,8 @@ 142, 182, 222, - 262 + 262, + 302 ] } ], @@ -229,7 +247,8 @@ 137, 177, 217, - 257 + 257, + 297 ] } ], @@ -241,7 +260,8 @@ 146, 186, 226, - 266 + 266, + 306 ] } ], diff --git a/gems/ast-crispr-markdown-markly/Gemfile b/gems/ast-crispr-markdown-markly/Gemfile index fd20e7992..38a30deed 100644 --- a/gems/ast-crispr-markdown-markly/Gemfile +++ b/gems/ast-crispr-markdown-markly/Gemfile @@ -272,6 +272,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/ast-crispr-markdown-markly/Gemfile.lock b/gems/ast-crispr-markdown-markly/Gemfile.lock index 0e9612d0a..69b980543 100644 --- a/gems/ast-crispr-markdown-markly/Gemfile.lock +++ b/gems/ast-crispr-markdown-markly/Gemfile.lock @@ -275,6 +275,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -308,7 +324,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -363,18 +378,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -538,22 +542,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -659,9 +659,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -739,7 +739,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -760,10 +759,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -838,13 +837,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/ast-crispr/Gemfile.lock b/gems/ast-crispr/Gemfile.lock index 04588f03b..ed60004ae 100644 --- a/gems/ast-crispr/Gemfile.lock +++ b/gems/ast-crispr/Gemfile.lock @@ -16,15 +16,6 @@ PATH service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -36,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -380,7 +376,6 @@ DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) ast-crispr! - ast-merge! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) debug (>= 1.1) diff --git a/gems/markdown-merge/.kettle-drift.lock b/gems/markdown-merge/.kettle-drift.lock index d3c2a2030..98e9f541b 100644 --- a/gems/markdown-merge/.kettle-drift.lock +++ b/gems/markdown-merge/.kettle-drift.lock @@ -7,7 +7,8 @@ 120, 160, 200, - 240 + 240, + 280 ] } ], @@ -19,7 +20,8 @@ 131, 171, 211, - 251 + 251, + 291 ] } ], @@ -31,7 +33,8 @@ 121, 161, 201, - 241 + 241, + 281 ] } ], @@ -43,7 +46,8 @@ 133, 173, 213, - 253 + 253, + 293 ] } ], @@ -55,7 +59,8 @@ 136, 176, 216, - 256 + 256, + 296 ] } ], @@ -67,7 +72,8 @@ 122, 162, 202, - 242 + 242, + 282 ] } ], @@ -80,7 +86,8 @@ 140, 180, 220, - 260 + 260, + 300 ] } ], @@ -92,7 +99,8 @@ 141, 181, 221, - 261 + 261, + 301 ] } ], @@ -105,7 +113,8 @@ 127, 167, 207, - 247 + 247, + 287 ] } ], @@ -117,7 +126,8 @@ 150, 190, 230, - 270 + 270, + 310 ] } ], @@ -130,7 +140,8 @@ 119, 159, 199, - 239 + 239, + 279 ] } ], @@ -143,7 +154,8 @@ 149, 189, 229, - 269 + 269, + 309 ] } ], @@ -155,7 +167,8 @@ 125, 165, 205, - 245 + 245, + 285 ] } ], @@ -168,7 +181,8 @@ 132, 172, 212, - 252 + 252, + 292 ] } ], @@ -181,7 +195,8 @@ 128, 168, 208, - 248 + 248, + 288 ] } ], @@ -193,7 +208,8 @@ 126, 166, 206, - 246 + 246, + 286 ] } ], @@ -205,7 +221,8 @@ 143, 183, 223, - 263 + 263, + 303 ] } ], @@ -217,7 +234,8 @@ 142, 182, 222, - 262 + 262, + 302 ] } ], @@ -229,7 +247,8 @@ 137, 177, 217, - 257 + 257, + 297 ] } ], @@ -241,7 +260,8 @@ 146, 186, 226, - 266 + 266, + 306 ] } ], diff --git a/gems/markdown-merge/.rubocop_gradual.lock b/gems/markdown-merge/.rubocop_gradual.lock deleted file mode 100644 index 4f8201218..000000000 --- a/gems/markdown-merge/.rubocop_gradual.lock +++ /dev/null @@ -1,608 +0,0 @@ -{ - ".simplecov:862493710": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:1018150957": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/markdown-merge.rb:1671676898": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`markdown-merge.rb`) should use snake_case.", 5381] - ], - "lib/markdown/merge.rb:3835020687": [ - [11, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Markdown::Merge`.", 2866359175], - [11, 3, 23539, "Metrics/ModuleLength: Module has too many lines. [564/100]", 3838590514], - [22, 5, 16, "Style/Documentation: Missing top-level documentation comment for `class Markdown::Merge::ParseError`.", 362242086], - [104, 5, 990, "Metrics/MethodLength: Method has too many lines. [23/10]", 650805533], - [133, 5, 678, "Metrics/AbcSize: Assignment Branch Condition size for `match_markdown_owners` is too high. [<10, 23, 8> 26.32/17]", 2124140148], - [133, 5, 678, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `match_markdown_owners` is too high. [9/7]", 2124140148], - [133, 5, 678, "Metrics/PerceivedComplexity: Perceived complexity for `match_markdown_owners` is too high. [9/8]", 2124140148], - [146, 5, 1188, "Metrics/AbcSize: Assignment Branch Condition size for `merge_markdown` is too high. [<10, 25, 8> 28.09/17]", 3592129796], - [146, 5, 1188, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_markdown` is too high. [9/7]", 3592129796], - [146, 5, 1188, "Metrics/MethodLength: Method has too many lines. [23/10]", 3592129796], - [146, 5, 1188, "Metrics/PerceivedComplexity: Perceived complexity for `merge_markdown` is too high. [9/8]", 3592129796], - [175, 5, 513, "Metrics/MethodLength: Method has too many lines. [13/10]", 912081106], - [193, 5, 747, "Metrics/MethodLength: Method has too many lines. [16/10]", 3172863125], - [224, 5, 1513, "Metrics/AbcSize: Assignment Branch Condition size for `apply_markdown_delegated_child_outputs` is too high. [<16, 37, 9> 41.3/17]", 3320736661], - [224, 5, 1513, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_markdown_delegated_child_outputs` is too high. [10/7]", 3320736661], - [224, 5, 1513, "Metrics/MethodLength: Method has too many lines. [30/10]", 3320736661], - [224, 5, 1513, "Metrics/PerceivedComplexity: Perceived complexity for `apply_markdown_delegated_child_outputs` is too high. [10/8]", 3320736661], - [262, 5, 1058, "Metrics/MethodLength: Method has too many lines. [23/10]", 2000305522], - [289, 5, 1103, "Metrics/MethodLength: Method has too many lines. [23/10]", 2615729942], - [289, 52, 144, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3050457682], - [317, 5, 817, "Metrics/MethodLength: Method has too many lines. [13/10]", 322304706], - [322, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 2378183959], - [335, 5, 805, "Metrics/MethodLength: Method has too many lines. [13/10]", 935244360], - [340, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 2974266470], - [353, 5, 722, "Metrics/MethodLength: Method has too many lines. [12/10]", 1758487766], - [358, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 3013228499], - [370, 5, 730, "Metrics/MethodLength: Method has too many lines. [12/10]", 3297037131], - [375, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 3013228499], - [401, 5, 1584, "Metrics/AbcSize: Assignment Branch Condition size for `collect_markdown_owners` is too high. [<21, 32, 13> 40.42/17]", 572024212], - [401, 5, 1584, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_markdown_owners` is too high. [11/7]", 572024212], - [401, 5, 1584, "Metrics/MethodLength: Method has too many lines. [45/10]", 572024212], - [401, 5, 1584, "Metrics/PerceivedComplexity: Perceived complexity for `collect_markdown_owners` is too high. [11/8]", 572024212], - [455, 5, 1147, "Metrics/AbcSize: Assignment Branch Condition size for `markdown_owner_start_indices` is too high. [<21, 22, 11> 32.34/17]", 12516264], - [455, 5, 1147, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `markdown_owner_start_indices` is too high. [9/7]", 12516264], - [455, 5, 1147, "Metrics/MethodLength: Method has too many lines. [33/10]", 12516264], - [455, 5, 1147, "Metrics/PerceivedComplexity: Perceived complexity for `markdown_owner_start_indices` is too high. [9/8]", 12516264], - [496, 5, 602, "Metrics/AbcSize: Assignment Branch Condition size for `collect_markdown_sections` is too high. [<9, 20, 6> 22.74/17]", 1946206422], - [496, 5, 602, "Metrics/MethodLength: Method has too many lines. [14/10]", 1946206422], - [504, 7, 11, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 848344986], - [515, 5, 1097, "Metrics/AbcSize: Assignment Branch Condition size for `markdown_fence_ranges` is too high. [<19, 21, 11> 30.38/17]", 2035260313], - [515, 5, 1097, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `markdown_fence_ranges` is too high. [8/7]", 2035260313], - [515, 5, 1097, "Metrics/MethodLength: Method has too many lines. [31/10]", 2035260313], - [531, 13, 227, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 1054958538], - [553, 5, 323, "Metrics/MethodLength: Method has too many lines. [14/10]", 2041170985], - [589, 5, 525, "Metrics/MethodLength: Method has too many lines. [11/10]", 1507618315] - ], - "lib/markdown/merge/backend_support.rb:1723133349": [ - [6, 5, 6677, "Metrics/ModuleLength: Module has too many lines. [151/100]", 1497234257], - [18, 7, 524, "Metrics/MethodLength: Method has too many lines. [13/10]", 2550700841], - [34, 7, 913, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `configure_markdown_only_language_class!` is too high. [9/7]", 2175633707], - [34, 7, 913, "Metrics/MethodLength: Method has too many lines. [14/10]", 2175633707], - [34, 7, 913, "Metrics/PerceivedComplexity: Perceived complexity for `configure_markdown_only_language_class!` is too high. [10/8]", 2175633707], - [37, 11, 658, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [9/7]", 353826273], - [37, 11, 658, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [10/8]", 353826273], - [44, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1312231069], - [54, 7, 1263, "Metrics/AbcSize: Assignment Branch Condition size for `configure_node_link_and_navigation!` is too high. [<3, 28, 3> 28.32/17]", 122101535], - [54, 7, 1263, "Metrics/MethodLength: Method has too many lines. [20/10]", 122101535], - [98, 7, 976, "Metrics/MethodLength: Method has too many lines. [24/10]", 2694447150], - [132, 7, 618, "Metrics/MethodLength: Method has too many lines. [11/10]", 2027069469], - [150, 7, 888, "Metrics/MethodLength: Method has too many lines. [21/10]", 3721642530] - ], - "lib/markdown/merge/cleanse/block_spacing.rb:2917446564": [ - [32, 7, 7186, "Metrics/ClassLength: Class has too many lines. [138/100]", 1732896955], - [132, 9, 465, "Metrics/AbcSize: Assignment Branch Condition size for `fix` is too high. [<6, 16, 5> 17.8/17]", 341373851], - [150, 9, 1964, "Metrics/AbcSize: Assignment Branch Condition size for `analyze` is too high. [<9, 25, 16> 31.02/17]", 2558819309], - [150, 9, 1964, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `analyze` is too high. [14/7]", 2558819309], - [150, 9, 1964, "Metrics/MethodLength: Method has too many lines. [23/10]", 2558819309], - [150, 9, 1964, "Metrics/PerceivedComplexity: Perceived complexity for `analyze` is too high. [14/8]", 2558819309], - [160, 25, 7, "Style/NumericPredicate: Use `idx.positive?` instead of `idx > 0`.", 1825176542], - [192, 40, 20, "Style/NumericPredicate: Use `html_block_depth.positive?` instead of `html_block_depth > 0`.", 3208734130] - ], - "lib/markdown/merge/cleanse/code_fence_spacing.rb:1353147449": [ - [161, 9, 1524, "Metrics/AbcSize: Assignment Branch Condition size for `code_blocks` is too high. [<18, 20, 12> 29.46/17]", 2467942971], - [161, 9, 1524, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `code_blocks` is too high. [12/7]", 2467942971], - [161, 9, 1524, "Metrics/MethodLength: Method has too many lines. [35/10]", 2467942971], - [161, 9, 1524, "Metrics/PerceivedComplexity: Perceived complexity for `code_blocks` is too high. [12/8]", 2467942971], - [169, 11, 1293, "Metrics/BlockLength: Block has too many lines. [27/25]", 3238939023], - [249, 9, 884, "Metrics/AbcSize: Assignment Branch Condition size for `parse_fence_line` is too high. [<7, 15, 6> 17.61/17]", 1033947369], - [249, 9, 884, "Metrics/MethodLength: Method has too many lines. [19/10]", 1033947369] - ], - "lib/markdown/merge/cleanse/condensed_link_refs.rb:3659937794": [ - [85, 7, 12174, "Metrics/ClassLength: Class has too many lines. [115/100]", 3309007721], - [200, 9, 874, "Metrics/AbcSize: Assignment Branch Condition size for `definitions` is too high. [<6, 14, 10> 18.22/17]", 1976258109], - [200, 9, 874, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `definitions` is too high. [9/7]", 1976258109], - [200, 9, 874, "Metrics/MethodLength: Method has too many lines. [13/10]", 1976258109], - [200, 9, 874, "Metrics/PerceivedComplexity: Perceived complexity for `definitions` is too high. [9/8]", 1976258109], - [213, 43, 17, "Style/NumericPredicate: Use `first_bracket.positive?` instead of `first_bracket > 0`.", 1095960710], - [273, 13, 30, "Naming/PredicatePrefix: Rename `has_content_before_definition?` to `content_before_definition?`.", 213744570], - [298, 9, 997, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_line` is too high. [9/7]", 2139717575], - [298, 9, 997, "Metrics/MethodLength: Method has too many lines. [13/10]", 2139717575], - [298, 9, 997, "Metrics/PerceivedComplexity: Perceived complexity for `parse_line` is too high. [9/8]", 2139717575], - [352, 9, 1214, "Metrics/AbcSize: Assignment Branch Condition size for `expand_line` is too high. [<10, 20, 17> 28.09/17]", 149412459], - [352, 9, 1214, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `expand_line` is too high. [14/7]", 149412459], - [352, 9, 1214, "Metrics/MethodLength: Method has too many lines. [21/10]", 149412459], - [352, 9, 1214, "Metrics/PerceivedComplexity: Perceived complexity for `expand_line` is too high. [15/8]", 149412459], - [358, 37, 17, "Style/NumericPredicate: Use `first_bracket.positive?` instead of `first_bracket > 0`.", 1095960710] - ], - "lib/markdown/merge/cleanse/templating_corruption.rb:3945009912": [ - [59, 9, 384, "Metrics/AbcSize: Assignment Branch Condition size for `append_issues` is too high. [<0, 17, 2> 17.12/17]", 2550677275] - ], - "lib/markdown/merge/code_block_merger.rb:1362562532": [ - [32, 5, 27618, "Metrics/ClassLength: Class has too many lines. [554/100]", 1891552237], - [120, 7, 543, "Metrics/MethodLength: Method has too many lines. [11/10]", 625040368], - [120, 28, 92, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3691835500], - [135, 7, 666, "Metrics/MethodLength: Method has too many lines. [13/10]", 4153783419], - [156, 7, 2796, "Metrics/AbcSize: Assignment Branch Condition size for `merge_code_blocks_with_runtime` is too high. [<5, 52, 11> 53.39/17]", 4194925058], - [156, 7, 2796, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_code_blocks_with_runtime` is too high. [10/7]", 4194925058], - [156, 7, 2796, "Metrics/MethodLength: Method has too many lines. [63/10]", 4194925058], - [156, 7, 2796, "Metrics/PerceivedComplexity: Perceived complexity for `merge_code_blocks_with_runtime` is too high. [12/8]", 4194925058], - [156, 41, 125, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1827509670], - [227, 7, 1778, "Metrics/AbcSize: Assignment Branch Condition size for `build_runtime_operation` is too high. [<3, 24, 4> 24.52/17]", 3746845105], - [227, 7, 1778, "Metrics/MethodLength: Method has too many lines. [31/10]", 3746845105], - [227, 34, 86, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3153149164], - [239, 39, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [290, 7, 528, "Metrics/MethodLength: Method has too many lines. [14/10]", 3045714289], - [307, 7, 2407, "Metrics/AbcSize: Assignment Branch Condition size for `merge_runtime_surface` is too high. [<1, 50, 7> 50.5/17]", 3818534251], - [307, 7, 2407, "Metrics/MethodLength: Method has too many lines. [53/10]", 3818534251], - [365, 7, 2502, "Metrics/AbcSize: Assignment Branch Condition size for `perform_code_block_merge` is too high. [<8, 34, 16> 38.42/17]", 3120245149], - [365, 7, 2502, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `perform_code_block_merge` is too high. [14/7]", 3120245149], - [365, 7, 2502, "Metrics/MethodLength: Method has too many lines. [57/10]", 3120245149], - [365, 7, 2502, "Metrics/PerceivedComplexity: Perceived complexity for `perform_code_block_merge` is too high. [16/8]", 3120245149], - [365, 35, 83, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2137984385], - [435, 7, 1289, "Metrics/MethodLength: Method has too many lines. [33/10]", 3304634912], - [435, 43, 154, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2516842130], - [473, 7, 755, "Metrics/MethodLength: Method has too many lines. [15/10]", 2207072637], - [473, 35, 127, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2610889879], - [492, 38, 167, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 372116680], - [492, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193417996], - [506, 37, 166, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 321759336], - [506, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861061], - [547, 19, 20, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 3860798338], - [574, 9, 109, "Lint/RescueException: Avoid rescuing the `Exception` class. Perhaps you meant to rescue `StandardError`?", 2421726137], - [575, 21, 50, "Style/ClassEqualityComparison: Use `instance_of?(::RSpec::Mocks::MockExpectationError)` instead of comparing classes.", 952914844], - [592, 9, 797, "Metrics/MethodLength: Method has too many lines. [18/10]", 4001935536], - [622, 9, 800, "Metrics/MethodLength: Method has too many lines. [18/10]", 2519636656], - [652, 9, 798, "Metrics/MethodLength: Method has too many lines. [18/10]", 2048436912], - [680, 9, 1160, "Metrics/MethodLength: Method has too many lines. [26/10]", 45677001], - [718, 9, 798, "Metrics/MethodLength: Method has too many lines. [18/10]", 3475080240] - ], - "lib/markdown/merge/comment_tracker.rb:167569374": [ - [19, 7, 374, "Metrics/MethodLength: Method has too many lines. [11/10]", 3280949001] - ], - "lib/markdown/merge/conflict_resolver.rb:686298490": [ - [29, 5, 6207, "Metrics/ClassLength: Class has too many lines. [122/100]", 3761260950], - [57, 7, 1217, "Metrics/MethodLength: Method has too many lines. [32/10]", 3372247297], - [57, 55, 14, "Lint/UnusedMethodArgument: Unused method argument - `template_index`.", 1809801172], - [57, 72, 10, "Lint/UnusedMethodArgument: Unused method argument - `dest_index`.", 2703999490], - [112, 7, 1811, "Metrics/AbcSize: Assignment Branch Condition size for `unresolved_resolution` is too high. [<6, 22, 5> 23.35/17]", 391291522], - [112, 7, 1811, "Metrics/MethodLength: Method has too many lines. [39/10]", 391291522], - [161, 7, 605, "Metrics/MethodLength: Method has too many lines. [12/10]", 577293020] - ], - "lib/markdown/merge/file_aligner.rb:841305081": [ - [27, 5, 19046, "Metrics/ClassLength: Class has too many lines. [364/100]", 3915220059], - [57, 7, 1853, "Metrics/AbcSize: Assignment Branch Condition size for `apply_match_refiner!` is too high. [<13, 31, 14> 36.41/17]", 3500652553], - [57, 7, 1853, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_match_refiner!` is too high. [15/7]", 3500652553], - [57, 7, 1853, "Metrics/MethodLength: Method has too many lines. [35/10]", 3500652553], - [57, 7, 1853, "Metrics/PerceivedComplexity: Perceived complexity for `apply_match_refiner!` is too high. [15/8]", 3500652553], - [112, 7, 312, "Metrics/MethodLength: Method has too many lines. [11/10]", 2670750985], - [132, 9, 46, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 4265307642], - [133, 11, 78, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1464832319], - [139, 7, 644, "Metrics/AbcSize: Assignment Branch Condition size for `build_heading_owner_paths` is too high. [<8, 20, 8> 22.98/17]", 2892981198], - [139, 7, 644, "Metrics/MethodLength: Method has too many lines. [13/10]", 2892981198], - [176, 7, 1056, "Metrics/AbcSize: Assignment Branch Condition size for `adjacent_section_hijack_repair_compatible?` is too high. [<4, 25, 8> 26.55/17]", 2068902935], - [176, 7, 1056, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `adjacent_section_hijack_repair_compatible?` is too high. [8/7]", 2068902935], - [176, 7, 1056, "Metrics/MethodLength: Method has too many lines. [11/10]", 2068902935], - [204, 7, 685, "Metrics/MethodLength: Method has too many lines. [12/10]", 3293058437], - [221, 7, 762, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `next_same_owner_match_for_template_only_entry` is too high. [8/7]", 681984620], - [250, 7, 829, "Metrics/MethodLength: Method has too many lines. [15/10]", 3104261185], - [309, 7, 759, "Metrics/MethodLength: Method has too many lines. [11/10]", 4043392433], - [342, 7, 540, "Metrics/AbcSize: Assignment Branch Condition size for `synthetic_section_label_paragraph?` is too high. [<3, 15, 11> 18.84/17]", 569218077], - [342, 7, 540, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `synthetic_section_label_paragraph?` is too high. [9/7]", 569218077], - [342, 7, 540, "Metrics/PerceivedComplexity: Perceived complexity for `synthetic_section_label_paragraph?` is too high. [9/8]", 569218077], - [347, 38, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [385, 47, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [385, 85, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [429, 7, 792, "Metrics/AbcSize: Assignment Branch Condition size for `neighboring_heading_signatures` is too high. [<7, 17, 8> 20.05/17]", 653610323], - [429, 7, 792, "Metrics/MethodLength: Method has too many lines. [14/10]", 653610323], - [466, 7, 879, "Metrics/AbcSize: Assignment Branch Condition size for `first_list_item_anchor` is too high. [<6, 22, 9> 24.52/17]", 1144304252], - [466, 7, 879, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `first_list_item_anchor` is too high. [9/7]", 1144304252], - [466, 7, 879, "Metrics/MethodLength: Method has too many lines. [21/10]", 1144304252], - [466, 7, 879, "Metrics/PerceivedComplexity: Perceived complexity for `first_list_item_anchor` is too high. [10/8]", 1144304252] - ], - "lib/markdown/merge/file_analysis.rb:1169434297": [ - [41, 5, 12695, "Metrics/ClassLength: Class has too many lines. [183/100]", 3122418242], - [168, 7, 2960, "Metrics/AbcSize: Assignment Branch Condition size for `compute_parser_signature` is too high. [<13, 36, 18> 42.3/17]", 1002271909], - [168, 7, 2960, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_parser_signature` is too high. [17/7]", 1002271909], - [168, 7, 2960, "Metrics/MethodLength: Method has too many lines. [42/10]", 1002271909], - [168, 7, 2960, "Metrics/PerceivedComplexity: Perceived complexity for `compute_parser_signature` is too high. [11/8]", 1002271909], - [290, 7, 777, "Metrics/MethodLength: Method has too many lines. [14/10]", 1287754637], - [328, 7, 558, "Metrics/MethodLength: Method has too many lines. [15/10]", 3417342515] - ], - "lib/markdown/merge/file_analysis_base.rb:678024820": [ - [37, 5, 26494, "Metrics/ClassLength: Class has too many lines. [405/100]", 2769422452], - [60, 7, 1360, "Metrics/MethodLength: Method has too many lines. [18/10]", 90913983], - [261, 7, 3539, "Metrics/AbcSize: Assignment Branch Condition size for `compute_parser_signature` is too high. [<16, 43, 19> 49.66/17]", 3466910865], - [261, 7, 3539, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_parser_signature` is too high. [18/7]", 3466910865], - [261, 7, 3539, "Metrics/MethodLength: Method has too many lines. [45/10]", 3466910865], - [261, 7, 3539, "Metrics/PerceivedComplexity: Perceived complexity for `compute_parser_signature` is too high. [11/8]", 3466910865], - [467, 7, 1153, "Metrics/AbcSize: Assignment Branch Condition size for `collect_top_level_nodes_with_gaps` is too high. [<10, 16, 7> 20.12/17]", 2190890907], - [467, 7, 1153, "Metrics/MethodLength: Method has too many lines. [18/10]", 2190890907], - [524, 7, 944, "Metrics/AbcSize: Assignment Branch Condition size for `integrate_gap_nodes` is too high. [<10, 14, 9> 19.42/17]", 2618792164], - [524, 7, 944, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `integrate_gap_nodes` is too high. [9/7]", 2618792164], - [524, 7, 944, "Metrics/MethodLength: Method has too many lines. [17/10]", 2618792164], - [524, 7, 944, "Metrics/PerceivedComplexity: Perceived complexity for `integrate_gap_nodes` is too high. [9/8]", 2618792164], - [536, 50, 7, "Style/NumericPredicate: Use `idx.positive?` instead of `idx > 0`.", 1825176542], - [565, 7, 2225, "Metrics/AbcSize: Assignment Branch Condition size for `find_freeze_markers` is too high. [<16, 30, 15> 37.16/17]", 263815919], - [565, 7, 2225, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_freeze_markers` is too high. [16/7]", 263815919], - [565, 7, 2225, "Metrics/MethodLength: Method has too many lines. [39/10]", 263815919], - [565, 7, 2225, "Metrics/PerceivedComplexity: Perceived complexity for `find_freeze_markers` is too high. [16/8]", 263815919], - [588, 15, 101, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 2762675417], - [611, 23, 26, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 2775329597], - [630, 7, 708, "Metrics/MethodLength: Method has too many lines. [19/10]", 1535336850], - [663, 7, 859, "Metrics/MethodLength: Method has too many lines. [19/10]", 1633852183], - [706, 7, 595, "Metrics/MethodLength: Method has too many lines. [14/10]", 2922601775], - [730, 7, 1145, "Metrics/AbcSize: Assignment Branch Condition size for `integrate_nodes_with_freeze_blocks` is too high. [<12, 17, 16> 26.25/17]", 2481642790], - [730, 7, 1145, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `integrate_nodes_with_freeze_blocks` is too high. [13/7]", 2481642790], - [730, 7, 1145, "Metrics/MethodLength: Method has too many lines. [22/10]", 2481642790], - [730, 7, 1145, "Metrics/PerceivedComplexity: Perceived complexity for `integrate_nodes_with_freeze_blocks` is too high. [13/8]", 2481642790] - ], - "lib/markdown/merge/freeze_node.rb:2861044075": [ - [39, 21, 86, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 4263110221] - ], - "lib/markdown/merge/gap_line_node.rb:2230943204": [ - [40, 7, 461, "Metrics/MethodLength: Method has too many lines. [11/10]", 1038026861], - [75, 7, 1087, "Metrics/MethodLength: Method has too many lines. [17/10]", 690589617], - [75, 7, 1087, "Metrics/PerceivedComplexity: Perceived complexity for `signature` is too high. [10/8]", 690589617], - [76, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] - ], - "lib/markdown/merge/link_definition_node.rb:526538026": [ - [54, 7, 413, "Metrics/MethodLength: Method has too many lines. [11/10]", 449561622] - ], - "lib/markdown/merge/link_parser.rb:1096919687": [ - [30, 5, 12509, "Metrics/ClassLength: Class has too many lines. [179/100]", 1758727291], - [168, 7, 459, "Metrics/MethodLength: Method has too many lines. [11/10]", 518494532], - [239, 7, 945, "Metrics/AbcSize: Assignment Branch Condition size for `build_link_tree` is too high. [<12, 18, 13> 25.24/17]", 3590515429], - [239, 7, 945, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_link_tree` is too high. [10/7]", 3590515429], - [239, 7, 945, "Metrics/MethodLength: Method has too many lines. [19/10]", 3590515429], - [239, 7, 945, "Metrics/PerceivedComplexity: Perceived complexity for `build_link_tree` is too high. [10/8]", 3590515429], - [297, 7, 738, "Metrics/AbcSize: Assignment Branch Condition size for `find_constructs` is too high. [<9, 9, 15> 19.67/17]", 1944426624], - [297, 7, 738, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_constructs` is too high. [9/7]", 1944426624], - [297, 7, 738, "Metrics/MethodLength: Method has too many lines. [20/10]", 1944426624], - [297, 7, 738, "Metrics/PerceivedComplexity: Perceived complexity for `find_constructs` is too high. [10/8]", 1944426624], - [308, 31, 7, "Style/NumericPredicate: Use `idx.positive?` instead of `idx > 0`.", 1825176542], - [326, 7, 1492, "Metrics/AbcSize: Assignment Branch Condition size for `try_parse_construct_at` is too high. [<7, 26, 13> 29.9/17]", 751157862], - [326, 7, 1492, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `try_parse_construct_at` is too high. [9/7]", 751157862], - [326, 7, 1492, "Metrics/MethodLength: Method has too many lines. [32/10]", 751157862], - [326, 7, 1492, "Metrics/PerceivedComplexity: Perceived complexity for `try_parse_construct_at` is too high. [10/8]", 751157862], - [371, 7, 332, "Metrics/MethodLength: Method has too many lines. [13/10]", 766454795], - [381, 27, 10, "Style/NumericPredicate: Use `depth.zero?` instead of `depth == 0`.", 3245914040], - [389, 7, 679, "Metrics/AbcSize: Assignment Branch Condition size for `find_paren_end` is too high. [<12, 5, 12> 17.69/17]", 3435642705], - [389, 7, 679, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_paren_end` is too high. [10/7]", 3435642705], - [389, 7, 679, "Metrics/MethodLength: Method has too many lines. [24/10]", 3435642705], - [389, 7, 679, "Metrics/PerceivedComplexity: Perceived complexity for `find_paren_end` is too high. [10/8]", 3435642705], - [410, 29, 10, "Style/NumericPredicate: Use `depth.zero?` instead of `depth == 0`.", 3245914040] - ], - "lib/markdown/merge/link_reference_rehydrator.rb:2522597032": [ - [28, 5, 10014, "Metrics/ClassLength: Class has too many lines. [171/100]", 3685995823], - [89, 7, 955, "Metrics/AbcSize: Assignment Branch Condition size for `rehydrate` is too high. [<6, 21, 4> 22.2/17]", 4193701], - [89, 7, 955, "Metrics/MethodLength: Method has too many lines. [12/10]", 4193701], - [138, 7, 1280, "Metrics/MethodLength: Method has too many lines. [20/10]", 2243922075], - [138, 7, 1280, "Metrics/PerceivedComplexity: Perceived complexity for `collect_nested_replacements` is too high. [10/8]", 2243922075], - [181, 7, 1844, "Metrics/AbcSize: Assignment Branch Condition size for `process_parent_with_children` is too high. [<11, 30, 10> 33.48/17]", 1412317448], - [181, 7, 1844, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `process_parent_with_children` is too high. [9/7]", 1412317448], - [181, 7, 1844, "Metrics/MethodLength: Method has too many lines. [29/10]", 1412317448], - [181, 7, 1844, "Metrics/PerceivedComplexity: Perceived complexity for `process_parent_with_children` is too high. [9/8]", 1412317448], - [230, 7, 672, "Metrics/AbcSize: Assignment Branch Condition size for `build_definition_maps` is too high. [<18, 18, 5> 25.94/17]", 2626750147], - [230, 7, 672, "Metrics/MethodLength: Method has too many lines. [15/10]", 2626750147], - [265, 7, 594, "Metrics/MethodLength: Method has too many lines. [21/10]", 1835317302], - [292, 7, 598, "Metrics/MethodLength: Method has too many lines. [21/10]", 1975952876] - ], - "lib/markdown/merge/list_match_refiner.rb:2863813265": [ - [28, 7, 760, "Metrics/AbcSize: Assignment Branch Condition size for `compute_similarity` is too high. [<6, 20, 4> 21.26/17]", 4078625426], - [28, 7, 760, "Metrics/MethodLength: Method has too many lines. [13/10]", 4078625426] - ], - "lib/markdown/merge/list_merger.rb:1304801063": [ - [33, 5, 10963, "Metrics/ClassLength: Class has too many lines. [214/100]", 602699468], - [48, 7, 1267, "Metrics/MethodLength: Method has too many lines. [22/10]", 3289445396], - [48, 22, 295, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 992893951], - [76, 20, 23, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 1178765246], - [86, 7, 474, "Metrics/MethodLength: Method has too many lines. [14/10]", 3392803095], - [110, 7, 2384, "Metrics/AbcSize: Assignment Branch Condition size for `align_items` is too high. [<29, 55, 24> 66.65/17]", 452537823], - [110, 7, 2384, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `align_items` is too high. [22/7]", 452537823], - [110, 7, 2384, "Metrics/MethodLength: Method has too many lines. [44/10]", 452537823], - [110, 7, 2384, "Metrics/PerceivedComplexity: Perceived complexity for `align_items` is too high. [23/8]", 452537823], - [179, 7, 2546, "Metrics/AbcSize: Assignment Branch Condition size for `emit_lines` is too high. [<24, 40, 13> 48.43/17]", 2868796461], - [179, 7, 2546, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_lines` is too high. [10/7]", 2868796461], - [179, 7, 2546, "Metrics/MethodLength: Method has too many lines. [48/10]", 2868796461], - [179, 7, 2546, "Metrics/PerceivedComplexity: Perceived complexity for `emit_lines` is too high. [9/8]", 2868796461], - [179, 21, 167, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3110781545], - [186, 9, 2214, "Metrics/BlockLength: Block has too many lines. [41/25]", 27504812], - [267, 7, 1113, "Metrics/MethodLength: Method has too many lines. [21/10]", 2701858480], - [267, 32, 165, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 4189168652] - ], - "lib/markdown/merge/merge_result.rb:3204455982": [ - [35, 5, 18456, "Metrics/ClassLength: Class has too many lines. [336/100]", 549816393], - [47, 21, 99, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1708164346], - [99, 11, 18, "Naming/PredicatePrefix: Rename `has_frozen_blocks?` to `frozen_blocks?`.", 2714608976], - [174, 7, 987, "Metrics/MethodLength: Method has too many lines. [14/10]", 199512025], - [178, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 2749193064], - [197, 7, 719, "Metrics/MethodLength: Method has too many lines. [11/10]", 3478479763], - [214, 7, 3130, "Metrics/AbcSize: Assignment Branch Condition size for `apply_grouped_delegated_block!` is too high. [<37, 72, 21> 83.63/17]", 3965639779], - [214, 7, 3130, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_grouped_delegated_block!` is too high. [21/7]", 3965639779], - [214, 7, 3130, "Metrics/MethodLength: Method has too many lines. [49/10]", 3965639779], - [214, 7, 3130, "Metrics/PerceivedComplexity: Perceived complexity for `apply_grouped_delegated_block!` is too high. [21/8]", 3965639779], - [218, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 2758428109], - [227, 9, 22, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 3561198282], - [232, 9, 22, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 3561198282], - [237, 9, 22, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 3561198282], - [267, 7, 956, "Metrics/AbcSize: Assignment Branch Condition size for `apply_output_range_resolutions_descending!` is too high. [<8, 26, 8> 28.35/17]", 410698269], - [267, 7, 956, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_output_range_resolutions_descending!` is too high. [8/7]", 410698269], - [267, 7, 956, "Metrics/MethodLength: Method has too many lines. [13/10]", 410698269], - [269, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1650842885], - [304, 7, 1607, "Metrics/AbcSize: Assignment Branch Condition size for `remap_delegated_cases_after_apply` is too high. [<5, 20, 1> 20.64/17]", 2805002106], - [304, 7, 1607, "Metrics/MethodLength: Method has too many lines. [25/10]", 2805002106], - [304, 44, 174, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2563452319], - [352, 7, 664, "Metrics/MethodLength: Method has too many lines. [13/10]", 2283269648], - [402, 7, 605, "Metrics/MethodLength: Method has too many lines. [12/10]", 219211686], - [418, 7, 622, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `sanitize_review_state_metadata` is too high. [8/7]", 656017698], - [418, 7, 622, "Metrics/MethodLength: Method has too many lines. [16/10]", 656017698], - [439, 7, 1110, "Metrics/AbcSize: Assignment Branch Condition size for `validate_review_state_compatibility!` is too high. [<7, 18, 13> 23.28/17]", 3899925007], - [439, 7, 1110, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_review_state_compatibility!` is too high. [11/7]", 3899925007], - [439, 7, 1110, "Metrics/MethodLength: Method has too many lines. [18/10]", 3899925007], - [439, 7, 1110, "Metrics/PerceivedComplexity: Perceived complexity for `validate_review_state_compatibility!` is too high. [11/8]", 3899925007], - [453, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 2530059826], - [460, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861331] - ], - "lib/markdown/merge/output_builder.rb:48145848": [ - [23, 5, 8640, "Metrics/ClassLength: Class has too many lines. [115/100]", 1155429967], - [47, 7, 2071, "Metrics/AbcSize: Assignment Branch Condition size for `add_node_source` is too high. [<6, 15, 12> 20.12/17]", 555854176], - [47, 7, 2071, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `add_node_source` is too high. [12/7]", 555854176], - [47, 7, 2071, "Metrics/MethodLength: Method has too many lines. [15/10]", 555854176], - [47, 7, 2071, "Metrics/PerceivedComplexity: Perceived complexity for `add_node_source` is too high. [12/8]", 555854176], - [60, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 527167630], - [61, 121, 67, "Layout/LineLength: Line is too long. [187/120]", 2893319489], - [62, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 2876999963], - [63, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 4139918410], - [92, 38, 9, "Style/NumericPredicate: Use `count.positive?` instead of `count > 0`.", 3986027816], - [122, 7, 370, "Metrics/MethodLength: Method has too many lines. [11/10]", 616591631], - [224, 7, 878, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_parser_node_source` is too high. [10/7]", 227721314], - [224, 7, 878, "Metrics/MethodLength: Method has too many lines. [13/10]", 227721314], - [224, 7, 878, "Metrics/PerceivedComplexity: Perceived complexity for `extract_parser_node_source` is too high. [11/8]", 227721314] - ], - "lib/markdown/merge/partial_template_merger.rb:3110525012": [ - [32, 5, 20691, "Metrics/ClassLength: Class has too many lines. [336/100]", 496419120], - [71, 7, 1040, "Metrics/MethodLength: Method has too many lines. [17/10]", 2144648319], - [71, 21, 417, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 1226086326], - [109, 7, 1065, "Metrics/AbcSize: Assignment Branch Condition size for `merge` is too high. [<7, 19, 6> 21.12/17]", 3976180000], - [109, 7, 1065, "Metrics/MethodLength: Method has too many lines. [25/10]", 3976180000], - [145, 7, 912, "Metrics/MethodLength: Method has too many lines. [15/10]", 2077585004], - [265, 7, 1401, "Metrics/AbcSize: Assignment Branch Condition size for `find_section_end` is too high. [<8, 28, 11> 31.13/17]", 1420600674], - [265, 7, 1401, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_section_end` is too high. [10/7]", 1420600674], - [265, 7, 1401, "Metrics/MethodLength: Method has too many lines. [20/10]", 1420600674], - [265, 7, 1401, "Metrics/PerceivedComplexity: Perceived complexity for `find_section_end` is too high. [10/8]", 1420600674], - [311, 7, 1101, "Metrics/AbcSize: Assignment Branch Condition size for `node_to_source` is too high. [<6, 15, 15> 22.05/17]", 3635207151], - [311, 7, 1101, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `node_to_source` is too high. [13/7]", 3635207151], - [311, 7, 1101, "Metrics/MethodLength: Method has too many lines. [20/10]", 3635207151], - [311, 7, 1101, "Metrics/PerceivedComplexity: Perceived complexity for `node_to_source` is too high. [14/8]", 3635207151], - [318, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [323, 42, 14, "Style/NumericPredicate: Use `start_line.positive?` instead of `start_line > 0`.", 792111162], - [345, 7, 643, "Metrics/MethodLength: Method has too many lines. [17/10]", 998852567], - [364, 34, 10, "Style/NumericPredicate: Use `value.zero?` instead of `value == 0`.", 4076387742], - [367, 7, 2760, "Metrics/AbcSize: Assignment Branch Condition size for `preserved_destination_insertions` is too high. [<19, 28, 14> 36.62/17]", 414221184], - [367, 7, 2760, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preserved_destination_insertions` is too high. [13/7]", 414221184], - [367, 7, 2760, "Metrics/MethodLength: Method has too many lines. [49/10]", 414221184], - [367, 7, 2760, "Metrics/PerceivedComplexity: Perceived complexity for `preserved_destination_insertions` is too high. [15/8]", 414221184], - [381, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 682972477], - [426, 7, 1058, "Metrics/MethodLength: Method has too many lines. [16/10]", 932075153], - [475, 7, 1040, "Metrics/AbcSize: Assignment Branch Condition size for `render_template_with_preserved_insertions` is too high. [<10, 18, 10> 22.89/17]", 1699694974], - [475, 7, 1040, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `render_template_with_preserved_insertions` is too high. [9/7]", 1699694974], - [475, 7, 1040, "Metrics/MethodLength: Method has too many lines. [21/10]", 1699694974], - [475, 7, 1040, "Metrics/PerceivedComplexity: Perceived complexity for `render_template_with_preserved_insertions` is too high. [9/8]", 1699694974], - [504, 7, 454, "Metrics/MethodLength: Method has too many lines. [12/10]", 3433907112] - ], - "lib/markdown/merge/preservation_support.rb:3687269889": [ - [13, 5, 10105, "Metrics/ModuleLength: Module has too many lines. [212/100]", 674454], - [24, 7, 572, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `standalone_comment_node?` is too high. [9/7]", 349869031], - [24, 7, 572, "Metrics/PerceivedComplexity: Perceived complexity for `standalone_comment_node?` is too high. [9/8]", 349869031], - [116, 7, 655, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `remove_plan_preserved_comment_regions` is too high. [8/7]", 2103873816], - [116, 7, 655, "Metrics/MethodLength: Method has too many lines. [12/10]", 2103873816], - [178, 7, 1301, "Metrics/AbcSize: Assignment Branch Condition size for `remove_plan_comment_insertion_specs` is too high. [<5, 22, 8> 23.94/17]", 698043371], - [178, 7, 1301, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `remove_plan_comment_insertion_specs` is too high. [9/7]", 698043371], - [178, 7, 1301, "Metrics/MethodLength: Method has too many lines. [22/10]", 698043371], - [178, 7, 1301, "Metrics/PerceivedComplexity: Perceived complexity for `remove_plan_comment_insertion_specs` is too high. [9/8]", 698043371], - [193, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045570401], - [217, 7, 737, "Metrics/MethodLength: Method has too many lines. [13/10]", 3882071587], - [248, 28, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [271, 7, 704, "Metrics/MethodLength: Method has too many lines. [13/10]", 2605835865], - [271, 52, 139, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1766111143] - ], - "lib/markdown/merge/smart_merger.rb:1245982439": [ - [151, 7, 1405, "Metrics/MethodLength: Method has too many lines. [19/10]", 2830703815], - [151, 21, 501, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [13/5]", 1104874368], - [229, 7, 1140, "Metrics/AbcSize: Assignment Branch Condition size for `node_to_source` is too high. [<5, 15, 9> 18.19/17]", 1515173572], - [229, 7, 1140, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `node_to_source` is too high. [9/7]", 1515173572], - [229, 7, 1140, "Metrics/MethodLength: Method has too many lines. [13/10]", 1515173572], - [229, 7, 1140, "Metrics/PerceivedComplexity: Perceived complexity for `node_to_source` is too high. [10/8]", 1515173572] - ], - "lib/markdown/merge/smart_merger_base.rb:950545235": [ - [43, 5, 59104, "Metrics/ClassLength: Class has too many lines. [984/100]", 1046238359], - [148, 7, 3731, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<20, 19, 10> 29.34/17]", 50319656], - [148, 7, 3731, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `initialize` is too high. [11/7]", 50319656], - [148, 7, 3731, "Metrics/MethodLength: Method has too many lines. [66/10]", 50319656], - [148, 7, 3731, "Metrics/PerceivedComplexity: Perceived complexity for `initialize` is too high. [9/8]", 50319656], - [148, 21, 606, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [17/5]", 4006929896], - [294, 7, 1760, "Metrics/AbcSize: Assignment Branch Condition size for `merge_result` is too high. [<15, 19, 7> 25.2/17]", 3628731818], - [294, 7, 1760, "Metrics/MethodLength: Method has too many lines. [31/10]", 3628731818], - [297, 25, 1662, "Metrics/BlockLength: Block has too many lines. [28/25]", 1167387512], - [343, 7, 1195, "Metrics/AbcSize: Assignment Branch Condition size for `merge_with_debug` is too high. [<3, 20, 17> 26.42/17]", 1763663260], - [343, 7, 1195, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_with_debug` is too high. [18/7]", 1763663260], - [343, 7, 1195, "Metrics/MethodLength: Method has too many lines. [27/10]", 1763663260], - [343, 7, 1195, "Metrics/PerceivedComplexity: Perceived complexity for `merge_with_debug` is too high. [18/8]", 1763663260], - [383, 7, 1862, "Metrics/AbcSize: Assignment Branch Condition size for `prepare_runtime_session!` is too high. [<4, 24, 1> 24.35/17]", 546014873], - [383, 7, 1862, "Metrics/MethodLength: Method has too many lines. [45/10]", 546014873], - [432, 7, 1064, "Metrics/MethodLength: Method has too many lines. [21/10]", 214902707], - [490, 7, 438, "Metrics/MethodLength: Method has too many lines. [11/10]", 1759076310], - [505, 31, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [529, 7, 788, "Metrics/MethodLength: Method has too many lines. [13/10]", 690316762], - [553, 7, 1538, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_cross_source_preamble_prefixes` is too high. [<9, 18, 6> 21/17]", 1970988374], - [553, 7, 1538, "Metrics/MethodLength: Method has too many lines. [25/10]", 1970988374], - [586, 7, 644, "Metrics/AbcSize: Assignment Branch Condition size for `leading_standalone_comment_run` is too high. [<8, 14, 7> 17.58/17]", 4188914818], - [586, 7, 644, "Metrics/MethodLength: Method has too many lines. [17/10]", 4188914818], - [614, 7, 1576, "Metrics/AbcSize: Assignment Branch Condition size for `process_alignment` is too high. [<15, 14, 10> 22.83/17]", 3967135783], - [614, 7, 1576, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `process_alignment` is too high. [11/7]", 3967135783], - [614, 7, 1576, "Metrics/MethodLength: Method has too many lines. [31/10]", 3967135783], - [614, 7, 1576, "Metrics/PerceivedComplexity: Perceived complexity for `process_alignment` is too high. [9/8]", 3967135783], - [656, 7, 2871, "Metrics/AbcSize: Assignment Branch Condition size for `process_match_to_builder` is too high. [<17, 39, 19> 46.59/17]", 608053079], - [656, 7, 2871, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `process_match_to_builder` is too high. [19/7]", 608053079], - [656, 7, 2871, "Metrics/MethodLength: Method has too many lines. [50/10]", 608053079], - [656, 7, 2871, "Metrics/PerceivedComplexity: Perceived complexity for `process_match_to_builder` is too high. [18/8]", 608053079], - [720, 7, 867, "Metrics/MethodLength: Method has too many lines. [18/10]", 2946023513], - [764, 7, 670, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `consumed_link_definitions_within` is too high. [8/7]", 2596009659], - [764, 7, 670, "Metrics/MethodLength: Method has too many lines. [11/10]", 2596009659], - [774, 9, 8, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 359839059], - [782, 45, 50, "Style/ClassEqualityComparison: Use `instance_of?(::RSpec::Mocks::MockExpectationError)` instead of comparing classes.", 952914844], - [797, 7, 939, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_node_typing` is too high. [8/7]", 2526108526], - [797, 7, 939, "Metrics/MethodLength: Method has too many lines. [14/10]", 2526108526], - [849, 7, 1297, "Metrics/AbcSize: Assignment Branch Condition size for `try_inner_merge_list_to_builder` is too high. [<8, 20, 8> 22.98/17]", 2844551967], - [849, 7, 1297, "Metrics/MethodLength: Method has too many lines. [25/10]", 2844551967], - [849, 42, 71, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3479074024], - [885, 7, 1361, "Metrics/AbcSize: Assignment Branch Condition size for `try_inner_merge_code_block_to_builder` is too high. [<7, 19, 6> 21.12/17]", 2468334280], - [885, 7, 1361, "Metrics/MethodLength: Method has too many lines. [29/10]", 2468334280], - [885, 48, 71, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3479074024], - [918, 7, 1923, "Metrics/AbcSize: Assignment Branch Condition size for `remap_delegated_unresolved_cases` is too high. [<8, 23, 5> 24.86/17]", 2261924082], - [918, 7, 1923, "Metrics/MethodLength: Method has too many lines. [35/10]", 2261924082], - [922, 9, 1535, "Metrics/BlockLength: Block has too many lines. [31/25]", 838301956], - [983, 7, 657, "Metrics/MethodLength: Method has too many lines. [15/10]", 4047906352], - [1027, 7, 411, "Metrics/MethodLength: Method has too many lines. [13/10]", 4206078535], - [1053, 7, 3160, "Metrics/AbcSize: Assignment Branch Condition size for `process_dest_only_to_builder` is too high. [<14, 41, 24> 49.53/17]", 1311626075], - [1053, 7, 3160, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `process_dest_only_to_builder` is too high. [25/7]", 1311626075], - [1053, 7, 3160, "Metrics/MethodLength: Method has too many lines. [51/10]", 1311626075], - [1053, 7, 3160, "Metrics/PerceivedComplexity: Perceived complexity for `process_dest_only_to_builder` is too high. [25/8]", 1311626075], - [1053, 39, 177, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2740785193], - [1167, 7, 395, "Metrics/MethodLength: Method has too many lines. [11/10]", 433430016], - [1204, 7, 465, "Metrics/MethodLength: Method has too many lines. [12/10]", 1101864061], - [1261, 7, 861, "Metrics/MethodLength: Method has too many lines. [16/10]", 2380789170], - [1314, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193431734], - [1317, 7, 1039, "Metrics/AbcSize: Assignment Branch Condition size for `kept_node_for_link_ownership` is too high. [<4, 17, 9> 19.65/17]", 849664480], - [1317, 7, 1039, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `kept_node_for_link_ownership` is too high. [8/7]", 849664480], - [1317, 7, 1039, "Metrics/MethodLength: Method has too many lines. [24/10]", 849664480], - [1348, 7, 797, "Metrics/MethodLength: Method has too many lines. [12/10]", 3928797316], - [1384, 7, 610, "Metrics/AbcSize: Assignment Branch Condition size for `link_reference_signatures_within` is too high. [<6, 15, 6> 17.23/17]", 2255263809], - [1390, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177625], - [1457, 7, 1360, "Metrics/MethodLength: Method has too many lines. [19/10]", 1607654950] - ], - "lib/markdown/merge/table_match_algorithm.rb:784102633": [ - [31, 5, 17084, "Metrics/ClassLength: Class has too many lines. [241/100]", 3870100216], - [71, 21, 130, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2234186342], - [86, 7, 537, "Metrics/MethodLength: Method has too many lines. [11/10]", 695685542], - [112, 7, 872, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<13, 29, 8> 32.77/17]", 3623880915], - [112, 7, 872, "Metrics/MethodLength: Method has too many lines. [20/10]", 3623880915], - [264, 7, 1291, "Metrics/AbcSize: Assignment Branch Condition size for `collect_text_recursive` is too high. [<5, 22, 13> 26.04/17]", 1898702827], - [264, 7, 1291, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_text_recursive` is too high. [12/7]", 1898702827], - [264, 7, 1291, "Metrics/MethodLength: Method has too many lines. [26/10]", 1898702827], - [264, 7, 1291, "Metrics/PerceivedComplexity: Perceived complexity for `collect_text_recursive` is too high. [15/8]", 1898702827], - [292, 24, 43, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 2747201274], - [303, 7, 644, "Metrics/AbcSize: Assignment Branch Condition size for `compute_header_match` is too high. [<6, 20, 9> 22.74/17]", 2910662900], - [303, 7, 644, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_header_match` is too high. [10/7]", 2910662900], - [303, 7, 644, "Metrics/MethodLength: Method has too many lines. [11/10]", 2910662900], - [303, 7, 644, "Metrics/PerceivedComplexity: Perceived complexity for `compute_header_match` is too high. [10/8]", 2910662900], - [330, 7, 927, "Metrics/AbcSize: Assignment Branch Condition size for `compute_first_column_match` is too high. [<14, 22, 14> 29.6/17]", 2043865784], - [330, 7, 927, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_first_column_match` is too high. [14/7]", 2043865784], - [330, 7, 927, "Metrics/MethodLength: Method has too many lines. [15/10]", 2043865784], - [330, 7, 927, "Metrics/PerceivedComplexity: Perceived complexity for `compute_first_column_match` is too high. [14/8]", 2043865784], - [331, 28, 19, "Style/SymbolProc: Pass `&:first` as an argument to `map` instead of a block.", 2561207191], - [332, 28, 19, "Style/SymbolProc: Pass `&:first` as an argument to `map` instead of a block.", 2561207191], - [352, 9, 15, "Style/NumericPredicate: Use `total_cells.positive?` instead of `total_cells > 0`.", 1010733923], - [362, 7, 1037, "Metrics/AbcSize: Assignment Branch Condition size for `compute_row_content_match` is too high. [<10, 15, 12> 21.66/17]", 1855353124], - [362, 7, 1037, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_row_content_match` is too high. [11/7]", 1855353124], - [362, 7, 1037, "Metrics/MethodLength: Method has too many lines. [21/10]", 1855353124], - [362, 7, 1037, "Metrics/PerceivedComplexity: Perceived complexity for `compute_row_content_match` is too high. [11/8]", 1855353124], - [404, 23, 14, "Style/NumericPredicate: Use `max_cells.zero?` instead of `max_cells == 0`.", 2427124139], - [423, 7, 1091, "Metrics/AbcSize: Assignment Branch Condition size for `compute_total_cells_match` is too high. [<14, 18, 12> 25.77/17]", 413080451], - [423, 7, 1091, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_total_cells_match` is too high. [11/7]", 413080451], - [423, 7, 1091, "Metrics/MethodLength: Method has too many lines. [24/10]", 413080451], - [423, 7, 1091, "Metrics/PerceivedComplexity: Perceived complexity for `compute_total_cells_match` is too high. [11/8]", 413080451], - [492, 23, 17, "Style/NumericPredicate: Use `total_weight.zero?` instead of `total_weight == 0`.", 3158357864] - ], - "lib/markdown/merge/table_match_refiner.rb:4203940079": [ - [118, 35, 50, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1492696344] - ], - "lib/markdown/merge/whitespace_normalizer.rb:121777318": [ - [33, 5, 6779, "Metrics/ClassLength: Class has too many lines. [115/100]", 3048764740], - [103, 7, 418, "Metrics/MethodLength: Method has too many lines. [11/10]", 3165373284], - [126, 7, 1750, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_excessive_blank_lines` is too high. [<12, 12, 10> 19.7/17]", 1435694128], - [126, 7, 1750, "Metrics/MethodLength: Method has too many lines. [36/10]", 1435694128], - [188, 7, 1270, "Metrics/AbcSize: Assignment Branch Condition size for `remove_blank_lines_between_link_refs` is too high. [<12, 22, 13> 28.23/17]", 1324661552], - [188, 7, 1270, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `remove_blank_lines_between_link_refs` is too high. [9/7]", 1324661552], - [188, 7, 1270, "Metrics/MethodLength: Method has too many lines. [29/10]", 1324661552], - [188, 7, 1270, "Metrics/PerceivedComplexity: Perceived complexity for `remove_blank_lines_between_link_refs` is too high. [10/8]", 1324661552], - [207, 15, 54, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 831575245] - ], - "lib/markdown/merge/wrapper_support.rb:1758973456": [ - [6, 5, 7266, "Metrics/ModuleLength: Module has too many lines. [161/100]", 2849920033], - [29, 7, 1214, "Metrics/MethodLength: Method has too many lines. [19/10]", 1280688859], - [29, 19, 250, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 4150728370], - [78, 7, 1452, "Metrics/MethodLength: Method has too many lines. [18/10]", 3670315588], - [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:3964894686": [ - [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ], - "spec/fixtures_integration_spec.rb:1958067822": [ - [3, 1, 15884, "Metrics/BlockLength: Block has too many lines. [383/25]", 1004800925] - ] -} diff --git a/gems/markdown-merge/Gemfile b/gems/markdown-merge/Gemfile index 56efdc48c..d0a8c1e61 100644 --- a/gems/markdown-merge/Gemfile +++ b/gems/markdown-merge/Gemfile @@ -272,6 +272,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/markdown-merge/Gemfile.lock b/gems/markdown-merge/Gemfile.lock index f3d09b5c3..754580c70 100644 --- a/gems/markdown-merge/Gemfile.lock +++ b/gems/markdown-merge/Gemfile.lock @@ -16,6 +16,281 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -27,11 +302,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +310,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -48,7 +324,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -104,15 +379,6 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -131,6 +397,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,25 +537,23 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -322,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -373,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-drift! + kettle-jem! + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -398,38 +685,61 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -442,20 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -470,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -481,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -508,17 +830,19 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -532,14 +856,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -547,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/markly-merge/.kettle-drift.lock b/gems/markly-merge/.kettle-drift.lock index 44ac5c29d..5b373dd8d 100644 --- a/gems/markly-merge/.kettle-drift.lock +++ b/gems/markly-merge/.kettle-drift.lock @@ -7,7 +7,8 @@ 119, 159, 199, - 239 + 239, + 279 ] } ], @@ -19,7 +20,8 @@ 130, 170, 210, - 250 + 250, + 290 ] } ], @@ -31,7 +33,8 @@ 120, 160, 200, - 240 + 240, + 280 ] } ], @@ -43,7 +46,8 @@ 132, 172, 212, - 252 + 252, + 292 ] } ], @@ -55,7 +59,8 @@ 135, 175, 215, - 255 + 255, + 295 ] } ], @@ -67,7 +72,8 @@ 121, 161, 201, - 241 + 241, + 281 ] } ], @@ -80,7 +86,8 @@ 139, 179, 219, - 259 + 259, + 299 ] } ], @@ -92,7 +99,8 @@ 140, 180, 220, - 260 + 260, + 300 ] } ], @@ -105,7 +113,8 @@ 126, 166, 206, - 246 + 246, + 286 ] } ], @@ -117,7 +126,8 @@ 149, 189, 229, - 269 + 269, + 309 ] } ], @@ -130,7 +140,8 @@ 118, 158, 198, - 238 + 238, + 278 ] } ], @@ -143,7 +154,8 @@ 148, 188, 228, - 268 + 268, + 308 ] } ], @@ -155,7 +167,8 @@ 124, 164, 204, - 244 + 244, + 284 ] } ], @@ -168,7 +181,8 @@ 131, 171, 211, - 251 + 251, + 291 ] } ], @@ -181,7 +195,8 @@ 127, 167, 207, - 247 + 247, + 287 ] } ], @@ -193,7 +208,8 @@ 125, 165, 205, - 245 + 245, + 285 ] } ], @@ -205,7 +221,8 @@ 142, 182, 222, - 262 + 262, + 302 ] } ], @@ -217,7 +234,8 @@ 141, 181, 221, - 261 + 261, + 301 ] } ], @@ -229,7 +247,8 @@ 136, 176, 216, - 256 + 256, + 296 ] } ], @@ -241,7 +260,8 @@ 145, 185, 225, - 265 + 265, + 305 ] } ], diff --git a/gems/markly-merge/Gemfile b/gems/markly-merge/Gemfile index a208b31c6..591b5ca72 100644 --- a/gems/markly-merge/Gemfile +++ b/gems/markly-merge/Gemfile @@ -271,6 +271,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/markly-merge/Gemfile.lock b/gems/markly-merge/Gemfile.lock index 0e38a0a14..c38641d2e 100644 --- a/gems/markly-merge/Gemfile.lock +++ b/gems/markly-merge/Gemfile.lock @@ -17,264 +17,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +35,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +48,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +111,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -533,8 +279,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +331,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -618,7 +362,7 @@ GEM yard yard-relative_markdown_links (0.6.0) nokogiri (>= 1.14.3, < 2) - yard-timekeeper (0.2.3) + yard-timekeeper (0.2.4) version_gem (~> 1.1, >= 1.1.13) yard-yaml (0.2.3) version_gem (~> 1.1, >= 1.1.13) @@ -638,45 +382,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +408,31 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +440,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,20 +452,15 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 @@ -788,14 +482,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +493,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +520,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +531,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,27 +544,21 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd yard-relative_markdown_links (0.6.0) sha256=3e5ffa85cbad9bac70bee5421774b190fb25d3bdf489323a5b3534f647d1a70e - yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 + yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 3c4ae0d0f58a68e6fadd7d66182dfaf4617acd98 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:25:23 -0600 Subject: [PATCH 220/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-crispr-markdown-markly/Gemfile.lock | 390 ++---------- gems/markdown-merge/.rubocop_gradual.lock | 608 +++++++++++++++++++ 2 files changed, 653 insertions(+), 345 deletions(-) create mode 100644 gems/markdown-merge/.rubocop_gradual.lock diff --git a/gems/ast-crispr-markdown-markly/Gemfile.lock b/gems/ast-crispr-markdown-markly/Gemfile.lock index 69b980543..9afe832a7 100644 --- a/gems/ast-crispr-markdown-markly/Gemfile.lock +++ b/gems/ast-crispr-markdown-markly/Gemfile.lock @@ -17,15 +17,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) ast-merge (= 7.1.0) @@ -33,264 +25,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) markdown-merge (= 7.1.0) markly (~> 0.9) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -302,6 +43,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -310,12 +56,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -324,6 +64,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -379,6 +120,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -397,6 +147,10 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) @@ -542,18 +296,22 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -587,11 +345,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -618,7 +376,7 @@ GEM yard yard-relative_markdown_links (0.6.0) nokogiri (>= 1.14.3, < 2) - yard-timekeeper (0.2.3) + yard-timekeeper (0.2.4) version_gem (~> 1.1, >= 1.1.13) yard-yaml (0.2.3) version_gem (~> 1.1, >= 1.1.13) @@ -640,43 +398,23 @@ DEPENDENCIES appraisal2 (~> 3.0, >= 3.0.6) 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,26 +423,18 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -713,33 +443,20 @@ CHECKSUMS ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,20 +469,15 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 @@ -787,14 +499,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +510,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,19 +537,18 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,27 +562,21 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd yard-relative_markdown_links (0.6.0) sha256=3e5ffa85cbad9bac70bee5421774b190fb25d3bdf489323a5b3534f647d1a70e - yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 + yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/markdown-merge/.rubocop_gradual.lock b/gems/markdown-merge/.rubocop_gradual.lock new file mode 100644 index 000000000..4f8201218 --- /dev/null +++ b/gems/markdown-merge/.rubocop_gradual.lock @@ -0,0 +1,608 @@ +{ + ".simplecov:862493710": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:1018150957": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/markdown-merge.rb:1671676898": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`markdown-merge.rb`) should use snake_case.", 5381] + ], + "lib/markdown/merge.rb:3835020687": [ + [11, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Markdown::Merge`.", 2866359175], + [11, 3, 23539, "Metrics/ModuleLength: Module has too many lines. [564/100]", 3838590514], + [22, 5, 16, "Style/Documentation: Missing top-level documentation comment for `class Markdown::Merge::ParseError`.", 362242086], + [104, 5, 990, "Metrics/MethodLength: Method has too many lines. [23/10]", 650805533], + [133, 5, 678, "Metrics/AbcSize: Assignment Branch Condition size for `match_markdown_owners` is too high. [<10, 23, 8> 26.32/17]", 2124140148], + [133, 5, 678, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `match_markdown_owners` is too high. [9/7]", 2124140148], + [133, 5, 678, "Metrics/PerceivedComplexity: Perceived complexity for `match_markdown_owners` is too high. [9/8]", 2124140148], + [146, 5, 1188, "Metrics/AbcSize: Assignment Branch Condition size for `merge_markdown` is too high. [<10, 25, 8> 28.09/17]", 3592129796], + [146, 5, 1188, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_markdown` is too high. [9/7]", 3592129796], + [146, 5, 1188, "Metrics/MethodLength: Method has too many lines. [23/10]", 3592129796], + [146, 5, 1188, "Metrics/PerceivedComplexity: Perceived complexity for `merge_markdown` is too high. [9/8]", 3592129796], + [175, 5, 513, "Metrics/MethodLength: Method has too many lines. [13/10]", 912081106], + [193, 5, 747, "Metrics/MethodLength: Method has too many lines. [16/10]", 3172863125], + [224, 5, 1513, "Metrics/AbcSize: Assignment Branch Condition size for `apply_markdown_delegated_child_outputs` is too high. [<16, 37, 9> 41.3/17]", 3320736661], + [224, 5, 1513, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_markdown_delegated_child_outputs` is too high. [10/7]", 3320736661], + [224, 5, 1513, "Metrics/MethodLength: Method has too many lines. [30/10]", 3320736661], + [224, 5, 1513, "Metrics/PerceivedComplexity: Perceived complexity for `apply_markdown_delegated_child_outputs` is too high. [10/8]", 3320736661], + [262, 5, 1058, "Metrics/MethodLength: Method has too many lines. [23/10]", 2000305522], + [289, 5, 1103, "Metrics/MethodLength: Method has too many lines. [23/10]", 2615729942], + [289, 52, 144, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3050457682], + [317, 5, 817, "Metrics/MethodLength: Method has too many lines. [13/10]", 322304706], + [322, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 2378183959], + [335, 5, 805, "Metrics/MethodLength: Method has too many lines. [13/10]", 935244360], + [340, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 2974266470], + [353, 5, 722, "Metrics/MethodLength: Method has too many lines. [12/10]", 1758487766], + [358, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 3013228499], + [370, 5, 730, "Metrics/MethodLength: Method has too many lines. [12/10]", 3297037131], + [375, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 3013228499], + [401, 5, 1584, "Metrics/AbcSize: Assignment Branch Condition size for `collect_markdown_owners` is too high. [<21, 32, 13> 40.42/17]", 572024212], + [401, 5, 1584, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_markdown_owners` is too high. [11/7]", 572024212], + [401, 5, 1584, "Metrics/MethodLength: Method has too many lines. [45/10]", 572024212], + [401, 5, 1584, "Metrics/PerceivedComplexity: Perceived complexity for `collect_markdown_owners` is too high. [11/8]", 572024212], + [455, 5, 1147, "Metrics/AbcSize: Assignment Branch Condition size for `markdown_owner_start_indices` is too high. [<21, 22, 11> 32.34/17]", 12516264], + [455, 5, 1147, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `markdown_owner_start_indices` is too high. [9/7]", 12516264], + [455, 5, 1147, "Metrics/MethodLength: Method has too many lines. [33/10]", 12516264], + [455, 5, 1147, "Metrics/PerceivedComplexity: Perceived complexity for `markdown_owner_start_indices` is too high. [9/8]", 12516264], + [496, 5, 602, "Metrics/AbcSize: Assignment Branch Condition size for `collect_markdown_sections` is too high. [<9, 20, 6> 22.74/17]", 1946206422], + [496, 5, 602, "Metrics/MethodLength: Method has too many lines. [14/10]", 1946206422], + [504, 7, 11, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 848344986], + [515, 5, 1097, "Metrics/AbcSize: Assignment Branch Condition size for `markdown_fence_ranges` is too high. [<19, 21, 11> 30.38/17]", 2035260313], + [515, 5, 1097, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `markdown_fence_ranges` is too high. [8/7]", 2035260313], + [515, 5, 1097, "Metrics/MethodLength: Method has too many lines. [31/10]", 2035260313], + [531, 13, 227, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 1054958538], + [553, 5, 323, "Metrics/MethodLength: Method has too many lines. [14/10]", 2041170985], + [589, 5, 525, "Metrics/MethodLength: Method has too many lines. [11/10]", 1507618315] + ], + "lib/markdown/merge/backend_support.rb:1723133349": [ + [6, 5, 6677, "Metrics/ModuleLength: Module has too many lines. [151/100]", 1497234257], + [18, 7, 524, "Metrics/MethodLength: Method has too many lines. [13/10]", 2550700841], + [34, 7, 913, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `configure_markdown_only_language_class!` is too high. [9/7]", 2175633707], + [34, 7, 913, "Metrics/MethodLength: Method has too many lines. [14/10]", 2175633707], + [34, 7, 913, "Metrics/PerceivedComplexity: Perceived complexity for `configure_markdown_only_language_class!` is too high. [10/8]", 2175633707], + [37, 11, 658, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [9/7]", 353826273], + [37, 11, 658, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [10/8]", 353826273], + [44, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1312231069], + [54, 7, 1263, "Metrics/AbcSize: Assignment Branch Condition size for `configure_node_link_and_navigation!` is too high. [<3, 28, 3> 28.32/17]", 122101535], + [54, 7, 1263, "Metrics/MethodLength: Method has too many lines. [20/10]", 122101535], + [98, 7, 976, "Metrics/MethodLength: Method has too many lines. [24/10]", 2694447150], + [132, 7, 618, "Metrics/MethodLength: Method has too many lines. [11/10]", 2027069469], + [150, 7, 888, "Metrics/MethodLength: Method has too many lines. [21/10]", 3721642530] + ], + "lib/markdown/merge/cleanse/block_spacing.rb:2917446564": [ + [32, 7, 7186, "Metrics/ClassLength: Class has too many lines. [138/100]", 1732896955], + [132, 9, 465, "Metrics/AbcSize: Assignment Branch Condition size for `fix` is too high. [<6, 16, 5> 17.8/17]", 341373851], + [150, 9, 1964, "Metrics/AbcSize: Assignment Branch Condition size for `analyze` is too high. [<9, 25, 16> 31.02/17]", 2558819309], + [150, 9, 1964, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `analyze` is too high. [14/7]", 2558819309], + [150, 9, 1964, "Metrics/MethodLength: Method has too many lines. [23/10]", 2558819309], + [150, 9, 1964, "Metrics/PerceivedComplexity: Perceived complexity for `analyze` is too high. [14/8]", 2558819309], + [160, 25, 7, "Style/NumericPredicate: Use `idx.positive?` instead of `idx > 0`.", 1825176542], + [192, 40, 20, "Style/NumericPredicate: Use `html_block_depth.positive?` instead of `html_block_depth > 0`.", 3208734130] + ], + "lib/markdown/merge/cleanse/code_fence_spacing.rb:1353147449": [ + [161, 9, 1524, "Metrics/AbcSize: Assignment Branch Condition size for `code_blocks` is too high. [<18, 20, 12> 29.46/17]", 2467942971], + [161, 9, 1524, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `code_blocks` is too high. [12/7]", 2467942971], + [161, 9, 1524, "Metrics/MethodLength: Method has too many lines. [35/10]", 2467942971], + [161, 9, 1524, "Metrics/PerceivedComplexity: Perceived complexity for `code_blocks` is too high. [12/8]", 2467942971], + [169, 11, 1293, "Metrics/BlockLength: Block has too many lines. [27/25]", 3238939023], + [249, 9, 884, "Metrics/AbcSize: Assignment Branch Condition size for `parse_fence_line` is too high. [<7, 15, 6> 17.61/17]", 1033947369], + [249, 9, 884, "Metrics/MethodLength: Method has too many lines. [19/10]", 1033947369] + ], + "lib/markdown/merge/cleanse/condensed_link_refs.rb:3659937794": [ + [85, 7, 12174, "Metrics/ClassLength: Class has too many lines. [115/100]", 3309007721], + [200, 9, 874, "Metrics/AbcSize: Assignment Branch Condition size for `definitions` is too high. [<6, 14, 10> 18.22/17]", 1976258109], + [200, 9, 874, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `definitions` is too high. [9/7]", 1976258109], + [200, 9, 874, "Metrics/MethodLength: Method has too many lines. [13/10]", 1976258109], + [200, 9, 874, "Metrics/PerceivedComplexity: Perceived complexity for `definitions` is too high. [9/8]", 1976258109], + [213, 43, 17, "Style/NumericPredicate: Use `first_bracket.positive?` instead of `first_bracket > 0`.", 1095960710], + [273, 13, 30, "Naming/PredicatePrefix: Rename `has_content_before_definition?` to `content_before_definition?`.", 213744570], + [298, 9, 997, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_line` is too high. [9/7]", 2139717575], + [298, 9, 997, "Metrics/MethodLength: Method has too many lines. [13/10]", 2139717575], + [298, 9, 997, "Metrics/PerceivedComplexity: Perceived complexity for `parse_line` is too high. [9/8]", 2139717575], + [352, 9, 1214, "Metrics/AbcSize: Assignment Branch Condition size for `expand_line` is too high. [<10, 20, 17> 28.09/17]", 149412459], + [352, 9, 1214, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `expand_line` is too high. [14/7]", 149412459], + [352, 9, 1214, "Metrics/MethodLength: Method has too many lines. [21/10]", 149412459], + [352, 9, 1214, "Metrics/PerceivedComplexity: Perceived complexity for `expand_line` is too high. [15/8]", 149412459], + [358, 37, 17, "Style/NumericPredicate: Use `first_bracket.positive?` instead of `first_bracket > 0`.", 1095960710] + ], + "lib/markdown/merge/cleanse/templating_corruption.rb:3945009912": [ + [59, 9, 384, "Metrics/AbcSize: Assignment Branch Condition size for `append_issues` is too high. [<0, 17, 2> 17.12/17]", 2550677275] + ], + "lib/markdown/merge/code_block_merger.rb:1362562532": [ + [32, 5, 27618, "Metrics/ClassLength: Class has too many lines. [554/100]", 1891552237], + [120, 7, 543, "Metrics/MethodLength: Method has too many lines. [11/10]", 625040368], + [120, 28, 92, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3691835500], + [135, 7, 666, "Metrics/MethodLength: Method has too many lines. [13/10]", 4153783419], + [156, 7, 2796, "Metrics/AbcSize: Assignment Branch Condition size for `merge_code_blocks_with_runtime` is too high. [<5, 52, 11> 53.39/17]", 4194925058], + [156, 7, 2796, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_code_blocks_with_runtime` is too high. [10/7]", 4194925058], + [156, 7, 2796, "Metrics/MethodLength: Method has too many lines. [63/10]", 4194925058], + [156, 7, 2796, "Metrics/PerceivedComplexity: Perceived complexity for `merge_code_blocks_with_runtime` is too high. [12/8]", 4194925058], + [156, 41, 125, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1827509670], + [227, 7, 1778, "Metrics/AbcSize: Assignment Branch Condition size for `build_runtime_operation` is too high. [<3, 24, 4> 24.52/17]", 3746845105], + [227, 7, 1778, "Metrics/MethodLength: Method has too many lines. [31/10]", 3746845105], + [227, 34, 86, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3153149164], + [239, 39, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [290, 7, 528, "Metrics/MethodLength: Method has too many lines. [14/10]", 3045714289], + [307, 7, 2407, "Metrics/AbcSize: Assignment Branch Condition size for `merge_runtime_surface` is too high. [<1, 50, 7> 50.5/17]", 3818534251], + [307, 7, 2407, "Metrics/MethodLength: Method has too many lines. [53/10]", 3818534251], + [365, 7, 2502, "Metrics/AbcSize: Assignment Branch Condition size for `perform_code_block_merge` is too high. [<8, 34, 16> 38.42/17]", 3120245149], + [365, 7, 2502, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `perform_code_block_merge` is too high. [14/7]", 3120245149], + [365, 7, 2502, "Metrics/MethodLength: Method has too many lines. [57/10]", 3120245149], + [365, 7, 2502, "Metrics/PerceivedComplexity: Perceived complexity for `perform_code_block_merge` is too high. [16/8]", 3120245149], + [365, 35, 83, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2137984385], + [435, 7, 1289, "Metrics/MethodLength: Method has too many lines. [33/10]", 3304634912], + [435, 43, 154, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2516842130], + [473, 7, 755, "Metrics/MethodLength: Method has too many lines. [15/10]", 2207072637], + [473, 35, 127, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2610889879], + [492, 38, 167, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 372116680], + [492, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193417996], + [506, 37, 166, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 321759336], + [506, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861061], + [547, 19, 20, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 3860798338], + [574, 9, 109, "Lint/RescueException: Avoid rescuing the `Exception` class. Perhaps you meant to rescue `StandardError`?", 2421726137], + [575, 21, 50, "Style/ClassEqualityComparison: Use `instance_of?(::RSpec::Mocks::MockExpectationError)` instead of comparing classes.", 952914844], + [592, 9, 797, "Metrics/MethodLength: Method has too many lines. [18/10]", 4001935536], + [622, 9, 800, "Metrics/MethodLength: Method has too many lines. [18/10]", 2519636656], + [652, 9, 798, "Metrics/MethodLength: Method has too many lines. [18/10]", 2048436912], + [680, 9, 1160, "Metrics/MethodLength: Method has too many lines. [26/10]", 45677001], + [718, 9, 798, "Metrics/MethodLength: Method has too many lines. [18/10]", 3475080240] + ], + "lib/markdown/merge/comment_tracker.rb:167569374": [ + [19, 7, 374, "Metrics/MethodLength: Method has too many lines. [11/10]", 3280949001] + ], + "lib/markdown/merge/conflict_resolver.rb:686298490": [ + [29, 5, 6207, "Metrics/ClassLength: Class has too many lines. [122/100]", 3761260950], + [57, 7, 1217, "Metrics/MethodLength: Method has too many lines. [32/10]", 3372247297], + [57, 55, 14, "Lint/UnusedMethodArgument: Unused method argument - `template_index`.", 1809801172], + [57, 72, 10, "Lint/UnusedMethodArgument: Unused method argument - `dest_index`.", 2703999490], + [112, 7, 1811, "Metrics/AbcSize: Assignment Branch Condition size for `unresolved_resolution` is too high. [<6, 22, 5> 23.35/17]", 391291522], + [112, 7, 1811, "Metrics/MethodLength: Method has too many lines. [39/10]", 391291522], + [161, 7, 605, "Metrics/MethodLength: Method has too many lines. [12/10]", 577293020] + ], + "lib/markdown/merge/file_aligner.rb:841305081": [ + [27, 5, 19046, "Metrics/ClassLength: Class has too many lines. [364/100]", 3915220059], + [57, 7, 1853, "Metrics/AbcSize: Assignment Branch Condition size for `apply_match_refiner!` is too high. [<13, 31, 14> 36.41/17]", 3500652553], + [57, 7, 1853, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_match_refiner!` is too high. [15/7]", 3500652553], + [57, 7, 1853, "Metrics/MethodLength: Method has too many lines. [35/10]", 3500652553], + [57, 7, 1853, "Metrics/PerceivedComplexity: Perceived complexity for `apply_match_refiner!` is too high. [15/8]", 3500652553], + [112, 7, 312, "Metrics/MethodLength: Method has too many lines. [11/10]", 2670750985], + [132, 9, 46, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 4265307642], + [133, 11, 78, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1464832319], + [139, 7, 644, "Metrics/AbcSize: Assignment Branch Condition size for `build_heading_owner_paths` is too high. [<8, 20, 8> 22.98/17]", 2892981198], + [139, 7, 644, "Metrics/MethodLength: Method has too many lines. [13/10]", 2892981198], + [176, 7, 1056, "Metrics/AbcSize: Assignment Branch Condition size for `adjacent_section_hijack_repair_compatible?` is too high. [<4, 25, 8> 26.55/17]", 2068902935], + [176, 7, 1056, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `adjacent_section_hijack_repair_compatible?` is too high. [8/7]", 2068902935], + [176, 7, 1056, "Metrics/MethodLength: Method has too many lines. [11/10]", 2068902935], + [204, 7, 685, "Metrics/MethodLength: Method has too many lines. [12/10]", 3293058437], + [221, 7, 762, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `next_same_owner_match_for_template_only_entry` is too high. [8/7]", 681984620], + [250, 7, 829, "Metrics/MethodLength: Method has too many lines. [15/10]", 3104261185], + [309, 7, 759, "Metrics/MethodLength: Method has too many lines. [11/10]", 4043392433], + [342, 7, 540, "Metrics/AbcSize: Assignment Branch Condition size for `synthetic_section_label_paragraph?` is too high. [<3, 15, 11> 18.84/17]", 569218077], + [342, 7, 540, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `synthetic_section_label_paragraph?` is too high. [9/7]", 569218077], + [342, 7, 540, "Metrics/PerceivedComplexity: Perceived complexity for `synthetic_section_label_paragraph?` is too high. [9/8]", 569218077], + [347, 38, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [385, 47, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [385, 85, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [429, 7, 792, "Metrics/AbcSize: Assignment Branch Condition size for `neighboring_heading_signatures` is too high. [<7, 17, 8> 20.05/17]", 653610323], + [429, 7, 792, "Metrics/MethodLength: Method has too many lines. [14/10]", 653610323], + [466, 7, 879, "Metrics/AbcSize: Assignment Branch Condition size for `first_list_item_anchor` is too high. [<6, 22, 9> 24.52/17]", 1144304252], + [466, 7, 879, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `first_list_item_anchor` is too high. [9/7]", 1144304252], + [466, 7, 879, "Metrics/MethodLength: Method has too many lines. [21/10]", 1144304252], + [466, 7, 879, "Metrics/PerceivedComplexity: Perceived complexity for `first_list_item_anchor` is too high. [10/8]", 1144304252] + ], + "lib/markdown/merge/file_analysis.rb:1169434297": [ + [41, 5, 12695, "Metrics/ClassLength: Class has too many lines. [183/100]", 3122418242], + [168, 7, 2960, "Metrics/AbcSize: Assignment Branch Condition size for `compute_parser_signature` is too high. [<13, 36, 18> 42.3/17]", 1002271909], + [168, 7, 2960, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_parser_signature` is too high. [17/7]", 1002271909], + [168, 7, 2960, "Metrics/MethodLength: Method has too many lines. [42/10]", 1002271909], + [168, 7, 2960, "Metrics/PerceivedComplexity: Perceived complexity for `compute_parser_signature` is too high. [11/8]", 1002271909], + [290, 7, 777, "Metrics/MethodLength: Method has too many lines. [14/10]", 1287754637], + [328, 7, 558, "Metrics/MethodLength: Method has too many lines. [15/10]", 3417342515] + ], + "lib/markdown/merge/file_analysis_base.rb:678024820": [ + [37, 5, 26494, "Metrics/ClassLength: Class has too many lines. [405/100]", 2769422452], + [60, 7, 1360, "Metrics/MethodLength: Method has too many lines. [18/10]", 90913983], + [261, 7, 3539, "Metrics/AbcSize: Assignment Branch Condition size for `compute_parser_signature` is too high. [<16, 43, 19> 49.66/17]", 3466910865], + [261, 7, 3539, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_parser_signature` is too high. [18/7]", 3466910865], + [261, 7, 3539, "Metrics/MethodLength: Method has too many lines. [45/10]", 3466910865], + [261, 7, 3539, "Metrics/PerceivedComplexity: Perceived complexity for `compute_parser_signature` is too high. [11/8]", 3466910865], + [467, 7, 1153, "Metrics/AbcSize: Assignment Branch Condition size for `collect_top_level_nodes_with_gaps` is too high. [<10, 16, 7> 20.12/17]", 2190890907], + [467, 7, 1153, "Metrics/MethodLength: Method has too many lines. [18/10]", 2190890907], + [524, 7, 944, "Metrics/AbcSize: Assignment Branch Condition size for `integrate_gap_nodes` is too high. [<10, 14, 9> 19.42/17]", 2618792164], + [524, 7, 944, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `integrate_gap_nodes` is too high. [9/7]", 2618792164], + [524, 7, 944, "Metrics/MethodLength: Method has too many lines. [17/10]", 2618792164], + [524, 7, 944, "Metrics/PerceivedComplexity: Perceived complexity for `integrate_gap_nodes` is too high. [9/8]", 2618792164], + [536, 50, 7, "Style/NumericPredicate: Use `idx.positive?` instead of `idx > 0`.", 1825176542], + [565, 7, 2225, "Metrics/AbcSize: Assignment Branch Condition size for `find_freeze_markers` is too high. [<16, 30, 15> 37.16/17]", 263815919], + [565, 7, 2225, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_freeze_markers` is too high. [16/7]", 263815919], + [565, 7, 2225, "Metrics/MethodLength: Method has too many lines. [39/10]", 263815919], + [565, 7, 2225, "Metrics/PerceivedComplexity: Perceived complexity for `find_freeze_markers` is too high. [16/8]", 263815919], + [588, 15, 101, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 2762675417], + [611, 23, 26, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 2775329597], + [630, 7, 708, "Metrics/MethodLength: Method has too many lines. [19/10]", 1535336850], + [663, 7, 859, "Metrics/MethodLength: Method has too many lines. [19/10]", 1633852183], + [706, 7, 595, "Metrics/MethodLength: Method has too many lines. [14/10]", 2922601775], + [730, 7, 1145, "Metrics/AbcSize: Assignment Branch Condition size for `integrate_nodes_with_freeze_blocks` is too high. [<12, 17, 16> 26.25/17]", 2481642790], + [730, 7, 1145, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `integrate_nodes_with_freeze_blocks` is too high. [13/7]", 2481642790], + [730, 7, 1145, "Metrics/MethodLength: Method has too many lines. [22/10]", 2481642790], + [730, 7, 1145, "Metrics/PerceivedComplexity: Perceived complexity for `integrate_nodes_with_freeze_blocks` is too high. [13/8]", 2481642790] + ], + "lib/markdown/merge/freeze_node.rb:2861044075": [ + [39, 21, 86, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 4263110221] + ], + "lib/markdown/merge/gap_line_node.rb:2230943204": [ + [40, 7, 461, "Metrics/MethodLength: Method has too many lines. [11/10]", 1038026861], + [75, 7, 1087, "Metrics/MethodLength: Method has too many lines. [17/10]", 690589617], + [75, 7, 1087, "Metrics/PerceivedComplexity: Perceived complexity for `signature` is too high. [10/8]", 690589617], + [76, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] + ], + "lib/markdown/merge/link_definition_node.rb:526538026": [ + [54, 7, 413, "Metrics/MethodLength: Method has too many lines. [11/10]", 449561622] + ], + "lib/markdown/merge/link_parser.rb:1096919687": [ + [30, 5, 12509, "Metrics/ClassLength: Class has too many lines. [179/100]", 1758727291], + [168, 7, 459, "Metrics/MethodLength: Method has too many lines. [11/10]", 518494532], + [239, 7, 945, "Metrics/AbcSize: Assignment Branch Condition size for `build_link_tree` is too high. [<12, 18, 13> 25.24/17]", 3590515429], + [239, 7, 945, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_link_tree` is too high. [10/7]", 3590515429], + [239, 7, 945, "Metrics/MethodLength: Method has too many lines. [19/10]", 3590515429], + [239, 7, 945, "Metrics/PerceivedComplexity: Perceived complexity for `build_link_tree` is too high. [10/8]", 3590515429], + [297, 7, 738, "Metrics/AbcSize: Assignment Branch Condition size for `find_constructs` is too high. [<9, 9, 15> 19.67/17]", 1944426624], + [297, 7, 738, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_constructs` is too high. [9/7]", 1944426624], + [297, 7, 738, "Metrics/MethodLength: Method has too many lines. [20/10]", 1944426624], + [297, 7, 738, "Metrics/PerceivedComplexity: Perceived complexity for `find_constructs` is too high. [10/8]", 1944426624], + [308, 31, 7, "Style/NumericPredicate: Use `idx.positive?` instead of `idx > 0`.", 1825176542], + [326, 7, 1492, "Metrics/AbcSize: Assignment Branch Condition size for `try_parse_construct_at` is too high. [<7, 26, 13> 29.9/17]", 751157862], + [326, 7, 1492, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `try_parse_construct_at` is too high. [9/7]", 751157862], + [326, 7, 1492, "Metrics/MethodLength: Method has too many lines. [32/10]", 751157862], + [326, 7, 1492, "Metrics/PerceivedComplexity: Perceived complexity for `try_parse_construct_at` is too high. [10/8]", 751157862], + [371, 7, 332, "Metrics/MethodLength: Method has too many lines. [13/10]", 766454795], + [381, 27, 10, "Style/NumericPredicate: Use `depth.zero?` instead of `depth == 0`.", 3245914040], + [389, 7, 679, "Metrics/AbcSize: Assignment Branch Condition size for `find_paren_end` is too high. [<12, 5, 12> 17.69/17]", 3435642705], + [389, 7, 679, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_paren_end` is too high. [10/7]", 3435642705], + [389, 7, 679, "Metrics/MethodLength: Method has too many lines. [24/10]", 3435642705], + [389, 7, 679, "Metrics/PerceivedComplexity: Perceived complexity for `find_paren_end` is too high. [10/8]", 3435642705], + [410, 29, 10, "Style/NumericPredicate: Use `depth.zero?` instead of `depth == 0`.", 3245914040] + ], + "lib/markdown/merge/link_reference_rehydrator.rb:2522597032": [ + [28, 5, 10014, "Metrics/ClassLength: Class has too many lines. [171/100]", 3685995823], + [89, 7, 955, "Metrics/AbcSize: Assignment Branch Condition size for `rehydrate` is too high. [<6, 21, 4> 22.2/17]", 4193701], + [89, 7, 955, "Metrics/MethodLength: Method has too many lines. [12/10]", 4193701], + [138, 7, 1280, "Metrics/MethodLength: Method has too many lines. [20/10]", 2243922075], + [138, 7, 1280, "Metrics/PerceivedComplexity: Perceived complexity for `collect_nested_replacements` is too high. [10/8]", 2243922075], + [181, 7, 1844, "Metrics/AbcSize: Assignment Branch Condition size for `process_parent_with_children` is too high. [<11, 30, 10> 33.48/17]", 1412317448], + [181, 7, 1844, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `process_parent_with_children` is too high. [9/7]", 1412317448], + [181, 7, 1844, "Metrics/MethodLength: Method has too many lines. [29/10]", 1412317448], + [181, 7, 1844, "Metrics/PerceivedComplexity: Perceived complexity for `process_parent_with_children` is too high. [9/8]", 1412317448], + [230, 7, 672, "Metrics/AbcSize: Assignment Branch Condition size for `build_definition_maps` is too high. [<18, 18, 5> 25.94/17]", 2626750147], + [230, 7, 672, "Metrics/MethodLength: Method has too many lines. [15/10]", 2626750147], + [265, 7, 594, "Metrics/MethodLength: Method has too many lines. [21/10]", 1835317302], + [292, 7, 598, "Metrics/MethodLength: Method has too many lines. [21/10]", 1975952876] + ], + "lib/markdown/merge/list_match_refiner.rb:2863813265": [ + [28, 7, 760, "Metrics/AbcSize: Assignment Branch Condition size for `compute_similarity` is too high. [<6, 20, 4> 21.26/17]", 4078625426], + [28, 7, 760, "Metrics/MethodLength: Method has too many lines. [13/10]", 4078625426] + ], + "lib/markdown/merge/list_merger.rb:1304801063": [ + [33, 5, 10963, "Metrics/ClassLength: Class has too many lines. [214/100]", 602699468], + [48, 7, 1267, "Metrics/MethodLength: Method has too many lines. [22/10]", 3289445396], + [48, 22, 295, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 992893951], + [76, 20, 23, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 1178765246], + [86, 7, 474, "Metrics/MethodLength: Method has too many lines. [14/10]", 3392803095], + [110, 7, 2384, "Metrics/AbcSize: Assignment Branch Condition size for `align_items` is too high. [<29, 55, 24> 66.65/17]", 452537823], + [110, 7, 2384, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `align_items` is too high. [22/7]", 452537823], + [110, 7, 2384, "Metrics/MethodLength: Method has too many lines. [44/10]", 452537823], + [110, 7, 2384, "Metrics/PerceivedComplexity: Perceived complexity for `align_items` is too high. [23/8]", 452537823], + [179, 7, 2546, "Metrics/AbcSize: Assignment Branch Condition size for `emit_lines` is too high. [<24, 40, 13> 48.43/17]", 2868796461], + [179, 7, 2546, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_lines` is too high. [10/7]", 2868796461], + [179, 7, 2546, "Metrics/MethodLength: Method has too many lines. [48/10]", 2868796461], + [179, 7, 2546, "Metrics/PerceivedComplexity: Perceived complexity for `emit_lines` is too high. [9/8]", 2868796461], + [179, 21, 167, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3110781545], + [186, 9, 2214, "Metrics/BlockLength: Block has too many lines. [41/25]", 27504812], + [267, 7, 1113, "Metrics/MethodLength: Method has too many lines. [21/10]", 2701858480], + [267, 32, 165, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 4189168652] + ], + "lib/markdown/merge/merge_result.rb:3204455982": [ + [35, 5, 18456, "Metrics/ClassLength: Class has too many lines. [336/100]", 549816393], + [47, 21, 99, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1708164346], + [99, 11, 18, "Naming/PredicatePrefix: Rename `has_frozen_blocks?` to `frozen_blocks?`.", 2714608976], + [174, 7, 987, "Metrics/MethodLength: Method has too many lines. [14/10]", 199512025], + [178, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 2749193064], + [197, 7, 719, "Metrics/MethodLength: Method has too many lines. [11/10]", 3478479763], + [214, 7, 3130, "Metrics/AbcSize: Assignment Branch Condition size for `apply_grouped_delegated_block!` is too high. [<37, 72, 21> 83.63/17]", 3965639779], + [214, 7, 3130, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_grouped_delegated_block!` is too high. [21/7]", 3965639779], + [214, 7, 3130, "Metrics/MethodLength: Method has too many lines. [49/10]", 3965639779], + [214, 7, 3130, "Metrics/PerceivedComplexity: Perceived complexity for `apply_grouped_delegated_block!` is too high. [21/8]", 3965639779], + [218, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 2758428109], + [227, 9, 22, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 3561198282], + [232, 9, 22, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 3561198282], + [237, 9, 22, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 3561198282], + [267, 7, 956, "Metrics/AbcSize: Assignment Branch Condition size for `apply_output_range_resolutions_descending!` is too high. [<8, 26, 8> 28.35/17]", 410698269], + [267, 7, 956, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_output_range_resolutions_descending!` is too high. [8/7]", 410698269], + [267, 7, 956, "Metrics/MethodLength: Method has too many lines. [13/10]", 410698269], + [269, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1650842885], + [304, 7, 1607, "Metrics/AbcSize: Assignment Branch Condition size for `remap_delegated_cases_after_apply` is too high. [<5, 20, 1> 20.64/17]", 2805002106], + [304, 7, 1607, "Metrics/MethodLength: Method has too many lines. [25/10]", 2805002106], + [304, 44, 174, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2563452319], + [352, 7, 664, "Metrics/MethodLength: Method has too many lines. [13/10]", 2283269648], + [402, 7, 605, "Metrics/MethodLength: Method has too many lines. [12/10]", 219211686], + [418, 7, 622, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `sanitize_review_state_metadata` is too high. [8/7]", 656017698], + [418, 7, 622, "Metrics/MethodLength: Method has too many lines. [16/10]", 656017698], + [439, 7, 1110, "Metrics/AbcSize: Assignment Branch Condition size for `validate_review_state_compatibility!` is too high. [<7, 18, 13> 23.28/17]", 3899925007], + [439, 7, 1110, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_review_state_compatibility!` is too high. [11/7]", 3899925007], + [439, 7, 1110, "Metrics/MethodLength: Method has too many lines. [18/10]", 3899925007], + [439, 7, 1110, "Metrics/PerceivedComplexity: Perceived complexity for `validate_review_state_compatibility!` is too high. [11/8]", 3899925007], + [453, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 2530059826], + [460, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861331] + ], + "lib/markdown/merge/output_builder.rb:48145848": [ + [23, 5, 8640, "Metrics/ClassLength: Class has too many lines. [115/100]", 1155429967], + [47, 7, 2071, "Metrics/AbcSize: Assignment Branch Condition size for `add_node_source` is too high. [<6, 15, 12> 20.12/17]", 555854176], + [47, 7, 2071, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `add_node_source` is too high. [12/7]", 555854176], + [47, 7, 2071, "Metrics/MethodLength: Method has too many lines. [15/10]", 555854176], + [47, 7, 2071, "Metrics/PerceivedComplexity: Perceived complexity for `add_node_source` is too high. [12/8]", 555854176], + [60, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 527167630], + [61, 121, 67, "Layout/LineLength: Line is too long. [187/120]", 2893319489], + [62, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 2876999963], + [63, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 4139918410], + [92, 38, 9, "Style/NumericPredicate: Use `count.positive?` instead of `count > 0`.", 3986027816], + [122, 7, 370, "Metrics/MethodLength: Method has too many lines. [11/10]", 616591631], + [224, 7, 878, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_parser_node_source` is too high. [10/7]", 227721314], + [224, 7, 878, "Metrics/MethodLength: Method has too many lines. [13/10]", 227721314], + [224, 7, 878, "Metrics/PerceivedComplexity: Perceived complexity for `extract_parser_node_source` is too high. [11/8]", 227721314] + ], + "lib/markdown/merge/partial_template_merger.rb:3110525012": [ + [32, 5, 20691, "Metrics/ClassLength: Class has too many lines. [336/100]", 496419120], + [71, 7, 1040, "Metrics/MethodLength: Method has too many lines. [17/10]", 2144648319], + [71, 21, 417, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 1226086326], + [109, 7, 1065, "Metrics/AbcSize: Assignment Branch Condition size for `merge` is too high. [<7, 19, 6> 21.12/17]", 3976180000], + [109, 7, 1065, "Metrics/MethodLength: Method has too many lines. [25/10]", 3976180000], + [145, 7, 912, "Metrics/MethodLength: Method has too many lines. [15/10]", 2077585004], + [265, 7, 1401, "Metrics/AbcSize: Assignment Branch Condition size for `find_section_end` is too high. [<8, 28, 11> 31.13/17]", 1420600674], + [265, 7, 1401, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_section_end` is too high. [10/7]", 1420600674], + [265, 7, 1401, "Metrics/MethodLength: Method has too many lines. [20/10]", 1420600674], + [265, 7, 1401, "Metrics/PerceivedComplexity: Perceived complexity for `find_section_end` is too high. [10/8]", 1420600674], + [311, 7, 1101, "Metrics/AbcSize: Assignment Branch Condition size for `node_to_source` is too high. [<6, 15, 15> 22.05/17]", 3635207151], + [311, 7, 1101, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `node_to_source` is too high. [13/7]", 3635207151], + [311, 7, 1101, "Metrics/MethodLength: Method has too many lines. [20/10]", 3635207151], + [311, 7, 1101, "Metrics/PerceivedComplexity: Perceived complexity for `node_to_source` is too high. [14/8]", 3635207151], + [318, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [323, 42, 14, "Style/NumericPredicate: Use `start_line.positive?` instead of `start_line > 0`.", 792111162], + [345, 7, 643, "Metrics/MethodLength: Method has too many lines. [17/10]", 998852567], + [364, 34, 10, "Style/NumericPredicate: Use `value.zero?` instead of `value == 0`.", 4076387742], + [367, 7, 2760, "Metrics/AbcSize: Assignment Branch Condition size for `preserved_destination_insertions` is too high. [<19, 28, 14> 36.62/17]", 414221184], + [367, 7, 2760, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preserved_destination_insertions` is too high. [13/7]", 414221184], + [367, 7, 2760, "Metrics/MethodLength: Method has too many lines. [49/10]", 414221184], + [367, 7, 2760, "Metrics/PerceivedComplexity: Perceived complexity for `preserved_destination_insertions` is too high. [15/8]", 414221184], + [381, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 682972477], + [426, 7, 1058, "Metrics/MethodLength: Method has too many lines. [16/10]", 932075153], + [475, 7, 1040, "Metrics/AbcSize: Assignment Branch Condition size for `render_template_with_preserved_insertions` is too high. [<10, 18, 10> 22.89/17]", 1699694974], + [475, 7, 1040, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `render_template_with_preserved_insertions` is too high. [9/7]", 1699694974], + [475, 7, 1040, "Metrics/MethodLength: Method has too many lines. [21/10]", 1699694974], + [475, 7, 1040, "Metrics/PerceivedComplexity: Perceived complexity for `render_template_with_preserved_insertions` is too high. [9/8]", 1699694974], + [504, 7, 454, "Metrics/MethodLength: Method has too many lines. [12/10]", 3433907112] + ], + "lib/markdown/merge/preservation_support.rb:3687269889": [ + [13, 5, 10105, "Metrics/ModuleLength: Module has too many lines. [212/100]", 674454], + [24, 7, 572, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `standalone_comment_node?` is too high. [9/7]", 349869031], + [24, 7, 572, "Metrics/PerceivedComplexity: Perceived complexity for `standalone_comment_node?` is too high. [9/8]", 349869031], + [116, 7, 655, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `remove_plan_preserved_comment_regions` is too high. [8/7]", 2103873816], + [116, 7, 655, "Metrics/MethodLength: Method has too many lines. [12/10]", 2103873816], + [178, 7, 1301, "Metrics/AbcSize: Assignment Branch Condition size for `remove_plan_comment_insertion_specs` is too high. [<5, 22, 8> 23.94/17]", 698043371], + [178, 7, 1301, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `remove_plan_comment_insertion_specs` is too high. [9/7]", 698043371], + [178, 7, 1301, "Metrics/MethodLength: Method has too many lines. [22/10]", 698043371], + [178, 7, 1301, "Metrics/PerceivedComplexity: Perceived complexity for `remove_plan_comment_insertion_specs` is too high. [9/8]", 698043371], + [193, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045570401], + [217, 7, 737, "Metrics/MethodLength: Method has too many lines. [13/10]", 3882071587], + [248, 28, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [271, 7, 704, "Metrics/MethodLength: Method has too many lines. [13/10]", 2605835865], + [271, 52, 139, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1766111143] + ], + "lib/markdown/merge/smart_merger.rb:1245982439": [ + [151, 7, 1405, "Metrics/MethodLength: Method has too many lines. [19/10]", 2830703815], + [151, 21, 501, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [13/5]", 1104874368], + [229, 7, 1140, "Metrics/AbcSize: Assignment Branch Condition size for `node_to_source` is too high. [<5, 15, 9> 18.19/17]", 1515173572], + [229, 7, 1140, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `node_to_source` is too high. [9/7]", 1515173572], + [229, 7, 1140, "Metrics/MethodLength: Method has too many lines. [13/10]", 1515173572], + [229, 7, 1140, "Metrics/PerceivedComplexity: Perceived complexity for `node_to_source` is too high. [10/8]", 1515173572] + ], + "lib/markdown/merge/smart_merger_base.rb:950545235": [ + [43, 5, 59104, "Metrics/ClassLength: Class has too many lines. [984/100]", 1046238359], + [148, 7, 3731, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<20, 19, 10> 29.34/17]", 50319656], + [148, 7, 3731, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `initialize` is too high. [11/7]", 50319656], + [148, 7, 3731, "Metrics/MethodLength: Method has too many lines. [66/10]", 50319656], + [148, 7, 3731, "Metrics/PerceivedComplexity: Perceived complexity for `initialize` is too high. [9/8]", 50319656], + [148, 21, 606, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [17/5]", 4006929896], + [294, 7, 1760, "Metrics/AbcSize: Assignment Branch Condition size for `merge_result` is too high. [<15, 19, 7> 25.2/17]", 3628731818], + [294, 7, 1760, "Metrics/MethodLength: Method has too many lines. [31/10]", 3628731818], + [297, 25, 1662, "Metrics/BlockLength: Block has too many lines. [28/25]", 1167387512], + [343, 7, 1195, "Metrics/AbcSize: Assignment Branch Condition size for `merge_with_debug` is too high. [<3, 20, 17> 26.42/17]", 1763663260], + [343, 7, 1195, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_with_debug` is too high. [18/7]", 1763663260], + [343, 7, 1195, "Metrics/MethodLength: Method has too many lines. [27/10]", 1763663260], + [343, 7, 1195, "Metrics/PerceivedComplexity: Perceived complexity for `merge_with_debug` is too high. [18/8]", 1763663260], + [383, 7, 1862, "Metrics/AbcSize: Assignment Branch Condition size for `prepare_runtime_session!` is too high. [<4, 24, 1> 24.35/17]", 546014873], + [383, 7, 1862, "Metrics/MethodLength: Method has too many lines. [45/10]", 546014873], + [432, 7, 1064, "Metrics/MethodLength: Method has too many lines. [21/10]", 214902707], + [490, 7, 438, "Metrics/MethodLength: Method has too many lines. [11/10]", 1759076310], + [505, 31, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [529, 7, 788, "Metrics/MethodLength: Method has too many lines. [13/10]", 690316762], + [553, 7, 1538, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_cross_source_preamble_prefixes` is too high. [<9, 18, 6> 21/17]", 1970988374], + [553, 7, 1538, "Metrics/MethodLength: Method has too many lines. [25/10]", 1970988374], + [586, 7, 644, "Metrics/AbcSize: Assignment Branch Condition size for `leading_standalone_comment_run` is too high. [<8, 14, 7> 17.58/17]", 4188914818], + [586, 7, 644, "Metrics/MethodLength: Method has too many lines. [17/10]", 4188914818], + [614, 7, 1576, "Metrics/AbcSize: Assignment Branch Condition size for `process_alignment` is too high. [<15, 14, 10> 22.83/17]", 3967135783], + [614, 7, 1576, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `process_alignment` is too high. [11/7]", 3967135783], + [614, 7, 1576, "Metrics/MethodLength: Method has too many lines. [31/10]", 3967135783], + [614, 7, 1576, "Metrics/PerceivedComplexity: Perceived complexity for `process_alignment` is too high. [9/8]", 3967135783], + [656, 7, 2871, "Metrics/AbcSize: Assignment Branch Condition size for `process_match_to_builder` is too high. [<17, 39, 19> 46.59/17]", 608053079], + [656, 7, 2871, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `process_match_to_builder` is too high. [19/7]", 608053079], + [656, 7, 2871, "Metrics/MethodLength: Method has too many lines. [50/10]", 608053079], + [656, 7, 2871, "Metrics/PerceivedComplexity: Perceived complexity for `process_match_to_builder` is too high. [18/8]", 608053079], + [720, 7, 867, "Metrics/MethodLength: Method has too many lines. [18/10]", 2946023513], + [764, 7, 670, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `consumed_link_definitions_within` is too high. [8/7]", 2596009659], + [764, 7, 670, "Metrics/MethodLength: Method has too many lines. [11/10]", 2596009659], + [774, 9, 8, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 359839059], + [782, 45, 50, "Style/ClassEqualityComparison: Use `instance_of?(::RSpec::Mocks::MockExpectationError)` instead of comparing classes.", 952914844], + [797, 7, 939, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_node_typing` is too high. [8/7]", 2526108526], + [797, 7, 939, "Metrics/MethodLength: Method has too many lines. [14/10]", 2526108526], + [849, 7, 1297, "Metrics/AbcSize: Assignment Branch Condition size for `try_inner_merge_list_to_builder` is too high. [<8, 20, 8> 22.98/17]", 2844551967], + [849, 7, 1297, "Metrics/MethodLength: Method has too many lines. [25/10]", 2844551967], + [849, 42, 71, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3479074024], + [885, 7, 1361, "Metrics/AbcSize: Assignment Branch Condition size for `try_inner_merge_code_block_to_builder` is too high. [<7, 19, 6> 21.12/17]", 2468334280], + [885, 7, 1361, "Metrics/MethodLength: Method has too many lines. [29/10]", 2468334280], + [885, 48, 71, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3479074024], + [918, 7, 1923, "Metrics/AbcSize: Assignment Branch Condition size for `remap_delegated_unresolved_cases` is too high. [<8, 23, 5> 24.86/17]", 2261924082], + [918, 7, 1923, "Metrics/MethodLength: Method has too many lines. [35/10]", 2261924082], + [922, 9, 1535, "Metrics/BlockLength: Block has too many lines. [31/25]", 838301956], + [983, 7, 657, "Metrics/MethodLength: Method has too many lines. [15/10]", 4047906352], + [1027, 7, 411, "Metrics/MethodLength: Method has too many lines. [13/10]", 4206078535], + [1053, 7, 3160, "Metrics/AbcSize: Assignment Branch Condition size for `process_dest_only_to_builder` is too high. [<14, 41, 24> 49.53/17]", 1311626075], + [1053, 7, 3160, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `process_dest_only_to_builder` is too high. [25/7]", 1311626075], + [1053, 7, 3160, "Metrics/MethodLength: Method has too many lines. [51/10]", 1311626075], + [1053, 7, 3160, "Metrics/PerceivedComplexity: Perceived complexity for `process_dest_only_to_builder` is too high. [25/8]", 1311626075], + [1053, 39, 177, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2740785193], + [1167, 7, 395, "Metrics/MethodLength: Method has too many lines. [11/10]", 433430016], + [1204, 7, 465, "Metrics/MethodLength: Method has too many lines. [12/10]", 1101864061], + [1261, 7, 861, "Metrics/MethodLength: Method has too many lines. [16/10]", 2380789170], + [1314, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193431734], + [1317, 7, 1039, "Metrics/AbcSize: Assignment Branch Condition size for `kept_node_for_link_ownership` is too high. [<4, 17, 9> 19.65/17]", 849664480], + [1317, 7, 1039, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `kept_node_for_link_ownership` is too high. [8/7]", 849664480], + [1317, 7, 1039, "Metrics/MethodLength: Method has too many lines. [24/10]", 849664480], + [1348, 7, 797, "Metrics/MethodLength: Method has too many lines. [12/10]", 3928797316], + [1384, 7, 610, "Metrics/AbcSize: Assignment Branch Condition size for `link_reference_signatures_within` is too high. [<6, 15, 6> 17.23/17]", 2255263809], + [1390, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177625], + [1457, 7, 1360, "Metrics/MethodLength: Method has too many lines. [19/10]", 1607654950] + ], + "lib/markdown/merge/table_match_algorithm.rb:784102633": [ + [31, 5, 17084, "Metrics/ClassLength: Class has too many lines. [241/100]", 3870100216], + [71, 21, 130, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2234186342], + [86, 7, 537, "Metrics/MethodLength: Method has too many lines. [11/10]", 695685542], + [112, 7, 872, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<13, 29, 8> 32.77/17]", 3623880915], + [112, 7, 872, "Metrics/MethodLength: Method has too many lines. [20/10]", 3623880915], + [264, 7, 1291, "Metrics/AbcSize: Assignment Branch Condition size for `collect_text_recursive` is too high. [<5, 22, 13> 26.04/17]", 1898702827], + [264, 7, 1291, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_text_recursive` is too high. [12/7]", 1898702827], + [264, 7, 1291, "Metrics/MethodLength: Method has too many lines. [26/10]", 1898702827], + [264, 7, 1291, "Metrics/PerceivedComplexity: Perceived complexity for `collect_text_recursive` is too high. [15/8]", 1898702827], + [292, 24, 43, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 2747201274], + [303, 7, 644, "Metrics/AbcSize: Assignment Branch Condition size for `compute_header_match` is too high. [<6, 20, 9> 22.74/17]", 2910662900], + [303, 7, 644, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_header_match` is too high. [10/7]", 2910662900], + [303, 7, 644, "Metrics/MethodLength: Method has too many lines. [11/10]", 2910662900], + [303, 7, 644, "Metrics/PerceivedComplexity: Perceived complexity for `compute_header_match` is too high. [10/8]", 2910662900], + [330, 7, 927, "Metrics/AbcSize: Assignment Branch Condition size for `compute_first_column_match` is too high. [<14, 22, 14> 29.6/17]", 2043865784], + [330, 7, 927, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_first_column_match` is too high. [14/7]", 2043865784], + [330, 7, 927, "Metrics/MethodLength: Method has too many lines. [15/10]", 2043865784], + [330, 7, 927, "Metrics/PerceivedComplexity: Perceived complexity for `compute_first_column_match` is too high. [14/8]", 2043865784], + [331, 28, 19, "Style/SymbolProc: Pass `&:first` as an argument to `map` instead of a block.", 2561207191], + [332, 28, 19, "Style/SymbolProc: Pass `&:first` as an argument to `map` instead of a block.", 2561207191], + [352, 9, 15, "Style/NumericPredicate: Use `total_cells.positive?` instead of `total_cells > 0`.", 1010733923], + [362, 7, 1037, "Metrics/AbcSize: Assignment Branch Condition size for `compute_row_content_match` is too high. [<10, 15, 12> 21.66/17]", 1855353124], + [362, 7, 1037, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_row_content_match` is too high. [11/7]", 1855353124], + [362, 7, 1037, "Metrics/MethodLength: Method has too many lines. [21/10]", 1855353124], + [362, 7, 1037, "Metrics/PerceivedComplexity: Perceived complexity for `compute_row_content_match` is too high. [11/8]", 1855353124], + [404, 23, 14, "Style/NumericPredicate: Use `max_cells.zero?` instead of `max_cells == 0`.", 2427124139], + [423, 7, 1091, "Metrics/AbcSize: Assignment Branch Condition size for `compute_total_cells_match` is too high. [<14, 18, 12> 25.77/17]", 413080451], + [423, 7, 1091, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_total_cells_match` is too high. [11/7]", 413080451], + [423, 7, 1091, "Metrics/MethodLength: Method has too many lines. [24/10]", 413080451], + [423, 7, 1091, "Metrics/PerceivedComplexity: Perceived complexity for `compute_total_cells_match` is too high. [11/8]", 413080451], + [492, 23, 17, "Style/NumericPredicate: Use `total_weight.zero?` instead of `total_weight == 0`.", 3158357864] + ], + "lib/markdown/merge/table_match_refiner.rb:4203940079": [ + [118, 35, 50, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1492696344] + ], + "lib/markdown/merge/whitespace_normalizer.rb:121777318": [ + [33, 5, 6779, "Metrics/ClassLength: Class has too many lines. [115/100]", 3048764740], + [103, 7, 418, "Metrics/MethodLength: Method has too many lines. [11/10]", 3165373284], + [126, 7, 1750, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_excessive_blank_lines` is too high. [<12, 12, 10> 19.7/17]", 1435694128], + [126, 7, 1750, "Metrics/MethodLength: Method has too many lines. [36/10]", 1435694128], + [188, 7, 1270, "Metrics/AbcSize: Assignment Branch Condition size for `remove_blank_lines_between_link_refs` is too high. [<12, 22, 13> 28.23/17]", 1324661552], + [188, 7, 1270, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `remove_blank_lines_between_link_refs` is too high. [9/7]", 1324661552], + [188, 7, 1270, "Metrics/MethodLength: Method has too many lines. [29/10]", 1324661552], + [188, 7, 1270, "Metrics/PerceivedComplexity: Perceived complexity for `remove_blank_lines_between_link_refs` is too high. [10/8]", 1324661552], + [207, 15, 54, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 831575245] + ], + "lib/markdown/merge/wrapper_support.rb:1758973456": [ + [6, 5, 7266, "Metrics/ModuleLength: Module has too many lines. [161/100]", 2849920033], + [29, 7, 1214, "Metrics/MethodLength: Method has too many lines. [19/10]", 1280688859], + [29, 19, 250, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 4150728370], + [78, 7, 1452, "Metrics/MethodLength: Method has too many lines. [18/10]", 3670315588], + [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:3964894686": [ + [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ], + "spec/fixtures_integration_spec.rb:1958067822": [ + [3, 1, 15884, "Metrics/BlockLength: Block has too many lines. [383/25]", 1004800925] + ] +} From d43cef6a387c39c79aeed60b52958fa78f76d0f6 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:25:24 -0600 Subject: [PATCH 221/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/markdown-merge/Gemfile.lock | 382 +++---------------------------- 1 file changed, 31 insertions(+), 351 deletions(-) diff --git a/gems/markdown-merge/Gemfile.lock b/gems/markdown-merge/Gemfile.lock index 754580c70..95a1a75be 100644 --- a/gems/markdown-merge/Gemfile.lock +++ b/gems/markdown-merge/Gemfile.lock @@ -17,39 +17,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -58,193 +26,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -252,45 +34,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -310,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -324,6 +61,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -379,6 +117,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -397,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -537,23 +283,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -587,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -618,7 +361,7 @@ GEM yard yard-relative_markdown_links (0.6.0) nokogiri (>= 1.14.3, < 2) - yard-timekeeper (0.2.3) + yard-timekeeper (0.2.4) version_gem (~> 1.1, >= 1.1.13) yard-yaml (0.2.3) version_gem (~> 1.1, >= 1.1.13) @@ -638,45 +381,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,61 +407,39 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +452,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +480,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +491,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,19 +518,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,27 +542,21 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd yard-relative_markdown_links (0.6.0) sha256=3e5ffa85cbad9bac70bee5421774b190fb25d3bdf489323a5b3534f647d1a70e - yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 + yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 9484d46e133106a050fb22212408b3159b35932d Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:26:06 -0600 Subject: [PATCH 222/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-crispr-markdown-markly/Gemfile.lock | 26 +- gems/ast-merge-git/.kettle-drift.lock | 60 ++- gems/ast-merge-git/Gemfile | 40 ++ gems/ast-merge-git/Gemfile.lock | 407 +++++++++++++++++-- gems/ast-merge/Gemfile | 68 ++-- gems/ast-merge/Rakefile | 18 +- gems/ast-merge/bin/yard | 2 +- gems/ast-merge/lib/ast/merge/version.rb | 2 +- gems/json-merge/.kettle-drift.lock | 60 ++- gems/json-merge/.rubocop_gradual.lock | 283 ------------- gems/json-merge/Gemfile | 40 ++ gems/json-merge/Gemfile.lock | 404 ++++++++++++++++-- gems/json-merge/bin/yard | 2 +- gems/json-merge/lib/json/merge/version.rb | 2 +- gems/markdown-merge/Gemfile.lock | 30 +- gems/markly-merge/Gemfile.lock | 13 +- gems/plain-merge/.kettle-drift.lock | 60 ++- gems/plain-merge/Gemfile | 40 ++ gems/plain-merge/Gemfile.lock | 331 +-------------- 19 files changed, 1044 insertions(+), 844 deletions(-) delete mode 100644 gems/json-merge/.rubocop_gradual.lock diff --git a/gems/ast-crispr-markdown-markly/Gemfile.lock b/gems/ast-crispr-markdown-markly/Gemfile.lock index 9afe832a7..7bc4ae187 100644 --- a/gems/ast-crispr-markdown-markly/Gemfile.lock +++ b/gems/ast-crispr-markdown-markly/Gemfile.lock @@ -16,22 +16,6 @@ PATH markly-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -43,6 +27,10 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) ast-merge (7.1.0) benchmark token-resolver (~> 2.0, >= 2.0.4) @@ -152,6 +140,10 @@ GEM tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -396,7 +388,6 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - ast-crispr! ast-crispr-markdown-markly! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) @@ -410,7 +401,6 @@ DEPENDENCIES kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-parser-gfm (~> 1.1) - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) rake (~> 13.0) diff --git a/gems/ast-merge-git/.kettle-drift.lock b/gems/ast-merge-git/.kettle-drift.lock index d3c2a2030..98e9f541b 100644 --- a/gems/ast-merge-git/.kettle-drift.lock +++ b/gems/ast-merge-git/.kettle-drift.lock @@ -7,7 +7,8 @@ 120, 160, 200, - 240 + 240, + 280 ] } ], @@ -19,7 +20,8 @@ 131, 171, 211, - 251 + 251, + 291 ] } ], @@ -31,7 +33,8 @@ 121, 161, 201, - 241 + 241, + 281 ] } ], @@ -43,7 +46,8 @@ 133, 173, 213, - 253 + 253, + 293 ] } ], @@ -55,7 +59,8 @@ 136, 176, 216, - 256 + 256, + 296 ] } ], @@ -67,7 +72,8 @@ 122, 162, 202, - 242 + 242, + 282 ] } ], @@ -80,7 +86,8 @@ 140, 180, 220, - 260 + 260, + 300 ] } ], @@ -92,7 +99,8 @@ 141, 181, 221, - 261 + 261, + 301 ] } ], @@ -105,7 +113,8 @@ 127, 167, 207, - 247 + 247, + 287 ] } ], @@ -117,7 +126,8 @@ 150, 190, 230, - 270 + 270, + 310 ] } ], @@ -130,7 +140,8 @@ 119, 159, 199, - 239 + 239, + 279 ] } ], @@ -143,7 +154,8 @@ 149, 189, 229, - 269 + 269, + 309 ] } ], @@ -155,7 +167,8 @@ 125, 165, 205, - 245 + 245, + 285 ] } ], @@ -168,7 +181,8 @@ 132, 172, 212, - 252 + 252, + 292 ] } ], @@ -181,7 +195,8 @@ 128, 168, 208, - 248 + 248, + 288 ] } ], @@ -193,7 +208,8 @@ 126, 166, 206, - 246 + 246, + 286 ] } ], @@ -205,7 +221,8 @@ 143, 183, 223, - 263 + 263, + 303 ] } ], @@ -217,7 +234,8 @@ 142, 182, 222, - 262 + 262, + 302 ] } ], @@ -229,7 +247,8 @@ 137, 177, 217, - 257 + 257, + 297 ] } ], @@ -241,7 +260,8 @@ 146, 186, 226, - 266 + 266, + 306 ] } ], diff --git a/gems/ast-merge-git/Gemfile b/gems/ast-merge-git/Gemfile index 9087f2b95..2b20b477a 100644 --- a/gems/ast-merge-git/Gemfile +++ b/gems/ast-merge-git/Gemfile @@ -272,6 +272,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/ast-merge-git/Gemfile.lock b/gems/ast-merge-git/Gemfile.lock index 4681158d7..24bd36523 100644 --- a/gems/ast-merge-git/Gemfile.lock +++ b/gems/ast-merge-git/Gemfile.lock @@ -16,6 +16,281 @@ PATH json-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -27,11 +302,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +310,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -48,7 +324,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -98,25 +373,12 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -135,6 +397,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -274,25 +537,23 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -326,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -377,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-drift! + kettle-jem! + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -402,39 +685,61 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -447,20 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -475,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -486,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -513,17 +830,19 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -537,14 +856,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -552,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ast-merge/Gemfile b/gems/ast-merge/Gemfile index 424fd7944..883a8e0dc 100644 --- a/gems/ast-merge/Gemfile +++ b/gems/ast-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source "https://gem.coop" +source 'https://gem.coop' git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,57 +19,53 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ["~> 1.0", ">= 1.0.8"] -gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ['~> 1.0', '>= 1.0.8'] +gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ tree_haver ] -direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") +direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? if direct_sibling_gems.any? && - (direct_sibling_local || - ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) - direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") - direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) begin nomono_activation_requirements = nomono_requirements - nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) if File.file?(nomono_lockfile) nomono_locked_spec = Bundler::LockfileParser - .new(Bundler.read_file(nomono_lockfile)) - .specs - .find { |spec| spec.name == "nomono" } + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } nomono_locked = nomono_locked_spec && - Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) - if nomono_locked - nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] - end - end - Kernel.send(:gem, "nomono", *nomono_activation_requirements) - require "nomono/bundler" - if direct_sibling_templating && !direct_sibling_local - ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local eval_nomono_gems( gems: direct_sibling_gems, - prefix: "STRUCTUREDMERGE", - path_env: "STRUCTUREDMERGE_DEV", - root: ["src", "my", "structuredmerge"] + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] ) rescue LoadError - warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' ensure if direct_sibling_templating && !direct_sibling_local if direct_sibling_dev_was_set - ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original else - ENV.delete("STRUCTUREDMERGE_DEV") + ENV.delete('STRUCTUREDMERGE_DEV') end end end @@ -333,25 +329,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging -eval_gemfile "gemfiles/modular/debug.gemfile" +eval_gemfile 'gemfiles/modular/debug.gemfile' # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile "gemfiles/modular/coverage.gemfile" +eval_gemfile 'gemfiles/modular/coverage.gemfile' # Linting -eval_gemfile "gemfiles/modular/style.gemfile" +eval_gemfile 'gemfiles/modular/style.gemfile' # Documentation -eval_gemfile "gemfiles/modular/documentation.gemfile" +eval_gemfile 'gemfiles/modular/documentation.gemfile' # Optional -eval_gemfile "gemfiles/modular/optional.gemfile" +eval_gemfile 'gemfiles/modular/optional.gemfile' ### Std Lib Extracted Gems -eval_gemfile "gemfiles/modular/x_std_libs.gemfile" +eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' # See unlocked_deps appraisal for more details on irb inclusion -gem "irb", "~> 1.17" # ruby >= 2.7 +gem 'irb', '~> 1.17' # ruby >= 2.7 diff --git a/gems/ast-merge/Rakefile b/gems/ast-merge/Rakefile index 6b4e21dec..339c9a3cb 100644 --- a/gems/ast-merge/Rakefile +++ b/gems/ast-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require "kettle/drift" + require 'kettle/drift' Kettle::Drift.install_tasks rescue LoadError - desc("(stub) kettle:drift:check is unavailable") - task("kettle:drift:check") do + desc('(stub) kettle:drift:check is unavailable') + task('kettle:drift:check') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:update is unavailable") - task("kettle:drift:update") do + desc('(stub) kettle:drift:update is unavailable') + task('kettle:drift:update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:force_update is unavailable") - task("kettle:drift:force_update") do + desc('(stub) kettle:drift:force_update is unavailable') + task('kettle:drift:force_update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift is unavailable") - task("kettle:drift" => "kettle:drift:update") + desc('(stub) kettle:drift is unavailable') + task('kettle:drift' => 'kettle:drift:update') end ### TEMPLATING TASKS diff --git a/gems/ast-merge/bin/yard b/gems/ast-merge/bin/yard index a7e8b6eed..5d516ad6f 100755 --- a/gems/ast-merge/bin/yard +++ b/gems/ast-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec("bundle", "exec", "rake", "yard") +exec('bundle', 'exec', 'rake', 'yard') diff --git a/gems/ast-merge/lib/ast/merge/version.rb b/gems/ast-merge/lib/ast/merge/version.rb index 3ef823f4d..6e7dc90f7 100644 --- a/gems/ast-merge/lib/ast/merge/version.rb +++ b/gems/ast-merge/lib/ast/merge/version.rb @@ -3,7 +3,7 @@ module Ast module Merge module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/json-merge/.kettle-drift.lock b/gems/json-merge/.kettle-drift.lock index d3c2a2030..98e9f541b 100644 --- a/gems/json-merge/.kettle-drift.lock +++ b/gems/json-merge/.kettle-drift.lock @@ -7,7 +7,8 @@ 120, 160, 200, - 240 + 240, + 280 ] } ], @@ -19,7 +20,8 @@ 131, 171, 211, - 251 + 251, + 291 ] } ], @@ -31,7 +33,8 @@ 121, 161, 201, - 241 + 241, + 281 ] } ], @@ -43,7 +46,8 @@ 133, 173, 213, - 253 + 253, + 293 ] } ], @@ -55,7 +59,8 @@ 136, 176, 216, - 256 + 256, + 296 ] } ], @@ -67,7 +72,8 @@ 122, 162, 202, - 242 + 242, + 282 ] } ], @@ -80,7 +86,8 @@ 140, 180, 220, - 260 + 260, + 300 ] } ], @@ -92,7 +99,8 @@ 141, 181, 221, - 261 + 261, + 301 ] } ], @@ -105,7 +113,8 @@ 127, 167, 207, - 247 + 247, + 287 ] } ], @@ -117,7 +126,8 @@ 150, 190, 230, - 270 + 270, + 310 ] } ], @@ -130,7 +140,8 @@ 119, 159, 199, - 239 + 239, + 279 ] } ], @@ -143,7 +154,8 @@ 149, 189, 229, - 269 + 269, + 309 ] } ], @@ -155,7 +167,8 @@ 125, 165, 205, - 245 + 245, + 285 ] } ], @@ -168,7 +181,8 @@ 132, 172, 212, - 252 + 252, + 292 ] } ], @@ -181,7 +195,8 @@ 128, 168, 208, - 248 + 248, + 288 ] } ], @@ -193,7 +208,8 @@ 126, 166, 206, - 246 + 246, + 286 ] } ], @@ -205,7 +221,8 @@ 143, 183, 223, - 263 + 263, + 303 ] } ], @@ -217,7 +234,8 @@ 142, 182, 222, - 262 + 262, + 302 ] } ], @@ -229,7 +247,8 @@ 137, 177, 217, - 257 + 257, + 297 ] } ], @@ -241,7 +260,8 @@ 146, 186, 226, - 266 + 266, + 306 ] } ], diff --git a/gems/json-merge/.rubocop_gradual.lock b/gems/json-merge/.rubocop_gradual.lock deleted file mode 100644 index 1f13b2bf6..000000000 --- a/gems/json-merge/.rubocop_gradual.lock +++ /dev/null @@ -1,283 +0,0 @@ -{ - ".simplecov:3644224046": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:2931360525": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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:1457364349": [ - [16, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1168797721], - [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ], - "lib/json-merge.rb:4173905501": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`json-merge.rb`) should use snake_case.", 5381] - ], - "lib/json/merge.rb:2128431218": [ - [11, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Json::Merge`.", 2866359175], - [11, 3, 9848, "Metrics/ModuleLength: Module has too many lines. [271/100]", 4082365503], - [21, 5, 16, "Style/Documentation: Missing top-level documentation comment for `class Json::Merge::ParseError`.", 362242086], - [65, 5, 941, "Metrics/AbcSize: Assignment Branch Condition size for `parse_json` is too high. [<3, 19, 9> 21.24/17]", 2519832432], - [65, 5, 941, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_json` is too high. [8/7]", 2519832432], - [65, 5, 941, "Metrics/MethodLength: Method has too many lines. [24/10]", 2519832432], - [98, 5, 780, "Metrics/MethodLength: Method has too many lines. [17/10]", 3747710599], - [131, 5, 621, "Metrics/AbcSize: Assignment Branch Condition size for `json_value_for_source` is too high. [<3, 17, 7> 18.63/17]", 3652201615], - [131, 5, 621, "Metrics/MethodLength: Method has too many lines. [11/10]", 3652201615], - [147, 5, 759, "Metrics/AbcSize: Assignment Branch Condition size for `json_value_for_node` is too high. [<6, 21, 12> 24.92/17]", 2618715974], - [147, 5, 759, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `json_value_for_node` is too high. [13/7]", 2618715974], - [147, 5, 759, "Metrics/MethodLength: Method has too many lines. [23/10]", 2618715974], - [174, 5, 555, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `decode_json_string_literal` is too high. [11/7]", 4144578840], - [174, 5, 555, "Metrics/MethodLength: Method has too many lines. [16/10]", 4144578840], - [238, 5, 691, "Metrics/MethodLength: Method has too many lines. [18/10]", 4010630320], - [261, 5, 528, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_trailing_comma` is too high. [8/7]", 4057979016], - [261, 5, 528, "Metrics/MethodLength: Method has too many lines. [13/10]", 4057979016], - [302, 5, 787, "Metrics/AbcSize: Assignment Branch Condition size for `advance_scanner_state` is too high. [<8, 12, 24> 28/17]", 2437181548], - [302, 5, 787, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `advance_scanner_state` is too high. [15/7]", 2437181548], - [302, 5, 787, "Metrics/MethodLength: Method has too many lines. [25/10]", 2437181548], - [302, 5, 787, "Metrics/PerceivedComplexity: Perceived complexity for `advance_scanner_state` is too high. [17/8]", 2437181548] - ], - "lib/json/merge/comment_tracker.rb:3472563198": [ - [19, 48, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] - ], - "lib/json/merge/conflict_resolver.rb:301712181": [ - [11, 5, 55081, "Metrics/ClassLength: Class has too many lines. [1053/100]", 4044265605], - [33, 7, 998, "Metrics/MethodLength: Method has too many lines. [16/10]", 2622185411], - [33, 21, 308, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [12/5]", 958959236], - [34, 121, 95, "Layout/LineLength: Line is too long. [215/120]", 3448296820], - [58, 7, 1143, "Metrics/MethodLength: Method has too many lines. [21/10]", 2302471255], - [107, 7, 4969, "Metrics/AbcSize: Assignment Branch Condition size for `merge_node_lists_to_emitter` is too high. [<29, 62, 22> 71.9/17]", 3145241362], - [107, 7, 4969, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_node_lists_to_emitter` is too high. [20/7]", 3145241362], - [107, 7, 4969, "Metrics/MethodLength: Method has too many lines. [82/10]", 3145241362], - [107, 7, 4969, "Metrics/PerceivedComplexity: Perceived complexity for `merge_node_lists_to_emitter` is too high. [22/8]", 3145241362], - [146, 9, 2759, "Metrics/BlockLength: Block has too many lines. [50/25]", 385678694], - [239, 7, 5585, "Metrics/AbcSize: Assignment Branch Condition size for `merge_matched_nodes_to_emitter` is too high. [<15, 45, 20> 51.48/17]", 3947285535], - [239, 7, 5585, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_matched_nodes_to_emitter` is too high. [17/7]", 3947285535], - [239, 7, 5585, "Metrics/MethodLength: Method has too many lines. [102/10]", 3947285535], - [239, 7, 5585, "Metrics/PerceivedComplexity: Perceived complexity for `merge_matched_nodes_to_emitter` is too high. [21/8]", 3947285535], - [277, 13, 1934, "Metrics/BlockLength: Block has too many lines. [31/25]", 884303795], - [306, 17, 181, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 898629436], - [363, 7, 895, "Metrics/MethodLength: Method has too many lines. [23/10]", 2982353847], - [392, 7, 718, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preference_for_pair` is too high. [8/7]", 3339910669], - [392, 7, 718, "Metrics/MethodLength: Method has too many lines. [12/10]", 3339910669], - [418, 7, 1636, "Metrics/MethodLength: Method has too many lines. [37/10]", 514235298], - [473, 25, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [493, 7, 5501, "Metrics/AbcSize: Assignment Branch Condition size for `emit_node` is too high. [<18, 82, 31> 89.49/17]", 1826498333], - [493, 7, 5501, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_node` is too high. [29/7]", 1826498333], - [493, 7, 5501, "Metrics/MethodLength: Method has too many lines. [109/10]", 1826498333], - [493, 7, 5501, "Metrics/PerceivedComplexity: Perceived complexity for `emit_node` is too high. [36/8]", 1826498333], - [522, 15, 1572, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 3256756034], - [554, 15, 654, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 3730688879], - [569, 17, 287, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 3369588943], - [618, 7, 1424, "Metrics/AbcSize: Assignment Branch Condition size for `emit_atomic_node` is too high. [<7, 14, 7> 17.15/17]", 776263089], - [618, 7, 1424, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_atomic_node` is too high. [8/7]", 776263089], - [618, 7, 1424, "Metrics/MethodLength: Method has too many lines. [22/10]", 776263089], - [666, 7, 242, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `recursively_merge_pair_values?` is too high. [8/7]", 3319997574], - [682, 7, 1642, "Metrics/AbcSize: Assignment Branch Condition size for `preferred_available_inline_attachment` is too high. [<14, 14, 14> 24.25/17]", 1854381957], - [682, 7, 1642, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preferred_available_inline_attachment` is too high. [13/7]", 1854381957], - [682, 7, 1642, "Metrics/MethodLength: Method has too many lines. [27/10]", 1854381957], - [682, 7, 1642, "Metrics/PerceivedComplexity: Perceived complexity for `preferred_available_inline_attachment` is too high. [14/8]", 1854381957], - [682, 48, 154, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 358586640], - [687, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 4196003793], - [719, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], - [725, 33, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [730, 7, 1761, "Metrics/AbcSize: Assignment Branch Condition size for `emit_preferred_leading_comments_for` is too high. [<4, 39, 16> 42.34/17]", 1923098835], - [730, 7, 1761, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_preferred_leading_comments_for` is too high. [16/7]", 1923098835], - [730, 7, 1761, "Metrics/MethodLength: Method has too many lines. [26/10]", 1923098835], - [730, 7, 1761, "Metrics/PerceivedComplexity: Perceived complexity for `emit_preferred_leading_comments_for` is too high. [17/8]", 1923098835], - [764, 7, 1600, "Metrics/AbcSize: Assignment Branch Condition size for `emit_leading_comments_for` is too high. [<5, 37, 10> 38.65/17]", 2686936477], - [764, 7, 1600, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_leading_comments_for` is too high. [11/7]", 2686936477], - [764, 7, 1600, "Metrics/MethodLength: Method has too many lines. [26/10]", 2686936477], - [764, 7, 1600, "Metrics/PerceivedComplexity: Perceived complexity for `emit_leading_comments_for` is too high. [11/8]", 2686936477], - [765, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [799, 7, 1573, "Metrics/AbcSize: Assignment Branch Condition size for `canonical_leading_comment_region` is too high. [<8, 28, 14> 32.31/17]", 151098026], - [799, 7, 1573, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonical_leading_comment_region` is too high. [12/7]", 151098026], - [799, 7, 1573, "Metrics/MethodLength: Method has too many lines. [29/10]", 151098026], - [799, 7, 1573, "Metrics/PerceivedComplexity: Perceived complexity for `canonical_leading_comment_region` is too high. [12/8]", 151098026], - [837, 7, 1315, "Metrics/AbcSize: Assignment Branch Condition size for `canonical_tracked_leading_comments` is too high. [<8, 21, 12> 25.48/17]", 3806475230], - [837, 7, 1315, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonical_tracked_leading_comments` is too high. [11/7]", 3806475230], - [837, 7, 1315, "Metrics/MethodLength: Method has too many lines. [21/10]", 3806475230], - [837, 7, 1315, "Metrics/PerceivedComplexity: Perceived complexity for `canonical_tracked_leading_comments` is too high. [11/8]", 3806475230], - [867, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [872, 7, 574, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `dedup_warning_context` is too high. [9/7]", 840557709], - [872, 7, 574, "Metrics/PerceivedComplexity: Perceived complexity for `dedup_warning_context` is too high. [9/8]", 840557709], - [875, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [876, 48, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [877, 48, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [917, 7, 687, "Metrics/AbcSize: Assignment Branch Condition size for `equivalent_owner?` is too high. [<0, 17, 19> 25.5/17]", 1122406222], - [917, 7, 687, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `equivalent_owner?` is too high. [15/7]", 1122406222], - [917, 7, 687, "Metrics/MethodLength: Method has too many lines. [14/10]", 1122406222], - [917, 7, 687, "Metrics/PerceivedComplexity: Perceived complexity for `equivalent_owner?` is too high. [16/8]", 1122406222], - [957, 7, 762, "Metrics/MethodLength: Method has too many lines. [13/10]", 341822255], - [976, 7, 701, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `shared_line_comment_attachment_for` is too high. [9/7]", 2431043907], - [976, 7, 701, "Metrics/MethodLength: Method has too many lines. [13/10]", 2431043907], - [976, 7, 701, "Metrics/PerceivedComplexity: Perceived complexity for `shared_line_comment_attachment_for` is too high. [9/8]", 2431043907], - [1018, 7, 617, "Metrics/AbcSize: Assignment Branch Condition size for `emit_container_trailing_lines` is too high. [<2, 17, 3> 17.38/17]", 2119480325], - [1043, 7, 723, "Metrics/AbcSize: Assignment Branch Condition size for `trailing_container_line_range` is too high. [<4, 15, 11> 19.03/17]", 3162486186], - [1043, 7, 723, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trailing_container_line_range` is too high. [10/7]", 3162486186], - [1043, 7, 723, "Metrics/MethodLength: Method has too many lines. [13/10]", 3162486186], - [1043, 7, 723, "Metrics/PerceivedComplexity: Perceived complexity for `trailing_container_line_range` is too high. [11/8]", 3162486186], - [1061, 7, 503, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_comment_and_blank_lines_in_range` is too high. [9/7]", 2774366077], - [1061, 7, 503, "Metrics/MethodLength: Method has too many lines. [11/10]", 2774366077], - [1061, 7, 503, "Metrics/PerceivedComplexity: Perceived complexity for `emit_comment_and_blank_lines_in_range` is too high. [9/8]", 2774366077], - [1108, 7, 945, "Metrics/MethodLength: Method has too many lines. [14/10]", 1167897124], - [1155, 7, 832, "Metrics/AbcSize: Assignment Branch Condition size for `removed_inline_block_comment_at` is too high. [<6, 26, 7> 27.59/17]", 890096863], - [1155, 7, 832, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `removed_inline_block_comment_at` is too high. [8/7]", 890096863], - [1155, 7, 832, "Metrics/MethodLength: Method has too many lines. [19/10]", 890096863], - [1212, 7, 1587, "Metrics/AbcSize: Assignment Branch Condition size for `emit_document_prelude` is too high. [<12, 40, 22> 47.2/17]", 1354199117], - [1212, 7, 1587, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_document_prelude` is too high. [21/7]", 1354199117], - [1212, 7, 1587, "Metrics/MethodLength: Method has too many lines. [35/10]", 1354199117], - [1212, 7, 1587, "Metrics/PerceivedComplexity: Perceived complexity for `emit_document_prelude` is too high. [22/8]", 1354199117], - [1256, 7, 1281, "Metrics/AbcSize: Assignment Branch Condition size for `emit_document_postlude` is too high. [<9, 31, 21> 38.51/17]", 1869501446], - [1256, 7, 1281, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_document_postlude` is too high. [20/7]", 1869501446], - [1256, 7, 1281, "Metrics/MethodLength: Method has too many lines. [23/10]", 1869501446], - [1256, 7, 1281, "Metrics/PerceivedComplexity: Perceived complexity for `emit_document_postlude` is too high. [20/8]", 1869501446], - [1276, 121, 104, "Layout/LineLength: Line is too long. [224/120]", 1511565389], - [1288, 9, 48, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2339197345], - [1334, 7, 1002, "Metrics/AbcSize: Assignment Branch Condition size for `build_refined_matches` is too high. [<11, 16, 8> 21/17]", 2274245926], - [1334, 7, 1002, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_refined_matches` is too high. [9/7]", 2274245926], - [1334, 7, 1002, "Metrics/MethodLength: Method has too many lines. [18/10]", 2274245926], - [1334, 7, 1002, "Metrics/PerceivedComplexity: Perceived complexity for `build_refined_matches` is too high. [9/8]", 2274245926] - ], - "lib/json/merge/emitter.rb:3208422098": [ - [16, 5, 6329, "Metrics/ClassLength: Class has too many lines. [140/100]", 1868859478], - [183, 7, 586, "Metrics/MethodLength: Method has too many lines. [14/10]", 4015595961] - ], - "lib/json/merge/file_analysis.rb:1768951794": [ - [7, 5, 8750, "Metrics/ClassLength: Class has too many lines. [234/100]", 3986988439], - [20, 7, 897, "Metrics/MethodLength: Method has too many lines. [16/10]", 2945813957], - [83, 9, 6, "Naming/MemoizedInstanceVariableName: Memoized variable `@nodes` does not match method name `statements`. Use `@statements` instead.", 2756313398], - [182, 7, 530, "Metrics/MethodLength: Method has too many lines. [12/10]", 2217856870], - [202, 7, 601, "Metrics/MethodLength: Method has too many lines. [13/10]", 1694972597], - [222, 7, 679, "Metrics/AbcSize: Assignment Branch Condition size for `collect_parse_errors` is too high. [<1, 19, 11> 21.98/17]", 1780421309], - [222, 7, 679, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_parse_errors` is too high. [11/7]", 1780421309], - [222, 7, 679, "Metrics/MethodLength: Method has too many lines. [13/10]", 1780421309], - [222, 7, 679, "Metrics/PerceivedComplexity: Perceived complexity for `collect_parse_errors` is too high. [11/8]", 1780421309], - [239, 7, 1373, "Metrics/AbcSize: Assignment Branch Condition size for `extract_freeze_blocks` is too high. [<16, 23, 14> 31.32/17]", 2629976180], - [239, 7, 1373, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_freeze_blocks` is too high. [12/7]", 2629976180], - [239, 7, 1373, "Metrics/MethodLength: Method has too many lines. [33/10]", 2629976180], - [239, 7, 1373, "Metrics/PerceivedComplexity: Perceived complexity for `extract_freeze_blocks` is too high. [14/8]", 2629976180], - [283, 7, 575, "Metrics/AbcSize: Assignment Branch Condition size for `integrate_nodes_and_freeze_blocks` is too high. [<8, 19, 10> 22.91/17]", 1313409663], - [283, 7, 575, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `integrate_nodes_and_freeze_blocks` is too high. [11/7]", 1313409663], - [283, 7, 575, "Metrics/MethodLength: Method has too many lines. [13/10]", 1313409663], - [283, 7, 575, "Metrics/PerceivedComplexity: Perceived complexity for `integrate_nodes_and_freeze_blocks` is too high. [11/8]", 1313409663] - ], - "lib/json/merge/freeze_node.rb:340454761": [ - [11, 21, 97, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 4181995290] - ], - "lib/json/merge/merge_result.rb:1135594830": [ - [140, 7, 421, "Metrics/MethodLength: Method has too many lines. [11/10]", 2459390040] - ], - "lib/json/merge/node_wrapper.rb:3026997700": [ - [7, 5, 5691, "Metrics/ClassLength: Class has too many lines. [189/100]", 2496649131], - [71, 7, 397, "Metrics/MethodLength: Method has too many lines. [11/10]", 3404369104], - [173, 7, 1322, "Metrics/AbcSize: Assignment Branch Condition size for `compute_signature` is too high. [<10, 26, 24> 36.77/17]", 2934899487], - [173, 7, 1322, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_signature` is too high. [22/7]", 2934899487], - [173, 7, 1322, "Metrics/MethodLength: Method has too many lines. [41/10]", 2934899487], - [173, 7, 1322, "Metrics/PerceivedComplexity: Perceived complexity for `compute_signature` is too high. [18/8]", 2934899487], - [220, 7, 831, "Metrics/AbcSize: Assignment Branch Condition size for `extract_object_keys` is too high. [<8, 13, 10> 18.25/17]", 4156563372], - [220, 7, 831, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_object_keys` is too high. [10/7]", 4156563372], - [220, 7, 831, "Metrics/MethodLength: Method has too many lines. [22/10]", 4156563372], - [220, 7, 831, "Metrics/PerceivedComplexity: Perceived complexity for `extract_object_keys` is too high. [10/8]", 4156563372] - ], - "lib/json/merge/object_match_refiner.rb:337747923": [ - [29, 5, 10245, "Metrics/ClassLength: Class has too many lines. [143/100]", 1652456083], - [148, 7, 652, "Metrics/AbcSize: Assignment Branch Condition size for `compute_object_similarity` is too high. [<6, 18, 4> 19.39/17]", 1704835547], - [172, 7, 382, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_fuzzy_key_matches` is too high. [8/7]", 1938411487], - [226, 7, 709, "Metrics/MethodLength: Method has too many lines. [13/10]", 1853541937], - [277, 23, 9, "Style/NumericPredicate: Use `len1.zero?` instead of `len1 == 0`.", 913205219], - [277, 36, 9, "Style/NumericPredicate: Use `len2.zero?` instead of `len2 == 0`.", 871697920], - [278, 23, 9, "Style/NumericPredicate: Use `len1.zero?` instead of `len1 == 0`.", 913205219], - [278, 36, 9, "Style/NumericPredicate: Use `len2.zero?` instead of `len2 == 0`.", 871697920], - [305, 7, 854, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<13, 29, 8> 32.77/17]", 2946547420], - [305, 7, 854, "Metrics/MethodLength: Method has too many lines. [20/10]", 2946547420] - ], - "lib/json/merge/smart_merger.rb:1431245415": [ - [24, 5, 8706, "Metrics/ClassLength: Class has too many lines. [183/100]", 745649819], - [44, 7, 1369, "Metrics/MethodLength: Method has too many lines. [20/10]", 1509468182], - [44, 21, 472, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [15/5]", 700498762], - [117, 7, 1318, "Metrics/AbcSize: Assignment Branch Condition size for `merge_with_debug` is too high. [<3, 24, 7> 25.18/17]", 1535809936], - [117, 7, 1318, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_with_debug` is too high. [8/7]", 1535809936], - [117, 7, 1318, "Metrics/MethodLength: Method has too many lines. [30/10]", 1535809936], - [188, 7, 574, "Metrics/MethodLength: Method has too many lines. [13/10]", 1857730257], - [221, 7, 1053, "Metrics/MethodLength: Method has too many lines. [24/10]", 3329630813] - ], - "spec/fixtures_integration_spec.rb:2941021946": [ - [3, 1, 7914, "Metrics/BlockLength: Block has too many lines. [163/25]", 4258553307], - [85, 60, 25, "Style/SymbolProc: Pass `&:compact` as an argument to `map` instead of a block.", 2107480170], - [93, 59, 25, "Style/SymbolProc: Pass `&:compact` as an argument to `map` instead of a block.", 2107480170], - [157, 3, 801, "Metrics/BlockLength: Block has too many lines. [27/25]", 716259872] - ], - "spec/reproducible_merge_spec.rb:133932627": [ - [5, 1, 1854, "Metrics/BlockLength: Block has too many lines. [40/25]", 671932104] - ] -} diff --git a/gems/json-merge/Gemfile b/gems/json-merge/Gemfile index 0130bb0b7..3cfe7f4a6 100644 --- a/gems/json-merge/Gemfile +++ b/gems/json-merge/Gemfile @@ -272,6 +272,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/json-merge/Gemfile.lock b/gems/json-merge/Gemfile.lock index 84c77ede1..6807fdca5 100644 --- a/gems/json-merge/Gemfile.lock +++ b/gems/json-merge/Gemfile.lock @@ -16,6 +16,281 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -27,11 +302,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +310,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -48,7 +324,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -104,15 +379,6 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -131,6 +397,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,25 +537,23 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -322,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -373,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-drift! + kettle-jem! + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -398,38 +685,61 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -442,20 +752,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -470,10 +787,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -481,6 +802,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -508,17 +830,19 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -532,14 +856,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -547,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/json-merge/bin/yard b/gems/json-merge/bin/yard index 5d516ad6f..a7e8b6eed 100755 --- a/gems/json-merge/bin/yard +++ b/gems/json-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec('bundle', 'exec', 'rake', 'yard') +exec("bundle", "exec", "rake", "yard") diff --git a/gems/json-merge/lib/json/merge/version.rb b/gems/json-merge/lib/json/merge/version.rb index 13f521eb3..d02d9f1a5 100644 --- a/gems/json-merge/lib/json/merge/version.rb +++ b/gems/json-merge/lib/json/merge/version.rb @@ -3,7 +3,7 @@ module Json module Merge module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/markdown-merge/Gemfile.lock b/gems/markdown-merge/Gemfile.lock index 95a1a75be..0fdd2d4f9 100644 --- a/gems/markdown-merge/Gemfile.lock +++ b/gems/markdown-merge/Gemfile.lock @@ -16,24 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -45,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -335,6 +322,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,7 +373,6 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - ast-merge! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) debug (>= 1.1) @@ -411,7 +402,6 @@ DEPENDENCIES standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - tree_haver! tree_sitter_language_pack! yaml-converter (~> 0.1) yard (~> 0.9, >= 0.9.44) diff --git a/gems/markly-merge/Gemfile.lock b/gems/markly-merge/Gemfile.lock index c38641d2e..b51d50fa5 100644 --- a/gems/markly-merge/Gemfile.lock +++ b/gems/markly-merge/Gemfile.lock @@ -16,14 +16,6 @@ PATH markly (~> 0.9) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -139,6 +131,10 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) @@ -394,7 +390,6 @@ DEPENDENCIES kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-parser-gfm (~> 1.1) - markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) diff --git a/gems/plain-merge/.kettle-drift.lock b/gems/plain-merge/.kettle-drift.lock index d3c2a2030..98e9f541b 100644 --- a/gems/plain-merge/.kettle-drift.lock +++ b/gems/plain-merge/.kettle-drift.lock @@ -7,7 +7,8 @@ 120, 160, 200, - 240 + 240, + 280 ] } ], @@ -19,7 +20,8 @@ 131, 171, 211, - 251 + 251, + 291 ] } ], @@ -31,7 +33,8 @@ 121, 161, 201, - 241 + 241, + 281 ] } ], @@ -43,7 +46,8 @@ 133, 173, 213, - 253 + 253, + 293 ] } ], @@ -55,7 +59,8 @@ 136, 176, 216, - 256 + 256, + 296 ] } ], @@ -67,7 +72,8 @@ 122, 162, 202, - 242 + 242, + 282 ] } ], @@ -80,7 +86,8 @@ 140, 180, 220, - 260 + 260, + 300 ] } ], @@ -92,7 +99,8 @@ 141, 181, 221, - 261 + 261, + 301 ] } ], @@ -105,7 +113,8 @@ 127, 167, 207, - 247 + 247, + 287 ] } ], @@ -117,7 +126,8 @@ 150, 190, 230, - 270 + 270, + 310 ] } ], @@ -130,7 +140,8 @@ 119, 159, 199, - 239 + 239, + 279 ] } ], @@ -143,7 +154,8 @@ 149, 189, 229, - 269 + 269, + 309 ] } ], @@ -155,7 +167,8 @@ 125, 165, 205, - 245 + 245, + 285 ] } ], @@ -168,7 +181,8 @@ 132, 172, 212, - 252 + 252, + 292 ] } ], @@ -181,7 +195,8 @@ 128, 168, 208, - 248 + 248, + 288 ] } ], @@ -193,7 +208,8 @@ 126, 166, 206, - 246 + 246, + 286 ] } ], @@ -205,7 +221,8 @@ 143, 183, 223, - 263 + 263, + 303 ] } ], @@ -217,7 +234,8 @@ 142, 182, 222, - 262 + 262, + 302 ] } ], @@ -229,7 +247,8 @@ 137, 177, 217, - 257 + 257, + 297 ] } ], @@ -241,7 +260,8 @@ 146, 186, 226, - 266 + 266, + 306 ] } ], diff --git a/gems/plain-merge/Gemfile b/gems/plain-merge/Gemfile index 698643059..f4c3f25f7 100644 --- a/gems/plain-merge/Gemfile +++ b/gems/plain-merge/Gemfile @@ -272,6 +272,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/plain-merge/Gemfile.lock b/gems/plain-merge/Gemfile.lock index c020666f7..342dbad14 100644 --- a/gems/plain-merge/Gemfile.lock +++ b/gems/plain-merge/Gemfile.lock @@ -17,39 +17,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -58,193 +26,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -252,29 +34,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -294,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +116,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +283,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -618,7 +361,7 @@ GEM yard yard-relative_markdown_links (0.6.0) nokogiri (>= 1.14.3, < 2) - yard-timekeeper (0.2.3) + yard-timekeeper (0.2.4) version_gem (~> 1.1, >= 1.1.13) yard-yaml (0.2.3) version_gem (~> 1.1, >= 1.1.13) @@ -638,45 +381,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +407,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +440,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +452,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +479,11 @@ 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.0) plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +491,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +518,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +529,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,27 +542,21 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd yard-relative_markdown_links (0.6.0) sha256=3e5ffa85cbad9bac70bee5421774b190fb25d3bdf489323a5b3534f647d1a70e - yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 + yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 1496840d8c3c2f7f50333686c849c4fc714198af Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:26:08 -0600 Subject: [PATCH 223/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-merge-git/Gemfile.lock | 387 ++-------------------- gems/json-merge/bin/yard | 2 +- gems/json-merge/lib/json/merge/version.rb | 2 +- 3 files changed, 38 insertions(+), 353 deletions(-) diff --git a/gems/ast-merge-git/Gemfile.lock b/gems/ast-merge-git/Gemfile.lock index 24bd36523..6201b7630 100644 --- a/gems/ast-merge-git/Gemfile.lock +++ b/gems/ast-merge-git/Gemfile.lock @@ -17,31 +17,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -50,247 +26,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: json-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -310,12 +52,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -324,6 +60,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -379,6 +116,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -397,7 +143,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -537,23 +282,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -587,11 +334,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -618,7 +365,7 @@ GEM yard yard-relative_markdown_links (0.6.0) nokogiri (>= 1.14.3, < 2) - yard-timekeeper (0.2.3) + yard-timekeeper (0.2.4) version_gem (~> 1.1, >= 1.1.13) yard-yaml (0.2.3) version_gem (~> 1.1, >= 1.1.13) @@ -638,45 +385,25 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,61 +412,39 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +457,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +485,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +496,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,19 +523,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,27 +547,21 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd yard-relative_markdown_links (0.6.0) sha256=3e5ffa85cbad9bac70bee5421774b190fb25d3bdf489323a5b3534f647d1a70e - yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 + yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/json-merge/bin/yard b/gems/json-merge/bin/yard index a7e8b6eed..5d516ad6f 100755 --- a/gems/json-merge/bin/yard +++ b/gems/json-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec("bundle", "exec", "rake", "yard") +exec('bundle', 'exec', 'rake', 'yard') diff --git a/gems/json-merge/lib/json/merge/version.rb b/gems/json-merge/lib/json/merge/version.rb index d02d9f1a5..13f521eb3 100644 --- a/gems/json-merge/lib/json/merge/version.rb +++ b/gems/json-merge/lib/json/merge/version.rb @@ -3,7 +3,7 @@ module Json module Merge module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end From c7030a2df6e2d01414538c00622de0db5445b202 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:26:11 -0600 Subject: [PATCH 224/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/json-merge/.rubocop_gradual.lock | 283 +++++++++++++++++++ gems/json-merge/Gemfile.lock | 382 +++----------------------- gems/plain-merge/Gemfile.lock | 327 +++++++++++++++++++++- 3 files changed, 639 insertions(+), 353 deletions(-) create mode 100644 gems/json-merge/.rubocop_gradual.lock diff --git a/gems/json-merge/.rubocop_gradual.lock b/gems/json-merge/.rubocop_gradual.lock new file mode 100644 index 000000000..1f13b2bf6 --- /dev/null +++ b/gems/json-merge/.rubocop_gradual.lock @@ -0,0 +1,283 @@ +{ + ".simplecov:3644224046": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:2931360525": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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:1457364349": [ + [16, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1168797721], + [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ], + "lib/json-merge.rb:4173905501": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`json-merge.rb`) should use snake_case.", 5381] + ], + "lib/json/merge.rb:2128431218": [ + [11, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Json::Merge`.", 2866359175], + [11, 3, 9848, "Metrics/ModuleLength: Module has too many lines. [271/100]", 4082365503], + [21, 5, 16, "Style/Documentation: Missing top-level documentation comment for `class Json::Merge::ParseError`.", 362242086], + [65, 5, 941, "Metrics/AbcSize: Assignment Branch Condition size for `parse_json` is too high. [<3, 19, 9> 21.24/17]", 2519832432], + [65, 5, 941, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_json` is too high. [8/7]", 2519832432], + [65, 5, 941, "Metrics/MethodLength: Method has too many lines. [24/10]", 2519832432], + [98, 5, 780, "Metrics/MethodLength: Method has too many lines. [17/10]", 3747710599], + [131, 5, 621, "Metrics/AbcSize: Assignment Branch Condition size for `json_value_for_source` is too high. [<3, 17, 7> 18.63/17]", 3652201615], + [131, 5, 621, "Metrics/MethodLength: Method has too many lines. [11/10]", 3652201615], + [147, 5, 759, "Metrics/AbcSize: Assignment Branch Condition size for `json_value_for_node` is too high. [<6, 21, 12> 24.92/17]", 2618715974], + [147, 5, 759, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `json_value_for_node` is too high. [13/7]", 2618715974], + [147, 5, 759, "Metrics/MethodLength: Method has too many lines. [23/10]", 2618715974], + [174, 5, 555, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `decode_json_string_literal` is too high. [11/7]", 4144578840], + [174, 5, 555, "Metrics/MethodLength: Method has too many lines. [16/10]", 4144578840], + [238, 5, 691, "Metrics/MethodLength: Method has too many lines. [18/10]", 4010630320], + [261, 5, 528, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_trailing_comma` is too high. [8/7]", 4057979016], + [261, 5, 528, "Metrics/MethodLength: Method has too many lines. [13/10]", 4057979016], + [302, 5, 787, "Metrics/AbcSize: Assignment Branch Condition size for `advance_scanner_state` is too high. [<8, 12, 24> 28/17]", 2437181548], + [302, 5, 787, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `advance_scanner_state` is too high. [15/7]", 2437181548], + [302, 5, 787, "Metrics/MethodLength: Method has too many lines. [25/10]", 2437181548], + [302, 5, 787, "Metrics/PerceivedComplexity: Perceived complexity for `advance_scanner_state` is too high. [17/8]", 2437181548] + ], + "lib/json/merge/comment_tracker.rb:3472563198": [ + [19, 48, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] + ], + "lib/json/merge/conflict_resolver.rb:301712181": [ + [11, 5, 55081, "Metrics/ClassLength: Class has too many lines. [1053/100]", 4044265605], + [33, 7, 998, "Metrics/MethodLength: Method has too many lines. [16/10]", 2622185411], + [33, 21, 308, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [12/5]", 958959236], + [34, 121, 95, "Layout/LineLength: Line is too long. [215/120]", 3448296820], + [58, 7, 1143, "Metrics/MethodLength: Method has too many lines. [21/10]", 2302471255], + [107, 7, 4969, "Metrics/AbcSize: Assignment Branch Condition size for `merge_node_lists_to_emitter` is too high. [<29, 62, 22> 71.9/17]", 3145241362], + [107, 7, 4969, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_node_lists_to_emitter` is too high. [20/7]", 3145241362], + [107, 7, 4969, "Metrics/MethodLength: Method has too many lines. [82/10]", 3145241362], + [107, 7, 4969, "Metrics/PerceivedComplexity: Perceived complexity for `merge_node_lists_to_emitter` is too high. [22/8]", 3145241362], + [146, 9, 2759, "Metrics/BlockLength: Block has too many lines. [50/25]", 385678694], + [239, 7, 5585, "Metrics/AbcSize: Assignment Branch Condition size for `merge_matched_nodes_to_emitter` is too high. [<15, 45, 20> 51.48/17]", 3947285535], + [239, 7, 5585, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_matched_nodes_to_emitter` is too high. [17/7]", 3947285535], + [239, 7, 5585, "Metrics/MethodLength: Method has too many lines. [102/10]", 3947285535], + [239, 7, 5585, "Metrics/PerceivedComplexity: Perceived complexity for `merge_matched_nodes_to_emitter` is too high. [21/8]", 3947285535], + [277, 13, 1934, "Metrics/BlockLength: Block has too many lines. [31/25]", 884303795], + [306, 17, 181, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 898629436], + [363, 7, 895, "Metrics/MethodLength: Method has too many lines. [23/10]", 2982353847], + [392, 7, 718, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preference_for_pair` is too high. [8/7]", 3339910669], + [392, 7, 718, "Metrics/MethodLength: Method has too many lines. [12/10]", 3339910669], + [418, 7, 1636, "Metrics/MethodLength: Method has too many lines. [37/10]", 514235298], + [473, 25, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [493, 7, 5501, "Metrics/AbcSize: Assignment Branch Condition size for `emit_node` is too high. [<18, 82, 31> 89.49/17]", 1826498333], + [493, 7, 5501, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_node` is too high. [29/7]", 1826498333], + [493, 7, 5501, "Metrics/MethodLength: Method has too many lines. [109/10]", 1826498333], + [493, 7, 5501, "Metrics/PerceivedComplexity: Perceived complexity for `emit_node` is too high. [36/8]", 1826498333], + [522, 15, 1572, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 3256756034], + [554, 15, 654, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 3730688879], + [569, 17, 287, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 3369588943], + [618, 7, 1424, "Metrics/AbcSize: Assignment Branch Condition size for `emit_atomic_node` is too high. [<7, 14, 7> 17.15/17]", 776263089], + [618, 7, 1424, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_atomic_node` is too high. [8/7]", 776263089], + [618, 7, 1424, "Metrics/MethodLength: Method has too many lines. [22/10]", 776263089], + [666, 7, 242, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `recursively_merge_pair_values?` is too high. [8/7]", 3319997574], + [682, 7, 1642, "Metrics/AbcSize: Assignment Branch Condition size for `preferred_available_inline_attachment` is too high. [<14, 14, 14> 24.25/17]", 1854381957], + [682, 7, 1642, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preferred_available_inline_attachment` is too high. [13/7]", 1854381957], + [682, 7, 1642, "Metrics/MethodLength: Method has too many lines. [27/10]", 1854381957], + [682, 7, 1642, "Metrics/PerceivedComplexity: Perceived complexity for `preferred_available_inline_attachment` is too high. [14/8]", 1854381957], + [682, 48, 154, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 358586640], + [687, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 4196003793], + [719, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], + [725, 33, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [730, 7, 1761, "Metrics/AbcSize: Assignment Branch Condition size for `emit_preferred_leading_comments_for` is too high. [<4, 39, 16> 42.34/17]", 1923098835], + [730, 7, 1761, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_preferred_leading_comments_for` is too high. [16/7]", 1923098835], + [730, 7, 1761, "Metrics/MethodLength: Method has too many lines. [26/10]", 1923098835], + [730, 7, 1761, "Metrics/PerceivedComplexity: Perceived complexity for `emit_preferred_leading_comments_for` is too high. [17/8]", 1923098835], + [764, 7, 1600, "Metrics/AbcSize: Assignment Branch Condition size for `emit_leading_comments_for` is too high. [<5, 37, 10> 38.65/17]", 2686936477], + [764, 7, 1600, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_leading_comments_for` is too high. [11/7]", 2686936477], + [764, 7, 1600, "Metrics/MethodLength: Method has too many lines. [26/10]", 2686936477], + [764, 7, 1600, "Metrics/PerceivedComplexity: Perceived complexity for `emit_leading_comments_for` is too high. [11/8]", 2686936477], + [765, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [799, 7, 1573, "Metrics/AbcSize: Assignment Branch Condition size for `canonical_leading_comment_region` is too high. [<8, 28, 14> 32.31/17]", 151098026], + [799, 7, 1573, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonical_leading_comment_region` is too high. [12/7]", 151098026], + [799, 7, 1573, "Metrics/MethodLength: Method has too many lines. [29/10]", 151098026], + [799, 7, 1573, "Metrics/PerceivedComplexity: Perceived complexity for `canonical_leading_comment_region` is too high. [12/8]", 151098026], + [837, 7, 1315, "Metrics/AbcSize: Assignment Branch Condition size for `canonical_tracked_leading_comments` is too high. [<8, 21, 12> 25.48/17]", 3806475230], + [837, 7, 1315, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonical_tracked_leading_comments` is too high. [11/7]", 3806475230], + [837, 7, 1315, "Metrics/MethodLength: Method has too many lines. [21/10]", 3806475230], + [837, 7, 1315, "Metrics/PerceivedComplexity: Perceived complexity for `canonical_tracked_leading_comments` is too high. [11/8]", 3806475230], + [867, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [872, 7, 574, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `dedup_warning_context` is too high. [9/7]", 840557709], + [872, 7, 574, "Metrics/PerceivedComplexity: Perceived complexity for `dedup_warning_context` is too high. [9/8]", 840557709], + [875, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [876, 48, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [877, 48, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [917, 7, 687, "Metrics/AbcSize: Assignment Branch Condition size for `equivalent_owner?` is too high. [<0, 17, 19> 25.5/17]", 1122406222], + [917, 7, 687, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `equivalent_owner?` is too high. [15/7]", 1122406222], + [917, 7, 687, "Metrics/MethodLength: Method has too many lines. [14/10]", 1122406222], + [917, 7, 687, "Metrics/PerceivedComplexity: Perceived complexity for `equivalent_owner?` is too high. [16/8]", 1122406222], + [957, 7, 762, "Metrics/MethodLength: Method has too many lines. [13/10]", 341822255], + [976, 7, 701, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `shared_line_comment_attachment_for` is too high. [9/7]", 2431043907], + [976, 7, 701, "Metrics/MethodLength: Method has too many lines. [13/10]", 2431043907], + [976, 7, 701, "Metrics/PerceivedComplexity: Perceived complexity for `shared_line_comment_attachment_for` is too high. [9/8]", 2431043907], + [1018, 7, 617, "Metrics/AbcSize: Assignment Branch Condition size for `emit_container_trailing_lines` is too high. [<2, 17, 3> 17.38/17]", 2119480325], + [1043, 7, 723, "Metrics/AbcSize: Assignment Branch Condition size for `trailing_container_line_range` is too high. [<4, 15, 11> 19.03/17]", 3162486186], + [1043, 7, 723, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trailing_container_line_range` is too high. [10/7]", 3162486186], + [1043, 7, 723, "Metrics/MethodLength: Method has too many lines. [13/10]", 3162486186], + [1043, 7, 723, "Metrics/PerceivedComplexity: Perceived complexity for `trailing_container_line_range` is too high. [11/8]", 3162486186], + [1061, 7, 503, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_comment_and_blank_lines_in_range` is too high. [9/7]", 2774366077], + [1061, 7, 503, "Metrics/MethodLength: Method has too many lines. [11/10]", 2774366077], + [1061, 7, 503, "Metrics/PerceivedComplexity: Perceived complexity for `emit_comment_and_blank_lines_in_range` is too high. [9/8]", 2774366077], + [1108, 7, 945, "Metrics/MethodLength: Method has too many lines. [14/10]", 1167897124], + [1155, 7, 832, "Metrics/AbcSize: Assignment Branch Condition size for `removed_inline_block_comment_at` is too high. [<6, 26, 7> 27.59/17]", 890096863], + [1155, 7, 832, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `removed_inline_block_comment_at` is too high. [8/7]", 890096863], + [1155, 7, 832, "Metrics/MethodLength: Method has too many lines. [19/10]", 890096863], + [1212, 7, 1587, "Metrics/AbcSize: Assignment Branch Condition size for `emit_document_prelude` is too high. [<12, 40, 22> 47.2/17]", 1354199117], + [1212, 7, 1587, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_document_prelude` is too high. [21/7]", 1354199117], + [1212, 7, 1587, "Metrics/MethodLength: Method has too many lines. [35/10]", 1354199117], + [1212, 7, 1587, "Metrics/PerceivedComplexity: Perceived complexity for `emit_document_prelude` is too high. [22/8]", 1354199117], + [1256, 7, 1281, "Metrics/AbcSize: Assignment Branch Condition size for `emit_document_postlude` is too high. [<9, 31, 21> 38.51/17]", 1869501446], + [1256, 7, 1281, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_document_postlude` is too high. [20/7]", 1869501446], + [1256, 7, 1281, "Metrics/MethodLength: Method has too many lines. [23/10]", 1869501446], + [1256, 7, 1281, "Metrics/PerceivedComplexity: Perceived complexity for `emit_document_postlude` is too high. [20/8]", 1869501446], + [1276, 121, 104, "Layout/LineLength: Line is too long. [224/120]", 1511565389], + [1288, 9, 48, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2339197345], + [1334, 7, 1002, "Metrics/AbcSize: Assignment Branch Condition size for `build_refined_matches` is too high. [<11, 16, 8> 21/17]", 2274245926], + [1334, 7, 1002, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_refined_matches` is too high. [9/7]", 2274245926], + [1334, 7, 1002, "Metrics/MethodLength: Method has too many lines. [18/10]", 2274245926], + [1334, 7, 1002, "Metrics/PerceivedComplexity: Perceived complexity for `build_refined_matches` is too high. [9/8]", 2274245926] + ], + "lib/json/merge/emitter.rb:3208422098": [ + [16, 5, 6329, "Metrics/ClassLength: Class has too many lines. [140/100]", 1868859478], + [183, 7, 586, "Metrics/MethodLength: Method has too many lines. [14/10]", 4015595961] + ], + "lib/json/merge/file_analysis.rb:1768951794": [ + [7, 5, 8750, "Metrics/ClassLength: Class has too many lines. [234/100]", 3986988439], + [20, 7, 897, "Metrics/MethodLength: Method has too many lines. [16/10]", 2945813957], + [83, 9, 6, "Naming/MemoizedInstanceVariableName: Memoized variable `@nodes` does not match method name `statements`. Use `@statements` instead.", 2756313398], + [182, 7, 530, "Metrics/MethodLength: Method has too many lines. [12/10]", 2217856870], + [202, 7, 601, "Metrics/MethodLength: Method has too many lines. [13/10]", 1694972597], + [222, 7, 679, "Metrics/AbcSize: Assignment Branch Condition size for `collect_parse_errors` is too high. [<1, 19, 11> 21.98/17]", 1780421309], + [222, 7, 679, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_parse_errors` is too high. [11/7]", 1780421309], + [222, 7, 679, "Metrics/MethodLength: Method has too many lines. [13/10]", 1780421309], + [222, 7, 679, "Metrics/PerceivedComplexity: Perceived complexity for `collect_parse_errors` is too high. [11/8]", 1780421309], + [239, 7, 1373, "Metrics/AbcSize: Assignment Branch Condition size for `extract_freeze_blocks` is too high. [<16, 23, 14> 31.32/17]", 2629976180], + [239, 7, 1373, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_freeze_blocks` is too high. [12/7]", 2629976180], + [239, 7, 1373, "Metrics/MethodLength: Method has too many lines. [33/10]", 2629976180], + [239, 7, 1373, "Metrics/PerceivedComplexity: Perceived complexity for `extract_freeze_blocks` is too high. [14/8]", 2629976180], + [283, 7, 575, "Metrics/AbcSize: Assignment Branch Condition size for `integrate_nodes_and_freeze_blocks` is too high. [<8, 19, 10> 22.91/17]", 1313409663], + [283, 7, 575, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `integrate_nodes_and_freeze_blocks` is too high. [11/7]", 1313409663], + [283, 7, 575, "Metrics/MethodLength: Method has too many lines. [13/10]", 1313409663], + [283, 7, 575, "Metrics/PerceivedComplexity: Perceived complexity for `integrate_nodes_and_freeze_blocks` is too high. [11/8]", 1313409663] + ], + "lib/json/merge/freeze_node.rb:340454761": [ + [11, 21, 97, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 4181995290] + ], + "lib/json/merge/merge_result.rb:1135594830": [ + [140, 7, 421, "Metrics/MethodLength: Method has too many lines. [11/10]", 2459390040] + ], + "lib/json/merge/node_wrapper.rb:3026997700": [ + [7, 5, 5691, "Metrics/ClassLength: Class has too many lines. [189/100]", 2496649131], + [71, 7, 397, "Metrics/MethodLength: Method has too many lines. [11/10]", 3404369104], + [173, 7, 1322, "Metrics/AbcSize: Assignment Branch Condition size for `compute_signature` is too high. [<10, 26, 24> 36.77/17]", 2934899487], + [173, 7, 1322, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_signature` is too high. [22/7]", 2934899487], + [173, 7, 1322, "Metrics/MethodLength: Method has too many lines. [41/10]", 2934899487], + [173, 7, 1322, "Metrics/PerceivedComplexity: Perceived complexity for `compute_signature` is too high. [18/8]", 2934899487], + [220, 7, 831, "Metrics/AbcSize: Assignment Branch Condition size for `extract_object_keys` is too high. [<8, 13, 10> 18.25/17]", 4156563372], + [220, 7, 831, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_object_keys` is too high. [10/7]", 4156563372], + [220, 7, 831, "Metrics/MethodLength: Method has too many lines. [22/10]", 4156563372], + [220, 7, 831, "Metrics/PerceivedComplexity: Perceived complexity for `extract_object_keys` is too high. [10/8]", 4156563372] + ], + "lib/json/merge/object_match_refiner.rb:337747923": [ + [29, 5, 10245, "Metrics/ClassLength: Class has too many lines. [143/100]", 1652456083], + [148, 7, 652, "Metrics/AbcSize: Assignment Branch Condition size for `compute_object_similarity` is too high. [<6, 18, 4> 19.39/17]", 1704835547], + [172, 7, 382, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_fuzzy_key_matches` is too high. [8/7]", 1938411487], + [226, 7, 709, "Metrics/MethodLength: Method has too many lines. [13/10]", 1853541937], + [277, 23, 9, "Style/NumericPredicate: Use `len1.zero?` instead of `len1 == 0`.", 913205219], + [277, 36, 9, "Style/NumericPredicate: Use `len2.zero?` instead of `len2 == 0`.", 871697920], + [278, 23, 9, "Style/NumericPredicate: Use `len1.zero?` instead of `len1 == 0`.", 913205219], + [278, 36, 9, "Style/NumericPredicate: Use `len2.zero?` instead of `len2 == 0`.", 871697920], + [305, 7, 854, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<13, 29, 8> 32.77/17]", 2946547420], + [305, 7, 854, "Metrics/MethodLength: Method has too many lines. [20/10]", 2946547420] + ], + "lib/json/merge/smart_merger.rb:1431245415": [ + [24, 5, 8706, "Metrics/ClassLength: Class has too many lines. [183/100]", 745649819], + [44, 7, 1369, "Metrics/MethodLength: Method has too many lines. [20/10]", 1509468182], + [44, 21, 472, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [15/5]", 700498762], + [117, 7, 1318, "Metrics/AbcSize: Assignment Branch Condition size for `merge_with_debug` is too high. [<3, 24, 7> 25.18/17]", 1535809936], + [117, 7, 1318, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_with_debug` is too high. [8/7]", 1535809936], + [117, 7, 1318, "Metrics/MethodLength: Method has too many lines. [30/10]", 1535809936], + [188, 7, 574, "Metrics/MethodLength: Method has too many lines. [13/10]", 1857730257], + [221, 7, 1053, "Metrics/MethodLength: Method has too many lines. [24/10]", 3329630813] + ], + "spec/fixtures_integration_spec.rb:2941021946": [ + [3, 1, 7914, "Metrics/BlockLength: Block has too many lines. [163/25]", 4258553307], + [85, 60, 25, "Style/SymbolProc: Pass `&:compact` as an argument to `map` instead of a block.", 2107480170], + [93, 59, 25, "Style/SymbolProc: Pass `&:compact` as an argument to `map` instead of a block.", 2107480170], + [157, 3, 801, "Metrics/BlockLength: Block has too many lines. [27/25]", 716259872] + ], + "spec/reproducible_merge_spec.rb:133932627": [ + [5, 1, 1854, "Metrics/BlockLength: Block has too many lines. [40/25]", 671932104] + ] +} diff --git a/gems/json-merge/Gemfile.lock b/gems/json-merge/Gemfile.lock index 6807fdca5..2bae6115a 100644 --- a/gems/json-merge/Gemfile.lock +++ b/gems/json-merge/Gemfile.lock @@ -17,39 +17,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -58,193 +26,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -252,45 +34,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -310,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -324,6 +61,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -379,6 +117,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -397,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -537,23 +283,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -587,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -618,7 +361,7 @@ GEM yard yard-relative_markdown_links (0.6.0) nokogiri (>= 1.14.3, < 2) - yard-timekeeper (0.2.3) + yard-timekeeper (0.2.4) version_gem (~> 1.1, >= 1.1.13) yard-yaml (0.2.3) version_gem (~> 1.1, >= 1.1.13) @@ -638,45 +381,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,61 +407,39 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +452,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +480,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +491,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,19 +518,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,27 +542,21 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd yard-relative_markdown_links (0.6.0) sha256=3e5ffa85cbad9bac70bee5421774b190fb25d3bdf489323a5b3534f647d1a70e - yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 + yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/plain-merge/Gemfile.lock b/gems/plain-merge/Gemfile.lock index 342dbad14..734495bfa 100644 --- a/gems/plain-merge/Gemfile.lock +++ b/gems/plain-merge/Gemfile.lock @@ -17,7 +17,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -26,7 +58,193 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -34,6 +252,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -53,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,24 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -407,32 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -479,11 +788,14 @@ 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.0) plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -491,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -518,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -529,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -542,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From d36747900715c0dca52351f9c04d2fa2aa0bc5c3 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:26:52 -0600 Subject: [PATCH 225/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-merge-git/Gemfile.lock | 28 +- gems/bash-merge/.kettle-drift.lock | 60 ++-- gems/bash-merge/.rubocop_gradual.lock | 3 +- gems/bash-merge/Gemfile | 40 +++ gems/bash-merge/Gemfile.lock | 38 ++- gems/bash-merge/bash-merge.gemspec | 6 +- gems/dotenv-merge/.kettle-drift.lock | 60 ++-- gems/dotenv-merge/.rubocop_gradual.lock | 3 +- gems/dotenv-merge/Gemfile | 40 +++ gems/dotenv-merge/Gemfile.lock | 63 ++-- gems/dotenv-merge/dotenv-merge.gemspec | 6 +- gems/json-merge/Gemfile.lock | 30 +- gems/plain-merge/Gemfile.lock | 353 +-------------------- gems/rbs-merge/.kettle-drift.lock | 60 ++-- gems/rbs-merge/.rubocop_gradual.lock | 402 ------------------------ gems/rbs-merge/Gemfile | 40 +++ gems/rbs-merge/Gemfile.lock | 63 ++-- gems/rbs-merge/lib/rbs/merge/version.rb | 2 +- gems/rbs-merge/rbs-merge.gemspec | 85 ++--- 19 files changed, 405 insertions(+), 977 deletions(-) delete mode 100644 gems/rbs-merge/.rubocop_gradual.lock diff --git a/gems/ast-merge-git/Gemfile.lock b/gems/ast-merge-git/Gemfile.lock index 6201b7630..f73aec09a 100644 --- a/gems/ast-merge-git/Gemfile.lock +++ b/gems/ast-merge-git/Gemfile.lock @@ -16,23 +16,6 @@ PATH json-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -44,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -110,6 +98,10 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) @@ -385,7 +377,6 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - ast-merge! ast-merge-git! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) @@ -394,7 +385,6 @@ DEPENDENCIES gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) diff --git a/gems/bash-merge/.kettle-drift.lock b/gems/bash-merge/.kettle-drift.lock index d3c2a2030..98e9f541b 100644 --- a/gems/bash-merge/.kettle-drift.lock +++ b/gems/bash-merge/.kettle-drift.lock @@ -7,7 +7,8 @@ 120, 160, 200, - 240 + 240, + 280 ] } ], @@ -19,7 +20,8 @@ 131, 171, 211, - 251 + 251, + 291 ] } ], @@ -31,7 +33,8 @@ 121, 161, 201, - 241 + 241, + 281 ] } ], @@ -43,7 +46,8 @@ 133, 173, 213, - 253 + 253, + 293 ] } ], @@ -55,7 +59,8 @@ 136, 176, 216, - 256 + 256, + 296 ] } ], @@ -67,7 +72,8 @@ 122, 162, 202, - 242 + 242, + 282 ] } ], @@ -80,7 +86,8 @@ 140, 180, 220, - 260 + 260, + 300 ] } ], @@ -92,7 +99,8 @@ 141, 181, 221, - 261 + 261, + 301 ] } ], @@ -105,7 +113,8 @@ 127, 167, 207, - 247 + 247, + 287 ] } ], @@ -117,7 +126,8 @@ 150, 190, 230, - 270 + 270, + 310 ] } ], @@ -130,7 +140,8 @@ 119, 159, 199, - 239 + 239, + 279 ] } ], @@ -143,7 +154,8 @@ 149, 189, 229, - 269 + 269, + 309 ] } ], @@ -155,7 +167,8 @@ 125, 165, 205, - 245 + 245, + 285 ] } ], @@ -168,7 +181,8 @@ 132, 172, 212, - 252 + 252, + 292 ] } ], @@ -181,7 +195,8 @@ 128, 168, 208, - 248 + 248, + 288 ] } ], @@ -193,7 +208,8 @@ 126, 166, 206, - 246 + 246, + 286 ] } ], @@ -205,7 +221,8 @@ 143, 183, 223, - 263 + 263, + 303 ] } ], @@ -217,7 +234,8 @@ 142, 182, 222, - 262 + 262, + 302 ] } ], @@ -229,7 +247,8 @@ 137, 177, 217, - 257 + 257, + 297 ] } ], @@ -241,7 +260,8 @@ 146, 186, 226, - 266 + 266, + 306 ] } ], diff --git a/gems/bash-merge/.rubocop_gradual.lock b/gems/bash-merge/.rubocop_gradual.lock index 33bcb2c09..69ee17f8e 100644 --- a/gems/bash-merge/.rubocop_gradual.lock +++ b/gems/bash-merge/.rubocop_gradual.lock @@ -8,9 +8,8 @@ [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] ], - "bash-merge.gemspec:2425862196": [ + "bash-merge.gemspec:4057981445": [ [118, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [120, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2105564149], [126, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949] ], "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ diff --git a/gems/bash-merge/Gemfile b/gems/bash-merge/Gemfile index 53719ef0c..e184161b8 100644 --- a/gems/bash-merge/Gemfile +++ b/gems/bash-merge/Gemfile @@ -272,6 +272,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/bash-merge/Gemfile.lock b/gems/bash-merge/Gemfile.lock index 6fdf80d44..4e3352a41 100644 --- a/gems/bash-merge/Gemfile.lock +++ b/gems/bash-merge/Gemfile.lock @@ -16,6 +16,24 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +45,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -322,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -353,7 +361,7 @@ GEM yard yard-relative_markdown_links (0.6.0) nokogiri (>= 1.14.3, < 2) - yard-timekeeper (0.2.3) + yard-timekeeper (0.2.4) version_gem (~> 1.1, >= 1.1.13) yard-yaml (0.2.3) version_gem (~> 1.1, >= 1.1.13) @@ -372,7 +380,8 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) - appraisal2 (~> 3.1, >= 3.1.4) + appraisal2 (~> 3.2, >= 3.2.0) + ast-merge! bash-merge! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) @@ -402,8 +411,9 @@ DEPENDENCIES standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) + tree_haver! tree_sitter_language_pack! - turbo_tests2 (~> 3.1, >= 3.1.14) + turbo_tests2 (~> 3.2, >= 3.2.0) yaml-converter (~> 0.1) yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) @@ -545,7 +555,7 @@ CHECKSUMS yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd yard-relative_markdown_links (0.6.0) sha256=3e5ffa85cbad9bac70bee5421774b190fb25d3bdf489323a5b3534f647d1a70e - yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 + yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 diff --git a/gems/bash-merge/bash-merge.gemspec b/gems/bash-merge/bash-merge.gemspec index 830d87cf7..2e634fb4e 100644 --- a/gems/bash-merge/bash-merge.gemspec +++ b/gems/bash-merge/bash-merge.gemspec @@ -115,9 +115,9 @@ Gem::Specification.new do |spec| spec.add_development_dependency('require_bench', '~> 1.0', '>= 1.0.4') # ruby >= 2.2.0 # Testing - spec.add_development_dependency('appraisal2', '~> 3.1', '>= 3.1.4') # ruby >= 1.8.7, for testing against multiple versions of dependencies - spec.add_development_dependency('kettle-test', '~> 2.0', '>= 2.0.11') # ruby >= 4.0.0 - spec.add_development_dependency('turbo_tests2', '~> 3.1', '>= 3.1.14') # ruby >= 2.4.0, default kettle-test runner + spec.add_development_dependency('appraisal2', '~> 3.2', '>= 3.2.0') # ruby >= 1.8.7, for testing against multiple versions of dependencies + spec.add_development_dependency('kettle-test', '~> 2.0', '>= 2.0.11') # ruby >= 4.0.0 + spec.add_development_dependency('turbo_tests2', '~> 3.2', '>= 3.2.0') # ruby >= 2.4.0, default kettle-test runner # Releasing spec.add_development_dependency('ruby-progressbar', '~> 1.13') # ruby >= 0 diff --git a/gems/dotenv-merge/.kettle-drift.lock b/gems/dotenv-merge/.kettle-drift.lock index d3c2a2030..98e9f541b 100644 --- a/gems/dotenv-merge/.kettle-drift.lock +++ b/gems/dotenv-merge/.kettle-drift.lock @@ -7,7 +7,8 @@ 120, 160, 200, - 240 + 240, + 280 ] } ], @@ -19,7 +20,8 @@ 131, 171, 211, - 251 + 251, + 291 ] } ], @@ -31,7 +33,8 @@ 121, 161, 201, - 241 + 241, + 281 ] } ], @@ -43,7 +46,8 @@ 133, 173, 213, - 253 + 253, + 293 ] } ], @@ -55,7 +59,8 @@ 136, 176, 216, - 256 + 256, + 296 ] } ], @@ -67,7 +72,8 @@ 122, 162, 202, - 242 + 242, + 282 ] } ], @@ -80,7 +86,8 @@ 140, 180, 220, - 260 + 260, + 300 ] } ], @@ -92,7 +99,8 @@ 141, 181, 221, - 261 + 261, + 301 ] } ], @@ -105,7 +113,8 @@ 127, 167, 207, - 247 + 247, + 287 ] } ], @@ -117,7 +126,8 @@ 150, 190, 230, - 270 + 270, + 310 ] } ], @@ -130,7 +140,8 @@ 119, 159, 199, - 239 + 239, + 279 ] } ], @@ -143,7 +154,8 @@ 149, 189, 229, - 269 + 269, + 309 ] } ], @@ -155,7 +167,8 @@ 125, 165, 205, - 245 + 245, + 285 ] } ], @@ -168,7 +181,8 @@ 132, 172, 212, - 252 + 252, + 292 ] } ], @@ -181,7 +195,8 @@ 128, 168, 208, - 248 + 248, + 288 ] } ], @@ -193,7 +208,8 @@ 126, 166, 206, - 246 + 246, + 286 ] } ], @@ -205,7 +221,8 @@ 143, 183, 223, - 263 + 263, + 303 ] } ], @@ -217,7 +234,8 @@ 142, 182, 222, - 262 + 262, + 302 ] } ], @@ -229,7 +247,8 @@ 137, 177, 217, - 257 + 257, + 297 ] } ], @@ -241,7 +260,8 @@ 146, 186, 226, - 266 + 266, + 306 ] } ], diff --git a/gems/dotenv-merge/.rubocop_gradual.lock b/gems/dotenv-merge/.rubocop_gradual.lock index a7735088e..238683cd4 100644 --- a/gems/dotenv-merge/.rubocop_gradual.lock +++ b/gems/dotenv-merge/.rubocop_gradual.lock @@ -8,9 +8,8 @@ [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] ], - "dotenv-merge.gemspec:2358764930": [ + "dotenv-merge.gemspec:3219964147": [ [125, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [127, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2105564149], [133, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949] ], "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ diff --git a/gems/dotenv-merge/Gemfile b/gems/dotenv-merge/Gemfile index fdddd9a28..eb7423aa0 100644 --- a/gems/dotenv-merge/Gemfile +++ b/gems/dotenv-merge/Gemfile @@ -272,6 +272,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/dotenv-merge/Gemfile.lock b/gems/dotenv-merge/Gemfile.lock index 191c40b34..45ff65026 100644 --- a/gems/dotenv-merge/Gemfile.lock +++ b/gems/dotenv-merge/Gemfile.lock @@ -275,6 +275,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -308,7 +324,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -363,18 +378,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -538,22 +542,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -637,7 +637,7 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) - appraisal2 (~> 3.1, >= 3.1.4) + appraisal2 (~> 3.2, >= 3.2.0) ast-crispr! ast-crispr-markdown-markly! ast-crispr-ruby-prism! @@ -659,9 +659,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.3, >= 2.3.7) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -695,7 +695,7 @@ DEPENDENCIES toml-merge! tree_haver! tree_sitter_language_pack! - turbo_tests2 (~> 3.1, >= 3.1.14) + turbo_tests2 (~> 3.2, >= 3.2.0) typescript-merge! yaml-converter (~> 0.1) yaml-merge! @@ -740,7 +740,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -761,10 +760,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -839,13 +838,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/dotenv-merge/dotenv-merge.gemspec b/gems/dotenv-merge/dotenv-merge.gemspec index 3b97eb500..c57163a6e 100644 --- a/gems/dotenv-merge/dotenv-merge.gemspec +++ b/gems/dotenv-merge/dotenv-merge.gemspec @@ -122,9 +122,9 @@ Gem::Specification.new do |spec| spec.add_development_dependency('require_bench', '~> 1.0', '>= 1.0.4') # ruby >= 2.2.0 # Testing - spec.add_development_dependency('appraisal2', '~> 3.1', '>= 3.1.4') # ruby >= 1.8.7, for testing against multiple versions of dependencies - spec.add_development_dependency('kettle-test', '~> 2.0', '>= 2.0.11') # ruby >= 4.0.0 - spec.add_development_dependency('turbo_tests2', '~> 3.1', '>= 3.1.14') # ruby >= 2.4.0, default kettle-test runner + spec.add_development_dependency('appraisal2', '~> 3.2', '>= 3.2.0') # ruby >= 1.8.7, for testing against multiple versions of dependencies + spec.add_development_dependency('kettle-test', '~> 2.0', '>= 2.0.11') # ruby >= 4.0.0 + spec.add_development_dependency('turbo_tests2', '~> 3.2', '>= 3.2.0') # ruby >= 2.4.0, default kettle-test runner # Releasing spec.add_development_dependency('ruby-progressbar', '~> 1.13') # ruby >= 0 diff --git a/gems/json-merge/Gemfile.lock b/gems/json-merge/Gemfile.lock index 2bae6115a..937db6db5 100644 --- a/gems/json-merge/Gemfile.lock +++ b/gems/json-merge/Gemfile.lock @@ -16,24 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -45,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -335,6 +322,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,7 +373,6 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - ast-merge! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) debug (>= 1.1) @@ -411,7 +402,6 @@ DEPENDENCIES standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - tree_haver! tree_sitter_language_pack! yaml-converter (~> 0.1) yard (~> 0.9, >= 0.9.44) diff --git a/gems/plain-merge/Gemfile.lock b/gems/plain-merge/Gemfile.lock index 734495bfa..502a6d94b 100644 --- a/gems/plain-merge/Gemfile.lock +++ b/gems/plain-merge/Gemfile.lock @@ -16,265 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +40,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +103,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +131,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +270,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +322,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +373,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +398,31 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +430,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +442,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +469,11 @@ 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.0) plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +481,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +508,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +519,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +532,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +547,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/rbs-merge/.kettle-drift.lock b/gems/rbs-merge/.kettle-drift.lock index d3c2a2030..98e9f541b 100644 --- a/gems/rbs-merge/.kettle-drift.lock +++ b/gems/rbs-merge/.kettle-drift.lock @@ -7,7 +7,8 @@ 120, 160, 200, - 240 + 240, + 280 ] } ], @@ -19,7 +20,8 @@ 131, 171, 211, - 251 + 251, + 291 ] } ], @@ -31,7 +33,8 @@ 121, 161, 201, - 241 + 241, + 281 ] } ], @@ -43,7 +46,8 @@ 133, 173, 213, - 253 + 253, + 293 ] } ], @@ -55,7 +59,8 @@ 136, 176, 216, - 256 + 256, + 296 ] } ], @@ -67,7 +72,8 @@ 122, 162, 202, - 242 + 242, + 282 ] } ], @@ -80,7 +86,8 @@ 140, 180, 220, - 260 + 260, + 300 ] } ], @@ -92,7 +99,8 @@ 141, 181, 221, - 261 + 261, + 301 ] } ], @@ -105,7 +113,8 @@ 127, 167, 207, - 247 + 247, + 287 ] } ], @@ -117,7 +126,8 @@ 150, 190, 230, - 270 + 270, + 310 ] } ], @@ -130,7 +140,8 @@ 119, 159, 199, - 239 + 239, + 279 ] } ], @@ -143,7 +154,8 @@ 149, 189, 229, - 269 + 269, + 309 ] } ], @@ -155,7 +167,8 @@ 125, 165, 205, - 245 + 245, + 285 ] } ], @@ -168,7 +181,8 @@ 132, 172, 212, - 252 + 252, + 292 ] } ], @@ -181,7 +195,8 @@ 128, 168, 208, - 248 + 248, + 288 ] } ], @@ -193,7 +208,8 @@ 126, 166, 206, - 246 + 246, + 286 ] } ], @@ -205,7 +221,8 @@ 143, 183, 223, - 263 + 263, + 303 ] } ], @@ -217,7 +234,8 @@ 142, 182, 222, - 262 + 262, + 302 ] } ], @@ -229,7 +247,8 @@ 137, 177, 217, - 257 + 257, + 297 ] } ], @@ -241,7 +260,8 @@ 146, 186, 226, - 266 + 266, + 306 ] } ], diff --git a/gems/rbs-merge/.rubocop_gradual.lock b/gems/rbs-merge/.rubocop_gradual.lock deleted file mode 100644 index 3d9c5b1c7..000000000 --- a/gems/rbs-merge/.rubocop_gradual.lock +++ /dev/null @@ -1,402 +0,0 @@ -{ - ".simplecov:2483172942": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:3295679373": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/rbs-merge.rb:334311121": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`rbs-merge.rb`) should use snake_case.", 5381], - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "lib/rbs/merge.rb:1873081658": [ - [17, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Rbs::Merge`.", 2866359175], - [103, 7, 1197, "Metrics/MethodLength: Method has too many lines. [22/10]", 564456261] - ], - "lib/rbs/merge/backends/rbs_backend.rb:2885387755": [ - [48, 11, 555, "Metrics/MethodLength: Method has too many lines. [13/10]", 2078142514], - [81, 11, 658, "Metrics/MethodLength: Method has too many lines. [11/10]", 324484142], - [172, 11, 527, "Metrics/MethodLength: Method has too many lines. [14/10]", 631898529], - [240, 15, 11, "Naming/PredicatePrefix: Rename `has_errors?` to `errors?`.", 1181419252], - [263, 9, 9332, "Metrics/ClassLength: Class has too many lines. [135/100]", 1906483935], - [290, 11, 1914, "Metrics/AbcSize: Assignment Branch Condition size for `type` is too high. [<0, 9, 23> 24.7/17]", 3636991776], - [290, 11, 1914, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `type` is too high. [24/7]", 3636991776], - [290, 11, 1914, "Metrics/MethodLength: Method has too many lines. [28/10]", 3636991776], - [363, 11, 489, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `end_point` is too high. [8/7]", 844861810], - [504, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] - ], - "lib/rbs/merge/comment_tracker.rb:1938176986": [ - [28, 7, 767, "Metrics/MethodLength: Method has too many lines. [15/10]", 752916075], - [60, 7, 416, "Metrics/MethodLength: Method has too many lines. [12/10]", 2715172162] - ], - "lib/rbs/merge/conflict_resolver.rb:1305396962": [ - [16, 5, 11045, "Metrics/ClassLength: Class has too many lines. [174/100]", 330576807], - [44, 7, 1614, "Metrics/MethodLength: Method has too many lines. [23/10]", 1004723330], - [44, 45, 14, "Lint/UnusedMethodArgument: Unused method argument - `template_index`.", 1809801172], - [44, 62, 10, "Lint/UnusedMethodArgument: Unused method argument - `dest_index`.", 2703999490], - [122, 7, 717, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `resolve_preference` is too high. [8/7]", 2783267415], - [122, 7, 717, "Metrics/MethodLength: Method has too many lines. [12/10]", 2783267415], - [156, 7, 949, "Metrics/AbcSize: Assignment Branch Condition size for `extract_declaration_text` is too high. [<9, 19, 14> 25.26/17]", 4132302840], - [156, 7, 949, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_declaration_text` is too high. [13/7]", 4132302840], - [156, 7, 949, "Metrics/MethodLength: Method has too many lines. [18/10]", 4132302840], - [156, 7, 949, "Metrics/PerceivedComplexity: Perceived complexity for `extract_declaration_text` is too high. [14/8]", 4132302840], - [181, 39, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [279, 7, 565, "Metrics/MethodLength: Method has too many lines. [13/10]", 375776463], - [279, 11, 12, "Naming/PredicatePrefix: Rename `has_members?` to `members?`.", 496913372] - ], - "lib/rbs/merge/file_aligner.rb:157117932": [ - [32, 7, 128, "Lint/UselessMethodDefinition: Useless method definition detected.", 4031328363] - ], - "lib/rbs/merge/file_analysis.rb:4205990536": [ - [23, 5, 20642, "Metrics/ClassLength: Class has too many lines. [403/100]", 3271819659], - [59, 7, 1146, "Metrics/MethodLength: Method has too many lines. [20/10]", 1625645012], - [191, 7, 398, "Metrics/MethodLength: Method has too many lines. [12/10]", 4157341657], - [211, 7, 719, "Metrics/MethodLength: Method has too many lines. [13/10]", 2571132513], - [235, 7, 965, "Metrics/AbcSize: Assignment Branch Condition size for `compute_tree_sitter_signature` is too high. [<3, 5, 21> 21.79/17]", 2963702282], - [235, 7, 965, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_tree_sitter_signature` is too high. [22/7]", 2963702282], - [235, 7, 965, "Metrics/MethodLength: Method has too many lines. [26/10]", 2963702282], - [235, 7, 965, "Metrics/PerceivedComplexity: Perceived complexity for `compute_tree_sitter_signature` is too high. [16/8]", 2963702282], - [269, 7, 996, "Metrics/AbcSize: Assignment Branch Condition size for `extract_tree_sitter_node_name` is too high. [<5, 16, 10> 19.52/17]", 300940102], - [269, 7, 996, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_tree_sitter_node_name` is too high. [11/7]", 300940102], - [269, 7, 996, "Metrics/MethodLength: Method has too many lines. [24/10]", 300940102], - [269, 7, 996, "Metrics/PerceivedComplexity: Perceived complexity for `extract_tree_sitter_node_name` is too high. [11/8]", 300940102], - [320, 7, 834, "Metrics/MethodLength: Method has too many lines. [16/10]", 658496547], - [380, 7, 1612, "Metrics/AbcSize: Assignment Branch Condition size for `extract_tree_sitter_declarations` is too high. [<8, 18, 11> 22.56/17]", 1899595676], - [380, 7, 1612, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_tree_sitter_declarations` is too high. [10/7]", 1899595676], - [380, 7, 1612, "Metrics/MethodLength: Method has too many lines. [23/10]", 1899595676], - [380, 7, 1612, "Metrics/PerceivedComplexity: Perceived complexity for `extract_tree_sitter_declarations` is too high. [11/8]", 1899595676], - [449, 7, 569, "Metrics/MethodLength: Method has too many lines. [13/10]", 210550095], - [471, 7, 1133, "Metrics/AbcSize: Assignment Branch Condition size for `build_freeze_blocks` is too high. [<7, 22, 6> 23.85/17]", 4016218974], - [471, 7, 1133, "Metrics/MethodLength: Method has too many lines. [29/10]", 4016218974], - [528, 7, 486, "Metrics/MethodLength: Method has too many lines. [12/10]", 618123864], - [528, 7, 486, "Metrics/PerceivedComplexity: Perceived complexity for `node_start_line` is too high. [9/8]", 618123864], - [545, 7, 472, "Metrics/MethodLength: Method has too many lines. [12/10]", 1339916888], - [545, 7, 472, "Metrics/PerceivedComplexity: Perceived complexity for `node_end_line` is too high. [9/8]", 1339916888], - [579, 7, 1868, "Metrics/AbcSize: Assignment Branch Condition size for `compute_rbs_gem_signature` is too high. [<0, 45, 23> 50.54/17]", 2652509672], - [579, 7, 1868, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_rbs_gem_signature` is too high. [23/7]", 2652509672], - [579, 7, 1868, "Metrics/MethodLength: Method has too many lines. [43/10]", 2652509672], - [579, 7, 1868, "Metrics/PerceivedComplexity: Perceived complexity for `compute_rbs_gem_signature` is too high. [9/8]", 2652509672] - ], - "lib/rbs/merge/freeze_node.rb:2942544870": [ - [34, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 201145846], - [39, 7, 577, "Metrics/MethodLength: Method has too many lines. [11/10]", 2189574632], - [39, 21, 186, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1006469938], - [78, 7, 1506, "Metrics/AbcSize: Assignment Branch Condition size for `validate_structure!` is too high. [<12, 12, 17> 24.02/17]", 1543687562], - [78, 7, 1506, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_structure!` is too high. [12/7]", 1543687562], - [78, 7, 1506, "Metrics/MethodLength: Method has too many lines. [25/10]", 1543687562], - [78, 7, 1506, "Metrics/PerceivedComplexity: Perceived complexity for `validate_structure!` is too high. [12/8]", 1543687562], - [150, 7, 891, "Metrics/AbcSize: Assignment Branch Condition size for `extract_node_name` is too high. [<4, 21, 12> 24.52/17]", 1223188123], - [150, 7, 891, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_node_name` is too high. [13/7]", 1223188123], - [150, 7, 891, "Metrics/MethodLength: Method has too many lines. [18/10]", 1223188123], - [150, 7, 891, "Metrics/PerceivedComplexity: Perceived complexity for `extract_node_name` is too high. [13/8]", 1223188123], - [162, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861336] - ], - "lib/rbs/merge/merge_result.rb:1707720872": [ - [18, 5, 15586, "Metrics/ClassLength: Class has too many lines. [276/100]", 817348545], - [89, 7, 966, "Metrics/MethodLength: Method has too many lines. [14/10]", 3349669346], - [176, 7, 1770, "Metrics/AbcSize: Assignment Branch Condition size for `extract_lines` is too high. [<15, 21, 16> 30.36/17]", 3951991352], - [176, 7, 1770, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_lines` is too high. [15/7]", 3951991352], - [176, 7, 1770, "Metrics/MethodLength: Method has too many lines. [29/10]", 3951991352], - [176, 7, 1770, "Metrics/PerceivedComplexity: Perceived complexity for `extract_lines` is too high. [16/8]", 3951991352], - [226, 44, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [232, 7, 606, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trailing_lines_for` is too high. [9/7]", 518209980], - [232, 7, 606, "Metrics/MethodLength: Method has too many lines. [13/10]", 518209980], - [232, 7, 606, "Metrics/PerceivedComplexity: Perceived complexity for `trailing_lines_for` is too high. [10/8]", 518209980], - [233, 47, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [266, 33, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [271, 7, 682, "Metrics/AbcSize: Assignment Branch Condition size for `deduplicate_leading_comment_overlap` is too high. [<4, 15, 9> 17.94/17]", 4227245480], - [271, 7, 682, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `deduplicate_leading_comment_overlap` is too high. [8/7]", 4227245480], - [271, 7, 682, "Metrics/MethodLength: Method has too many lines. [11/10]", 4227245480], - [335, 23, 24, "Style/SafeNavigation: Use safe navigation (`&.`) instead of checking if an object exists before calling the method.", 1487466207], - [371, 7, 893, "Metrics/MethodLength: Method has too many lines. [11/10]", 1066420963], - [371, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 2582953496] - ], - "lib/rbs/merge/node_type_normalizer.rb:2788764230": [ - [65, 5, 10747, "Metrics/ModuleLength: Module has too many lines. [199/100]", 63560324], - [250, 9, 693, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonical_type_for_node` is too high. [9/7]", 908800634], - [250, 9, 693, "Metrics/MethodLength: Method has too many lines. [16/10]", 908800634], - [250, 9, 693, "Metrics/PerceivedComplexity: Perceived complexity for `canonical_type_for_node` is too high. [9/8]", 908800634], - [323, 9, 689, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `refine_tree_sitter_attribute_type` is too high. [9/7]", 2340352499], - [323, 9, 689, "Metrics/MethodLength: Method has too many lines. [13/10]", 2340352499], - [323, 9, 689, "Metrics/PerceivedComplexity: Perceived complexity for `refine_tree_sitter_attribute_type` is too high. [9/8]", 2340352499], - [343, 9, 475, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `refine_tree_sitter_variable_type` is too high. [8/7]", 536330497], - [343, 9, 475, "Metrics/MethodLength: Method has too many lines. [14/10]", 536330497] - ], - "lib/rbs/merge/node_wrapper.rb:1434186839": [ - [26, 5, 14933, "Metrics/ClassLength: Class has too many lines. [344/100]", 4139761414], - [37, 17, 84, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 366036293], - [264, 7, 831, "Metrics/AbcSize: Assignment Branch Condition size for `text` is too high. [<3, 32, 20> 37.85/17]", 980238327], - [264, 7, 831, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `text` is too high. [18/7]", 980238327], - [264, 7, 831, "Metrics/MethodLength: Method has too many lines. [18/10]", 980238327], - [264, 7, 831, "Metrics/PerceivedComplexity: Perceived complexity for `text` is too high. [20/8]", 980238327], - [268, 47, 2, "Lint/SafeNavigationConsistency: Use `.` instead of unnecessary `&.`.", 5858765], - [280, 22, 14, "Style/NumericPredicate: Use `start_line.positive?` instead of `start_line > 0`.", 792111162], - [301, 7, 1209, "Metrics/AbcSize: Assignment Branch Condition size for `signature` is too high. [<1, 25, 20> 32.03/17]", 4281557215], - [301, 7, 1209, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `signature` is too high. [21/7]", 4281557215], - [301, 7, 1209, "Metrics/MethodLength: Method has too many lines. [45/10]", 4281557215], - [351, 7, 384, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `method_kind` is too high. [8/7]", 563626808], - [351, 7, 384, "Metrics/PerceivedComplexity: Perceived complexity for `method_kind` is too high. [9/8]", 563626808], - [423, 7, 935, "Metrics/MethodLength: Method has too many lines. [21/10]", 3557799127], - [469, 7, 667, "Metrics/AbcSize: Assignment Branch Condition size for `extract_child_texts` is too high. [<6, 16, 8> 18.87/17]", 1979652559], - [469, 7, 667, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_child_texts` is too high. [9/7]", 1979652559], - [469, 7, 667, "Metrics/MethodLength: Method has too many lines. [12/10]", 1979652559], - [469, 7, 667, "Metrics/PerceivedComplexity: Perceived complexity for `extract_child_texts` is too high. [9/8]", 1979652559], - [487, 7, 583, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_tree_sitter_visibility_kind` is too high. [9/7]", 2002684122], - [487, 7, 583, "Metrics/MethodLength: Method has too many lines. [13/10]", 2002684122], - [487, 7, 583, "Metrics/PerceivedComplexity: Perceived complexity for `extract_tree_sitter_visibility_kind` is too high. [9/8]", 2002684122], - [532, 7, 557, "Metrics/MethodLength: Method has too many lines. [14/10]", 1753294094] - ], - "lib/rbs/merge/smart_merger.rb:4114819804": [ - [43, 5, 38956, "Metrics/ClassLength: Class has too many lines. [785/100]", 3732361716], - [85, 7, 1188, "Metrics/MethodLength: Method has too many lines. [17/10]", 2908064588], - [85, 21, 447, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 1344979847], - [181, 7, 805, "Metrics/AbcSize: Assignment Branch Condition size for `perform_merge` is too high. [<6, 15, 8> 18.03/17]", 1638854701], - [181, 7, 805, "Metrics/MethodLength: Method has too many lines. [14/10]", 1638854701], - [207, 7, 572, "Metrics/MethodLength: Method has too many lines. [15/10]", 3471574631], - [290, 7, 621, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `root_boundary_lines_for` is too high. [9/7]", 354795708], - [290, 7, 621, "Metrics/PerceivedComplexity: Perceived complexity for `root_boundary_lines_for` is too high. [9/8]", 354795708], - [291, 34, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [323, 9, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 748374760], - [326, 7, 794, "Metrics/AbcSize: Assignment Branch Condition size for `root_boundary_range` is too high. [<4, 22, 11> 24.92/17]", 2546634651], - [326, 7, 794, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `root_boundary_range` is too high. [10/7]", 2546634651], - [326, 7, 794, "Metrics/MethodLength: Method has too many lines. [19/10]", 2546634651], - [326, 7, 794, "Metrics/PerceivedComplexity: Perceived complexity for `root_boundary_range` is too high. [11/8]", 2546634651], - [365, 7, 1030, "Metrics/AbcSize: Assignment Branch Condition size for `process_match` is too high. [<1, 22, 7> 23.11/17]", 333057092], - [365, 7, 1030, "Metrics/MethodLength: Method has too many lines. [27/10]", 333057092], - [428, 7, 1830, "Metrics/AbcSize: Assignment Branch Condition size for `removed_declaration_comment_lines` is too high. [<13, 31, 25> 41.89/17]", 276966259], - [428, 7, 1830, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `removed_declaration_comment_lines` is too high. [21/7]", 276966259], - [428, 7, 1830, "Metrics/MethodLength: Method has too many lines. [38/10]", 276966259], - [428, 7, 1830, "Metrics/PerceivedComplexity: Perceived complexity for `removed_declaration_comment_lines` is too high. [24/8]", 276966259], - [476, 7, 675, "Metrics/MethodLength: Method has too many lines. [13/10]", 1415352570], - [502, 7, 2604, "Metrics/AbcSize: Assignment Branch Condition size for `reconstruct_declaration_with_merged_members` is too high. [<19, 23, 22> 37.07/17]", 1250076424], - [502, 7, 2604, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `reconstruct_declaration_with_merged_members` is too high. [17/7]", 1250076424], - [502, 7, 2604, "Metrics/MethodLength: Method has too many lines. [49/10]", 1250076424], - [502, 7, 2604, "Metrics/PerceivedComplexity: Perceived complexity for `reconstruct_declaration_with_merged_members` is too high. [17/8]", 1250076424], - [540, 20, 46, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 1375387925], - [555, 9, 210, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 3589424565], - [565, 7, 1271, "Metrics/AbcSize: Assignment Branch Condition size for `recursive_body_lines_for_declaration` is too high. [<8, 23, 9> 25.96/17]", 2123349984], - [565, 7, 1271, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `recursive_body_lines_for_declaration` is too high. [10/7]", 2123349984], - [565, 7, 1271, "Metrics/MethodLength: Method has too many lines. [18/10]", 2123349984], - [565, 7, 1271, "Metrics/PerceivedComplexity: Perceived complexity for `recursive_body_lines_for_declaration` is too high. [10/8]", 2123349984], - [565, 47, 139, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 652517575], - [591, 7, 1910, "Metrics/AbcSize: Assignment Branch Condition size for `merge_member_lines` is too high. [<4, 35, 12> 37.22/17]", 1631109354], - [591, 7, 1910, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_member_lines` is too high. [11/7]", 1631109354], - [591, 7, 1910, "Metrics/MethodLength: Method has too many lines. [42/10]", 1631109354], - [592, 9, 1837, "Metrics/BlockLength: Block has too many lines. [40/25]", 3339652106], - [638, 7, 1779, "Metrics/AbcSize: Assignment Branch Condition size for `align_member_lists` is too high. [<14, 26, 14> 32.68/17]", 3585753868], - [638, 7, 1779, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `align_member_lists` is too high. [14/7]", 3585753868], - [638, 7, 1779, "Metrics/MethodLength: Method has too many lines. [49/10]", 3585753868], - [638, 7, 1779, "Metrics/PerceivedComplexity: Perceived complexity for `align_member_lists` is too high. [15/8]", 3585753868], - [745, 7, 605, "Metrics/AbcSize: Assignment Branch Condition size for `split_top_level_return_type` is too high. [<7, 14, 10> 18.57/17]", 1731525207], - [745, 7, 605, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split_top_level_return_type` is too high. [8/7]", 1731525207], - [745, 7, 605, "Metrics/MethodLength: Method has too many lines. [17/10]", 1731525207], - [782, 7, 1684, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_statement_lines_with_leading_comments` is too high. [8/7]", 3625004207], - [782, 7, 1684, "Metrics/MethodLength: Method has too many lines. [29/10]", 3625004207], - [782, 7, 1684, "Metrics/PerceivedComplexity: Perceived complexity for `extract_statement_lines_with_leading_comments` is too high. [10/8]", 3625004207], - [869, 33, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [874, 7, 840, "Metrics/MethodLength: Method has too many lines. [15/10]", 3400690599], - [895, 39, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [982, 23, 24, "Style/SafeNavigation: Use safe navigation (`&.`) instead of checking if an object exists before calling the method.", 1487466207], - [998, 7, 1788, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_cross_source_preamble_prefixes` is too high. [<14, 21, 9> 26.8/17]", 3130187278], - [998, 7, 1788, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collapse_cross_source_preamble_prefixes` is too high. [9/7]", 3130187278], - [998, 7, 1788, "Metrics/MethodLength: Method has too many lines. [31/10]", 3130187278], - [998, 7, 1788, "Metrics/PerceivedComplexity: Perceived complexity for `collapse_cross_source_preamble_prefixes` is too high. [9/8]", 3130187278], - [1038, 7, 533, "Metrics/MethodLength: Method has too many lines. [15/10]", 4188914818] - ], - "rbs-merge.gemspec:395192785": [ - [126, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [128, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2105564149], - [134, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949] - ], - "spec/integration/reproducible_merge_spec.rb:4124333249": [ - [9, 1, 6937, "Metrics/BlockLength: Block has too many lines. [155/25]", 1482304086], - [14, 3, 4384, "Metrics/BlockLength: Block has too many lines. [85/25]", 628655161], - [15, 5, 3507, "Metrics/BlockLength: Block has too many lines. [65/25]", 2935184196], - [56, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858910], - [62, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 50415752], - [87, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1546684737] - ], - "spec/rbs/merge/comment_behavior_matrix_spec.rb:2666227529": [ - [14, 45, 6, "Lint/UnusedBlockArgument: Unused block argument - `inline`. If it's necessary, use `_` or `_inline` as an argument name to indicate that it won't be used.", 1605470060], - [18, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 253885993], - [19, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 1702591521] - ], - "spec/rbs/merge/comment_tracker_spec.rb:1831412931": [ - [5, 1, 14574, "Metrics/BlockLength: Block has too many lines. [306/25]", 1598998757], - [8, 3, 3272, "Metrics/BlockLength: Block has too many lines. [67/25]", 935176133], - [95, 3, 1130, "Metrics/BlockLength: Block has too many lines. [28/25]", 204252301], - [143, 3, 1704, "Metrics/BlockLength: Block has too many lines. [32/25]", 1579622084], - [209, 3, 5815, "Metrics/BlockLength: Block has too many lines. [112/25]", 433112678] - ], - "spec/rbs/merge/conflict_resolver_spec.rb:999961156": [ - [8, 1, 19854, "Metrics/BlockLength: Block has too many lines. [491/25]", 3942921818], - [9, 3, 1428, "Metrics/BlockLength: Block has too many lines. [36/25]", 529294185], - [56, 3, 1199, "Metrics/BlockLength: Block has too many lines. [28/25]", 73504201], - [93, 3, 1277, "Metrics/BlockLength: Block has too many lines. [29/25]", 595351018], - [190, 3, 7078, "Metrics/BlockLength: Block has too many lines. [149/25]", 3739681265], - [296, 5, 1646, "Metrics/BlockLength: Block has too many lines. [33/25]", 3128279135], - [302, 7, 1292, "Metrics/BlockLength: Block has too many lines. [27/25]", 729602127], - [404, 3, 4548, "Metrics/BlockLength: Block has too many lines. [114/25]", 2619563374], - [420, 5, 922, "Metrics/BlockLength: Block has too many lines. [26/25]", 3893264586], - [452, 5, 960, "Metrics/BlockLength: Block has too many lines. [26/25]", 3053707146] - ], - "spec/rbs/merge/file_aligner_spec.rb:2643720547": [ - [7, 1, 21476, "Metrics/BlockLength: Block has too many lines. [555/25]", 4145069110], - [65, 3, 1123, "Metrics/BlockLength: Block has too many lines. [28/25]", 1358831340], - [188, 3, 1226, "Metrics/BlockLength: Block has too many lines. [34/25]", 1337144492], - [246, 3, 4891, "Metrics/BlockLength: Block has too many lines. [152/25]", 125990895], - [436, 3, 1943, "Metrics/BlockLength: Block has too many lines. [34/25]", 4126970167], - [483, 3, 3944, "Metrics/BlockLength: Block has too many lines. [94/25]", 2604333848], - [565, 5, 1328, "Metrics/BlockLength: Block has too many lines. [27/25]", 1994971578] - ], - "spec/rbs/merge/file_analysis_spec.rb:952231308": [ - [15, 1, 54363, "Metrics/BlockLength: Block has too many lines. [1205/25]", 2485884639], - [16, 3, 1272, "Metrics/BlockLength: Block has too many lines. [38/25]", 1778989479], - [17, 5, 1210, "Metrics/BlockLength: Block has too many lines. [37/25]", 1755177515], - [67, 3, 1152, "Metrics/BlockLength: Block has too many lines. [33/25]", 2931980952], - [68, 5, 1083, "Metrics/BlockLength: Block has too many lines. [32/25]", 3589815947], - [136, 3, 982, "Metrics/BlockLength: Block has too many lines. [30/25]", 1355840781], - [137, 5, 929, "Metrics/BlockLength: Block has too many lines. [29/25]", 3738902933], - [200, 3, 1559, "Metrics/BlockLength: Block has too many lines. [30/25]", 3203356148], - [201, 5, 1493, "Metrics/BlockLength: Block has too many lines. [29/25]", 1389049628], - [860, 3, 2525, "Metrics/BlockLength: Block has too many lines. [42/25]", 2701315631], - [861, 5, 2455, "Metrics/BlockLength: Block has too many lines. [41/25]", 1293659790], - [884, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 193270906], - [919, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 115067835], - [948, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [954, 3, 3548, "Metrics/BlockLength: Block has too many lines. [59/25]", 2573657607], - [955, 5, 3497, "Metrics/BlockLength: Block has too many lines. [58/25]", 14776664], - [982, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085251945], - [1017, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2659900392], - [1038, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2659900392], - [1091, 3, 1750, "Metrics/BlockLength: Block has too many lines. [29/25]", 460836946], - [1092, 5, 1693, "Metrics/BlockLength: Block has too many lines. [28/25]", 1601111212], - [1135, 3, 1948, "Metrics/BlockLength: Block has too many lines. [41/25]", 4061538475], - [1136, 5, 1892, "Metrics/BlockLength: Block has too many lines. [40/25]", 4081702319], - [1195, 3, 2571, "Metrics/BlockLength: Block has too many lines. [55/25]", 3959149994], - [1265, 3, 2440, "Metrics/BlockLength: Block has too many lines. [52/25]", 2164819729], - [1332, 3, 2008, "Metrics/BlockLength: Block has too many lines. [39/25]", 609327574], - [1379, 3, 1938, "Metrics/BlockLength: Block has too many lines. [38/25]", 361672068], - [1425, 3, 1995, "Metrics/BlockLength: Block has too many lines. [39/25]", 4024875480], - [1472, 3, 1992, "Metrics/BlockLength: Block has too many lines. [39/25]", 1156260241] - ], - "spec/rbs/merge/freeze_node_spec.rb:2278400615": [ - [8, 1, 13268, "Metrics/BlockLength: Block has too many lines. [327/25]", 1590692835], - [9, 3, 2116, "Metrics/BlockLength: Block has too many lines. [43/25]", 4215218715], - [98, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3784984989], - [99, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1182436848], - [331, 3, 2919, "Metrics/BlockLength: Block has too many lines. [65/25]", 1415484725] - ], - "spec/rbs/merge/merge_result_spec.rb:2449518259": [ - [8, 1, 20574, "Metrics/BlockLength: Block has too many lines. [454/25]", 736738811], - [53, 3, 1244, "Metrics/BlockLength: Block has too many lines. [31/25]", 3686452170] - ], - "spec/rbs/merge/smart_merger_removal_mode_compliance_spec.rb:3475743041": [ - [7, 1, 1860, "Metrics/BlockLength: Block has too many lines. [66/25]", 3469987127], - [8, 3, 1798, "Metrics/BlockLength: Block has too many lines. [65/25]", 778477682] - ], - "spec/rbs/merge/smart_merger_spec.rb:3451189224": [ - [14, 1, 43498, "Metrics/BlockLength: Block has too many lines. [1190/25]", 1106962], - [149, 3, 10886, "Metrics/BlockLength: Block has too many lines. [286/25]", 1693926280], - [315, 5, 985, "Metrics/BlockLength: Block has too many lines. [26/25]", 3397066157], - [351, 5, 1063, "Metrics/BlockLength: Block has too many lines. [26/25]", 2718784043], - [461, 5, 1135, "Metrics/BlockLength: Block has too many lines. [26/25]", 3797285781], - [497, 5, 1213, "Metrics/BlockLength: Block has too many lines. [26/25]", 3686078390], - [536, 3, 2766, "Metrics/BlockLength: Block has too many lines. [84/25]", 3927490181], - [649, 3, 1714, "Metrics/BlockLength: Block has too many lines. [54/25]", 386494661], - [721, 3, 5393, "Metrics/BlockLength: Block has too many lines. [138/25]", 2457897034], - [925, 3, 4479, "Metrics/BlockLength: Block has too many lines. [134/25]", 3856958364], - [926, 5, 1327, "Metrics/BlockLength: Block has too many lines. [33/25]", 4009192695], - [970, 5, 953, "Metrics/BlockLength: Block has too many lines. [29/25]", 902715698], - [1008, 5, 1147, "Metrics/BlockLength: Block has too many lines. [37/25]", 3544491851], - [1058, 5, 955, "Metrics/BlockLength: Block has too many lines. [27/25]", 2688118410], - [1096, 3, 1031, "Metrics/BlockLength: Block has too many lines. [32/25]", 663517347], - [1097, 5, 970, "Metrics/BlockLength: Block has too many lines. [31/25]", 1575476639], - [1135, 3, 882, "Metrics/BlockLength: Block has too many lines. [27/25]", 3845382500], - [1136, 5, 813, "Metrics/BlockLength: Block has too many lines. [26/25]", 1755501948], - [1171, 3, 805, "Metrics/BlockLength: Block has too many lines. [26/25]", 3413285873], - [1204, 3, 2200, "Metrics/BlockLength: Block has too many lines. [70/25]", 3541894760], - [1205, 5, 1202, "Metrics/BlockLength: Block has too many lines. [38/25]", 3971143978], - [1235, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177610], - [1251, 5, 923, "Metrics/BlockLength: Block has too many lines. [28/25]", 3867507419], - [1288, 3, 1175, "Metrics/BlockLength: Block has too many lines. [36/25]", 1587654554], - [1289, 5, 1103, "Metrics/BlockLength: Block has too many lines. [35/25]", 3885176914], - [1368, 3, 1252, "Metrics/BlockLength: Block has too many lines. [28/25]", 4206068435], - [1407, 3, 1278, "Metrics/BlockLength: Block has too many lines. [28/25]", 1372687996], - [1446, 3, 1265, "Metrics/BlockLength: Block has too many lines. [28/25]", 3208600846], - [1485, 3, 1265, "Metrics/BlockLength: Block has too many lines. [28/25]", 212464082], - [1524, 3, 1262, "Metrics/BlockLength: Block has too many lines. [28/25]", 4277366491] - ], - "spec/rbs/merge_spec.rb:3352331478": [ - [5, 1, 1389, "Metrics/BlockLength: Block has too many lines. [37/25]", 373922011], - [10, 3, 1270, "Metrics/BlockLength: Block has too many lines. [32/25]", 2567886247] - ] -} diff --git a/gems/rbs-merge/Gemfile b/gems/rbs-merge/Gemfile index 4137f14bc..024bd7458 100644 --- a/gems/rbs-merge/Gemfile +++ b/gems/rbs-merge/Gemfile @@ -272,6 +272,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/rbs-merge/Gemfile.lock b/gems/rbs-merge/Gemfile.lock index 78f88aa8f..4861a4dcc 100644 --- a/gems/rbs-merge/Gemfile.lock +++ b/gems/rbs-merge/Gemfile.lock @@ -275,6 +275,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -307,7 +323,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -362,18 +377,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -535,22 +539,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -634,7 +634,7 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) - appraisal2 (~> 3.1, >= 3.1.4) + appraisal2 (~> 3.2, >= 3.2.0) ast-crispr! ast-crispr-markdown-markly! ast-crispr-ruby-prism! @@ -656,9 +656,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.3, >= 2.3.7) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -692,7 +692,7 @@ DEPENDENCIES toml-merge! tree_haver! tree_sitter_language_pack! - turbo_tests2 (~> 3.1, >= 3.1.14) + turbo_tests2 (~> 3.2, >= 3.2.0) typescript-merge! yaml-converter (~> 0.1) yaml-merge! @@ -736,7 +736,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -757,10 +756,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -834,13 +833,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/rbs-merge/lib/rbs/merge/version.rb b/gems/rbs-merge/lib/rbs/merge/version.rb index a96a21ddc..8e09fbec5 100644 --- a/gems/rbs-merge/lib/rbs/merge/version.rb +++ b/gems/rbs-merge/lib/rbs/merge/version.rb @@ -3,7 +3,7 @@ module Rbs module Merge module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/rbs-merge/rbs-merge.gemspec b/gems/rbs-merge/rbs-merge.gemspec index 0f7a1c47f..a1b1ea2c8 100644 --- a/gems/rbs-merge/rbs-merge.gemspec +++ b/gems/rbs-merge/rbs-merge.gemspec @@ -9,47 +9,47 @@ Gem::Specification.new do |spec| spec.name = 'rbs-merge' spec.version = Module.new.tap { |mod| Kernel.load("#{__dir__}/lib/rbs/merge/version.rb", mod) }::Rbs::Merge::Version::VERSION - spec.authors = ['Peter H. Boling'] - spec.email = ['floss@galtzo.com'] + spec.authors = ["Peter H. Boling"] + spec.email = ["floss@galtzo.com"] spec.summary = '☯️ Structured Merge RBS analysis and merge for Ruby' spec.description = '☯️ RBS declaration, comment, freeze-block, and template merge behavior for Structured Merge.' spec.homepage = 'https://github.com/structuredmerge/structuredmerge-ruby' - spec.licenses = ['AGPL-3.0-only', 'PolyForm-Small-Business-1.0.0'] - spec.required_ruby_version = '>= 4.0.0' + spec.licenses = ["AGPL-3.0-only", "PolyForm-Small-Business-1.0.0"] + spec.required_ruby_version = ">= 4.0.0" # 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') - user_cert = "certs/#{ENV.fetch('GEM_CERT_USER', ENV['USER'])}.pem" + unless ENV.include?("SKIP_GEM_SIGNING") + user_cert = "certs/#{ENV.fetch("GEM_CERT_USER", ENV["USER"])}.pem" cert_file_path = File.join(__dir__, user_cert) - cert_chain = cert_file_path.split(',') + cert_chain = cert_file_path.split(",") cert_chain.select! { |fp| File.exist?(fp) } if cert_file_path && cert_chain.any? spec.cert_chain = cert_chain - if $PROGRAM_NAME.end_with?('gem') && ARGV[0] == 'build' - spec.signing_key = File.join(Gem.user_home, '.ssh', 'gem-private_key.pem') + if $PROGRAM_NAME.end_with?("gem") && ARGV[0] == "build" + spec.signing_key = File.join(Gem.user_home, ".ssh", "gem-private_key.pem") end end end - spec.metadata['homepage_uri'] = 'https://structuredmerge.org' - spec.metadata['source_code_uri'] = "#{spec.homepage}/tree/v#{spec.version}" - spec.metadata['changelog_uri'] = "#{spec.homepage}/blob/v#{spec.version}/CHANGELOG.md" - spec.metadata['bug_tracker_uri'] = "#{spec.homepage}/issues" - spec.metadata['documentation_uri'] = "https://www.rubydoc.info/gems/#{spec.name}/#{spec.version}" - spec.metadata['funding_uri'] = 'https://github.com/sponsors/pboling' - spec.metadata['wiki_uri'] = "#{spec.homepage}/wiki" - spec.metadata['news_uri'] = "https://www.railsbling.com/tags/#{spec.name}" - spec.metadata['discord_uri'] = 'https://discord.gg/3qme4XHNKN' - spec.metadata['rubygems_mfa_required'] = 'true' + spec.metadata["homepage_uri"] = "https://structuredmerge.org" + spec.metadata["source_code_uri"] = "#{spec.homepage}/tree/v#{spec.version}" + spec.metadata["changelog_uri"] = "#{spec.homepage}/blob/v#{spec.version}/CHANGELOG.md" + spec.metadata["bug_tracker_uri"] = "#{spec.homepage}/issues" + spec.metadata["documentation_uri"] = "https://www.rubydoc.info/gems/#{spec.name}/#{spec.version}" + spec.metadata["funding_uri"] = "https://github.com/sponsors/pboling" + spec.metadata["wiki_uri"] = "#{spec.homepage}/wiki" + spec.metadata["news_uri"] = "https://www.railsbling.com/tags/#{spec.name}" + spec.metadata["discord_uri"] = "https://discord.gg/3qme4XHNKN" + spec.metadata["rubygems_mfa_required"] = "true" enumerate_package_files = lambda do |root| - Dir.glob(File.join(root, '**', '*'), File::FNM_DOTMATCH).select do |path| - File.file?(path) && !['.', '..'].include?(File.basename(path)) + Dir.glob(File.join(root, "**", "*"), File::FNM_DOTMATCH).select do |path| + File.file?(path) && ![".", ".."].include?(File.basename(path)) end end package_metadata_files = %w[ @@ -69,17 +69,17 @@ Gem::Specification.new do |spec| *enumerate_package_files.call('exe') ] spec.rdoc_options += [ - '--title', + "--title", "#{spec.name} - #{spec.summary}", - '--main', - 'README.md', - '--exclude', - '^sig/', - '--line-numbers', - '--inline-source', - '--quiet' + "--main", + "README.md", + "--exclude", + "^sig/", + "--line-numbers", + "--inline-source", + "--quiet" ] - spec.bindir = 'exe' + spec.bindir = "exe" # Listed files are the relative paths from bindir above. spec.executables = [] @@ -89,13 +89,13 @@ Gem::Specification.new do |spec| # rbs-merge will then preserve content between those markers across template runs. # kettle-jem:unfreeze - spec.require_paths = ['lib'] + spec.require_paths = ["lib"] # Utilities spec.add_dependency 'ast-merge', "= #{spec.version}" spec.add_dependency 'rbs', '>= 3.10' spec.add_dependency 'tree_haver', "= #{spec.version}" - spec.add_dependency('version_gem', '~> 1.1', '>= 1.1.14') # ruby >= 2.2.0 + spec.add_dependency("version_gem", "~> 1.1", ">= 1.1.14") # ruby >= 2.2.0 # NOTE: It is preferable to list development dependencies in the gemspec due to increased # visibility and discoverability. @@ -111,26 +111,27 @@ Gem::Specification.new do |spec| # and preferably a modular one (see gemfiles/modular/*.gemfile). # Dev, Test, & Release Tasks - spec.add_development_dependency('kettle-dev', '~> 2.3', '>= 2.3.7') # ruby >= 4.0.0 + spec.add_development_dependency("kettle-dev", "~> 2.3", ">= 2.3.7") # ruby >= 4.0.0 # Security - spec.add_development_dependency('bundler-audit', '~> 0.9.3') # ruby >= 2.0.0 + spec.add_development_dependency("bundler-audit", "~> 0.9.3") # ruby >= 2.0.0 # Tasks - spec.add_development_dependency('rake', '~> 13.0') # ruby >= 2.2.0 + spec.add_development_dependency("rake", "~> 13.0") # ruby >= 2.2.0 # Debugging - spec.add_development_dependency('require_bench', '~> 1.0', '>= 1.0.4') # ruby >= 2.2.0 + spec.add_development_dependency("require_bench", "~> 1.0", ">= 1.0.4") # ruby >= 2.2.0 # Testing - spec.add_development_dependency('appraisal2', '~> 3.1', '>= 3.1.4') # ruby >= 1.8.7, for testing against multiple versions of dependencies - spec.add_development_dependency('kettle-test', '~> 2.0', '>= 2.0.11') # ruby >= 4.0.0 - spec.add_development_dependency('turbo_tests2', '~> 3.1', '>= 3.1.14') # ruby >= 2.4.0, default kettle-test runner + spec.add_development_dependency("appraisal2", "~> 3.2", ">= 3.2.0") # ruby >= 1.8.7, for testing against multiple versions of dependencies + spec.add_development_dependency("kettle-test", "~> 2.0", ">= 2.0.11") # ruby >= 4.0.0 + spec.add_development_dependency("turbo_tests2", "~> 3.2", ">= 3.2.0") # ruby >= 2.4.0, default kettle-test runner # Releasing - spec.add_development_dependency('ruby-progressbar', '~> 1.13') # ruby >= 0 - spec.add_development_dependency('stone_checksums', '~> 1.0', '>= 1.0.6') # ruby >= 2.2.0 + spec.add_development_dependency("ruby-progressbar", "~> 1.13") # ruby >= 0 + spec.add_development_dependency("stone_checksums", "~> 1.0", ">= 1.0.6") # ruby >= 2.2.0 # 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.4') # ruby >= 2.4 + spec.add_development_dependency("gitmoji-regex", "~> 2.0", ">= 2.0.4") # ruby >= 2.4 + end From ab074a9f015839e82c43d62c015649a15de97ac5 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:26:54 -0600 Subject: [PATCH 226/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-merge/.rubocop_gradual.lock | 2839 +++++++++++++++++++++++ gems/dotenv-merge/Gemfile.lock | 382 +-- gems/rbs-merge/lib/rbs/merge/version.rb | 2 +- gems/rbs-merge/rbs-merge.gemspec | 85 +- 4 files changed, 2913 insertions(+), 395 deletions(-) create mode 100644 gems/ast-merge/.rubocop_gradual.lock diff --git a/gems/ast-merge/.rubocop_gradual.lock b/gems/ast-merge/.rubocop_gradual.lock new file mode 100644 index 000000000..bc6712ed3 --- /dev/null +++ b/gems/ast-merge/.rubocop_gradual.lock @@ -0,0 +1,2839 @@ +{ + ".simplecov:3463276878": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:429706125": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "ast-merge.gemspec:1182320030": [ + [16, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1168797721], + [129, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [144, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [145, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [152, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/ast-merge.rb:3005639624": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`ast-merge.rb`) should use snake_case.", 5381] + ], + "lib/ast/merge.rb:3429747270": [ + [11, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge`.", 2866359175], + [11, 3, 270037, "Metrics/ModuleLength: Module has too many lines. [5702/100]", 2847709439], + [22, 5, 16, "Style/Documentation: Missing top-level documentation comment for `class Ast::Merge::ParseError`.", 362242086], + [33, 7, 362, "Metrics/AbcSize: Assignment Branch Condition size for `build_message` is too high. [<2, 16, 6> 17.2/17]", 3988736327], + [47, 5, 31, "Style/Documentation: Missing top-level documentation comment for `class Ast::Merge::PlaceholderCollisionError`.", 218924302], + [161, 7, 337, "Metrics/MethodLength: Method has too many lines. [11/10]", 2388996629], + [178, 7, 327, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [8/7]", 979795121], + [309, 7, 383, "Metrics/MethodLength: Method has too many lines. [11/10]", 634650261], + [473, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 3450568485], + [474, 7, 461, "Metrics/MethodLength: Method has too many lines. [12/10]", 43929779], + [491, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1299979089], + [492, 7, 377, "Metrics/MethodLength: Method has too many lines. [11/10]", 3704151253], + [508, 121, 39, "Layout/LineLength: Line is too long. [159/120]", 85503958], + [509, 7, 447, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [8/7]", 298553749], + [509, 7, 447, "Metrics/MethodLength: Method has too many lines. [12/10]", 298553749], + [538, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1441148616], + [539, 7, 453, "Metrics/MethodLength: Method has too many lines. [14/10]", 1899007021], + [558, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193342990], + [559, 7, 400, "Metrics/MethodLength: Method has too many lines. [11/10]", 298553749], + [588, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860750], + [589, 7, 411, "Metrics/MethodLength: Method has too many lines. [12/10]", 2893925621], + [606, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3137791633], + [607, 7, 454, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [8/7]", 298553749], + [607, 7, 454, "Metrics/MethodLength: Method has too many lines. [12/10]", 298553749], + [666, 7, 385, "Metrics/MethodLength: Method has too many lines. [11/10]", 794265461], + [703, 7, 419, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [10/7]", 3313546353], + [703, 7, 419, "Metrics/PerceivedComplexity: Perceived complexity for `to_h` is too high. [10/8]", 3313546353], + [753, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 398187770], + [765, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 2746783933], + [812, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860841], + [820, 121, 156, "Layout/LineLength: Line is too long. [276/120]", 1149525480], + [825, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 2538424426], + [837, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 2285382915], + [847, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3962419360], + [860, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 398187770], + [862, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3195178507], + [866, 121, 85, "Layout/LineLength: Line is too long. [205/120]", 4238980637], + [868, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 2678411233], + [870, 121, 39, "Layout/LineLength: Line is too long. [159/120]", 4028520110], + [881, 121, 110, "Layout/LineLength: Line is too long. [230/120]", 3837814921], + [895, 5, 2283, "Metrics/MethodLength: Method has too many lines. [57/10]", 2282416447], + [955, 5, 2654, "Metrics/MethodLength: Method has too many lines. [63/10]", 2491520565], + [1006, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1823519875], + [1015, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1874311968], + [1021, 5, 10660, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_downstream_merge_gem_feature_matrix` is too high. [<0, 21, 0> 21/17]", 2277322577], + [1021, 5, 10660, "Metrics/MethodLength: Method has too many lines. [248/10]", 2277322577], + [1272, 5, 1546, "Metrics/MethodLength: Method has too many lines. [37/10]", 208933754], + [1306, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 2658452668], + [1312, 5, 4206, "Metrics/MethodLength: Method has too many lines. [96/10]", 1997530776], + [1389, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 183246985], + [1405, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 3268438356], + [1411, 5, 1598, "Metrics/MethodLength: Method has too many lines. [46/10]", 849757258], + [1454, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1323237892], + [1460, 5, 1164, "Metrics/MethodLength: Method has too many lines. [36/10]", 1477831421], + [1493, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 931876829], + [1499, 5, 1699, "Metrics/MethodLength: Method has too many lines. [43/10]", 1125544678], + [1545, 5, 1016, "Metrics/MethodLength: Method has too many lines. [27/10]", 2194427985], + [1575, 5, 1058, "Metrics/MethodLength: Method has too many lines. [30/10]", 47860722], + [1608, 5, 1186, "Metrics/MethodLength: Method has too many lines. [31/10]", 676863486], + [1636, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 2689509078], + [1642, 5, 1517, "Metrics/MethodLength: Method has too many lines. [41/10]", 3855445172], + [1655, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 817380904], + [1680, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 409671963], + [1686, 5, 2116, "Metrics/MethodLength: Method has too many lines. [61/10]", 524104794], + [1750, 5, 820, "Metrics/MethodLength: Method has too many lines. [12/10]", 1888457180], + [1750, 37, 298, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 789483382], + [1751, 121, 100, "Layout/LineLength: Line is too long. [220/120]", 3288750271], + [1766, 5, 3595, "Metrics/AbcSize: Assignment Branch Condition size for `initial_profile_promotion_policy` is too high. [<9, 20, 0> 21.93/17]", 83685787], + [1766, 5, 3595, "Metrics/MethodLength: Method has too many lines. [77/10]", 83685787], + [1846, 5, 768, "Metrics/MethodLength: Method has too many lines. [17/10]", 314059802], + [1867, 5, 1493, "Metrics/AbcSize: Assignment Branch Condition size for `evaluate_profile_selection_requirement` is too high. [<7, 23, 9> 25.67/17]", 3177555163], + [1867, 5, 1493, "Metrics/MethodLength: Method has too many lines. [29/10]", 3177555163], + [1868, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2145168012], + [1875, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 683002336], + [1909, 5, 985, "Metrics/AbcSize: Assignment Branch Condition size for `profile_promotion_blocking_reasons` is too high. [<4, 25, 13> 28.46/17]", 1146627465], + [1909, 5, 985, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `profile_promotion_blocking_reasons` is too high. [10/7]", 1146627465], + [1909, 5, 985, "Metrics/MethodLength: Method has too many lines. [18/10]", 1146627465], + [1909, 5, 985, "Metrics/PerceivedComplexity: Perceived complexity for `profile_promotion_blocking_reasons` is too high. [10/8]", 1146627465], + [1930, 5, 3173, "Metrics/AbcSize: Assignment Branch Condition size for `validate_language_backend_profile` is too high. [<25, 68, 20> 75.16/17]", 2100389324], + [1930, 5, 3173, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_language_backend_profile` is too high. [21/7]", 2100389324], + [1930, 5, 3173, "Metrics/MethodLength: Method has too many lines. [60/10]", 2100389324], + [1930, 5, 3173, "Metrics/PerceivedComplexity: Perceived complexity for `validate_language_backend_profile` is too high. [23/8]", 2100389324], + [2002, 5, 1523, "Metrics/AbcSize: Assignment Branch Condition size for `validate_backend_inventory` is too high. [<13, 38, 13> 42.21/17]", 1899037537], + [2002, 5, 1523, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_backend_inventory` is too high. [13/7]", 1899037537], + [2002, 5, 1523, "Metrics/MethodLength: Method has too many lines. [25/10]", 1899037537], + [2002, 5, 1523, "Metrics/PerceivedComplexity: Perceived complexity for `validate_backend_inventory` is too high. [13/8]", 1899037537], + [2045, 5, 906, "Metrics/MethodLength: Method has too many lines. [20/10]", 3137959843], + [2068, 5, 2744, "Metrics/AbcSize: Assignment Branch Condition size for `detect_raw_merge_inconsistencies` is too high. [<8, 43, 21> 48.52/17]", 3717440692], + [2068, 5, 2744, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_raw_merge_inconsistencies` is too high. [17/7]", 3717440692], + [2068, 5, 2744, "Metrics/MethodLength: Method has too many lines. [53/10]", 3717440692], + [2068, 5, 2744, "Metrics/PerceivedComplexity: Perceived complexity for `detect_raw_merge_inconsistencies` is too high. [17/8]", 3717440692], + [2083, 7, 1894, "Metrics/BlockLength: Block has too many lines. [33/25]", 758887611], + [2129, 5, 762, "Metrics/MethodLength: Method has too many lines. [11/10]", 3021402342], + [2143, 5, 490, "Metrics/MethodLength: Method has too many lines. [11/10]", 578473475], + [2157, 5, 881, "Metrics/AbcSize: Assignment Branch Condition size for `execute_independent_commutative_insertions` is too high. [<6, 16, 7> 18.47/17]", 259417386], + [2157, 5, 881, "Metrics/MethodLength: Method has too many lines. [21/10]", 259417386], + [2184, 5, 1107, "Metrics/AbcSize: Assignment Branch Condition size for `execute_independent_keyed_member_edits` is too high. [<10, 31, 15> 35.86/17]", 4271501385], + [2184, 5, 1107, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `execute_independent_keyed_member_edits` is too high. [14/7]", 4271501385], + [2184, 5, 1107, "Metrics/MethodLength: Method has too many lines. [24/10]", 4271501385], + [2184, 5, 1107, "Metrics/PerceivedComplexity: Perceived complexity for `execute_independent_keyed_member_edits` is too high. [14/8]", 4271501385], + [2228, 5, 3149, "Metrics/AbcSize: Assignment Branch Condition size for `parse_compact_ruleset` is too high. [<16, 68, 24> 73.86/17]", 3149098803], + [2228, 5, 3149, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_compact_ruleset` is too high. [22/7]", 3149098803], + [2228, 5, 3149, "Metrics/MethodLength: Method has too many lines. [67/10]", 3149098803], + [2228, 5, 3149, "Metrics/PerceivedComplexity: Perceived complexity for `parse_compact_ruleset` is too high. [23/8]", 3149098803], + [2234, 7, 2544, "Metrics/BlockLength: Block has too many lines. [50/25]", 2484860466], + [2261, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193420054], + [2307, 5, 2658, "Metrics/AbcSize: Assignment Branch Condition size for `compact_ruleset_feature_profile` is too high. [<11, 67, 38> 77.81/17]", 4022599673], + [2307, 5, 2658, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compact_ruleset_feature_profile` is too high. [29/7]", 4022599673], + [2307, 5, 2658, "Metrics/MethodLength: Method has too many lines. [66/10]", 4022599673], + [2307, 5, 2658, "Metrics/PerceivedComplexity: Perceived complexity for `compact_ruleset_feature_profile` is too high. [16/8]", 4022599673], + [2325, 7, 2243, "Metrics/BlockLength: Block has too many lines. [47/25]", 965041772], + [2392, 5, 2733, "Metrics/AbcSize: Assignment Branch Condition size for `classify_template_target_path` is too high. [<4, 36, 23> 42.91/17]", 3661828596], + [2392, 5, 2733, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `classify_template_target_path` is too high. [21/7]", 3661828596], + [2392, 5, 2733, "Metrics/MethodLength: Method has too many lines. [39/10]", 3661828596], + [2392, 5, 2733, "Metrics/PerceivedComplexity: Perceived complexity for `classify_template_target_path` is too high. [17/8]", 3661828596], + [2424, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [2438, 5, 416, "Metrics/MethodLength: Method has too many lines. [12/10]", 1388641773], + [2481, 5, 388, "Metrics/MethodLength: Method has too many lines. [12/10]", 2360583514], + [2510, 5, 820, "Metrics/MethodLength: Method has too many lines. [13/10]", 354674808], + [2526, 5, 929, "Metrics/AbcSize: Assignment Branch Condition size for `enrich_template_plan_entries` is too high. [<9, 12, 10> 18.03/17]", 2666747528], + [2526, 5, 929, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `enrich_template_plan_entries` is too high. [9/7]", 2666747528], + [2526, 5, 929, "Metrics/MethodLength: Method has too many lines. [19/10]", 2666747528], + [2526, 5, 929, "Metrics/PerceivedComplexity: Perceived complexity for `enrich_template_plan_entries` is too high. [10/8]", 2666747528], + [2549, 5, 1245, "Metrics/AbcSize: Assignment Branch Condition size for `enrich_template_plan_entries_with_token_state` is too high. [<11, 23, 14> 29.09/17]", 1507113977], + [2549, 5, 1245, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `enrich_template_plan_entries_with_token_state` is too high. [13/7]", 1507113977], + [2549, 5, 1245, "Metrics/MethodLength: Method has too many lines. [19/10]", 1507113977], + [2549, 5, 1245, "Metrics/PerceivedComplexity: Perceived complexity for `enrich_template_plan_entries_with_token_state` is too high. [13/8]", 1507113977], + [2573, 5, 1353, "Metrics/AbcSize: Assignment Branch Condition size for `prepare_template_entries` is too high. [<6, 18, 11> 21.93/17]", 2774310942], + [2573, 5, 1353, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `prepare_template_entries` is too high. [11/7]", 2774310942], + [2573, 5, 1353, "Metrics/MethodLength: Method has too many lines. [24/10]", 2774310942], + [2573, 5, 1353, "Metrics/PerceivedComplexity: Perceived complexity for `prepare_template_entries` is too high. [12/8]", 2774310942], + [2603, 5, 1494, "Metrics/AbcSize: Assignment Branch Condition size for `plan_template_execution` is too high. [<8, 22, 17> 28.93/17]", 3876421385], + [2603, 5, 1494, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `plan_template_execution` is too high. [14/7]", 3876421385], + [2603, 5, 1494, "Metrics/MethodLength: Method has too many lines. [29/10]", 3876421385], + [2603, 5, 1494, "Metrics/PerceivedComplexity: Perceived complexity for `plan_template_execution` is too high. [15/8]", 3876421385], + [2604, 7, 1421, "Metrics/BlockLength: Block has too many lines. [27/25]", 2887810383], + [2637, 5, 822, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 2749235529], + [2637, 37, 220, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 447165880], + [2638, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 518382509], + [2652, 5, 2060, "Metrics/AbcSize: Assignment Branch Condition size for `preview_template_execution` is too high. [<11, 42, 26> 50.61/17]", 2270817206], + [2652, 5, 2060, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preview_template_execution` is too high. [25/7]", 2270817206], + [2652, 5, 2060, "Metrics/MethodLength: Method has too many lines. [39/10]", 2270817206], + [2652, 5, 2060, "Metrics/PerceivedComplexity: Perceived complexity for `preview_template_execution` is too high. [23/8]", 2270817206], + [2662, 7, 1809, "Metrics/BlockLength: Block has too many lines. [28/25]", 310337564], + [2700, 5, 2513, "Metrics/AbcSize: Assignment Branch Condition size for `apply_template_execution` is too high. [<14, 50, 25> 57.63/17]", 177708331], + [2700, 5, 2513, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_template_execution` is too high. [26/7]", 177708331], + [2700, 5, 2513, "Metrics/MethodLength: Method has too many lines. [50/10]", 177708331], + [2700, 5, 2513, "Metrics/PerceivedComplexity: Perceived complexity for `apply_template_execution` is too high. [23/8]", 177708331], + [2711, 7, 2239, "Metrics/BlockLength: Block has too many lines. [38/25]", 1651205014], + [2761, 5, 1696, "Metrics/AbcSize: Assignment Branch Condition size for `evaluate_template_tree_convergence` is too high. [<11, 29, 17> 35.37/17]", 2507998041], + [2761, 5, 1696, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `evaluate_template_tree_convergence` is too high. [17/7]", 2507998041], + [2761, 5, 1696, "Metrics/MethodLength: Method has too many lines. [35/10]", 2507998041], + [2761, 5, 1696, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 2507998041], + [2761, 5, 1696, "Metrics/PerceivedComplexity: Perceived complexity for `evaluate_template_tree_convergence` is too high. [17/8]", 2507998041], + [2761, 43, 198, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 4214374277], + [2762, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 2983874608], + [2804, 5, 688, "Metrics/MethodLength: Method has too many lines. [15/10]", 3064253784], + [2804, 5, 688, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 3064253784], + [2804, 36, 216, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 448029307], + [2805, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3840139076], + [2848, 5, 664, "Metrics/MethodLength: Method has too many lines. [13/10]", 995637868], + [2848, 5, 664, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 995637868], + [2848, 53, 202, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 4227116196], + [2849, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 418683952], + [2866, 5, 649, "Metrics/MethodLength: Method has too many lines. [13/10]", 1831524792], + [2866, 5, 649, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 1831524792], + [2866, 54, 178, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2962381850], + [2867, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 3690915627], + [2884, 5, 1280, "Metrics/AbcSize: Assignment Branch Condition size for `apply_template_tree_execution_to_directory` is too high. [<6, 16, 6> 18.11/17]", 305449363], + [2884, 5, 1280, "Metrics/MethodLength: Method has too many lines. [23/10]", 305449363], + [2884, 5, 1280, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 305449363], + [2884, 51, 200, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1352434212], + [2885, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 1139621482], + [2913, 5, 2199, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_tree_run` is too high. [<15, 42, 31> 54.31/17]", 975627723], + [2913, 5, 2199, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_tree_run` is too high. [25/7]", 975627723], + [2913, 5, 2199, "Metrics/MethodLength: Method has too many lines. [38/10]", 975627723], + [2913, 5, 2199, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_tree_run` is too high. [26/8]", 975627723], + [2957, 5, 1515, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_apply` is too high. [<13, 35, 21> 42.84/17]", 3710254295], + [2957, 5, 1515, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_directory_apply` is too high. [17/7]", 3710254295], + [2957, 5, 1515, "Metrics/MethodLength: Method has too many lines. [26/10]", 3710254295], + [2957, 5, 1515, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_directory_apply` is too high. [17/8]", 3710254295], + [2972, 20, 1, "Style/DoubleNegation: Avoid the use of double negation (`!!`).", 177540], + [2989, 5, 1656, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_plan` is too high. [<11, 24, 25> 36.36/17]", 2946319293], + [2989, 5, 1656, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_directory_plan` is too high. [18/7]", 2946319293], + [2989, 5, 1656, "Metrics/MethodLength: Method has too many lines. [36/10]", 2946319293], + [2989, 5, 1656, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_directory_plan` is too high. [16/8]", 2946319293], + [3061, 7, 9, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 3648222389], + [3082, 5, 410, "Metrics/MethodLength: Method has too many lines. [12/10]", 248324428], + [3088, 7, 11, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 848344986], + [3132, 5, 712, "Metrics/MethodLength: Method has too many lines. [12/10]", 2500743043], + [3132, 27, 178, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 873705194], + [3132, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3023611470], + [3158, 42, 167, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2002181571], + [3171, 5, 1097, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structured_edit_selection_profile` is too high. [8/7]", 1149325233], + [3171, 5, 1097, "Metrics/MethodLength: Method has too many lines. [14/10]", 1149325233], + [3171, 42, 311, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 3814063337], + [3172, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 198450264], + [3185, 34, 47, "Style/SafeNavigation: Use safe navigation (`&.`) instead of checking if an object exists before calling the method.", 3204815976], + [3190, 5, 869, "Metrics/MethodLength: Method has too many lines. [11/10]", 83957392], + [3190, 41, 250, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1486072775], + [3191, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1967186495], + [3201, 36, 47, "Style/SafeNavigation: Use safe navigation (`&.`) instead of checking if an object exists before calling the method.", 3204815976], + [3206, 5, 1156, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structured_edit_match_profile` is too high. [10/7]", 4112674787], + [3206, 5, 1156, "Metrics/MethodLength: Method has too many lines. [15/10]", 4112674787], + [3206, 5, 1156, "Metrics/PerceivedComplexity: Perceived complexity for `structured_edit_match_profile` is too high. [10/8]", 4112674787], + [3206, 38, 321, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [12/5]", 823565876], + [3207, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859667], + [3208, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3673982236], + [3226, 5, 933, "Metrics/MethodLength: Method has too many lines. [14/10]", 2099388915], + [3226, 37, 319, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [12/5]", 250907892], + [3227, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177545], + [3228, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 4154814685], + [3245, 5, 907, "Metrics/MethodLength: Method has too many lines. [12/10]", 2242846328], + [3245, 42, 275, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 246196330], + [3246, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1439117336], + [3262, 5, 1057, "Metrics/MethodLength: Method has too many lines. [14/10]", 2891607970], + [3262, 44, 323, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 1386547750], + [3263, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1676243675], + [3264, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 4154814685], + [3281, 5, 1375, "Metrics/AbcSize: Assignment Branch Condition size for `structured_edit_request` is too high. [<11, 25, 10> 29.09/17]", 4153786554], + [3281, 5, 1375, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structured_edit_request` is too high. [11/7]", 4153786554], + [3281, 5, 1375, "Metrics/MethodLength: Method has too many lines. [16/10]", 4153786554], + [3281, 5, 1375, "Metrics/PerceivedComplexity: Perceived complexity for `structured_edit_request` is too high. [11/8]", 4153786554], + [3281, 32, 370, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [13/5]", 2381882467], + [3282, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177545], + [3303, 5, 728, "Metrics/MethodLength: Method has too many lines. [11/10]", 4026157473], + [3303, 31, 175, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 773121544], + [3335, 5, 597, "Metrics/MethodLength: Method has too many lines. [11/10]", 4143495860], + [3374, 5, 577, "Metrics/MethodLength: Method has too many lines. [11/10]", 4169131743], + [3389, 5, 1011, "Metrics/AbcSize: Assignment Branch Condition size for `structured_edit_execution_report` is too high. [<7, 16, 7> 18.81/17]", 876221899], + [3389, 5, 1011, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structured_edit_execution_report` is too high. [8/7]", 876221899], + [3389, 5, 1011, "Metrics/MethodLength: Method has too many lines. [12/10]", 876221899], + [3389, 41, 245, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 2484440861], + [3390, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 4036992717], + [3415, 55, 170, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 668161765], + [3438, 5, 819, "Metrics/MethodLength: Method has too many lines. [12/10]", 2287133436], + [3438, 56, 217, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3198032135], + [3439, 121, 51, "Layout/LineLength: Line is too long. [171/120]", 3526181051], + [3472, 5, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 1853778635], + [3481, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], + [3513, 5, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 1132214891], + [3522, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], + [3544, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 556747511], + [3553, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1808630920], + [3575, 5, 708, "Metrics/MethodLength: Method has too many lines. [11/10]", 3590891170], + [3584, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1367166441], + [3607, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 689748855], + [3616, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1808630920], + [3638, 5, 708, "Metrics/MethodLength: Method has too many lines. [11/10]", 1478642210], + [3647, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1367166441], + [3671, 5, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 239506091], + [3680, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], + [3702, 5, 693, "Metrics/MethodLength: Method has too many lines. [11/10]", 3803476550], + [3711, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], + [3734, 5, 728, "Metrics/MethodLength: Method has too many lines. [11/10]", 748161230], + [3743, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 2807086497], + [3765, 5, 758, "Metrics/MethodLength: Method has too many lines. [11/10]", 3900524558], + [3774, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3463884836], + [3798, 5, 748, "Metrics/MethodLength: Method has too many lines. [11/10]", 2076716686], + [3807, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 609414023], + [3829, 5, 778, "Metrics/MethodLength: Method has too many lines. [11/10]", 867958318], + [3833, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193343749], + [3838, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 1202823007], + [3862, 5, 728, "Metrics/MethodLength: Method has too many lines. [11/10]", 2078323790], + [3871, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 2807086497], + [3893, 5, 758, "Metrics/MethodLength: Method has too many lines. [11/10]", 121025422], + [3902, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3463884836], + [3924, 5, 733, "Metrics/MethodLength: Method has too many lines. [11/10]", 1216456558], + [3933, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 145839927], + [3955, 5, 763, "Metrics/MethodLength: Method has too many lines. [11/10]", 2946525998], + [3964, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 275709226], + [3988, 5, 768, "Metrics/MethodLength: Method has too many lines. [11/10]", 3281402414], + [3992, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177656], + [3997, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 1427340581], + [4034, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3673982236], + [4091, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193417070], + [4102, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2768444], + [4109, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3833204035], + [4117, 5, 863, "Metrics/MethodLength: Method has too many lines. [11/10]", 3731153486], + [4121, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 4054494590], + [4126, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 2084326338], + [4132, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 4201858364], + [4136, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861122], + [4140, 5, 873, "Metrics/MethodLength: Method has too many lines. [11/10]", 1866057614], + [4144, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3893180930], + [4149, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 863421408], + [4155, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 3247130491], + [4159, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1171438608], + [4163, 5, 883, "Metrics/MethodLength: Method has too many lines. [11/10]", 2352924462], + [4163, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860841], + [4164, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861334], + [4167, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 465221046], + [4172, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 1922522532], + [4188, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 4067226670], + [4192, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2033573170], + [4196, 5, 893, "Metrics/MethodLength: Method has too many lines. [11/10]", 1633175534], + [4196, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087926422], + [4197, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087421565], + [4200, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 615151909], + [4205, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 884393597], + [4231, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 417844693], + [4235, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1233681340], + [4239, 5, 903, "Metrics/MethodLength: Method has too many lines. [11/10]", 3964877742], + [4239, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873471], + [4240, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1322899615], + [4243, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 3471008807], + [4248, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 627945471], + [4254, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 2960084092], + [4258, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2148514258], + [4262, 5, 913, "Metrics/MethodLength: Method has too many lines. [11/10]", 385546958], + [4262, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2970472935], + [4263, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3808956371], + [4266, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 3412499338], + [4271, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 3274208144], + [4277, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 4275923717], + [4285, 5, 848, "Metrics/MethodLength: Method has too many lines. [11/10]", 457851502], + [4289, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 413805135], + [4294, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 951908917], + [4300, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 1859200227], + [4308, 5, 808, "Metrics/MethodLength: Method has too many lines. [11/10]", 884695726], + [4312, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 2011807620], + [4317, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 384138219], + [4323, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1176320663], + [4331, 5, 798, "Metrics/MethodLength: Method has too many lines. [11/10]", 1422521838], + [4335, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3247420006], + [4340, 121, 35, "Layout/LineLength: Line is too long. [155/120]", 1408316702], + [4346, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 938465266], + [4354, 5, 803, "Metrics/MethodLength: Method has too many lines. [11/10]", 2370839950], + [4358, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 74128911], + [4363, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 1364659899], + [4369, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2059517661], + [4377, 5, 803, "Metrics/MethodLength: Method has too many lines. [11/10]", 3379336814], + [4381, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 74128911], + [4386, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 1364659899], + [4434, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 4281772560], + [4442, 5, 833, "Metrics/MethodLength: Method has too many lines. [11/10]", 3245498510], + [4446, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3542644754], + [4451, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1916814773], + [4457, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 859690879], + [4465, 5, 833, "Metrics/MethodLength: Method has too many lines. [11/10]", 4138830126], + [4469, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3542644754], + [4474, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1916814773], + [4480, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3880141603], + [4488, 5, 828, "Metrics/MethodLength: Method has too many lines. [11/10]", 3621010990], + [4492, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3917260126], + [4497, 121, 41, "Layout/LineLength: Line is too long. [161/120]", 1879260859], + [4503, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1776611011], + [4511, 5, 838, "Metrics/MethodLength: Method has too many lines. [11/10]", 514585454], + [4515, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1353518231], + [4520, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 1228459824], + [4526, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 3932349968], + [4530, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087903307], + [4534, 5, 878, "Metrics/MethodLength: Method has too many lines. [11/10]", 1525737454], + [4534, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], + [4535, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177538], + [4538, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 2895681070], + [4543, 121, 51, "Layout/LineLength: Line is too long. [171/120]", 4040662298], + [4549, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 66929045], + [4557, 5, 808, "Metrics/MethodLength: Method has too many lines. [11/10]", 1626746606], + [4561, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 2011807620], + [4566, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 384138219], + [4580, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 849230508], + [4588, 5, 838, "Metrics/MethodLength: Method has too many lines. [11/10]", 3531122670], + [4592, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1353518231], + [4597, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 1228459824], + [4612, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1176320663], + [4620, 5, 798, "Metrics/MethodLength: Method has too many lines. [11/10]", 1118421486], + [4624, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3247420006], + [4629, 121, 35, "Layout/LineLength: Line is too long. [155/120]", 1408316702], + [4651, 5, 693, "Metrics/MethodLength: Method has too many lines. [11/10]", 1668406662], + [4660, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], + [4674, 5, 648, "Metrics/MethodLength: Method has too many lines. [11/10]", 3479836893], + [4683, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193343749], + [4705, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 3147549879], + [4714, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1808630920], + [4749, 5, 677, "Metrics/MethodLength: Method has too many lines. [11/10]", 1206941784], + [4758, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3937819337], + [4781, 5, 672, "Metrics/MethodLength: Method has too many lines. [11/10]", 3634903061], + [4790, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], + [4812, 5, 683, "Metrics/MethodLength: Method has too many lines. [11/10]", 3417053461], + [4821, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], + [4845, 5, 668, "Metrics/MethodLength: Method has too many lines. [11/10]", 1540762726], + [4854, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1808630920], + [4876, 5, 698, "Metrics/MethodLength: Method has too many lines. [11/10]", 2804825893], + [4885, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1367166441], + [4908, 5, 683, "Metrics/MethodLength: Method has too many lines. [11/10]", 3165010613], + [4917, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], + [4939, 5, 713, "Metrics/MethodLength: Method has too many lines. [11/10]", 2795628035], + [4948, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 497133415], + [4954, 5, 864, "Metrics/MethodLength: Method has too many lines. [12/10]", 1086224878], + [4954, 50, 268, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 4022739767], + [4955, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1607400384], + [4979, 5, 658, "Metrics/MethodLength: Method has too many lines. [11/10]", 3999796489], + [4988, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 102058825], + [5002, 59, 179, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1569981428], + [5003, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 1515849732], + [5034, 5, 694, "Metrics/MethodLength: Method has too many lines. [11/10]", 3830236120], + [5043, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2250857971], + [5057, 5, 673, "Metrics/MethodLength: Method has too many lines. [11/10]", 2413908653], + [5066, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1225026887], + [5080, 5, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 3935895659], + [5089, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], + [5103, 5, 692, "Metrics/MethodLength: Method has too many lines. [11/10]", 3660669627], + [5112, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3558241761], + [5126, 5, 612, "Metrics/MethodLength: Method has too many lines. [11/10]", 100391811], + [5165, 5, 693, "Metrics/MethodLength: Method has too many lines. [11/10]", 3138587622], + [5174, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], + [5196, 5, 688, "Metrics/MethodLength: Method has too many lines. [11/10]", 2736088861], + [5205, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1992103013], + [5228, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 2275602867], + [5237, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3598350322], + [5260, 5, 602, "Metrics/MethodLength: Method has too many lines. [11/10]", 3023166371], + [5275, 36, 181, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1071580945], + [5288, 5, 787, "Metrics/AbcSize: Assignment Branch Condition size for `group_projected_child_review_cases` is too high. [<4, 17, 4> 17.92/17]", 3391527151], + [5288, 5, 787, "Metrics/MethodLength: Method has too many lines. [18/10]", 3391527151], + [5312, 5, 705, "Metrics/MethodLength: Method has too many lines. [13/10]", 2629923275], + [5339, 5, 547, "Metrics/MethodLength: Method has too many lines. [12/10]", 1911190850], + [5364, 5, 1516, "Metrics/AbcSize: Assignment Branch Condition size for `review_projected_child_groups` is too high. [<11, 21, 9> 25.36/17]", 3333110579], + [5364, 5, 1516, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `review_projected_child_groups` is too high. [8/7]", 3333110579], + [5364, 5, 1516, "Metrics/MethodLength: Method has too many lines. [39/10]", 3333110579], + [5364, 5, 1516, "Metrics/PerceivedComplexity: Perceived complexity for `review_projected_child_groups` is too high. [9/8]", 3333110579], + [5398, 7, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], + [5410, 5, 562, "Metrics/MethodLength: Method has too many lines. [14/10]", 3083915102], + [5429, 5, 1898, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_delegated_child_outputs` is too high. [<11, 21, 6> 24.45/17]", 2739722546], + [5429, 5, 1898, "Metrics/MethodLength: Method has too many lines. [49/10]", 2739722546], + [5484, 5, 942, "Metrics/AbcSize: Assignment Branch Condition size for `execute_nested_merge` is too high. [<3, 17, 6> 18.28/17]", 766157172], + [5484, 5, 942, "Metrics/MethodLength: Method has too many lines. [20/10]", 766157172], + [5484, 29, 144, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1404367793], + [5511, 5, 652, "Metrics/MethodLength: Method has too many lines. [13/10]", 2105803856], + [5530, 38, 140, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1682835820], + [5560, 5, 577, "Metrics/MethodLength: Method has too many lines. [12/10]", 2659610443], + [5629, 5, 569, "Metrics/MethodLength: Method has too many lines. [14/10]", 20616641], + [5657, 5, 772, "Metrics/AbcSize: Assignment Branch Condition size for `conformance_manifest_review_request_ids` is too high. [<7, 16, 8> 19.21/17]", 3577418475], + [5657, 5, 772, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `conformance_manifest_review_request_ids` is too high. [9/7]", 3577418475], + [5657, 5, 772, "Metrics/MethodLength: Method has too many lines. [14/10]", 3577418475], + [5657, 5, 772, "Metrics/PerceivedComplexity: Perceived complexity for `conformance_manifest_review_request_ids` is too high. [9/8]", 3577418475], + [5711, 5, 606, "Metrics/MethodLength: Method has too many lines. [11/10]", 2675086662], + [5726, 5, 562, "Metrics/MethodLength: Method has too many lines. [11/10]", 3811715870], + [5741, 5, 578, "Metrics/MethodLength: Method has too many lines. [11/10]", 1776197415], + [5756, 5, 1298, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_conformance_family_context` is too high. [<7, 28, 9> 30.23/17]", 4265202259], + [5756, 5, 1298, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `resolve_conformance_family_context` is too high. [10/7]", 4265202259], + [5756, 5, 1298, "Metrics/MethodLength: Method has too many lines. [23/10]", 4265202259], + [5756, 5, 1298, "Metrics/PerceivedComplexity: Perceived complexity for `resolve_conformance_family_context` is too high. [10/8]", 4265202259], + [5785, 5, 1994, "Metrics/AbcSize: Assignment Branch Condition size for `review_conformance_family_context` is too high. [<12, 24, 10> 28.64/17]", 2834851944], + [5785, 5, 1994, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `review_conformance_family_context` is too high. [10/7]", 2834851944], + [5785, 5, 1994, "Metrics/MethodLength: Method has too many lines. [41/10]", 2834851944], + [5785, 5, 1994, "Metrics/PerceivedComplexity: Perceived complexity for `review_conformance_family_context` is too high. [11/8]", 2834851944], + [5808, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 641612328], + [5845, 5, 1844, "Metrics/AbcSize: Assignment Branch Condition size for `select_conformance_case` is too high. [<2, 43, 14> 45.27/17]", 670673209], + [5845, 5, 1844, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `select_conformance_case` is too high. [14/7]", 670673209], + [5845, 5, 1844, "Metrics/MethodLength: Method has too many lines. [30/10]", 670673209], + [5845, 5, 1844, "Metrics/PerceivedComplexity: Perceived complexity for `select_conformance_case` is too high. [16/8]", 670673209], + [5850, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 2135503892], + [5852, 121, 41, "Layout/LineLength: Line is too long. [161/120]", 3932054828], + [5861, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 3169124957], + [5883, 5, 509, "Metrics/MethodLength: Method has too many lines. [11/10]", 3552283123], + [5972, 5, 4195, "Metrics/AbcSize: Assignment Branch Condition size for `review_conformance_manifest` is too high. [<37, 63, 16> 74.79/17]", 2166560528], + [5972, 5, 4195, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `review_conformance_manifest` is too high. [14/7]", 2166560528], + [5972, 5, 4195, "Metrics/MethodLength: Method has too many lines. [89/10]", 2166560528], + [5972, 5, 4195, "Metrics/PerceivedComplexity: Perceived complexity for `review_conformance_manifest` is too high. [17/8]", 2166560528], + [6037, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2746826653], + [6053, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 3035993839], + [6075, 5, 676, "Metrics/MethodLength: Method has too many lines. [15/10]", 3048335475], + [6098, 5, 1054, "Metrics/AbcSize: Assignment Branch Condition size for `plan_conformance_suite` is too high. [<11, 18, 8> 22.56/17]", 1855254788], + [6098, 5, 1054, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `plan_conformance_suite` is too high. [8/7]", 1855254788], + [6098, 5, 1054, "Metrics/MethodLength: Method has too many lines. [25/10]", 1855254788], + [6098, 31, 84, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 172854173], + [6163, 5, 1274, "Metrics/AbcSize: Assignment Branch Condition size for `plan_named_conformance_suites_with_diagnostics` is too high. [<11, 21, 7> 24.72/17]", 3991300730], + [6163, 5, 1274, "Metrics/MethodLength: Method has too many lines. [27/10]", 3991300730], + [6190, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 3035993839], + [6255, 5, 2071, "Metrics/AbcSize: Assignment Branch Condition size for `review_decision_for_family_context` is too high. [<7, 22, 16> 28.09/17]", 4245377184], + [6255, 5, 2071, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `review_decision_for_family_context` is too high. [12/7]", 4245377184], + [6255, 5, 2071, "Metrics/MethodLength: Method has too many lines. [46/10]", 4245377184], + [6255, 5, 2071, "Metrics/PerceivedComplexity: Perceived complexity for `review_decision_for_family_context` is too high. [12/8]", 4245377184], + [6260, 7, 1766, "Metrics/BlockLength: Block has too many lines. [40/25]", 65448241], + [6312, 5, 686, "Metrics/MethodLength: Method has too many lines. [13/10]", 4030291682] + ], + "lib/ast/merge/ast_node.rb:2037773320": [ + [44, 5, 7086, "Metrics/ClassLength: Class has too many lines. [114/100]", 201314721], + [220, 11, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183] + ], + "lib/ast/merge/comment/attachment.rb:2388154769": [ + [42, 23, 180, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3775370530], + [75, 24, 2, "Lint/SafeNavigationConsistency: Use `.` instead of unnecessary `&.`.", 5858765], + [81, 25, 2, "Lint/SafeNavigationConsistency: Use `.` instead of unnecessary `&.`.", 5858765], + [114, 9, 410, "Metrics/AbcSize: Assignment Branch Condition size for `inspect` is too high. [<1, 17, 4> 17.49/17]", 605978105], + [115, 32, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] + ], + "lib/ast/merge/comment/augmenter.rb:633395157": [ + [12, 7, 13967, "Metrics/ClassLength: Class has too many lines. [291/100]", 2806660144], + [33, 9, 721, "Metrics/MethodLength: Method has too many lines. [16/10]", 200402816], + [33, 23, 91, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2938734913], + [64, 9, 1335, "Metrics/AbcSize: Assignment Branch Condition size for `build!` is too high. [<12, 29, 6> 31.95/17]", 3904283188], + [64, 9, 1335, "Metrics/MethodLength: Method has too many lines. [22/10]", 3904283188], + [94, 9, 867, "Metrics/AbcSize: Assignment Branch Condition size for `infer_leading_comments` is too high. [<8, 19, 14> 24.92/17]", 1941464872], + [94, 9, 867, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_leading_comments` is too high. [11/7]", 1941464872], + [94, 9, 867, "Metrics/MethodLength: Method has too many lines. [20/10]", 1941464872], + [94, 9, 867, "Metrics/PerceivedComplexity: Perceived complexity for `infer_leading_comments` is too high. [12/8]", 1941464872], + [122, 9, 429, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_inline_comments` is too high. [8/7]", 2688935834], + [133, 9, 934, "Metrics/AbcSize: Assignment Branch Condition size for `infer_trailing_comments` is too high. [<8, 21, 18> 28.79/17]", 1551855281], + [133, 9, 934, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_trailing_comments` is too high. [15/7]", 1551855281], + [133, 9, 934, "Metrics/MethodLength: Method has too many lines. [20/10]", 1551855281], + [133, 9, 934, "Metrics/PerceivedComplexity: Perceived complexity for `infer_trailing_comments` is too high. [15/8]", 1551855281], + [160, 9, 488, "Metrics/AbcSize: Assignment Branch Condition size for `infer_postlude!` is too high. [<5, 17, 8> 19.44/17]", 2562637949], + [160, 9, 488, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_postlude!` is too high. [8/7]", 2562637949], + [173, 9, 1529, "Metrics/AbcSize: Assignment Branch Condition size for `infer_remaining_regions!` is too high. [<12, 27, 23> 37.44/17]", 3911657050], + [173, 9, 1529, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_remaining_regions!` is too high. [18/7]", 3911657050], + [173, 9, 1529, "Metrics/MethodLength: Method has too many lines. [28/10]", 3911657050], + [173, 9, 1529, "Metrics/PerceivedComplexity: Perceived complexity for `infer_remaining_regions!` is too high. [20/8]", 3911657050], + [216, 9, 507, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split_preamble_group` is too high. [8/7]", 336784898], + [231, 9, 588, "Metrics/MethodLength: Method has too many lines. [17/10]", 3445626532], + [274, 9, 965, "Metrics/AbcSize: Assignment Branch Condition size for `build_region` is too high. [<6, 17, 7> 19.34/17]", 344809006], + [274, 9, 965, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_region` is too high. [8/7]", 344809006], + [274, 9, 965, "Metrics/MethodLength: Method has too many lines. [24/10]", 344809006] + ], + "lib/ast/merge/comment/block.rb:3806757604": [ + [31, 7, 6754, "Metrics/ClassLength: Class has too many lines. [106/100]", 2308582303], + [57, 9, 1059, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<12, 13, 14> 22.56/17]", 2656171724], + [57, 9, 1059, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `initialize` is too high. [14/7]", 2656171724], + [57, 9, 1059, "Metrics/MethodLength: Method has too many lines. [21/10]", 2656171724], + [57, 9, 1059, "Metrics/PerceivedComplexity: Perceived complexity for `initialize` is too high. [15/8]", 2656171724], + [113, 9, 511, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `freeze_action` is too high. [9/7]", 55014877], + [113, 9, 511, "Metrics/MethodLength: Method has too many lines. [12/10]", 55014877], + [113, 9, 511, "Metrics/PerceivedComplexity: Perceived complexity for `freeze_action` is too high. [9/8]", 55014877], + [181, 9, 439, "Metrics/AbcSize: Assignment Branch Condition size for `first_meaningful_content` is too high. [<2, 16, 11> 19.52/17]", 680479883], + [181, 9, 439, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `first_meaningful_content` is too high. [11/7]", 680479883], + [181, 9, 439, "Metrics/PerceivedComplexity: Perceived complexity for `first_meaningful_content` is too high. [12/8]", 680479883], + [197, 9, 765, "Metrics/AbcSize: Assignment Branch Condition size for `extract_block_content` is too high. [<7, 24, 9> 26.57/17]", 621871624], + [197, 9, 765, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_block_content` is too high. [9/7]", 621871624], + [197, 9, 765, "Metrics/PerceivedComplexity: Perceived complexity for `extract_block_content` is too high. [9/8]", 621871624] + ], + "lib/ast/merge/comment/c_style_tracker_base.rb:1569556520": [ + [22, 7, 15053, "Metrics/ClassLength: Class has too many lines. [284/100]", 3599183270], + [83, 9, 509, "Metrics/MethodLength: Method has too many lines. [11/10]", 1639553915], + [102, 9, 492, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `leading_comments_before` is too high. [8/7]", 3127043491], + [102, 9, 492, "Metrics/MethodLength: Method has too many lines. [11/10]", 3127043491], + [124, 9, 487, "Metrics/MethodLength: Method has too many lines. [11/10]", 1869933531], + [176, 9, 713, "Metrics/AbcSize: Assignment Branch Condition size for `trailing_comments_after` is too high. [<6, 12, 13> 18.68/17]", 543703521], + [176, 9, 713, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trailing_comments_after` is too high. [11/7]", 543703521], + [176, 9, 713, "Metrics/MethodLength: Method has too many lines. [14/10]", 543703521], + [176, 9, 713, "Metrics/PerceivedComplexity: Perceived complexity for `trailing_comments_after` is too high. [11/8]", 543703521], + [184, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177549], + [202, 9, 598, "Metrics/MethodLength: Method has too many lines. [12/10]", 1628921093], + [222, 9, 1271, "Metrics/MethodLength: Method has too many lines. [21/10]", 612335469], + [222, 35, 137, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1823300034], + [329, 35, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [348, 9, 2271, "Metrics/AbcSize: Assignment Branch Condition size for `extract_comments` is too high. [<17, 32, 13> 38.5/17]", 2751274968], + [348, 9, 2271, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_comments` is too high. [14/7]", 2751274968], + [348, 9, 2271, "Metrics/MethodLength: Method has too many lines. [59/10]", 2751274968], + [348, 9, 2271, "Metrics/PerceivedComplexity: Perceived complexity for `extract_comments` is too high. [14/8]", 2751274968], + [353, 11, 2045, "Metrics/BlockLength: Block has too many lines. [52/25]", 575665179], + [418, 9, 659, "Metrics/MethodLength: Method has too many lines. [15/10]", 177254901], + [439, 71, 4, "Lint/UnusedMethodArgument: Unused method argument - `line`.", 2087656651], + [439, 78, 8, "Lint/UnusedMethodArgument: Unused method argument - `line_num`.", 622661090] + ], + "lib/ast/merge/comment/hash_tracker_base.rb:861186417": [ + [32, 7, 19362, "Metrics/ClassLength: Class has too many lines. [221/100]", 1031055222], + [118, 9, 444, "Metrics/MethodLength: Method has too many lines. [11/10]", 3347260807], + [142, 9, 921, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `leading_comments_before` is too high. [8/7]", 415734636], + [142, 9, 921, "Metrics/MethodLength: Method has too many lines. [11/10]", 415734636], + [172, 9, 440, "Metrics/MethodLength: Method has too many lines. [11/10]", 2464474004], + [225, 9, 623, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trailing_comments_after` is too high. [10/7]", 543703521], + [225, 9, 623, "Metrics/MethodLength: Method has too many lines. [12/10]", 543703521], + [225, 9, 623, "Metrics/PerceivedComplexity: Perceived complexity for `trailing_comments_after` is too high. [10/8]", 543703521], + [249, 9, 551, "Metrics/MethodLength: Method has too many lines. [12/10]", 2783654570], + [278, 9, 1271, "Metrics/MethodLength: Method has too many lines. [21/10]", 612335469], + [278, 35, 137, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1823300034], + [374, 35, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [439, 9, 826, "Metrics/MethodLength: Method has too many lines. [12/10]", 1706632542] + ], + "lib/ast/merge/comment/parser.rb:2674748021": [ + [34, 7, 8372, "Metrics/ClassLength: Class has too many lines. [141/100]", 2541983664], + [84, 9, 357, "Metrics/MethodLength: Method has too many lines. [12/10]", 2265493710], + [104, 9, 545, "Metrics/AbcSize: Assignment Branch Condition size for `auto_detect_style` is too high. [<5, 17, 7> 19.05/17]", 868366444], + [104, 9, 545, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `auto_detect_style` is too high. [8/7]", 868366444], + [125, 9, 1650, "Metrics/AbcSize: Assignment Branch Condition size for `parse_line_comments` is too high. [<8, 28, 7> 29.95/17]", 1511562163], + [125, 9, 1650, "Metrics/MethodLength: Method has too many lines. [31/10]", 1511562163], + [176, 9, 2670, "Metrics/AbcSize: Assignment Branch Condition size for `parse_with_block_comments` is too high. [<15, 47, 15> 51.57/17]", 2963765048], + [176, 9, 2670, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_with_block_comments` is too high. [15/7]", 2963765048], + [176, 9, 2670, "Metrics/MethodLength: Method has too many lines. [47/10]", 2963765048], + [176, 9, 2670, "Metrics/PerceivedComplexity: Perceived complexity for `parse_with_block_comments` is too high. [16/8]", 2963765048], + [181, 11, 2390, "Metrics/BlockLength: Block has too many lines. [40/25]", 3720582340] + ], + "lib/ast/merge/comment/quoted_hash_line_parser.rb:2878420841": [ + [74, 9, 458, "Metrics/MethodLength: Method has too many lines. [11/10]", 1526360697], + [91, 9, 620, "Metrics/AbcSize: Assignment Branch Condition size for `inline_result` is too high. [<3, 16, 6> 17.35/17]", 2706755447], + [91, 9, 620, "Metrics/MethodLength: Method has too many lines. [14/10]", 2706755447] + ], + "lib/ast/merge/comment/region_merge_policy.rb:176745155": [ + [23, 23, 98, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1029631546], + [55, 9, 423, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `freeze_sensitive?` is too high. [8/7]", 4102661282], + [61, 41, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [61, 85, 2, "Lint/SafeNavigationConsistency: Use `.` instead of unnecessary `&.`.", 5858765], + [96, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3491399903] + ], + "lib/ast/merge/comment/style.rb:3045051983": [ + [27, 7, 9109, "Metrics/ClassLength: Class has too many lines. [143/100]", 131723516], + [142, 11, 911, "Metrics/MethodLength: Method has too many lines. [17/10]", 355862493], + [142, 23, 164, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 668558018], + [203, 23, 164, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 668558018] + ], + "lib/ast/merge/comment/tracked_hash_adapter.rb:3235547929": [ + [99, 11, 553, "Metrics/AbcSize: Assignment Branch Condition size for `line_text_from` is too high. [<4, 20, 4> 20.78/17]", 2680273536], + [99, 11, 553, "Metrics/MethodLength: Method has too many lines. [13/10]", 2680273536] + ], + "lib/ast/merge/composite_match_refiner.rb:1718969703": [ + [58, 7, 668, "Metrics/MethodLength: Method has too many lines. [14/10]", 2649148714] + ], + "lib/ast/merge/conflict_resolver_base.rb:765343263": [ + [69, 5, 14959, "Metrics/ClassLength: Class has too many lines. [170/100]", 633092728], + [156, 7, 919, "Metrics/MethodLength: Method has too many lines. [13/10]", 1701319380], + [156, 21, 200, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3369976202], + [367, 7, 972, "Metrics/MethodLength: Method has too many lines. [22/10]", 2870739148], + [434, 47, 13, "Style/NumericPredicate: Use `recursive.positive?` instead of `recursive > 0`.", 462999281], + [436, 99, 14, "Style/NumericPredicate: Use `recursive.zero?` instead of `recursive == 0`.", 2394069519] + ], + "lib/ast/merge/content_match_refiner.rb:3628272158": [ + [47, 5, 7719, "Metrics/ClassLength: Class has too many lines. [108/100]", 651494487], + [87, 7, 750, "Metrics/MethodLength: Method has too many lines. [17/10]", 3624290009], + [165, 37, 48, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 953994744], + [232, 7, 846, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<13, 29, 8> 32.77/17]", 3597737347], + [232, 7, 846, "Metrics/MethodLength: Method has too many lines. [20/10]", 3597737347] + ], + "lib/ast/merge/debug_logger.rb:1783610128": [ + [72, 5, 7614, "Metrics/ModuleLength: Module has too many lines. [118/100]", 736598454], + [85, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 941621], + [206, 7, 584, "Metrics/AbcSize: Assignment Branch Condition size for `time` is too high. [<3, 17, 2> 17.38/17]", 3468868523], + [206, 7, 584, "Metrics/MethodLength: Method has too many lines. [14/10]", 3468868523], + [269, 7, 450, "Metrics/PerceivedComplexity: Perceived complexity for `extract_lines` is too high. [9/8]", 680738666], + [287, 7, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631] + ], + "lib/ast/merge/detector/base.rb:343830240": [ + [175, 25, 73, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2991095115] + ], + "lib/ast/merge/detector/fenced_code_block.rb:3555142063": [ + [36, 7, 6302, "Metrics/ClassLength: Class has too many lines. [116/100]", 852968953], + [71, 9, 2492, "Metrics/AbcSize: Assignment Branch Condition size for `detect_all` is too high. [<31, 28, 12> 43.46/17]", 3575218793], + [71, 9, 2492, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_all` is too high. [11/7]", 3575218793], + [71, 9, 2492, "Metrics/MethodLength: Method has too many lines. [54/10]", 3575218793], + [71, 9, 2492, "Metrics/PerceivedComplexity: Perceived complexity for `detect_all` is too high. [13/8]", 3575218793], + [84, 11, 2060, "Metrics/BlockLength: Block has too many lines. [41/25]", 1744553779] + ], + "lib/ast/merge/detector/mergeable.rb:354817747": [ + [54, 7, 11933, "Metrics/ModuleLength: Module has too many lines. [140/100]", 1453034870], + [162, 9, 601, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_region_configs` is too high. [8/7]", 1278024890], + [162, 9, 601, "Metrics/MethodLength: Method has too many lines. [16/10]", 1278024890], + [189, 9, 1054, "Metrics/AbcSize: Assignment Branch Condition size for `extract_regions` is too high. [<11, 16, 3> 19.65/17]", 663241096], + [189, 9, 1054, "Metrics/MethodLength: Method has too many lines. [20/10]", 663241096], + [285, 9, 1005, "Metrics/AbcSize: Assignment Branch Condition size for `merge_and_substitute_regions` is too high. [<16, 19, 4> 25.16/17]", 4123525156], + [285, 9, 1005, "Metrics/MethodLength: Method has too many lines. [16/10]", 4123525156], + [318, 9, 1369, "Metrics/AbcSize: Assignment Branch Condition size for `merge_region` is too high. [<11, 20, 14> 26.78/17]", 746321843], + [318, 9, 1369, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_region` is too high. [15/7]", 746321843], + [318, 9, 1369, "Metrics/MethodLength: Method has too many lines. [16/10]", 746321843], + [318, 9, 1369, "Metrics/PerceivedComplexity: Perceived complexity for `merge_region` is too high. [15/8]", 746321843] + ], + "lib/ast/merge/detector/toml_frontmatter.rb:3255696517": [ + [50, 9, 892, "Metrics/MethodLength: Method has too many lines. [20/10]", 3132005303] + ], + "lib/ast/merge/detector/yaml_frontmatter.rb:2551474823": [ + [49, 9, 958, "Metrics/MethodLength: Method has too many lines. [20/10]", 3132005303] + ], + "lib/ast/merge/diff_mapper_base.rb:3204989377": [ + [22, 5, 7793, "Metrics/ClassLength: Class has too many lines. [141/100]", 2217731166], + [80, 7, 2598, "Metrics/AbcSize: Assignment Branch Condition size for `parse_diff` is too high. [<21, 31, 15> 40.34/17]", 939898835], + [80, 7, 2598, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_diff` is too high. [16/7]", 939898835], + [80, 7, 2598, "Metrics/MethodLength: Method has too many lines. [65/10]", 939898835], + [80, 7, 2598, "Metrics/PerceivedComplexity: Perceived complexity for `parse_diff` is too high. [12/8]", 939898835], + [90, 9, 2162, "Metrics/BlockLength: Block has too many lines. [50/25]", 3403609416], + [169, 7, 394, "Metrics/MethodLength: Method has too many lines. [11/10]", 2028641628] + ], + "lib/ast/merge/emitter_base.rb:655463559": [ + [26, 5, 14449, "Metrics/ClassLength: Class has too many lines. [226/100]", 2015391034], + [95, 7, 653, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_comment_region` is too high. [9/7]", 24580929], + [95, 7, 653, "Metrics/MethodLength: Method has too many lines. [12/10]", 24580929], + [95, 7, 653, "Metrics/PerceivedComplexity: Perceived complexity for `emit_comment_region` is too high. [9/8]", 24580929], + [120, 7, 1311, "Metrics/AbcSize: Assignment Branch Condition size for `emit_comment_attachment` is too high. [<5, 25, 16> 30.1/17]", 964928813], + [120, 7, 1311, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_comment_attachment` is too high. [17/7]", 964928813], + [120, 7, 1311, "Metrics/MethodLength: Method has too many lines. [17/10]", 964928813], + [120, 7, 1311, "Metrics/PerceivedComplexity: Perceived complexity for `emit_comment_attachment` is too high. [17/8]", 964928813], + [120, 34, 127, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 628879795], + [152, 7, 984, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_layout_gap` is too high. [8/7]", 1954418889], + [152, 7, 984, "Metrics/MethodLength: Method has too many lines. [13/10]", 1954418889], + [152, 7, 984, "Metrics/PerceivedComplexity: Perceived complexity for `emit_layout_gap` is too high. [9/8]", 1954418889], + [152, 26, 136, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3839882587], + [183, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861198], + [184, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087656651], + [186, 7, 1307, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_layout_attachment` is too high. [9/7]", 708408665], + [186, 7, 1307, "Metrics/MethodLength: Method has too many lines. [26/10]", 708408665], + [186, 7, 1307, "Metrics/PerceivedComplexity: Perceived complexity for `emit_layout_attachment` is too high. [9/8]", 708408665], + [186, 33, 218, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1552587384], + [187, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 1763090185], + [189, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1371312610], + [256, 31, 17, "Style/NumericPredicate: Use `@indent_level.positive?` instead of `@indent_level > 0`.", 1892475678], + [302, 56, 12, "Lint/UnusedMethodArgument: Unused method argument - `current_line`. You can also write as `inline_comment_region_target_column(*)` if you want the method to accept any arguments but don't care about them.", 2091263933], + [306, 42, 6, "Lint/UnusedMethodArgument: Unused method argument - `region`.", 2124512157], + [306, 51, 13, "Lint/UnusedMethodArgument: Unused method argument - `target_column`.", 3246375805], + [321, 7, 1141, "Metrics/AbcSize: Assignment Branch Condition size for `inline_comment_node_text` is too high. [<6, 29, 8> 30.68/17]", 2583471562], + [321, 7, 1141, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `inline_comment_node_text` is too high. [9/7]", 2583471562], + [321, 7, 1141, "Metrics/MethodLength: Method has too many lines. [22/10]", 2583471562], + [321, 7, 1141, "Metrics/PerceivedComplexity: Perceived complexity for `inline_comment_node_text` is too high. [9/8]", 2583471562], + [339, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861626], + [350, 7, 510, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_region_gap_lines` is too high. [8/7]", 1999747697], + [350, 7, 510, "Metrics/PerceivedComplexity: Perceived complexity for `emit_region_gap_lines` is too high. [9/8]", 1999747697] + ], + "lib/ast/merge/emitter_line_metadata_support.rb:3153033769": [ + [5, 5, 33, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::EmitterLineMetadataSupport`.", 2926748997], + [23, 7, 541, "Metrics/MethodLength: Method has too many lines. [12/10]", 2407359355] + ], + "lib/ast/merge/file_aligner_base.rb:2160333224": [ + [13, 5, 8206, "Metrics/ClassLength: Class has too many lines. [203/100]", 2982381587], + [27, 7, 2329, "Metrics/AbcSize: Assignment Branch Condition size for `align` is too high. [<19, 39, 14> 45.59/17]", 1243937217], + [27, 7, 2329, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `align` is too high. [14/7]", 1243937217], + [27, 7, 2329, "Metrics/MethodLength: Method has too many lines. [56/10]", 1243937217], + [27, 7, 2329, "Metrics/PerceivedComplexity: Perceived complexity for `align` is too high. [14/8]", 1243937217], + [167, 7, 655, "Metrics/MethodLength: Method has too many lines. [14/10]", 2468821688], + [199, 7, 455, "Metrics/MethodLength: Method has too many lines. [13/10]", 2361153066], + [218, 7, 1557, "Metrics/AbcSize: Assignment Branch Condition size for `apply_match_refiner!` is too high. [<10, 28, 12> 32.06/17]", 2386945712], + [218, 7, 1557, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_match_refiner!` is too high. [13/7]", 2386945712], + [218, 7, 1557, "Metrics/MethodLength: Method has too many lines. [31/10]", 2386945712], + [218, 7, 1557, "Metrics/PerceivedComplexity: Perceived complexity for `apply_match_refiner!` is too high. [13/8]", 2386945712] + ], + "lib/ast/merge/file_analyzable.rb:607555963": [ + [36, 5, 31229, "Metrics/ModuleLength: Module has too many lines. [316/100]", 1247752256], + [99, 19, 9, "Style/NumericPredicate: Use `index.negative?` instead of `index < 0`.", 4215255415], + [148, 7, 793, "Metrics/MethodLength: Method has too many lines. [22/10]", 1467470910], + [202, 7, 771, "Metrics/MethodLength: Method has too many lines. [16/10]", 1412317163], + [344, 7, 844, "Metrics/MethodLength: Method has too many lines. [12/10]", 2335919661], + [369, 7, 730, "Metrics/MethodLength: Method has too many lines. [11/10]", 1047958652], + [431, 7, 863, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_layout_owned_comment_attachment` is too high. [<0, 20, 4> 20.4/17]", 3284843691], + [431, 7, 863, "Metrics/MethodLength: Method has too many lines. [17/10]", 3284843691], + [481, 7, 683, "Metrics/MethodLength: Method has too many lines. [15/10]", 241044926], + [520, 14, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [614, 7, 6095, "Metrics/AbcSize: Assignment Branch Condition size for `generate_signature` is too high. [<4, 21, 13> 25.02/17]", 2828809875], + [614, 7, 6095, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `generate_signature` is too high. [11/7]", 2828809875], + [614, 7, 6095, "Metrics/MethodLength: Method has too many lines. [30/10]", 2828809875], + [614, 7, 6095, "Metrics/PerceivedComplexity: Perceived complexity for `generate_signature` is too high. [14/8]", 2828809875], + [676, 24, 390, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 3279112483] + ], + "lib/ast/merge/freeze_node_base.rb:2110274026": [ + [59, 5, 14572, "Metrics/ClassLength: Class has too many lines. [171/100]", 3038607603], + [108, 25, 545, "Style/MutableConstant: Freeze mutable objects assigned to constants.", 2366014160], + [186, 9, 1100, "Metrics/MethodLength: Method has too many lines. [15/10]", 2506841532], + [288, 7, 758, "Metrics/MethodLength: Method has too many lines. [11/10]", 136868205], + [288, 21, 276, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 1720059801], + [335, 7, 660, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `reason` is too high. [8/7]", 3127566048], + [418, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] + ], + "lib/ast/merge/healer.rb:3642412735": [ + [18, 7, 588, "Metrics/MethodLength: Method has too many lines. [15/10]", 3172269921], + [18, 17, 84, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1781025196], + [41, 7, 687, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `filter_items` is too high. [8/7]", 1200842691], + [41, 7, 687, "Metrics/MethodLength: Method has too many lines. [17/10]", 1200842691], + [41, 7, 687, "Metrics/PerceivedComplexity: Perceived complexity for `filter_items` is too high. [9/8]", 1200842691], + [41, 23, 130, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 33939503] + ], + "lib/ast/merge/jaccard_similarity.rb:678558736": [ + [87, 19, 1, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 177604], + [87, 22, 1, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 177607] + ], + "lib/ast/merge/key_path_partial_template_merger_base.rb:1818613864": [ + [22, 5, 6114, "Metrics/ClassLength: Class has too many lines. [155/100]", 1269962119], + [43, 21, 214, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 3637591635], + [68, 7, 489, "Metrics/MethodLength: Method has too many lines. [12/10]", 3170411580], + [118, 7, 640, "Metrics/AbcSize: Assignment Branch Condition size for `find_key_path` is too high. [<8, 14, 10> 18.97/17]", 2613403604], + [118, 7, 640, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_key_path` is too high. [8/7]", 2613403604], + [118, 7, 640, "Metrics/MethodLength: Method has too many lines. [16/10]", 2613403604], + [118, 7, 640, "Metrics/PerceivedComplexity: Perceived complexity for `find_key_path` is too high. [9/8]", 2613403604], + [140, 7, 536, "Metrics/MethodLength: Method has too many lines. [17/10]", 3598062652], + [168, 7, 804, "Metrics/MethodLength: Method has too many lines. [19/10]", 2773364183] + ], + "lib/ast/merge/layout.rb:3670500101": [ + [23, 36, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] + ], + "lib/ast/merge/layout/augmenter.rb:2556116722": [ + [8, 7, 5498, "Metrics/ClassLength: Class has too many lines. [129/100]", 3693754698], + [21, 23, 125, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 3395039982], + [53, 9, 1795, "Metrics/AbcSize: Assignment Branch Condition size for `build!` is too high. [<20, 32, 17> 41.39/17]", 3542913254], + [53, 9, 1795, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build!` is too high. [15/7]", 3542913254], + [53, 9, 1795, "Metrics/MethodLength: Method has too many lines. [43/10]", 3542913254], + [53, 9, 1795, "Metrics/PerceivedComplexity: Perceived complexity for `build!` is too high. [15/8]", 3542913254], + [58, 11, 1227, "Metrics/BlockLength: Block has too many lines. [29/25]", 55360131], + [105, 9, 504, "Metrics/MethodLength: Method has too many lines. [16/10]", 1953725517] + ], + "lib/ast/merge/layout/gap.rb:1678106201": [ + [11, 7, 7558, "Metrics/ClassLength: Class has too many lines. [151/100]", 2254377349], + [23, 9, 655, "Metrics/MethodLength: Method has too many lines. [11/10]", 3584854768], + [23, 23, 146, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 361396001], + [157, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859545], + [162, 9, 303, "Metrics/MethodLength: Method has too many lines. [12/10]", 2236444774], + [203, 9, 688, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_adjacency!` is too high. [10/7]", 1112786311], + [203, 9, 688, "Metrics/MethodLength: Method has too many lines. [13/10]", 1112786311] + ], + "lib/ast/merge/match_refiner_base.rb:1760054866": [ + [248, 7, 503, "Metrics/MethodLength: Method has too many lines. [11/10]", 2844230268], + [275, 7, 1056, "Metrics/AbcSize: Assignment Branch Condition size for `greedy_match` is too high. [<9, 24, 8> 26.85/17]", 2497617815], + [275, 7, 1056, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `greedy_match` is too high. [8/7]", 2497617815], + [275, 7, 1056, "Metrics/MethodLength: Method has too many lines. [24/10]", 2497617815] + ], + "lib/ast/merge/merge_result_base.rb:764500297": [ + [17, 5, 18646, "Metrics/ClassLength: Class has too many lines. [335/100]", 314460772], + [88, 21, 187, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1067369198], + [187, 7, 843, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_blank_line_runs!` is too high. [<12, 12, 10> 19.7/17]", 2347011594], + [187, 7, 843, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_blank_line_runs!` is too high. [9/7]", 2347011594], + [187, 7, 843, "Metrics/MethodLength: Method has too many lines. [22/10]", 2347011594], + [187, 7, 843, "Metrics/PerceivedComplexity: Perceived complexity for `normalize_blank_line_runs!` is too high. [10/8]", 2347011594], + [227, 7, 1004, "Metrics/MethodLength: Method has too many lines. [21/10]", 59539336], + [227, 35, 211, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 709487711], + [266, 7, 602, "Metrics/MethodLength: Method has too many lines. [13/10]", 320027623], + [341, 7, 927, "Metrics/AbcSize: Assignment Branch Condition size for `validate_review_state_compatibility!` is too high. [<8, 15, 4> 17.46/17]", 1596840080], + [341, 7, 927, "Metrics/MethodLength: Method has too many lines. [16/10]", 1596840080], + [403, 7, 936, "Metrics/AbcSize: Assignment Branch Condition size for `review_state_metadata` is too high. [<7, 18, 4> 19.72/17]", 4128292066], + [403, 7, 936, "Metrics/MethodLength: Method has too many lines. [14/10]", 4128292066], + [413, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 20421901], + [438, 7, 1194, "Metrics/MethodLength: Method has too many lines. [21/10]", 4289697646], + [448, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3342583337] + ], + "lib/ast/merge/merger_config.rb:3582657829": [ + [46, 5, 10581, "Metrics/ClassLength: Class has too many lines. [148/100]", 1598770872], + [96, 21, 234, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 720509970] + ], + "lib/ast/merge/navigable/injection_point_finder.rb:4117743218": [ + [45, 9, 1707, "Metrics/AbcSize: Assignment Branch Condition size for `find` is too high. [<9, 18, 17> 26.34/17]", 1445381162], + [45, 9, 1707, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find` is too high. [15/7]", 1445381162], + [45, 9, 1707, "Metrics/MethodLength: Method has too many lines. [28/10]", 1445381162], + [45, 9, 1707, "Metrics/PerceivedComplexity: Perceived complexity for `find` is too high. [16/8]", 1445381162], + [45, 17, 156, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 3876813166] + ], + "lib/ast/merge/navigable/statement.rb:3050515622": [ + [42, 7, 11078, "Metrics/ClassLength: Class has too many lines. [179/100]", 2550894515], + [96, 11, 550, "Metrics/AbcSize: Assignment Branch Condition size for `find_matching` is too high. [<7, 16, 12> 21.19/17]", 3492534565], + [96, 11, 550, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_matching` is too high. [12/7]", 3492534565], + [96, 11, 550, "Metrics/PerceivedComplexity: Perceived complexity for `find_matching` is too high. [12/8]", 3492534565], + [222, 13, 20, "Naming/PredicatePrefix: Rename `has_tree_navigation?` to `tree_navigation?`.", 733442156] + ], + "lib/ast/merge/node_typing.rb:4008165135": [ + [175, 9, 694, "Metrics/MethodLength: Method has too many lines. [12/10]", 777909930], + [213, 9, 891, "Metrics/AbcSize: Assignment Branch Condition size for `find_typing_callable` is too high. [<3, 23, 13> 26.59/17]", 3835052858], + [213, 9, 891, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_typing_callable` is too high. [14/7]", 3835052858], + [213, 9, 891, "Metrics/PerceivedComplexity: Perceived complexity for `find_typing_callable` is too high. [14/8]", 3835052858] + ], + "lib/ast/merge/node_wrapper_base.rb:3796877358": [ + [62, 5, 10228, "Metrics/ClassLength: Class has too many lines. [135/100]", 3832956007], + [92, 21, 81, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 4261369704] + ], + "lib/ast/merge/owner_selection.rb:2568070127": [ + [9, 7, 757, "Metrics/MethodLength: Method has too many lines. [13/10]", 2069564552] + ], + "lib/ast/merge/partial_template_merger_base.rb:2252899061": [ + [27, 5, 16780, "Metrics/ClassLength: Class has too many lines. [266/100]", 2205844189], + [48, 23, 81, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2112244807], + [106, 7, 757, "Metrics/MethodLength: Method has too many lines. [11/10]", 571708764], + [106, 21, 293, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 871709580], + [135, 7, 788, "Metrics/AbcSize: Assignment Branch Condition size for `merge` is too high. [<4, 19, 5> 20.05/17]", 467674580], + [135, 7, 788, "Metrics/MethodLength: Method has too many lines. [13/10]", 467674580], + [213, 7, 533, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_matcher` is too high. [<7, 20, 6> 22.02/17]", 1798972396], + [238, 7, 922, "Metrics/MethodLength: Method has too many lines. [25/10]", 1846154069], + [242, 25, 37, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 939456830], + [251, 25, 31, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 1024894473], + [268, 7, 1905, "Metrics/AbcSize: Assignment Branch Condition size for `perform_section_merge` is too high. [<13, 15, 2> 19.95/17]", 2711014340], + [268, 7, 1905, "Metrics/MethodLength: Method has too many lines. [34/10]", 2711014340], + [316, 50, 15, "Lint/UnusedMethodArgument: Unused method argument - `section_context`.", 2872123372], + [334, 7, 690, "Metrics/MethodLength: Method has too many lines. [14/10]", 1807124523], + [367, 7, 1122, "Metrics/AbcSize: Assignment Branch Condition size for `build_merged_content` is too high. [<1, 29, 14> 32.22/17]", 3938410418], + [367, 7, 1122, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_merged_content` is too high. [15/7]", 3938410418], + [367, 7, 1122, "Metrics/MethodLength: Method has too many lines. [18/10]", 3938410418], + [367, 7, 1122, "Metrics/PerceivedComplexity: Perceived complexity for `build_merged_content` is too high. [15/8]", 3938410418], + [397, 7, 596, "Metrics/MethodLength: Method has too many lines. [12/10]", 2602121883], + [397, 32, 144, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1463491208], + [414, 7, 1589, "Metrics/AbcSize: Assignment Branch Condition size for `source_splice_plan_for` is too high. [<6, 18, 9> 21/17]", 2889667289], + [414, 7, 1589, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `source_splice_plan_for` is too high. [9/7]", 2889667289], + [414, 7, 1589, "Metrics/MethodLength: Method has too many lines. [30/10]", 2889667289], + [414, 7, 1589, "Metrics/PerceivedComplexity: Perceived complexity for `source_splice_plan_for` is too high. [9/8]", 2889667289] + ], + "lib/ast/merge/recipe/config.rb:3990762705": [ + [54, 7, 14970, "Metrics/ClassLength: Class has too many lines. [296/100]", 2492031021], + [142, 9, 673, "Metrics/MethodLength: Method has too many lines. [12/10]", 3011978845], + [170, 9, 484, "Metrics/MethodLength: Method has too many lines. [15/10]", 183356432], + [246, 9, 710, "Metrics/AbcSize: Assignment Branch Condition size for `parse_injection` is too high. [<8, 13, 8> 17.23/17]", 641239814], + [246, 9, 710, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_injection` is too high. [9/7]", 641239814], + [246, 9, 710, "Metrics/MethodLength: Method has too many lines. [16/10]", 641239814], + [246, 9, 710, "Metrics/PerceivedComplexity: Perceived complexity for `parse_injection` is too high. [9/8]", 641239814], + [278, 9, 871, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_step` is too high. [8/7]", 3989307721], + [278, 9, 871, "Metrics/MethodLength: Method has too many lines. [20/10]", 3989307721], + [338, 9, 1758, "Metrics/AbcSize: Assignment Branch Condition size for `parse_step_merge_overrides` is too high. [<11, 43, 25> 50.94/17]", 806370438], + [338, 9, 1758, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_step_merge_overrides` is too high. [22/7]", 806370438], + [338, 9, 1758, "Metrics/MethodLength: Method has too many lines. [30/10]", 806370438], + [338, 9, 1758, "Metrics/PerceivedComplexity: Perceived complexity for `parse_step_merge_overrides` is too high. [22/8]", 806370438], + [373, 9, 566, "Metrics/MethodLength: Method has too many lines. [14/10]", 3671206955], + [391, 9, 547, "Metrics/MethodLength: Method has too many lines. [16/10]", 3273587697], + [459, 9, 799, "Metrics/AbcSize: Assignment Branch Condition size for `validate_injection!` is too high. [<2, 15, 12> 19.31/17]", 1665903587], + [459, 9, 799, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_injection!` is too high. [13/7]", 1665903587], + [459, 9, 799, "Metrics/MethodLength: Method has too many lines. [11/10]", 1665903587], + [459, 9, 799, "Metrics/PerceivedComplexity: Perceived complexity for `validate_injection!` is too high. [13/8]", 1665903587] + ], + "lib/ast/merge/recipe/preset.rb:2311326866": [ + [195, 9, 662, "Metrics/MethodLength: Method has too many lines. [12/10]", 1640897447] + ], + "lib/ast/merge/recipe/runner.rb:2243867806": [ + [27, 7, 28612, "Metrics/ClassLength: Class has too many lines. [547/100]", 79000832], + [73, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1411864995], + [77, 23, 136, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1636278032], + [92, 9, 849, "Metrics/MethodLength: Method has too many lines. [14/10]", 3083064345], + [128, 24, 129, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2642826282], + [210, 9, 788, "Metrics/MethodLength: Method has too many lines. [23/10]", 743008161], + [241, 9, 3397, "Metrics/AbcSize: Assignment Branch Condition size for `create_partial_template_merger` is too high. [<3, 52, 16> 54.49/17]", 2086180075], + [241, 9, 3397, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `create_partial_template_merger` is too high. [14/7]", 2086180075], + [241, 9, 3397, "Metrics/MethodLength: Method has too many lines. [63/10]", 2086180075], + [241, 9, 3397, "Metrics/PerceivedComplexity: Perceived complexity for `create_partial_template_merger` is too high. [13/8]", 2086180075], + [250, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2857356312], + [274, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177538], + [312, 9, 2210, "Metrics/AbcSize: Assignment Branch Condition size for `create_smart_merger` is too high. [<1, 39, 7> 39.64/17]", 1694660188], + [312, 9, 2210, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `create_smart_merger` is too high. [8/7]", 1694660188], + [312, 9, 2210, "Metrics/MethodLength: Method has too many lines. [45/10]", 1694660188], + [357, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 195423462], + [370, 9, 1087, "Metrics/MethodLength: Method has too many lines. [24/10]", 3850049530], + [370, 31, 124, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3466458723], + [401, 9, 1008, "Metrics/MethodLength: Method has too many lines. [19/10]", 2010895303], + [401, 25, 143, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2360959504], + [424, 9, 1263, "Metrics/AbcSize: Assignment Branch Condition size for `execute_partial_merge_step` is too high. [<3, 22, 1> 22.23/17]", 2850918453], + [424, 9, 1263, "Metrics/MethodLength: Method has too many lines. [25/10]", 2850918453], + [453, 9, 835, "Metrics/MethodLength: Method has too many lines. [14/10]", 1478843287], + [471, 9, 808, "Metrics/MethodLength: Method has too many lines. [15/10]", 1127254660], + [471, 37, 155, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 838578768], + [491, 9, 1126, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_smart_merge_result` is too high. [<8, 17, 12> 22.29/17]", 1786697339], + [491, 9, 1126, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_smart_merge_result` is too high. [9/7]", 1786697339], + [491, 9, 1126, "Metrics/MethodLength: Method has too many lines. [23/10]", 1786697339], + [491, 9, 1126, "Metrics/PerceivedComplexity: Perceived complexity for `normalize_smart_merge_result` is too high. [11/8]", 1786697339], + [518, 9, 2523, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_script_step_result` is too high. [<5, 40, 32> 51.47/17]", 2162420067], + [518, 9, 2523, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_script_step_result` is too high. [26/7]", 2162420067], + [518, 9, 2523, "Metrics/MethodLength: Method has too many lines. [48/10]", 2162420067], + [518, 9, 2523, "Metrics/PerceivedComplexity: Perceived complexity for `normalize_script_step_result` is too high. [29/8]", 2162420067], + [547, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 93872446], + [556, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 1527250939], + [586, 11, 155, "Style/HashTransformKeys: Prefer `transform_keys` over `each_with_object`.", 837503672], + [591, 9, 698, "Metrics/MethodLength: Method has too many lines. [11/10]", 1116310304], + [635, 9, 2582, "Metrics/AbcSize: Assignment Branch Condition size for `create_result_from_steps` is too high. [<8, 30, 31> 43.87/17]", 2040042265], + [635, 9, 2582, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `create_result_from_steps` is too high. [23/7]", 2040042265], + [635, 9, 2582, "Metrics/MethodLength: Method has too many lines. [60/10]", 2040042265], + [635, 9, 2582, "Metrics/PerceivedComplexity: Perceived complexity for `create_result_from_steps` is too high. [27/8]", 2040042265], + [635, 37, 133, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 789257106], + [649, 42, 40, "Style/SymbolProc: Pass `&:has_anchor` as an argument to `any?` instead of a block.", 4233626321] + ], + "lib/ast/merge/recipe/script_loader.rb:1397873218": [ + [145, 9, 1126, "Metrics/AbcSize: Assignment Branch Condition size for `load_script_file` is too high. [<6, 19, 4> 20.32/17]", 3417625171], + [145, 9, 1126, "Metrics/MethodLength: Method has too many lines. [17/10]", 3417625171] + ], + "lib/ast/merge/rspec/comment_behavior_matrix_adapters.rb:3429217018": [ + [9, 46, 341, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 532439002], + [31, 9, 901, "Metrics/MethodLength: Method has too many lines. [11/10]", 584608092], + [31, 59, 308, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 883491898], + [54, 9, 1269, "Metrics/MethodLength: Method has too many lines. [20/10]", 1021031182], + [65, 51, 6, "Lint/UnusedBlockArgument: Unused block argument - `inline`. If it's necessary, use `_` or `_inline` as an argument name to indicate that it won't be used.", 1605470060], + [69, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 4226982364], + [70, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1440420861] + ], + "lib/ast/merge/rspec/conformance_fixtures.rb:1295759615": [ + [6, 7, 26, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::RSpec::ConformanceFixtures`.", 90066768], + [9, 9, 1432, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_conformance_fixture_support` is too high. [<10, 30, 33> 45.71/17]", 518714108], + [9, 9, 1432, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_conformance_fixture_support` is too high. [33/7]", 518714108], + [9, 9, 1432, "Metrics/MethodLength: Method has too many lines. [25/10]", 518714108], + [9, 9, 1432, "Metrics/PerceivedComplexity: Perceived complexity for `normalize_conformance_fixture_support` is too high. [31/8]", 518714108] + ], + "lib/ast/merge/rspec/dependency_tags_config.rb:3604516304": [ + [30, 1, 2102, "Metrics/BlockLength: Block has too many lines. [26/25]", 113766065] + ], + "lib/ast/merge/rspec/merge_gem_registry.rb:3009576030": [ + [58, 7, 12129, "Metrics/ModuleLength: Module has too many lines. [158/100]", 335549747], + [90, 9, 780, "Metrics/MethodLength: Method has too many lines. [14/10]", 978965737], + [90, 21, 99, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3580433546], + [118, 9, 650, "Metrics/MethodLength: Method has too many lines. [12/10]", 3143160805], + [118, 31, 130, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2575863904], + [143, 9, 823, "Metrics/MethodLength: Method has too many lines. [17/10]", 4033116153], + [200, 9, 765, "Metrics/AbcSize: Assignment Branch Condition size for `register_known_gems` is too high. [<3, 17, 3> 17.52/17]", 1367620151], + [200, 9, 765, "Metrics/MethodLength: Method has too many lines. [17/10]", 1367620151] + ], + "lib/ast/merge/rspec/shared_examples.rb:2878318351": [ + [29, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 330577472] + ], + "lib/ast/merge/rspec/shared_examples/comment_behavior_matrix.rb:3695671858": [ + [36, 1, 27847, "Metrics/BlockLength: Block has too many lines. [540/25]", 3796645407], + [38, 55, 15, "Style/SymbolProc: Pass `&:value` as an argument to `lambda` instead of a block.", 1808354951], + [42, 64, 23, "Style/SymbolProc: Pass `&:statements` as an argument to `lambda` instead of a block.", 277221641], + [69, 3, 4455, "Metrics/BlockLength: Block has too many lines. [82/25]", 3672334777], + [72, 5, 1763, "Metrics/BlockLength: Block has too many lines. [34/25]", 164750821], + [165, 3, 22093, "Metrics/BlockLength: Block has too many lines. [429/25]", 229312375], + [292, 5, 1918, "Metrics/BlockLength: Block has too many lines. [29/25]", 1312741055], + [323, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1902517440], + [325, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 173482512], + [328, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 167607404], + [476, 5, 1605, "Metrics/BlockLength: Block has too many lines. [35/25]", 1943633697], + [677, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1902517440] + ], + "lib/ast/merge/rspec/shared_examples/conflict_resolver_base.rb:624045197": [ + [30, 1, 7893, "Metrics/BlockLength: Block has too many lines. [197/25]", 3450672926], + [37, 3, 1372, "Metrics/BlockLength: Block has too many lines. [33/25]", 3389152504], + [83, 3, 1206, "Metrics/BlockLength: Block has too many lines. [35/25]", 1580202348], + [128, 3, 1177, "Metrics/BlockLength: Block has too many lines. [33/25]", 2178974049], + [215, 3, 2443, "Metrics/BlockLength: Block has too many lines. [51/25]", 2538475273], + [219, 5, 1909, "Metrics/BlockLength: Block has too many lines. [35/25]", 880175101], + [279, 1, 2518, "Metrics/BlockLength: Block has too many lines. [74/25]", 958151448], + [286, 3, 2235, "Metrics/BlockLength: Block has too many lines. [70/25]", 2123260684], + [391, 1, 1317, "Metrics/BlockLength: Block has too many lines. [37/25]", 2321517041], + [439, 1, 1639, "Metrics/BlockLength: Block has too many lines. [37/25]", 276150366] + ], + "lib/ast/merge/rspec/shared_examples/debug_logger.rb:2747003588": [ + [23, 1, 4741, "Metrics/BlockLength: Block has too many lines. [121/25]", 3341338388], + [47, 3, 976, "Metrics/BlockLength: Block has too many lines. [27/25]", 2640321404], + [85, 3, 1452, "Metrics/BlockLength: Block has too many lines. [34/25]", 554663062] + ], + "lib/ast/merge/rspec/shared_examples/feature_profile.rb:4172143324": [ + [30, 1, 4249, "Metrics/BlockLength: Block has too many lines. [53/25]", 3787230403] + ], + "lib/ast/merge/rspec/shared_examples/file_analyzable.rb:2391547213": [ + [44, 1, 6468, "Metrics/BlockLength: Block has too many lines. [145/25]", 3744642916] + ], + "lib/ast/merge/rspec/shared_examples/freeze_node_base.rb:1711126715": [ + [23, 1, 5952, "Metrics/BlockLength: Block has too many lines. [157/25]", 3152271039], + [29, 3, 2836, "Metrics/BlockLength: Block has too many lines. [69/25]", 2082270913], + [115, 3, 1552, "Metrics/BlockLength: Block has too many lines. [46/25]", 4180117745] + ], + "lib/ast/merge/rspec/shared_examples/layout_attachment.rb:4130619694": [ + [30, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 1263574869], + [31, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 4282300883] + ], + "lib/ast/merge/rspec/shared_examples/layout_augmenter.rb:1928277603": [ + [18, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1311107624], + [19, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1311107624] + ], + "lib/ast/merge/rspec/shared_examples/merge_result_base.rb:2962043558": [ + [18, 1, 2330, "Metrics/BlockLength: Block has too many lines. [67/25]", 3496673178], + [53, 3, 1271, "Metrics/BlockLength: Block has too many lines. [42/25]", 2278976858] + ], + "lib/ast/merge/rspec/shared_examples/merger_config.rb:2413785902": [ + [18, 1, 8240, "Metrics/BlockLength: Block has too many lines. [193/25]", 3665443345], + [57, 3, 1628, "Metrics/BlockLength: Block has too many lines. [32/25]", 7828299], + [98, 3, 1266, "Metrics/BlockLength: Block has too many lines. [28/25]", 317929439], + [159, 3, 1740, "Metrics/BlockLength: Block has too many lines. [42/25]", 1736487820], + [217, 3, 1373, "Metrics/BlockLength: Block has too many lines. [30/25]", 442933563] + ], + "lib/ast/merge/rspec/shared_examples/recipe_preset_contract.rb:1495545061": [ + [7, 1, 2558, "Metrics/BlockLength: Block has too many lines. [51/25]", 4091815632] + ], + "lib/ast/merge/rspec/shared_examples/removal_mode_compliance.rb:3645548199": [ + [24, 1, 1860, "Metrics/BlockLength: Block has too many lines. [33/25]", 1115825136] + ], + "lib/ast/merge/rspec/shared_examples/reproducible_merge.rb:2276592459": [ + [51, 1, 2030, "Metrics/BlockLength: Block has too many lines. [52/25]", 563553381] + ], + "lib/ast/merge/rspec/shared_examples/reproducible_partial_merge.rb:524436129": [ + [3, 1, 2321, "Metrics/BlockLength: Block has too many lines. [44/25]", 3206099540] + ], + "lib/ast/merge/rspec/shared_examples/runtime_debug_contract.rb:4244040583": [ + [8, 1, 2808, "Metrics/BlockLength: Block has too many lines. [48/25]", 3274492878] + ], + "lib/ast/merge/rspec/shared_examples/unresolved_helper_contract.rb:2916431464": [ + [9, 1, 5998, "Metrics/BlockLength: Block has too many lines. [126/25]", 4174562424], + [94, 3, 1515, "Metrics/BlockLength: Block has too many lines. [32/25]", 1928238376] + ], + "lib/ast/merge/rspec/shared_examples/unresolved_review_state_transport_contract.rb:3368966854": [ + [14, 1, 3386, "Metrics/BlockLength: Block has too many lines. [68/25]", 2910343214], + [65, 3, 317, "Metrics/MethodLength: Method has too many lines. [12/10]", 2653897690] + ], + "lib/ast/merge/rspec/shared_examples/unresolved_runtime_contract.rb:1424234700": [ + [10, 1, 2652, "Metrics/BlockLength: Block has too many lines. [42/25]", 960283638], + [31, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2892620242], + [46, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193437756] + ], + "lib/ast/merge/rspec/shared_examples/unresolved_runtime_debug_contract.rb:2897026147": [ + [25, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2418171787], + [26, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 235635831] + ], + "lib/ast/merge/ruleset/config.rb:4242726919": [ + [7, 7, 3664, "Metrics/ClassLength: Class has too many lines. [101/100]", 1968929597], + [36, 9, 933, "Metrics/MethodLength: Method has too many lines. [15/10]", 3334511209], + [36, 23, 319, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [15/5]", 1652945408], + [65, 9, 515, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 18, 3> 18.25/17]", 2614325513], + [65, 9, 515, "Metrics/MethodLength: Method has too many lines. [14/10]", 2614325513] + ], + "lib/ast/merge/ruleset/feature_profile.rb:3980745364": [ + [12, 7, 6054, "Metrics/ClassLength: Class has too many lines. [155/100]", 2818730231], + [29, 9, 1351, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<17, 18, 7> 25.73/17]", 2248702332], + [29, 9, 1351, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `initialize` is too high. [8/7]", 2248702332], + [29, 9, 1351, "Metrics/MethodLength: Method has too many lines. [17/10]", 2248702332], + [29, 23, 422, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 1415781648], + [138, 9, 1509, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 36, 6> 36.5/17]", 3793816437], + [138, 9, 1509, "Metrics/MethodLength: Method has too many lines. [31/10]", 3793816437] + ], + "lib/ast/merge/ruleset/parser.rb:698282871": [ + [7, 7, 9396, "Metrics/ClassLength: Class has too many lines. [199/100]", 1305123525], + [43, 9, 473, "Metrics/AbcSize: Assignment Branch Condition size for `parse` is too high. [<0, 17, 2> 17.12/17]", 1400394586], + [43, 9, 473, "Metrics/MethodLength: Method has too many lines. [12/10]", 1400394586], + [71, 9, 1053, "Metrics/MethodLength: Method has too many lines. [24/10]", 1569959910], + [101, 9, 1123, "Metrics/AbcSize: Assignment Branch Condition size for `parse_single_value_directive!` is too high. [<7, 13, 10> 17.83/17]", 706129883], + [101, 9, 1123, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_single_value_directive!` is too high. [8/7]", 706129883], + [101, 9, 1123, "Metrics/MethodLength: Method has too many lines. [24/10]", 706129883], + [170, 9, 605, "Metrics/MethodLength: Method has too many lines. [11/10]", 336127382], + [186, 9, 687, "Metrics/MethodLength: Method has too many lines. [11/10]", 2962844982] + ], + "lib/ast/merge/ruleset/profile_vocabulary.rb:2359837647": [ + [7, 7, 3956, "Metrics/ModuleLength: Module has too many lines. [107/100]", 1680256705] + ], + "lib/ast/merge/ruleset/runtime_declaration.rb:1016848190": [ + [18, 9, 819, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<11, 13, 5> 17.75/17]", 4043304883], + [18, 9, 819, "Metrics/MethodLength: Method has too many lines. [11/10]", 4043304883], + [18, 23, 240, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 3868000276], + [49, 9, 551, "Metrics/MethodLength: Method has too many lines. [13/10]", 448215861] + ], + "lib/ast/merge/ruleset/runtime_translator.rb:3255492631": [ + [9, 11, 816, "Metrics/MethodLength: Method has too many lines. [19/10]", 225301385], + [31, 11, 986, "Metrics/AbcSize: Assignment Branch Condition size for `feature_profile` is too high. [<1, 17, 0> 17.03/17]", 1395467476], + [31, 11, 986, "Metrics/MethodLength: Method has too many lines. [19/10]", 1395467476] + ], + "lib/ast/merge/ruleset/support_style_resolver.rb:508975884": [ + [9, 11, 864, "Metrics/MethodLength: Method has too many lines. [22/10]", 3902551296] + ], + "lib/ast/merge/runtime/child_result.rb:4083710804": [ + [16, 9, 698, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<7, 16, 2> 17.58/17]", 2208366179], + [16, 23, 227, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 3688358290], + [38, 9, 584, "Metrics/MethodLength: Method has too many lines. [11/10]", 3113479157], + [55, 11, 106, "Style/HashTransformKeys: Prefer `transform_keys` over `each_with_object`.", 4262612225] + ], + "lib/ast/merge/runtime/delegate.rb:3607371286": [ + [17, 23, 285, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 2793452069] + ], + "lib/ast/merge/runtime/diagnostic.rb:805162185": [ + [10, 23, 72, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1875462867] + ], + "lib/ast/merge/runtime/operation.rb:1030261783": [ + [20, 9, 767, "Metrics/MethodLength: Method has too many lines. [11/10]", 2728174753], + [20, 23, 278, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 694444911], + [100, 9, 617, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<2, 24, 6> 24.82/17]", 1175382849], + [100, 9, 617, "Metrics/MethodLength: Method has too many lines. [11/10]", 1175382849] + ], + "lib/ast/merge/runtime/resolution_case.rb:250040454": [ + [8, 9, 707, "Metrics/AbcSize: Assignment Branch Condition size for `from_h` is too high. [<1, 19, 6> 19.95/17]", 2592154170], + [29, 23, 189, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 818714714], + [81, 11, 111, "Style/HashTransformKeys: Prefer `transform_keys` over `each_with_object`.", 2712537644] + ], + "lib/ast/merge/runtime/root_session_support.rb:1917388966": [ + [10, 9, 2153, "Metrics/AbcSize: Assignment Branch Condition size for `start_runtime_root_session!` is too high. [<5, 20, 3> 20.83/17]", 1888056651], + [10, 9, 2153, "Metrics/MethodLength: Method has too many lines. [41/10]", 1888056651], + [10, 40, 421, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 2297301282], + [60, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2312419928], + [68, 9, 771, "Metrics/MethodLength: Method has too many lines. [13/10]", 1787620786], + [68, 43, 191, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3635875424] + ], + "lib/ast/merge/runtime/session.rb:628419040": [ + [66, 9, 1203, "Metrics/AbcSize: Assignment Branch Condition size for `summary` is too high. [<5, 43, 13> 45.2/17]", 550888870], + [66, 9, 1203, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `summary` is too high. [14/7]", 550888870], + [66, 9, 1203, "Metrics/MethodLength: Method has too many lines. [20/10]", 550888870], + [66, 9, 1203, "Metrics/PerceivedComplexity: Perceived complexity for `summary` is too high. [14/8]", 550888870] + ], + "lib/ast/merge/runtime/surface.rb:3684795905": [ + [17, 23, 230, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 469229117], + [44, 9, 418, "Metrics/MethodLength: Method has too many lines. [11/10]", 998969973] + ], + "lib/ast/merge/section_typing.rb:4261989256": [ + [112, 9, 710, "Metrics/MethodLength: Method has too many lines. [15/10]", 3600335459], + [176, 9, 67, "Lint/MissingSuper: Call `super` to initialize state of the parent class.", 4077537758], + [216, 9, 85, "Lint/MissingSuper: Call `super` to initialize state of the parent class.", 3648782014], + [245, 9, 1446, "Metrics/AbcSize: Assignment Branch Condition size for `merge_sections` is too high. [<13, 20, 12> 26.7/17]", 525095633], + [245, 9, 1446, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_sections` is too high. [12/7]", 525095633], + [245, 9, 1446, "Metrics/MethodLength: Method has too many lines. [28/10]", 525095633], + [245, 9, 1446, "Metrics/PerceivedComplexity: Perceived complexity for `merge_sections` is too high. [13/8]", 525095633] + ], + "lib/ast/merge/smart_merger_base.rb:4189972287": [ + [109, 5, 15324, "Metrics/ClassLength: Class has too many lines. [172/100]", 3547407870], + [214, 7, 1974, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<20, 14, 5> 24.92/17]", 2211610736], + [214, 7, 1974, "Metrics/MethodLength: Method has too many lines. [23/10]", 2211610736], + [214, 21, 443, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [15/5]", 1530523783], + [424, 7, 1312, "Metrics/AbcSize: Assignment Branch Condition size for `parse_and_analyze` is too high. [<7, 25, 11> 28.2/17]", 1640248187], + [424, 7, 1312, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_and_analyze` is too high. [10/7]", 1640248187], + [424, 7, 1312, "Metrics/MethodLength: Method has too many lines. [15/10]", 1640248187], + [424, 7, 1312, "Metrics/PerceivedComplexity: Perceived complexity for `parse_and_analyze` is too high. [10/8]", 1640248187], + [517, 12, 52, "Style/NumericPredicate: Use `result_class.instance_method(:initialize).arity.zero?` instead of `result_class.instance_method(:initialize).arity == 0`.", 1312375552] + ], + "lib/ast/merge/structural_edit/boundary.rb:2838060197": [ + [20, 23, 93, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3901214537], + [41, 38, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [51, 38, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [60, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087440865] + ], + "lib/ast/merge/structural_edit/boundary_support.rb:2036464761": [ + [31, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861061], + [32, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 97596930] + ], + "lib/ast/merge/structural_edit/plan_set.rb:538463647": [ + [116, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 2855200692] + ], + "lib/ast/merge/structural_edit/rehome_plan.rb:2152178780": [ + [23, 23, 123, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3433617242], + [100, 9, 519, "Metrics/MethodLength: Method has too many lines. [11/10]", 318006380], + [136, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 2367140872] + ], + "lib/ast/merge/structural_edit/remove_plan.rb:1189569486": [ + [11, 7, 9717, "Metrics/ClassLength: Class has too many lines. [160/100]", 3652701475], + [25, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861091], + [27, 9, 1409, "Metrics/MethodLength: Method has too many lines. [22/10]", 3344870777], + [27, 23, 255, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 3970946607], + [28, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 1637059282], + [36, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859104], + [196, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 1617827253], + [224, 9, 1032, "Metrics/MethodLength: Method has too many lines. [20/10]", 968444047] + ], + "lib/ast/merge/structural_edit/remove_plan_support.rb:877461974": [ + [9, 9, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631], + [19, 9, 1429, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_remove_plan` is too high. [8/7]", 4091314919], + [19, 9, 1429, "Metrics/MethodLength: Method has too many lines. [32/10]", 4091314919] + ], + "lib/ast/merge/structural_edit/splice_plan.rb:2675806114": [ + [39, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1683893295], + [42, 23, 203, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3653221702], + [113, 9, 517, "Metrics/MethodLength: Method has too many lines. [11/10]", 634912361] + ], + "lib/ast/merge/structured_emitter_provenance_support.rb:445323365": [ + [5, 5, 41, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::StructuredEmitterProvenanceSupport`.", 3548518830] + ], + "lib/ast/merge/structured_review_apply_support.rb:3649736380": [ + [5, 5, 35, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::StructuredReviewApplySupport`.", 1282380463], + [22, 7, 782, "Metrics/AbcSize: Assignment Branch Condition size for `current_output_span_for` is too high. [<6, 19, 11> 22.76/17]", 4137750179], + [22, 7, 782, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `current_output_span_for` is too high. [8/7]", 4137750179], + [22, 7, 782, "Metrics/MethodLength: Method has too many lines. [14/10]", 4137750179], + [42, 7, 595, "Metrics/MethodLength: Method has too many lines. [12/10]", 2080934521], + [60, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3151172498] + ], + "lib/ast/merge/text/conflict_resolver.rb:989169286": [ + [19, 7, 9182, "Metrics/ClassLength: Class has too many lines. [159/100]", 1070563745], + [28, 23, 211, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2639535499], + [53, 9, 2507, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_batch` is too high. [<15, 34, 5> 37.5/17]", 825130797], + [53, 9, 2507, "Metrics/MethodLength: Method has too many lines. [44/10]", 825130797], + [196, 9, 2458, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_matched_pair` is too high. [<2, 30, 11> 32.02/17]", 4037214978], + [196, 9, 2458, "Metrics/MethodLength: Method has too many lines. [46/10]", 4037214978] + ], + "lib/ast/merge/text/file_analysis.rb:1530312707": [ + [106, 9, 1484, "Metrics/AbcSize: Assignment Branch Condition size for `parse_statements` is too high. [<11, 15, 6> 19.54/17]", 1858083071], + [106, 9, 1484, "Metrics/MethodLength: Method has too many lines. [34/10]", 1858083071], + [160, 9, 449, "Metrics/MethodLength: Method has too many lines. [11/10]", 1902035813] + ], + "lib/ast/merge/text/line_node.rb:3385927013": [ + [145, 9, 699, "Metrics/MethodLength: Method has too many lines. [17/10]", 2201872249] + ], + "lib/ast/merge/text/section_splitter.rb:129704488": [ + [141, 9, 1442, "Metrics/AbcSize: Assignment Branch Condition size for `merge_section_lists` is too high. [<13, 20, 6> 24.6/17]", 3551729170], + [141, 9, 1442, "Metrics/MethodLength: Method has too many lines. [23/10]", 3551729170], + [322, 9, 1767, "Metrics/AbcSize: Assignment Branch Condition size for `split` is too high. [<11, 29, 10> 32.59/17]", 2207922758], + [322, 9, 1767, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split` is too high. [10/7]", 2207922758], + [322, 9, 1767, "Metrics/MethodLength: Method has too many lines. [46/10]", 2207922758], + [322, 9, 1767, "Metrics/PerceivedComplexity: Perceived complexity for `split` is too high. [13/8]", 2207922758], + [328, 11, 1019, "Metrics/BlockLength: Block has too many lines. [26/25]", 1561634792] + ], + "lib/ast/merge/text/smart_merger.rb:2405807903": [ + [67, 9, 831, "Metrics/MethodLength: Method has too many lines. [12/10]", 584426022], + [67, 23, 350, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 3074172637] + ], + "lib/ast/merge/trailing_groups/alignment_sort.rb:2593404330": [ + [40, 9, 513, "Metrics/MethodLength: Method has too many lines. [12/10]", 89360683] + ], + "lib/ast/merge/trailing_groups/core.rb:4231959665": [ + [61, 9, 812, "Metrics/MethodLength: Method has too many lines. [17/10]", 1777526069], + [101, 9, 998, "Metrics/AbcSize: Assignment Branch Condition size for `flush_ready_trailing_groups` is too high. [<8, 18, 15> 24.76/17]", 2397698441], + [101, 9, 998, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `flush_ready_trailing_groups` is too high. [13/7]", 2397698441], + [101, 9, 998, "Metrics/MethodLength: Method has too many lines. [17/10]", 2397698441], + [101, 9, 998, "Metrics/PerceivedComplexity: Perceived complexity for `flush_ready_trailing_groups` is too high. [13/8]", 2397698441] + ], + "lib/ast/merge/trailing_groups/dest_iterate.rb:3897205087": [ + [69, 9, 751, "Metrics/MethodLength: Method has too many lines. [12/10]", 3915657972], + [69, 47, 199, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2545849044] + ], + "lib/ast/merge/unresolved_support.rb:2881272494": [ + [7, 5, 24, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::UnresolvedSupport`.", 990281691], + [7, 5, 4392, "Metrics/ModuleLength: Module has too many lines. [116/100]", 3475162940], + [32, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [67, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [85, 7, 1038, "Metrics/MethodLength: Method has too many lines. [14/10]", 3139619197], + [85, 40, 338, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 71164914] + ], + "spec/ast/merge/ast_node_spec.rb:1362065144": [ + [3, 1, 8199, "Metrics/BlockLength: Block has too many lines. [254/25]", 1649868231], + [18, 3, 1030, "Metrics/BlockLength: Block has too many lines. [33/25]", 1409835577] + ], + "spec/ast/merge/block_directive_spec.rb:2305756581": [ + [3, 1, 5181, "Metrics/BlockLength: Block has too many lines. [138/25]", 1887900896], + [128, 3, 1391, "Metrics/BlockLength: Block has too many lines. [39/25]", 3626371694] + ], + "spec/ast/merge/comment/attachment_spec.rb:2571833836": [ + [3, 1, 5536, "Metrics/BlockLength: Block has too many lines. [150/25]", 1841571757], + [93, 3, 1639, "Metrics/BlockLength: Block has too many lines. [37/25]", 212730671] + ], + "spec/ast/merge/comment/augmenter_spec.rb:4266625483": [ + [3, 1, 9141, "Metrics/BlockLength: Block has too many lines. [212/25]", 530365996], + [16, 3, 6849, "Metrics/BlockLength: Block has too many lines. [154/25]", 503152628], + [200, 3, 1244, "Metrics/BlockLength: Block has too many lines. [33/25]", 3565041107] + ], + "spec/ast/merge/comment/block_spec.rb:4138473890": [ + [3, 1, 9021, "Metrics/BlockLength: Block has too many lines. [250/25]", 1617505173], + [8, 3, 1115, "Metrics/BlockLength: Block has too many lines. [27/25]", 2958989619], + [93, 3, 1127, "Metrics/BlockLength: Block has too many lines. [33/25]", 196340527], + [123, 45, 16, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 155572628], + [159, 3, 1432, "Metrics/BlockLength: Block has too many lines. [35/25]", 281400319] + ], + "spec/ast/merge/comment/c_style_tracker_base_spec.rb:3154319400": [ + [3, 1, 5816, "Metrics/BlockLength: Block has too many lines. [133/25]", 680831933], + [100, 3, 1450, "Metrics/BlockLength: Block has too many lines. [35/25]", 4153882185] + ], + "spec/ast/merge/comment/capability_spec.rb:2763521225": [ + [3, 1, 3522, "Metrics/BlockLength: Block has too many lines. [89/25]", 1487980773], + [4, 3, 1954, "Metrics/BlockLength: Block has too many lines. [41/25]", 160187362] + ], + "spec/ast/merge/comment/empty_spec.rb:1801324640": [ + [3, 1, 2584, "Metrics/BlockLength: Block has too many lines. [70/25]", 270179899], + [4, 3, 1047, "Metrics/BlockLength: Block has too many lines. [27/25]", 3056449816] + ], + "spec/ast/merge/comment/hash_tracker_base_spec.rb:3624528747": [ + [3, 1, 9653, "Metrics/BlockLength: Block has too many lines. [271/25]", 3748659406], + [8, 3, 1210, "Metrics/BlockLength: Block has too many lines. [37/25]", 2566766302], + [21, 7, 872, "Metrics/AbcSize: Assignment Branch Condition size for `extract_comments` is too high. [<7, 24, 5> 25.5/17]", 1213080161], + [21, 7, 872, "Metrics/MethodLength: Method has too many lines. [25/10]", 1213080161], + [275, 3, 1171, "Metrics/BlockLength: Block has too many lines. [29/25]", 1425466742] + ], + "spec/ast/merge/comment/line_spec.rb:1487829548": [ + [3, 1, 5291, "Metrics/BlockLength: Block has too many lines. [128/25]", 587604747], + [6, 3, 1573, "Metrics/BlockLength: Block has too many lines. [37/25]", 4105920006] + ], + "spec/ast/merge/comment/parser_spec.rb:2443973508": [ + [3, 1, 9855, "Metrics/BlockLength: Block has too many lines. [237/25]", 404174977], + [4, 3, 1013, "Metrics/BlockLength: Block has too many lines. [26/25]", 182655397], + [38, 3, 1282, "Metrics/BlockLength: Block has too many lines. [28/25]", 2303702609] + ], + "spec/ast/merge/comment/quoted_hash_line_parser_spec.rb:3795390831": [ + [3, 1, 1810, "Metrics/BlockLength: Block has too many lines. [44/25]", 2575838586], + [6, 3, 1700, "Metrics/BlockLength: Block has too many lines. [41/25]", 1553834548] + ], + "spec/ast/merge/comment/region_merge_policy_spec.rb:4175996936": [ + [3, 1, 3618, "Metrics/BlockLength: Block has too many lines. [75/25]", 4006378358], + [11, 3, 2752, "Metrics/BlockLength: Block has too many lines. [52/25]", 494211987] + ], + "spec/ast/merge/comment/region_spec.rb:2674736508": [ + [3, 1, 4033, "Metrics/BlockLength: Block has too many lines. [91/25]", 1828104331] + ], + "spec/ast/merge/comment/style_spec.rb:1875195890": [ + [3, 1, 4040, "Metrics/BlockLength: Block has too many lines. [101/25]", 2759361650] + ], + "spec/ast/merge/comment/support_style_spec.rb:1350169032": [ + [3, 1, 1577, "Metrics/BlockLength: Block has too many lines. [39/25]", 3414039011] + ], + "spec/ast/merge/comment/tracked_hash_adapter_spec.rb:1256807736": [ + [3, 1, 4482, "Metrics/BlockLength: Block has too many lines. [97/25]", 264417763], + [4, 3, 3101, "Metrics/BlockLength: Block has too many lines. [63/25]", 1050939978], + [81, 3, 1313, "Metrics/BlockLength: Block has too many lines. [30/25]", 515655104] + ], + "spec/ast/merge/comment_spec.rb:81945459": [ + [3, 1, 15888, "Metrics/BlockLength: Block has too many lines. [384/25]", 2229554982], + [4, 3, 3957, "Metrics/BlockLength: Block has too many lines. [84/25]", 660667217], + [5, 5, 1187, "Metrics/BlockLength: Block has too many lines. [26/25]", 241562105], + [105, 3, 1371, "Metrics/BlockLength: Block has too many lines. [30/25]", 1901983597], + [159, 3, 1296, "Metrics/BlockLength: Block has too many lines. [30/25]", 1749880380], + [239, 3, 1151, "Metrics/BlockLength: Block has too many lines. [28/25]", 183967322], + [272, 3, 2004, "Metrics/BlockLength: Block has too many lines. [45/25]", 2594323837], + [349, 3, 3220, "Metrics/BlockLength: Block has too many lines. [83/25]", 790417809], + [350, 5, 2347, "Metrics/BlockLength: Block has too many lines. [60/25]", 4016801881] + ], + "spec/ast/merge/composite_match_refiner_spec.rb:2888297870": [ + [3, 1, 6152, "Metrics/BlockLength: Block has too many lines. [143/25]", 3308692548], + [55, 3, 4118, "Metrics/BlockLength: Block has too many lines. [87/25]", 1405655464] + ], + "spec/ast/merge/conflict_resolver_base_spec.rb:3331938447": [ + [5, 1, 20643, "Metrics/BlockLength: Block has too many lines. [516/25]", 3129196558], + [14, 59, 14, "Lint/UnusedMethodArgument: Unused method argument - `template_index`.", 1809801172], + [14, 76, 10, "Lint/UnusedMethodArgument: Unused method argument - `dest_index`.", 2703999490], + [47, 61, 14, "Lint/UnusedMethodArgument: Unused method argument - `template_index`. You can also write as `resolve_node_pair(*)` if you want the method to accept any arguments but don't care about them.", 1809801172], + [47, 78, 10, "Lint/UnusedMethodArgument: Unused method argument - `dest_index`. You can also write as `resolve_node_pair(*)` if you want the method to accept any arguments but don't care about them.", 2703999490], + [105, 3, 17203, "Metrics/BlockLength: Block has too many lines. [425/25]", 1114912980], + [154, 5, 1797, "Metrics/BlockLength: Block has too many lines. [37/25]", 515146940], + [203, 5, 1373, "Metrics/BlockLength: Block has too many lines. [32/25]", 603210832], + [292, 5, 2874, "Metrics/BlockLength: Block has too many lines. [77/25]", 3918129775], + [341, 7, 1292, "Metrics/BlockLength: Block has too many lines. [34/25]", 1769555944], + [402, 5, 1857, "Metrics/BlockLength: Block has too many lines. [44/25]", 1516406612], + [456, 5, 1209, "Metrics/BlockLength: Block has too many lines. [31/25]", 430489898], + [514, 5, 2021, "Metrics/BlockLength: Block has too many lines. [37/25]", 144128170], + [515, 7, 1953, "Metrics/BlockLength: Block has too many lines. [35/25]", 1574966248], + [567, 5, 1500, "Metrics/BlockLength: Block has too many lines. [40/25]", 2509466150] + ], + "spec/ast/merge/content_match_refiner_spec.rb:4058001158": [ + [3, 1, 14348, "Metrics/BlockLength: Block has too many lines. [318/25]", 1171164704], + [25, 3, 1238, "Metrics/BlockLength: Block has too many lines. [29/25]", 2139810386], + [63, 3, 4077, "Metrics/BlockLength: Block has too many lines. [95/25]", 3471153375], + [325, 3, 2213, "Metrics/BlockLength: Block has too many lines. [37/25]", 3370370915] + ], + "spec/ast/merge/debug_logger_spec.rb:429510168": [ + [3, 1, 17306, "Metrics/BlockLength: Block has too many lines. [358/25]", 2287792973], + [251, 3, 1598, "Metrics/BlockLength: Block has too many lines. [27/25]", 3227542816], + [358, 3, 5118, "Metrics/BlockLength: Block has too many lines. [77/25]", 1759761803] + ], + "spec/ast/merge/detector/base_spec.rb:4157102211": [ + [3, 1, 3172, "Metrics/BlockLength: Block has too many lines. [100/25]", 3745104028], + [11, 7, 498, "Metrics/MethodLength: Method has too many lines. [13/10]", 3178368155], + [49, 3, 900, "Metrics/BlockLength: Block has too many lines. [28/25]", 2333048204] + ], + "spec/ast/merge/detector/fenced_code_block_spec.rb:495797689": [ + [3, 1, 11589, "Metrics/BlockLength: Block has too many lines. [363/25]", 3764545134], + [38, 3, 4467, "Metrics/BlockLength: Block has too many lines. [150/25]", 1597401000], + [41, 5, 1077, "Metrics/BlockLength: Block has too many lines. [31/25]", 2269642514], + [115, 5, 848, "Metrics/BlockLength: Block has too many lines. [27/25]", 1704866975], + [220, 3, 4815, "Metrics/BlockLength: Block has too many lines. [146/25]", 3797214474] + ], + "spec/ast/merge/detector/mergeable_spec.rb:1307688846": [ + [3, 1, 23175, "Metrics/BlockLength: Block has too many lines. [654/25]", 2932391114], + [77, 3, 2079, "Metrics/BlockLength: Block has too many lines. [53/25]", 1093085347], + [177, 3, 2217, "Metrics/BlockLength: Block has too many lines. [69/25]", 926985871], + [188, 5, 948, "Metrics/BlockLength: Block has too many lines. [26/25]", 4186135901], + [225, 5, 898, "Metrics/BlockLength: Block has too many lines. [31/25]", 513446836], + [266, 3, 1168, "Metrics/BlockLength: Block has too many lines. [29/25]", 774699411], + [304, 3, 1188, "Metrics/BlockLength: Block has too many lines. [27/25]", 4282853126], + [339, 3, 918, "Metrics/BlockLength: Block has too many lines. [28/25]", 1759590109], + [372, 3, 870, "Metrics/BlockLength: Block has too many lines. [28/25]", 131542026], + [410, 3, 3768, "Metrics/BlockLength: Block has too many lines. [111/25]", 181819560], + [483, 5, 1536, "Metrics/BlockLength: Block has too many lines. [47/25]", 385085357], + [540, 3, 1891, "Metrics/BlockLength: Block has too many lines. [52/25]", 602757329], + [664, 3, 1927, "Metrics/BlockLength: Block has too many lines. [56/25]", 48062261], + [691, 5, 1146, "Metrics/BlockLength: Block has too many lines. [31/25]", 1961728737], + [721, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3104497040], + [729, 3, 1625, "Metrics/BlockLength: Block has too many lines. [46/25]", 1570579215] + ], + "spec/ast/merge/detector/region_spec.rb:594725562": [ + [3, 1, 8128, "Metrics/BlockLength: Block has too many lines. [290/25]", 1984713692], + [4, 3, 806, "Metrics/BlockLength: Block has too many lines. [28/25]", 1515087192], + [58, 3, 1236, "Metrics/BlockLength: Block has too many lines. [45/25]", 2464968707], + [128, 3, 1063, "Metrics/BlockLength: Block has too many lines. [33/25]", 239148700], + [250, 3, 2010, "Metrics/BlockLength: Block has too many lines. [76/25]", 2595033382] + ], + "spec/ast/merge/detector/toml_frontmatter_spec.rb:1135160129": [ + [3, 1, 6717, "Metrics/BlockLength: Block has too many lines. [218/25]", 2273975625], + [12, 3, 5534, "Metrics/BlockLength: Block has too many lines. [187/25]", 538920673], + [13, 5, 1456, "Metrics/BlockLength: Block has too many lines. [38/25]", 3113759139] + ], + "spec/ast/merge/detector/yaml_frontmatter_spec.rb:2467934365": [ + [3, 1, 6702, "Metrics/BlockLength: Block has too many lines. [213/25]", 3083039982], + [12, 3, 5056, "Metrics/BlockLength: Block has too many lines. [170/25]", 1889948780], + [13, 5, 1438, "Metrics/BlockLength: Block has too many lines. [38/25]", 1736912391], + [219, 3, 1396, "Metrics/BlockLength: Block has too many lines. [33/25]", 2446467851] + ], + "spec/ast/merge/diff_mapper_base_spec.rb:1771546518": [ + [5, 1, 8521, "Metrics/BlockLength: Block has too many lines. [248/25]", 1057580573], + [22, 9, 44, "Style/InverseMethods: Use `reject` instead of inverting `select`.", 3063843489], + [46, 3, 3878, "Metrics/BlockLength: Block has too many lines. [116/25]", 2874032080], + [47, 5, 1938, "Metrics/BlockLength: Block has too many lines. [48/25]", 1904497583], + [191, 3, 1488, "Metrics/BlockLength: Block has too many lines. [43/25]", 1632956840] + ], + "spec/ast/merge/emitter_base_spec.rb:4197360291": [ + [3, 1, 11215, "Metrics/BlockLength: Block has too many lines. [282/25]", 4254840781], + [30, 3, 4393, "Metrics/BlockLength: Block has too many lines. [102/25]", 3992142376], + [134, 58, 12, "Lint/UnusedMethodArgument: Unused method argument - `current_line`. You can also write as `inline_comment_region_target_column(*)` if you want the method to accept any arguments but don't care about them.", 2091263933], + [138, 44, 6, "Lint/UnusedMethodArgument: Unused method argument - `region`.", 2124512157], + [159, 3, 1815, "Metrics/BlockLength: Block has too many lines. [39/25]", 719023387], + [206, 3, 2233, "Metrics/BlockLength: Block has too many lines. [62/25]", 3754339775], + [312, 3, 1059, "Metrics/BlockLength: Block has too many lines. [26/25]", 375007123] + ], + "spec/ast/merge/fictive_language_harness_spec.rb:1179155480": [ + [6, 1, 6693, "Metrics/BlockLength: Block has too many lines. [143/25]", 245088433], + [7, 3, 1968, "Metrics/BlockLength: Block has too many lines. [36/25]", 4161580169], + [58, 3, 1230, "Metrics/BlockLength: Block has too many lines. [34/25]", 990452676], + [103, 3, 2668, "Metrics/BlockLength: Block has too many lines. [51/25]", 1755027956] + ], + "spec/ast/merge/file_aligner_base_spec.rb:91275387": [ + [5, 1, 9948, "Metrics/BlockLength: Block has too many lines. [217/25]", 3354563411], + [6, 3, 1490, "Metrics/BlockLength: Block has too many lines. [45/25]", 563330990], + [95, 3, 7495, "Metrics/BlockLength: Block has too many lines. [129/25]", 598770279], + [103, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3749416415], + [163, 5, 1489, "Metrics/BlockLength: Block has too many lines. [26/25]", 2910876949] + ], + "spec/ast/merge/file_analyzable_spec.rb:3816965829": [ + [3, 1, 12458, "Metrics/BlockLength: Block has too many lines. [272/25]", 216138965], + [25, 3, 9603, "Metrics/BlockLength: Block has too many lines. [202/25]", 2508188172], + [297, 3, 1214, "Metrics/BlockLength: Block has too many lines. [30/25]", 777182624] + ], + "spec/ast/merge/freezable_spec.rb:559280324": [ + [5, 1, 5033, "Metrics/BlockLength: Block has too many lines. [123/25]", 3070666859], + [6, 3, 1199, "Metrics/BlockLength: Block has too many lines. [34/25]", 4058875636], + [66, 3, 1530, "Metrics/BlockLength: Block has too many lines. [31/25]", 1670675428] + ], + "spec/ast/merge/freeze_node_base_spec.rb:2962962931": [ + [3, 1, 21887, "Metrics/BlockLength: Block has too many lines. [560/25]", 567315021], + [48, 3, 1369, "Metrics/BlockLength: Block has too many lines. [38/25]", 3363160391], + [131, 3, 2739, "Metrics/BlockLength: Block has too many lines. [56/25]", 2008289622], + [205, 3, 1586, "Metrics/BlockLength: Block has too many lines. [35/25]", 4179606047], + [251, 3, 977, "Metrics/BlockLength: Block has too many lines. [26/25]", 1240612851], + [287, 3, 1130, "Metrics/BlockLength: Block has too many lines. [28/25]", 2511265379], + [322, 3, 5029, "Metrics/BlockLength: Block has too many lines. [126/25]", 739537566], + [598, 3, 3055, "Metrics/BlockLength: Block has too many lines. [81/25]", 145217296] + ], + "spec/ast/merge/healer_spec.rb:877829793": [ + [3, 1, 4896, "Metrics/BlockLength: Block has too many lines. [148/25]", 1074378773], + [19, 3, 1333, "Metrics/BlockLength: Block has too many lines. [38/25]", 2940878263], + [24, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193432399], + [61, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085379023], + [67, 3, 2985, "Metrics/BlockLength: Block has too many lines. [93/25]", 4032786576] + ], + "spec/ast/merge/jaccard_similarity_spec.rb:3984307047": [ + [3, 1, 2659, "Metrics/BlockLength: Block has too many lines. [71/25]", 1122516612], + [6, 3, 1484, "Metrics/BlockLength: Block has too many lines. [38/25]", 3367914637], + [55, 3, 1090, "Metrics/BlockLength: Block has too many lines. [28/25]", 2629339264] + ], + "spec/ast/merge/key_path_partial_template_merger_base_spec.rb:2189485360": [ + [5, 1, 5955, "Metrics/BlockLength: Block has too many lines. [138/25]", 91542958], + [35, 3, 1217, "Metrics/BlockLength: Block has too many lines. [33/25]", 2663081123], + [97, 3, 3019, "Metrics/BlockLength: Block has too many lines. [54/25]", 1411952192] + ], + "spec/ast/merge/layout/attachment_spec.rb:3814294426": [ + [3, 1, 1799, "Metrics/BlockLength: Block has too many lines. [34/25]", 1283153367] + ], + "spec/ast/merge/layout/augmenter_spec.rb:3633045915": [ + [3, 1, 4412, "Metrics/BlockLength: Block has too many lines. [92/25]", 2690553031], + [20, 3, 2725, "Metrics/BlockLength: Block has too many lines. [54/25]", 3645203819] + ], + "spec/ast/merge/layout/gap_spec.rb:4232058283": [ + [3, 1, 2758, "Metrics/BlockLength: Block has too many lines. [72/25]", 2052697931], + [9, 3, 1290, "Metrics/BlockLength: Block has too many lines. [28/25]", 3175967312] + ], + "spec/ast/merge/match_refiner_base_spec.rb:3961767223": [ + [3, 1, 10604, "Metrics/BlockLength: Block has too many lines. [301/25]", 4290485382], + [4, 3, 1146, "Metrics/BlockLength: Block has too many lines. [37/25]", 108051658], + [50, 3, 1005, "Metrics/BlockLength: Block has too many lines. [28/25]", 3807648246], + [125, 3, 1026, "Metrics/BlockLength: Block has too many lines. [27/25]", 2896086726], + [162, 3, 4464, "Metrics/BlockLength: Block has too many lines. [114/25]", 2878217135], + [218, 5, 1112, "Metrics/BlockLength: Block has too many lines. [30/25]", 1605825436], + [224, 11, 104, "Style/HashLikeCase: Consider replacing `case-when` with a hash lookup.", 4220899731], + [247, 11, 132, "Style/HashLikeCase: Consider replacing `case-when` with a hash lookup.", 3401820780], + [258, 5, 1642, "Metrics/BlockLength: Block has too many lines. [35/25]", 1288881729], + [337, 3, 1108, "Metrics/BlockLength: Block has too many lines. [33/25]", 2139263963] + ], + "spec/ast/merge/match_score_base_spec.rb:2340739872": [ + [3, 1, 15213, "Metrics/BlockLength: Block has too many lines. [372/25]", 1512747000], + [4, 3, 1553, "Metrics/BlockLength: Block has too many lines. [41/25]", 2789289940], + [43, 20, 2, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 5862747], + [43, 24, 2, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 5862744], + [56, 3, 1041, "Metrics/BlockLength: Block has too many lines. [29/25]", 3729310115], + [152, 3, 3259, "Metrics/BlockLength: Block has too many lines. [82/25]", 1438003770], + [258, 3, 2199, "Metrics/BlockLength: Block has too many lines. [43/25]", 3386602801], + [320, 3, 1684, "Metrics/BlockLength: Block has too many lines. [35/25]", 3807719546], + [365, 14, 16, "Lint/FloatComparison: Avoid equality comparisons of floats as they are unreliable.", 3787748956], + [369, 3, 1696, "Metrics/BlockLength: Block has too many lines. [36/25]", 3172214426], + [417, 3, 1792, "Metrics/BlockLength: Block has too many lines. [45/25]", 3557977606], + [438, 5, 1121, "Metrics/BlockLength: Block has too many lines. [26/25]", 4236927298] + ], + "spec/ast/merge/merge_result_base_spec.rb:2262708492": [ + [3, 1, 19471, "Metrics/BlockLength: Block has too many lines. [529/25]", 4106058751], + [38, 3, 2735, "Metrics/BlockLength: Block has too many lines. [80/25]", 1103243845], + [279, 3, 1611, "Metrics/BlockLength: Block has too many lines. [39/25]", 1928511417], + [280, 5, 1203, "Metrics/BlockLength: Block has too many lines. [26/25]", 857223227], + [326, 3, 2070, "Metrics/BlockLength: Block has too many lines. [48/25]", 2552826824], + [385, 3, 5769, "Metrics/BlockLength: Block has too many lines. [140/25]", 1457747735], + [511, 5, 1306, "Metrics/BlockLength: Block has too many lines. [29/25]", 2980786372], + [574, 3, 1308, "Metrics/BlockLength: Block has too many lines. [32/25]", 1342704008] + ], + "spec/ast/merge/merger_config_spec.rb:663896662": [ + [5, 1, 7314, "Metrics/BlockLength: Block has too many lines. [189/25]", 1279589310], + [11, 3, 1180, "Metrics/BlockLength: Block has too many lines. [26/25]", 1014009176], + [45, 3, 1151, "Metrics/BlockLength: Block has too many lines. [26/25]", 785276703], + [79, 3, 3574, "Metrics/BlockLength: Block has too many lines. [97/25]", 969726064], + [126, 5, 1158, "Metrics/BlockLength: Block has too many lines. [29/25]", 389808524] + ], + "spec/ast/merge/navigable/injection_point_finder_spec.rb:3693754765": [ + [3, 1, 5152, "Metrics/BlockLength: Block has too many lines. [123/25]", 3265221808], + [15, 3, 4026, "Metrics/BlockLength: Block has too many lines. [96/25]", 1482695302], + [63, 5, 2337, "Metrics/BlockLength: Block has too many lines. [54/25]", 2678200297] + ], + "spec/ast/merge/navigable/injection_point_spec.rb:3295717447": [ + [3, 1, 6032, "Metrics/BlockLength: Block has too many lines. [161/25]", 805025024], + [77, 3, 1083, "Metrics/BlockLength: Block has too many lines. [28/25]", 3091139104] + ], + "spec/ast/merge/navigable/statement_spec.rb:2965726260": [ + [3, 1, 18289, "Metrics/BlockLength: Block has too many lines. [510/25]", 4119203121], + [102, 3, 3570, "Metrics/BlockLength: Block has too many lines. [97/25]", 3287535168], + [156, 5, 2030, "Metrics/BlockLength: Block has too many lines. [51/25]", 3299963733], + [251, 3, 1338, "Metrics/BlockLength: Block has too many lines. [37/25]", 844559624], + [411, 3, 1550, "Metrics/BlockLength: Block has too many lines. [42/25]", 3851790429], + [465, 3, 1372, "Metrics/BlockLength: Block has too many lines. [41/25]", 3782869383] + ], + "spec/ast/merge/node_typing/frozen_wrapper_spec.rb:3823345520": [ + [3, 1, 4532, "Metrics/BlockLength: Block has too many lines. [117/25]", 3944573785] + ], + "spec/ast/merge/node_typing/normalizer_spec.rb:1976431423": [ + [4, 1, 8679, "Metrics/BlockLength: Block has too many lines. [219/25]", 938207310], + [65, 3, 1137, "Metrics/BlockLength: Block has too many lines. [26/25]", 3180807289], + [101, 3, 1404, "Metrics/BlockLength: Block has too many lines. [28/25]", 1094334251], + [216, 3, 875, "Metrics/BlockLength: Block has too many lines. [26/25]", 2755551247] + ], + "spec/ast/merge/node_typing/wrapper_spec.rb:3211588263": [ + [3, 1, 3469, "Metrics/BlockLength: Block has too many lines. [92/25]", 638644563] + ], + "spec/ast/merge/node_typing_spec.rb:4080661389": [ + [3, 1, 12728, "Metrics/BlockLength: Block has too many lines. [333/25]", 3927571381], + [132, 3, 3704, "Metrics/BlockLength: Block has too many lines. [98/25]", 2130243754], + [208, 5, 1267, "Metrics/BlockLength: Block has too many lines. [31/25]", 2816753725], + [265, 3, 1298, "Metrics/BlockLength: Block has too many lines. [33/25]", 3320876250], + [311, 3, 3803, "Metrics/BlockLength: Block has too many lines. [100/25]", 2743470911] + ], + "spec/ast/merge/node_wrapper_base_spec.rb:2252820285": [ + [3, 1, 11681, "Metrics/BlockLength: Block has too many lines. [307/25]", 1698593962], + [32, 3, 2341, "Metrics/BlockLength: Block has too many lines. [68/25]", 1594381363], + [179, 3, 2568, "Metrics/BlockLength: Block has too many lines. [51/25]", 1269052990], + [294, 3, 1252, "Metrics/BlockLength: Block has too many lines. [26/25]", 4220822180], + [329, 3, 1963, "Metrics/BlockLength: Block has too many lines. [39/25]", 1623030031] + ], + "spec/ast/merge/owner_selection_spec.rb:1894901093": [ + [3, 1, 1356, "Metrics/BlockLength: Block has too many lines. [35/25]", 1030003775] + ], + "spec/ast/merge/partial_template_merger_base_spec.rb:3412991027": [ + [3, 1, 7073, "Metrics/BlockLength: Block has too many lines. [145/25]", 3415302240], + [16, 9, 43, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3196404056], + [22, 9, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 4116824817], + [48, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [96, 3, 4220, "Metrics/BlockLength: Block has too many lines. [68/25]", 3464417459], + [97, 5, 2029, "Metrics/BlockLength: Block has too many lines. [27/25]", 3297854360], + [138, 5, 2122, "Metrics/BlockLength: Block has too many lines. [37/25]", 1592076374] + ], + "spec/ast/merge/recipe/config_spec.rb:3917288551": [ + [3, 1, 21041, "Metrics/BlockLength: Block has too many lines. [611/25]", 2431235923], + [72, 3, 1653, "Metrics/BlockLength: Block has too many lines. [36/25]", 2702780755], + [174, 3, 1465, "Metrics/BlockLength: Block has too many lines. [44/25]", 2326126933], + [226, 3, 3419, "Metrics/BlockLength: Block has too many lines. [89/25]", 798604841], + [327, 3, 1398, "Metrics/BlockLength: Block has too many lines. [34/25]", 3113267700], + [474, 3, 1184, "Metrics/BlockLength: Block has too many lines. [39/25]", 2599756030], + [519, 3, 4630, "Metrics/BlockLength: Block has too many lines. [147/25]", 1245526575] + ], + "spec/ast/merge/recipe/preset_spec.rb:818394232": [ + [3, 1, 6696, "Metrics/BlockLength: Block has too many lines. [173/25]", 3205615892] + ], + "spec/ast/merge/recipe/runner_spec.rb:3689194117": [ + [3, 1, 46798, "Metrics/BlockLength: Block has too many lines. [1104/25]", 3220015076], + [48, 3, 1128, "Metrics/BlockLength: Block has too many lines. [26/25]", 910457645], + [108, 3, 3036, "Metrics/BlockLength: Block has too many lines. [92/25]", 2112378918], + [132, 5, 881, "Metrics/BlockLength: Block has too many lines. [27/25]", 3842010356], + [177, 5, 918, "Metrics/BlockLength: Block has too many lines. [27/25]", 2152367239], + [295, 3, 1383, "Metrics/BlockLength: Block has too many lines. [41/25]", 2141027559], + [362, 3, 1653, "Metrics/BlockLength: Block has too many lines. [33/25]", 1536472295], + [449, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3960802027], + [497, 3, 7959, "Metrics/BlockLength: Block has too many lines. [200/25]", 3739116912], + [556, 5, 1225, "Metrics/BlockLength: Block has too many lines. [31/25]", 195497726], + [740, 3, 6977, "Metrics/BlockLength: Block has too many lines. [145/25]", 2805535296], + [748, 5, 2241, "Metrics/BlockLength: Block has too many lines. [49/25]", 2552233173], + [805, 5, 3007, "Metrics/BlockLength: Block has too many lines. [59/25]", 708771722], + [877, 5, 1444, "Metrics/BlockLength: Block has too many lines. [26/25]", 3274225022], + [911, 3, 3258, "Metrics/BlockLength: Block has too many lines. [85/25]", 2346849758], + [1012, 3, 2710, "Metrics/BlockLength: Block has too many lines. [71/25]", 3801821877], + [1029, 5, 1547, "Metrics/BlockLength: Block has too many lines. [42/25]", 2962020615], + [1109, 3, 2240, "Metrics/BlockLength: Block has too many lines. [35/25]", 1139957345], + [1115, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], + [1117, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], + [1119, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1801369636], + [1121, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2652710920], + [1123, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1375785821], + [1125, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 632755459], + [1160, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], + [1162, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], + [1164, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1375785821], + [1176, 3, 1472, "Metrics/BlockLength: Block has too many lines. [31/25]", 844153987], + [1181, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1239303812], + [1183, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1251336963], + [1216, 3, 2277, "Metrics/BlockLength: Block has too many lines. [43/25]", 4287127386], + [1221, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], + [1223, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2652710920], + [1225, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1375785821], + [1227, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 632755459], + [1274, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3420615328] + ], + "spec/ast/merge/recipe/script_loader_spec.rb:2136892097": [ + [3, 1, 8554, "Metrics/BlockLength: Block has too many lines. [237/25]", 2314425369], + [45, 3, 2842, "Metrics/BlockLength: Block has too many lines. [75/25]", 168902852], + [155, 3, 1400, "Metrics/BlockLength: Block has too many lines. [39/25]", 1611123964] + ], + "spec/ast/merge/rspec/shared_examples/feature_profile_spec.rb:2654837708": [ + [5, 1, 1140, "Metrics/BlockLength: Block has too many lines. [31/25]", 678325840] + ], + "spec/ast/merge/rspec/shared_examples/file_analyzable_spec.rb:1833922303": [ + [58, 3, 970, "Metrics/AbcSize: Assignment Branch Condition size for `detect_freeze_blocks` is too high. [<16, 9, 5> 19.03/17]", 1533823667], + [58, 3, 970, "Metrics/MethodLength: Method has too many lines. [31/10]", 1533823667], + [104, 1, 1216, "Metrics/BlockLength: Block has too many lines. [39/25]", 1009012120], + [105, 3, 1159, "Metrics/BlockLength: Block has too many lines. [38/25]", 1361521205] + ], + "spec/ast/merge/rspec/shared_examples/layout_attachment_spec.rb:714796658": [ + [8, 1, 957, "Metrics/BlockLength: Block has too many lines. [28/25]", 3738990548] + ], + "spec/ast/merge/rspec/shared_examples/recipe_preset_contract_spec.rb:669158728": [ + [6, 1, 1577, "Metrics/BlockLength: Block has too many lines. [41/25]", 2157464290], + [7, 3, 1512, "Metrics/BlockLength: Block has too many lines. [39/25]", 1968160370], + [44, 5, 401, "Metrics/AbcSize: Assignment Branch Condition size for `run_verify_loaded_preset` is too high. [<0, 26, 0> 26/17]", 2960760840] + ], + "spec/ast/merge/rspec/shared_examples/removal_mode_compliance_spec.rb:31388352": [ + [6, 22, 2, "Style/MutableConstant: Freeze mutable objects assigned to constants.", 5861859], + [44, 1, 2546, "Metrics/BlockLength: Block has too many lines. [77/25]", 3740028971], + [45, 3, 1350, "Metrics/BlockLength: Block has too many lines. [41/25]", 2793151667], + [94, 3, 1128, "Metrics/BlockLength: Block has too many lines. [32/25]", 2527000512], + [95, 5, 1081, "Metrics/BlockLength: Block has too many lines. [30/25]", 3825359844] + ], + "spec/ast/merge/rspec/shared_examples/reproducible_partial_merge_spec.rb:2862326360": [ + [19, 3, 600, "Metrics/MethodLength: Method has too many lines. [13/10]", 1542875905] + ], + "spec/ast/merge/ruleset/config_spec.rb:1860949041": [ + [3, 1, 9431, "Metrics/BlockLength: Block has too many lines. [236/25]", 4015119559], + [24, 3, 5341, "Metrics/BlockLength: Block has too many lines. [149/25]", 2361087446], + [25, 5, 1064, "Metrics/BlockLength: Block has too many lines. [26/25]", 603056104], + [226, 3, 2125, "Metrics/BlockLength: Block has too many lines. [36/25]", 1640873170] + ], + "spec/ast/merge/ruleset/declaration_objects_spec.rb:3827892270": [ + [3, 1, 1881, "Metrics/BlockLength: Block has too many lines. [47/25]", 1770376910] + ], + "spec/ast/merge/ruleset/feature_profile_spec.rb:2241111096": [ + [3, 1, 4189, "Metrics/BlockLength: Block has too many lines. [86/25]", 1116963550], + [4, 3, 4129, "Metrics/BlockLength: Block has too many lines. [84/25]", 117079811], + [5, 5, 2391, "Metrics/BlockLength: Block has too many lines. [45/25]", 1800077283] + ], + "spec/ast/merge/ruleset/parser_spec.rb:386407767": [ + [3, 1, 5670, "Metrics/BlockLength: Block has too many lines. [144/25]", 3425850453], + [4, 3, 5618, "Metrics/BlockLength: Block has too many lines. [143/25]", 246633759] + ], + "spec/ast/merge/ruleset/profile_vocabulary_spec.rb:2570869276": [ + [3, 1, 2095, "Metrics/BlockLength: Block has too many lines. [46/25]", 3214342662] + ], + "spec/ast/merge/ruleset/support_style_resolver_spec.rb:640167644": [ + [3, 1, 1625, "Metrics/BlockLength: Block has too many lines. [49/25]", 2066834885], + [4, 3, 1559, "Metrics/BlockLength: Block has too many lines. [47/25]", 1169495477] + ], + "spec/ast/merge/runtime_spec.rb:3962589694": [ + [5, 1, 24649, "Metrics/BlockLength: Block has too many lines. [664/25]", 2634021188], + [76, 3, 1459, "Metrics/BlockLength: Block has too many lines. [41/25]", 3744002593], + [125, 3, 1417, "Metrics/BlockLength: Block has too many lines. [33/25]", 4087615381], + [166, 3, 2549, "Metrics/BlockLength: Block has too many lines. [69/25]", 3150260095], + [175, 5, 1068, "Metrics/BlockLength: Block has too many lines. [26/25]", 2933114685], + [247, 3, 1668, "Metrics/BlockLength: Block has too many lines. [39/25]", 2386637993], + [259, 5, 1265, "Metrics/BlockLength: Block has too many lines. [27/25]", 3157806167], + [321, 3, 10884, "Metrics/BlockLength: Block has too many lines. [295/25]", 1889265918], + [322, 5, 1879, "Metrics/BlockLength: Block has too many lines. [46/25]", 2536583521], + [373, 5, 3938, "Metrics/BlockLength: Block has too many lines. [108/25]", 340276027], + [486, 5, 1270, "Metrics/BlockLength: Block has too many lines. [38/25]", 3844174392], + [528, 5, 3728, "Metrics/BlockLength: Block has too many lines. [95/25]", 3779381786], + [630, 3, 3240, "Metrics/BlockLength: Block has too many lines. [84/25]", 3856725067], + [656, 5, 1649, "Metrics/BlockLength: Block has too many lines. [40/25]", 3713662683] + ], + "spec/ast/merge/section_typing_spec.rb:2580971307": [ + [3, 1, 14786, "Metrics/BlockLength: Block has too many lines. [344/25]", 2925587076], + [4, 3, 1940, "Metrics/BlockLength: Block has too many lines. [50/25]", 3362429388], + [67, 3, 3684, "Metrics/BlockLength: Block has too many lines. [96/25]", 3864076664], + [120, 5, 1998, "Metrics/BlockLength: Block has too many lines. [50/25]", 411620722], + [183, 3, 1415, "Metrics/BlockLength: Block has too many lines. [37/25]", 3323012675], + [192, 5, 1124, "Metrics/BlockLength: Block has too many lines. [28/25]", 966216762], + [229, 3, 1610, "Metrics/BlockLength: Block has too many lines. [38/25]", 1499957007], + [229, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 1025596574], + [279, 3, 4437, "Metrics/BlockLength: Block has too many lines. [80/25]", 423587151], + [356, 36, 23, "Style/SymbolProc: Pass `&:unclassified?` as an argument to `find` instead of a block.", 563945984], + [369, 36, 23, "Style/SymbolProc: Pass `&:unclassified?` as an argument to `find` instead of a block.", 563945984], + [375, 3, 1630, "Metrics/BlockLength: Block has too many lines. [31/25]", 1675144727] + ], + "spec/ast/merge/smart_merger_base_spec.rb:1904727390": [ + [3, 1, 13253, "Metrics/BlockLength: Block has too many lines. [398/25]", 3611753358], + [30, 9, 10, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 1099697163], + [87, 3, 1851, "Metrics/BlockLength: Block has too many lines. [40/25]", 3729571903], + [210, 3, 925, "Metrics/BlockLength: Block has too many lines. [35/25]", 2001100899], + [344, 3, 709, "Metrics/BlockLength: Block has too many lines. [27/25]", 3041950416], + [415, 3, 1074, "Metrics/BlockLength: Block has too many lines. [35/25]", 956635689], + [416, 5, 1026, "Metrics/BlockLength: Block has too many lines. [33/25]", 1993879652], + [461, 3, 1031, "Metrics/BlockLength: Block has too many lines. [31/25]", 35315996] + ], + "spec/ast/merge/structural_edit/boundary_support_spec.rb:863387845": [ + [3, 1, 4226, "Metrics/BlockLength: Block has too many lines. [86/25]", 1889771490], + [16, 9, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1304492024], + [22, 9, 41, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3828424401], + [59, 3, 1294, "Metrics/BlockLength: Block has too many lines. [26/25]", 3038774774] + ], + "spec/ast/merge/structural_edit/plan_set_spec.rb:3633263362": [ + [3, 1, 5945, "Metrics/BlockLength: Block has too many lines. [180/25]", 3883285271], + [14, 3, 2139, "Metrics/BlockLength: Block has too many lines. [72/25]", 3558415255], + [128, 3, 1412, "Metrics/BlockLength: Block has too many lines. [39/25]", 1216754705] + ], + "spec/ast/merge/structural_edit/remove_plan_spec.rb:3569534665": [ + [3, 1, 6442, "Metrics/BlockLength: Block has too many lines. [134/25]", 3440814588], + [39, 3, 3768, "Metrics/BlockLength: Block has too many lines. [75/25]", 876721813], + [127, 3, 1439, "Metrics/BlockLength: Block has too many lines. [29/25]", 3378195351] + ], + "spec/ast/merge/structural_edit/remove_plan_support_spec.rb:800158061": [ + [3, 1, 2893, "Metrics/BlockLength: Block has too many lines. [62/25]", 3748446914], + [16, 9, 43, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3196404056], + [22, 9, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 4116824817], + [29, 3, 2091, "Metrics/BlockLength: Block has too many lines. [39/25]", 1684933040], + [30, 5, 1653, "Metrics/BlockLength: Block has too many lines. [27/25]", 2456404305] + ], + "spec/ast/merge/structural_edit/splice_plan_spec.rb:3331205681": [ + [3, 1, 3159, "Metrics/BlockLength: Block has too many lines. [83/25]", 2234926397], + [16, 3, 1837, "Metrics/BlockLength: Block has too many lines. [46/25]", 2935991482], + [42, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860750] + ], + "spec/ast/merge/text/conflict_resolver_spec.rb:3810004132": [ + [5, 1, 9102, "Metrics/BlockLength: Block has too many lines. [218/25]", 672115618], + [33, 3, 8206, "Metrics/BlockLength: Block has too many lines. [194/25]", 259803246], + [78, 5, 1920, "Metrics/BlockLength: Block has too many lines. [45/25]", 3965182334], + [139, 5, 1918, "Metrics/BlockLength: Block has too many lines. [44/25]", 3707046125] + ], + "spec/ast/merge/text/file_analysis_spec.rb:3430380445": [ + [5, 1, 8842, "Metrics/BlockLength: Block has too many lines. [205/25]", 4255187284], + [6, 3, 1323, "Metrics/BlockLength: Block has too many lines. [29/25]", 2518912953], + [47, 3, 1830, "Metrics/BlockLength: Block has too many lines. [43/25]", 3685770590], + [135, 3, 1620, "Metrics/BlockLength: Block has too many lines. [35/25]", 3089951119] + ], + "spec/ast/merge/text/line_node_spec.rb:1757790485": [ + [5, 1, 4739, "Metrics/BlockLength: Block has too many lines. [131/25]", 1487875238] + ], + "spec/ast/merge/text/merge_result_spec.rb:589380024": [ + [5, 1, 1541, "Metrics/BlockLength: Block has too many lines. [40/25]", 2828087992] + ], + "spec/ast/merge/text/section_splitter_spec.rb:804308722": [ + [4, 1, 5705, "Metrics/BlockLength: Block has too many lines. [209/25]", 4175363685], + [5, 3, 794, "Metrics/BlockLength: Block has too many lines. [28/25]", 2386862842], + [42, 3, 1126, "Metrics/BlockLength: Block has too many lines. [45/25]", 1507887296], + [95, 3, 746, "Metrics/BlockLength: Block has too many lines. [30/25]", 1759029412], + [131, 3, 1169, "Metrics/BlockLength: Block has too many lines. [45/25]", 1412318991], + [184, 3, 754, "Metrics/BlockLength: Block has too many lines. [30/25]", 2717556691], + [246, 1, 16648, "Metrics/BlockLength: Block has too many lines. [428/25]", 3166834694], + [370, 3, 1640, "Metrics/BlockLength: Block has too many lines. [46/25]", 2049342960], + [424, 3, 3237, "Metrics/BlockLength: Block has too many lines. [102/25]", 2357275144], + [540, 3, 3505, "Metrics/BlockLength: Block has too many lines. [67/25]", 2112469350], + [619, 3, 3586, "Metrics/BlockLength: Block has too many lines. [90/25]", 3866409298], + [620, 5, 1650, "Metrics/BlockLength: Block has too many lines. [48/25]", 289235626], + [622, 9, 1474, "Metrics/AbcSize: Assignment Branch Condition size for `split` is too high. [<8, 21, 7> 23.54/17]", 557655357], + [622, 9, 1474, "Metrics/MethodLength: Method has too many lines. [41/10]", 557655357], + [622, 9, 1474, "Metrics/PerceivedComplexity: Perceived complexity for `split` is too high. [9/8]", 557655357], + [628, 11, 1237, "Metrics/BlockLength: Block has too many lines. [33/25]", 1134667672], + [717, 29, 44, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 2169354946], + [723, 29, 44, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 2169354946], + [751, 1, 3128, "Metrics/BlockLength: Block has too many lines. [85/25]", 2082776744], + [769, 3, 1744, "Metrics/BlockLength: Block has too many lines. [46/25]", 223880162], + [770, 5, 1258, "Metrics/BlockLength: Block has too many lines. [31/25]", 2245422869] + ], + "spec/ast/merge/text/smart_merger_spec.rb:4128732567": [ + [3, 1, 8057, "Metrics/BlockLength: Block has too many lines. [210/25]", 1690443322], + [4, 3, 1135, "Metrics/BlockLength: Block has too many lines. [28/25]", 3788979655], + [58, 3, 4438, "Metrics/BlockLength: Block has too many lines. [106/25]", 2613192474], + [187, 3, 1053, "Metrics/BlockLength: Block has too many lines. [26/25]", 803567817], + [220, 3, 892, "Metrics/BlockLength: Block has too many lines. [28/25]", 2001100899] + ], + "spec/ast/merge/text/word_node_spec.rb:1457011521": [ + [5, 1, 3264, "Metrics/BlockLength: Block has too many lines. [74/25]", 677733430] + ], + "spec/ast/merge/token_match_refiner_spec.rb:3180314913": [ + [3, 1, 4000, "Metrics/BlockLength: Block has too many lines. [80/25]", 1630791278], + [8, 3, 2912, "Metrics/BlockLength: Block has too many lines. [60/25]", 529772148] + ], + "spec/ast/merge/trailing_groups/alignment_sort_spec.rb:1594915480": [ + [5, 1, 4710, "Metrics/BlockLength: Block has too many lines. [114/25]", 2499296583], + [14, 3, 2140, "Metrics/BlockLength: Block has too many lines. [47/25]", 3871799493], + [95, 3, 1482, "Metrics/BlockLength: Block has too many lines. [35/25]", 1088314263] + ], + "spec/ast/merge/trailing_groups/core_spec.rb:2651131504": [ + [5, 1, 9601, "Metrics/BlockLength: Block has too many lines. [242/25]", 598045669], + [22, 3, 3728, "Metrics/BlockLength: Block has too many lines. [87/25]", 1304580063], + [119, 3, 3931, "Metrics/BlockLength: Block has too many lines. [99/25]", 2464218479], + [186, 5, 1322, "Metrics/BlockLength: Block has too many lines. [30/25]", 427915501], + [187, 7, 1267, "Metrics/BlockLength: Block has too many lines. [28/25]", 861882691], + [245, 3, 1306, "Metrics/BlockLength: Block has too many lines. [34/25]", 86572459] + ], + "spec/ast/merge/trailing_groups/dest_iterate_spec.rb:3632880085": [ + [5, 1, 5523, "Metrics/BlockLength: Block has too many lines. [131/25]", 3077369183], + [19, 3, 3990, "Metrics/BlockLength: Block has too many lines. [91/25]", 593259616], + [39, 35, 12, "Style/SymbolProc: Pass `&:sig` as an argument to `lambda` instead of a block.", 3587754320], + [54, 33, 23, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 384283629], + [89, 35, 13, "Style/SymbolProc: Pass `&:name` as an argument to `lambda` instead of a block.", 3561384234], + [98, 35, 12, "Style/SymbolProc: Pass `&:sig` as an argument to `lambda` instead of a block.", 3587754320], + [113, 35, 12, "Style/SymbolProc: Pass `&:sig` as an argument to `lambda` instead of a block.", 3587754320] + ], + "spec/ast/merge/unresolved_policy_spec.rb:2561713656": [ + [3, 1, 1333, "Metrics/BlockLength: Block has too many lines. [33/25]", 4109547889] + ], + "spec/ast/merge/unresolved_review_state_spec.rb:3186871217": [ + [3, 1, 1038, "Metrics/BlockLength: Block has too many lines. [31/25]", 1325553035] + ], + "spec/ast/merge_rspec_conformance_fixtures_spec.rb:251774004": [ + [5, 1, 2119, "Metrics/BlockLength: Block has too many lines. [55/25]", 1724925683], + [6, 3, 1203, "Metrics/BlockLength: Block has too many lines. [29/25]", 3306863581] + ], + "spec/ast/merge_spec.rb:664670069": [ + [3, 1, 3113, "Metrics/BlockLength: Block has too many lines. [74/25]", 4034649501], + [9, 3, 2227, "Metrics/BlockLength: Block has too many lines. [51/25]", 578300230], + [10, 5, 2182, "Metrics/BlockLength: Block has too many lines. [49/25]", 2758871265] + ], + "spec/base_substrate_spec.rb:2864492094": [ + [5, 1, 5800, "Metrics/BlockLength: Block has too many lines. [143/25]", 784801982], + [6, 3, 192, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 680981873], + [13, 3, 378, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1223797442], + [31, 3, 628, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 2123191050], + [53, 3, 429, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3536712197], + [69, 3, 24, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 2280792512], + [70, 3, 78, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 604224776], + [72, 3, 146, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3315091322] + ], + "spec/fixtures_integration_spec.rb:1145500459": [ + [595, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859109], + [758, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 576909008], + [881, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087900170], + [1806, 3, 816, "Metrics/MethodLength: Method has too many lines. [13/10]", 170960660], + [1806, 39, 213, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 635200700], + [1807, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3976306097], + [1831, 38, 80, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3297939075], + [1916, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1745553512], + [1917, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 118067488], + [1918, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 196190368], + [1919, 121, 41, "Layout/LineLength: Line is too long. [161/120]", 3371256193], + [2090, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3241114703], + [2428, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], + [2567, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], + [2991, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3697593604], + [2992, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], + [3113, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179435314], + [3122, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1182194285], + [3124, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 3886107031], + [3151, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1751849111], + [3152, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1519587684], + [3153, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 4086262880], + [3170, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3568081822], + [3171, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1776876782], + [3173, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [3174, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1751849111], + [3176, 121, 73, "Layout/LineLength: Line is too long. [193/120]", 3322243646], + [3178, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1715153206], + [3179, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [3180, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 504997180], + [3181, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 1146860021], + [3182, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 2312101607], + [3183, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1423779161], + [3184, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1900897138], + [3185, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 1689840383], + [3186, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 1589056236], + [3188, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 763176550], + [3194, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3957871310], + [3196, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 763176550], + [3198, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 919916608], + [3199, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 919916608], + [3200, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3957871310], + [3201, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 4073040612], + [3202, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 763176550], + [3203, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 667593075], + [3205, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1310972770], + [3206, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 311387795], + [3207, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 724840266], + [3208, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 2555878310], + [3209, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1781078972], + [3210, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [3213, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [3214, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1658060570], + [3215, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 3085728851], + [3216, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3129400559], + [3217, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3197516464], + [3218, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087771520], + [3219, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3837194228], + [3220, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1312323543], + [3221, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 2356847623], + [3222, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [3223, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3428073441], + [3224, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 2891080552], + [3225, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3080737172], + [3226, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 170445026], + [3227, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3240051869], + [3228, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 4266052680], + [3229, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3376297786], + [3230, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 398435913], + [3231, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 4134940256], + [3232, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 30370035], + [3233, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 2862546359], + [3234, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1901388514], + [3235, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 838864274], + [3236, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 3437460384], + [3237, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1567003152], + [3238, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2609066305], + [3239, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 4043187090], + [3240, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3866430009], + [3241, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 2182699083], + [3242, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 3958792129], + [3243, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3449926560], + [3244, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 399774089], + [3245, 121, 68, "Layout/LineLength: Line is too long. [188/120]", 2119246799], + [3247, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3592658842], + [3248, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2905723409], + [3249, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 3930305198], + [3250, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 4186230052], + [3251, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [3252, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2700200720], + [3253, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 1630526402], + [3254, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3669244926], + [3255, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2814234644], + [3256, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3109415933], + [3257, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3643275044], + [3258, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 3825290660], + [3259, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1751849111], + [3260, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 4112285398], + [3261, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 1684279672], + [3262, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 1616506266], + [3264, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [3265, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1330093223], + [3266, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 4084555566], + [3267, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 2466867154], + [3268, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 4088314613], + [3269, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 2416893689], + [3270, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 683312682], + [3271, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 2516517934], + [3272, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2414563355], + [3273, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 2232595211], + [3274, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 2940789369], + [3275, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 941259913], + [3276, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2133508098], + [3277, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1621975014], + [3278, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 35985461], + [3279, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 746016305], + [3280, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 435488100], + [3281, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 2581129172], + [3282, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 3495900774], + [3283, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1413120342], + [3284, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [3285, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2333800791], + [3286, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 2576906206], + [3287, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 2986659874], + [3288, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2811932564], + [3289, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 1970813291], + [3290, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 2904941246], + [3291, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3745922508], + [3292, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 735247237], + [3293, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3731320885], + [3294, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 3896022034], + [3295, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 2827048584], + [3296, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 2548596663], + [3297, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 3812352018], + [3298, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 1280243910], + [3299, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 1742643292], + [3300, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 3056442430], + [3301, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 3144363287], + [3302, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 477297993], + [3303, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 3657857971], + [3304, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3913984414], + [3305, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 336201058], + [3306, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 485418789], + [3307, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 453253839], + [3308, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3673833034], + [3309, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 1552836890], + [3310, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 2714635965], + [3311, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 9336999], + [3312, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 584857208], + [3313, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1394865213], + [3314, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 3973222761], + [3315, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 2020040051], + [3316, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 3060994335], + [3317, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 196286917], + [3318, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 4168514178], + [3319, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 810581246], + [3320, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 1473417372], + [3321, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 3008376885], + [3322, 121, 84, "Layout/LineLength: Line is too long. [204/120]", 454816400], + [3323, 121, 88, "Layout/LineLength: Line is too long. [208/120]", 1416223705], + [3324, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 2896813919], + [3325, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 957293983], + [3326, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 2118117430], + [3327, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 1367404612], + [3328, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 2459902188], + [3329, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 461483815], + [3330, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 2791596520], + [3331, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 203085787], + [3332, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 2942095139], + [3333, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 131861965], + [3334, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 3340827551], + [3335, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 102582610], + [3336, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 762789354], + [3337, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 3478337442], + [3338, 121, 112, "Layout/LineLength: Line is too long. [232/120]", 4010607435], + [3339, 121, 132, "Layout/LineLength: Line is too long. [252/120]", 3754747587], + [3340, 121, 136, "Layout/LineLength: Line is too long. [256/120]", 379336923], + [3341, 121, 108, "Layout/LineLength: Line is too long. [228/120]", 3366353902], + [3342, 121, 128, "Layout/LineLength: Line is too long. [248/120]", 1686898289], + [3343, 121, 132, "Layout/LineLength: Line is too long. [252/120]", 2005192241], + [3344, 121, 104, "Layout/LineLength: Line is too long. [224/120]", 1868634464], + [3345, 121, 124, "Layout/LineLength: Line is too long. [244/120]", 3939743614], + [3346, 121, 128, "Layout/LineLength: Line is too long. [248/120]", 2978506702], + [3347, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 3909866928], + [3348, 121, 118, "Layout/LineLength: Line is too long. [238/120]", 2853032177], + [3349, 121, 122, "Layout/LineLength: Line is too long. [242/120]", 2968366309], + [3350, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 1753663643], + [3351, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 3387619436], + [3352, 121, 106, "Layout/LineLength: Line is too long. [226/120]", 197895496], + [3353, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 576181861], + [3354, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 2809313444], + [3355, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 3963067112], + [3356, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 1121380327], + [3357, 121, 100, "Layout/LineLength: Line is too long. [220/120]", 31591211], + [3358, 121, 104, "Layout/LineLength: Line is too long. [224/120]", 1946129497], + [3359, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 767185096], + [3360, 121, 100, "Layout/LineLength: Line is too long. [220/120]", 1092646020], + [3361, 121, 104, "Layout/LineLength: Line is too long. [224/120]", 1328841270], + [3362, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 2663749624], + [3363, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 430318647], + [3364, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 1650234037], + [3365, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 1082269805], + [3366, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 316397809], + [3367, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 3145391348], + [3368, 121, 112, "Layout/LineLength: Line is too long. [232/120]", 2808088654], + [3369, 121, 116, "Layout/LineLength: Line is too long. [236/120]", 1035513748], + [3370, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 2552800539], + [3371, 121, 112, "Layout/LineLength: Line is too long. [232/120]", 1727699169], + [3372, 121, 116, "Layout/LineLength: Line is too long. [236/120]", 1171566267], + [3373, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 2994775049], + [3374, 121, 110, "Layout/LineLength: Line is too long. [230/120]", 3860489151], + [3375, 121, 114, "Layout/LineLength: Line is too long. [234/120]", 959496607], + [3376, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 1694222439], + [3377, 121, 114, "Layout/LineLength: Line is too long. [234/120]", 1501186331], + [3378, 121, 118, "Layout/LineLength: Line is too long. [238/120]", 4059659418], + [3379, 121, 110, "Layout/LineLength: Line is too long. [230/120]", 1899868779], + [3380, 121, 130, "Layout/LineLength: Line is too long. [250/120]", 323324279], + [3381, 121, 134, "Layout/LineLength: Line is too long. [254/120]", 3956414359], + [3382, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 3506644741], + [3383, 121, 116, "Layout/LineLength: Line is too long. [236/120]", 936139074], + [3384, 121, 136, "Layout/LineLength: Line is too long. [256/120]", 4153213512], + [3385, 121, 140, "Layout/LineLength: Line is too long. [260/120]", 1491976338], + [3386, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 4061753206], + [3387, 121, 106, "Layout/LineLength: Line is too long. [226/120]", 2410434304], + [3388, 121, 124, "Layout/LineLength: Line is too long. [244/120]", 3518300264], + [3389, 121, 144, "Layout/LineLength: Line is too long. [264/120]", 1040696046], + [3390, 121, 148, "Layout/LineLength: Line is too long. [268/120]", 139604188], + [3391, 121, 120, "Layout/LineLength: Line is too long. [240/120]", 231937793], + [3392, 121, 140, "Layout/LineLength: Line is too long. [260/120]", 1835509805], + [3393, 121, 144, "Layout/LineLength: Line is too long. [264/120]", 1629218396], + [3394, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 2312875700], + [3395, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 2933374083], + [3396, 121, 106, "Layout/LineLength: Line is too long. [226/120]", 1719349671], + [3397, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 2555579810], + [3398, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 2023551624], + [3399, 121, 114, "Layout/LineLength: Line is too long. [234/120]", 955231924], + [3400, 121, 118, "Layout/LineLength: Line is too long. [238/120]", 4232993781], + [3401, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 3472954835], + [3402, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 3211922285], + [3403, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 2874956332], + [3404, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 1360335840], + [3405, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2135379556], + [3406, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3242768475], + [3407, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 2789115918], + [3408, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3346448124], + [3409, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1538469817], + [3410, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1543041113], + [3411, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 3344741438], + [3412, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2188404009], + [3413, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1330398779], + [3414, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 332468826], + [3415, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 1905397598], + [3416, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 438831062], + [3417, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 3377667334], + [3418, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3232541734], + [3420, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2130930429], + [3421, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 3684939371], + [3423, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2361951097], + [3424, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 1211447462], + [3425, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3309872691], + [3426, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 360053761], + [3427, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 1310136493], + [3428, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1950686342], + [3429, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 1397845826], + [3430, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 4191304724], + [3431, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2354128498], + [3432, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 1865717453], + [3433, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 24220542], + [3434, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 2618612673], + [3437, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3422918867], + [3438, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3689431739], + [3482, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 4093564799], + [3488, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1662653970], + [3489, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3967501655], + [3490, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2178516622], + [3491, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 1345346561], + [3505, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193466072], + [3625, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 3612393276], + [3626, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 797303985], + [3629, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1606320605], + [3649, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1776876782], + [3653, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 828742791], + [3673, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3294617581], + [3683, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3519842846], + [3693, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1966440909], + [3694, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053864], + [3700, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1606320605], + [3723, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 1340744311], + [3742, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1741893077], + [3743, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053865], + [3747, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193405204], + [3761, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1401226501], + [3764, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085352569], + [3767, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 696523922], + [3782, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], + [3792, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2746826653], + [4208, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1138870161], + [4770, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], + [4781, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 2132299307], + [4828, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087775098], + [4839, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 757851079], + [4875, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], + [4886, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 441649198], + [4909, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087903295], + [4921, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 170442008], + [4930, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], + [4932, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1888875443], + [4969, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 398433651], + [4980, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3921367744], + [5003, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2422819473], + [5009, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 194583095], + [5015, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1901385496], + [5024, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 490810486], + [5026, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 586287746], + [5030, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1310969752], + [5050, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087389205], + [5062, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2609063547], + [5071, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], + [5073, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1370761696], + [5096, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 2208661169], + [5102, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1862604658], + [5108, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 3958789371], + [5117, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3449594464], + [5119, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 692050524], + [5123, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 802172558], + [5193, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2406691660], + [5228, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], + [5239, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1811982742], + [5266, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2562189319], + [5272, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193430346], + [5278, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2814237166], + [5287, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2189106693], + [5289, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 3874870868], + [5293, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179474914], + [5326, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1751845165], + [5337, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2617230371], + [5341, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], + [5382, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], + [5393, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3793790598], + [5428, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 4088312783], + [5439, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3220724736], + [5443, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087899888], + [5462, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2552888401], + [5468, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 194583095], + [5474, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2414559905], + [5483, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 626762179], + [5485, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3969284923], + [5489, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 1893261414], + [5521, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2133507320], + [5532, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 2101353476], + [5536, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087685705], + [5555, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2431380437], + [5561, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 194583095], + [5567, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 435489438], + [5576, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 1520878209], + [5578, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 2238995076], + [5582, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 2789405913], + [5615, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], + [5626, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3409328196], + [5649, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087858069], + [5661, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2811935086], + [5670, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], + [5672, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1113346693], + [5676, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3227128786], + [5696, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 48793812], + [5702, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 338440584], + [5708, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 735248703], + [5717, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 927473097], + [5719, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 1394536741], + [5723, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3134012967], + [5742, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 2967615316], + [5748, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 2810710931], + [5754, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 2548594701], + [5757, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860796], + [5759, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], + [5763, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3549194295], + [5765, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 1074004741], + [5769, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 2874423564], + [5772, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087576526], + [5774, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], + [5789, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 1696848307], + [5795, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 2883501659], + [5801, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 3056443076], + [5806, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193405204], + [5810, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 1487412605], + [5812, 121, 51, "Layout/LineLength: Line is too long. [171/120]", 2021571284], + [5816, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1975782995], + [5819, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860796], + [5821, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193405204], + [5826, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 183236849], + [5835, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 856018753], + [5838, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], + [5841, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 2146546324], + [5847, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3913983076], + [5850, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 3491931666], + [5852, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3536323546], + [5856, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 356581191], + [5858, 121, 63, "Layout/LineLength: Line is too long. [183/120]", 4144657639], + [5862, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 1478616653], + [5865, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1774852021], + [5867, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3536323546], + [5882, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3884289787], + [5888, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 1001503687], + [5894, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3673836976], + [5903, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 3164908550], + [5905, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 1134300778], + [5909, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1797165224], + [5928, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 2508143995], + [5934, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 3002532188], + [5940, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 584857986], + [5943, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860796], + [5945, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], + [5949, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 749691384], + [5951, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 3389354954], + [5955, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 3402045699], + [5958, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087576526], + [5960, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], + [5974, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 2447716612], + [5980, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3201685099], + [5986, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 3060990885], + [5995, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 29396315], + [5997, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 1228645365], + [6001, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1436742837], + [6020, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 716917214], + [6026, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 2175814211], + [6032, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 1473420390], + [6035, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193433391], + [6037, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1422839111], + [6041, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 1571170198], + [6043, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 2175059093], + [6047, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3886666417], + [6050, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 176753677], + [6052, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1422839111], + [6068, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 3471319495], + [6074, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 1274038477], + [6080, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 2896814693], + [6083, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087576526], + [6085, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114086530], + [6089, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 250433828], + [6091, 121, 59, "Layout/LineLength: Line is too long. [179/120]", 3910556848], + [6095, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4002014976], + [6098, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 3491931666], + [6100, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114086530], + [6194, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861664], + [6208, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087932582], + [6222, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861664], + [6238, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 876012844], + [6240, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1756764194], + [6241, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 4173216735], + [6244, 121, 75, "Layout/LineLength: Line is too long. [195/120]", 911964425], + [6245, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 173266907], + [6246, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1412705933], + [6249, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1756764194], + [6250, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 2605683750], + [6253, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 3182252139], + [6255, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1652557742], + [6259, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 2240437058], + [6260, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 173266907], + [6261, 121, 101, "Layout/LineLength: Line is too long. [221/120]", 3694598076], + [6263, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861152], + [6264, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179079542], + [6265, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 3528944411], + [6268, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3020159378], + [6270, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1652557742], + [6276, 121, 84, "Layout/LineLength: Line is too long. [204/120]", 420843234], + [6278, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1401226501], + [6279, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 442915368], + [6282, 121, 79, "Layout/LineLength: Line is too long. [199/120]", 4212444955], + [6283, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053864], + [6284, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1373660924], + [6287, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1401226501], + [6288, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 1539225758], + [6291, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3020159378], + [6293, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 4240691845], + [6297, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 674553335], + [6298, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053864], + [6299, 121, 105, "Layout/LineLength: Line is too long. [225/120]", 4163432287], + [6301, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2089555761], + [6302, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2034687276], + [6303, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 3710905302], + [6306, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 4204667212], + [6308, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 4240691845], + [6314, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 2071493433], + [6316, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085352569], + [6317, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 2853066942], + [6320, 121, 71, "Layout/LineLength: Line is too long. [191/120]", 2771467828], + [6321, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193425976], + [6322, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3025157142], + [6325, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085352569], + [6326, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 3340824101], + [6329, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 3999804761], + [6331, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1999310973], + [6335, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 835016333], + [6336, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193425976], + [6337, 121, 97, "Layout/LineLength: Line is too long. [217/120]", 3575893945], + [6340, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193405945], + [6341, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 1755858308], + [6344, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 3182252139], + [6346, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1999310973], + [6352, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 3033080032], + [6354, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177549], + [6355, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 2720985203], + [6358, 121, 65, "Layout/LineLength: Line is too long. [185/120]", 3233424320], + [6360, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873483], + [6363, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177549], + [6364, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 131859703], + [6367, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1943494546], + [6369, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 4016166830], + [6373, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 1350760977], + [6375, 121, 91, "Layout/LineLength: Line is too long. [211/120]", 4098706554], + [6379, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 4059724765], + [6382, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1651955548], + [6384, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 4016166830], + [6390, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 1057495720], + [6393, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1621971220], + [6396, 121, 49, "Layout/LineLength: Line is too long. [169/120]", 1585717593], + [6402, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 2942094233], + [6405, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2624667704], + [6407, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2317051977], + [6411, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 1321610634], + [6413, 121, 75, "Layout/LineLength: Line is too long. [195/120]", 2854688831], + [6417, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 4185465554], + [6420, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1169781875], + [6422, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2317051977], + [6428, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 1916545020], + [6431, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1422839111], + [6434, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 910134593], + [6440, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 203086561], + [6443, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2939363812], + [6445, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3155638331], + [6449, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 1955758062], + [6451, 121, 71, "Layout/LineLength: Line is too long. [191/120]", 3737424359], + [6455, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 3597620692], + [6458, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2624667704], + [6460, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3155638331], + [6466, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 1036052399], + [6469, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114086530], + [6472, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 1268266488], + [6478, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 2791598354], + [6481, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1302589368], + [6483, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3533902728], + [6487, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 3942276897], + [6489, 121, 73, "Layout/LineLength: Line is too long. [193/120]", 1175941460], + [6493, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 679697318], + [6496, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 28126263], + [6498, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3533902728], + [6499, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 181895237], + [6504, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 4057848448], + [6507, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114086530], + [6510, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 4067769399], + [6516, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 461482909], + [6519, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1302589368], + [6521, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3533902728], + [6525, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 3561204590], + [6527, 121, 73, "Layout/LineLength: Line is too long. [193/120]", 880160795], + [6531, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 1614719145], + [6534, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 28126263], + [6536, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3533902728], + [6537, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 181895237], + [6584, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193432306], + [6598, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 1645945966], + [6601, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3212740609], + [6604, 121, 59, "Layout/LineLength: Line is too long. [179/120]", 3982698123], + [6606, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193425997], + [6610, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 2663750402], + [6613, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2420297272], + [6615, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1164389943], + [6619, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 3483121581], + [6621, 121, 85, "Layout/LineLength: Line is too long. [205/120]", 2271668600], + [6625, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 804794365], + [6628, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3659367004], + [6630, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1164389943], + [6631, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 561395486], + [6636, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 1251661057], + [6639, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3212740609], + [6642, 121, 59, "Layout/LineLength: Line is too long. [179/120]", 3210109508], + [6644, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193425997], + [6648, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 430316685], + [6651, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2420297272], + [6653, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1164389943], + [6657, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 2428160226], + [6659, 121, 85, "Layout/LineLength: Line is too long. [205/120]", 2663295671], + [6663, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 2822109938], + [6666, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3659367004], + [6668, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1164389943], + [6669, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 561395486], + [6674, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 857639785], + [6677, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3669622788], + [6680, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 140453799], + [6682, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860765], + [6686, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 1650236431], + [6689, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 150699323], + [6691, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 50618962], + [6695, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 4205571164], + [6697, 121, 83, "Layout/LineLength: Line is too long. [203/120]", 1549528021], + [6701, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 1325488145], + [6704, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1510711065], + [6706, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 50618962], + [6712, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 3043205563], + [6715, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2381137493], + [6718, 121, 61, "Layout/LineLength: Line is too long. [181/120]", 2200345195], + [6720, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087926498], + [6724, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 1082269527], + [6727, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1510711065], + [6729, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1104064739], + [6733, 121, 68, "Layout/LineLength: Line is too long. [188/120]", 1652941658], + [6735, 121, 87, "Layout/LineLength: Line is too long. [207/120]", 1440323819], + [6739, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 802896260], + [6742, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1943494546], + [6744, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1104064739], + [6750, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 788730815], + [6752, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2034687276], + [6753, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 4226330106], + [6756, 121, 77, "Layout/LineLength: Line is too long. [197/120]", 2414796320], + [6757, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873470], + [6758, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3090817832], + [6761, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2034687276], + [6762, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 2839148677], + [6765, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 2393983240], + [6767, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 2581936864], + [6771, 121, 84, "Layout/LineLength: Line is too long. [204/120]", 3923254945], + [6772, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873470], + [6773, 121, 103, "Layout/LineLength: Line is too long. [223/120]", 580639726], + [6775, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193419246], + [6776, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1756764194], + [6777, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 3202758044], + [6780, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 912651721], + [6782, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 2581936864], + [6786, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1164293389], + [6799, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860840], + [6800, 121, 88, "Layout/LineLength: Line is too long. [208/120]", 574552570], + [6802, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3845073641], + [6803, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 543375177], + [6806, 121, 83, "Layout/LineLength: Line is too long. [203/120]", 222410330], + [6807, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3025157219], + [6808, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1904561434], + [6811, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 489872984], + [6812, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 97325617], + [6815, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 4204667212], + [6817, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 4062673070], + [6821, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 1451915960], + [6822, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3025157219], + [6823, 121, 109, "Layout/LineLength: Line is too long. [229/120]", 4200529758], + [6825, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1497831350], + [6826, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 4214367244], + [6827, 121, 84, "Layout/LineLength: Line is too long. [204/120]", 399603517], + [6830, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3423548875], + [6832, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 4062673070], + [6836, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3279830097], + [6848, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 659167322], + [6860, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087926423], + [6861, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 3300294193], + [6863, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3172850966], + [6864, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 2396187736], + [6867, 121, 87, "Layout/LineLength: Line is too long. [207/120]", 1991888901], + [6868, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1954380402], + [6869, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2589970962], + [6872, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 42340644], + [6873, 121, 67, "Layout/LineLength: Line is too long. [187/120]", 479235996], + [6876, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3423548875], + [6878, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1462541970], + [6882, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 1373978781], + [6883, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1954380402], + [6884, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 280641011], + [6886, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1664110553], + [6887, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1009650381], + [6888, 121, 88, "Layout/LineLength: Line is too long. [208/120]", 909329343], + [6891, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 2977589831], + [6893, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1462541970], + [6898, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873470], + [6899, 121, 61, "Layout/LineLength: Line is too long. [181/120]", 1904101094], + [6901, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2229256255], + [6902, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 1839090017], + [6905, 121, 91, "Layout/LineLength: Line is too long. [211/120]", 4260980907], + [6906, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 4253118453], + [6907, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1536690221], + [6909, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861152], + [6910, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 209824656], + [6911, 121, 71, "Layout/LineLength: Line is too long. [191/120]", 1530496074], + [6914, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 2977589831], + [6916, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3261436902], + [6920, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 3762694917], + [6921, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 4253118453], + [6922, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 3196230010], + [6924, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3165598659], + [6925, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 4264469493], + [6926, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 3140690958], + [6929, 121, 35, "Layout/LineLength: Line is too long. [155/120]", 2999583208], + [6931, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3261436902], + [6937, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 326070599], + [6940, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1621971220], + [6943, 121, 49, "Layout/LineLength: Line is too long. [169/120]", 1689000214], + [6949, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 2459904022], + [6952, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2624667704], + [6954, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2317051977], + [6958, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 2842872837], + [6960, 121, 75, "Layout/LineLength: Line is too long. [195/120]", 423884656], + [6964, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 2673769885], + [6967, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1169781875], + [6969, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2317051977], + [6970, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2126253911], + [6986, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 2388292564], + [6989, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2381137493], + [6992, 121, 61, "Layout/LineLength: Line is too long. [181/120]", 1136762660], + [6994, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087926498], + [6998, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 2555581016], + [7001, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1510711065], + [7003, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1104064739], + [7007, 121, 68, "Layout/LineLength: Line is too long. [188/120]", 1986812885], + [7009, 121, 87, "Layout/LineLength: Line is too long. [207/120]", 1864036132], + [7013, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 3590180043], + [7016, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1943494546], + [7018, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1104064739], + [7019, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2382712010], + [7029, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1791534645], + [7034, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 2403815412], + [7037, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1422839111], + [7040, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 4046048864], + [7046, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 3472955113], + [7049, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2939363812], + [7051, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3155638331], + [7055, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3911469720], + [7057, 121, 71, "Layout/LineLength: Line is too long. [191/120]", 272433263], + [7061, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 634420444], + [7064, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2624667704], + [7066, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3155638331], + [7067, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2088324682], + [7080, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087906711], + [7092, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2135380894], + [7101, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], + [7103, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 4280757685], + [7107, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 161599970], + [7141, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053789], + [7176, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2188407955], + [7187, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3692322233], + [7191, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087557694], + [7214, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3197512522], + [7223, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858840], + [7225, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 85298067], + [7282, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193418403], + [7288, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193418403], + [7311, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087432474], + [7323, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2361949763], + [7332, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], + [7334, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 581045160], + [7338, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 4235011647], + [7357, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1898147766], + [7363, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177560], + [7369, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 1310140439], + [7378, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 681770239], + [7380, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3821940657], + [7384, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], + [7404, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861292], + [7416, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2354124424], + [7425, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087922021], + [7427, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 3921370162], + [8020, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 4083054536], + [8048, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 4083054536], + [8077, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 4083054536], + [8135, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 632953222], + [8164, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 732995265], + [8214, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 1886249927], + [8376, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 578751979], + [8377, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3803540269], + [8386, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2238403955], + [8387, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1028441932], + [8388, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 1975950909], + [8443, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1244043798] + ], + "spec/integration/freeze_node_edge_cases_spec.rb:3416491031": [ + [6, 1, 28959, "Metrics/BlockLength: Block has too many lines. [663/25]", 3473768018], + [7, 3, 2985, "Metrics/BlockLength: Block has too many lines. [57/25]", 436154415], + [8, 5, 2934, "Metrics/BlockLength: Block has too many lines. [55/25]", 1963918102], + [78, 3, 6091, "Metrics/BlockLength: Block has too many lines. [136/25]", 232153494], + [98, 5, 3053, "Metrics/BlockLength: Block has too many lines. [69/25]", 1442974101], + [202, 5, 1691, "Metrics/BlockLength: Block has too many lines. [29/25]", 985654389], + [241, 3, 8515, "Metrics/BlockLength: Block has too many lines. [176/25]", 2776676526], + [473, 3, 2024, "Metrics/BlockLength: Block has too many lines. [55/25]", 1048101963], + [474, 5, 890, "Metrics/BlockLength: Block has too many lines. [26/25]", 753961540], + [543, 3, 4511, "Metrics/BlockLength: Block has too many lines. [116/25]", 1227615145], + [693, 3, 1660, "Metrics/BlockLength: Block has too many lines. [43/25]", 1881888061], + [694, 5, 1107, "Metrics/BlockLength: Block has too many lines. [26/25]", 368095693] + ], + "spec/integration/gem_family_section_merge_spec.rb:1744383089": [ + [164, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 93655697] + ], + "spec/integration/integration_spec.rb:2239247043": [ + [14, 1, 4488, "Metrics/BlockLength: Block has too many lines. [88/25]", 206207480], + [15, 3, 3267, "Metrics/BlockLength: Block has too many lines. [62/25]", 1323899085], + [40, 5, 2263, "Metrics/BlockLength: Block has too many lines. [48/25]", 3172595581] + ], + "spec/integration/link_reference_preservation_spec.rb:3764298162": [ + [6, 1, 2646, "Metrics/BlockLength: Block has too many lines. [48/25]", 3396410609], + [19, 3, 2058, "Metrics/BlockLength: Block has too many lines. [33/25]", 163363949] + ], + "spec/integration/markly_merge_spec.rb:3076950975": [ + [3, 1, 22886, "Metrics/BlockLength: Block has too many lines. [670/25]", 1408138744], + [62, 3, 7192, "Metrics/BlockLength: Block has too many lines. [189/25]", 1890889324], + [63, 5, 1678, "Metrics/BlockLength: Block has too many lines. [41/25]", 2587582896], + [115, 5, 1808, "Metrics/BlockLength: Block has too many lines. [48/25]", 3381172795], + [147, 46, 21, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 451071547], + [171, 5, 1134, "Metrics/BlockLength: Block has too many lines. [30/25]", 2526618199], + [220, 5, 1335, "Metrics/BlockLength: Block has too many lines. [32/25]", 2790596215], + [311, 3, 2008, "Metrics/BlockLength: Block has too many lines. [66/25]", 2640155627], + [394, 3, 1052, "Metrics/BlockLength: Block has too many lines. [27/25]", 3988836255], + [440, 3, 2950, "Metrics/BlockLength: Block has too many lines. [89/25]", 961031348], + [441, 5, 1352, "Metrics/BlockLength: Block has too many lines. [37/25]", 1952365669], + [495, 5, 1550, "Metrics/BlockLength: Block has too many lines. [48/25]", 2400197001], + [561, 3, 1665, "Metrics/BlockLength: Block has too many lines. [52/25]", 3884776329], + [650, 3, 1919, "Metrics/BlockLength: Block has too many lines. [57/25]", 2594646583], + [725, 3, 1644, "Metrics/BlockLength: Block has too many lines. [45/25]", 2348710811], + [791, 3, 1600, "Metrics/BlockLength: Block has too many lines. [46/25]", 3683503747] + ], + "spec/integration/partial_template_merger_table_merge_spec.rb:3504046892": [ + [7, 1, 7402, "Metrics/BlockLength: Block has too many lines. [164/25]", 3368892126], + [9, 3, 2986, "Metrics/BlockLength: Block has too many lines. [67/25]", 2267114449], + [65, 5, 1359, "Metrics/BlockLength: Block has too many lines. [28/25]", 3145143002], + [102, 3, 997, "Metrics/BlockLength: Block has too many lines. [26/25]", 3156068215], + [147, 3, 3009, "Metrics/BlockLength: Block has too many lines. [65/25]", 994160212], + [202, 5, 1401, "Metrics/BlockLength: Block has too many lines. [28/25]", 3038951618] + ], + "spec/integration/table_formatting_preservation_spec.rb:3943985446": [ + [6, 1, 3086, "Metrics/BlockLength: Block has too many lines. [56/25]", 2210897849], + [19, 3, 2374, "Metrics/BlockLength: Block has too many lines. [40/25]", 668961519], + [33, 5, 1847, "Metrics/BlockLength: Block has too many lines. [28/25]", 3433318963] + ], + "spec/integration/text_merge_spec.rb:884566200": [ + [6, 1, 7747, "Metrics/BlockLength: Block has too many lines. [204/25]", 2372984305], + [60, 3, 1113, "Metrics/BlockLength: Block has too many lines. [34/25]", 3399970957], + [67, 5, 860, "Metrics/BlockLength: Block has too many lines. [27/25]", 2337191560], + [103, 3, 916, "Metrics/BlockLength: Block has too many lines. [28/25]", 4082963348], + [149, 3, 3001, "Metrics/BlockLength: Block has too many lines. [74/25]", 7776854] + ], + "spec/support/fictive_language_harness.rb:1770581700": [ + [85, 7, 733, "Metrics/AbcSize: Assignment Branch Condition size for `extract_comments` is too high. [<5, 16, 5> 17.49/17]", 1127096515], + [85, 7, 733, "Metrics/MethodLength: Method has too many lines. [22/10]", 1127096515], + [117, 21, 129, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 681912759], + [182, 7, 1084, "Metrics/AbcSize: Assignment Branch Condition size for `parse_statements` is too high. [<9, 28, 7> 30.23/17]", 3123785685], + [182, 7, 1084, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_statements` is too high. [8/7]", 3123785685], + [182, 7, 1084, "Metrics/MethodLength: Method has too many lines. [24/10]", 3123785685], + [233, 5, 9879, "Metrics/ClassLength: Class has too many lines. [228/100]", 3231256134], + [236, 21, 208, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2970487173], + [257, 7, 1981, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_batch` is too high. [<16, 32, 4> 36/17]", 4125392918], + [257, 7, 1981, "Metrics/MethodLength: Method has too many lines. [42/10]", 4125392918], + [342, 7, 778, "Metrics/MethodLength: Method has too many lines. [18/10]", 4189873983], + [364, 7, 844, "Metrics/MethodLength: Method has too many lines. [19/10]", 526186683], + [449, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087956942], + [464, 7, 1065, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_template_preamble_prefix_region` is too high. [<6, 24, 11> 27.07/17]", 2332280467], + [464, 7, 1065, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collapse_template_preamble_prefix_region` is too high. [10/7]", 2332280467], + [464, 7, 1065, "Metrics/MethodLength: Method has too many lines. [20/10]", 2332280467], + [464, 7, 1065, "Metrics/PerceivedComplexity: Perceived complexity for `collapse_template_preamble_prefix_region` is too high. [10/8]", 2332280467] + ], + "spec/support/testable_node.rb:1110514732": [ + [10, 7, 573, "Metrics/MethodLength: Method has too many lines. [12/10]", 798847435], + [10, 22, 226, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 2319398994], + [40, 7, 642, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<11, 14, 6> 18.79/17]", 2249578474], + [40, 21, 131, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 1786967686] + ] +} diff --git a/gems/dotenv-merge/Gemfile.lock b/gems/dotenv-merge/Gemfile.lock index 45ff65026..7ccf39f28 100644 --- a/gems/dotenv-merge/Gemfile.lock +++ b/gems/dotenv-merge/Gemfile.lock @@ -17,39 +17,7 @@ PATH version_gem (~> 1.1, >= 1.1.14) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -58,193 +26,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -252,45 +34,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -310,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -324,6 +61,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -379,6 +117,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -397,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -537,23 +283,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -587,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -618,7 +361,7 @@ GEM yard yard-relative_markdown_links (0.6.0) nokogiri (>= 1.14.3, < 2) - yard-timekeeper (0.2.3) + yard-timekeeper (0.2.4) version_gem (~> 1.1, >= 1.1.13) yard-yaml (0.2.3) version_gem (~> 1.1, >= 1.1.13) @@ -638,45 +381,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.2, >= 3.2.0) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.3, >= 2.3.7) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,61 +407,40 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.2, >= 3.2.0) - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -753,27 +454,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +481,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +492,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,19 +519,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -857,27 +543,21 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd yard-relative_markdown_links (0.6.0) sha256=3e5ffa85cbad9bac70bee5421774b190fb25d3bdf489323a5b3534f647d1a70e - yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 + yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/rbs-merge/lib/rbs/merge/version.rb b/gems/rbs-merge/lib/rbs/merge/version.rb index 8e09fbec5..a96a21ddc 100644 --- a/gems/rbs-merge/lib/rbs/merge/version.rb +++ b/gems/rbs-merge/lib/rbs/merge/version.rb @@ -3,7 +3,7 @@ module Rbs module Merge module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/rbs-merge/rbs-merge.gemspec b/gems/rbs-merge/rbs-merge.gemspec index a1b1ea2c8..4d53cd680 100644 --- a/gems/rbs-merge/rbs-merge.gemspec +++ b/gems/rbs-merge/rbs-merge.gemspec @@ -9,47 +9,47 @@ Gem::Specification.new do |spec| spec.name = 'rbs-merge' spec.version = Module.new.tap { |mod| Kernel.load("#{__dir__}/lib/rbs/merge/version.rb", mod) }::Rbs::Merge::Version::VERSION - spec.authors = ["Peter H. Boling"] - spec.email = ["floss@galtzo.com"] + spec.authors = ['Peter H. Boling'] + spec.email = ['floss@galtzo.com'] spec.summary = '☯️ Structured Merge RBS analysis and merge for Ruby' spec.description = '☯️ RBS declaration, comment, freeze-block, and template merge behavior for Structured Merge.' spec.homepage = 'https://github.com/structuredmerge/structuredmerge-ruby' - spec.licenses = ["AGPL-3.0-only", "PolyForm-Small-Business-1.0.0"] - spec.required_ruby_version = ">= 4.0.0" + spec.licenses = ['AGPL-3.0-only', 'PolyForm-Small-Business-1.0.0'] + spec.required_ruby_version = '>= 4.0.0' # 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") - user_cert = "certs/#{ENV.fetch("GEM_CERT_USER", ENV["USER"])}.pem" + unless ENV.include?('SKIP_GEM_SIGNING') + user_cert = "certs/#{ENV.fetch('GEM_CERT_USER', ENV['USER'])}.pem" cert_file_path = File.join(__dir__, user_cert) - cert_chain = cert_file_path.split(",") + cert_chain = cert_file_path.split(',') cert_chain.select! { |fp| File.exist?(fp) } if cert_file_path && cert_chain.any? spec.cert_chain = cert_chain - if $PROGRAM_NAME.end_with?("gem") && ARGV[0] == "build" - spec.signing_key = File.join(Gem.user_home, ".ssh", "gem-private_key.pem") + if $PROGRAM_NAME.end_with?('gem') && ARGV[0] == 'build' + spec.signing_key = File.join(Gem.user_home, '.ssh', 'gem-private_key.pem') end end end - spec.metadata["homepage_uri"] = "https://structuredmerge.org" - spec.metadata["source_code_uri"] = "#{spec.homepage}/tree/v#{spec.version}" - spec.metadata["changelog_uri"] = "#{spec.homepage}/blob/v#{spec.version}/CHANGELOG.md" - spec.metadata["bug_tracker_uri"] = "#{spec.homepage}/issues" - spec.metadata["documentation_uri"] = "https://www.rubydoc.info/gems/#{spec.name}/#{spec.version}" - spec.metadata["funding_uri"] = "https://github.com/sponsors/pboling" - spec.metadata["wiki_uri"] = "#{spec.homepage}/wiki" - spec.metadata["news_uri"] = "https://www.railsbling.com/tags/#{spec.name}" - spec.metadata["discord_uri"] = "https://discord.gg/3qme4XHNKN" - spec.metadata["rubygems_mfa_required"] = "true" + spec.metadata['homepage_uri'] = 'https://structuredmerge.org' + spec.metadata['source_code_uri'] = "#{spec.homepage}/tree/v#{spec.version}" + spec.metadata['changelog_uri'] = "#{spec.homepage}/blob/v#{spec.version}/CHANGELOG.md" + spec.metadata['bug_tracker_uri'] = "#{spec.homepage}/issues" + spec.metadata['documentation_uri'] = "https://www.rubydoc.info/gems/#{spec.name}/#{spec.version}" + spec.metadata['funding_uri'] = 'https://github.com/sponsors/pboling' + spec.metadata['wiki_uri'] = "#{spec.homepage}/wiki" + spec.metadata['news_uri'] = "https://www.railsbling.com/tags/#{spec.name}" + spec.metadata['discord_uri'] = 'https://discord.gg/3qme4XHNKN' + spec.metadata['rubygems_mfa_required'] = 'true' enumerate_package_files = lambda do |root| - Dir.glob(File.join(root, "**", "*"), File::FNM_DOTMATCH).select do |path| - File.file?(path) && ![".", ".."].include?(File.basename(path)) + Dir.glob(File.join(root, '**', '*'), File::FNM_DOTMATCH).select do |path| + File.file?(path) && !['.', '..'].include?(File.basename(path)) end end package_metadata_files = %w[ @@ -69,17 +69,17 @@ Gem::Specification.new do |spec| *enumerate_package_files.call('exe') ] spec.rdoc_options += [ - "--title", + '--title', "#{spec.name} - #{spec.summary}", - "--main", - "README.md", - "--exclude", - "^sig/", - "--line-numbers", - "--inline-source", - "--quiet" + '--main', + 'README.md', + '--exclude', + '^sig/', + '--line-numbers', + '--inline-source', + '--quiet' ] - spec.bindir = "exe" + spec.bindir = 'exe' # Listed files are the relative paths from bindir above. spec.executables = [] @@ -89,13 +89,13 @@ Gem::Specification.new do |spec| # rbs-merge will then preserve content between those markers across template runs. # kettle-jem:unfreeze - spec.require_paths = ["lib"] + spec.require_paths = ['lib'] # Utilities spec.add_dependency 'ast-merge', "= #{spec.version}" spec.add_dependency 'rbs', '>= 3.10' spec.add_dependency 'tree_haver', "= #{spec.version}" - spec.add_dependency("version_gem", "~> 1.1", ">= 1.1.14") # ruby >= 2.2.0 + spec.add_dependency('version_gem', '~> 1.1', '>= 1.1.14') # ruby >= 2.2.0 # NOTE: It is preferable to list development dependencies in the gemspec due to increased # visibility and discoverability. @@ -111,27 +111,26 @@ Gem::Specification.new do |spec| # and preferably a modular one (see gemfiles/modular/*.gemfile). # Dev, Test, & Release Tasks - spec.add_development_dependency("kettle-dev", "~> 2.3", ">= 2.3.7") # ruby >= 4.0.0 + spec.add_development_dependency('kettle-dev', '~> 2.3', '>= 2.3.7') # ruby >= 4.0.0 # Security - spec.add_development_dependency("bundler-audit", "~> 0.9.3") # ruby >= 2.0.0 + spec.add_development_dependency('bundler-audit', '~> 0.9.3') # ruby >= 2.0.0 # Tasks - spec.add_development_dependency("rake", "~> 13.0") # ruby >= 2.2.0 + spec.add_development_dependency('rake', '~> 13.0') # ruby >= 2.2.0 # Debugging - spec.add_development_dependency("require_bench", "~> 1.0", ">= 1.0.4") # ruby >= 2.2.0 + spec.add_development_dependency('require_bench', '~> 1.0', '>= 1.0.4') # ruby >= 2.2.0 # Testing - spec.add_development_dependency("appraisal2", "~> 3.2", ">= 3.2.0") # ruby >= 1.8.7, for testing against multiple versions of dependencies - spec.add_development_dependency("kettle-test", "~> 2.0", ">= 2.0.11") # ruby >= 4.0.0 - spec.add_development_dependency("turbo_tests2", "~> 3.2", ">= 3.2.0") # ruby >= 2.4.0, default kettle-test runner + spec.add_development_dependency('appraisal2', '~> 3.2', '>= 3.2.0') # ruby >= 1.8.7, for testing against multiple versions of dependencies + spec.add_development_dependency('kettle-test', '~> 2.0', '>= 2.0.11') # ruby >= 4.0.0 + spec.add_development_dependency('turbo_tests2', '~> 3.2', '>= 3.2.0') # ruby >= 2.4.0, default kettle-test runner # Releasing - spec.add_development_dependency("ruby-progressbar", "~> 1.13") # ruby >= 0 - spec.add_development_dependency("stone_checksums", "~> 1.0", ">= 1.0.6") # ruby >= 2.2.0 + spec.add_development_dependency('ruby-progressbar', '~> 1.13') # ruby >= 0 + spec.add_development_dependency('stone_checksums', '~> 1.0', '>= 1.0.6') # ruby >= 2.2.0 # 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.4") # ruby >= 2.4 - + spec.add_development_dependency('gitmoji-regex', '~> 2.0', '>= 2.0.4') # ruby >= 2.4 end From ae60c81a731d67996315d851a2d9b9a8cf326360 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:26:58 -0600 Subject: [PATCH 227/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-merge/Gemfile.lock | 390 ++------------------------ gems/bash-merge/Gemfile.lock | 30 +- gems/rbs-merge/.rubocop_gradual.lock | 401 +++++++++++++++++++++++++++ 3 files changed, 441 insertions(+), 380 deletions(-) create mode 100644 gems/rbs-merge/.rubocop_gradual.lock diff --git a/gems/ast-merge/Gemfile.lock b/gems/ast-merge/Gemfile.lock index 40333e45c..41470ced4 100644 --- a/gems/ast-merge/Gemfile.lock +++ b/gems/ast-merge/Gemfile.lock @@ -18,233 +18,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -252,45 +26,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -310,12 +45,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -324,6 +53,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -379,6 +109,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -397,7 +136,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -537,23 +275,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -587,11 +327,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -618,7 +353,7 @@ GEM yard yard-relative_markdown_links (0.6.0) nokogiri (>= 1.14.3, < 2) - yard-timekeeper (0.2.3) + yard-timekeeper (0.2.4) version_gem (~> 1.1, >= 1.1.13) yard-yaml (0.2.3) version_gem (~> 1.1, >= 1.1.13) @@ -638,45 +373,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,61 +398,39 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +443,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +470,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +481,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,19 +508,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,27 +532,21 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd yard-relative_markdown_links (0.6.0) sha256=3e5ffa85cbad9bac70bee5421774b190fb25d3bdf489323a5b3534f647d1a70e - yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 + yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/bash-merge/Gemfile.lock b/gems/bash-merge/Gemfile.lock index 4e3352a41..fad17160e 100644 --- a/gems/bash-merge/Gemfile.lock +++ b/gems/bash-merge/Gemfile.lock @@ -16,24 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -45,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -335,6 +322,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,7 +373,6 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.2, >= 3.2.0) - ast-merge! bash-merge! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) @@ -411,7 +402,6 @@ DEPENDENCIES standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) - tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.2, >= 3.2.0) yaml-converter (~> 0.1) diff --git a/gems/rbs-merge/.rubocop_gradual.lock b/gems/rbs-merge/.rubocop_gradual.lock new file mode 100644 index 000000000..91b839368 --- /dev/null +++ b/gems/rbs-merge/.rubocop_gradual.lock @@ -0,0 +1,401 @@ +{ + ".simplecov:2483172942": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:3295679373": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/rbs-merge.rb:334311121": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`rbs-merge.rb`) should use snake_case.", 5381], + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "lib/rbs/merge.rb:1873081658": [ + [17, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Rbs::Merge`.", 2866359175], + [103, 7, 1197, "Metrics/MethodLength: Method has too many lines. [22/10]", 564456261] + ], + "lib/rbs/merge/backends/rbs_backend.rb:2885387755": [ + [48, 11, 555, "Metrics/MethodLength: Method has too many lines. [13/10]", 2078142514], + [81, 11, 658, "Metrics/MethodLength: Method has too many lines. [11/10]", 324484142], + [172, 11, 527, "Metrics/MethodLength: Method has too many lines. [14/10]", 631898529], + [240, 15, 11, "Naming/PredicatePrefix: Rename `has_errors?` to `errors?`.", 1181419252], + [263, 9, 9332, "Metrics/ClassLength: Class has too many lines. [135/100]", 1906483935], + [290, 11, 1914, "Metrics/AbcSize: Assignment Branch Condition size for `type` is too high. [<0, 9, 23> 24.7/17]", 3636991776], + [290, 11, 1914, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `type` is too high. [24/7]", 3636991776], + [290, 11, 1914, "Metrics/MethodLength: Method has too many lines. [28/10]", 3636991776], + [363, 11, 489, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `end_point` is too high. [8/7]", 844861810], + [504, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] + ], + "lib/rbs/merge/comment_tracker.rb:1938176986": [ + [28, 7, 767, "Metrics/MethodLength: Method has too many lines. [15/10]", 752916075], + [60, 7, 416, "Metrics/MethodLength: Method has too many lines. [12/10]", 2715172162] + ], + "lib/rbs/merge/conflict_resolver.rb:1305396962": [ + [16, 5, 11045, "Metrics/ClassLength: Class has too many lines. [174/100]", 330576807], + [44, 7, 1614, "Metrics/MethodLength: Method has too many lines. [23/10]", 1004723330], + [44, 45, 14, "Lint/UnusedMethodArgument: Unused method argument - `template_index`.", 1809801172], + [44, 62, 10, "Lint/UnusedMethodArgument: Unused method argument - `dest_index`.", 2703999490], + [122, 7, 717, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `resolve_preference` is too high. [8/7]", 2783267415], + [122, 7, 717, "Metrics/MethodLength: Method has too many lines. [12/10]", 2783267415], + [156, 7, 949, "Metrics/AbcSize: Assignment Branch Condition size for `extract_declaration_text` is too high. [<9, 19, 14> 25.26/17]", 4132302840], + [156, 7, 949, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_declaration_text` is too high. [13/7]", 4132302840], + [156, 7, 949, "Metrics/MethodLength: Method has too many lines. [18/10]", 4132302840], + [156, 7, 949, "Metrics/PerceivedComplexity: Perceived complexity for `extract_declaration_text` is too high. [14/8]", 4132302840], + [181, 39, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [279, 7, 565, "Metrics/MethodLength: Method has too many lines. [13/10]", 375776463], + [279, 11, 12, "Naming/PredicatePrefix: Rename `has_members?` to `members?`.", 496913372] + ], + "lib/rbs/merge/file_aligner.rb:157117932": [ + [32, 7, 128, "Lint/UselessMethodDefinition: Useless method definition detected.", 4031328363] + ], + "lib/rbs/merge/file_analysis.rb:4205990536": [ + [23, 5, 20642, "Metrics/ClassLength: Class has too many lines. [403/100]", 3271819659], + [59, 7, 1146, "Metrics/MethodLength: Method has too many lines. [20/10]", 1625645012], + [191, 7, 398, "Metrics/MethodLength: Method has too many lines. [12/10]", 4157341657], + [211, 7, 719, "Metrics/MethodLength: Method has too many lines. [13/10]", 2571132513], + [235, 7, 965, "Metrics/AbcSize: Assignment Branch Condition size for `compute_tree_sitter_signature` is too high. [<3, 5, 21> 21.79/17]", 2963702282], + [235, 7, 965, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_tree_sitter_signature` is too high. [22/7]", 2963702282], + [235, 7, 965, "Metrics/MethodLength: Method has too many lines. [26/10]", 2963702282], + [235, 7, 965, "Metrics/PerceivedComplexity: Perceived complexity for `compute_tree_sitter_signature` is too high. [16/8]", 2963702282], + [269, 7, 996, "Metrics/AbcSize: Assignment Branch Condition size for `extract_tree_sitter_node_name` is too high. [<5, 16, 10> 19.52/17]", 300940102], + [269, 7, 996, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_tree_sitter_node_name` is too high. [11/7]", 300940102], + [269, 7, 996, "Metrics/MethodLength: Method has too many lines. [24/10]", 300940102], + [269, 7, 996, "Metrics/PerceivedComplexity: Perceived complexity for `extract_tree_sitter_node_name` is too high. [11/8]", 300940102], + [320, 7, 834, "Metrics/MethodLength: Method has too many lines. [16/10]", 658496547], + [380, 7, 1612, "Metrics/AbcSize: Assignment Branch Condition size for `extract_tree_sitter_declarations` is too high. [<8, 18, 11> 22.56/17]", 1899595676], + [380, 7, 1612, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_tree_sitter_declarations` is too high. [10/7]", 1899595676], + [380, 7, 1612, "Metrics/MethodLength: Method has too many lines. [23/10]", 1899595676], + [380, 7, 1612, "Metrics/PerceivedComplexity: Perceived complexity for `extract_tree_sitter_declarations` is too high. [11/8]", 1899595676], + [449, 7, 569, "Metrics/MethodLength: Method has too many lines. [13/10]", 210550095], + [471, 7, 1133, "Metrics/AbcSize: Assignment Branch Condition size for `build_freeze_blocks` is too high. [<7, 22, 6> 23.85/17]", 4016218974], + [471, 7, 1133, "Metrics/MethodLength: Method has too many lines. [29/10]", 4016218974], + [528, 7, 486, "Metrics/MethodLength: Method has too many lines. [12/10]", 618123864], + [528, 7, 486, "Metrics/PerceivedComplexity: Perceived complexity for `node_start_line` is too high. [9/8]", 618123864], + [545, 7, 472, "Metrics/MethodLength: Method has too many lines. [12/10]", 1339916888], + [545, 7, 472, "Metrics/PerceivedComplexity: Perceived complexity for `node_end_line` is too high. [9/8]", 1339916888], + [579, 7, 1868, "Metrics/AbcSize: Assignment Branch Condition size for `compute_rbs_gem_signature` is too high. [<0, 45, 23> 50.54/17]", 2652509672], + [579, 7, 1868, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_rbs_gem_signature` is too high. [23/7]", 2652509672], + [579, 7, 1868, "Metrics/MethodLength: Method has too many lines. [43/10]", 2652509672], + [579, 7, 1868, "Metrics/PerceivedComplexity: Perceived complexity for `compute_rbs_gem_signature` is too high. [9/8]", 2652509672] + ], + "lib/rbs/merge/freeze_node.rb:2942544870": [ + [34, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 201145846], + [39, 7, 577, "Metrics/MethodLength: Method has too many lines. [11/10]", 2189574632], + [39, 21, 186, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1006469938], + [78, 7, 1506, "Metrics/AbcSize: Assignment Branch Condition size for `validate_structure!` is too high. [<12, 12, 17> 24.02/17]", 1543687562], + [78, 7, 1506, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_structure!` is too high. [12/7]", 1543687562], + [78, 7, 1506, "Metrics/MethodLength: Method has too many lines. [25/10]", 1543687562], + [78, 7, 1506, "Metrics/PerceivedComplexity: Perceived complexity for `validate_structure!` is too high. [12/8]", 1543687562], + [150, 7, 891, "Metrics/AbcSize: Assignment Branch Condition size for `extract_node_name` is too high. [<4, 21, 12> 24.52/17]", 1223188123], + [150, 7, 891, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_node_name` is too high. [13/7]", 1223188123], + [150, 7, 891, "Metrics/MethodLength: Method has too many lines. [18/10]", 1223188123], + [150, 7, 891, "Metrics/PerceivedComplexity: Perceived complexity for `extract_node_name` is too high. [13/8]", 1223188123], + [162, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861336] + ], + "lib/rbs/merge/merge_result.rb:1707720872": [ + [18, 5, 15586, "Metrics/ClassLength: Class has too many lines. [276/100]", 817348545], + [89, 7, 966, "Metrics/MethodLength: Method has too many lines. [14/10]", 3349669346], + [176, 7, 1770, "Metrics/AbcSize: Assignment Branch Condition size for `extract_lines` is too high. [<15, 21, 16> 30.36/17]", 3951991352], + [176, 7, 1770, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_lines` is too high. [15/7]", 3951991352], + [176, 7, 1770, "Metrics/MethodLength: Method has too many lines. [29/10]", 3951991352], + [176, 7, 1770, "Metrics/PerceivedComplexity: Perceived complexity for `extract_lines` is too high. [16/8]", 3951991352], + [226, 44, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [232, 7, 606, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trailing_lines_for` is too high. [9/7]", 518209980], + [232, 7, 606, "Metrics/MethodLength: Method has too many lines. [13/10]", 518209980], + [232, 7, 606, "Metrics/PerceivedComplexity: Perceived complexity for `trailing_lines_for` is too high. [10/8]", 518209980], + [233, 47, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [266, 33, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [271, 7, 682, "Metrics/AbcSize: Assignment Branch Condition size for `deduplicate_leading_comment_overlap` is too high. [<4, 15, 9> 17.94/17]", 4227245480], + [271, 7, 682, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `deduplicate_leading_comment_overlap` is too high. [8/7]", 4227245480], + [271, 7, 682, "Metrics/MethodLength: Method has too many lines. [11/10]", 4227245480], + [335, 23, 24, "Style/SafeNavigation: Use safe navigation (`&.`) instead of checking if an object exists before calling the method.", 1487466207], + [371, 7, 893, "Metrics/MethodLength: Method has too many lines. [11/10]", 1066420963], + [371, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 2582953496] + ], + "lib/rbs/merge/node_type_normalizer.rb:2788764230": [ + [65, 5, 10747, "Metrics/ModuleLength: Module has too many lines. [199/100]", 63560324], + [250, 9, 693, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonical_type_for_node` is too high. [9/7]", 908800634], + [250, 9, 693, "Metrics/MethodLength: Method has too many lines. [16/10]", 908800634], + [250, 9, 693, "Metrics/PerceivedComplexity: Perceived complexity for `canonical_type_for_node` is too high. [9/8]", 908800634], + [323, 9, 689, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `refine_tree_sitter_attribute_type` is too high. [9/7]", 2340352499], + [323, 9, 689, "Metrics/MethodLength: Method has too many lines. [13/10]", 2340352499], + [323, 9, 689, "Metrics/PerceivedComplexity: Perceived complexity for `refine_tree_sitter_attribute_type` is too high. [9/8]", 2340352499], + [343, 9, 475, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `refine_tree_sitter_variable_type` is too high. [8/7]", 536330497], + [343, 9, 475, "Metrics/MethodLength: Method has too many lines. [14/10]", 536330497] + ], + "lib/rbs/merge/node_wrapper.rb:1434186839": [ + [26, 5, 14933, "Metrics/ClassLength: Class has too many lines. [344/100]", 4139761414], + [37, 17, 84, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 366036293], + [264, 7, 831, "Metrics/AbcSize: Assignment Branch Condition size for `text` is too high. [<3, 32, 20> 37.85/17]", 980238327], + [264, 7, 831, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `text` is too high. [18/7]", 980238327], + [264, 7, 831, "Metrics/MethodLength: Method has too many lines. [18/10]", 980238327], + [264, 7, 831, "Metrics/PerceivedComplexity: Perceived complexity for `text` is too high. [20/8]", 980238327], + [268, 47, 2, "Lint/SafeNavigationConsistency: Use `.` instead of unnecessary `&.`.", 5858765], + [280, 22, 14, "Style/NumericPredicate: Use `start_line.positive?` instead of `start_line > 0`.", 792111162], + [301, 7, 1209, "Metrics/AbcSize: Assignment Branch Condition size for `signature` is too high. [<1, 25, 20> 32.03/17]", 4281557215], + [301, 7, 1209, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `signature` is too high. [21/7]", 4281557215], + [301, 7, 1209, "Metrics/MethodLength: Method has too many lines. [45/10]", 4281557215], + [351, 7, 384, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `method_kind` is too high. [8/7]", 563626808], + [351, 7, 384, "Metrics/PerceivedComplexity: Perceived complexity for `method_kind` is too high. [9/8]", 563626808], + [423, 7, 935, "Metrics/MethodLength: Method has too many lines. [21/10]", 3557799127], + [469, 7, 667, "Metrics/AbcSize: Assignment Branch Condition size for `extract_child_texts` is too high. [<6, 16, 8> 18.87/17]", 1979652559], + [469, 7, 667, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_child_texts` is too high. [9/7]", 1979652559], + [469, 7, 667, "Metrics/MethodLength: Method has too many lines. [12/10]", 1979652559], + [469, 7, 667, "Metrics/PerceivedComplexity: Perceived complexity for `extract_child_texts` is too high. [9/8]", 1979652559], + [487, 7, 583, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_tree_sitter_visibility_kind` is too high. [9/7]", 2002684122], + [487, 7, 583, "Metrics/MethodLength: Method has too many lines. [13/10]", 2002684122], + [487, 7, 583, "Metrics/PerceivedComplexity: Perceived complexity for `extract_tree_sitter_visibility_kind` is too high. [9/8]", 2002684122], + [532, 7, 557, "Metrics/MethodLength: Method has too many lines. [14/10]", 1753294094] + ], + "lib/rbs/merge/smart_merger.rb:4114819804": [ + [43, 5, 38956, "Metrics/ClassLength: Class has too many lines. [785/100]", 3732361716], + [85, 7, 1188, "Metrics/MethodLength: Method has too many lines. [17/10]", 2908064588], + [85, 21, 447, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 1344979847], + [181, 7, 805, "Metrics/AbcSize: Assignment Branch Condition size for `perform_merge` is too high. [<6, 15, 8> 18.03/17]", 1638854701], + [181, 7, 805, "Metrics/MethodLength: Method has too many lines. [14/10]", 1638854701], + [207, 7, 572, "Metrics/MethodLength: Method has too many lines. [15/10]", 3471574631], + [290, 7, 621, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `root_boundary_lines_for` is too high. [9/7]", 354795708], + [290, 7, 621, "Metrics/PerceivedComplexity: Perceived complexity for `root_boundary_lines_for` is too high. [9/8]", 354795708], + [291, 34, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [323, 9, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 748374760], + [326, 7, 794, "Metrics/AbcSize: Assignment Branch Condition size for `root_boundary_range` is too high. [<4, 22, 11> 24.92/17]", 2546634651], + [326, 7, 794, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `root_boundary_range` is too high. [10/7]", 2546634651], + [326, 7, 794, "Metrics/MethodLength: Method has too many lines. [19/10]", 2546634651], + [326, 7, 794, "Metrics/PerceivedComplexity: Perceived complexity for `root_boundary_range` is too high. [11/8]", 2546634651], + [365, 7, 1030, "Metrics/AbcSize: Assignment Branch Condition size for `process_match` is too high. [<1, 22, 7> 23.11/17]", 333057092], + [365, 7, 1030, "Metrics/MethodLength: Method has too many lines. [27/10]", 333057092], + [428, 7, 1830, "Metrics/AbcSize: Assignment Branch Condition size for `removed_declaration_comment_lines` is too high. [<13, 31, 25> 41.89/17]", 276966259], + [428, 7, 1830, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `removed_declaration_comment_lines` is too high. [21/7]", 276966259], + [428, 7, 1830, "Metrics/MethodLength: Method has too many lines. [38/10]", 276966259], + [428, 7, 1830, "Metrics/PerceivedComplexity: Perceived complexity for `removed_declaration_comment_lines` is too high. [24/8]", 276966259], + [476, 7, 675, "Metrics/MethodLength: Method has too many lines. [13/10]", 1415352570], + [502, 7, 2604, "Metrics/AbcSize: Assignment Branch Condition size for `reconstruct_declaration_with_merged_members` is too high. [<19, 23, 22> 37.07/17]", 1250076424], + [502, 7, 2604, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `reconstruct_declaration_with_merged_members` is too high. [17/7]", 1250076424], + [502, 7, 2604, "Metrics/MethodLength: Method has too many lines. [49/10]", 1250076424], + [502, 7, 2604, "Metrics/PerceivedComplexity: Perceived complexity for `reconstruct_declaration_with_merged_members` is too high. [17/8]", 1250076424], + [540, 20, 46, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 1375387925], + [555, 9, 210, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 3589424565], + [565, 7, 1271, "Metrics/AbcSize: Assignment Branch Condition size for `recursive_body_lines_for_declaration` is too high. [<8, 23, 9> 25.96/17]", 2123349984], + [565, 7, 1271, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `recursive_body_lines_for_declaration` is too high. [10/7]", 2123349984], + [565, 7, 1271, "Metrics/MethodLength: Method has too many lines. [18/10]", 2123349984], + [565, 7, 1271, "Metrics/PerceivedComplexity: Perceived complexity for `recursive_body_lines_for_declaration` is too high. [10/8]", 2123349984], + [565, 47, 139, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 652517575], + [591, 7, 1910, "Metrics/AbcSize: Assignment Branch Condition size for `merge_member_lines` is too high. [<4, 35, 12> 37.22/17]", 1631109354], + [591, 7, 1910, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_member_lines` is too high. [11/7]", 1631109354], + [591, 7, 1910, "Metrics/MethodLength: Method has too many lines. [42/10]", 1631109354], + [592, 9, 1837, "Metrics/BlockLength: Block has too many lines. [40/25]", 3339652106], + [638, 7, 1779, "Metrics/AbcSize: Assignment Branch Condition size for `align_member_lists` is too high. [<14, 26, 14> 32.68/17]", 3585753868], + [638, 7, 1779, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `align_member_lists` is too high. [14/7]", 3585753868], + [638, 7, 1779, "Metrics/MethodLength: Method has too many lines. [49/10]", 3585753868], + [638, 7, 1779, "Metrics/PerceivedComplexity: Perceived complexity for `align_member_lists` is too high. [15/8]", 3585753868], + [745, 7, 605, "Metrics/AbcSize: Assignment Branch Condition size for `split_top_level_return_type` is too high. [<7, 14, 10> 18.57/17]", 1731525207], + [745, 7, 605, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split_top_level_return_type` is too high. [8/7]", 1731525207], + [745, 7, 605, "Metrics/MethodLength: Method has too many lines. [17/10]", 1731525207], + [782, 7, 1684, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_statement_lines_with_leading_comments` is too high. [8/7]", 3625004207], + [782, 7, 1684, "Metrics/MethodLength: Method has too many lines. [29/10]", 3625004207], + [782, 7, 1684, "Metrics/PerceivedComplexity: Perceived complexity for `extract_statement_lines_with_leading_comments` is too high. [10/8]", 3625004207], + [869, 33, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [874, 7, 840, "Metrics/MethodLength: Method has too many lines. [15/10]", 3400690599], + [895, 39, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [982, 23, 24, "Style/SafeNavigation: Use safe navigation (`&.`) instead of checking if an object exists before calling the method.", 1487466207], + [998, 7, 1788, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_cross_source_preamble_prefixes` is too high. [<14, 21, 9> 26.8/17]", 3130187278], + [998, 7, 1788, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collapse_cross_source_preamble_prefixes` is too high. [9/7]", 3130187278], + [998, 7, 1788, "Metrics/MethodLength: Method has too many lines. [31/10]", 3130187278], + [998, 7, 1788, "Metrics/PerceivedComplexity: Perceived complexity for `collapse_cross_source_preamble_prefixes` is too high. [9/8]", 3130187278], + [1038, 7, 533, "Metrics/MethodLength: Method has too many lines. [15/10]", 4188914818] + ], + "rbs-merge.gemspec:2636606176": [ + [126, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [134, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949] + ], + "spec/integration/reproducible_merge_spec.rb:4124333249": [ + [9, 1, 6937, "Metrics/BlockLength: Block has too many lines. [155/25]", 1482304086], + [14, 3, 4384, "Metrics/BlockLength: Block has too many lines. [85/25]", 628655161], + [15, 5, 3507, "Metrics/BlockLength: Block has too many lines. [65/25]", 2935184196], + [56, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858910], + [62, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 50415752], + [87, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1546684737] + ], + "spec/rbs/merge/comment_behavior_matrix_spec.rb:2666227529": [ + [14, 45, 6, "Lint/UnusedBlockArgument: Unused block argument - `inline`. If it's necessary, use `_` or `_inline` as an argument name to indicate that it won't be used.", 1605470060], + [18, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 253885993], + [19, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 1702591521] + ], + "spec/rbs/merge/comment_tracker_spec.rb:1831412931": [ + [5, 1, 14574, "Metrics/BlockLength: Block has too many lines. [306/25]", 1598998757], + [8, 3, 3272, "Metrics/BlockLength: Block has too many lines. [67/25]", 935176133], + [95, 3, 1130, "Metrics/BlockLength: Block has too many lines. [28/25]", 204252301], + [143, 3, 1704, "Metrics/BlockLength: Block has too many lines. [32/25]", 1579622084], + [209, 3, 5815, "Metrics/BlockLength: Block has too many lines. [112/25]", 433112678] + ], + "spec/rbs/merge/conflict_resolver_spec.rb:999961156": [ + [8, 1, 19854, "Metrics/BlockLength: Block has too many lines. [491/25]", 3942921818], + [9, 3, 1428, "Metrics/BlockLength: Block has too many lines. [36/25]", 529294185], + [56, 3, 1199, "Metrics/BlockLength: Block has too many lines. [28/25]", 73504201], + [93, 3, 1277, "Metrics/BlockLength: Block has too many lines. [29/25]", 595351018], + [190, 3, 7078, "Metrics/BlockLength: Block has too many lines. [149/25]", 3739681265], + [296, 5, 1646, "Metrics/BlockLength: Block has too many lines. [33/25]", 3128279135], + [302, 7, 1292, "Metrics/BlockLength: Block has too many lines. [27/25]", 729602127], + [404, 3, 4548, "Metrics/BlockLength: Block has too many lines. [114/25]", 2619563374], + [420, 5, 922, "Metrics/BlockLength: Block has too many lines. [26/25]", 3893264586], + [452, 5, 960, "Metrics/BlockLength: Block has too many lines. [26/25]", 3053707146] + ], + "spec/rbs/merge/file_aligner_spec.rb:2643720547": [ + [7, 1, 21476, "Metrics/BlockLength: Block has too many lines. [555/25]", 4145069110], + [65, 3, 1123, "Metrics/BlockLength: Block has too many lines. [28/25]", 1358831340], + [188, 3, 1226, "Metrics/BlockLength: Block has too many lines. [34/25]", 1337144492], + [246, 3, 4891, "Metrics/BlockLength: Block has too many lines. [152/25]", 125990895], + [436, 3, 1943, "Metrics/BlockLength: Block has too many lines. [34/25]", 4126970167], + [483, 3, 3944, "Metrics/BlockLength: Block has too many lines. [94/25]", 2604333848], + [565, 5, 1328, "Metrics/BlockLength: Block has too many lines. [27/25]", 1994971578] + ], + "spec/rbs/merge/file_analysis_spec.rb:952231308": [ + [15, 1, 54363, "Metrics/BlockLength: Block has too many lines. [1205/25]", 2485884639], + [16, 3, 1272, "Metrics/BlockLength: Block has too many lines. [38/25]", 1778989479], + [17, 5, 1210, "Metrics/BlockLength: Block has too many lines. [37/25]", 1755177515], + [67, 3, 1152, "Metrics/BlockLength: Block has too many lines. [33/25]", 2931980952], + [68, 5, 1083, "Metrics/BlockLength: Block has too many lines. [32/25]", 3589815947], + [136, 3, 982, "Metrics/BlockLength: Block has too many lines. [30/25]", 1355840781], + [137, 5, 929, "Metrics/BlockLength: Block has too many lines. [29/25]", 3738902933], + [200, 3, 1559, "Metrics/BlockLength: Block has too many lines. [30/25]", 3203356148], + [201, 5, 1493, "Metrics/BlockLength: Block has too many lines. [29/25]", 1389049628], + [860, 3, 2525, "Metrics/BlockLength: Block has too many lines. [42/25]", 2701315631], + [861, 5, 2455, "Metrics/BlockLength: Block has too many lines. [41/25]", 1293659790], + [884, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 193270906], + [919, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 115067835], + [948, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [954, 3, 3548, "Metrics/BlockLength: Block has too many lines. [59/25]", 2573657607], + [955, 5, 3497, "Metrics/BlockLength: Block has too many lines. [58/25]", 14776664], + [982, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085251945], + [1017, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2659900392], + [1038, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2659900392], + [1091, 3, 1750, "Metrics/BlockLength: Block has too many lines. [29/25]", 460836946], + [1092, 5, 1693, "Metrics/BlockLength: Block has too many lines. [28/25]", 1601111212], + [1135, 3, 1948, "Metrics/BlockLength: Block has too many lines. [41/25]", 4061538475], + [1136, 5, 1892, "Metrics/BlockLength: Block has too many lines. [40/25]", 4081702319], + [1195, 3, 2571, "Metrics/BlockLength: Block has too many lines. [55/25]", 3959149994], + [1265, 3, 2440, "Metrics/BlockLength: Block has too many lines. [52/25]", 2164819729], + [1332, 3, 2008, "Metrics/BlockLength: Block has too many lines. [39/25]", 609327574], + [1379, 3, 1938, "Metrics/BlockLength: Block has too many lines. [38/25]", 361672068], + [1425, 3, 1995, "Metrics/BlockLength: Block has too many lines. [39/25]", 4024875480], + [1472, 3, 1992, "Metrics/BlockLength: Block has too many lines. [39/25]", 1156260241] + ], + "spec/rbs/merge/freeze_node_spec.rb:2278400615": [ + [8, 1, 13268, "Metrics/BlockLength: Block has too many lines. [327/25]", 1590692835], + [9, 3, 2116, "Metrics/BlockLength: Block has too many lines. [43/25]", 4215218715], + [98, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3784984989], + [99, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1182436848], + [331, 3, 2919, "Metrics/BlockLength: Block has too many lines. [65/25]", 1415484725] + ], + "spec/rbs/merge/merge_result_spec.rb:2449518259": [ + [8, 1, 20574, "Metrics/BlockLength: Block has too many lines. [454/25]", 736738811], + [53, 3, 1244, "Metrics/BlockLength: Block has too many lines. [31/25]", 3686452170] + ], + "spec/rbs/merge/smart_merger_removal_mode_compliance_spec.rb:3475743041": [ + [7, 1, 1860, "Metrics/BlockLength: Block has too many lines. [66/25]", 3469987127], + [8, 3, 1798, "Metrics/BlockLength: Block has too many lines. [65/25]", 778477682] + ], + "spec/rbs/merge/smart_merger_spec.rb:3451189224": [ + [14, 1, 43498, "Metrics/BlockLength: Block has too many lines. [1190/25]", 1106962], + [149, 3, 10886, "Metrics/BlockLength: Block has too many lines. [286/25]", 1693926280], + [315, 5, 985, "Metrics/BlockLength: Block has too many lines. [26/25]", 3397066157], + [351, 5, 1063, "Metrics/BlockLength: Block has too many lines. [26/25]", 2718784043], + [461, 5, 1135, "Metrics/BlockLength: Block has too many lines. [26/25]", 3797285781], + [497, 5, 1213, "Metrics/BlockLength: Block has too many lines. [26/25]", 3686078390], + [536, 3, 2766, "Metrics/BlockLength: Block has too many lines. [84/25]", 3927490181], + [649, 3, 1714, "Metrics/BlockLength: Block has too many lines. [54/25]", 386494661], + [721, 3, 5393, "Metrics/BlockLength: Block has too many lines. [138/25]", 2457897034], + [925, 3, 4479, "Metrics/BlockLength: Block has too many lines. [134/25]", 3856958364], + [926, 5, 1327, "Metrics/BlockLength: Block has too many lines. [33/25]", 4009192695], + [970, 5, 953, "Metrics/BlockLength: Block has too many lines. [29/25]", 902715698], + [1008, 5, 1147, "Metrics/BlockLength: Block has too many lines. [37/25]", 3544491851], + [1058, 5, 955, "Metrics/BlockLength: Block has too many lines. [27/25]", 2688118410], + [1096, 3, 1031, "Metrics/BlockLength: Block has too many lines. [32/25]", 663517347], + [1097, 5, 970, "Metrics/BlockLength: Block has too many lines. [31/25]", 1575476639], + [1135, 3, 882, "Metrics/BlockLength: Block has too many lines. [27/25]", 3845382500], + [1136, 5, 813, "Metrics/BlockLength: Block has too many lines. [26/25]", 1755501948], + [1171, 3, 805, "Metrics/BlockLength: Block has too many lines. [26/25]", 3413285873], + [1204, 3, 2200, "Metrics/BlockLength: Block has too many lines. [70/25]", 3541894760], + [1205, 5, 1202, "Metrics/BlockLength: Block has too many lines. [38/25]", 3971143978], + [1235, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177610], + [1251, 5, 923, "Metrics/BlockLength: Block has too many lines. [28/25]", 3867507419], + [1288, 3, 1175, "Metrics/BlockLength: Block has too many lines. [36/25]", 1587654554], + [1289, 5, 1103, "Metrics/BlockLength: Block has too many lines. [35/25]", 3885176914], + [1368, 3, 1252, "Metrics/BlockLength: Block has too many lines. [28/25]", 4206068435], + [1407, 3, 1278, "Metrics/BlockLength: Block has too many lines. [28/25]", 1372687996], + [1446, 3, 1265, "Metrics/BlockLength: Block has too many lines. [28/25]", 3208600846], + [1485, 3, 1265, "Metrics/BlockLength: Block has too many lines. [28/25]", 212464082], + [1524, 3, 1262, "Metrics/BlockLength: Block has too many lines. [28/25]", 4277366491] + ], + "spec/rbs/merge_spec.rb:3352331478": [ + [5, 1, 1389, "Metrics/BlockLength: Block has too many lines. [37/25]", 373922011], + [10, 3, 1270, "Metrics/BlockLength: Block has too many lines. [32/25]", 2567886247] + ] +} From e324eb0f6d478a6eef08d39380cf308f8ad1d717 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:27:03 -0600 Subject: [PATCH 228/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/dotenv-merge/Gemfile.lock | 327 +++++++++++++++++++++++++++- gems/rbs-merge/Gemfile.lock | 379 +++------------------------------ gems/toml-merge/Gemfile.lock | 353 +++++++++++++++++++++++++++++- gems/yaml-merge/Gemfile.lock | 353 +++++++++++++++++++++++++++++- 4 files changed, 1042 insertions(+), 370 deletions(-) diff --git a/gems/dotenv-merge/Gemfile.lock b/gems/dotenv-merge/Gemfile.lock index 7ccf39f28..d3125d74c 100644 --- a/gems/dotenv-merge/Gemfile.lock +++ b/gems/dotenv-merge/Gemfile.lock @@ -17,7 +17,39 @@ PATH version_gem (~> 1.1, >= 1.1.14) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -26,7 +58,193 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -34,6 +252,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -53,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,24 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.2, >= 3.2.0) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.3, >= 2.3.7) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -407,33 +685,55 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.2, >= 3.2.0) + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -454,19 +754,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -481,10 +789,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -492,6 +804,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -519,9 +832,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -530,6 +846,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -543,14 +860,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -558,6 +880,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/rbs-merge/Gemfile.lock b/gems/rbs-merge/Gemfile.lock index 4861a4dcc..9fb0ed2c2 100644 --- a/gems/rbs-merge/Gemfile.lock +++ b/gems/rbs-merge/Gemfile.lock @@ -18,39 +18,7 @@ PATH version_gem (~> 1.1, >= 1.1.14) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -59,192 +27,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -252,45 +35,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -310,11 +54,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -323,6 +62,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -378,6 +118,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -396,7 +145,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -534,23 +282,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -584,11 +334,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -615,7 +360,7 @@ GEM yard yard-relative_markdown_links (0.6.0) nokogiri (>= 1.14.3, < 2) - yard-timekeeper (0.2.3) + yard-timekeeper (0.2.4) version_gem (~> 1.1, >= 1.1.13) yard-yaml (0.2.3) version_gem (~> 1.1, >= 1.1.13) @@ -635,42 +380,21 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.2, >= 3.2.0) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.3, >= 2.3.7) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) rbs-merge! @@ -682,61 +406,40 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.2, >= 3.2.0) - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -749,27 +452,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -783,14 +478,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -826,19 +517,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -852,27 +541,21 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd yard-relative_markdown_links (0.6.0) sha256=3e5ffa85cbad9bac70bee5421774b190fb25d3bdf489323a5b3534f647d1a70e - yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 + yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/toml-merge/Gemfile.lock b/gems/toml-merge/Gemfile.lock index 1182f98db..87531476e 100644 --- a/gems/toml-merge/Gemfile.lock +++ b/gems/toml-merge/Gemfile.lock @@ -16,6 +16,265 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -103,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -131,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -322,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -373,22 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -397,32 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -430,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -442,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -469,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -480,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -507,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -518,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -531,15 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -547,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/yaml-merge/Gemfile.lock b/gems/yaml-merge/Gemfile.lock index 8b0e8ac0f..5ea0feeed 100644 --- a/gems/yaml-merge/Gemfile.lock +++ b/gems/yaml-merge/Gemfile.lock @@ -16,6 +16,265 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -103,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -131,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -322,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -373,22 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -397,11 +685,17 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) yaml-merge! yard (~> 0.9, >= 0.9.44) @@ -410,19 +704,35 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -430,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -442,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -469,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -480,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -507,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -518,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -531,10 +859,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -547,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 900f45a4c19809f3ca5d92f664bb7618f3d83379 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:27:35 -0600 Subject: [PATCH 229/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-merge/Gemfile.lock | 335 +++++++++++++++++++- gems/dotenv-merge/Gemfile.lock | 353 +--------------------- gems/go-merge/.kettle-drift.lock | 60 ++-- gems/go-merge/Gemfile | 70 ++++- gems/go-merge/Rakefile | 18 +- gems/go-merge/lib/go/merge/version.rb | 2 +- gems/rbs-merge/Gemfile.lock | 324 +++++++++++++++++++- gems/ruby-merge/.kettle-drift.lock | 60 ++-- gems/ruby-merge/Gemfile | 70 ++++- gems/ruby-merge/Gemfile.lock | 353 +++++++++++++++++++++- gems/ruby-merge/Rakefile | 18 +- gems/ruby-merge/lib/ruby/merge/version.rb | 2 +- gems/toml-merge/.kettle-drift.lock | 60 ++-- gems/toml-merge/.rubocop_gradual.lock | 258 ---------------- gems/toml-merge/Gemfile | 40 +++ gems/toml-merge/Gemfile.lock | 59 ++-- gems/yaml-merge/.kettle-drift.lock | 60 ++-- gems/yaml-merge/Gemfile | 40 +++ gems/yaml-merge/Gemfile.lock | 331 +------------------- 19 files changed, 1415 insertions(+), 1098 deletions(-) delete mode 100644 gems/toml-merge/.rubocop_gradual.lock diff --git a/gems/ast-merge/Gemfile.lock b/gems/ast-merge/Gemfile.lock index 41470ced4..bde262090 100644 --- a/gems/ast-merge/Gemfile.lock +++ b/gems/ast-merge/Gemfile.lock @@ -18,7 +18,233 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -26,6 +252,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -45,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -108,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -136,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -275,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -327,6 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -373,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -398,32 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -431,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -443,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -470,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -481,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -508,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -519,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -532,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -547,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/dotenv-merge/Gemfile.lock b/gems/dotenv-merge/Gemfile.lock index d3125d74c..8323ae68e 100644 --- a/gems/dotenv-merge/Gemfile.lock +++ b/gems/dotenv-merge/Gemfile.lock @@ -16,265 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +40,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +103,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +131,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +270,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +322,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +373,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.2, >= 3.2.0) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.3, >= 2.3.7) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,55 +398,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.2, >= 3.2.0) - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -754,27 +444,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -789,14 +471,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -804,7 +482,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -832,12 +509,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -846,7 +520,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -860,19 +533,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -880,7 +548,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/go-merge/.kettle-drift.lock b/gems/go-merge/.kettle-drift.lock index d3c2a2030..98e9f541b 100644 --- a/gems/go-merge/.kettle-drift.lock +++ b/gems/go-merge/.kettle-drift.lock @@ -7,7 +7,8 @@ 120, 160, 200, - 240 + 240, + 280 ] } ], @@ -19,7 +20,8 @@ 131, 171, 211, - 251 + 251, + 291 ] } ], @@ -31,7 +33,8 @@ 121, 161, 201, - 241 + 241, + 281 ] } ], @@ -43,7 +46,8 @@ 133, 173, 213, - 253 + 253, + 293 ] } ], @@ -55,7 +59,8 @@ 136, 176, 216, - 256 + 256, + 296 ] } ], @@ -67,7 +72,8 @@ 122, 162, 202, - 242 + 242, + 282 ] } ], @@ -80,7 +86,8 @@ 140, 180, 220, - 260 + 260, + 300 ] } ], @@ -92,7 +99,8 @@ 141, 181, 221, - 261 + 261, + 301 ] } ], @@ -105,7 +113,8 @@ 127, 167, 207, - 247 + 247, + 287 ] } ], @@ -117,7 +126,8 @@ 150, 190, 230, - 270 + 270, + 310 ] } ], @@ -130,7 +140,8 @@ 119, 159, 199, - 239 + 239, + 279 ] } ], @@ -143,7 +154,8 @@ 149, 189, 229, - 269 + 269, + 309 ] } ], @@ -155,7 +167,8 @@ 125, 165, 205, - 245 + 245, + 285 ] } ], @@ -168,7 +181,8 @@ 132, 172, 212, - 252 + 252, + 292 ] } ], @@ -181,7 +195,8 @@ 128, 168, 208, - 248 + 248, + 288 ] } ], @@ -193,7 +208,8 @@ 126, 166, 206, - 246 + 246, + 286 ] } ], @@ -205,7 +221,8 @@ 143, 183, 223, - 263 + 263, + 303 ] } ], @@ -217,7 +234,8 @@ 142, 182, 222, - 262 + 262, + 302 ] } ], @@ -229,7 +247,8 @@ 137, 177, 217, - 257 + 257, + 297 ] } ], @@ -241,7 +260,8 @@ 146, 186, 226, - 266 + 266, + 306 ] } ], diff --git a/gems/go-merge/Gemfile b/gems/go-merge/Gemfile index 9dbdcc96c..ea0a20a8a 100644 --- a/gems/go-merge/Gemfile +++ b/gems/go-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source 'https://gem.coop' +source "https://gem.coop" git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,18 +19,62 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ['~> 1.0', '>= 1.0.8'] -gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ["~> 1.0", ">= 1.0.8"] +gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ast-merge tree_haver ] -direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') +direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? + +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) + direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") + direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == "nomono" } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + if nomono_locked + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] + end + end + Kernel.send(:gem, "nomono", *nomono_activation_requirements) + require "nomono/bundler" + if direct_sibling_templating && !direct_sibling_local + ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + end + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: "STRUCTUREDMERGE", + path_env: "STRUCTUREDMERGE_DEV", + root: ["src", "my", "structuredmerge"] + ) + rescue LoadError + warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + else + ENV.delete("STRUCTUREDMERGE_DEV") + end + end + end +end if direct_sibling_gems.any? && (direct_sibling_local || @@ -290,25 +334,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? # Debugging -eval_gemfile 'gemfiles/modular/debug.gemfile' +eval_gemfile "gemfiles/modular/debug.gemfile" # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile 'gemfiles/modular/coverage.gemfile' +eval_gemfile "gemfiles/modular/coverage.gemfile" # Linting -eval_gemfile 'gemfiles/modular/style.gemfile' +eval_gemfile "gemfiles/modular/style.gemfile" # Documentation -eval_gemfile 'gemfiles/modular/documentation.gemfile' +eval_gemfile "gemfiles/modular/documentation.gemfile" # Optional -eval_gemfile 'gemfiles/modular/optional.gemfile' +eval_gemfile "gemfiles/modular/optional.gemfile" ### Std Lib Extracted Gems -eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' +eval_gemfile "gemfiles/modular/x_std_libs.gemfile" # See unlocked_deps appraisal for more details on irb inclusion -gem 'irb', '~> 1.17' # ruby >= 2.7 +gem "irb", "~> 1.17" # ruby >= 2.7 diff --git a/gems/go-merge/Rakefile b/gems/go-merge/Rakefile index f0aa98d5f..f7fe74fab 100644 --- a/gems/go-merge/Rakefile +++ b/gems/go-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require 'kettle/drift' + require "kettle/drift" Kettle::Drift.install_tasks rescue LoadError - desc('(stub) kettle:drift:check is unavailable') - task('kettle:drift:check') do + desc("(stub) kettle:drift:check is unavailable") + task("kettle:drift:check") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:update is unavailable') - task('kettle:drift:update') do + desc("(stub) kettle:drift:update is unavailable") + task("kettle:drift:update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:force_update is unavailable') - task('kettle:drift:force_update') do + desc("(stub) kettle:drift:force_update is unavailable") + task("kettle:drift:force_update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift is unavailable') - task('kettle:drift' => 'kettle:drift:update') + desc("(stub) kettle:drift is unavailable") + task("kettle:drift" => "kettle:drift:update") end ### TEMPLATING TASKS diff --git a/gems/go-merge/lib/go/merge/version.rb b/gems/go-merge/lib/go/merge/version.rb index d576fba8a..7a12d28aa 100644 --- a/gems/go-merge/lib/go/merge/version.rb +++ b/gems/go-merge/lib/go/merge/version.rb @@ -3,7 +3,7 @@ module Go module Merge module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/rbs-merge/Gemfile.lock b/gems/rbs-merge/Gemfile.lock index 9fb0ed2c2..9b37f4b6c 100644 --- a/gems/rbs-merge/Gemfile.lock +++ b/gems/rbs-merge/Gemfile.lock @@ -18,7 +18,39 @@ PATH version_gem (~> 1.1, >= 1.1.14) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -27,7 +59,192 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -35,6 +252,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -54,6 +294,11 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -117,6 +362,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -145,6 +392,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -282,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -334,6 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -380,21 +635,42 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.2, >= 3.2.0) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.3, >= 2.3.7) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) rbs-merge! @@ -406,33 +682,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.2, >= 3.2.0) + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,19 +750,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -478,10 +784,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -517,9 +827,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -528,6 +841,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -541,14 +855,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -556,6 +875,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ruby-merge/.kettle-drift.lock b/gems/ruby-merge/.kettle-drift.lock index d3c2a2030..98e9f541b 100644 --- a/gems/ruby-merge/.kettle-drift.lock +++ b/gems/ruby-merge/.kettle-drift.lock @@ -7,7 +7,8 @@ 120, 160, 200, - 240 + 240, + 280 ] } ], @@ -19,7 +20,8 @@ 131, 171, 211, - 251 + 251, + 291 ] } ], @@ -31,7 +33,8 @@ 121, 161, 201, - 241 + 241, + 281 ] } ], @@ -43,7 +46,8 @@ 133, 173, 213, - 253 + 253, + 293 ] } ], @@ -55,7 +59,8 @@ 136, 176, 216, - 256 + 256, + 296 ] } ], @@ -67,7 +72,8 @@ 122, 162, 202, - 242 + 242, + 282 ] } ], @@ -80,7 +86,8 @@ 140, 180, 220, - 260 + 260, + 300 ] } ], @@ -92,7 +99,8 @@ 141, 181, 221, - 261 + 261, + 301 ] } ], @@ -105,7 +113,8 @@ 127, 167, 207, - 247 + 247, + 287 ] } ], @@ -117,7 +126,8 @@ 150, 190, 230, - 270 + 270, + 310 ] } ], @@ -130,7 +140,8 @@ 119, 159, 199, - 239 + 239, + 279 ] } ], @@ -143,7 +154,8 @@ 149, 189, 229, - 269 + 269, + 309 ] } ], @@ -155,7 +167,8 @@ 125, 165, 205, - 245 + 245, + 285 ] } ], @@ -168,7 +181,8 @@ 132, 172, 212, - 252 + 252, + 292 ] } ], @@ -181,7 +195,8 @@ 128, 168, 208, - 248 + 248, + 288 ] } ], @@ -193,7 +208,8 @@ 126, 166, 206, - 246 + 246, + 286 ] } ], @@ -205,7 +221,8 @@ 143, 183, 223, - 263 + 263, + 303 ] } ], @@ -217,7 +234,8 @@ 142, 182, 222, - 262 + 262, + 302 ] } ], @@ -229,7 +247,8 @@ 137, 177, 217, - 257 + 257, + 297 ] } ], @@ -241,7 +260,8 @@ 146, 186, 226, - 266 + 266, + 306 ] } ], diff --git a/gems/ruby-merge/Gemfile b/gems/ruby-merge/Gemfile index b4bfd9736..85079ceb0 100644 --- a/gems/ruby-merge/Gemfile +++ b/gems/ruby-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source 'https://gem.coop' +source "https://gem.coop" git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,18 +19,62 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ['~> 1.0', '>= 1.0.8'] -gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ["~> 1.0", ">= 1.0.8"] +gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ast-merge tree_haver ] -direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') +direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? + +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) + direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") + direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == "nomono" } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + if nomono_locked + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] + end + end + Kernel.send(:gem, "nomono", *nomono_activation_requirements) + require "nomono/bundler" + if direct_sibling_templating && !direct_sibling_local + ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + end + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: "STRUCTUREDMERGE", + path_env: "STRUCTUREDMERGE_DEV", + root: ["src", "my", "structuredmerge"] + ) + rescue LoadError + warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + else + ENV.delete("STRUCTUREDMERGE_DEV") + end + end + end +end if direct_sibling_gems.any? && (direct_sibling_local || @@ -290,25 +334,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? # Debugging -eval_gemfile 'gemfiles/modular/debug.gemfile' +eval_gemfile "gemfiles/modular/debug.gemfile" # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile 'gemfiles/modular/coverage.gemfile' +eval_gemfile "gemfiles/modular/coverage.gemfile" # Linting -eval_gemfile 'gemfiles/modular/style.gemfile' +eval_gemfile "gemfiles/modular/style.gemfile" # Documentation -eval_gemfile 'gemfiles/modular/documentation.gemfile' +eval_gemfile "gemfiles/modular/documentation.gemfile" # Optional -eval_gemfile 'gemfiles/modular/optional.gemfile' +eval_gemfile "gemfiles/modular/optional.gemfile" ### Std Lib Extracted Gems -eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' +eval_gemfile "gemfiles/modular/x_std_libs.gemfile" # See unlocked_deps appraisal for more details on irb inclusion -gem 'irb', '~> 1.17' # ruby >= 2.7 +gem "irb", "~> 1.17" # ruby >= 2.7 diff --git a/gems/ruby-merge/Gemfile.lock b/gems/ruby-merge/Gemfile.lock index fb5b38919..691f91a12 100644 --- a/gems/ruby-merge/Gemfile.lock +++ b/gems/ruby-merge/Gemfile.lock @@ -16,6 +16,265 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -103,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -131,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -322,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -373,22 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -399,30 +687,52 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0.0) ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -430,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -442,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -469,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -480,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -511,6 +835,8 @@ 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -519,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -532,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -547,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ruby-merge/Rakefile b/gems/ruby-merge/Rakefile index c528d41ee..c7b8a4b9e 100644 --- a/gems/ruby-merge/Rakefile +++ b/gems/ruby-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require 'kettle/drift' + require "kettle/drift" Kettle::Drift.install_tasks rescue LoadError - desc('(stub) kettle:drift:check is unavailable') - task('kettle:drift:check') do + desc("(stub) kettle:drift:check is unavailable") + task("kettle:drift:check") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:update is unavailable') - task('kettle:drift:update') do + desc("(stub) kettle:drift:update is unavailable") + task("kettle:drift:update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:force_update is unavailable') - task('kettle:drift:force_update') do + desc("(stub) kettle:drift:force_update is unavailable") + task("kettle:drift:force_update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift is unavailable') - task('kettle:drift' => 'kettle:drift:update') + desc("(stub) kettle:drift is unavailable") + task("kettle:drift" => "kettle:drift:update") end ### TEMPLATING TASKS diff --git a/gems/ruby-merge/lib/ruby/merge/version.rb b/gems/ruby-merge/lib/ruby/merge/version.rb index d88eae0c6..0dcd005a5 100644 --- a/gems/ruby-merge/lib/ruby/merge/version.rb +++ b/gems/ruby-merge/lib/ruby/merge/version.rb @@ -3,7 +3,7 @@ module Ruby module Merge module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/toml-merge/.kettle-drift.lock b/gems/toml-merge/.kettle-drift.lock index d3c2a2030..98e9f541b 100644 --- a/gems/toml-merge/.kettle-drift.lock +++ b/gems/toml-merge/.kettle-drift.lock @@ -7,7 +7,8 @@ 120, 160, 200, - 240 + 240, + 280 ] } ], @@ -19,7 +20,8 @@ 131, 171, 211, - 251 + 251, + 291 ] } ], @@ -31,7 +33,8 @@ 121, 161, 201, - 241 + 241, + 281 ] } ], @@ -43,7 +46,8 @@ 133, 173, 213, - 253 + 253, + 293 ] } ], @@ -55,7 +59,8 @@ 136, 176, 216, - 256 + 256, + 296 ] } ], @@ -67,7 +72,8 @@ 122, 162, 202, - 242 + 242, + 282 ] } ], @@ -80,7 +86,8 @@ 140, 180, 220, - 260 + 260, + 300 ] } ], @@ -92,7 +99,8 @@ 141, 181, 221, - 261 + 261, + 301 ] } ], @@ -105,7 +113,8 @@ 127, 167, 207, - 247 + 247, + 287 ] } ], @@ -117,7 +126,8 @@ 150, 190, 230, - 270 + 270, + 310 ] } ], @@ -130,7 +140,8 @@ 119, 159, 199, - 239 + 239, + 279 ] } ], @@ -143,7 +154,8 @@ 149, 189, 229, - 269 + 269, + 309 ] } ], @@ -155,7 +167,8 @@ 125, 165, 205, - 245 + 245, + 285 ] } ], @@ -168,7 +181,8 @@ 132, 172, 212, - 252 + 252, + 292 ] } ], @@ -181,7 +195,8 @@ 128, 168, 208, - 248 + 248, + 288 ] } ], @@ -193,7 +208,8 @@ 126, 166, 206, - 246 + 246, + 286 ] } ], @@ -205,7 +221,8 @@ 143, 183, 223, - 263 + 263, + 303 ] } ], @@ -217,7 +234,8 @@ 142, 182, 222, - 262 + 262, + 302 ] } ], @@ -229,7 +247,8 @@ 137, 177, 217, - 257 + 257, + 297 ] } ], @@ -241,7 +260,8 @@ 146, 186, 226, - 266 + 266, + 306 ] } ], diff --git a/gems/toml-merge/.rubocop_gradual.lock b/gems/toml-merge/.rubocop_gradual.lock deleted file mode 100644 index 918c85d88..000000000 --- a/gems/toml-merge/.rubocop_gradual.lock +++ /dev/null @@ -1,258 +0,0 @@ -{ - ".simplecov:3682400110": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:133885645": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/toml-merge.rb:3814390984": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`toml-merge.rb`) should use snake_case.", 5381], - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "lib/toml/merge.rb:3069711497": [ - [39, 3, 12193, "Metrics/ModuleLength: Module has too many lines. [231/100]", 1479901406], - [114, 5, 9241, "Metrics/ClassLength: Class has too many lines. [205/100]", 349141169], - [156, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1773216188], - [165, 7, 709, "Metrics/MethodLength: Method has too many lines. [17/10]", 2355964538], - [191, 7, 1280, "Metrics/AbcSize: Assignment Branch Condition size for `merge_toml` is too high. [<6, 16, 6> 18.11/17]", 2322240506], - [191, 7, 1280, "Metrics/MethodLength: Method has too many lines. [25/10]", 2322240506], - [195, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1773216188], - [222, 7, 1401, "Metrics/AbcSize: Assignment Branch Condition size for `merge_toml_with_parser` is too high. [<6, 18, 6> 19.9/17]", 3118052892], - [222, 7, 1401, "Metrics/MethodLength: Method has too many lines. [24/10]", 3118052892], - [321, 9, 11, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 848344986] - ], - "lib/toml/merge/comment_tracker.rb:743656609": [ - [16, 5, 5242, "Metrics/ClassLength: Class has too many lines. [112/100]", 3014190138], - [28, 7, 990, "Metrics/MethodLength: Method has too many lines. [17/10]", 85804539], - [92, 7, 949, "Metrics/AbcSize: Assignment Branch Condition size for `build_toml_region` is too high. [<7, 21, 9> 23.9/17]", 552845000], - [92, 7, 949, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_toml_region` is too high. [9/7]", 552845000], - [92, 7, 949, "Metrics/MethodLength: Method has too many lines. [23/10]", 552845000], - [92, 7, 949, "Metrics/PerceivedComplexity: Perceived complexity for `build_toml_region` is too high. [9/8]", 552845000] - ], - "lib/toml/merge/conflict_resolver.rb:2699752146": [ - [11, 5, 42658, "Metrics/ClassLength: Class has too many lines. [791/100]", 2931993361], - [30, 7, 788, "Metrics/MethodLength: Method has too many lines. [13/10]", 2218400960], - [30, 21, 235, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 788504679], - [31, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3099130903], - [52, 7, 1676, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_batch` is too high. [<4, 24, 3> 24.52/17]", 623996510], - [52, 7, 1676, "Metrics/MethodLength: Method has too many lines. [29/10]", 623996510], - [53, 9, 1632, "Metrics/BlockLength: Block has too many lines. [27/25]", 3553849414], - [101, 7, 8464, "Metrics/AbcSize: Assignment Branch Condition size for `merge_node_lists_to_emitter` is too high. [<54, 88, 31> 107.8/17]", 3669765511], - [101, 7, 8464, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_node_lists_to_emitter` is too high. [27/7]", 3669765511], - [101, 7, 8464, "Metrics/MethodLength: Method has too many lines. [141/10]", 3669765511], - [101, 7, 8464, "Metrics/PerceivedComplexity: Perceived complexity for `merge_node_lists_to_emitter` is too high. [29/8]", 3669765511], - [146, 9, 5685, "Metrics/BlockLength: Block has too many lines. [102/25]", 464560406], - [286, 7, 2458, "Metrics/AbcSize: Assignment Branch Condition size for `merge_matched_nodes_to_emitter` is too high. [<6, 17, 10> 20.62/17]", 4036358483], - [286, 7, 2458, "Metrics/MethodLength: Method has too many lines. [49/10]", 4036358483], - [286, 7, 2458, "Metrics/PerceivedComplexity: Perceived complexity for `merge_matched_nodes_to_emitter` is too high. [9/8]", 4036358483], - [289, 11, 1647, "Metrics/BlockLength: Block has too many lines. [34/25]", 997955803], - [353, 7, 770, "Metrics/MethodLength: Method has too many lines. [21/10]", 543737609], - [387, 7, 1101, "Metrics/AbcSize: Assignment Branch Condition size for `build_refined_matches` is too high. [<11, 16, 8> 21/17]", 4236016583], - [387, 7, 1101, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_refined_matches` is too high. [9/7]", 4236016583], - [387, 7, 1101, "Metrics/MethodLength: Method has too many lines. [18/10]", 4236016583], - [387, 7, 1101, "Metrics/PerceivedComplexity: Perceived complexity for `build_refined_matches` is too high. [9/8]", 4236016583], - [427, 7, 642, "Metrics/AbcSize: Assignment Branch Condition size for `emit_removed_destination_node_inline_comments` is too high. [<4, 20, 5> 21/17]", 2624953678], - [427, 7, 642, "Metrics/MethodLength: Method has too many lines. [11/10]", 2624953678], - [462, 7, 720, "Metrics/MethodLength: Method has too many lines. [11/10]", 4270722493], - [499, 7, 1022, "Metrics/MethodLength: Method has too many lines. [17/10]", 3216685542], - [584, 7, 1854, "Metrics/AbcSize: Assignment Branch Condition size for `emit_leading_region` is too high. [<8, 28, 9> 30.48/17]", 377203837], - [584, 7, 1854, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_leading_region` is too high. [10/7]", 377203837], - [584, 7, 1854, "Metrics/MethodLength: Method has too many lines. [32/10]", 377203837], - [584, 7, 1854, "Metrics/PerceivedComplexity: Perceived complexity for `emit_leading_region` is too high. [10/8]", 377203837], - [685, 7, 1275, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_template_preamble_prefix_region` is too high. [<7, 24, 9> 26.57/17]", 1754222078], - [685, 7, 1275, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collapse_template_preamble_prefix_region` is too high. [8/7]", 1754222078], - [685, 7, 1275, "Metrics/MethodLength: Method has too many lines. [24/10]", 1754222078], - [716, 7, 662, "Metrics/AbcSize: Assignment Branch Condition size for `root_boundary_lines_for` is too high. [<4, 15, 10> 18.47/17]", 935744348], - [716, 7, 662, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `root_boundary_lines_for` is too high. [9/7]", 935744348], - [716, 7, 662, "Metrics/MethodLength: Method has too many lines. [14/10]", 935744348], - [736, 7, 343, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `region_lines_for` is too high. [8/7]", 399995706], - [753, 7, 614, "Metrics/AbcSize: Assignment Branch Condition size for `dedup_warning_context` is too high. [<0, 20, 10> 22.36/17]", 2011768288], - [753, 7, 614, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `dedup_warning_context` is too high. [11/7]", 2011768288], - [753, 7, 614, "Metrics/PerceivedComplexity: Perceived complexity for `dedup_warning_context` is too high. [11/8]", 2011768288], - [756, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [757, 41, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [757, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 3287405165], - [783, 7, 1426, "Metrics/MethodLength: Method has too many lines. [34/10]", 1351993853], - [849, 7, 955, "Metrics/MethodLength: Method has too many lines. [21/10]", 3080929417], - [877, 7, 1249, "Metrics/AbcSize: Assignment Branch Condition size for `emit_node_lines` is too high. [<6, 21, 6> 22.65/17]", 3195628693], - [877, 7, 1249, "Metrics/MethodLength: Method has too many lines. [21/10]", 3195628693], - [952, 7, 637, "Metrics/AbcSize: Assignment Branch Condition size for `inline_region_separator` is too high. [<5, 18, 7> 19.95/17]", 2029360360], - [952, 7, 637, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `inline_region_separator` is too high. [8/7]", 2029360360], - [952, 7, 637, "Metrics/MethodLength: Method has too many lines. [12/10]", 2029360360], - [969, 7, 465, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_interstitial_blank_lines` is too high. [9/7]", 1640065866], - [969, 7, 465, "Metrics/PerceivedComplexity: Perceived complexity for `emit_interstitial_blank_lines` is too high. [9/8]", 1640065866], - [981, 7, 620, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_gap_before_node` is too high. [12/7]", 2808239642], - [981, 7, 620, "Metrics/PerceivedComplexity: Perceived complexity for `emit_gap_before_node` is too high. [12/8]", 2808239642], - [983, 36, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [998, 7, 526, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_preceding_blank_lines` is too high. [8/7]", 3889743093], - [998, 7, 526, "Metrics/MethodLength: Method has too many lines. [11/10]", 3889743093] - ], - "lib/toml/merge/file_analysis.rb:2630402533": [ - [12, 5, 19537, "Metrics/ClassLength: Class has too many lines. [368/100]", 929433986], - [15, 7, 22, "Style/Documentation: Missing top-level documentation comment for `class Toml::Merge::FileAnalysis::CommentAugmenter`.", 2864244718], - [20, 9, 849, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<11, 13, 1> 17.06/17]", 1333266342], - [20, 9, 849, "Metrics/MethodLength: Method has too many lines. [16/10]", 1333266342], - [72, 7, 869, "Metrics/MethodLength: Method has too many lines. [13/10]", 1683071581], - [228, 7, 959, "Metrics/AbcSize: Assignment Branch Condition size for `root_pairs` is too high. [<10, 13, 16> 22.91/17]", 1481059821], - [228, 7, 959, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `root_pairs` is too high. [15/7]", 1481059821], - [228, 7, 959, "Metrics/MethodLength: Method has too many lines. [21/10]", 1481059821], - [228, 7, 959, "Metrics/PerceivedComplexity: Perceived complexity for `root_pairs` is too high. [15/8]", 1481059821], - [246, 9, 384, "Style/CombinableLoops: Combine this loop with the previous loop.", 2434692315], - [263, 7, 1743, "Metrics/AbcSize: Assignment Branch Condition size for `parse_toml` is too high. [<10, 12, 8> 17.55/17]", 1966830746], - [263, 7, 1743, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_toml` is too high. [9/7]", 1966830746], - [263, 7, 1743, "Metrics/MethodLength: Method has too many lines. [19/10]", 1966830746], - [331, 7, 596, "Metrics/MethodLength: Method has too many lines. [13/10]", 995924372], - [389, 7, 588, "Metrics/AbcSize: Assignment Branch Condition size for `comment_owner_end_line_for_augmenter` is too high. [<1, 20, 13> 23.87/17]", 1972553155], - [389, 7, 588, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `comment_owner_end_line_for_augmenter` is too high. [14/7]", 1972553155], - [389, 7, 588, "Metrics/PerceivedComplexity: Perceived complexity for `comment_owner_end_line_for_augmenter` is too high. [14/8]", 1972553155], - [448, 7, 1255, "Metrics/AbcSize: Assignment Branch Condition size for `scan_line_for_comment` is too high. [<16, 13, 17> 26.72/17]", 622981429], - [448, 7, 1255, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `scan_line_for_comment` is too high. [12/7]", 622981429], - [448, 7, 1255, "Metrics/MethodLength: Method has too many lines. [38/10]", 622981429], - [448, 7, 1255, "Metrics/PerceivedComplexity: Perceived complexity for `scan_line_for_comment` is too high. [13/8]", 622981429], - [496, 7, 319, "Metrics/MethodLength: Method has too many lines. [11/10]", 2890996257], - [535, 7, 416, "Metrics/MethodLength: Method has too many lines. [11/10]", 2416972242], - [576, 7, 464, "Metrics/AbcSize: Assignment Branch Condition size for `node_text` is too high. [<3, 16, 8> 18.14/17]", 2138809005], - [576, 7, 464, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `node_text` is too high. [8/7]", 2138809005] - ], - "lib/toml/merge/key_sorter.rb:829731466": [ - [59, 7, 1787, "Metrics/AbcSize: Assignment Branch Condition size for `partition_into_blocks` is too high. [<11, 23, 8> 26.72/17]", 3324132918], - [59, 7, 1787, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `partition_into_blocks` is too high. [8/7]", 3324132918], - [59, 7, 1787, "Metrics/MethodLength: Method has too many lines. [38/10]", 3324132918], - [59, 7, 1787, "Metrics/PerceivedComplexity: Perceived complexity for `partition_into_blocks` is too high. [9/8]", 3324132918] - ], - "lib/toml/merge/node_type_normalizer.rb:2171981470": [ - [67, 5, 7844, "Metrics/ModuleLength: Module has too many lines. [134/100]", 828548837], - [159, 11, 4, "Lint/BooleanSymbol: Symbol with a boolean name - you probably meant to use `true`.", 2087932467], - [160, 11, 5, "Lint/BooleanSymbol: Symbol with a boolean name - you probably meant to use `false`.", 170962968], - [215, 11, 4, "Lint/BooleanSymbol: Symbol with a boolean name - you probably meant to use `true`.", 2087932467], - [216, 11, 5, "Lint/BooleanSymbol: Symbol with a boolean name - you probably meant to use `false`.", 170962968] - ], - "lib/toml/merge/node_wrapper.rb:975742583": [ - [26, 5, 24084, "Metrics/ClassLength: Class has too many lines. [424/100]", 111672250], - [37, 9, 517, "Metrics/MethodLength: Method has too many lines. [11/10]", 3513234297], - [37, 17, 154, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2431837951], - [54, 7, 503, "Metrics/MethodLength: Method has too many lines. [12/10]", 2647031658], - [54, 21, 82, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2652802373], - [229, 7, 1380, "Metrics/AbcSize: Assignment Branch Condition size for `value_node` is too high. [<5, 16, 10> 19.52/17]", 1398903082], - [229, 7, 1380, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `value_node` is too high. [9/7]", 1398903082], - [229, 7, 1380, "Metrics/MethodLength: Method has too many lines. [32/10]", 1398903082], - [229, 7, 1380, "Metrics/PerceivedComplexity: Perceived complexity for `value_node` is too high. [9/8]", 1398903082], - [232, 9, 1306, "Metrics/BlockLength: Block has too many lines. [28/25]", 3342818997], - [286, 7, 496, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `pairs` is too high. [9/7]", 2741436417], - [286, 7, 496, "Metrics/PerceivedComplexity: Perceived complexity for `pairs` is too high. [9/8]", 2741436417], - [319, 7, 706, "Metrics/MethodLength: Method has too many lines. [22/10]", 2032215880], - [390, 7, 753, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `effective_end_line` is too high. [10/7]", 29395992], - [390, 7, 753, "Metrics/PerceivedComplexity: Perceived complexity for `effective_end_line` is too high. [10/8]", 29395992], - [414, 7, 2225, "Metrics/AbcSize: Assignment Branch Condition size for `compute_signature` is too high. [<9, 32, 24> 41/17]", 1299303855], - [414, 7, 2225, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_signature` is too high. [25/7]", 1299303855], - [414, 7, 2225, "Metrics/MethodLength: Method has too many lines. [39/10]", 1299303855], - [414, 7, 2225, "Metrics/PerceivedComplexity: Perceived complexity for `compute_signature` is too high. [16/8]", 1299303855], - [523, 7, 487, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `raw_pair_value_text` is too high. [8/7]", 3177077098], - [547, 7, 1503, "Metrics/AbcSize: Assignment Branch Condition size for `collect_inline_table_keys_recursive` is too high. [<7, 25, 18> 31.59/17]", 3778857543], - [547, 7, 1503, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_inline_table_keys_recursive` is too high. [17/7]", 3778857543], - [547, 7, 1503, "Metrics/MethodLength: Method has too many lines. [24/10]", 3778857543], - [547, 7, 1503, "Metrics/PerceivedComplexity: Perceived complexity for `collect_inline_table_keys_recursive` is too high. [18/8]", 3778857543], - [605, 7, 855, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_sibling_pairs_for_table` is too high. [8/7]", 3160731503], - [605, 7, 855, "Metrics/MethodLength: Method has too many lines. [14/10]", 3160731503], - [636, 7, 655, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_next_table_start_line` is too high. [9/7]", 1465728116], - [636, 7, 655, "Metrics/MethodLength: Method has too many lines. [12/10]", 1465728116], - [636, 7, 655, "Metrics/PerceivedComplexity: Perceived complexity for `find_next_table_start_line` is too high. [9/8]", 1465728116], - [665, 7, 861, "Metrics/MethodLength: Method has too many lines. [12/10]", 4202205110] - ], - "lib/toml/merge/smart_merger.rb:3624815957": [ - [39, 5, 9573, "Metrics/ClassLength: Class has too many lines. [190/100]", 1615610584], - [72, 7, 1283, "Metrics/MethodLength: Method has too many lines. [18/10]", 2597249100], - [72, 21, 427, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 1661881927], - [144, 7, 1347, "Metrics/AbcSize: Assignment Branch Condition size for `merge_with_debug` is too high. [<3, 20, 7> 21.4/17]", 2015540458], - [144, 7, 1347, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_with_debug` is too high. [8/7]", 2015540458], - [144, 7, 1347, "Metrics/MethodLength: Method has too many lines. [31/10]", 2015540458], - [248, 7, 1161, "Metrics/MethodLength: Method has too many lines. [26/10]", 1453116447] - ], - "lib/toml/merge/table_match_refiner.rb:1590173808": [ - [32, 5, 7338, "Metrics/ClassLength: Class has too many lines. [108/100]", 3006106276], - [113, 35, 50, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1492696344], - [147, 7, 410, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_table_name` is too high. [8/7]", 2032455294], - [217, 7, 659, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<11, 38, 8> 40.36/17]", 2658150371], - [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:3985149016": [ - [3, 1, 12320, "Metrics/BlockLength: Block has too many lines. [273/25]", 2102318823], - [34, 3, 2099, "Metrics/BlockLength: Block has too many lines. [27/25]", 677669008], - [233, 3, 1127, "Metrics/BlockLength: Block has too many lines. [27/25]", 3231986094] - ], - "toml-merge.gemspec:2519299257": [ - [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ] -} diff --git a/gems/toml-merge/Gemfile b/gems/toml-merge/Gemfile index a85d99fde..4708c33ac 100644 --- a/gems/toml-merge/Gemfile +++ b/gems/toml-merge/Gemfile @@ -272,6 +272,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/toml-merge/Gemfile.lock b/gems/toml-merge/Gemfile.lock index 87531476e..fef01f4f8 100644 --- a/gems/toml-merge/Gemfile.lock +++ b/gems/toml-merge/Gemfile.lock @@ -275,6 +275,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -308,7 +324,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -363,18 +378,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -538,22 +542,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -659,9 +659,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -739,7 +739,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -760,10 +759,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -838,13 +837,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/yaml-merge/.kettle-drift.lock b/gems/yaml-merge/.kettle-drift.lock index d3c2a2030..98e9f541b 100644 --- a/gems/yaml-merge/.kettle-drift.lock +++ b/gems/yaml-merge/.kettle-drift.lock @@ -7,7 +7,8 @@ 120, 160, 200, - 240 + 240, + 280 ] } ], @@ -19,7 +20,8 @@ 131, 171, 211, - 251 + 251, + 291 ] } ], @@ -31,7 +33,8 @@ 121, 161, 201, - 241 + 241, + 281 ] } ], @@ -43,7 +46,8 @@ 133, 173, 213, - 253 + 253, + 293 ] } ], @@ -55,7 +59,8 @@ 136, 176, 216, - 256 + 256, + 296 ] } ], @@ -67,7 +72,8 @@ 122, 162, 202, - 242 + 242, + 282 ] } ], @@ -80,7 +86,8 @@ 140, 180, 220, - 260 + 260, + 300 ] } ], @@ -92,7 +99,8 @@ 141, 181, 221, - 261 + 261, + 301 ] } ], @@ -105,7 +113,8 @@ 127, 167, 207, - 247 + 247, + 287 ] } ], @@ -117,7 +126,8 @@ 150, 190, 230, - 270 + 270, + 310 ] } ], @@ -130,7 +140,8 @@ 119, 159, 199, - 239 + 239, + 279 ] } ], @@ -143,7 +154,8 @@ 149, 189, 229, - 269 + 269, + 309 ] } ], @@ -155,7 +167,8 @@ 125, 165, 205, - 245 + 245, + 285 ] } ], @@ -168,7 +181,8 @@ 132, 172, 212, - 252 + 252, + 292 ] } ], @@ -181,7 +195,8 @@ 128, 168, 208, - 248 + 248, + 288 ] } ], @@ -193,7 +208,8 @@ 126, 166, 206, - 246 + 246, + 286 ] } ], @@ -205,7 +221,8 @@ 143, 183, 223, - 263 + 263, + 303 ] } ], @@ -217,7 +234,8 @@ 142, 182, 222, - 262 + 262, + 302 ] } ], @@ -229,7 +247,8 @@ 137, 177, 217, - 257 + 257, + 297 ] } ], @@ -241,7 +260,8 @@ 146, 186, 226, - 266 + 266, + 306 ] } ], diff --git a/gems/yaml-merge/Gemfile b/gems/yaml-merge/Gemfile index d79b393f2..94c21b84d 100644 --- a/gems/yaml-merge/Gemfile +++ b/gems/yaml-merge/Gemfile @@ -272,6 +272,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/yaml-merge/Gemfile.lock b/gems/yaml-merge/Gemfile.lock index 5ea0feeed..a256589b3 100644 --- a/gems/yaml-merge/Gemfile.lock +++ b/gems/yaml-merge/Gemfile.lock @@ -17,39 +17,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -58,201 +26,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -260,21 +34,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -294,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +116,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +283,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -618,7 +361,7 @@ GEM yard yard-relative_markdown_links (0.6.0) nokogiri (>= 1.14.3, < 2) - yard-timekeeper (0.2.3) + yard-timekeeper (0.2.4) version_gem (~> 1.1, >= 1.1.13) yard-yaml (0.2.3) version_gem (~> 1.1, >= 1.1.13) @@ -638,45 +381,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,17 +406,12 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) yaml-merge! yard (~> 0.9, >= 0.9.44) @@ -704,35 +420,19 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +440,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +452,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +479,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +490,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +517,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +528,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,14 +541,10 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -876,10 +554,9 @@ CHECKSUMS yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd yard-relative_markdown_links (0.6.0) sha256=3e5ffa85cbad9bac70bee5421774b190fb25d3bdf489323a5b3534f647d1a70e - yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 + yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 29eb5e1c305bd5b48c1b5def97bd2171037a1a08 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:27:41 -0600 Subject: [PATCH 230/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/go-merge/.rubocop_gradual.lock | 102 ------- gems/go-merge/Gemfile | 68 +++-- gems/go-merge/Gemfile.lock | 59 ++-- gems/go-merge/Rakefile | 18 +- gems/ruby-merge/.rubocop_gradual.lock | 390 -------------------------- gems/ruby-merge/Gemfile.lock | 59 ++-- gems/ruby-merge/bin/yard | 2 +- gems/toml-merge/.rubocop_gradual.lock | 258 +++++++++++++++++ gems/toml-merge/Gemfile.lock | 382 ++----------------------- gems/yaml-merge/Gemfile.lock | 327 ++++++++++++++++++++- 10 files changed, 712 insertions(+), 953 deletions(-) delete mode 100644 gems/go-merge/.rubocop_gradual.lock delete mode 100644 gems/ruby-merge/.rubocop_gradual.lock create mode 100644 gems/toml-merge/.rubocop_gradual.lock diff --git a/gems/go-merge/.rubocop_gradual.lock b/gems/go-merge/.rubocop_gradual.lock deleted file mode 100644 index bb6039651..000000000 --- a/gems/go-merge/.rubocop_gradual.lock +++ /dev/null @@ -1,102 +0,0 @@ -{ - ".simplecov:203349166": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:522749197": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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:3413698974": [ - [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ], - "lib/go-merge.rb:1938991181": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`go-merge.rb`) should use snake_case.", 5381] - ], - "lib/go/merge.rb:547557749": [ - [10, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Go::Merge`.", 2866359175], - [10, 3, 7242, "Metrics/ModuleLength: Module has too many lines. [173/100]", 2713105462], - [11, 5, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631], - [72, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1491828652], - [79, 5, 1399, "Metrics/AbcSize: Assignment Branch Condition size for `merge_go` is too high. [<13, 32, 11> 36.25/17]", 3471957286], - [79, 5, 1399, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_go` is too high. [11/7]", 3471957286], - [79, 5, 1399, "Metrics/MethodLength: Method has too many lines. [22/10]", 3471957286], - [79, 5, 1399, "Metrics/PerceivedComplexity: Perceived complexity for `merge_go` is too high. [11/8]", 3471957286], - [98, 34, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], - [106, 5, 1419, "Metrics/AbcSize: Assignment Branch Condition size for `analyze_go_module` is too high. [<8, 19, 5> 21.21/17]", 525883462], - [106, 5, 1419, "Metrics/MethodLength: Method has too many lines. [40/10]", 525883462] - ], - "spec/fixtures_integration_spec.rb:2854818786": [ - [3, 1, 4677, "Metrics/BlockLength: Block has too many lines. [66/25]", 420437002], - [8, 3, 4420, "Metrics/BlockLength: Block has too many lines. [61/25]", 566085077] - ] -} diff --git a/gems/go-merge/Gemfile b/gems/go-merge/Gemfile index ea0a20a8a..c9b9bfd2d 100644 --- a/gems/go-merge/Gemfile +++ b/gems/go-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source "https://gem.coop" +source 'https://gem.coop' git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,58 +19,54 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ["~> 1.0", ">= 1.0.8"] -gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ['~> 1.0', '>= 1.0.8'] +gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ast-merge tree_haver ] -direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") +direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? if direct_sibling_gems.any? && - (direct_sibling_local || - ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) - direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") - direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) begin nomono_activation_requirements = nomono_requirements - nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) if File.file?(nomono_lockfile) nomono_locked_spec = Bundler::LockfileParser - .new(Bundler.read_file(nomono_lockfile)) - .specs - .find { |spec| spec.name == "nomono" } + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } nomono_locked = nomono_locked_spec && - Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) - if nomono_locked - nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] - end - end - Kernel.send(:gem, "nomono", *nomono_activation_requirements) - require "nomono/bundler" - if direct_sibling_templating && !direct_sibling_local - ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local eval_nomono_gems( gems: direct_sibling_gems, - prefix: "STRUCTUREDMERGE", - path_env: "STRUCTUREDMERGE_DEV", - root: ["src", "my", "structuredmerge"] + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] ) rescue LoadError - warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' ensure if direct_sibling_templating && !direct_sibling_local if direct_sibling_dev_was_set - ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original else - ENV.delete("STRUCTUREDMERGE_DEV") + ENV.delete('STRUCTUREDMERGE_DEV') end end end @@ -334,25 +330,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging -eval_gemfile "gemfiles/modular/debug.gemfile" +eval_gemfile 'gemfiles/modular/debug.gemfile' # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile "gemfiles/modular/coverage.gemfile" +eval_gemfile 'gemfiles/modular/coverage.gemfile' # Linting -eval_gemfile "gemfiles/modular/style.gemfile" +eval_gemfile 'gemfiles/modular/style.gemfile' # Documentation -eval_gemfile "gemfiles/modular/documentation.gemfile" +eval_gemfile 'gemfiles/modular/documentation.gemfile' # Optional -eval_gemfile "gemfiles/modular/optional.gemfile" +eval_gemfile 'gemfiles/modular/optional.gemfile' ### Std Lib Extracted Gems -eval_gemfile "gemfiles/modular/x_std_libs.gemfile" +eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' # See unlocked_deps appraisal for more details on irb inclusion -gem "irb", "~> 1.17" # ruby >= 2.7 +gem 'irb', '~> 1.17' # ruby >= 2.7 diff --git a/gems/go-merge/Gemfile.lock b/gems/go-merge/Gemfile.lock index c35a1d0fa..d218b78d8 100644 --- a/gems/go-merge/Gemfile.lock +++ b/gems/go-merge/Gemfile.lock @@ -275,6 +275,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -308,7 +324,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -363,18 +378,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -538,22 +542,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -659,9 +659,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -739,7 +739,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -760,10 +759,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -838,13 +837,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/go-merge/Rakefile b/gems/go-merge/Rakefile index f7fe74fab..f0aa98d5f 100644 --- a/gems/go-merge/Rakefile +++ b/gems/go-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require "kettle/drift" + require 'kettle/drift' Kettle::Drift.install_tasks rescue LoadError - desc("(stub) kettle:drift:check is unavailable") - task("kettle:drift:check") do + desc('(stub) kettle:drift:check is unavailable') + task('kettle:drift:check') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:update is unavailable") - task("kettle:drift:update") do + desc('(stub) kettle:drift:update is unavailable') + task('kettle:drift:update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:force_update is unavailable") - task("kettle:drift:force_update") do + desc('(stub) kettle:drift:force_update is unavailable') + task('kettle:drift:force_update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift is unavailable") - task("kettle:drift" => "kettle:drift:update") + desc('(stub) kettle:drift is unavailable') + task('kettle:drift' => 'kettle:drift:update') end ### TEMPLATING TASKS diff --git a/gems/ruby-merge/.rubocop_gradual.lock b/gems/ruby-merge/.rubocop_gradual.lock deleted file mode 100644 index 827b7fe9d..000000000 --- a/gems/ruby-merge/.rubocop_gradual.lock +++ /dev/null @@ -1,390 +0,0 @@ -{ - ".simplecov:3590623278": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:2768890125": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/ruby-merge.rb:2992445753": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`ruby-merge.rb`) should use snake_case.", 5381] - ], - "lib/ruby/merge.rb:1549201317": [ - [21, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Ruby::Merge`.", 2866359175], - [21, 3, 117385, "Metrics/ModuleLength: Module has too many lines. [2664/100]", 3496752980], - [42, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3061257365], - [103, 5, 841, "Metrics/AbcSize: Assignment Branch Condition size for `parse_ruby` is too high. [<4, 16, 6> 17.55/17]", 1071201699], - [103, 5, 841, "Metrics/MethodLength: Method has too many lines. [16/10]", 1071201699], - [128, 5, 2656, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_method_move_detection` is too high. [<17, 40, 18> 47.04/17]", 3779436399], - [128, 5, 2656, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_method_move_detection` is too high. [16/7]", 3779436399], - [128, 5, 2656, "Metrics/MethodLength: Method has too many lines. [45/10]", 3779436399], - [128, 5, 2656, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_method_move_detection` is too high. [16/8]", 3779436399], - [140, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 727785047], - [153, 121, 51, "Layout/LineLength: Line is too long. [171/120]", 3259664538], - [172, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], - [175, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], - [176, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 1976354608], - [180, 5, 4374, "Metrics/AbcSize: Assignment Branch Condition size for `merge_ruby` is too high. [<31, 63, 24> 74.2/17]", 2749692967], - [180, 5, 4374, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_ruby` is too high. [21/7]", 2749692967], - [180, 5, 4374, "Metrics/MethodLength: Method has too many lines. [83/10]", 2749692967], - [180, 5, 4374, "Metrics/PerceivedComplexity: Perceived complexity for `merge_ruby` is too high. [22/8]", 2749692967], - [239, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], - [278, 5, 1312, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_delegated_child_operations` is too high. [<10, 15, 6> 19/17]", 2246428949], - [278, 5, 1312, "Metrics/MethodLength: Method has too many lines. [28/10]", 2246428949], - [324, 5, 861, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_source_owner_identity_profile` is too high. [<5, 17, 2> 17.83/17]", 4129925341], - [324, 5, 861, "Metrics/MethodLength: Method has too many lines. [20/10]", 4129925341], - [347, 5, 2064, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_source_owner_identity_matches` is too high. [<17, 31, 11> 37.03/17]", 2780319153], - [347, 5, 2064, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_source_owner_identity_matches` is too high. [11/7]", 2780319153], - [347, 5, 2064, "Metrics/MethodLength: Method has too many lines. [37/10]", 2780319153], - [347, 5, 2064, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_source_owner_identity_matches` is too high. [11/8]", 2780319153], - [376, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], - [379, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], - [384, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1001816794], - [390, 5, 1314, "Metrics/MethodLength: Method has too many lines. [28/10]", 4183124680], - [423, 5, 786, "Metrics/MethodLength: Method has too many lines. [24/10]", 3631640245], - [450, 5, 916, "Metrics/MethodLength: Method has too many lines. [18/10]", 631485532], - [471, 5, 662, "Metrics/MethodLength: Method has too many lines. [15/10]", 2231086183], - [490, 5, 777, "Metrics/MethodLength: Method has too many lines. [18/10]", 895030114], - [511, 5, 727, "Metrics/MethodLength: Method has too many lines. [19/10]", 776483642], - [533, 5, 861, "Metrics/MethodLength: Method has too many lines. [29/10]", 537340961], - [565, 5, 655, "Metrics/MethodLength: Method has too many lines. [16/10]", 3756601977], - [584, 5, 1592, "Metrics/MethodLength: Method has too many lines. [25/10]", 3521052904], - [608, 121, 106, "Layout/LineLength: Line is too long. [226/120]", 2104286058], - [614, 5, 777, "Metrics/MethodLength: Method has too many lines. [14/10]", 2821246515], - [631, 5, 1429, "Metrics/MethodLength: Method has too many lines. [26/10]", 244346226], - [654, 121, 124, "Layout/LineLength: Line is too long. [244/120]", 13261232], - [660, 5, 1367, "Metrics/MethodLength: Method has too many lines. [41/10]", 3883814121], - [704, 5, 750, "Metrics/MethodLength: Method has too many lines. [22/10]", 764028624], - [730, 5, 1315, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_silent_data_loss_validation_report` is too high. [<8, 14, 7> 17.58/17]", 2039399818], - [730, 5, 1315, "Metrics/MethodLength: Method has too many lines. [31/10]", 2039399818], - [765, 5, 724, "Metrics/MethodLength: Method has too many lines. [14/10]", 1741779676], - [776, 121, 67, "Layout/LineLength: Line is too long. [187/120]", 1996508131], - [782, 5, 752, "Metrics/MethodLength: Method has too many lines. [21/10]", 3870096101], - [806, 5, 1052, "Metrics/MethodLength: Method has too many lines. [32/10]", 119279638], - [841, 5, 1588, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_interstitial_comment_attachment_report` is too high. [<11, 34, 17> 39.57/17]", 4112280260], - [841, 5, 1588, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_interstitial_comment_attachment_report` is too high. [14/7]", 4112280260], - [841, 5, 1588, "Metrics/MethodLength: Method has too many lines. [30/10]", 4112280260], - [841, 5, 1588, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_interstitial_comment_attachment_report` is too high. [15/8]", 4112280260], - [855, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 180543822], - [883, 5, 536, "Metrics/MethodLength: Method has too many lines. [13/10]", 245509059], - [899, 5, 2252, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_rename_detection` is too high. [<14, 32, 11> 36.62/17]", 2574664763], - [899, 5, 2252, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_rename_detection` is too high. [10/7]", 2574664763], - [899, 5, 2252, "Metrics/MethodLength: Method has too many lines. [46/10]", 2574664763], - [899, 5, 2252, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_rename_detection` is too high. [11/8]", 2574664763], - [942, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 4074688513], - [948, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], - [952, 5, 2254, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_rename_plus_edit_conflicts` is too high. [<15, 30, 13> 35.97/17]", 3664513828], - [952, 5, 2254, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_rename_plus_edit_conflicts` is too high. [10/7]", 3664513828], - [952, 5, 2254, "Metrics/MethodLength: Method has too many lines. [45/10]", 3664513828], - [952, 5, 2254, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_rename_plus_edit_conflicts` is too high. [11/8]", 3664513828], - [1004, 5, 1926, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_cross_container_method_move_detection` is too high. [<8, 18, 7> 20.9/17]", 1401333972], - [1004, 5, 1926, "Metrics/MethodLength: Method has too many lines. [44/10]", 1401333972], - [1047, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3474944396], - [1054, 5, 1488, "Metrics/AbcSize: Assignment Branch Condition size for `apply_ruby_delegated_child_outputs` is too high. [<16, 39, 12> 43.83/17]", 842348215], - [1054, 5, 1488, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_ruby_delegated_child_outputs` is too high. [12/7]", 842348215], - [1054, 5, 1488, "Metrics/MethodLength: Method has too many lines. [27/10]", 842348215], - [1054, 5, 1488, "Metrics/PerceivedComplexity: Perceived complexity for `apply_ruby_delegated_child_outputs` is too high. [13/8]", 842348215], - [1088, 5, 980, "Metrics/MethodLength: Method has too many lines. [23/10]", 1425119613], - [1115, 5, 1025, "Metrics/MethodLength: Method has too many lines. [23/10]", 2179557432], - [1143, 5, 757, "Metrics/MethodLength: Method has too many lines. [12/10]", 3975431355], - [1148, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 1956194284], - [1160, 5, 745, "Metrics/MethodLength: Method has too many lines. [12/10]", 1051086033], - [1165, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1636990749], - [1177, 5, 670, "Metrics/MethodLength: Method has too many lines. [11/10]", 3552666292], - [1182, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 3013228499], - [1193, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 1356230953], - [1198, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 3013228499], - [1209, 5, 2093, "Metrics/AbcSize: Assignment Branch Condition size for `analyze_ruby_document` is too high. [<21, 31, 12> 39.32/17]", 3298966582], - [1209, 5, 2093, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `analyze_ruby_document` is too high. [13/7]", 3298966582], - [1209, 5, 2093, "Metrics/MethodLength: Method has too many lines. [53/10]", 3298966582], - [1209, 5, 2093, "Metrics/PerceivedComplexity: Perceived complexity for `analyze_ruby_document` is too high. [13/8]", 3298966582], - [1215, 7, 1035, "Metrics/BlockLength: Block has too many lines. [27/25]", 2081528636], - [1284, 5, 427, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_file_footer_text` is too high. [<5, 17, 8> 19.44/17]", 1703748308], - [1311, 5, 806, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_process_analysis_from_tree` is too high. [10/7]", 1109735749], - [1311, 5, 806, "Metrics/MethodLength: Method has too many lines. [19/10]", 1109735749], - [1361, 5, 533, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_import_item_from_begin_node` is too high. [8/7]", 582163830], - [1383, 5, 487, "Metrics/MethodLength: Method has too many lines. [12/10]", 3257507103], - [1400, 5, 583, "Metrics/MethodLength: Method has too many lines. [15/10]", 4108141408], - [1443, 5, 645, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_import_span_for` is too high. [<6, 22, 9> 24.52/17]", 1779826452], - [1443, 5, 645, "Metrics/MethodLength: Method has too many lines. [12/10]", 1779826452], - [1495, 5, 1015, "Metrics/MethodLength: Method has too many lines. [16/10]", 1317835917], - [1501, 121, 173, "Layout/LineLength: Line is too long. [293/120]", 225499532], - [1528, 5, 518, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_tslp_claimed_line_indexes` is too high. [<6, 19, 5> 20.54/17]", 1455439838], - [1551, 5, 443, "Metrics/MethodLength: Method has too many lines. [12/10]", 4230588206], - [1568, 5, 363, "Metrics/MethodLength: Method has too many lines. [11/10]", 3068065572], - [1629, 5, 1849, "Metrics/AbcSize: Assignment Branch Condition size for `legacy_collect_ruby_declaration_entries` is too high. [<24, 26, 13> 37.7/17]", 3187770326], - [1629, 5, 1849, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `legacy_collect_ruby_declaration_entries` is too high. [11/7]", 3187770326], - [1629, 5, 1849, "Metrics/MethodLength: Method has too many lines. [54/10]", 3187770326], - [1629, 5, 1849, "Metrics/PerceivedComplexity: Perceived complexity for `legacy_collect_ruby_declaration_entries` is too high. [11/8]", 3187770326], - [1676, 13, 76, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 1356567820], - [1712, 5, 396, "Metrics/MethodLength: Method has too many lines. [11/10]", 1239008881], - [1727, 5, 681, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_process_declaration_entries` is too high. [<7, 17, 2> 18.49/17]", 2675999354], - [1727, 5, 681, "Metrics/MethodLength: Method has too many lines. [16/10]", 2675999354], - [1747, 5, 634, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_top_level_process_structure_items` is too high. [<5, 32, 14> 35.28/17]", 1120707166], - [1747, 5, 634, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_top_level_process_structure_items` is too high. [11/7]", 1120707166], - [1747, 5, 634, "Metrics/MethodLength: Method has too many lines. [11/10]", 1120707166], - [1747, 5, 634, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_top_level_process_structure_items` is too high. [11/8]", 1120707166], - [1759, 7, 11, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 848344986], - [1766, 7, 9, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 3648222389], - [1811, 5, 1284, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_intra_owner_merge_plan` is too high. [<8, 24, 9> 26.85/17]", 2388567699], - [1811, 5, 1284, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_intra_owner_merge_plan` is too high. [9/7]", 2388567699], - [1811, 5, 1284, "Metrics/MethodLength: Method has too many lines. [22/10]", 2388567699], - [1811, 5, 1284, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_intra_owner_merge_plan` is too high. [9/8]", 2388567699], - [1852, 5, 557, "Metrics/MethodLength: Method has too many lines. [11/10]", 3178341030], - [1910, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 895013151], - [1915, 5, 593, "Metrics/MethodLength: Method has too many lines. [13/10]", 2850316611], - [1916, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177625], - [1933, 5, 609, "Metrics/MethodLength: Method has too many lines. [12/10]", 784855730], - [1948, 5, 695, "Metrics/MethodLength: Method has too many lines. [14/10]", 3942458504], - [1985, 5, 1114, "Metrics/AbcSize: Assignment Branch Condition size for `merge_declaration_hash_constants` is too high. [<11, 22, 6> 25.32/17]", 3861922947], - [1985, 5, 1114, "Metrics/MethodLength: Method has too many lines. [17/10]", 3861922947], - [2007, 5, 794, "Metrics/AbcSize: Assignment Branch Condition size for `merge_declaration_body_constants` is too high. [<9, 14, 6> 17.69/17]", 1882117166], - [2037, 5, 1138, "Metrics/AbcSize: Assignment Branch Condition size for `merge_array_constant_text` is too high. [<9, 18, 7> 21.31/17]", 1448081799], - [2037, 5, 1138, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_array_constant_text` is too high. [8/7]", 1448081799], - [2037, 5, 1138, "Metrics/MethodLength: Method has too many lines. [15/10]", 1448081799], - [2043, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193434112], - [2050, 7, 8, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 359846632], - [2057, 5, 774, "Metrics/AbcSize: Assignment Branch Condition size for `merge_percent_array_constant_text` is too high. [<8, 16, 7> 19.21/17]", 625509828], - [2057, 5, 774, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_percent_array_constant_text` is too high. [8/7]", 625509828], - [2086, 5, 1060, "Metrics/AbcSize: Assignment Branch Condition size for `merge_multiline_array_constant_text` is too high. [<11, 23, 10> 27.39/17]", 2672751288], - [2086, 5, 1060, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_multiline_array_constant_text` is too high. [11/7]", 2672751288], - [2086, 5, 1060, "Metrics/MethodLength: Method has too many lines. [13/10]", 2672751288], - [2086, 5, 1060, "Metrics/PerceivedComplexity: Perceived complexity for `merge_multiline_array_constant_text` is too high. [11/8]", 2672751288], - [2095, 7, 8, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 359846632], - [2104, 5, 1605, "Metrics/AbcSize: Assignment Branch Condition size for `merge_declaration_body_methods` is too high. [<21, 28, 15> 38.08/17]", 2740924329], - [2104, 5, 1605, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_declaration_body_methods` is too high. [14/7]", 2740924329], - [2104, 5, 1605, "Metrics/MethodLength: Method has too many lines. [29/10]", 2740924329], - [2104, 5, 1605, "Metrics/PerceivedComplexity: Perceived complexity for `merge_declaration_body_methods` is too high. [15/8]", 2740924329], - [2111, 7, 8, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 359846632], - [2138, 5, 1076, "Metrics/AbcSize: Assignment Branch Condition size for `merge_nested_body_declarations` is too high. [<14, 24, 10> 29.53/17]", 1397199527], - [2138, 5, 1076, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_nested_body_declarations` is too high. [11/7]", 1397199527], - [2138, 5, 1076, "Metrics/MethodLength: Method has too many lines. [14/10]", 1397199527], - [2138, 5, 1076, "Metrics/PerceivedComplexity: Perceived complexity for `merge_nested_body_declarations` is too high. [11/8]", 1397199527], - [2177, 5, 2549, "Metrics/AbcSize: Assignment Branch Condition size for `top_level_source_region_owners` is too high. [<24, 33, 13> 42.83/17]", 1909271685], - [2177, 5, 2549, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `top_level_source_region_owners` is too high. [11/7]", 1909271685], - [2177, 5, 2549, "Metrics/MethodLength: Method has too many lines. [64/10]", 1909271685], - [2177, 5, 2549, "Metrics/PerceivedComplexity: Perceived complexity for `top_level_source_region_owners` is too high. [11/8]", 1909271685], - [2220, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861626], - [2235, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1695648499], - [2251, 5, 2126, "Metrics/AbcSize: Assignment Branch Condition size for `container_child_source_regions` is too high. [<23, 28, 11> 37.87/17]", 4031983731], - [2251, 5, 2126, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `container_child_source_regions` is too high. [10/7]", 4031983731], - [2251, 5, 2126, "Metrics/MethodLength: Method has too many lines. [56/10]", 4031983731], - [2251, 5, 2126, "Metrics/PerceivedComplexity: Perceived complexity for `container_child_source_regions` is too high. [10/8]", 4031983731], - [2317, 5, 996, "Metrics/AbcSize: Assignment Branch Condition size for `interleave_source_regions` is too high. [<8, 14, 6> 17.2/17]", 796443872], - [2317, 5, 996, "Metrics/MethodLength: Method has too many lines. [30/10]", 796443872], - [2355, 5, 1323, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `source_interstitial_region` is too high. [13/7]", 1970451685], - [2355, 5, 1323, "Metrics/MethodLength: Method has too many lines. [30/10]", 1970451685], - [2355, 5, 1323, "Metrics/PerceivedComplexity: Perceived complexity for `source_interstitial_region` is too high. [12/8]", 1970451685], - [2355, 35, 80, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2143999554], - [2390, 5, 396, "Metrics/MethodLength: Method has too many lines. [12/10]", 663734283], - [2406, 5, 890, "Metrics/AbcSize: Assignment Branch Condition size for `collect_blank_line_regions` is too high. [<4, 18, 7> 19.72/17]", 3362926457], - [2406, 5, 890, "Metrics/MethodLength: Method has too many lines. [20/10]", 3362926457], - [2465, 5, 30, "Style/Documentation: Missing top-level documentation comment for `class Ruby::Merge::RubyHashLiteralProjector`.", 2586933062], - [2465, 5, 5733, "Metrics/ClassLength: Class has too many lines. [144/100]", 48390292], - [2498, 7, 617, "Metrics/MethodLength: Method has too many lines. [15/10]", 1617225783], - [2522, 7, 943, "Metrics/AbcSize: Assignment Branch Condition size for `project_hash_key` is too high. [<1, 18, 8> 19.72/17]", 3538404248], - [2522, 7, 943, "Metrics/MethodLength: Method has too many lines. [26/10]", 3538404248], - [2580, 7, 616, "Metrics/AbcSize: Assignment Branch Condition size for `trailing_comma?` is too high. [<3, 20, 6> 21.1/17]", 1517912413], - [2645, 5, 1202, "Metrics/AbcSize: Assignment Branch Condition size for `constant_hash_blocks` is too high. [<19, 25, 6> 31.97/17]", 399214756], - [2645, 5, 1202, "Metrics/MethodLength: Method has too many lines. [36/10]", 399214756], - [2686, 5, 727, "Metrics/AbcSize: Assignment Branch Condition size for `hash_assignment_finish_line` is too high. [<11, 7, 12> 17.72/17]", 1215874404], - [2686, 5, 727, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `hash_assignment_finish_line` is too high. [9/7]", 1215874404], - [2686, 5, 727, "Metrics/MethodLength: Method has too many lines. [26/10]", 1215874404], - [2686, 5, 727, "Metrics/PerceivedComplexity: Perceived complexity for `hash_assignment_finish_line` is too high. [11/8]", 1215874404], - [2716, 5, 2007, "Metrics/AbcSize: Assignment Branch Condition size for `direct_body_method_entries` is too high. [<28, 33, 13> 45.19/17]", 2589282610], - [2716, 5, 2007, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `direct_body_method_entries` is too high. [12/7]", 2589282610], - [2716, 5, 2007, "Metrics/MethodLength: Method has too many lines. [56/10]", 2589282610], - [2716, 5, 2007, "Metrics/PerceivedComplexity: Perceived complexity for `direct_body_method_entries` is too high. [12/8]", 2589282610], - [2781, 5, 1221, "Metrics/AbcSize: Assignment Branch Condition size for `direct_body_constant_entries` is too high. [<16, 34, 10> 38.88/17]", 1588885504], - [2781, 5, 1221, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `direct_body_constant_entries` is too high. [9/7]", 1588885504], - [2781, 5, 1221, "Metrics/MethodLength: Method has too many lines. [35/10]", 1588885504], - [2781, 5, 1221, "Metrics/PerceivedComplexity: Perceived complexity for `direct_body_constant_entries` is too high. [9/8]", 1588885504], - [2824, 5, 708, "Metrics/AbcSize: Assignment Branch Condition size for `split_ruby_array_elements` is too high. [<11, 12, 11> 19.65/17]", 1344003748], - [2824, 5, 708, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split_ruby_array_elements` is too high. [9/7]", 1344003748], - [2824, 5, 708, "Metrics/MethodLength: Method has too many lines. [24/10]", 1344003748], - [2824, 5, 708, "Metrics/PerceivedComplexity: Perceived complexity for `split_ruby_array_elements` is too high. [11/8]", 1344003748], - [2868, 5, 977, "Metrics/AbcSize: Assignment Branch Condition size for `append_multiline_array_elements` is too high. [<12, 32, 9> 35.34/17]", 1316332112], - [2868, 5, 977, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `append_multiline_array_elements` is too high. [9/7]", 1316332112], - [2868, 5, 977, "Metrics/MethodLength: Method has too many lines. [16/10]", 1316332112], - [2868, 5, 977, "Metrics/PerceivedComplexity: Perceived complexity for `append_multiline_array_elements` is too high. [9/8]", 1316332112], - [2896, 5, 728, "Metrics/AbcSize: Assignment Branch Condition size for `array_assignment_finish_line` is too high. [<11, 7, 12> 17.72/17]", 1471354607], - [2896, 5, 728, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `array_assignment_finish_line` is too high. [9/7]", 1471354607], - [2896, 5, 728, "Metrics/MethodLength: Method has too many lines. [26/10]", 1471354607], - [2896, 5, 728, "Metrics/PerceivedComplexity: Perceived complexity for `array_assignment_finish_line` is too high. [11/8]", 1471354607], - [2932, 5, 1127, "Metrics/AbcSize: Assignment Branch Condition size for `direct_body_declaration_entries` is too high. [<14, 30, 7> 33.84/17]", 1223661118], - [2932, 5, 1127, "Metrics/MethodLength: Method has too many lines. [30/10]", 1223661118], - [2979, 5, 984, "Metrics/AbcSize: Assignment Branch Condition size for `insert_declaration_body_blocks` is too high. [<4, 23, 12> 26.25/17]", 159690081], - [2979, 5, 984, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `insert_declaration_body_blocks` is too high. [9/7]", 159690081], - [2979, 5, 984, "Metrics/MethodLength: Method has too many lines. [16/10]", 159690081], - [2979, 5, 984, "Metrics/PerceivedComplexity: Perceived complexity for `insert_declaration_body_blocks` is too high. [10/8]", 159690081], - [3024, 5, 1027, "Metrics/AbcSize: Assignment Branch Condition size for `merge_ruby_hash_literals` is too high. [<8, 30, 9> 32.33/17]", 2793745298], - [3024, 5, 1027, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_ruby_hash_literals` is too high. [9/7]", 2793745298], - [3024, 5, 1027, "Metrics/MethodLength: Method has too many lines. [19/10]", 2793745298], - [3024, 5, 1027, "Metrics/PerceivedComplexity: Perceived complexity for `merge_ruby_hash_literals` is too high. [10/8]", 2793745298], - [3046, 5, 636, "Metrics/AbcSize: Assignment Branch Condition size for `render_ruby_hash_literal` is too high. [<5, 19, 6> 20.54/17]", 1834383244], - [3086, 5, 491, "Metrics/MethodLength: Method has too many lines. [11/10]", 1799924605], - [3119, 5, 1125, "Metrics/AbcSize: Assignment Branch Condition size for `surfaces_for_owner` is too high. [<6, 19, 3> 20.15/17]", 4036098594], - [3119, 5, 1125, "Metrics/MethodLength: Method has too many lines. [20/10]", 4036098594], - [3144, 5, 1126, "Metrics/AbcSize: Assignment Branch Condition size for `example_surfaces_for` is too high. [<4, 20, 2> 20.49/17]", 757808110], - [3144, 5, 1126, "Metrics/MethodLength: Method has too many lines. [21/10]", 757808110] - ], - "lib/ruby/merge/block_directive_detector.rb:315354690": [ - [10, 5, 6220, "Metrics/ClassLength: Class has too many lines. [161/100]", 3182117306], - [83, 7, 1085, "Metrics/AbcSize: Assignment Branch Condition size for `detect_freeze_spans` is too high. [<10, 18, 6> 21.45/17]", 3827147306], - [83, 7, 1085, "Metrics/MethodLength: Method has too many lines. [27/10]", 3827147306], - [117, 7, 1508, "Metrics/AbcSize: Assignment Branch Condition size for `detect_nocov_spans` is too high. [<10, 30, 10> 33.17/17]", 3750116369], - [117, 7, 1508, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_nocov_spans` is too high. [9/7]", 3750116369], - [117, 7, 1508, "Metrics/MethodLength: Method has too many lines. [40/10]", 3750116369], - [117, 7, 1508, "Metrics/PerceivedComplexity: Perceived complexity for `detect_nocov_spans` is too high. [12/8]", 3750116369], - [125, 9, 1189, "Metrics/BlockLength: Block has too many lines. [30/25]", 431470454], - [165, 7, 921, "Metrics/AbcSize: Assignment Branch Condition size for `validate_no_crossing` is too high. [<8, 16, 8> 19.6/17]", 1072352384], - [165, 7, 921, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_no_crossing` is too high. [8/7]", 1072352384], - [165, 7, 921, "Metrics/MethodLength: Method has too many lines. [19/10]", 1072352384], - [193, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193343749], - [194, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860841] - ], - "lib/ruby/merge/doc_comment_support.rb:11585367": [ - [71, 7, 950, "Metrics/AbcSize: Assignment Branch Condition size for `example_blocks` is too high. [<8, 17, 8> 20.42/17]", 878231540], - [71, 7, 950, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `example_blocks` is too high. [8/7]", 878231540], - [71, 7, 950, "Metrics/MethodLength: Method has too many lines. [19/10]", 878231540] - ], - "lib/ruby/merge/gemspec_support.rb:672395758": [ - [5, 5, 21, "Style/Documentation: Missing top-level documentation comment for `module Ruby::Merge::GemspecSupport`.", 593910650] - ], - "lib/ruby/merge/magic_comment_support.rb:2193186223": [ - [26, 7, 1484, "Metrics/AbcSize: Assignment Branch Condition size for `comment_only_prefix_info` is too high. [<9, 38, 8> 39.86/17]", 1098666313], - [26, 7, 1484, "Metrics/MethodLength: Method has too many lines. [33/10]", 1098666313], - [69, 7, 693, "Metrics/AbcSize: Assignment Branch Condition size for `header_magic_comment_types_for_lines` is too high. [<10, 13, 9> 18.71/17]", 3693768719], - [69, 7, 693, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `header_magic_comment_types_for_lines` is too high. [8/7]", 3693768719], - [69, 7, 693, "Metrics/MethodLength: Method has too many lines. [16/10]", 3693768719], - [93, 7, 747, "Metrics/AbcSize: Assignment Branch Condition size for `prefix_comment_line_numbers_for_comments` is too high. [<10, 12, 7> 17.12/17]", 1181507516], - [93, 7, 747, "Metrics/MethodLength: Method has too many lines. [19/10]", 1181507516] - ], - "lib/ruby/merge/method_similarity.rb:3120642740": [ - [5, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ruby::Merge::MethodSimilarity`.", 3784960433], - [23, 7, 493, "Metrics/AbcSize: Assignment Branch Condition size for `param_similarity` is too high. [<4, 19, 4> 19.82/17]", 1175888813], - [45, 7, 738, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<13, 29, 8> 32.77/17]", 1085087702], - [45, 7, 738, "Metrics/MethodLength: Method has too many lines. [20/10]", 1085087702] - ], - "lib/ruby/merge/nocov_node_base.rb:1713613866": [ - [23, 21, 84, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3439911158], - [51, 7, 353, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `signature` is too high. [8/7]", 3442013923], - [51, 7, 353, "Metrics/PerceivedComplexity: Perceived complexity for `signature` is too high. [9/8]", 3442013923] - ], - "lib/ruby/merge/rescue_semantics.rb:2728370094": [ - [5, 5, 21, "Style/Documentation: Missing top-level documentation comment for `class Ruby::Merge::RescueSemantics`.", 4002082661], - [5, 5, 8140, "Metrics/ClassLength: Class has too many lines. [157/100]", 3302970297], - [10, 7, 812, "Metrics/AbcSize: Assignment Branch Condition size for `merge_ordered_clause_types` is too high. [<9, 17, 8> 20.83/17]", 391537814], - [10, 7, 812, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_ordered_clause_types` is too high. [8/7]", 391537814], - [10, 7, 812, "Metrics/MethodLength: Method has too many lines. [16/10]", 391537814], - [10, 7, 812, "Metrics/PerceivedComplexity: Perceived complexity for `merge_ordered_clause_types` is too high. [9/8]", 391537814], - [33, 7, 1470, "Metrics/AbcSize: Assignment Branch Condition size for `canonicalize_rescue_clause_order` is too high. [<18, 28, 14> 36.11/17]", 570708009], - [33, 7, 1470, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonicalize_rescue_clause_order` is too high. [14/7]", 570708009], - [33, 7, 1470, "Metrics/MethodLength: Method has too many lines. [24/10]", 570708009], - [33, 7, 1470, "Metrics/PerceivedComplexity: Perceived complexity for `canonicalize_rescue_clause_order` is too high. [14/8]", 570708009], - [113, 7, 1080, "Metrics/AbcSize: Assignment Branch Condition size for `source_defined_exception_hierarchy` is too high. [<9, 20, 10> 24.1/17]", 3196945148], - [113, 7, 1080, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `source_defined_exception_hierarchy` is too high. [10/7]", 3196945148], - [113, 7, 1080, "Metrics/MethodLength: Method has too many lines. [15/10]", 3196945148], - [113, 7, 1080, "Metrics/PerceivedComplexity: Perceived complexity for `source_defined_exception_hierarchy` is too high. [11/8]", 3196945148], - [126, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1806710570] - ], - "lib/ruby/merge/scaffold_chunk_support.rb:640658628": [ - [5, 5, 27, "Style/Documentation: Missing top-level documentation comment for `module Ruby::Merge::ScaffoldChunkSupport`.", 2416541725] - ], - "lib/ruby/merge/signature_support.rb:1167161535": [ - [5, 5, 23, "Style/Documentation: Missing top-level documentation comment for `module Ruby::Merge::SignatureSupport`.", 2080470772] - ], - "ruby-merge.gemspec:503862341": [ - [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ], - "spec/fixtures_integration_spec.rb:2791875397": [ - [7, 1, 71426, "Metrics/BlockLength: Block has too many lines. [1643/25]", 1328376978], - [8, 3, 94, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 4224869601], - [9, 3, 80, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3493759864], - [10, 3, 72, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 218819604], - [11, 3, 83, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3957977039], - [125, 3, 1207, "Metrics/BlockLength: Block has too many lines. [27/25]", 2841005266], - [206, 3, 1550, "Metrics/BlockLength: Block has too many lines. [44/25]", 1381861178], - [257, 3, 1209, "Metrics/BlockLength: Block has too many lines. [33/25]", 1745132505], - [297, 3, 61330, "Metrics/BlockLength: Block has too many lines. [1387/25]", 3444780370], - [693, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859109], - [1777, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3355833611], - [1784, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 38619260] - ], - "spec/hash_literal_projector_spec.rb:2425567956": [ - [13, 41, 31, "Lint/PercentStringArray: Within `%w`/`%W`, quotes and ',' are unnecessary and may be unwanted in the resulting strings.", 3214960854] - ], - "spec/rescue_semantics_spec.rb:2518131257": [ - [5, 1, 2150, "Metrics/BlockLength: Block has too many lines. [59/25]", 163524539] - ] -} diff --git a/gems/ruby-merge/Gemfile.lock b/gems/ruby-merge/Gemfile.lock index 691f91a12..d8758159d 100644 --- a/gems/ruby-merge/Gemfile.lock +++ b/gems/ruby-merge/Gemfile.lock @@ -275,6 +275,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -308,7 +324,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -363,18 +378,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -538,22 +542,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -659,9 +659,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -739,7 +739,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -760,10 +759,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -838,13 +837,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/ruby-merge/bin/yard b/gems/ruby-merge/bin/yard index 5d516ad6f..a7e8b6eed 100755 --- a/gems/ruby-merge/bin/yard +++ b/gems/ruby-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec('bundle', 'exec', 'rake', 'yard') +exec("bundle", "exec", "rake", "yard") diff --git a/gems/toml-merge/.rubocop_gradual.lock b/gems/toml-merge/.rubocop_gradual.lock new file mode 100644 index 000000000..918c85d88 --- /dev/null +++ b/gems/toml-merge/.rubocop_gradual.lock @@ -0,0 +1,258 @@ +{ + ".simplecov:3682400110": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:133885645": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/toml-merge.rb:3814390984": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`toml-merge.rb`) should use snake_case.", 5381], + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "lib/toml/merge.rb:3069711497": [ + [39, 3, 12193, "Metrics/ModuleLength: Module has too many lines. [231/100]", 1479901406], + [114, 5, 9241, "Metrics/ClassLength: Class has too many lines. [205/100]", 349141169], + [156, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1773216188], + [165, 7, 709, "Metrics/MethodLength: Method has too many lines. [17/10]", 2355964538], + [191, 7, 1280, "Metrics/AbcSize: Assignment Branch Condition size for `merge_toml` is too high. [<6, 16, 6> 18.11/17]", 2322240506], + [191, 7, 1280, "Metrics/MethodLength: Method has too many lines. [25/10]", 2322240506], + [195, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1773216188], + [222, 7, 1401, "Metrics/AbcSize: Assignment Branch Condition size for `merge_toml_with_parser` is too high. [<6, 18, 6> 19.9/17]", 3118052892], + [222, 7, 1401, "Metrics/MethodLength: Method has too many lines. [24/10]", 3118052892], + [321, 9, 11, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 848344986] + ], + "lib/toml/merge/comment_tracker.rb:743656609": [ + [16, 5, 5242, "Metrics/ClassLength: Class has too many lines. [112/100]", 3014190138], + [28, 7, 990, "Metrics/MethodLength: Method has too many lines. [17/10]", 85804539], + [92, 7, 949, "Metrics/AbcSize: Assignment Branch Condition size for `build_toml_region` is too high. [<7, 21, 9> 23.9/17]", 552845000], + [92, 7, 949, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_toml_region` is too high. [9/7]", 552845000], + [92, 7, 949, "Metrics/MethodLength: Method has too many lines. [23/10]", 552845000], + [92, 7, 949, "Metrics/PerceivedComplexity: Perceived complexity for `build_toml_region` is too high. [9/8]", 552845000] + ], + "lib/toml/merge/conflict_resolver.rb:2699752146": [ + [11, 5, 42658, "Metrics/ClassLength: Class has too many lines. [791/100]", 2931993361], + [30, 7, 788, "Metrics/MethodLength: Method has too many lines. [13/10]", 2218400960], + [30, 21, 235, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 788504679], + [31, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3099130903], + [52, 7, 1676, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_batch` is too high. [<4, 24, 3> 24.52/17]", 623996510], + [52, 7, 1676, "Metrics/MethodLength: Method has too many lines. [29/10]", 623996510], + [53, 9, 1632, "Metrics/BlockLength: Block has too many lines. [27/25]", 3553849414], + [101, 7, 8464, "Metrics/AbcSize: Assignment Branch Condition size for `merge_node_lists_to_emitter` is too high. [<54, 88, 31> 107.8/17]", 3669765511], + [101, 7, 8464, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_node_lists_to_emitter` is too high. [27/7]", 3669765511], + [101, 7, 8464, "Metrics/MethodLength: Method has too many lines. [141/10]", 3669765511], + [101, 7, 8464, "Metrics/PerceivedComplexity: Perceived complexity for `merge_node_lists_to_emitter` is too high. [29/8]", 3669765511], + [146, 9, 5685, "Metrics/BlockLength: Block has too many lines. [102/25]", 464560406], + [286, 7, 2458, "Metrics/AbcSize: Assignment Branch Condition size for `merge_matched_nodes_to_emitter` is too high. [<6, 17, 10> 20.62/17]", 4036358483], + [286, 7, 2458, "Metrics/MethodLength: Method has too many lines. [49/10]", 4036358483], + [286, 7, 2458, "Metrics/PerceivedComplexity: Perceived complexity for `merge_matched_nodes_to_emitter` is too high. [9/8]", 4036358483], + [289, 11, 1647, "Metrics/BlockLength: Block has too many lines. [34/25]", 997955803], + [353, 7, 770, "Metrics/MethodLength: Method has too many lines. [21/10]", 543737609], + [387, 7, 1101, "Metrics/AbcSize: Assignment Branch Condition size for `build_refined_matches` is too high. [<11, 16, 8> 21/17]", 4236016583], + [387, 7, 1101, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_refined_matches` is too high. [9/7]", 4236016583], + [387, 7, 1101, "Metrics/MethodLength: Method has too many lines. [18/10]", 4236016583], + [387, 7, 1101, "Metrics/PerceivedComplexity: Perceived complexity for `build_refined_matches` is too high. [9/8]", 4236016583], + [427, 7, 642, "Metrics/AbcSize: Assignment Branch Condition size for `emit_removed_destination_node_inline_comments` is too high. [<4, 20, 5> 21/17]", 2624953678], + [427, 7, 642, "Metrics/MethodLength: Method has too many lines. [11/10]", 2624953678], + [462, 7, 720, "Metrics/MethodLength: Method has too many lines. [11/10]", 4270722493], + [499, 7, 1022, "Metrics/MethodLength: Method has too many lines. [17/10]", 3216685542], + [584, 7, 1854, "Metrics/AbcSize: Assignment Branch Condition size for `emit_leading_region` is too high. [<8, 28, 9> 30.48/17]", 377203837], + [584, 7, 1854, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_leading_region` is too high. [10/7]", 377203837], + [584, 7, 1854, "Metrics/MethodLength: Method has too many lines. [32/10]", 377203837], + [584, 7, 1854, "Metrics/PerceivedComplexity: Perceived complexity for `emit_leading_region` is too high. [10/8]", 377203837], + [685, 7, 1275, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_template_preamble_prefix_region` is too high. [<7, 24, 9> 26.57/17]", 1754222078], + [685, 7, 1275, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collapse_template_preamble_prefix_region` is too high. [8/7]", 1754222078], + [685, 7, 1275, "Metrics/MethodLength: Method has too many lines. [24/10]", 1754222078], + [716, 7, 662, "Metrics/AbcSize: Assignment Branch Condition size for `root_boundary_lines_for` is too high. [<4, 15, 10> 18.47/17]", 935744348], + [716, 7, 662, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `root_boundary_lines_for` is too high. [9/7]", 935744348], + [716, 7, 662, "Metrics/MethodLength: Method has too many lines. [14/10]", 935744348], + [736, 7, 343, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `region_lines_for` is too high. [8/7]", 399995706], + [753, 7, 614, "Metrics/AbcSize: Assignment Branch Condition size for `dedup_warning_context` is too high. [<0, 20, 10> 22.36/17]", 2011768288], + [753, 7, 614, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `dedup_warning_context` is too high. [11/7]", 2011768288], + [753, 7, 614, "Metrics/PerceivedComplexity: Perceived complexity for `dedup_warning_context` is too high. [11/8]", 2011768288], + [756, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [757, 41, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [757, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 3287405165], + [783, 7, 1426, "Metrics/MethodLength: Method has too many lines. [34/10]", 1351993853], + [849, 7, 955, "Metrics/MethodLength: Method has too many lines. [21/10]", 3080929417], + [877, 7, 1249, "Metrics/AbcSize: Assignment Branch Condition size for `emit_node_lines` is too high. [<6, 21, 6> 22.65/17]", 3195628693], + [877, 7, 1249, "Metrics/MethodLength: Method has too many lines. [21/10]", 3195628693], + [952, 7, 637, "Metrics/AbcSize: Assignment Branch Condition size for `inline_region_separator` is too high. [<5, 18, 7> 19.95/17]", 2029360360], + [952, 7, 637, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `inline_region_separator` is too high. [8/7]", 2029360360], + [952, 7, 637, "Metrics/MethodLength: Method has too many lines. [12/10]", 2029360360], + [969, 7, 465, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_interstitial_blank_lines` is too high. [9/7]", 1640065866], + [969, 7, 465, "Metrics/PerceivedComplexity: Perceived complexity for `emit_interstitial_blank_lines` is too high. [9/8]", 1640065866], + [981, 7, 620, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_gap_before_node` is too high. [12/7]", 2808239642], + [981, 7, 620, "Metrics/PerceivedComplexity: Perceived complexity for `emit_gap_before_node` is too high. [12/8]", 2808239642], + [983, 36, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [998, 7, 526, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_preceding_blank_lines` is too high. [8/7]", 3889743093], + [998, 7, 526, "Metrics/MethodLength: Method has too many lines. [11/10]", 3889743093] + ], + "lib/toml/merge/file_analysis.rb:2630402533": [ + [12, 5, 19537, "Metrics/ClassLength: Class has too many lines. [368/100]", 929433986], + [15, 7, 22, "Style/Documentation: Missing top-level documentation comment for `class Toml::Merge::FileAnalysis::CommentAugmenter`.", 2864244718], + [20, 9, 849, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<11, 13, 1> 17.06/17]", 1333266342], + [20, 9, 849, "Metrics/MethodLength: Method has too many lines. [16/10]", 1333266342], + [72, 7, 869, "Metrics/MethodLength: Method has too many lines. [13/10]", 1683071581], + [228, 7, 959, "Metrics/AbcSize: Assignment Branch Condition size for `root_pairs` is too high. [<10, 13, 16> 22.91/17]", 1481059821], + [228, 7, 959, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `root_pairs` is too high. [15/7]", 1481059821], + [228, 7, 959, "Metrics/MethodLength: Method has too many lines. [21/10]", 1481059821], + [228, 7, 959, "Metrics/PerceivedComplexity: Perceived complexity for `root_pairs` is too high. [15/8]", 1481059821], + [246, 9, 384, "Style/CombinableLoops: Combine this loop with the previous loop.", 2434692315], + [263, 7, 1743, "Metrics/AbcSize: Assignment Branch Condition size for `parse_toml` is too high. [<10, 12, 8> 17.55/17]", 1966830746], + [263, 7, 1743, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_toml` is too high. [9/7]", 1966830746], + [263, 7, 1743, "Metrics/MethodLength: Method has too many lines. [19/10]", 1966830746], + [331, 7, 596, "Metrics/MethodLength: Method has too many lines. [13/10]", 995924372], + [389, 7, 588, "Metrics/AbcSize: Assignment Branch Condition size for `comment_owner_end_line_for_augmenter` is too high. [<1, 20, 13> 23.87/17]", 1972553155], + [389, 7, 588, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `comment_owner_end_line_for_augmenter` is too high. [14/7]", 1972553155], + [389, 7, 588, "Metrics/PerceivedComplexity: Perceived complexity for `comment_owner_end_line_for_augmenter` is too high. [14/8]", 1972553155], + [448, 7, 1255, "Metrics/AbcSize: Assignment Branch Condition size for `scan_line_for_comment` is too high. [<16, 13, 17> 26.72/17]", 622981429], + [448, 7, 1255, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `scan_line_for_comment` is too high. [12/7]", 622981429], + [448, 7, 1255, "Metrics/MethodLength: Method has too many lines. [38/10]", 622981429], + [448, 7, 1255, "Metrics/PerceivedComplexity: Perceived complexity for `scan_line_for_comment` is too high. [13/8]", 622981429], + [496, 7, 319, "Metrics/MethodLength: Method has too many lines. [11/10]", 2890996257], + [535, 7, 416, "Metrics/MethodLength: Method has too many lines. [11/10]", 2416972242], + [576, 7, 464, "Metrics/AbcSize: Assignment Branch Condition size for `node_text` is too high. [<3, 16, 8> 18.14/17]", 2138809005], + [576, 7, 464, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `node_text` is too high. [8/7]", 2138809005] + ], + "lib/toml/merge/key_sorter.rb:829731466": [ + [59, 7, 1787, "Metrics/AbcSize: Assignment Branch Condition size for `partition_into_blocks` is too high. [<11, 23, 8> 26.72/17]", 3324132918], + [59, 7, 1787, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `partition_into_blocks` is too high. [8/7]", 3324132918], + [59, 7, 1787, "Metrics/MethodLength: Method has too many lines. [38/10]", 3324132918], + [59, 7, 1787, "Metrics/PerceivedComplexity: Perceived complexity for `partition_into_blocks` is too high. [9/8]", 3324132918] + ], + "lib/toml/merge/node_type_normalizer.rb:2171981470": [ + [67, 5, 7844, "Metrics/ModuleLength: Module has too many lines. [134/100]", 828548837], + [159, 11, 4, "Lint/BooleanSymbol: Symbol with a boolean name - you probably meant to use `true`.", 2087932467], + [160, 11, 5, "Lint/BooleanSymbol: Symbol with a boolean name - you probably meant to use `false`.", 170962968], + [215, 11, 4, "Lint/BooleanSymbol: Symbol with a boolean name - you probably meant to use `true`.", 2087932467], + [216, 11, 5, "Lint/BooleanSymbol: Symbol with a boolean name - you probably meant to use `false`.", 170962968] + ], + "lib/toml/merge/node_wrapper.rb:975742583": [ + [26, 5, 24084, "Metrics/ClassLength: Class has too many lines. [424/100]", 111672250], + [37, 9, 517, "Metrics/MethodLength: Method has too many lines. [11/10]", 3513234297], + [37, 17, 154, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2431837951], + [54, 7, 503, "Metrics/MethodLength: Method has too many lines. [12/10]", 2647031658], + [54, 21, 82, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2652802373], + [229, 7, 1380, "Metrics/AbcSize: Assignment Branch Condition size for `value_node` is too high. [<5, 16, 10> 19.52/17]", 1398903082], + [229, 7, 1380, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `value_node` is too high. [9/7]", 1398903082], + [229, 7, 1380, "Metrics/MethodLength: Method has too many lines. [32/10]", 1398903082], + [229, 7, 1380, "Metrics/PerceivedComplexity: Perceived complexity for `value_node` is too high. [9/8]", 1398903082], + [232, 9, 1306, "Metrics/BlockLength: Block has too many lines. [28/25]", 3342818997], + [286, 7, 496, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `pairs` is too high. [9/7]", 2741436417], + [286, 7, 496, "Metrics/PerceivedComplexity: Perceived complexity for `pairs` is too high. [9/8]", 2741436417], + [319, 7, 706, "Metrics/MethodLength: Method has too many lines. [22/10]", 2032215880], + [390, 7, 753, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `effective_end_line` is too high. [10/7]", 29395992], + [390, 7, 753, "Metrics/PerceivedComplexity: Perceived complexity for `effective_end_line` is too high. [10/8]", 29395992], + [414, 7, 2225, "Metrics/AbcSize: Assignment Branch Condition size for `compute_signature` is too high. [<9, 32, 24> 41/17]", 1299303855], + [414, 7, 2225, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_signature` is too high. [25/7]", 1299303855], + [414, 7, 2225, "Metrics/MethodLength: Method has too many lines. [39/10]", 1299303855], + [414, 7, 2225, "Metrics/PerceivedComplexity: Perceived complexity for `compute_signature` is too high. [16/8]", 1299303855], + [523, 7, 487, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `raw_pair_value_text` is too high. [8/7]", 3177077098], + [547, 7, 1503, "Metrics/AbcSize: Assignment Branch Condition size for `collect_inline_table_keys_recursive` is too high. [<7, 25, 18> 31.59/17]", 3778857543], + [547, 7, 1503, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_inline_table_keys_recursive` is too high. [17/7]", 3778857543], + [547, 7, 1503, "Metrics/MethodLength: Method has too many lines. [24/10]", 3778857543], + [547, 7, 1503, "Metrics/PerceivedComplexity: Perceived complexity for `collect_inline_table_keys_recursive` is too high. [18/8]", 3778857543], + [605, 7, 855, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_sibling_pairs_for_table` is too high. [8/7]", 3160731503], + [605, 7, 855, "Metrics/MethodLength: Method has too many lines. [14/10]", 3160731503], + [636, 7, 655, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_next_table_start_line` is too high. [9/7]", 1465728116], + [636, 7, 655, "Metrics/MethodLength: Method has too many lines. [12/10]", 1465728116], + [636, 7, 655, "Metrics/PerceivedComplexity: Perceived complexity for `find_next_table_start_line` is too high. [9/8]", 1465728116], + [665, 7, 861, "Metrics/MethodLength: Method has too many lines. [12/10]", 4202205110] + ], + "lib/toml/merge/smart_merger.rb:3624815957": [ + [39, 5, 9573, "Metrics/ClassLength: Class has too many lines. [190/100]", 1615610584], + [72, 7, 1283, "Metrics/MethodLength: Method has too many lines. [18/10]", 2597249100], + [72, 21, 427, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 1661881927], + [144, 7, 1347, "Metrics/AbcSize: Assignment Branch Condition size for `merge_with_debug` is too high. [<3, 20, 7> 21.4/17]", 2015540458], + [144, 7, 1347, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_with_debug` is too high. [8/7]", 2015540458], + [144, 7, 1347, "Metrics/MethodLength: Method has too many lines. [31/10]", 2015540458], + [248, 7, 1161, "Metrics/MethodLength: Method has too many lines. [26/10]", 1453116447] + ], + "lib/toml/merge/table_match_refiner.rb:1590173808": [ + [32, 5, 7338, "Metrics/ClassLength: Class has too many lines. [108/100]", 3006106276], + [113, 35, 50, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1492696344], + [147, 7, 410, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_table_name` is too high. [8/7]", 2032455294], + [217, 7, 659, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<11, 38, 8> 40.36/17]", 2658150371], + [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:3985149016": [ + [3, 1, 12320, "Metrics/BlockLength: Block has too many lines. [273/25]", 2102318823], + [34, 3, 2099, "Metrics/BlockLength: Block has too many lines. [27/25]", 677669008], + [233, 3, 1127, "Metrics/BlockLength: Block has too many lines. [27/25]", 3231986094] + ], + "toml-merge.gemspec:2519299257": [ + [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ] +} diff --git a/gems/toml-merge/Gemfile.lock b/gems/toml-merge/Gemfile.lock index fef01f4f8..bf74b1629 100644 --- a/gems/toml-merge/Gemfile.lock +++ b/gems/toml-merge/Gemfile.lock @@ -17,39 +17,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -58,193 +26,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -252,45 +34,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -310,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -324,6 +61,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -379,6 +117,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -397,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -537,23 +283,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -587,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -618,7 +361,7 @@ GEM yard yard-relative_markdown_links (0.6.0) nokogiri (>= 1.14.3, < 2) - yard-timekeeper (0.2.3) + yard-timekeeper (0.2.4) version_gem (~> 1.1, >= 1.1.13) yard-yaml (0.2.3) version_gem (~> 1.1, >= 1.1.13) @@ -638,45 +381,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,61 +406,40 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +452,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +479,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +490,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,19 +517,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,27 +541,22 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd yard-relative_markdown_links (0.6.0) sha256=3e5ffa85cbad9bac70bee5421774b190fb25d3bdf489323a5b3534f647d1a70e - yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 + yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/yaml-merge/Gemfile.lock b/gems/yaml-merge/Gemfile.lock index a256589b3..8c7304619 100644 --- a/gems/yaml-merge/Gemfile.lock +++ b/gems/yaml-merge/Gemfile.lock @@ -17,7 +17,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -26,7 +58,201 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -34,6 +260,21 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -53,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -406,12 +685,17 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) yaml-merge! yard (~> 0.9, >= 0.9.44) @@ -420,19 +704,35 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -479,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -490,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -517,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -528,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -541,10 +859,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -557,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 07620a159be5043e4cd9582750c607be4a0ab021 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:27:44 -0600 Subject: [PATCH 231/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/go-merge/.rubocop_gradual.lock | 102 +++++++ gems/go-merge/Gemfile.lock | 382 +++----------------------- gems/go-merge/lib/go/merge/version.rb | 2 +- gems/ruby-merge/Gemfile | 68 +++-- gems/ruby-merge/Rakefile | 18 +- gems/ruby-merge/bin/yard | 2 +- gems/rust-merge/Gemfile.lock | 353 +++++++++++++++++++++++- 7 files changed, 519 insertions(+), 408 deletions(-) create mode 100644 gems/go-merge/.rubocop_gradual.lock diff --git a/gems/go-merge/.rubocop_gradual.lock b/gems/go-merge/.rubocop_gradual.lock new file mode 100644 index 000000000..bb6039651 --- /dev/null +++ b/gems/go-merge/.rubocop_gradual.lock @@ -0,0 +1,102 @@ +{ + ".simplecov:203349166": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:522749197": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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:3413698974": [ + [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ], + "lib/go-merge.rb:1938991181": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`go-merge.rb`) should use snake_case.", 5381] + ], + "lib/go/merge.rb:547557749": [ + [10, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Go::Merge`.", 2866359175], + [10, 3, 7242, "Metrics/ModuleLength: Module has too many lines. [173/100]", 2713105462], + [11, 5, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631], + [72, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1491828652], + [79, 5, 1399, "Metrics/AbcSize: Assignment Branch Condition size for `merge_go` is too high. [<13, 32, 11> 36.25/17]", 3471957286], + [79, 5, 1399, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_go` is too high. [11/7]", 3471957286], + [79, 5, 1399, "Metrics/MethodLength: Method has too many lines. [22/10]", 3471957286], + [79, 5, 1399, "Metrics/PerceivedComplexity: Perceived complexity for `merge_go` is too high. [11/8]", 3471957286], + [98, 34, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], + [106, 5, 1419, "Metrics/AbcSize: Assignment Branch Condition size for `analyze_go_module` is too high. [<8, 19, 5> 21.21/17]", 525883462], + [106, 5, 1419, "Metrics/MethodLength: Method has too many lines. [40/10]", 525883462] + ], + "spec/fixtures_integration_spec.rb:2854818786": [ + [3, 1, 4677, "Metrics/BlockLength: Block has too many lines. [66/25]", 420437002], + [8, 3, 4420, "Metrics/BlockLength: Block has too many lines. [61/25]", 566085077] + ] +} diff --git a/gems/go-merge/Gemfile.lock b/gems/go-merge/Gemfile.lock index d218b78d8..93f41815d 100644 --- a/gems/go-merge/Gemfile.lock +++ b/gems/go-merge/Gemfile.lock @@ -17,39 +17,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -58,193 +26,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -252,45 +34,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -310,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -324,6 +61,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -379,6 +117,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -397,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -537,23 +283,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -587,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -618,7 +361,7 @@ GEM yard yard-relative_markdown_links (0.6.0) nokogiri (>= 1.14.3, < 2) - yard-timekeeper (0.2.3) + yard-timekeeper (0.2.4) version_gem (~> 1.1, >= 1.1.13) yard-yaml (0.2.3) version_gem (~> 1.1, >= 1.1.13) @@ -638,45 +381,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,61 +407,39 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -757,22 +457,15 @@ CHECKSUMS io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +480,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +491,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,19 +518,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,27 +542,21 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd yard-relative_markdown_links (0.6.0) sha256=3e5ffa85cbad9bac70bee5421774b190fb25d3bdf489323a5b3534f647d1a70e - yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 + yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/go-merge/lib/go/merge/version.rb b/gems/go-merge/lib/go/merge/version.rb index 7a12d28aa..d576fba8a 100644 --- a/gems/go-merge/lib/go/merge/version.rb +++ b/gems/go-merge/lib/go/merge/version.rb @@ -3,7 +3,7 @@ module Go module Merge module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/ruby-merge/Gemfile b/gems/ruby-merge/Gemfile index 85079ceb0..1c77339e9 100644 --- a/gems/ruby-merge/Gemfile +++ b/gems/ruby-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source "https://gem.coop" +source 'https://gem.coop' git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,58 +19,54 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ["~> 1.0", ">= 1.0.8"] -gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ['~> 1.0', '>= 1.0.8'] +gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ast-merge tree_haver ] -direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") +direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? if direct_sibling_gems.any? && - (direct_sibling_local || - ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) - direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") - direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) begin nomono_activation_requirements = nomono_requirements - nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) if File.file?(nomono_lockfile) nomono_locked_spec = Bundler::LockfileParser - .new(Bundler.read_file(nomono_lockfile)) - .specs - .find { |spec| spec.name == "nomono" } + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } nomono_locked = nomono_locked_spec && - Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) - if nomono_locked - nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] - end - end - Kernel.send(:gem, "nomono", *nomono_activation_requirements) - require "nomono/bundler" - if direct_sibling_templating && !direct_sibling_local - ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local eval_nomono_gems( gems: direct_sibling_gems, - prefix: "STRUCTUREDMERGE", - path_env: "STRUCTUREDMERGE_DEV", - root: ["src", "my", "structuredmerge"] + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] ) rescue LoadError - warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' ensure if direct_sibling_templating && !direct_sibling_local if direct_sibling_dev_was_set - ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original else - ENV.delete("STRUCTUREDMERGE_DEV") + ENV.delete('STRUCTUREDMERGE_DEV') end end end @@ -334,25 +330,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging -eval_gemfile "gemfiles/modular/debug.gemfile" +eval_gemfile 'gemfiles/modular/debug.gemfile' # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile "gemfiles/modular/coverage.gemfile" +eval_gemfile 'gemfiles/modular/coverage.gemfile' # Linting -eval_gemfile "gemfiles/modular/style.gemfile" +eval_gemfile 'gemfiles/modular/style.gemfile' # Documentation -eval_gemfile "gemfiles/modular/documentation.gemfile" +eval_gemfile 'gemfiles/modular/documentation.gemfile' # Optional -eval_gemfile "gemfiles/modular/optional.gemfile" +eval_gemfile 'gemfiles/modular/optional.gemfile' ### Std Lib Extracted Gems -eval_gemfile "gemfiles/modular/x_std_libs.gemfile" +eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' # See unlocked_deps appraisal for more details on irb inclusion -gem "irb", "~> 1.17" # ruby >= 2.7 +gem 'irb', '~> 1.17' # ruby >= 2.7 diff --git a/gems/ruby-merge/Rakefile b/gems/ruby-merge/Rakefile index c7b8a4b9e..c528d41ee 100644 --- a/gems/ruby-merge/Rakefile +++ b/gems/ruby-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require "kettle/drift" + require 'kettle/drift' Kettle::Drift.install_tasks rescue LoadError - desc("(stub) kettle:drift:check is unavailable") - task("kettle:drift:check") do + desc('(stub) kettle:drift:check is unavailable') + task('kettle:drift:check') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:update is unavailable") - task("kettle:drift:update") do + desc('(stub) kettle:drift:update is unavailable') + task('kettle:drift:update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:force_update is unavailable") - task("kettle:drift:force_update") do + desc('(stub) kettle:drift:force_update is unavailable') + task('kettle:drift:force_update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift is unavailable") - task("kettle:drift" => "kettle:drift:update") + desc('(stub) kettle:drift is unavailable') + task('kettle:drift' => 'kettle:drift:update') end ### TEMPLATING TASKS diff --git a/gems/ruby-merge/bin/yard b/gems/ruby-merge/bin/yard index a7e8b6eed..5d516ad6f 100755 --- a/gems/ruby-merge/bin/yard +++ b/gems/ruby-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec("bundle", "exec", "rake", "yard") +exec('bundle', 'exec', 'rake', 'yard') diff --git a/gems/rust-merge/Gemfile.lock b/gems/rust-merge/Gemfile.lock index cbf0a7bc9..53081f8da 100644 --- a/gems/rust-merge/Gemfile.lock +++ b/gems/rust-merge/Gemfile.lock @@ -16,6 +16,265 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -103,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -131,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -322,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -373,22 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -397,32 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -430,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -442,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -469,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -480,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -507,10 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -519,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -532,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -547,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 757ab29ea8e4b381a135886132da270fd2b4ae8a Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:27:53 -0600 Subject: [PATCH 232/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/go-merge/Gemfile.lock | 327 +++++++++++++++++- gems/ruby-merge/.rubocop_gradual.lock | 390 ++++++++++++++++++++++ gems/ruby-merge/Gemfile.lock | 382 ++------------------- gems/ruby-merge/lib/ruby/merge/version.rb | 2 +- gems/toml-merge/Gemfile.lock | 30 +- gems/typescript-merge/Gemfile.lock | 353 +++++++++++++++++++- gems/yaml-merge/Gemfile.lock | 353 +------------------- 7 files changed, 1110 insertions(+), 727 deletions(-) create mode 100644 gems/ruby-merge/.rubocop_gradual.lock diff --git a/gems/go-merge/Gemfile.lock b/gems/go-merge/Gemfile.lock index 93f41815d..0afc11a39 100644 --- a/gems/go-merge/Gemfile.lock +++ b/gems/go-merge/Gemfile.lock @@ -17,7 +17,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -26,7 +58,193 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -34,6 +252,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -53,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,24 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -407,32 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -457,15 +758,22 @@ CHECKSUMS io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -480,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -491,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -518,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -529,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -542,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ruby-merge/.rubocop_gradual.lock b/gems/ruby-merge/.rubocop_gradual.lock new file mode 100644 index 000000000..827b7fe9d --- /dev/null +++ b/gems/ruby-merge/.rubocop_gradual.lock @@ -0,0 +1,390 @@ +{ + ".simplecov:3590623278": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:2768890125": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/ruby-merge.rb:2992445753": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`ruby-merge.rb`) should use snake_case.", 5381] + ], + "lib/ruby/merge.rb:1549201317": [ + [21, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Ruby::Merge`.", 2866359175], + [21, 3, 117385, "Metrics/ModuleLength: Module has too many lines. [2664/100]", 3496752980], + [42, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3061257365], + [103, 5, 841, "Metrics/AbcSize: Assignment Branch Condition size for `parse_ruby` is too high. [<4, 16, 6> 17.55/17]", 1071201699], + [103, 5, 841, "Metrics/MethodLength: Method has too many lines. [16/10]", 1071201699], + [128, 5, 2656, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_method_move_detection` is too high. [<17, 40, 18> 47.04/17]", 3779436399], + [128, 5, 2656, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_method_move_detection` is too high. [16/7]", 3779436399], + [128, 5, 2656, "Metrics/MethodLength: Method has too many lines. [45/10]", 3779436399], + [128, 5, 2656, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_method_move_detection` is too high. [16/8]", 3779436399], + [140, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 727785047], + [153, 121, 51, "Layout/LineLength: Line is too long. [171/120]", 3259664538], + [172, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], + [175, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], + [176, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 1976354608], + [180, 5, 4374, "Metrics/AbcSize: Assignment Branch Condition size for `merge_ruby` is too high. [<31, 63, 24> 74.2/17]", 2749692967], + [180, 5, 4374, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_ruby` is too high. [21/7]", 2749692967], + [180, 5, 4374, "Metrics/MethodLength: Method has too many lines. [83/10]", 2749692967], + [180, 5, 4374, "Metrics/PerceivedComplexity: Perceived complexity for `merge_ruby` is too high. [22/8]", 2749692967], + [239, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], + [278, 5, 1312, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_delegated_child_operations` is too high. [<10, 15, 6> 19/17]", 2246428949], + [278, 5, 1312, "Metrics/MethodLength: Method has too many lines. [28/10]", 2246428949], + [324, 5, 861, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_source_owner_identity_profile` is too high. [<5, 17, 2> 17.83/17]", 4129925341], + [324, 5, 861, "Metrics/MethodLength: Method has too many lines. [20/10]", 4129925341], + [347, 5, 2064, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_source_owner_identity_matches` is too high. [<17, 31, 11> 37.03/17]", 2780319153], + [347, 5, 2064, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_source_owner_identity_matches` is too high. [11/7]", 2780319153], + [347, 5, 2064, "Metrics/MethodLength: Method has too many lines. [37/10]", 2780319153], + [347, 5, 2064, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_source_owner_identity_matches` is too high. [11/8]", 2780319153], + [376, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], + [379, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], + [384, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1001816794], + [390, 5, 1314, "Metrics/MethodLength: Method has too many lines. [28/10]", 4183124680], + [423, 5, 786, "Metrics/MethodLength: Method has too many lines. [24/10]", 3631640245], + [450, 5, 916, "Metrics/MethodLength: Method has too many lines. [18/10]", 631485532], + [471, 5, 662, "Metrics/MethodLength: Method has too many lines. [15/10]", 2231086183], + [490, 5, 777, "Metrics/MethodLength: Method has too many lines. [18/10]", 895030114], + [511, 5, 727, "Metrics/MethodLength: Method has too many lines. [19/10]", 776483642], + [533, 5, 861, "Metrics/MethodLength: Method has too many lines. [29/10]", 537340961], + [565, 5, 655, "Metrics/MethodLength: Method has too many lines. [16/10]", 3756601977], + [584, 5, 1592, "Metrics/MethodLength: Method has too many lines. [25/10]", 3521052904], + [608, 121, 106, "Layout/LineLength: Line is too long. [226/120]", 2104286058], + [614, 5, 777, "Metrics/MethodLength: Method has too many lines. [14/10]", 2821246515], + [631, 5, 1429, "Metrics/MethodLength: Method has too many lines. [26/10]", 244346226], + [654, 121, 124, "Layout/LineLength: Line is too long. [244/120]", 13261232], + [660, 5, 1367, "Metrics/MethodLength: Method has too many lines. [41/10]", 3883814121], + [704, 5, 750, "Metrics/MethodLength: Method has too many lines. [22/10]", 764028624], + [730, 5, 1315, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_silent_data_loss_validation_report` is too high. [<8, 14, 7> 17.58/17]", 2039399818], + [730, 5, 1315, "Metrics/MethodLength: Method has too many lines. [31/10]", 2039399818], + [765, 5, 724, "Metrics/MethodLength: Method has too many lines. [14/10]", 1741779676], + [776, 121, 67, "Layout/LineLength: Line is too long. [187/120]", 1996508131], + [782, 5, 752, "Metrics/MethodLength: Method has too many lines. [21/10]", 3870096101], + [806, 5, 1052, "Metrics/MethodLength: Method has too many lines. [32/10]", 119279638], + [841, 5, 1588, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_interstitial_comment_attachment_report` is too high. [<11, 34, 17> 39.57/17]", 4112280260], + [841, 5, 1588, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_interstitial_comment_attachment_report` is too high. [14/7]", 4112280260], + [841, 5, 1588, "Metrics/MethodLength: Method has too many lines. [30/10]", 4112280260], + [841, 5, 1588, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_interstitial_comment_attachment_report` is too high. [15/8]", 4112280260], + [855, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 180543822], + [883, 5, 536, "Metrics/MethodLength: Method has too many lines. [13/10]", 245509059], + [899, 5, 2252, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_rename_detection` is too high. [<14, 32, 11> 36.62/17]", 2574664763], + [899, 5, 2252, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_rename_detection` is too high. [10/7]", 2574664763], + [899, 5, 2252, "Metrics/MethodLength: Method has too many lines. [46/10]", 2574664763], + [899, 5, 2252, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_rename_detection` is too high. [11/8]", 2574664763], + [942, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 4074688513], + [948, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], + [952, 5, 2254, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_rename_plus_edit_conflicts` is too high. [<15, 30, 13> 35.97/17]", 3664513828], + [952, 5, 2254, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_rename_plus_edit_conflicts` is too high. [10/7]", 3664513828], + [952, 5, 2254, "Metrics/MethodLength: Method has too many lines. [45/10]", 3664513828], + [952, 5, 2254, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_rename_plus_edit_conflicts` is too high. [11/8]", 3664513828], + [1004, 5, 1926, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_cross_container_method_move_detection` is too high. [<8, 18, 7> 20.9/17]", 1401333972], + [1004, 5, 1926, "Metrics/MethodLength: Method has too many lines. [44/10]", 1401333972], + [1047, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3474944396], + [1054, 5, 1488, "Metrics/AbcSize: Assignment Branch Condition size for `apply_ruby_delegated_child_outputs` is too high. [<16, 39, 12> 43.83/17]", 842348215], + [1054, 5, 1488, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_ruby_delegated_child_outputs` is too high. [12/7]", 842348215], + [1054, 5, 1488, "Metrics/MethodLength: Method has too many lines. [27/10]", 842348215], + [1054, 5, 1488, "Metrics/PerceivedComplexity: Perceived complexity for `apply_ruby_delegated_child_outputs` is too high. [13/8]", 842348215], + [1088, 5, 980, "Metrics/MethodLength: Method has too many lines. [23/10]", 1425119613], + [1115, 5, 1025, "Metrics/MethodLength: Method has too many lines. [23/10]", 2179557432], + [1143, 5, 757, "Metrics/MethodLength: Method has too many lines. [12/10]", 3975431355], + [1148, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 1956194284], + [1160, 5, 745, "Metrics/MethodLength: Method has too many lines. [12/10]", 1051086033], + [1165, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1636990749], + [1177, 5, 670, "Metrics/MethodLength: Method has too many lines. [11/10]", 3552666292], + [1182, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 3013228499], + [1193, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 1356230953], + [1198, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 3013228499], + [1209, 5, 2093, "Metrics/AbcSize: Assignment Branch Condition size for `analyze_ruby_document` is too high. [<21, 31, 12> 39.32/17]", 3298966582], + [1209, 5, 2093, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `analyze_ruby_document` is too high. [13/7]", 3298966582], + [1209, 5, 2093, "Metrics/MethodLength: Method has too many lines. [53/10]", 3298966582], + [1209, 5, 2093, "Metrics/PerceivedComplexity: Perceived complexity for `analyze_ruby_document` is too high. [13/8]", 3298966582], + [1215, 7, 1035, "Metrics/BlockLength: Block has too many lines. [27/25]", 2081528636], + [1284, 5, 427, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_file_footer_text` is too high. [<5, 17, 8> 19.44/17]", 1703748308], + [1311, 5, 806, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_process_analysis_from_tree` is too high. [10/7]", 1109735749], + [1311, 5, 806, "Metrics/MethodLength: Method has too many lines. [19/10]", 1109735749], + [1361, 5, 533, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_import_item_from_begin_node` is too high. [8/7]", 582163830], + [1383, 5, 487, "Metrics/MethodLength: Method has too many lines. [12/10]", 3257507103], + [1400, 5, 583, "Metrics/MethodLength: Method has too many lines. [15/10]", 4108141408], + [1443, 5, 645, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_import_span_for` is too high. [<6, 22, 9> 24.52/17]", 1779826452], + [1443, 5, 645, "Metrics/MethodLength: Method has too many lines. [12/10]", 1779826452], + [1495, 5, 1015, "Metrics/MethodLength: Method has too many lines. [16/10]", 1317835917], + [1501, 121, 173, "Layout/LineLength: Line is too long. [293/120]", 225499532], + [1528, 5, 518, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_tslp_claimed_line_indexes` is too high. [<6, 19, 5> 20.54/17]", 1455439838], + [1551, 5, 443, "Metrics/MethodLength: Method has too many lines. [12/10]", 4230588206], + [1568, 5, 363, "Metrics/MethodLength: Method has too many lines. [11/10]", 3068065572], + [1629, 5, 1849, "Metrics/AbcSize: Assignment Branch Condition size for `legacy_collect_ruby_declaration_entries` is too high. [<24, 26, 13> 37.7/17]", 3187770326], + [1629, 5, 1849, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `legacy_collect_ruby_declaration_entries` is too high. [11/7]", 3187770326], + [1629, 5, 1849, "Metrics/MethodLength: Method has too many lines. [54/10]", 3187770326], + [1629, 5, 1849, "Metrics/PerceivedComplexity: Perceived complexity for `legacy_collect_ruby_declaration_entries` is too high. [11/8]", 3187770326], + [1676, 13, 76, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 1356567820], + [1712, 5, 396, "Metrics/MethodLength: Method has too many lines. [11/10]", 1239008881], + [1727, 5, 681, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_process_declaration_entries` is too high. [<7, 17, 2> 18.49/17]", 2675999354], + [1727, 5, 681, "Metrics/MethodLength: Method has too many lines. [16/10]", 2675999354], + [1747, 5, 634, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_top_level_process_structure_items` is too high. [<5, 32, 14> 35.28/17]", 1120707166], + [1747, 5, 634, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_top_level_process_structure_items` is too high. [11/7]", 1120707166], + [1747, 5, 634, "Metrics/MethodLength: Method has too many lines. [11/10]", 1120707166], + [1747, 5, 634, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_top_level_process_structure_items` is too high. [11/8]", 1120707166], + [1759, 7, 11, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 848344986], + [1766, 7, 9, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 3648222389], + [1811, 5, 1284, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_intra_owner_merge_plan` is too high. [<8, 24, 9> 26.85/17]", 2388567699], + [1811, 5, 1284, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `ruby_intra_owner_merge_plan` is too high. [9/7]", 2388567699], + [1811, 5, 1284, "Metrics/MethodLength: Method has too many lines. [22/10]", 2388567699], + [1811, 5, 1284, "Metrics/PerceivedComplexity: Perceived complexity for `ruby_intra_owner_merge_plan` is too high. [9/8]", 2388567699], + [1852, 5, 557, "Metrics/MethodLength: Method has too many lines. [11/10]", 3178341030], + [1910, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 895013151], + [1915, 5, 593, "Metrics/MethodLength: Method has too many lines. [13/10]", 2850316611], + [1916, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177625], + [1933, 5, 609, "Metrics/MethodLength: Method has too many lines. [12/10]", 784855730], + [1948, 5, 695, "Metrics/MethodLength: Method has too many lines. [14/10]", 3942458504], + [1985, 5, 1114, "Metrics/AbcSize: Assignment Branch Condition size for `merge_declaration_hash_constants` is too high. [<11, 22, 6> 25.32/17]", 3861922947], + [1985, 5, 1114, "Metrics/MethodLength: Method has too many lines. [17/10]", 3861922947], + [2007, 5, 794, "Metrics/AbcSize: Assignment Branch Condition size for `merge_declaration_body_constants` is too high. [<9, 14, 6> 17.69/17]", 1882117166], + [2037, 5, 1138, "Metrics/AbcSize: Assignment Branch Condition size for `merge_array_constant_text` is too high. [<9, 18, 7> 21.31/17]", 1448081799], + [2037, 5, 1138, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_array_constant_text` is too high. [8/7]", 1448081799], + [2037, 5, 1138, "Metrics/MethodLength: Method has too many lines. [15/10]", 1448081799], + [2043, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193434112], + [2050, 7, 8, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 359846632], + [2057, 5, 774, "Metrics/AbcSize: Assignment Branch Condition size for `merge_percent_array_constant_text` is too high. [<8, 16, 7> 19.21/17]", 625509828], + [2057, 5, 774, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_percent_array_constant_text` is too high. [8/7]", 625509828], + [2086, 5, 1060, "Metrics/AbcSize: Assignment Branch Condition size for `merge_multiline_array_constant_text` is too high. [<11, 23, 10> 27.39/17]", 2672751288], + [2086, 5, 1060, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_multiline_array_constant_text` is too high. [11/7]", 2672751288], + [2086, 5, 1060, "Metrics/MethodLength: Method has too many lines. [13/10]", 2672751288], + [2086, 5, 1060, "Metrics/PerceivedComplexity: Perceived complexity for `merge_multiline_array_constant_text` is too high. [11/8]", 2672751288], + [2095, 7, 8, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 359846632], + [2104, 5, 1605, "Metrics/AbcSize: Assignment Branch Condition size for `merge_declaration_body_methods` is too high. [<21, 28, 15> 38.08/17]", 2740924329], + [2104, 5, 1605, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_declaration_body_methods` is too high. [14/7]", 2740924329], + [2104, 5, 1605, "Metrics/MethodLength: Method has too many lines. [29/10]", 2740924329], + [2104, 5, 1605, "Metrics/PerceivedComplexity: Perceived complexity for `merge_declaration_body_methods` is too high. [15/8]", 2740924329], + [2111, 7, 8, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 359846632], + [2138, 5, 1076, "Metrics/AbcSize: Assignment Branch Condition size for `merge_nested_body_declarations` is too high. [<14, 24, 10> 29.53/17]", 1397199527], + [2138, 5, 1076, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_nested_body_declarations` is too high. [11/7]", 1397199527], + [2138, 5, 1076, "Metrics/MethodLength: Method has too many lines. [14/10]", 1397199527], + [2138, 5, 1076, "Metrics/PerceivedComplexity: Perceived complexity for `merge_nested_body_declarations` is too high. [11/8]", 1397199527], + [2177, 5, 2549, "Metrics/AbcSize: Assignment Branch Condition size for `top_level_source_region_owners` is too high. [<24, 33, 13> 42.83/17]", 1909271685], + [2177, 5, 2549, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `top_level_source_region_owners` is too high. [11/7]", 1909271685], + [2177, 5, 2549, "Metrics/MethodLength: Method has too many lines. [64/10]", 1909271685], + [2177, 5, 2549, "Metrics/PerceivedComplexity: Perceived complexity for `top_level_source_region_owners` is too high. [11/8]", 1909271685], + [2220, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861626], + [2235, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1695648499], + [2251, 5, 2126, "Metrics/AbcSize: Assignment Branch Condition size for `container_child_source_regions` is too high. [<23, 28, 11> 37.87/17]", 4031983731], + [2251, 5, 2126, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `container_child_source_regions` is too high. [10/7]", 4031983731], + [2251, 5, 2126, "Metrics/MethodLength: Method has too many lines. [56/10]", 4031983731], + [2251, 5, 2126, "Metrics/PerceivedComplexity: Perceived complexity for `container_child_source_regions` is too high. [10/8]", 4031983731], + [2317, 5, 996, "Metrics/AbcSize: Assignment Branch Condition size for `interleave_source_regions` is too high. [<8, 14, 6> 17.2/17]", 796443872], + [2317, 5, 996, "Metrics/MethodLength: Method has too many lines. [30/10]", 796443872], + [2355, 5, 1323, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `source_interstitial_region` is too high. [13/7]", 1970451685], + [2355, 5, 1323, "Metrics/MethodLength: Method has too many lines. [30/10]", 1970451685], + [2355, 5, 1323, "Metrics/PerceivedComplexity: Perceived complexity for `source_interstitial_region` is too high. [12/8]", 1970451685], + [2355, 35, 80, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2143999554], + [2390, 5, 396, "Metrics/MethodLength: Method has too many lines. [12/10]", 663734283], + [2406, 5, 890, "Metrics/AbcSize: Assignment Branch Condition size for `collect_blank_line_regions` is too high. [<4, 18, 7> 19.72/17]", 3362926457], + [2406, 5, 890, "Metrics/MethodLength: Method has too many lines. [20/10]", 3362926457], + [2465, 5, 30, "Style/Documentation: Missing top-level documentation comment for `class Ruby::Merge::RubyHashLiteralProjector`.", 2586933062], + [2465, 5, 5733, "Metrics/ClassLength: Class has too many lines. [144/100]", 48390292], + [2498, 7, 617, "Metrics/MethodLength: Method has too many lines. [15/10]", 1617225783], + [2522, 7, 943, "Metrics/AbcSize: Assignment Branch Condition size for `project_hash_key` is too high. [<1, 18, 8> 19.72/17]", 3538404248], + [2522, 7, 943, "Metrics/MethodLength: Method has too many lines. [26/10]", 3538404248], + [2580, 7, 616, "Metrics/AbcSize: Assignment Branch Condition size for `trailing_comma?` is too high. [<3, 20, 6> 21.1/17]", 1517912413], + [2645, 5, 1202, "Metrics/AbcSize: Assignment Branch Condition size for `constant_hash_blocks` is too high. [<19, 25, 6> 31.97/17]", 399214756], + [2645, 5, 1202, "Metrics/MethodLength: Method has too many lines. [36/10]", 399214756], + [2686, 5, 727, "Metrics/AbcSize: Assignment Branch Condition size for `hash_assignment_finish_line` is too high. [<11, 7, 12> 17.72/17]", 1215874404], + [2686, 5, 727, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `hash_assignment_finish_line` is too high. [9/7]", 1215874404], + [2686, 5, 727, "Metrics/MethodLength: Method has too many lines. [26/10]", 1215874404], + [2686, 5, 727, "Metrics/PerceivedComplexity: Perceived complexity for `hash_assignment_finish_line` is too high. [11/8]", 1215874404], + [2716, 5, 2007, "Metrics/AbcSize: Assignment Branch Condition size for `direct_body_method_entries` is too high. [<28, 33, 13> 45.19/17]", 2589282610], + [2716, 5, 2007, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `direct_body_method_entries` is too high. [12/7]", 2589282610], + [2716, 5, 2007, "Metrics/MethodLength: Method has too many lines. [56/10]", 2589282610], + [2716, 5, 2007, "Metrics/PerceivedComplexity: Perceived complexity for `direct_body_method_entries` is too high. [12/8]", 2589282610], + [2781, 5, 1221, "Metrics/AbcSize: Assignment Branch Condition size for `direct_body_constant_entries` is too high. [<16, 34, 10> 38.88/17]", 1588885504], + [2781, 5, 1221, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `direct_body_constant_entries` is too high. [9/7]", 1588885504], + [2781, 5, 1221, "Metrics/MethodLength: Method has too many lines. [35/10]", 1588885504], + [2781, 5, 1221, "Metrics/PerceivedComplexity: Perceived complexity for `direct_body_constant_entries` is too high. [9/8]", 1588885504], + [2824, 5, 708, "Metrics/AbcSize: Assignment Branch Condition size for `split_ruby_array_elements` is too high. [<11, 12, 11> 19.65/17]", 1344003748], + [2824, 5, 708, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split_ruby_array_elements` is too high. [9/7]", 1344003748], + [2824, 5, 708, "Metrics/MethodLength: Method has too many lines. [24/10]", 1344003748], + [2824, 5, 708, "Metrics/PerceivedComplexity: Perceived complexity for `split_ruby_array_elements` is too high. [11/8]", 1344003748], + [2868, 5, 977, "Metrics/AbcSize: Assignment Branch Condition size for `append_multiline_array_elements` is too high. [<12, 32, 9> 35.34/17]", 1316332112], + [2868, 5, 977, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `append_multiline_array_elements` is too high. [9/7]", 1316332112], + [2868, 5, 977, "Metrics/MethodLength: Method has too many lines. [16/10]", 1316332112], + [2868, 5, 977, "Metrics/PerceivedComplexity: Perceived complexity for `append_multiline_array_elements` is too high. [9/8]", 1316332112], + [2896, 5, 728, "Metrics/AbcSize: Assignment Branch Condition size for `array_assignment_finish_line` is too high. [<11, 7, 12> 17.72/17]", 1471354607], + [2896, 5, 728, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `array_assignment_finish_line` is too high. [9/7]", 1471354607], + [2896, 5, 728, "Metrics/MethodLength: Method has too many lines. [26/10]", 1471354607], + [2896, 5, 728, "Metrics/PerceivedComplexity: Perceived complexity for `array_assignment_finish_line` is too high. [11/8]", 1471354607], + [2932, 5, 1127, "Metrics/AbcSize: Assignment Branch Condition size for `direct_body_declaration_entries` is too high. [<14, 30, 7> 33.84/17]", 1223661118], + [2932, 5, 1127, "Metrics/MethodLength: Method has too many lines. [30/10]", 1223661118], + [2979, 5, 984, "Metrics/AbcSize: Assignment Branch Condition size for `insert_declaration_body_blocks` is too high. [<4, 23, 12> 26.25/17]", 159690081], + [2979, 5, 984, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `insert_declaration_body_blocks` is too high. [9/7]", 159690081], + [2979, 5, 984, "Metrics/MethodLength: Method has too many lines. [16/10]", 159690081], + [2979, 5, 984, "Metrics/PerceivedComplexity: Perceived complexity for `insert_declaration_body_blocks` is too high. [10/8]", 159690081], + [3024, 5, 1027, "Metrics/AbcSize: Assignment Branch Condition size for `merge_ruby_hash_literals` is too high. [<8, 30, 9> 32.33/17]", 2793745298], + [3024, 5, 1027, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_ruby_hash_literals` is too high. [9/7]", 2793745298], + [3024, 5, 1027, "Metrics/MethodLength: Method has too many lines. [19/10]", 2793745298], + [3024, 5, 1027, "Metrics/PerceivedComplexity: Perceived complexity for `merge_ruby_hash_literals` is too high. [10/8]", 2793745298], + [3046, 5, 636, "Metrics/AbcSize: Assignment Branch Condition size for `render_ruby_hash_literal` is too high. [<5, 19, 6> 20.54/17]", 1834383244], + [3086, 5, 491, "Metrics/MethodLength: Method has too many lines. [11/10]", 1799924605], + [3119, 5, 1125, "Metrics/AbcSize: Assignment Branch Condition size for `surfaces_for_owner` is too high. [<6, 19, 3> 20.15/17]", 4036098594], + [3119, 5, 1125, "Metrics/MethodLength: Method has too many lines. [20/10]", 4036098594], + [3144, 5, 1126, "Metrics/AbcSize: Assignment Branch Condition size for `example_surfaces_for` is too high. [<4, 20, 2> 20.49/17]", 757808110], + [3144, 5, 1126, "Metrics/MethodLength: Method has too many lines. [21/10]", 757808110] + ], + "lib/ruby/merge/block_directive_detector.rb:315354690": [ + [10, 5, 6220, "Metrics/ClassLength: Class has too many lines. [161/100]", 3182117306], + [83, 7, 1085, "Metrics/AbcSize: Assignment Branch Condition size for `detect_freeze_spans` is too high. [<10, 18, 6> 21.45/17]", 3827147306], + [83, 7, 1085, "Metrics/MethodLength: Method has too many lines. [27/10]", 3827147306], + [117, 7, 1508, "Metrics/AbcSize: Assignment Branch Condition size for `detect_nocov_spans` is too high. [<10, 30, 10> 33.17/17]", 3750116369], + [117, 7, 1508, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_nocov_spans` is too high. [9/7]", 3750116369], + [117, 7, 1508, "Metrics/MethodLength: Method has too many lines. [40/10]", 3750116369], + [117, 7, 1508, "Metrics/PerceivedComplexity: Perceived complexity for `detect_nocov_spans` is too high. [12/8]", 3750116369], + [125, 9, 1189, "Metrics/BlockLength: Block has too many lines. [30/25]", 431470454], + [165, 7, 921, "Metrics/AbcSize: Assignment Branch Condition size for `validate_no_crossing` is too high. [<8, 16, 8> 19.6/17]", 1072352384], + [165, 7, 921, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_no_crossing` is too high. [8/7]", 1072352384], + [165, 7, 921, "Metrics/MethodLength: Method has too many lines. [19/10]", 1072352384], + [193, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193343749], + [194, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860841] + ], + "lib/ruby/merge/doc_comment_support.rb:11585367": [ + [71, 7, 950, "Metrics/AbcSize: Assignment Branch Condition size for `example_blocks` is too high. [<8, 17, 8> 20.42/17]", 878231540], + [71, 7, 950, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `example_blocks` is too high. [8/7]", 878231540], + [71, 7, 950, "Metrics/MethodLength: Method has too many lines. [19/10]", 878231540] + ], + "lib/ruby/merge/gemspec_support.rb:672395758": [ + [5, 5, 21, "Style/Documentation: Missing top-level documentation comment for `module Ruby::Merge::GemspecSupport`.", 593910650] + ], + "lib/ruby/merge/magic_comment_support.rb:2193186223": [ + [26, 7, 1484, "Metrics/AbcSize: Assignment Branch Condition size for `comment_only_prefix_info` is too high. [<9, 38, 8> 39.86/17]", 1098666313], + [26, 7, 1484, "Metrics/MethodLength: Method has too many lines. [33/10]", 1098666313], + [69, 7, 693, "Metrics/AbcSize: Assignment Branch Condition size for `header_magic_comment_types_for_lines` is too high. [<10, 13, 9> 18.71/17]", 3693768719], + [69, 7, 693, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `header_magic_comment_types_for_lines` is too high. [8/7]", 3693768719], + [69, 7, 693, "Metrics/MethodLength: Method has too many lines. [16/10]", 3693768719], + [93, 7, 747, "Metrics/AbcSize: Assignment Branch Condition size for `prefix_comment_line_numbers_for_comments` is too high. [<10, 12, 7> 17.12/17]", 1181507516], + [93, 7, 747, "Metrics/MethodLength: Method has too many lines. [19/10]", 1181507516] + ], + "lib/ruby/merge/method_similarity.rb:3120642740": [ + [5, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ruby::Merge::MethodSimilarity`.", 3784960433], + [23, 7, 493, "Metrics/AbcSize: Assignment Branch Condition size for `param_similarity` is too high. [<4, 19, 4> 19.82/17]", 1175888813], + [45, 7, 738, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<13, 29, 8> 32.77/17]", 1085087702], + [45, 7, 738, "Metrics/MethodLength: Method has too many lines. [20/10]", 1085087702] + ], + "lib/ruby/merge/nocov_node_base.rb:1713613866": [ + [23, 21, 84, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3439911158], + [51, 7, 353, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `signature` is too high. [8/7]", 3442013923], + [51, 7, 353, "Metrics/PerceivedComplexity: Perceived complexity for `signature` is too high. [9/8]", 3442013923] + ], + "lib/ruby/merge/rescue_semantics.rb:2728370094": [ + [5, 5, 21, "Style/Documentation: Missing top-level documentation comment for `class Ruby::Merge::RescueSemantics`.", 4002082661], + [5, 5, 8140, "Metrics/ClassLength: Class has too many lines. [157/100]", 3302970297], + [10, 7, 812, "Metrics/AbcSize: Assignment Branch Condition size for `merge_ordered_clause_types` is too high. [<9, 17, 8> 20.83/17]", 391537814], + [10, 7, 812, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_ordered_clause_types` is too high. [8/7]", 391537814], + [10, 7, 812, "Metrics/MethodLength: Method has too many lines. [16/10]", 391537814], + [10, 7, 812, "Metrics/PerceivedComplexity: Perceived complexity for `merge_ordered_clause_types` is too high. [9/8]", 391537814], + [33, 7, 1470, "Metrics/AbcSize: Assignment Branch Condition size for `canonicalize_rescue_clause_order` is too high. [<18, 28, 14> 36.11/17]", 570708009], + [33, 7, 1470, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonicalize_rescue_clause_order` is too high. [14/7]", 570708009], + [33, 7, 1470, "Metrics/MethodLength: Method has too many lines. [24/10]", 570708009], + [33, 7, 1470, "Metrics/PerceivedComplexity: Perceived complexity for `canonicalize_rescue_clause_order` is too high. [14/8]", 570708009], + [113, 7, 1080, "Metrics/AbcSize: Assignment Branch Condition size for `source_defined_exception_hierarchy` is too high. [<9, 20, 10> 24.1/17]", 3196945148], + [113, 7, 1080, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `source_defined_exception_hierarchy` is too high. [10/7]", 3196945148], + [113, 7, 1080, "Metrics/MethodLength: Method has too many lines. [15/10]", 3196945148], + [113, 7, 1080, "Metrics/PerceivedComplexity: Perceived complexity for `source_defined_exception_hierarchy` is too high. [11/8]", 3196945148], + [126, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1806710570] + ], + "lib/ruby/merge/scaffold_chunk_support.rb:640658628": [ + [5, 5, 27, "Style/Documentation: Missing top-level documentation comment for `module Ruby::Merge::ScaffoldChunkSupport`.", 2416541725] + ], + "lib/ruby/merge/signature_support.rb:1167161535": [ + [5, 5, 23, "Style/Documentation: Missing top-level documentation comment for `module Ruby::Merge::SignatureSupport`.", 2080470772] + ], + "ruby-merge.gemspec:503862341": [ + [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ], + "spec/fixtures_integration_spec.rb:2791875397": [ + [7, 1, 71426, "Metrics/BlockLength: Block has too many lines. [1643/25]", 1328376978], + [8, 3, 94, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 4224869601], + [9, 3, 80, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3493759864], + [10, 3, 72, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 218819604], + [11, 3, 83, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3957977039], + [125, 3, 1207, "Metrics/BlockLength: Block has too many lines. [27/25]", 2841005266], + [206, 3, 1550, "Metrics/BlockLength: Block has too many lines. [44/25]", 1381861178], + [257, 3, 1209, "Metrics/BlockLength: Block has too many lines. [33/25]", 1745132505], + [297, 3, 61330, "Metrics/BlockLength: Block has too many lines. [1387/25]", 3444780370], + [693, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859109], + [1777, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3355833611], + [1784, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 38619260] + ], + "spec/hash_literal_projector_spec.rb:2425567956": [ + [13, 41, 31, "Lint/PercentStringArray: Within `%w`/`%W`, quotes and ',' are unnecessary and may be unwanted in the resulting strings.", 3214960854] + ], + "spec/rescue_semantics_spec.rb:2518131257": [ + [5, 1, 2150, "Metrics/BlockLength: Block has too many lines. [59/25]", 163524539] + ] +} diff --git a/gems/ruby-merge/Gemfile.lock b/gems/ruby-merge/Gemfile.lock index d8758159d..cb9116cc7 100644 --- a/gems/ruby-merge/Gemfile.lock +++ b/gems/ruby-merge/Gemfile.lock @@ -17,39 +17,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -58,193 +26,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -252,45 +34,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -310,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -324,6 +61,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -379,6 +117,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -397,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -537,23 +283,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -587,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -618,7 +361,7 @@ GEM yard yard-relative_markdown_links (0.6.0) nokogiri (>= 1.14.3, < 2) - yard-timekeeper (0.2.3) + yard-timekeeper (0.2.4) version_gem (~> 1.1, >= 1.1.13) yard-yaml (0.2.3) version_gem (~> 1.1, >= 1.1.13) @@ -638,45 +381,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -687,59 +408,38 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0.0) ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +452,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +479,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +490,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -834,15 +521,14 @@ 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,27 +542,21 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd yard-relative_markdown_links (0.6.0) sha256=3e5ffa85cbad9bac70bee5421774b190fb25d3bdf489323a5b3534f647d1a70e - yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 + yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ruby-merge/lib/ruby/merge/version.rb b/gems/ruby-merge/lib/ruby/merge/version.rb index 0dcd005a5..d88eae0c6 100644 --- a/gems/ruby-merge/lib/ruby/merge/version.rb +++ b/gems/ruby-merge/lib/ruby/merge/version.rb @@ -3,7 +3,7 @@ module Ruby module Merge module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/toml-merge/Gemfile.lock b/gems/toml-merge/Gemfile.lock index bf74b1629..1a355a34c 100644 --- a/gems/toml-merge/Gemfile.lock +++ b/gems/toml-merge/Gemfile.lock @@ -16,24 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -45,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -335,6 +322,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,7 +373,6 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - ast-merge! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) debug (>= 1.1) @@ -411,7 +402,6 @@ DEPENDENCIES stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! - tree_haver! tree_sitter_language_pack! yaml-converter (~> 0.1) yard (~> 0.9, >= 0.9.44) diff --git a/gems/typescript-merge/Gemfile.lock b/gems/typescript-merge/Gemfile.lock index de6a40e2a..776990eb1 100644 --- a/gems/typescript-merge/Gemfile.lock +++ b/gems/typescript-merge/Gemfile.lock @@ -16,6 +16,265 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -103,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -131,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -322,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -373,22 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -397,32 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -430,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -442,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -469,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -480,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -507,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -518,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -531,6 +859,9 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f @@ -540,6 +871,7 @@ CHECKSUMS unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -547,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/yaml-merge/Gemfile.lock b/gems/yaml-merge/Gemfile.lock index 8c7304619..f2364f96c 100644 --- a/gems/yaml-merge/Gemfile.lock +++ b/gems/yaml-merge/Gemfile.lock @@ -16,265 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +40,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +103,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +131,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +270,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +322,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +373,22 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,17 +397,11 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) yaml-merge! yard (~> 0.9, >= 0.9.44) @@ -704,35 +410,19 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +430,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +442,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +469,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +480,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +507,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +518,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,14 +531,10 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -879,7 +547,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 89e9b8ead7879cac16a6aa2bdc6b55e71ecb84f0 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:28:16 -0600 Subject: [PATCH 233/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-template/.kettle-drift.lock | 60 ++- gems/ast-template/Gemfile | 70 +++- gems/ast-template/Rakefile | 18 +- gems/ast-template/lib/ast/template/version.rb | 2 +- gems/ruby-merge/Gemfile.lock | 327 +++++++++++++++- gems/rust-merge/.kettle-drift.lock | 60 ++- gems/rust-merge/Gemfile | 40 ++ gems/rust-merge/Gemfile.lock | 331 +--------------- gems/typescript-merge/Gemfile.lock | 353 +----------------- 9 files changed, 526 insertions(+), 735 deletions(-) diff --git a/gems/ast-template/.kettle-drift.lock b/gems/ast-template/.kettle-drift.lock index 44ac5c29d..5b373dd8d 100644 --- a/gems/ast-template/.kettle-drift.lock +++ b/gems/ast-template/.kettle-drift.lock @@ -7,7 +7,8 @@ 119, 159, 199, - 239 + 239, + 279 ] } ], @@ -19,7 +20,8 @@ 130, 170, 210, - 250 + 250, + 290 ] } ], @@ -31,7 +33,8 @@ 120, 160, 200, - 240 + 240, + 280 ] } ], @@ -43,7 +46,8 @@ 132, 172, 212, - 252 + 252, + 292 ] } ], @@ -55,7 +59,8 @@ 135, 175, 215, - 255 + 255, + 295 ] } ], @@ -67,7 +72,8 @@ 121, 161, 201, - 241 + 241, + 281 ] } ], @@ -80,7 +86,8 @@ 139, 179, 219, - 259 + 259, + 299 ] } ], @@ -92,7 +99,8 @@ 140, 180, 220, - 260 + 260, + 300 ] } ], @@ -105,7 +113,8 @@ 126, 166, 206, - 246 + 246, + 286 ] } ], @@ -117,7 +126,8 @@ 149, 189, 229, - 269 + 269, + 309 ] } ], @@ -130,7 +140,8 @@ 118, 158, 198, - 238 + 238, + 278 ] } ], @@ -143,7 +154,8 @@ 148, 188, 228, - 268 + 268, + 308 ] } ], @@ -155,7 +167,8 @@ 124, 164, 204, - 244 + 244, + 284 ] } ], @@ -168,7 +181,8 @@ 131, 171, 211, - 251 + 251, + 291 ] } ], @@ -181,7 +195,8 @@ 127, 167, 207, - 247 + 247, + 287 ] } ], @@ -193,7 +208,8 @@ 125, 165, 205, - 245 + 245, + 285 ] } ], @@ -205,7 +221,8 @@ 142, 182, 222, - 262 + 262, + 302 ] } ], @@ -217,7 +234,8 @@ 141, 181, 221, - 261 + 261, + 301 ] } ], @@ -229,7 +247,8 @@ 136, 176, 216, - 256 + 256, + 296 ] } ], @@ -241,7 +260,8 @@ 145, 185, 225, - 265 + 265, + 305 ] } ], diff --git a/gems/ast-template/Gemfile b/gems/ast-template/Gemfile index 8fa827ea3..a3f3e6830 100644 --- a/gems/ast-template/Gemfile +++ b/gems/ast-template/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source 'https://gem.coop' +source "https://gem.coop" git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,17 +19,61 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ['~> 1.0', '>= 1.0.8'] -gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ["~> 1.0", ">= 1.0.8"] +gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ast-merge ] -direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') +direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? + +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) + direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") + direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == "nomono" } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + if nomono_locked + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] + end + end + Kernel.send(:gem, "nomono", *nomono_activation_requirements) + require "nomono/bundler" + if direct_sibling_templating && !direct_sibling_local + ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + end + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: "STRUCTUREDMERGE", + path_env: "STRUCTUREDMERGE_DEV", + root: ["src", "my", "structuredmerge"] + ) + rescue LoadError + warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + else + ENV.delete("STRUCTUREDMERGE_DEV") + end + end + end +end if direct_sibling_gems.any? && (direct_sibling_local || @@ -289,25 +333,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? # Debugging -eval_gemfile 'gemfiles/modular/debug.gemfile' +eval_gemfile "gemfiles/modular/debug.gemfile" # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile 'gemfiles/modular/coverage.gemfile' +eval_gemfile "gemfiles/modular/coverage.gemfile" # Linting -eval_gemfile 'gemfiles/modular/style.gemfile' +eval_gemfile "gemfiles/modular/style.gemfile" # Documentation -eval_gemfile 'gemfiles/modular/documentation.gemfile' +eval_gemfile "gemfiles/modular/documentation.gemfile" # Optional -eval_gemfile 'gemfiles/modular/optional.gemfile' +eval_gemfile "gemfiles/modular/optional.gemfile" ### Std Lib Extracted Gems -eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' +eval_gemfile "gemfiles/modular/x_std_libs.gemfile" # See unlocked_deps appraisal for more details on irb inclusion -gem 'irb', '~> 1.17' # ruby >= 2.7 +gem "irb", "~> 1.17" # ruby >= 2.7 diff --git a/gems/ast-template/Rakefile b/gems/ast-template/Rakefile index 1da755b67..193fad244 100644 --- a/gems/ast-template/Rakefile +++ b/gems/ast-template/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require 'kettle/drift' + require "kettle/drift" Kettle::Drift.install_tasks rescue LoadError - desc('(stub) kettle:drift:check is unavailable') - task('kettle:drift:check') do + desc("(stub) kettle:drift:check is unavailable") + task("kettle:drift:check") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:update is unavailable') - task('kettle:drift:update') do + desc("(stub) kettle:drift:update is unavailable") + task("kettle:drift:update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:force_update is unavailable') - task('kettle:drift:force_update') do + desc("(stub) kettle:drift:force_update is unavailable") + task("kettle:drift:force_update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift is unavailable') - task('kettle:drift' => 'kettle:drift:update') + desc("(stub) kettle:drift is unavailable") + task("kettle:drift" => "kettle:drift:update") end ### TEMPLATING TASKS diff --git a/gems/ast-template/lib/ast/template/version.rb b/gems/ast-template/lib/ast/template/version.rb index 0e1e7cf5d..2cf6f7536 100644 --- a/gems/ast-template/lib/ast/template/version.rb +++ b/gems/ast-template/lib/ast/template/version.rb @@ -3,7 +3,7 @@ module Ast module Template module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/ruby-merge/Gemfile.lock b/gems/ruby-merge/Gemfile.lock index cb9116cc7..d7aa907b8 100644 --- a/gems/ruby-merge/Gemfile.lock +++ b/gems/ruby-merge/Gemfile.lock @@ -17,7 +17,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -26,7 +58,193 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -34,6 +252,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -53,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -408,31 +687,52 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0.0) ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -479,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -490,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -521,6 +835,8 @@ 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -529,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -542,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/rust-merge/.kettle-drift.lock b/gems/rust-merge/.kettle-drift.lock index d3c2a2030..98e9f541b 100644 --- a/gems/rust-merge/.kettle-drift.lock +++ b/gems/rust-merge/.kettle-drift.lock @@ -7,7 +7,8 @@ 120, 160, 200, - 240 + 240, + 280 ] } ], @@ -19,7 +20,8 @@ 131, 171, 211, - 251 + 251, + 291 ] } ], @@ -31,7 +33,8 @@ 121, 161, 201, - 241 + 241, + 281 ] } ], @@ -43,7 +46,8 @@ 133, 173, 213, - 253 + 253, + 293 ] } ], @@ -55,7 +59,8 @@ 136, 176, 216, - 256 + 256, + 296 ] } ], @@ -67,7 +72,8 @@ 122, 162, 202, - 242 + 242, + 282 ] } ], @@ -80,7 +86,8 @@ 140, 180, 220, - 260 + 260, + 300 ] } ], @@ -92,7 +99,8 @@ 141, 181, 221, - 261 + 261, + 301 ] } ], @@ -105,7 +113,8 @@ 127, 167, 207, - 247 + 247, + 287 ] } ], @@ -117,7 +126,8 @@ 150, 190, 230, - 270 + 270, + 310 ] } ], @@ -130,7 +140,8 @@ 119, 159, 199, - 239 + 239, + 279 ] } ], @@ -143,7 +154,8 @@ 149, 189, 229, - 269 + 269, + 309 ] } ], @@ -155,7 +167,8 @@ 125, 165, 205, - 245 + 245, + 285 ] } ], @@ -168,7 +181,8 @@ 132, 172, 212, - 252 + 252, + 292 ] } ], @@ -181,7 +195,8 @@ 128, 168, 208, - 248 + 248, + 288 ] } ], @@ -193,7 +208,8 @@ 126, 166, 206, - 246 + 246, + 286 ] } ], @@ -205,7 +221,8 @@ 143, 183, 223, - 263 + 263, + 303 ] } ], @@ -217,7 +234,8 @@ 142, 182, 222, - 262 + 262, + 302 ] } ], @@ -229,7 +247,8 @@ 137, 177, 217, - 257 + 257, + 297 ] } ], @@ -241,7 +260,8 @@ 146, 186, 226, - 266 + 266, + 306 ] } ], diff --git a/gems/rust-merge/Gemfile b/gems/rust-merge/Gemfile index cfdf72694..c143d31ed 100644 --- a/gems/rust-merge/Gemfile +++ b/gems/rust-merge/Gemfile @@ -272,6 +272,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/rust-merge/Gemfile.lock b/gems/rust-merge/Gemfile.lock index 53081f8da..8f9fd758f 100644 --- a/gems/rust-merge/Gemfile.lock +++ b/gems/rust-merge/Gemfile.lock @@ -17,39 +17,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -58,193 +26,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -252,29 +34,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -294,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +116,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +144,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +283,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -618,7 +361,7 @@ GEM yard yard-relative_markdown_links (0.6.0) nokogiri (>= 1.14.3, < 2) - yard-timekeeper (0.2.3) + yard-timekeeper (0.2.4) version_gem (~> 1.1, >= 1.1.13) yard-yaml (0.2.3) version_gem (~> 1.1, >= 1.1.13) @@ -638,45 +381,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +406,33 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +440,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +452,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +479,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +490,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +517,10 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +529,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,27 +542,21 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd yard-relative_markdown_links (0.6.0) sha256=3e5ffa85cbad9bac70bee5421774b190fb25d3bdf489323a5b3534f647d1a70e - yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 + yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/typescript-merge/Gemfile.lock b/gems/typescript-merge/Gemfile.lock index 776990eb1..de6a40e2a 100644 --- a/gems/typescript-merge/Gemfile.lock +++ b/gems/typescript-merge/Gemfile.lock @@ -16,265 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +40,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +103,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +131,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +270,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +322,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +373,22 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +397,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +430,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +442,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +469,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +480,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +507,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +518,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,9 +531,6 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f @@ -871,7 +540,6 @@ CHECKSUMS unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +547,6 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 6f835f3e36d831677010e4c4ff6cdb7e1e809564 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:28:25 -0600 Subject: [PATCH 234/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-template/.rubocop_gradual.lock | 315 ----------------- gems/ast-template/Gemfile | 68 ++-- gems/ast-template/Gemfile.lock | 59 ++-- gems/ast-template/Rakefile | 18 +- gems/ast-template/lib/ast/template/version.rb | 2 +- gems/binary-merge/.kettle-drift.lock | 60 ++-- gems/binary-merge/Gemfile | 70 +++- gems/binary-merge/Gemfile.lock | 59 ++-- gems/binary-merge/Rakefile | 18 +- gems/binary-merge/lib/binary/merge/version.rb | 2 +- gems/rust-merge/Gemfile.lock | 327 +++++++++++++++++- gems/typescript-merge/.kettle-drift.lock | 60 ++-- gems/typescript-merge/Gemfile | 40 +++ gems/typescript-merge/Gemfile.lock | 34 +- 14 files changed, 632 insertions(+), 500 deletions(-) delete mode 100644 gems/ast-template/.rubocop_gradual.lock diff --git a/gems/ast-template/.rubocop_gradual.lock b/gems/ast-template/.rubocop_gradual.lock deleted file mode 100644 index 032ac1f2a..000000000 --- a/gems/ast-template/.rubocop_gradual.lock +++ /dev/null @@ -1,315 +0,0 @@ -{ - ".simplecov:3875640430": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:2781279821": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "ast-template.gemspec:3753841817": [ - [127, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [142, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [143, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [150, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/ast-template.rb:1768837856": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`ast-template.rb`) should use snake_case.", 5381] - ], - "lib/ast/template.rb:2086842713": [ - [10, 3, 15, "Style/Documentation: Missing top-level documentation comment for `module Ast::Template`.", 1853069487], - [10, 3, 62364, "Metrics/ModuleLength: Module has too many lines. [1391/100]", 2978788318], - [31, 5, 61575, "Metrics/ClassLength: Class has too many lines. [1370/100]", 1675855509], - [32, 7, 656, "Metrics/MethodLength: Method has too many lines. [12/10]", 4176787264], - [47, 7, 1248, "Metrics/AbcSize: Assignment Branch Condition size for `readme_family_token_values` is too high. [<17, 31, 5> 35.71/17]", 2414018706], - [47, 7, 1248, "Metrics/MethodLength: Method has too many lines. [21/10]", 2414018706], - [78, 7, 915, "Metrics/MethodLength: Method has too many lines. [18/10]", 788116683], - [108, 7, 624, "Metrics/MethodLength: Method has too many lines. [14/10]", 3152255782], - [125, 7, 1499, "Metrics/AbcSize: Assignment Branch Condition size for `run_readme_family_sections_for_package_directories` is too high. [<10, 27, 6> 29.41/17]", 44972847], - [125, 7, 1499, "Metrics/MethodLength: Method has too many lines. [35/10]", 44972847], - [133, 9, 1138, "Metrics/BlockLength: Block has too many lines. [26/25]", 3835793651], - [164, 7, 540, "Metrics/MethodLength: Method has too many lines. [14/10]", 1455912513], - [198, 7, 2052, "Metrics/AbcSize: Assignment Branch Condition size for `default_family_merge_adapter_registry` is too high. [<14, 39, 10> 42.63/17]", 2278087573], - [198, 7, 2052, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `default_family_merge_adapter_registry` is too high. [11/7]", 2278087573], - [198, 7, 2052, "Metrics/MethodLength: Method has too many lines. [56/10]", 2278087573], - [198, 7, 2052, "Metrics/PerceivedComplexity: Perceived complexity for `default_family_merge_adapter_registry` is too high. [11/8]", 2278087573], - [224, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [226, 13, 16, "Lint/SuppressedException: Do not suppress exceptions.", 1026572812], - [236, 11, 16, "Lint/SuppressedException: Do not suppress exceptions.", 1026572812], - [251, 13, 16, "Lint/SuppressedException: Do not suppress exceptions.", 1026572812], - [269, 59, 158, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1840084196], - [270, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087867783], - [283, 7, 585, "Metrics/MethodLength: Method has too many lines. [11/10]", 3906693384], - [283, 56, 172, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 331060096], - [284, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1674317416], - [298, 7, 591, "Metrics/MethodLength: Method has too many lines. [11/10]", 3516005727], - [298, 58, 174, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1025179136], - [299, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 254853645], - [313, 7, 685, "Metrics/MethodLength: Method has too many lines. [12/10]", 3467399181], - [313, 70, 179, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2059101405], - [314, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 2061684677], - [329, 7, 618, "Metrics/MethodLength: Method has too many lines. [11/10]", 2401761450], - [329, 78, 201, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 4235690185], - [330, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 1064263543], - [364, 55, 164, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2487000221], - [365, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3119702098], - [378, 63, 186, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2803525897], - [379, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 2696213732], - [399, 7, 855, "Metrics/MethodLength: Method has too many lines. [21/10]", 1805387058], - [399, 68, 191, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2632809545], - [400, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 4190793949], - [424, 7, 942, "Metrics/MethodLength: Method has too many lines. [22/10]", 3830329170], - [424, 87, 210, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 3023644425], - [425, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 517767074], - [450, 7, 1847, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_session_status` is too high. [<14, 49, 27> 57.67/17]", 4110228676], - [450, 7, 1847, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_directory_session_status` is too high. [27/7]", 4110228676], - [450, 7, 1847, "Metrics/MethodLength: Method has too many lines. [26/10]", 4110228676], - [450, 7, 1847, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_directory_session_status` is too high. [27/8]", 4110228676], - [471, 18, 1, "Style/DoubleNegation: Avoid the use of double negation (`!!`).", 177540], - [488, 7, 639, "Metrics/MethodLength: Method has too many lines. [11/10]", 1159346913], - [503, 7, 2247, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_session_diagnostics` is too high. [<12, 46, 28> 55.17/17]", 42314578], - [503, 7, 2247, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_directory_session_diagnostics` is too high. [26/7]", 42314578], - [503, 7, 2247, "Metrics/MethodLength: Method has too many lines. [44/10]", 42314578], - [503, 7, 2247, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_directory_session_diagnostics` is too high. [26/8]", 42314578], - [515, 23, 1380, "Metrics/BlockLength: Block has too many lines. [27/25]", 2686192500], - [543, 9, 11, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 848344986], - [560, 7, 669, "Metrics/MethodLength: Method has too many lines. [11/10]", 948308474], - [569, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085362375], - [575, 7, 721, "Metrics/MethodLength: Method has too many lines. [14/10]", 3970823326], - [575, 71, 194, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 3917828873], - [576, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 1017287714], - [593, 7, 921, "Metrics/MethodLength: Method has too many lines. [18/10]", 3608196218], - [593, 90, 213, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1024049097], - [593, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861341], - [594, 121, 59, "Layout/LineLength: Line is too long. [179/120]", 2535099243], - [623, 7, 1232, "Metrics/MethodLength: Method has too many lines. [33/10]", 2772161373], - [623, 67, 190, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 767991305], - [624, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 4114753948], - [660, 7, 1317, "Metrics/MethodLength: Method has too many lines. [26/10]", 3490333035], - [660, 86, 209, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1111567049], - [661, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 3056305766], - [690, 7, 1325, "Metrics/MethodLength: Method has too many lines. [26/10]", 4238651548], - [690, 88, 211, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 4054918473], - [691, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 172214443], - [720, 7, 1370, "Metrics/MethodLength: Method has too many lines. [37/10]", 2622224263], - [720, 76, 205, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3505072102], - [721, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 4014499349], - [761, 7, 1142, "Metrics/AbcSize: Assignment Branch Condition size for `run_template_directory_session_with_options` is too high. [<2, 28, 13> 30.94/17]", 4142644019], - [761, 7, 1142, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `run_template_directory_session_with_options` is too high. [14/7]", 4142644019], - [761, 7, 1142, "Metrics/MethodLength: Method has too many lines. [19/10]", 4142644019], - [761, 7, 1142, "Metrics/PerceivedComplexity: Perceived complexity for `run_template_directory_session_with_options` is too high. [14/8]", 4142644019], - [783, 7, 1053, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_session_options_configuration` is too high. [<3, 19, 5> 19.87/17]", 4149687719], - [783, 7, 1053, "Metrics/MethodLength: Method has too many lines. [24/10]", 4149687719], - [822, 7, 1015, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_session_profile_configuration` is too high. [<6, 17, 6> 19/17]", 3439042821], - [822, 7, 1015, "Metrics/MethodLength: Method has too many lines. [21/10]", 3439042821], - [846, 7, 741, "Metrics/MethodLength: Method has too many lines. [13/10]", 26059598], - [862, 7, 431, "Metrics/MethodLength: Method has too many lines. [12/10]", 2701838518], - [885, 7, 645, "Metrics/MethodLength: Method has too many lines. [11/10]", 4194104448], - [900, 7, 619, "Metrics/MethodLength: Method has too many lines. [12/10]", 1636858424], - [924, 7, 645, "Metrics/MethodLength: Method has too many lines. [11/10]", 1685536251], - [939, 7, 762, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `run_template_directory_session_runner_request` is too high. [8/7]", 1296256230], - [939, 7, 762, "Metrics/MethodLength: Method has too many lines. [16/10]", 1296256230], - [967, 7, 680, "Metrics/MethodLength: Method has too many lines. [11/10]", 2612182881], - [976, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3937819337], - [982, 7, 2608, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_session_runner_input` is too high. [<14, 56, 37> 68.56/17]", 1118646956], - [982, 7, 2608, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_directory_session_runner_input` is too high. [36/7]", 1118646956], - [982, 7, 2608, "Metrics/MethodLength: Method has too many lines. [42/10]", 1118646956], - [982, 7, 2608, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_directory_session_runner_input` is too high. [36/8]", 1118646956], - [1015, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4185298420], - [1028, 7, 1841, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_session_runner_payload` is too high. [<6, 34, 26> 43.22/17]", 668498009], - [1028, 7, 1841, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_directory_session_runner_payload` is too high. [25/7]", 668498009], - [1028, 7, 1841, "Metrics/MethodLength: Method has too many lines. [29/10]", 668498009], - [1028, 7, 1841, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_directory_session_runner_payload` is too high. [27/8]", 668498009], - [1052, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 838260297], - [1078, 7, 680, "Metrics/MethodLength: Method has too many lines. [11/10]", 1786285601], - [1087, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3937819337], - [1093, 7, 727, "Metrics/MethodLength: Method has too many lines. [17/10]", 2883184841], - [1115, 7, 793, "Metrics/MethodLength: Method has too many lines. [21/10]", 3728759813], - [1153, 7, 2638, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_session_inspection` is too high. [<6, 37, 2> 37.54/17]", 2423723700], - [1153, 7, 2638, "Metrics/MethodLength: Method has too many lines. [66/10]", 2423723700], - [1233, 7, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 835919808], - [1242, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193343749], - [1248, 7, 639, "Metrics/MethodLength: Method has too many lines. [16/10]", 890869399], - [1279, 7, 1321, "Metrics/AbcSize: Assignment Branch Condition size for `run_template_directory_session_command_payload` is too high. [<1, 27, 12> 29.56/17]", 268857423], - [1279, 7, 1321, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `run_template_directory_session_command_payload` is too high. [13/7]", 268857423], - [1279, 7, 1321, "Metrics/MethodLength: Method has too many lines. [20/10]", 268857423], - [1279, 7, 1321, "Metrics/PerceivedComplexity: Perceived complexity for `run_template_directory_session_command_payload` is too high. [13/8]", 268857423], - [1295, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2272443568], - [1319, 7, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 3409839974], - [1328, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193343749], - [1342, 7, 645, "Metrics/MethodLength: Method has too many lines. [11/10]", 2481445197], - [1365, 7, 685, "Metrics/MethodLength: Method has too many lines. [11/10]", 807027808], - [1374, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1225026887], - [1388, 7, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 1570524606], - [1397, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193343749], - [1403, 7, 589, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_session_request_from_runner_request` is too high. [8/7]", 1923077466], - [1403, 7, 589, "Metrics/MethodLength: Method has too many lines. [11/10]", 1923077466], - [1418, 7, 1803, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_template_directory_session_options` is too high. [<3, 38, 28> 47.3/17]", 319878734], - [1418, 7, 1803, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `resolve_template_directory_session_options` is too high. [29/7]", 319878734], - [1418, 7, 1803, "Metrics/MethodLength: Method has too many lines. [22/10]", 319878734], - [1418, 7, 1803, "Metrics/PerceivedComplexity: Perceived complexity for `resolve_template_directory_session_options` is too high. [29/8]", 319878734], - [1458, 7, 1357, "Metrics/AbcSize: Assignment Branch Condition size for `replace_or_insert_markdown_heading_section` is too high. [<18, 33, 18> 41.68/17]", 812459935], - [1458, 7, 1357, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `replace_or_insert_markdown_heading_section` is too high. [12/7]", 812459935], - [1458, 7, 1357, "Metrics/MethodLength: Method has too many lines. [26/10]", 812459935], - [1458, 7, 1357, "Metrics/PerceivedComplexity: Perceived complexity for `replace_or_insert_markdown_heading_section` is too high. [12/8]", 812459935], - [1494, 7, 456, "Metrics/AbcSize: Assignment Branch Condition size for `readme_family_section_insert_index` is too high. [<5, 9, 14> 17.38/17]", 252997882], - [1494, 7, 456, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `readme_family_section_insert_index` is too high. [8/7]", 252997882], - [1494, 7, 456, "Metrics/MethodLength: Method has too many lines. [13/10]", 252997882] - ], - "spec/session_integration_spec.rb:1063469608": [ - [5, 1, 89793, "Metrics/BlockLength: Block has too many lines. [1761/25]", 3162725061], - [31, 3, 612, "Metrics/MethodLength: Method has too many lines. [16/10]", 1402311658], - [50, 3, 2970, "Metrics/BlockLength: Block has too many lines. [60/25]", 2848879838], - [118, 3, 1748, "Metrics/BlockLength: Block has too many lines. [40/25]", 3276283317], - [164, 3, 1582, "Metrics/BlockLength: Block has too many lines. [37/25]", 4190998336], - [237, 3, 2325, "Metrics/BlockLength: Block has too many lines. [51/25]", 3352569469], - [295, 3, 1789, "Metrics/BlockLength: Block has too many lines. [38/25]", 1947005133], - [339, 3, 1944, "Metrics/BlockLength: Block has too many lines. [41/25]", 3993685201], - [386, 3, 1807, "Metrics/BlockLength: Block has too many lines. [38/25]", 4257675897], - [452, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 561412382], - [457, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], - [472, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 561412382], - [477, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2088089918], - [485, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087412612], - [490, 3, 1758, "Metrics/BlockLength: Block has too many lines. [37/25]", 1520782676], - [548, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], - [554, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1246048068], - [560, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [573, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1246048068], - [578, 3, 1812, "Metrics/BlockLength: Block has too many lines. [39/25]", 1709538088], - [623, 3, 1428, "Metrics/BlockLength: Block has too many lines. [31/25]", 4067408447], - [660, 3, 1975, "Metrics/BlockLength: Block has too many lines. [49/25]", 432162268], - [716, 3, 1902, "Metrics/BlockLength: Block has too many lines. [45/25]", 2326466404], - [770, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 703289421], - [797, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 703289421], - [818, 3, 1462, "Metrics/BlockLength: Block has too many lines. [35/25]", 1648309772], - [860, 3, 1466, "Metrics/BlockLength: Block has too many lines. [31/25]", 3549227194], - [898, 3, 1656, "Metrics/BlockLength: Block has too many lines. [36/25]", 2643926725], - [956, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], - [963, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2382627530], - [968, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [985, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2382627530], - [990, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114085752], - [998, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3868965366], - [1004, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3135429041], - [1011, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 2121600243], - [1016, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3948574204], - [1034, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 2121600243], - [1038, 3, 1281, "Metrics/BlockLength: Block has too many lines. [31/25]", 1507281102], - [1076, 3, 1329, "Metrics/BlockLength: Block has too many lines. [31/25]", 3185120887], - [1114, 3, 1680, "Metrics/BlockLength: Block has too many lines. [36/25]", 2250099450], - [1115, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193424063], - [1158, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114085752], - [1166, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3868965366], - [1172, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3135429041], - [1179, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 2121600243], - [1184, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3948574204], - [1202, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 2121600243], - [1206, 3, 1628, "Metrics/BlockLength: Block has too many lines. [36/25]", 4066832477], - [1249, 3, 1267, "Metrics/BlockLength: Block has too many lines. [31/25]", 488100020], - [1287, 3, 1404, "Metrics/BlockLength: Block has too many lines. [36/25]", 2415041159], - [1330, 3, 1970, "Metrics/BlockLength: Block has too many lines. [38/25]", 1463232713], - [1376, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193407726], - [1384, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193406689], - [1390, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087900170], - [1397, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 414784060], - [1402, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179046083], - [1419, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 414784060], - [1540, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], - [1547, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2382627530], - [1552, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [1569, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2382627530], - [1574, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1621973742], - [1582, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1297498406], - [1588, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 2665434363], - [1595, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1334260795], - [1600, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193407726], - [1608, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193406689], - [1614, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087900170], - [1621, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 414784060], - [1626, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179046083], - [1644, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 414784060], - [1649, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3197516464], - [1667, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1334260795], - [1717, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193407726], - [1725, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193406689], - [1731, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087900170], - [1738, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 414784060], - [1743, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179046083], - [1760, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 414784060], - [1868, 3, 442, "Metrics/AbcSize: Assignment Branch Condition size for `options_with_resolved_fixture_paths` is too high. [<3, 18, 2> 18.36/17]", 13098503], - [1879, 3, 878, "Metrics/AbcSize: Assignment Branch Condition size for `runner_request_with_resolved_fixture_paths` is too high. [<7, 36, 6> 37.16/17]", 2279422631], - [1879, 3, 878, "Metrics/MethodLength: Method has too many lines. [20/10]", 2279422631], - [1902, 3, 449, "Metrics/AbcSize: Assignment Branch Condition size for `runner_payload_with_resolved_fixture_paths` is too high. [<3, 18, 2> 18.36/17]", 1041394699], - [1948, 3, 932, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_session_inspection_expected_paths` is too high. [<4, 24, 6> 25.06/17]", 616473516], - [1948, 3, 932, "Metrics/MethodLength: Method has too many lines. [17/10]", 616473516], - [2015, 3, 679, "Metrics/AbcSize: Assignment Branch Condition size for `invocation_with_resolved_fixture_paths` is too high. [<5, 20, 4> 21/17]", 2866326769], - [2015, 3, 679, "Metrics/MethodLength: Method has too many lines. [12/10]", 2866326769] - ] -} diff --git a/gems/ast-template/Gemfile b/gems/ast-template/Gemfile index a3f3e6830..eeac60475 100644 --- a/gems/ast-template/Gemfile +++ b/gems/ast-template/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source "https://gem.coop" +source 'https://gem.coop' git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,57 +19,53 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ["~> 1.0", ">= 1.0.8"] -gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ['~> 1.0', '>= 1.0.8'] +gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ast-merge ] -direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") +direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? if direct_sibling_gems.any? && - (direct_sibling_local || - ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) - direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") - direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) begin nomono_activation_requirements = nomono_requirements - nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) if File.file?(nomono_lockfile) nomono_locked_spec = Bundler::LockfileParser - .new(Bundler.read_file(nomono_lockfile)) - .specs - .find { |spec| spec.name == "nomono" } + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } nomono_locked = nomono_locked_spec && - Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) - if nomono_locked - nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] - end - end - Kernel.send(:gem, "nomono", *nomono_activation_requirements) - require "nomono/bundler" - if direct_sibling_templating && !direct_sibling_local - ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local eval_nomono_gems( gems: direct_sibling_gems, - prefix: "STRUCTUREDMERGE", - path_env: "STRUCTUREDMERGE_DEV", - root: ["src", "my", "structuredmerge"] + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] ) rescue LoadError - warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' ensure if direct_sibling_templating && !direct_sibling_local if direct_sibling_dev_was_set - ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original else - ENV.delete("STRUCTUREDMERGE_DEV") + ENV.delete('STRUCTUREDMERGE_DEV') end end end @@ -333,25 +329,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging -eval_gemfile "gemfiles/modular/debug.gemfile" +eval_gemfile 'gemfiles/modular/debug.gemfile' # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile "gemfiles/modular/coverage.gemfile" +eval_gemfile 'gemfiles/modular/coverage.gemfile' # Linting -eval_gemfile "gemfiles/modular/style.gemfile" +eval_gemfile 'gemfiles/modular/style.gemfile' # Documentation -eval_gemfile "gemfiles/modular/documentation.gemfile" +eval_gemfile 'gemfiles/modular/documentation.gemfile' # Optional -eval_gemfile "gemfiles/modular/optional.gemfile" +eval_gemfile 'gemfiles/modular/optional.gemfile' ### Std Lib Extracted Gems -eval_gemfile "gemfiles/modular/x_std_libs.gemfile" +eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' # See unlocked_deps appraisal for more details on irb inclusion -gem "irb", "~> 1.17" # ruby >= 2.7 +gem 'irb', '~> 1.17' # ruby >= 2.7 diff --git a/gems/ast-template/Gemfile.lock b/gems/ast-template/Gemfile.lock index 3db99393b..530ee0633 100644 --- a/gems/ast-template/Gemfile.lock +++ b/gems/ast-template/Gemfile.lock @@ -275,6 +275,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -308,7 +324,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -363,18 +378,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -538,22 +542,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -659,9 +659,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -739,7 +739,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -760,10 +759,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -838,13 +837,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/ast-template/Rakefile b/gems/ast-template/Rakefile index 193fad244..1da755b67 100644 --- a/gems/ast-template/Rakefile +++ b/gems/ast-template/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require "kettle/drift" + require 'kettle/drift' Kettle::Drift.install_tasks rescue LoadError - desc("(stub) kettle:drift:check is unavailable") - task("kettle:drift:check") do + desc('(stub) kettle:drift:check is unavailable') + task('kettle:drift:check') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:update is unavailable") - task("kettle:drift:update") do + desc('(stub) kettle:drift:update is unavailable') + task('kettle:drift:update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:force_update is unavailable") - task("kettle:drift:force_update") do + desc('(stub) kettle:drift:force_update is unavailable') + task('kettle:drift:force_update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift is unavailable") - task("kettle:drift" => "kettle:drift:update") + desc('(stub) kettle:drift is unavailable') + task('kettle:drift' => 'kettle:drift:update') end ### TEMPLATING TASKS diff --git a/gems/ast-template/lib/ast/template/version.rb b/gems/ast-template/lib/ast/template/version.rb index 2cf6f7536..0e1e7cf5d 100644 --- a/gems/ast-template/lib/ast/template/version.rb +++ b/gems/ast-template/lib/ast/template/version.rb @@ -3,7 +3,7 @@ module Ast module Template module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/binary-merge/.kettle-drift.lock b/gems/binary-merge/.kettle-drift.lock index 5b373dd8d..309d406e1 100644 --- a/gems/binary-merge/.kettle-drift.lock +++ b/gems/binary-merge/.kettle-drift.lock @@ -8,7 +8,8 @@ 159, 199, 239, - 279 + 279, + 319 ] } ], @@ -21,7 +22,8 @@ 170, 210, 250, - 290 + 290, + 330 ] } ], @@ -34,7 +36,8 @@ 160, 200, 240, - 280 + 280, + 320 ] } ], @@ -47,7 +50,8 @@ 172, 212, 252, - 292 + 292, + 332 ] } ], @@ -60,7 +64,8 @@ 175, 215, 255, - 295 + 295, + 335 ] } ], @@ -73,7 +78,8 @@ 161, 201, 241, - 281 + 281, + 321 ] } ], @@ -87,7 +93,8 @@ 179, 219, 259, - 299 + 299, + 339 ] } ], @@ -100,7 +107,8 @@ 180, 220, 260, - 300 + 300, + 340 ] } ], @@ -114,7 +122,8 @@ 166, 206, 246, - 286 + 286, + 326 ] } ], @@ -127,7 +136,8 @@ 189, 229, 269, - 309 + 309, + 349 ] } ], @@ -141,7 +151,8 @@ 158, 198, 238, - 278 + 278, + 318 ] } ], @@ -155,7 +166,8 @@ 188, 228, 268, - 308 + 308, + 348 ] } ], @@ -168,7 +180,8 @@ 164, 204, 244, - 284 + 284, + 324 ] } ], @@ -182,7 +195,8 @@ 171, 211, 251, - 291 + 291, + 331 ] } ], @@ -196,7 +210,8 @@ 167, 207, 247, - 287 + 287, + 327 ] } ], @@ -209,7 +224,8 @@ 165, 205, 245, - 285 + 285, + 325 ] } ], @@ -222,7 +238,8 @@ 182, 222, 262, - 302 + 302, + 342 ] } ], @@ -235,7 +252,8 @@ 181, 221, 261, - 301 + 301, + 341 ] } ], @@ -248,7 +266,8 @@ 176, 216, 256, - 296 + 296, + 336 ] } ], @@ -261,7 +280,8 @@ 185, 225, 265, - 305 + 305, + 345 ] } ], diff --git a/gems/binary-merge/Gemfile b/gems/binary-merge/Gemfile index bb3d7d3d2..6fa913a4f 100644 --- a/gems/binary-merge/Gemfile +++ b/gems/binary-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source 'https://gem.coop' +source "https://gem.coop" git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,17 +19,61 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ['~> 1.0', '>= 1.0.8'] -gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ["~> 1.0", ">= 1.0.8"] +gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ tree_haver ] -direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') +direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? + +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) + direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") + direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == "nomono" } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + if nomono_locked + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] + end + end + Kernel.send(:gem, "nomono", *nomono_activation_requirements) + require "nomono/bundler" + if direct_sibling_templating && !direct_sibling_local + ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + end + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: "STRUCTUREDMERGE", + path_env: "STRUCTUREDMERGE_DEV", + root: ["src", "my", "structuredmerge"] + ) + rescue LoadError + warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + else + ENV.delete("STRUCTUREDMERGE_DEV") + end + end + end +end if direct_sibling_gems.any? && (direct_sibling_local || @@ -329,25 +373,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? # Debugging -eval_gemfile 'gemfiles/modular/debug.gemfile' +eval_gemfile "gemfiles/modular/debug.gemfile" # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile 'gemfiles/modular/coverage.gemfile' +eval_gemfile "gemfiles/modular/coverage.gemfile" # Linting -eval_gemfile 'gemfiles/modular/style.gemfile' +eval_gemfile "gemfiles/modular/style.gemfile" # Documentation -eval_gemfile 'gemfiles/modular/documentation.gemfile' +eval_gemfile "gemfiles/modular/documentation.gemfile" # Optional -eval_gemfile 'gemfiles/modular/optional.gemfile' +eval_gemfile "gemfiles/modular/optional.gemfile" ### Std Lib Extracted Gems -eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' +eval_gemfile "gemfiles/modular/x_std_libs.gemfile" # See unlocked_deps appraisal for more details on irb inclusion -gem 'irb', '~> 1.17' # ruby >= 2.7 +gem "irb", "~> 1.17" # ruby >= 2.7 diff --git a/gems/binary-merge/Gemfile.lock b/gems/binary-merge/Gemfile.lock index 3962446a6..0436c868e 100644 --- a/gems/binary-merge/Gemfile.lock +++ b/gems/binary-merge/Gemfile.lock @@ -275,6 +275,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -308,7 +324,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -363,18 +378,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -538,22 +542,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -659,9 +659,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -739,7 +739,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -760,10 +759,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -838,13 +837,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/binary-merge/Rakefile b/gems/binary-merge/Rakefile index b29d3a04b..ea4ce831d 100644 --- a/gems/binary-merge/Rakefile +++ b/gems/binary-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require 'kettle/drift' + require "kettle/drift" Kettle::Drift.install_tasks rescue LoadError - desc('(stub) kettle:drift:check is unavailable') - task('kettle:drift:check') do + desc("(stub) kettle:drift:check is unavailable") + task("kettle:drift:check") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:update is unavailable') - task('kettle:drift:update') do + desc("(stub) kettle:drift:update is unavailable") + task("kettle:drift:update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:force_update is unavailable') - task('kettle:drift:force_update') do + desc("(stub) kettle:drift:force_update is unavailable") + task("kettle:drift:force_update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift is unavailable') - task('kettle:drift' => 'kettle:drift:update') + desc("(stub) kettle:drift is unavailable") + task("kettle:drift" => "kettle:drift:update") end ### TEMPLATING TASKS diff --git a/gems/binary-merge/lib/binary/merge/version.rb b/gems/binary-merge/lib/binary/merge/version.rb index d8ae92dfa..bb78df888 100644 --- a/gems/binary-merge/lib/binary/merge/version.rb +++ b/gems/binary-merge/lib/binary/merge/version.rb @@ -3,7 +3,7 @@ module Binary module Merge module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/rust-merge/Gemfile.lock b/gems/rust-merge/Gemfile.lock index 8f9fd758f..38105ec32 100644 --- a/gems/rust-merge/Gemfile.lock +++ b/gems/rust-merge/Gemfile.lock @@ -17,7 +17,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -26,7 +58,193 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -34,6 +252,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -53,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -406,33 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -479,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -490,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -517,10 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -529,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -542,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/typescript-merge/.kettle-drift.lock b/gems/typescript-merge/.kettle-drift.lock index d3c2a2030..98e9f541b 100644 --- a/gems/typescript-merge/.kettle-drift.lock +++ b/gems/typescript-merge/.kettle-drift.lock @@ -7,7 +7,8 @@ 120, 160, 200, - 240 + 240, + 280 ] } ], @@ -19,7 +20,8 @@ 131, 171, 211, - 251 + 251, + 291 ] } ], @@ -31,7 +33,8 @@ 121, 161, 201, - 241 + 241, + 281 ] } ], @@ -43,7 +46,8 @@ 133, 173, 213, - 253 + 253, + 293 ] } ], @@ -55,7 +59,8 @@ 136, 176, 216, - 256 + 256, + 296 ] } ], @@ -67,7 +72,8 @@ 122, 162, 202, - 242 + 242, + 282 ] } ], @@ -80,7 +86,8 @@ 140, 180, 220, - 260 + 260, + 300 ] } ], @@ -92,7 +99,8 @@ 141, 181, 221, - 261 + 261, + 301 ] } ], @@ -105,7 +113,8 @@ 127, 167, 207, - 247 + 247, + 287 ] } ], @@ -117,7 +126,8 @@ 150, 190, 230, - 270 + 270, + 310 ] } ], @@ -130,7 +140,8 @@ 119, 159, 199, - 239 + 239, + 279 ] } ], @@ -143,7 +154,8 @@ 149, 189, 229, - 269 + 269, + 309 ] } ], @@ -155,7 +167,8 @@ 125, 165, 205, - 245 + 245, + 285 ] } ], @@ -168,7 +181,8 @@ 132, 172, 212, - 252 + 252, + 292 ] } ], @@ -181,7 +195,8 @@ 128, 168, 208, - 248 + 248, + 288 ] } ], @@ -193,7 +208,8 @@ 126, 166, 206, - 246 + 246, + 286 ] } ], @@ -205,7 +221,8 @@ 143, 183, 223, - 263 + 263, + 303 ] } ], @@ -217,7 +234,8 @@ 142, 182, 222, - 262 + 262, + 302 ] } ], @@ -229,7 +247,8 @@ 137, 177, 217, - 257 + 257, + 297 ] } ], @@ -241,7 +260,8 @@ 146, 186, 226, - 266 + 266, + 306 ] } ], diff --git a/gems/typescript-merge/Gemfile b/gems/typescript-merge/Gemfile index 2702c2467..9477afd06 100644 --- a/gems/typescript-merge/Gemfile +++ b/gems/typescript-merge/Gemfile @@ -272,6 +272,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/typescript-merge/Gemfile.lock b/gems/typescript-merge/Gemfile.lock index de6a40e2a..66109fed2 100644 --- a/gems/typescript-merge/Gemfile.lock +++ b/gems/typescript-merge/Gemfile.lock @@ -16,6 +16,24 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +45,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -322,11 +335,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -353,7 +361,7 @@ GEM yard yard-relative_markdown_links (0.6.0) nokogiri (>= 1.14.3, < 2) - yard-timekeeper (0.2.3) + yard-timekeeper (0.2.4) version_gem (~> 1.1, >= 1.1.13) yard-yaml (0.2.3) version_gem (~> 1.1, >= 1.1.13) @@ -373,6 +381,7 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + ast-merge! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) debug (>= 1.1) @@ -401,6 +410,7 @@ DEPENDENCIES standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + tree_haver! tree_sitter_language_pack! typescript-merge! yaml-converter (~> 0.1) @@ -544,7 +554,7 @@ CHECKSUMS yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd yard-relative_markdown_links (0.6.0) sha256=3e5ffa85cbad9bac70bee5421774b190fb25d3bdf489323a5b3534f647d1a70e - yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 + yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 From da7f9cf85d5559b90c7454e40c8d9926b7cab232 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:28:31 -0600 Subject: [PATCH 235/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-template/.rubocop_gradual.lock | 315 ++++++++++++++ gems/ast-template/Gemfile.lock | 396 ++---------------- gems/binary-merge/Gemfile | 68 ++- gems/binary-merge/Rakefile | 18 +- gems/binary-merge/lib/binary/merge/version.rb | 2 +- gems/typescript-merge/Gemfile.lock | 327 ++++++++++++++- 6 files changed, 717 insertions(+), 409 deletions(-) create mode 100644 gems/ast-template/.rubocop_gradual.lock diff --git a/gems/ast-template/.rubocop_gradual.lock b/gems/ast-template/.rubocop_gradual.lock new file mode 100644 index 000000000..032ac1f2a --- /dev/null +++ b/gems/ast-template/.rubocop_gradual.lock @@ -0,0 +1,315 @@ +{ + ".simplecov:3875640430": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:2781279821": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "ast-template.gemspec:3753841817": [ + [127, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [142, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [143, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [150, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/ast-template.rb:1768837856": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`ast-template.rb`) should use snake_case.", 5381] + ], + "lib/ast/template.rb:2086842713": [ + [10, 3, 15, "Style/Documentation: Missing top-level documentation comment for `module Ast::Template`.", 1853069487], + [10, 3, 62364, "Metrics/ModuleLength: Module has too many lines. [1391/100]", 2978788318], + [31, 5, 61575, "Metrics/ClassLength: Class has too many lines. [1370/100]", 1675855509], + [32, 7, 656, "Metrics/MethodLength: Method has too many lines. [12/10]", 4176787264], + [47, 7, 1248, "Metrics/AbcSize: Assignment Branch Condition size for `readme_family_token_values` is too high. [<17, 31, 5> 35.71/17]", 2414018706], + [47, 7, 1248, "Metrics/MethodLength: Method has too many lines. [21/10]", 2414018706], + [78, 7, 915, "Metrics/MethodLength: Method has too many lines. [18/10]", 788116683], + [108, 7, 624, "Metrics/MethodLength: Method has too many lines. [14/10]", 3152255782], + [125, 7, 1499, "Metrics/AbcSize: Assignment Branch Condition size for `run_readme_family_sections_for_package_directories` is too high. [<10, 27, 6> 29.41/17]", 44972847], + [125, 7, 1499, "Metrics/MethodLength: Method has too many lines. [35/10]", 44972847], + [133, 9, 1138, "Metrics/BlockLength: Block has too many lines. [26/25]", 3835793651], + [164, 7, 540, "Metrics/MethodLength: Method has too many lines. [14/10]", 1455912513], + [198, 7, 2052, "Metrics/AbcSize: Assignment Branch Condition size for `default_family_merge_adapter_registry` is too high. [<14, 39, 10> 42.63/17]", 2278087573], + [198, 7, 2052, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `default_family_merge_adapter_registry` is too high. [11/7]", 2278087573], + [198, 7, 2052, "Metrics/MethodLength: Method has too many lines. [56/10]", 2278087573], + [198, 7, 2052, "Metrics/PerceivedComplexity: Perceived complexity for `default_family_merge_adapter_registry` is too high. [11/8]", 2278087573], + [224, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [226, 13, 16, "Lint/SuppressedException: Do not suppress exceptions.", 1026572812], + [236, 11, 16, "Lint/SuppressedException: Do not suppress exceptions.", 1026572812], + [251, 13, 16, "Lint/SuppressedException: Do not suppress exceptions.", 1026572812], + [269, 59, 158, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1840084196], + [270, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087867783], + [283, 7, 585, "Metrics/MethodLength: Method has too many lines. [11/10]", 3906693384], + [283, 56, 172, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 331060096], + [284, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1674317416], + [298, 7, 591, "Metrics/MethodLength: Method has too many lines. [11/10]", 3516005727], + [298, 58, 174, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1025179136], + [299, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 254853645], + [313, 7, 685, "Metrics/MethodLength: Method has too many lines. [12/10]", 3467399181], + [313, 70, 179, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2059101405], + [314, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 2061684677], + [329, 7, 618, "Metrics/MethodLength: Method has too many lines. [11/10]", 2401761450], + [329, 78, 201, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 4235690185], + [330, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 1064263543], + [364, 55, 164, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2487000221], + [365, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3119702098], + [378, 63, 186, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2803525897], + [379, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 2696213732], + [399, 7, 855, "Metrics/MethodLength: Method has too many lines. [21/10]", 1805387058], + [399, 68, 191, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2632809545], + [400, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 4190793949], + [424, 7, 942, "Metrics/MethodLength: Method has too many lines. [22/10]", 3830329170], + [424, 87, 210, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 3023644425], + [425, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 517767074], + [450, 7, 1847, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_session_status` is too high. [<14, 49, 27> 57.67/17]", 4110228676], + [450, 7, 1847, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_directory_session_status` is too high. [27/7]", 4110228676], + [450, 7, 1847, "Metrics/MethodLength: Method has too many lines. [26/10]", 4110228676], + [450, 7, 1847, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_directory_session_status` is too high. [27/8]", 4110228676], + [471, 18, 1, "Style/DoubleNegation: Avoid the use of double negation (`!!`).", 177540], + [488, 7, 639, "Metrics/MethodLength: Method has too many lines. [11/10]", 1159346913], + [503, 7, 2247, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_session_diagnostics` is too high. [<12, 46, 28> 55.17/17]", 42314578], + [503, 7, 2247, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_directory_session_diagnostics` is too high. [26/7]", 42314578], + [503, 7, 2247, "Metrics/MethodLength: Method has too many lines. [44/10]", 42314578], + [503, 7, 2247, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_directory_session_diagnostics` is too high. [26/8]", 42314578], + [515, 23, 1380, "Metrics/BlockLength: Block has too many lines. [27/25]", 2686192500], + [543, 9, 11, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 848344986], + [560, 7, 669, "Metrics/MethodLength: Method has too many lines. [11/10]", 948308474], + [569, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085362375], + [575, 7, 721, "Metrics/MethodLength: Method has too many lines. [14/10]", 3970823326], + [575, 71, 194, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 3917828873], + [576, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 1017287714], + [593, 7, 921, "Metrics/MethodLength: Method has too many lines. [18/10]", 3608196218], + [593, 90, 213, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1024049097], + [593, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861341], + [594, 121, 59, "Layout/LineLength: Line is too long. [179/120]", 2535099243], + [623, 7, 1232, "Metrics/MethodLength: Method has too many lines. [33/10]", 2772161373], + [623, 67, 190, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 767991305], + [624, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 4114753948], + [660, 7, 1317, "Metrics/MethodLength: Method has too many lines. [26/10]", 3490333035], + [660, 86, 209, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1111567049], + [661, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 3056305766], + [690, 7, 1325, "Metrics/MethodLength: Method has too many lines. [26/10]", 4238651548], + [690, 88, 211, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 4054918473], + [691, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 172214443], + [720, 7, 1370, "Metrics/MethodLength: Method has too many lines. [37/10]", 2622224263], + [720, 76, 205, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3505072102], + [721, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 4014499349], + [761, 7, 1142, "Metrics/AbcSize: Assignment Branch Condition size for `run_template_directory_session_with_options` is too high. [<2, 28, 13> 30.94/17]", 4142644019], + [761, 7, 1142, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `run_template_directory_session_with_options` is too high. [14/7]", 4142644019], + [761, 7, 1142, "Metrics/MethodLength: Method has too many lines. [19/10]", 4142644019], + [761, 7, 1142, "Metrics/PerceivedComplexity: Perceived complexity for `run_template_directory_session_with_options` is too high. [14/8]", 4142644019], + [783, 7, 1053, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_session_options_configuration` is too high. [<3, 19, 5> 19.87/17]", 4149687719], + [783, 7, 1053, "Metrics/MethodLength: Method has too many lines. [24/10]", 4149687719], + [822, 7, 1015, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_session_profile_configuration` is too high. [<6, 17, 6> 19/17]", 3439042821], + [822, 7, 1015, "Metrics/MethodLength: Method has too many lines. [21/10]", 3439042821], + [846, 7, 741, "Metrics/MethodLength: Method has too many lines. [13/10]", 26059598], + [862, 7, 431, "Metrics/MethodLength: Method has too many lines. [12/10]", 2701838518], + [885, 7, 645, "Metrics/MethodLength: Method has too many lines. [11/10]", 4194104448], + [900, 7, 619, "Metrics/MethodLength: Method has too many lines. [12/10]", 1636858424], + [924, 7, 645, "Metrics/MethodLength: Method has too many lines. [11/10]", 1685536251], + [939, 7, 762, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `run_template_directory_session_runner_request` is too high. [8/7]", 1296256230], + [939, 7, 762, "Metrics/MethodLength: Method has too many lines. [16/10]", 1296256230], + [967, 7, 680, "Metrics/MethodLength: Method has too many lines. [11/10]", 2612182881], + [976, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3937819337], + [982, 7, 2608, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_session_runner_input` is too high. [<14, 56, 37> 68.56/17]", 1118646956], + [982, 7, 2608, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_directory_session_runner_input` is too high. [36/7]", 1118646956], + [982, 7, 2608, "Metrics/MethodLength: Method has too many lines. [42/10]", 1118646956], + [982, 7, 2608, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_directory_session_runner_input` is too high. [36/8]", 1118646956], + [1015, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4185298420], + [1028, 7, 1841, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_session_runner_payload` is too high. [<6, 34, 26> 43.22/17]", 668498009], + [1028, 7, 1841, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_directory_session_runner_payload` is too high. [25/7]", 668498009], + [1028, 7, 1841, "Metrics/MethodLength: Method has too many lines. [29/10]", 668498009], + [1028, 7, 1841, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_directory_session_runner_payload` is too high. [27/8]", 668498009], + [1052, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 838260297], + [1078, 7, 680, "Metrics/MethodLength: Method has too many lines. [11/10]", 1786285601], + [1087, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3937819337], + [1093, 7, 727, "Metrics/MethodLength: Method has too many lines. [17/10]", 2883184841], + [1115, 7, 793, "Metrics/MethodLength: Method has too many lines. [21/10]", 3728759813], + [1153, 7, 2638, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_session_inspection` is too high. [<6, 37, 2> 37.54/17]", 2423723700], + [1153, 7, 2638, "Metrics/MethodLength: Method has too many lines. [66/10]", 2423723700], + [1233, 7, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 835919808], + [1242, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193343749], + [1248, 7, 639, "Metrics/MethodLength: Method has too many lines. [16/10]", 890869399], + [1279, 7, 1321, "Metrics/AbcSize: Assignment Branch Condition size for `run_template_directory_session_command_payload` is too high. [<1, 27, 12> 29.56/17]", 268857423], + [1279, 7, 1321, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `run_template_directory_session_command_payload` is too high. [13/7]", 268857423], + [1279, 7, 1321, "Metrics/MethodLength: Method has too many lines. [20/10]", 268857423], + [1279, 7, 1321, "Metrics/PerceivedComplexity: Perceived complexity for `run_template_directory_session_command_payload` is too high. [13/8]", 268857423], + [1295, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2272443568], + [1319, 7, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 3409839974], + [1328, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193343749], + [1342, 7, 645, "Metrics/MethodLength: Method has too many lines. [11/10]", 2481445197], + [1365, 7, 685, "Metrics/MethodLength: Method has too many lines. [11/10]", 807027808], + [1374, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1225026887], + [1388, 7, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 1570524606], + [1397, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193343749], + [1403, 7, 589, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_session_request_from_runner_request` is too high. [8/7]", 1923077466], + [1403, 7, 589, "Metrics/MethodLength: Method has too many lines. [11/10]", 1923077466], + [1418, 7, 1803, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_template_directory_session_options` is too high. [<3, 38, 28> 47.3/17]", 319878734], + [1418, 7, 1803, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `resolve_template_directory_session_options` is too high. [29/7]", 319878734], + [1418, 7, 1803, "Metrics/MethodLength: Method has too many lines. [22/10]", 319878734], + [1418, 7, 1803, "Metrics/PerceivedComplexity: Perceived complexity for `resolve_template_directory_session_options` is too high. [29/8]", 319878734], + [1458, 7, 1357, "Metrics/AbcSize: Assignment Branch Condition size for `replace_or_insert_markdown_heading_section` is too high. [<18, 33, 18> 41.68/17]", 812459935], + [1458, 7, 1357, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `replace_or_insert_markdown_heading_section` is too high. [12/7]", 812459935], + [1458, 7, 1357, "Metrics/MethodLength: Method has too many lines. [26/10]", 812459935], + [1458, 7, 1357, "Metrics/PerceivedComplexity: Perceived complexity for `replace_or_insert_markdown_heading_section` is too high. [12/8]", 812459935], + [1494, 7, 456, "Metrics/AbcSize: Assignment Branch Condition size for `readme_family_section_insert_index` is too high. [<5, 9, 14> 17.38/17]", 252997882], + [1494, 7, 456, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `readme_family_section_insert_index` is too high. [8/7]", 252997882], + [1494, 7, 456, "Metrics/MethodLength: Method has too many lines. [13/10]", 252997882] + ], + "spec/session_integration_spec.rb:1063469608": [ + [5, 1, 89793, "Metrics/BlockLength: Block has too many lines. [1761/25]", 3162725061], + [31, 3, 612, "Metrics/MethodLength: Method has too many lines. [16/10]", 1402311658], + [50, 3, 2970, "Metrics/BlockLength: Block has too many lines. [60/25]", 2848879838], + [118, 3, 1748, "Metrics/BlockLength: Block has too many lines. [40/25]", 3276283317], + [164, 3, 1582, "Metrics/BlockLength: Block has too many lines. [37/25]", 4190998336], + [237, 3, 2325, "Metrics/BlockLength: Block has too many lines. [51/25]", 3352569469], + [295, 3, 1789, "Metrics/BlockLength: Block has too many lines. [38/25]", 1947005133], + [339, 3, 1944, "Metrics/BlockLength: Block has too many lines. [41/25]", 3993685201], + [386, 3, 1807, "Metrics/BlockLength: Block has too many lines. [38/25]", 4257675897], + [452, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 561412382], + [457, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], + [472, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 561412382], + [477, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2088089918], + [485, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087412612], + [490, 3, 1758, "Metrics/BlockLength: Block has too many lines. [37/25]", 1520782676], + [548, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], + [554, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1246048068], + [560, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [573, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1246048068], + [578, 3, 1812, "Metrics/BlockLength: Block has too many lines. [39/25]", 1709538088], + [623, 3, 1428, "Metrics/BlockLength: Block has too many lines. [31/25]", 4067408447], + [660, 3, 1975, "Metrics/BlockLength: Block has too many lines. [49/25]", 432162268], + [716, 3, 1902, "Metrics/BlockLength: Block has too many lines. [45/25]", 2326466404], + [770, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 703289421], + [797, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 703289421], + [818, 3, 1462, "Metrics/BlockLength: Block has too many lines. [35/25]", 1648309772], + [860, 3, 1466, "Metrics/BlockLength: Block has too many lines. [31/25]", 3549227194], + [898, 3, 1656, "Metrics/BlockLength: Block has too many lines. [36/25]", 2643926725], + [956, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], + [963, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2382627530], + [968, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [985, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2382627530], + [990, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114085752], + [998, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3868965366], + [1004, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3135429041], + [1011, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 2121600243], + [1016, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3948574204], + [1034, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 2121600243], + [1038, 3, 1281, "Metrics/BlockLength: Block has too many lines. [31/25]", 1507281102], + [1076, 3, 1329, "Metrics/BlockLength: Block has too many lines. [31/25]", 3185120887], + [1114, 3, 1680, "Metrics/BlockLength: Block has too many lines. [36/25]", 2250099450], + [1115, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193424063], + [1158, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114085752], + [1166, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3868965366], + [1172, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3135429041], + [1179, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 2121600243], + [1184, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3948574204], + [1202, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 2121600243], + [1206, 3, 1628, "Metrics/BlockLength: Block has too many lines. [36/25]", 4066832477], + [1249, 3, 1267, "Metrics/BlockLength: Block has too many lines. [31/25]", 488100020], + [1287, 3, 1404, "Metrics/BlockLength: Block has too many lines. [36/25]", 2415041159], + [1330, 3, 1970, "Metrics/BlockLength: Block has too many lines. [38/25]", 1463232713], + [1376, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193407726], + [1384, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193406689], + [1390, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087900170], + [1397, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 414784060], + [1402, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179046083], + [1419, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 414784060], + [1540, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], + [1547, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2382627530], + [1552, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [1569, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2382627530], + [1574, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1621973742], + [1582, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1297498406], + [1588, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 2665434363], + [1595, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1334260795], + [1600, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193407726], + [1608, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193406689], + [1614, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087900170], + [1621, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 414784060], + [1626, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179046083], + [1644, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 414784060], + [1649, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3197516464], + [1667, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1334260795], + [1717, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193407726], + [1725, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193406689], + [1731, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087900170], + [1738, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 414784060], + [1743, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179046083], + [1760, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 414784060], + [1868, 3, 442, "Metrics/AbcSize: Assignment Branch Condition size for `options_with_resolved_fixture_paths` is too high. [<3, 18, 2> 18.36/17]", 13098503], + [1879, 3, 878, "Metrics/AbcSize: Assignment Branch Condition size for `runner_request_with_resolved_fixture_paths` is too high. [<7, 36, 6> 37.16/17]", 2279422631], + [1879, 3, 878, "Metrics/MethodLength: Method has too many lines. [20/10]", 2279422631], + [1902, 3, 449, "Metrics/AbcSize: Assignment Branch Condition size for `runner_payload_with_resolved_fixture_paths` is too high. [<3, 18, 2> 18.36/17]", 1041394699], + [1948, 3, 932, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_session_inspection_expected_paths` is too high. [<4, 24, 6> 25.06/17]", 616473516], + [1948, 3, 932, "Metrics/MethodLength: Method has too many lines. [17/10]", 616473516], + [2015, 3, 679, "Metrics/AbcSize: Assignment Branch Condition size for `invocation_with_resolved_fixture_paths` is too high. [<5, 20, 4> 21/17]", 2866326769], + [2015, 3, 679, "Metrics/MethodLength: Method has too many lines. [12/10]", 2866326769] + ] +} diff --git a/gems/ast-template/Gemfile.lock b/gems/ast-template/Gemfile.lock index 530ee0633..cb29eb6e0 100644 --- a/gems/ast-template/Gemfile.lock +++ b/gems/ast-template/Gemfile.lock @@ -16,39 +16,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -56,241 +24,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -310,12 +43,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -324,6 +51,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -379,6 +107,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -397,7 +134,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -537,23 +273,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -587,11 +325,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -618,7 +356,7 @@ GEM yard yard-relative_markdown_links (0.6.0) nokogiri (>= 1.14.3, < 2) - yard-timekeeper (0.2.3) + yard-timekeeper (0.2.4) version_gem (~> 1.1, >= 1.1.13) yard-yaml (0.2.3) version_gem (~> 1.1, >= 1.1.13) @@ -638,45 +376,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,61 +402,39 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +447,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +474,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +485,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,19 +512,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,27 +536,21 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd yard-relative_markdown_links (0.6.0) sha256=3e5ffa85cbad9bac70bee5421774b190fb25d3bdf489323a5b3534f647d1a70e - yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 + yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/binary-merge/Gemfile b/gems/binary-merge/Gemfile index 6fa913a4f..da1848f25 100644 --- a/gems/binary-merge/Gemfile +++ b/gems/binary-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source "https://gem.coop" +source 'https://gem.coop' git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,57 +19,53 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ["~> 1.0", ">= 1.0.8"] -gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ['~> 1.0', '>= 1.0.8'] +gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ tree_haver ] -direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") +direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? if direct_sibling_gems.any? && - (direct_sibling_local || - ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) - direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") - direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) begin nomono_activation_requirements = nomono_requirements - nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) if File.file?(nomono_lockfile) nomono_locked_spec = Bundler::LockfileParser - .new(Bundler.read_file(nomono_lockfile)) - .specs - .find { |spec| spec.name == "nomono" } + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } nomono_locked = nomono_locked_spec && - Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) - if nomono_locked - nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] - end - end - Kernel.send(:gem, "nomono", *nomono_activation_requirements) - require "nomono/bundler" - if direct_sibling_templating && !direct_sibling_local - ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local eval_nomono_gems( gems: direct_sibling_gems, - prefix: "STRUCTUREDMERGE", - path_env: "STRUCTUREDMERGE_DEV", - root: ["src", "my", "structuredmerge"] + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] ) rescue LoadError - warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' ensure if direct_sibling_templating && !direct_sibling_local if direct_sibling_dev_was_set - ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original else - ENV.delete("STRUCTUREDMERGE_DEV") + ENV.delete('STRUCTUREDMERGE_DEV') end end end @@ -373,25 +369,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging -eval_gemfile "gemfiles/modular/debug.gemfile" +eval_gemfile 'gemfiles/modular/debug.gemfile' # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile "gemfiles/modular/coverage.gemfile" +eval_gemfile 'gemfiles/modular/coverage.gemfile' # Linting -eval_gemfile "gemfiles/modular/style.gemfile" +eval_gemfile 'gemfiles/modular/style.gemfile' # Documentation -eval_gemfile "gemfiles/modular/documentation.gemfile" +eval_gemfile 'gemfiles/modular/documentation.gemfile' # Optional -eval_gemfile "gemfiles/modular/optional.gemfile" +eval_gemfile 'gemfiles/modular/optional.gemfile' ### Std Lib Extracted Gems -eval_gemfile "gemfiles/modular/x_std_libs.gemfile" +eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' # See unlocked_deps appraisal for more details on irb inclusion -gem "irb", "~> 1.17" # ruby >= 2.7 +gem 'irb', '~> 1.17' # ruby >= 2.7 diff --git a/gems/binary-merge/Rakefile b/gems/binary-merge/Rakefile index ea4ce831d..b29d3a04b 100644 --- a/gems/binary-merge/Rakefile +++ b/gems/binary-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require "kettle/drift" + require 'kettle/drift' Kettle::Drift.install_tasks rescue LoadError - desc("(stub) kettle:drift:check is unavailable") - task("kettle:drift:check") do + desc('(stub) kettle:drift:check is unavailable') + task('kettle:drift:check') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:update is unavailable") - task("kettle:drift:update") do + desc('(stub) kettle:drift:update is unavailable') + task('kettle:drift:update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:force_update is unavailable") - task("kettle:drift:force_update") do + desc('(stub) kettle:drift:force_update is unavailable') + task('kettle:drift:force_update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift is unavailable") - task("kettle:drift" => "kettle:drift:update") + desc('(stub) kettle:drift is unavailable') + task('kettle:drift' => 'kettle:drift:update') end ### TEMPLATING TASKS diff --git a/gems/binary-merge/lib/binary/merge/version.rb b/gems/binary-merge/lib/binary/merge/version.rb index bb78df888..d8ae92dfa 100644 --- a/gems/binary-merge/lib/binary/merge/version.rb +++ b/gems/binary-merge/lib/binary/merge/version.rb @@ -3,7 +3,7 @@ module Binary module Merge module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/typescript-merge/Gemfile.lock b/gems/typescript-merge/Gemfile.lock index 66109fed2..21c4bdfe9 100644 --- a/gems/typescript-merge/Gemfile.lock +++ b/gems/typescript-merge/Gemfile.lock @@ -17,7 +17,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -26,7 +58,201 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -34,6 +260,21 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -53,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -283,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -335,6 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -406,33 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -479,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -490,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -517,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -528,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -541,6 +859,9 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f @@ -550,6 +871,7 @@ CHECKSUMS unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From a788959f1b8573e52e238362a1e2ed6a0bd9bce4 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:28:33 -0600 Subject: [PATCH 236/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/binary-merge/Gemfile.lock | 396 +++------------------------------ gems/psych-merge/Gemfile.lock | 355 +++++++++++++++++++++++++++-- 2 files changed, 371 insertions(+), 380 deletions(-) diff --git a/gems/binary-merge/Gemfile.lock b/gems/binary-merge/Gemfile.lock index 0436c868e..5349e6cda 100644 --- a/gems/binary-merge/Gemfile.lock +++ b/gems/binary-merge/Gemfile.lock @@ -16,235 +16,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -252,45 +24,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -310,12 +43,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -324,6 +51,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -379,6 +107,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -397,7 +134,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -537,23 +273,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -584,14 +322,6 @@ GEM delegate (~> 0.1) rspec (~> 3.0) timecop (>= 0.7, < 1) - token-resolver (2.0.4) - parslet (~> 2.0) - version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -618,7 +348,7 @@ GEM yard yard-relative_markdown_links (0.6.0) nokogiri (>= 1.14.3, < 2) - yard-timekeeper (0.2.3) + yard-timekeeper (0.2.4) version_gem (~> 1.1, >= 1.1.13) yard-yaml (0.2.3) version_gem (~> 1.1, >= 1.1.13) @@ -638,45 +368,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,61 +393,39 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) - ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +438,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +465,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +476,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,19 +503,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -855,28 +526,21 @@ CHECKSUMS thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73 timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 - token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd yard-relative_markdown_links (0.6.0) sha256=3e5ffa85cbad9bac70bee5421774b190fb25d3bdf489323a5b3534f647d1a70e - yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 + yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/psych-merge/Gemfile.lock b/gems/psych-merge/Gemfile.lock index 8ba6f6b35..a12016d3e 100644 --- a/gems/psych-merge/Gemfile.lock +++ b/gems/psych-merge/Gemfile.lock @@ -17,6 +17,264 @@ PATH version_gem (~> 1.1, >= 1.1.9) yaml-merge (= 7.1.0) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -28,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -41,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -104,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -132,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -271,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -323,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -342,10 +606,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.13) - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) yard (0.9.45) yard-fence (0.9.6) rdoc (>= 6.11, < 8) @@ -378,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -403,31 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -435,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -447,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -474,9 +788,12 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 @@ -486,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -513,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -524,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -537,10 +859,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -553,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 7d58ba9a17f19bbedd5bb958f4b3dadbb433e3d7 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:28:56 -0600 Subject: [PATCH 237/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-template/Gemfile.lock | 341 ++++++++++++++++++++++++++++- gems/binary-merge/Gemfile.lock | 341 ++++++++++++++++++++++++++++- gems/zip-merge/.kettle-drift.lock | 60 ++++-- gems/zip-merge/Gemfile | 40 ++++ gems/zip-merge/Gemfile.lock | 345 +----------------------------- 5 files changed, 758 insertions(+), 369 deletions(-) diff --git a/gems/ast-template/Gemfile.lock b/gems/ast-template/Gemfile.lock index cb29eb6e0..f763e88a6 100644 --- a/gems/ast-template/Gemfile.lock +++ b/gems/ast-template/Gemfile.lock @@ -16,7 +16,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -24,6 +56,225 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -43,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -106,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -134,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -273,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -325,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -376,24 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -402,32 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -435,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -447,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -474,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -485,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -512,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -523,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -536,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -551,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/binary-merge/Gemfile.lock b/gems/binary-merge/Gemfile.lock index 5349e6cda..a228ee13e 100644 --- a/gems/binary-merge/Gemfile.lock +++ b/gems/binary-merge/Gemfile.lock @@ -16,7 +16,235 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -24,6 +252,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -43,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -106,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -134,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -273,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -322,6 +584,14 @@ GEM delegate (~> 0.1) rspec (~> 3.0) timecop (>= 0.7, < 1) + token-resolver (2.0.4) + parslet (~> 2.0) + version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -368,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -393,32 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) + ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -426,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -438,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -465,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -476,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -503,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -514,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -526,14 +858,20 @@ CHECKSUMS thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73 timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 + token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -541,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/zip-merge/.kettle-drift.lock b/gems/zip-merge/.kettle-drift.lock index 5b373dd8d..309d406e1 100644 --- a/gems/zip-merge/.kettle-drift.lock +++ b/gems/zip-merge/.kettle-drift.lock @@ -8,7 +8,8 @@ 159, 199, 239, - 279 + 279, + 319 ] } ], @@ -21,7 +22,8 @@ 170, 210, 250, - 290 + 290, + 330 ] } ], @@ -34,7 +36,8 @@ 160, 200, 240, - 280 + 280, + 320 ] } ], @@ -47,7 +50,8 @@ 172, 212, 252, - 292 + 292, + 332 ] } ], @@ -60,7 +64,8 @@ 175, 215, 255, - 295 + 295, + 335 ] } ], @@ -73,7 +78,8 @@ 161, 201, 241, - 281 + 281, + 321 ] } ], @@ -87,7 +93,8 @@ 179, 219, 259, - 299 + 299, + 339 ] } ], @@ -100,7 +107,8 @@ 180, 220, 260, - 300 + 300, + 340 ] } ], @@ -114,7 +122,8 @@ 166, 206, 246, - 286 + 286, + 326 ] } ], @@ -127,7 +136,8 @@ 189, 229, 269, - 309 + 309, + 349 ] } ], @@ -141,7 +151,8 @@ 158, 198, 238, - 278 + 278, + 318 ] } ], @@ -155,7 +166,8 @@ 188, 228, 268, - 308 + 308, + 348 ] } ], @@ -168,7 +180,8 @@ 164, 204, 244, - 284 + 284, + 324 ] } ], @@ -182,7 +195,8 @@ 171, 211, 251, - 291 + 291, + 331 ] } ], @@ -196,7 +210,8 @@ 167, 207, 247, - 287 + 287, + 327 ] } ], @@ -209,7 +224,8 @@ 165, 205, 245, - 285 + 285, + 325 ] } ], @@ -222,7 +238,8 @@ 182, 222, 262, - 302 + 302, + 342 ] } ], @@ -235,7 +252,8 @@ 181, 221, 261, - 301 + 301, + 341 ] } ], @@ -248,7 +266,8 @@ 176, 216, 256, - 296 + 296, + 336 ] } ], @@ -261,7 +280,8 @@ 185, 225, 265, - 305 + 305, + 345 ] } ], diff --git a/gems/zip-merge/Gemfile b/gems/zip-merge/Gemfile index 1cb1cc398..fb5838621 100644 --- a/gems/zip-merge/Gemfile +++ b/gems/zip-merge/Gemfile @@ -311,6 +311,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/zip-merge/Gemfile.lock b/gems/zip-merge/Gemfile.lock index 9238afb04..03aef1934 100644 --- a/gems/zip-merge/Gemfile.lock +++ b/gems/zip-merge/Gemfile.lock @@ -16,242 +16,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -259,22 +24,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -294,12 +43,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +106,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +134,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +273,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -584,14 +322,6 @@ GEM delegate (~> 0.1) rspec (~> 3.0) timecop (>= 0.7, < 1) - token-resolver (2.0.4) - parslet (~> 2.0) - version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -618,7 +348,7 @@ GEM yard yard-relative_markdown_links (0.6.0) nokogiri (>= 1.14.3, < 2) - yard-timekeeper (0.2.3) + yard-timekeeper (0.2.4) version_gem (~> 1.1, >= 1.1.13) yard-yaml (0.2.3) version_gem (~> 1.1, >= 1.1.13) @@ -638,45 +368,22 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,19 +392,13 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) @@ -711,28 +412,12 @@ CHECKSUMS ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) - ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +425,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +437,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +464,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +475,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +502,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +513,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -858,25 +525,19 @@ CHECKSUMS thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73 timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 - token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd yard-relative_markdown_links (0.6.0) sha256=3e5ffa85cbad9bac70bee5421774b190fb25d3bdf489323a5b3534f647d1a70e - yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 + yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 zip-merge (7.1.0) From 03216d3702f9a7366b29b517df861be7bc537915 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:29:10 -0600 Subject: [PATCH 238/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/citrus-toml-merge/.kettle-drift.lock | 60 ++-- gems/citrus-toml-merge/Gemfile | 40 +++ gems/citrus-toml-merge/Gemfile.lock | 59 ++-- gems/parslet-toml-merge/.kettle-drift.lock | 60 ++-- gems/parslet-toml-merge/Gemfile | 40 +++ gems/parslet-toml-merge/Gemfile.lock | 346 +----------------- gems/psych-merge/.kettle-drift.lock | 60 ++-- gems/psych-merge/.rubocop_gradual.lock | 372 -------------------- gems/psych-merge/Gemfile | 40 +++ gems/psych-merge/Gemfile.lock | 59 ++-- gems/psych-merge/lib/psych/merge/version.rb | 2 +- gems/zip-merge/Gemfile.lock | 341 +++++++++++++++++- 12 files changed, 650 insertions(+), 829 deletions(-) delete mode 100644 gems/psych-merge/.rubocop_gradual.lock diff --git a/gems/citrus-toml-merge/.kettle-drift.lock b/gems/citrus-toml-merge/.kettle-drift.lock index 44ac5c29d..5b373dd8d 100644 --- a/gems/citrus-toml-merge/.kettle-drift.lock +++ b/gems/citrus-toml-merge/.kettle-drift.lock @@ -7,7 +7,8 @@ 119, 159, 199, - 239 + 239, + 279 ] } ], @@ -19,7 +20,8 @@ 130, 170, 210, - 250 + 250, + 290 ] } ], @@ -31,7 +33,8 @@ 120, 160, 200, - 240 + 240, + 280 ] } ], @@ -43,7 +46,8 @@ 132, 172, 212, - 252 + 252, + 292 ] } ], @@ -55,7 +59,8 @@ 135, 175, 215, - 255 + 255, + 295 ] } ], @@ -67,7 +72,8 @@ 121, 161, 201, - 241 + 241, + 281 ] } ], @@ -80,7 +86,8 @@ 139, 179, 219, - 259 + 259, + 299 ] } ], @@ -92,7 +99,8 @@ 140, 180, 220, - 260 + 260, + 300 ] } ], @@ -105,7 +113,8 @@ 126, 166, 206, - 246 + 246, + 286 ] } ], @@ -117,7 +126,8 @@ 149, 189, 229, - 269 + 269, + 309 ] } ], @@ -130,7 +140,8 @@ 118, 158, 198, - 238 + 238, + 278 ] } ], @@ -143,7 +154,8 @@ 148, 188, 228, - 268 + 268, + 308 ] } ], @@ -155,7 +167,8 @@ 124, 164, 204, - 244 + 244, + 284 ] } ], @@ -168,7 +181,8 @@ 131, 171, 211, - 251 + 251, + 291 ] } ], @@ -181,7 +195,8 @@ 127, 167, 207, - 247 + 247, + 287 ] } ], @@ -193,7 +208,8 @@ 125, 165, 205, - 245 + 245, + 285 ] } ], @@ -205,7 +221,8 @@ 142, 182, 222, - 262 + 262, + 302 ] } ], @@ -217,7 +234,8 @@ 141, 181, 221, - 261 + 261, + 301 ] } ], @@ -229,7 +247,8 @@ 136, 176, 216, - 256 + 256, + 296 ] } ], @@ -241,7 +260,8 @@ 145, 185, 225, - 265 + 265, + 305 ] } ], diff --git a/gems/citrus-toml-merge/Gemfile b/gems/citrus-toml-merge/Gemfile index ecdfbadae..6c9a05565 100644 --- a/gems/citrus-toml-merge/Gemfile +++ b/gems/citrus-toml-merge/Gemfile @@ -271,6 +271,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/citrus-toml-merge/Gemfile.lock b/gems/citrus-toml-merge/Gemfile.lock index 75bc67a58..4078ebd0e 100644 --- a/gems/citrus-toml-merge/Gemfile.lock +++ b/gems/citrus-toml-merge/Gemfile.lock @@ -275,6 +275,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -308,7 +324,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -363,18 +378,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -538,22 +542,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -659,9 +659,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -739,7 +739,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -760,10 +759,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -838,13 +837,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/parslet-toml-merge/.kettle-drift.lock b/gems/parslet-toml-merge/.kettle-drift.lock index 44ac5c29d..5b373dd8d 100644 --- a/gems/parslet-toml-merge/.kettle-drift.lock +++ b/gems/parslet-toml-merge/.kettle-drift.lock @@ -7,7 +7,8 @@ 119, 159, 199, - 239 + 239, + 279 ] } ], @@ -19,7 +20,8 @@ 130, 170, 210, - 250 + 250, + 290 ] } ], @@ -31,7 +33,8 @@ 120, 160, 200, - 240 + 240, + 280 ] } ], @@ -43,7 +46,8 @@ 132, 172, 212, - 252 + 252, + 292 ] } ], @@ -55,7 +59,8 @@ 135, 175, 215, - 255 + 255, + 295 ] } ], @@ -67,7 +72,8 @@ 121, 161, 201, - 241 + 241, + 281 ] } ], @@ -80,7 +86,8 @@ 139, 179, 219, - 259 + 259, + 299 ] } ], @@ -92,7 +99,8 @@ 140, 180, 220, - 260 + 260, + 300 ] } ], @@ -105,7 +113,8 @@ 126, 166, 206, - 246 + 246, + 286 ] } ], @@ -117,7 +126,8 @@ 149, 189, 229, - 269 + 269, + 309 ] } ], @@ -130,7 +140,8 @@ 118, 158, 198, - 238 + 238, + 278 ] } ], @@ -143,7 +154,8 @@ 148, 188, 228, - 268 + 268, + 308 ] } ], @@ -155,7 +167,8 @@ 124, 164, 204, - 244 + 244, + 284 ] } ], @@ -168,7 +181,8 @@ 131, 171, 211, - 251 + 251, + 291 ] } ], @@ -181,7 +195,8 @@ 127, 167, 207, - 247 + 247, + 287 ] } ], @@ -193,7 +208,8 @@ 125, 165, 205, - 245 + 245, + 285 ] } ], @@ -205,7 +221,8 @@ 142, 182, 222, - 262 + 262, + 302 ] } ], @@ -217,7 +234,8 @@ 141, 181, 221, - 261 + 261, + 301 ] } ], @@ -229,7 +247,8 @@ 136, 176, 216, - 256 + 256, + 296 ] } ], @@ -241,7 +260,8 @@ 145, 185, 225, - 265 + 265, + 305 ] } ], diff --git a/gems/parslet-toml-merge/Gemfile b/gems/parslet-toml-merge/Gemfile index 487394971..1bef787f2 100644 --- a/gems/parslet-toml-merge/Gemfile +++ b/gems/parslet-toml-merge/Gemfile @@ -271,6 +271,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/parslet-toml-merge/Gemfile.lock b/gems/parslet-toml-merge/Gemfile.lock index 3293a63f0..bdd37b265 100644 --- a/gems/parslet-toml-merge/Gemfile.lock +++ b/gems/parslet-toml-merge/Gemfile.lock @@ -17,264 +17,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: toml-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +35,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +48,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +111,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +139,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +278,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -589,9 +332,11 @@ GEM version_gem (~> 1.1, >= 1.1.13) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -618,7 +363,7 @@ GEM yard yard-relative_markdown_links (0.6.0) nokogiri (>= 1.14.3, < 2) - yard-timekeeper (0.2.3) + yard-timekeeper (0.2.4) version_gem (~> 1.1, >= 1.1.13) yard-yaml (0.2.3) version_gem (~> 1.1, >= 1.1.13) @@ -638,45 +383,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +408,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +441,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +453,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -789,13 +481,10 @@ CHECKSUMS parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 parslet-toml-merge (7.1.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +492,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +519,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +530,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -861,25 +545,21 @@ CHECKSUMS token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd yard-relative_markdown_links (0.6.0) sha256=3e5ffa85cbad9bac70bee5421774b190fb25d3bdf489323a5b3534f647d1a70e - yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 + yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/psych-merge/.kettle-drift.lock b/gems/psych-merge/.kettle-drift.lock index 47f738bf0..0e09e9847 100644 --- a/gems/psych-merge/.kettle-drift.lock +++ b/gems/psych-merge/.kettle-drift.lock @@ -8,7 +8,8 @@ 161, 201, 241, - 281 + 281, + 321 ] } ], @@ -21,7 +22,8 @@ 172, 212, 252, - 292 + 292, + 332 ] } ], @@ -34,7 +36,8 @@ 162, 202, 242, - 282 + 282, + 322 ] } ], @@ -47,7 +50,8 @@ 174, 214, 254, - 294 + 294, + 334 ] } ], @@ -60,7 +64,8 @@ 177, 217, 257, - 297 + 297, + 337 ] } ], @@ -73,7 +78,8 @@ 163, 203, 243, - 283 + 283, + 323 ] } ], @@ -87,7 +93,8 @@ 181, 221, 261, - 301 + 301, + 341 ] } ], @@ -100,7 +107,8 @@ 182, 222, 262, - 302 + 302, + 342 ] } ], @@ -114,7 +122,8 @@ 168, 208, 248, - 288 + 288, + 328 ] } ], @@ -127,7 +136,8 @@ 191, 231, 271, - 311 + 311, + 351 ] } ], @@ -141,7 +151,8 @@ 160, 200, 240, - 280 + 280, + 320 ] } ], @@ -155,7 +166,8 @@ 190, 230, 270, - 310 + 310, + 350 ] } ], @@ -168,7 +180,8 @@ 166, 206, 246, - 286 + 286, + 326 ] } ], @@ -182,7 +195,8 @@ 173, 213, 253, - 293 + 293, + 333 ] } ], @@ -196,7 +210,8 @@ 169, 209, 249, - 289 + 289, + 329 ] } ], @@ -209,7 +224,8 @@ 167, 207, 247, - 287 + 287, + 327 ] } ], @@ -222,7 +238,8 @@ 184, 224, 264, - 304 + 304, + 344 ] } ], @@ -235,7 +252,8 @@ 183, 223, 263, - 303 + 303, + 343 ] } ], @@ -248,7 +266,8 @@ 178, 218, 258, - 298 + 298, + 338 ] } ], @@ -261,7 +280,8 @@ 187, 227, 267, - 307 + 307, + 347 ] } ], diff --git a/gems/psych-merge/.rubocop_gradual.lock b/gems/psych-merge/.rubocop_gradual.lock deleted file mode 100644 index 85e814fd4..000000000 --- a/gems/psych-merge/.rubocop_gradual.lock +++ /dev/null @@ -1,372 +0,0 @@ -{ - ".simplecov:2102217422": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:1368539789": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/psych-merge.rb:1330894360": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`psych-merge.rb`) should use snake_case.", 5381] - ], - "lib/psych/merge.rb:173660101": [ - [38, 3, 9398, "Metrics/ModuleLength: Module has too many lines. [188/100]", 2155600486], - [115, 5, 6353, "Metrics/ClassLength: Class has too many lines. [160/100]", 2805786752], - [171, 7, 1593, "Metrics/MethodLength: Method has too many lines. [26/10]", 162695378], - [171, 21, 295, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 2742902791], - [212, 7, 440, "Metrics/MethodLength: Method has too many lines. [11/10]", 4238054657], - [252, 7, 417, "Metrics/MethodLength: Method has too many lines. [11/10]", 3661776213], - [275, 7, 458, "Metrics/MethodLength: Method has too many lines. [15/10]", 1125262299] - ], - "lib/psych/merge/comment_tracker.rb:109829813": [ - [33, 7, 711, "Metrics/MethodLength: Method has too many lines. [24/10]", 4175176008], - [65, 48, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] - ], - "lib/psych/merge/conflict_resolver.rb:1439336560": [ - [24, 5, 98551, "Metrics/ClassLength: Class has too many lines. [1730/100]", 3470480790], - [48, 7, 1257, "Metrics/MethodLength: Method has too many lines. [18/10]", 2709727248], - [48, 21, 354, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [13/5]", 1127138839], - [49, 121, 141, "Layout/LineLength: Line is too long. [261/120]", 84971754], - [63, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1411495206], - [75, 7, 1316, "Metrics/MethodLength: Method has too many lines. [22/10]", 841707991], - [121, 7, 1128, "Metrics/AbcSize: Assignment Branch Condition size for `build_refined_matches` is too high. [<11, 16, 8> 21/17]", 4214539560], - [121, 7, 1128, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_refined_matches` is too high. [9/7]", 4214539560], - [121, 7, 1128, "Metrics/MethodLength: Method has too many lines. [18/10]", 4214539560], - [121, 7, 1128, "Metrics/PerceivedComplexity: Perceived complexity for `build_refined_matches` is too high. [9/8]", 4214539560], - [149, 7, 11524, "Metrics/AbcSize: Assignment Branch Condition size for `merge_nodes_to_emitter` is too high. [<57, 120, 50> 142/17]", 2474480422], - [149, 7, 11524, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_nodes_to_emitter` is too high. [43/7]", 2474480422], - [149, 7, 11524, "Metrics/MethodLength: Method has too many lines. [194/10]", 2474480422], - [149, 7, 11524, "Metrics/PerceivedComplexity: Perceived complexity for `merge_nodes_to_emitter` is too high. [49/8]", 2474480422], - [149, 33, 186, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 421356977], - [150, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 97621789], - [193, 24, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2944491302], - [204, 9, 7819, "Metrics/BlockLength: Block has too many lines. [136/25]", 519912312], - [205, 28, 36, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 345161915], - [263, 39, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3425527675], - [270, 39, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3425527675], - [286, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2818803335], - [330, 37, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3425527675], - [337, 37, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3425527675], - [376, 26, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2944491302], - [391, 24, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2944491302], - [436, 7, 1049, "Metrics/MethodLength: Method has too many lines. [14/10]", 2563450827], - [455, 7, 1990, "Metrics/AbcSize: Assignment Branch Condition size for `emit_supplemental_document_postlude` is too high. [<8, 20, 6> 22.36/17]", 1604415261], - [455, 7, 1990, "Metrics/MethodLength: Method has too many lines. [24/10]", 1604415261], - [501, 7, 982, "Metrics/AbcSize: Assignment Branch Condition size for `emit_nonpreferred_document_postlude_regions` is too high. [<5, 20, 10> 22.91/17]", 7588338], - [501, 7, 982, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_nonpreferred_document_postlude_regions` is too high. [10/7]", 7588338], - [501, 7, 982, "Metrics/MethodLength: Method has too many lines. [17/10]", 7588338], - [501, 7, 982, "Metrics/PerceivedComplexity: Perceived complexity for `emit_nonpreferred_document_postlude_regions` is too high. [11/8]", 7588338], - [523, 7, 429, "Metrics/MethodLength: Method has too many lines. [11/10]", 2317545285], - [551, 7, 1153, "Metrics/MethodLength: Method has too many lines. [27/10]", 2050460902], - [581, 7, 1164, "Metrics/MethodLength: Method has too many lines. [16/10]", 293708573], - [602, 7, 1132, "Metrics/MethodLength: Method has too many lines. [15/10]", 2657257420], - [610, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193417991], - [624, 68, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [627, 19, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [630, 7, 718, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preference_for_pair` is too high. [8/7]", 3339910669], - [630, 7, 718, "Metrics/MethodLength: Method has too many lines. [12/10]", 3339910669], - [656, 7, 1442, "Metrics/MethodLength: Method has too many lines. [34/10]", 3775627321], - [723, 7, 1439, "Metrics/AbcSize: Assignment Branch Condition size for `can_merge_recursively?` is too high. [<0, 18, 13> 22.2/17]", 3986446452], - [723, 7, 1439, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `can_merge_recursively?` is too high. [13/7]", 3986446452], - [723, 7, 1439, "Metrics/MethodLength: Method has too many lines. [11/10]", 3986446452], - [723, 7, 1439, "Metrics/PerceivedComplexity: Perceived complexity for `can_merge_recursively?` is too high. [14/8]", 3986446452], - [754, 7, 368, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `flow_sequence?` is too high. [9/7]", 13791150], - [754, 7, 368, "Metrics/PerceivedComplexity: Perceived complexity for `flow_sequence?` is too high. [9/8]", 13791150], - [765, 7, 452, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `flow_mapping?` is too high. [11/7]", 4104291177], - [765, 7, 452, "Metrics/PerceivedComplexity: Perceived complexity for `flow_mapping?` is too high. [11/8]", 4104291177], - [802, 7, 705, "Metrics/AbcSize: Assignment Branch Condition size for `bare_dash_sequence_item_mapping?` is too high. [<5, 18, 8> 20.32/17]", 625586302], - [802, 7, 705, "Metrics/MethodLength: Method has too many lines. [11/10]", 625586302], - [829, 7, 2511, "Metrics/AbcSize: Assignment Branch Condition size for `emit_recursive_merge` is too high. [<0, 19, 10> 21.47/17]", 3873511358], - [829, 7, 2511, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_recursive_merge` is too high. [9/7]", 3873511358], - [829, 7, 2511, "Metrics/MethodLength: Method has too many lines. [49/10]", 3873511358], - [829, 7, 2511, "Metrics/PerceivedComplexity: Perceived complexity for `emit_recursive_merge` is too high. [11/8]", 3873511358], - [830, 9, 2388, "Metrics/BlockLength: Block has too many lines. [47/25]", 1655278799], - [906, 7, 2400, "Metrics/AbcSize: Assignment Branch Condition size for `emit_recursive_mapping_merge` is too high. [<15, 29, 14> 35.52/17]", 1648233163], - [906, 7, 2400, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_recursive_mapping_merge` is too high. [15/7]", 1648233163], - [906, 7, 2400, "Metrics/MethodLength: Method has too many lines. [44/10]", 1648233163], - [906, 7, 2400, "Metrics/PerceivedComplexity: Perceived complexity for `emit_recursive_mapping_merge` is too high. [17/8]", 1648233163], - [974, 7, 6966, "Metrics/AbcSize: Assignment Branch Condition size for `emit_recursive_sequence_merge` is too high. [<35, 84, 35> 97.5/17]", 2427419647], - [974, 7, 6966, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_recursive_sequence_merge` is too high. [30/7]", 2427419647], - [974, 7, 6966, "Metrics/MethodLength: Method has too many lines. [113/10]", 2427419647], - [974, 7, 6966, "Metrics/PerceivedComplexity: Perceived complexity for `emit_recursive_sequence_merge` is too high. [37/8]", 2427419647], - [1020, 74, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2678193523], - [1023, 9, 3871, "Metrics/BlockLength: Block has too many lines. [72/25]", 4174342864], - [1036, 28, 31, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1010804247], - [1048, 37, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2630532814], - [1064, 28, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2630532814], - [1077, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2582359665], - [1102, 76, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2678193523], - [1111, 74, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2678193523], - [1115, 7, 1262, "Metrics/AbcSize: Assignment Branch Condition size for `build_sequence_item_matches` is too high. [<11, 13, 2> 17.15/17]", 3127840652], - [1115, 7, 1262, "Metrics/MethodLength: Method has too many lines. [21/10]", 3127840652], - [1146, 7, 3065, "Metrics/AbcSize: Assignment Branch Condition size for `build_refined_sequence_observation_matches` is too high. [<19, 51, 17> 57.02/17]", 2950540403], - [1146, 7, 3065, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_refined_sequence_observation_matches` is too high. [18/7]", 2950540403], - [1146, 7, 3065, "Metrics/MethodLength: Method has too many lines. [55/10]", 2950540403], - [1146, 7, 3065, "Metrics/PerceivedComplexity: Perceived complexity for `build_refined_sequence_observation_matches` is too high. [18/8]", 2950540403], - [1209, 9, 24, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 32301403], - [1261, 7, 901, "Metrics/MethodLength: Method has too many lines. [14/10]", 3298193773], - [1261, 29, 147, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3718416672], - [1285, 7, 1642, "Metrics/AbcSize: Assignment Branch Condition size for `emit_node` is too high. [<4, 22, 10> 24.49/17]", 518692521], - [1285, 7, 1642, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_node` is too high. [11/7]", 518692521], - [1285, 7, 1642, "Metrics/MethodLength: Method has too many lines. [32/10]", 518692521], - [1285, 7, 1642, "Metrics/PerceivedComplexity: Perceived complexity for `emit_node` is too high. [11/8]", 518692521], - [1285, 20, 138, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 109777589], - [1331, 7, 1577, "Metrics/AbcSize: Assignment Branch Condition size for `emit_mapping_entry` is too high. [<6, 17, 15> 23.45/17]", 3927797439], - [1331, 7, 1577, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_mapping_entry` is too high. [13/7]", 3927797439], - [1331, 7, 1577, "Metrics/MethodLength: Method has too many lines. [28/10]", 3927797439], - [1331, 7, 1577, "Metrics/PerceivedComplexity: Perceived complexity for `emit_mapping_entry` is too high. [13/8]", 3927797439], - [1331, 29, 148, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2283756321], - [1375, 7, 1975, "Metrics/AbcSize: Assignment Branch Condition size for `emit_mapping_entry_prelude` is too high. [<9, 26, 16> 31.83/17]", 3449491730], - [1375, 7, 1975, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_mapping_entry_prelude` is too high. [16/7]", 3449491730], - [1375, 7, 1975, "Metrics/MethodLength: Method has too many lines. [35/10]", 3449491730], - [1375, 7, 1975, "Metrics/PerceivedComplexity: Perceived complexity for `emit_mapping_entry_prelude` is too high. [16/8]", 3449491730], - [1419, 7, 1550, "Metrics/AbcSize: Assignment Branch Condition size for `emit_node_prelude` is too high. [<6, 17, 9> 20.15/17]", 4132652846], - [1419, 7, 1550, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_node_prelude` is too high. [10/7]", 4132652846], - [1419, 7, 1550, "Metrics/MethodLength: Method has too many lines. [26/10]", 4132652846], - [1419, 7, 1550, "Metrics/PerceivedComplexity: Perceived complexity for `emit_node_prelude` is too high. [10/8]", 4132652846], - [1463, 7, 1256, "Metrics/AbcSize: Assignment Branch Condition size for `emit_node_first_line` is too high. [<3, 16, 5> 17.03/17]", 809936874], - [1463, 7, 1256, "Metrics/MethodLength: Method has too many lines. [24/10]", 809936874], - [1492, 7, 838, "Metrics/AbcSize: Assignment Branch Condition size for `emit_removed_destination_node_comments` is too high. [<3, 16, 7> 17.72/17]", 1801654574], - [1492, 7, 838, "Metrics/MethodLength: Method has too many lines. [13/10]", 1801654574], - [1531, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2088091358], - [1551, 7, 587, "Metrics/MethodLength: Method has too many lines. [14/10]", 1778584112], - [1594, 7, 1089, "Metrics/AbcSize: Assignment Branch Condition size for `canonical_sequence_item_value` is too high. [<7, 20, 8> 22.65/17]", 2923924756], - [1594, 7, 1089, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonical_sequence_item_value` is too high. [9/7]", 2923924756], - [1594, 7, 1089, "Metrics/MethodLength: Method has too many lines. [15/10]", 2923924756], - [1594, 7, 1089, "Metrics/PerceivedComplexity: Perceived complexity for `canonical_sequence_item_value` is too high. [9/8]", 2923924756], - [1621, 7, 918, "Metrics/AbcSize: Assignment Branch Condition size for `sequence_item_observations` is too high. [<7, 26, 9> 28.39/17]", 1736204122], - [1621, 7, 918, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `sequence_item_observations` is too high. [10/7]", 1736204122], - [1621, 7, 918, "Metrics/MethodLength: Method has too many lines. [15/10]", 1736204122], - [1621, 7, 918, "Metrics/PerceivedComplexity: Perceived complexity for `sequence_item_observations` is too high. [10/8]", 1736204122], - [1626, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3762412176], - [1635, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 4096127909], - [1656, 7, 901, "Metrics/AbcSize: Assignment Branch Condition size for `trimmed_sequence_item_lines` is too high. [<11, 26, 10> 29.95/17]", 4091201884], - [1656, 7, 901, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trimmed_sequence_item_lines` is too high. [10/7]", 4091201884], - [1656, 7, 901, "Metrics/MethodLength: Method has too many lines. [15/10]", 4091201884], - [1656, 7, 901, "Metrics/PerceivedComplexity: Perceived complexity for `trimmed_sequence_item_lines` is too high. [10/8]", 4091201884], - [1678, 7, 713, "Metrics/AbcSize: Assignment Branch Condition size for `sequence_item_start_line` is too high. [<5, 22, 8> 23.94/17]", 2061460995], - [1712, 11, 61, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1718502596], - [1718, 7, 629, "Metrics/AbcSize: Assignment Branch Condition size for `effective_end_line` is too high. [<4, 14, 10> 17.66/17]", 2226115349], - [1718, 7, 629, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `effective_end_line` is too high. [10/7]", 2226115349], - [1718, 7, 629, "Metrics/PerceivedComplexity: Perceived complexity for `effective_end_line` is too high. [10/8]", 2226115349], - [1722, 41, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [1764, 7, 1381, "Metrics/AbcSize: Assignment Branch Condition size for `region_already_emitted?` is too high. [<11, 32, 14> 36.62/17]", 2166775868], - [1764, 7, 1381, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `region_already_emitted?` is too high. [13/7]", 2166775868], - [1764, 7, 1381, "Metrics/MethodLength: Method has too many lines. [26/10]", 2166775868], - [1764, 7, 1381, "Metrics/PerceivedComplexity: Perceived complexity for `region_already_emitted?` is too high. [14/8]", 2166775868], - [1804, 7, 2218, "Metrics/AbcSize: Assignment Branch Condition size for `emit_document_postlude` is too high. [<17, 30, 14> 37.22/17]", 1397438331], - [1804, 7, 2218, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_document_postlude` is too high. [15/7]", 1397438331], - [1804, 7, 2218, "Metrics/MethodLength: Method has too many lines. [27/10]", 1397438331], - [1804, 7, 2218, "Metrics/PerceivedComplexity: Perceived complexity for `emit_document_postlude` is too high. [15/8]", 1397438331], - [1848, 7, 1304, "Metrics/AbcSize: Assignment Branch Condition size for `emit_document_prelude` is too high. [<8, 28, 11> 31.13/17]", 325827008], - [1848, 7, 1304, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_document_prelude` is too high. [12/7]", 325827008], - [1848, 7, 1304, "Metrics/MethodLength: Method has too many lines. [24/10]", 325827008], - [1848, 7, 1304, "Metrics/PerceivedComplexity: Perceived complexity for `emit_document_prelude` is too high. [13/8]", 325827008], - [1896, 9, 48, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2339197345], - [1899, 7, 691, "Metrics/AbcSize: Assignment Branch Condition size for `document_leading_regions_for` is too high. [<5, 19, 14> 24.12/17]", 796439642], - [1899, 7, 691, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `document_leading_regions_for` is too high. [14/7]", 796439642], - [1899, 7, 691, "Metrics/MethodLength: Method has too many lines. [12/10]", 796439642], - [1899, 7, 691, "Metrics/PerceivedComplexity: Perceived complexity for `document_leading_regions_for` is too high. [14/8]", 796439642], - [1928, 7, 646, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonical_leading_comment_region` is too high. [10/7]", 1342472091], - [1928, 7, 646, "Metrics/PerceivedComplexity: Perceived complexity for `canonical_leading_comment_region` is too high. [10/8]", 1342472091], - [1942, 7, 1410, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_template_preamble_prefix_region` is too high. [<7, 25, 15> 29.98/17]", 449550851], - [1942, 7, 1410, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collapse_template_preamble_prefix_region` is too high. [11/7]", 449550851], - [1942, 7, 1410, "Metrics/MethodLength: Method has too many lines. [27/10]", 449550851], - [1942, 7, 1410, "Metrics/PerceivedComplexity: Perceived complexity for `collapse_template_preamble_prefix_region` is too high. [11/8]", 449550851], - [1975, 7, 991, "Metrics/AbcSize: Assignment Branch Condition size for `duplicated_template_preamble_prefix_in_first_node_leading_region?` is too high. [<7, 25, 14> 29.5/17]", 4012549279], - [1975, 7, 991, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `duplicated_template_preamble_prefix_in_first_node_leading_region?` is too high. [12/7]", 4012549279], - [1975, 7, 991, "Metrics/MethodLength: Method has too many lines. [13/10]", 4012549279], - [1975, 7, 991, "Metrics/PerceivedComplexity: Perceived complexity for `duplicated_template_preamble_prefix_in_first_node_leading_region?` is too high. [12/8]", 4012549279], - [2030, 7, 956, "Metrics/AbcSize: Assignment Branch Condition size for `document_trailing_regions_for` is too high. [<6, 16, 12> 20.88/17]", 3560026445], - [2030, 7, 956, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `document_trailing_regions_for` is too high. [12/7]", 3560026445], - [2030, 7, 956, "Metrics/PerceivedComplexity: Perceived complexity for `document_trailing_regions_for` is too high. [12/8]", 3560026445], - [2053, 7, 456, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `deflated_content_end_line` is too high. [8/7]", 3297059340], - [2089, 7, 614, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `leading_gap_line_count_for` is too high. [9/7]", 1127644346], - [2089, 7, 614, "Metrics/PerceivedComplexity: Perceived complexity for `leading_gap_line_count_for` is too high. [10/8]", 1127644346], - [2093, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 2290159738], - [2139, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [2168, 31, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [2175, 55, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [2183, 54, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [2191, 56, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [2196, 7, 822, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preferred_leading_comment_region` is too high. [10/7]", 1272157667], - [2196, 7, 822, "Metrics/PerceivedComplexity: Perceived complexity for `preferred_leading_comment_region` is too high. [10/8]", 1272157667], - [2308, 7, 465, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_interstitial_blank_lines` is too high. [9/7]", 1640065866], - [2308, 7, 465, "Metrics/PerceivedComplexity: Perceived complexity for `emit_interstitial_blank_lines` is too high. [9/8]", 1640065866], - [2320, 7, 586, "Metrics/MethodLength: Method has too many lines. [12/10]", 3310131662] - ], - "lib/psych/merge/debug_logger.rb:110646504": [ - [26, 9, 680, "Metrics/MethodLength: Method has too many lines. [12/10]", 1981451425] - ], - "lib/psych/merge/diff_mapper.rb:844380236": [ - [20, 5, 7887, "Metrics/ClassLength: Class has too many lines. [118/100]", 3492547573], - [34, 7, 471, "Metrics/MethodLength: Method has too many lines. [11/10]", 577300188], - [75, 7, 627, "Metrics/MethodLength: Method has too many lines. [12/10]", 2362564224], - [102, 7, 786, "Metrics/MethodLength: Method has too many lines. [11/10]", 1096016446], - [131, 7, 1613, "Metrics/AbcSize: Assignment Branch Condition size for `find_nested_path` is too high. [<12, 27, 20> 35.68/17]", 4005634231], - [131, 7, 1613, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_nested_path` is too high. [17/7]", 4005634231], - [131, 7, 1613, "Metrics/MethodLength: Method has too many lines. [30/10]", 4005634231], - [131, 7, 1613, "Metrics/PerceivedComplexity: Perceived complexity for `find_nested_path` is too high. [18/8]", 4005634231], - [183, 7, 758, "Metrics/MethodLength: Method has too many lines. [13/10]", 2773539171], - [204, 20, 11, "Style/NumericPredicate: Use `indent.zero?` instead of `indent == 0`.", 1189613385] - ], - "lib/psych/merge/emitter.rb:2851865662": [ - [14, 5, 7357, "Metrics/ClassLength: Class has too many lines. [147/100]", 579415518], - [138, 42, 6, "Lint/UnusedMethodArgument: Unused method argument - `region`.", 2124512157], - [151, 55, 12, "Lint/UnusedMethodArgument: Unused method argument - `current_line`.", 2091263933], - [166, 7, 560, "Metrics/AbcSize: Assignment Branch Condition size for `repeated_region_segment_length` is too high. [<6, 14, 8> 17.2/17]", 800046942], - [194, 7, 596, "Metrics/MethodLength: Method has too many lines. [12/10]", 2092207138], - [228, 7, 662, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `needs_quoting?` is too high. [10/7]", 172072954], - [228, 7, 662, "Metrics/PerceivedComplexity: Perceived complexity for `needs_quoting?` is too high. [10/8]", 172072954] - ], - "lib/psych/merge/file_analysis.rb:1868572144": [ - [13, 5, 14981, "Metrics/ClassLength: Class has too many lines. [251/100]", 3755372144], - [37, 7, 1080, "Metrics/MethodLength: Method has too many lines. [15/10]", 4243676919], - [203, 7, 533, "Metrics/MethodLength: Method has too many lines. [11/10]", 2772113363], - [237, 7, 998, "Metrics/AbcSize: Assignment Branch Condition size for `mapping_entry_attachment` is too high. [<5, 23, 7> 24.56/17]", 3001873728], - [237, 7, 998, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `mapping_entry_attachment` is too high. [8/7]", 3001873728], - [237, 7, 998, "Metrics/MethodLength: Method has too many lines. [13/10]", 3001873728], - [267, 7, 809, "Metrics/AbcSize: Assignment Branch Condition size for `full_line_comment_blocks_before` is too high. [<9, 16, 6> 19.31/17]", 2033268754], - [267, 7, 809, "Metrics/MethodLength: Method has too many lines. [22/10]", 2033268754], - [329, 7, 1353, "Metrics/AbcSize: Assignment Branch Condition size for `extract_freeze_blocks` is too high. [<12, 20, 12> 26.23/17]", 4244924302], - [329, 7, 1353, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_freeze_blocks` is too high. [10/7]", 4244924302], - [329, 7, 1353, "Metrics/MethodLength: Method has too many lines. [27/10]", 4244924302], - [329, 7, 1353, "Metrics/PerceivedComplexity: Perceived complexity for `extract_freeze_blocks` is too high. [11/8]", 4244924302], - [370, 7, 1756, "Metrics/AbcSize: Assignment Branch Condition size for `integrate_nodes_and_freeze_blocks` is too high. [<11, 28, 19> 35.58/17]", 1233865722], - [370, 7, 1756, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `integrate_nodes_and_freeze_blocks` is too high. [18/7]", 1233865722], - [370, 7, 1756, "Metrics/MethodLength: Method has too many lines. [31/10]", 1233865722], - [370, 7, 1756, "Metrics/PerceivedComplexity: Perceived complexity for `integrate_nodes_and_freeze_blocks` is too high. [19/8]", 1233865722] - ], - "lib/psych/merge/freeze_node.rb:3007012923": [ - [33, 21, 127, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1948779238] - ], - "lib/psych/merge/mapping_match_refiner.rb:3428808618": [ - [29, 5, 7580, "Metrics/ClassLength: Class has too many lines. [111/100]", 3764504760], - [121, 7, 800, "Metrics/MethodLength: Method has too many lines. [13/10]", 2814728338], - [150, 15, 20, "Style/ClassEqualityComparison: Use `instance_of?(node2.class)` instead of comparing classes.", 1212490233], - [193, 7, 270, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `sequence_similarity` is too high. [9/7]", 724822377], - [193, 7, 270, "Metrics/PerceivedComplexity: Perceived complexity for `sequence_similarity` is too high. [9/8]", 724822377], - [197, 23, 9, "Style/NumericPredicate: Use `len1.zero?` instead of `len1 == 0`.", 913205219], - [197, 36, 9, "Style/NumericPredicate: Use `len2.zero?` instead of `len2 == 0`.", 871697920], - [198, 23, 9, "Style/NumericPredicate: Use `len1.zero?` instead of `len1 == 0`.", 913205219], - [198, 36, 9, "Style/NumericPredicate: Use `len2.zero?` instead of `len2 == 0`.", 871697920], - [225, 7, 854, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<13, 29, 8> 32.77/17]", 2946547420], - [225, 7, 854, "Metrics/MethodLength: Method has too many lines. [20/10]", 2946547420] - ], - "lib/psych/merge/merge_result.rb:4276173304": [ - [140, 7, 421, "Metrics/MethodLength: Method has too many lines. [11/10]", 2459390040] - ], - "lib/psych/merge/node_wrapper.rb:1997974804": [ - [12, 5, 12280, "Metrics/ClassLength: Class has too many lines. [222/100]", 463540785], - [42, 7, 2039, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `initialize` is too high. [8/7]", 338533329], - [42, 21, 274, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 2646089467], - [144, 7, 699, "Metrics/MethodLength: Method has too many lines. [20/10]", 2676695829], - [210, 7, 985, "Metrics/MethodLength: Method has too many lines. [16/10]", 59427073], - [256, 7, 686, "Metrics/AbcSize: Assignment Branch Condition size for `compute_signature` is too high. [<4, 21, 13> 25.02/17]", 2657240579], - [256, 7, 686, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_signature` is too high. [14/7]", 2657240579], - [256, 7, 686, "Metrics/MethodLength: Method has too many lines. [18/10]", 2657240579], - [256, 7, 686, "Metrics/PerceivedComplexity: Perceived complexity for `compute_signature` is too high. [10/8]", 2657240579], - [277, 7, 425, "Metrics/MethodLength: Method has too many lines. [11/10]", 3170039988], - [310, 7, 1150, "Metrics/MethodLength: Method has too many lines. [24/10]", 647387009], - [321, 31, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [340, 7, 484, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `clamp_end_line_to_next_sibling!` is too high. [10/7]", 953824779], - [340, 7, 484, "Metrics/PerceivedComplexity: Perceived complexity for `clamp_end_line_to_next_sibling!` is too high. [10/8]", 953824779] - ], - "lib/psych/merge/smart_merger.rb:1750771088": [ - [45, 5, 10514, "Metrics/ClassLength: Class has too many lines. [192/100]", 4260193581], - [81, 7, 1336, "Metrics/MethodLength: Method has too many lines. [18/10]", 1713606127], - [81, 21, 557, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [16/5]", 1646356108], - [153, 7, 1440, "Metrics/AbcSize: Assignment Branch Condition size for `merge_with_debug` is too high. [<3, 24, 7> 25.18/17]", 695369520], - [153, 7, 1440, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_with_debug` is too high. [8/7]", 695369520], - [153, 7, 1440, "Metrics/MethodLength: Method has too many lines. [32/10]", 695369520], - [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:914772787": [ - [129, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [144, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [145, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [152, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ], - "spec/fixtures_integration_spec.rb:1717446685": [ - [3, 1, 9786, "Metrics/BlockLength: Block has too many lines. [222/25]", 1649396447], - [16, 3, 1302, "Metrics/BlockLength: Block has too many lines. [32/25]", 1546514966], - [52, 3, 2159, "Metrics/BlockLength: Block has too many lines. [28/25]", 270765486], - [109, 3, 1594, "Metrics/BlockLength: Block has too many lines. [41/25]", 568154065], - [227, 3, 1413, "Metrics/BlockLength: Block has too many lines. [29/25]", 1847754351] - ], - "spec/reproducible_merge_spec.rb:2168097366": [ - [3, 1, 5699, "Metrics/BlockLength: Block has too many lines. [107/25]", 3775945048], - [4, 3, 61, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1575360142], - [6, 3, 4847, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3343843514], - [47, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 3440433042], - [53, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3187380084] - ] -} diff --git a/gems/psych-merge/Gemfile b/gems/psych-merge/Gemfile index c950901a0..225eef797 100644 --- a/gems/psych-merge/Gemfile +++ b/gems/psych-merge/Gemfile @@ -313,6 +313,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/psych-merge/Gemfile.lock b/gems/psych-merge/Gemfile.lock index a12016d3e..9fa08b960 100644 --- a/gems/psych-merge/Gemfile.lock +++ b/gems/psych-merge/Gemfile.lock @@ -275,6 +275,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + GEM remote: https://gem.coop/ specs: @@ -308,7 +324,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -363,18 +378,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -538,22 +542,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -659,9 +659,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -739,7 +739,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -760,10 +759,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -838,13 +837,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/psych-merge/lib/psych/merge/version.rb b/gems/psych-merge/lib/psych/merge/version.rb index aa65219d4..518f12da4 100644 --- a/gems/psych-merge/lib/psych/merge/version.rb +++ b/gems/psych-merge/lib/psych/merge/version.rb @@ -3,7 +3,7 @@ module Psych module Merge module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/zip-merge/Gemfile.lock b/gems/zip-merge/Gemfile.lock index 03aef1934..7eff2c3ec 100644 --- a/gems/zip-merge/Gemfile.lock +++ b/gems/zip-merge/Gemfile.lock @@ -16,7 +16,242 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -24,6 +259,22 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -43,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -106,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -134,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -273,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -322,6 +584,14 @@ GEM delegate (~> 0.1) rspec (~> 3.0) timecop (>= 0.7, < 1) + token-resolver (2.0.4) + parslet (~> 2.0) + version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -368,22 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -392,13 +685,19 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) @@ -412,12 +711,28 @@ CHECKSUMS ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) + ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -425,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -437,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -464,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -475,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -502,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -513,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -525,14 +858,20 @@ CHECKSUMS thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73 timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 + token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd From 57732db263087a95fc73e13e5d3b1c2cfcd2b255 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:29:12 -0600 Subject: [PATCH 239/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/citrus-toml-merge/Gemfile.lock | 396 ++------------------ gems/psych-merge/lib/psych/merge/version.rb | 2 +- 2 files changed, 41 insertions(+), 357 deletions(-) diff --git a/gems/citrus-toml-merge/Gemfile.lock b/gems/citrus-toml-merge/Gemfile.lock index 4078ebd0e..624aa6b23 100644 --- a/gems/citrus-toml-merge/Gemfile.lock +++ b/gems/citrus-toml-merge/Gemfile.lock @@ -17,280 +17,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: toml-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -302,6 +35,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -310,12 +48,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -324,6 +56,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -379,6 +112,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -397,7 +139,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -537,23 +278,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -587,11 +330,14 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -618,7 +364,7 @@ GEM yard yard-relative_markdown_links (0.6.0) nokogiri (>= 1.14.3, < 2) - yard-timekeeper (0.2.3) + yard-timekeeper (0.2.4) version_gem (~> 1.1, >= 1.1.13) yard-yaml (0.2.3) version_gem (~> 1.1, >= 1.1.13) @@ -638,45 +384,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,61 +409,40 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +455,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,14 +482,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -802,7 +493,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,19 +520,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,27 +544,23 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd yard-relative_markdown_links (0.6.0) sha256=3e5ffa85cbad9bac70bee5421774b190fb25d3bdf489323a5b3534f647d1a70e - yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 + yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/psych-merge/lib/psych/merge/version.rb b/gems/psych-merge/lib/psych/merge/version.rb index 518f12da4..aa65219d4 100644 --- a/gems/psych-merge/lib/psych/merge/version.rb +++ b/gems/psych-merge/lib/psych/merge/version.rb @@ -3,7 +3,7 @@ module Psych module Merge module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end From 341f85ed3a673ca02c4d6555f370ff71f373a91d Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:29:19 -0600 Subject: [PATCH 240/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/citrus-toml-merge/Gemfile.lock | 341 +++++++++++++++++++++- gems/kramdown-merge/Gemfile.lock | 356 ++++++++++++++++++++++- gems/parslet-toml-merge/Gemfile.lock | 342 ++++++++++++++++++++++- gems/psych-merge/.rubocop_gradual.lock | 372 ++++++++++++++++++++++++ gems/psych-merge/Gemfile.lock | 373 +++---------------------- 5 files changed, 1407 insertions(+), 377 deletions(-) create mode 100644 gems/psych-merge/.rubocop_gradual.lock diff --git a/gems/citrus-toml-merge/Gemfile.lock b/gems/citrus-toml-merge/Gemfile.lock index 624aa6b23..5eadec344 100644 --- a/gems/citrus-toml-merge/Gemfile.lock +++ b/gems/citrus-toml-merge/Gemfile.lock @@ -17,13 +17,264 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: toml-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -35,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -48,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -111,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -139,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -278,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -330,14 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -384,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -409,33 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -443,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -455,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -482,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -493,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -520,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -531,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -544,16 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -561,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/kramdown-merge/Gemfile.lock b/gems/kramdown-merge/Gemfile.lock index c83dc2cdc..59d980821 100644 --- a/gems/kramdown-merge/Gemfile.lock +++ b/gems/kramdown-merge/Gemfile.lock @@ -16,6 +16,265 @@ PATH markdown-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -27,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -103,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -131,10 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -274,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -326,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -377,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -402,31 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -434,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -446,11 +753,15 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 @@ -461,6 +772,8 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -475,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -486,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -513,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -524,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -537,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -552,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) 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 bdd37b265..7bfa19abd 100644 --- a/gems/parslet-toml-merge/Gemfile.lock +++ b/gems/parslet-toml-merge/Gemfile.lock @@ -17,13 +17,264 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: toml-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -35,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -48,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -111,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -139,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -278,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -332,11 +589,9 @@ GEM version_gem (~> 1.1, >= 1.1.13) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -383,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -408,32 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -441,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -453,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -481,10 +789,13 @@ CHECKSUMS parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 parslet-toml-merge (7.1.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -492,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -519,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -530,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -545,14 +861,17 @@ CHECKSUMS token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -560,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/psych-merge/.rubocop_gradual.lock b/gems/psych-merge/.rubocop_gradual.lock new file mode 100644 index 000000000..85e814fd4 --- /dev/null +++ b/gems/psych-merge/.rubocop_gradual.lock @@ -0,0 +1,372 @@ +{ + ".simplecov:2102217422": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:1368539789": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/psych-merge.rb:1330894360": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`psych-merge.rb`) should use snake_case.", 5381] + ], + "lib/psych/merge.rb:173660101": [ + [38, 3, 9398, "Metrics/ModuleLength: Module has too many lines. [188/100]", 2155600486], + [115, 5, 6353, "Metrics/ClassLength: Class has too many lines. [160/100]", 2805786752], + [171, 7, 1593, "Metrics/MethodLength: Method has too many lines. [26/10]", 162695378], + [171, 21, 295, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 2742902791], + [212, 7, 440, "Metrics/MethodLength: Method has too many lines. [11/10]", 4238054657], + [252, 7, 417, "Metrics/MethodLength: Method has too many lines. [11/10]", 3661776213], + [275, 7, 458, "Metrics/MethodLength: Method has too many lines. [15/10]", 1125262299] + ], + "lib/psych/merge/comment_tracker.rb:109829813": [ + [33, 7, 711, "Metrics/MethodLength: Method has too many lines. [24/10]", 4175176008], + [65, 48, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] + ], + "lib/psych/merge/conflict_resolver.rb:1439336560": [ + [24, 5, 98551, "Metrics/ClassLength: Class has too many lines. [1730/100]", 3470480790], + [48, 7, 1257, "Metrics/MethodLength: Method has too many lines. [18/10]", 2709727248], + [48, 21, 354, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [13/5]", 1127138839], + [49, 121, 141, "Layout/LineLength: Line is too long. [261/120]", 84971754], + [63, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1411495206], + [75, 7, 1316, "Metrics/MethodLength: Method has too many lines. [22/10]", 841707991], + [121, 7, 1128, "Metrics/AbcSize: Assignment Branch Condition size for `build_refined_matches` is too high. [<11, 16, 8> 21/17]", 4214539560], + [121, 7, 1128, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_refined_matches` is too high. [9/7]", 4214539560], + [121, 7, 1128, "Metrics/MethodLength: Method has too many lines. [18/10]", 4214539560], + [121, 7, 1128, "Metrics/PerceivedComplexity: Perceived complexity for `build_refined_matches` is too high. [9/8]", 4214539560], + [149, 7, 11524, "Metrics/AbcSize: Assignment Branch Condition size for `merge_nodes_to_emitter` is too high. [<57, 120, 50> 142/17]", 2474480422], + [149, 7, 11524, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_nodes_to_emitter` is too high. [43/7]", 2474480422], + [149, 7, 11524, "Metrics/MethodLength: Method has too many lines. [194/10]", 2474480422], + [149, 7, 11524, "Metrics/PerceivedComplexity: Perceived complexity for `merge_nodes_to_emitter` is too high. [49/8]", 2474480422], + [149, 33, 186, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 421356977], + [150, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 97621789], + [193, 24, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2944491302], + [204, 9, 7819, "Metrics/BlockLength: Block has too many lines. [136/25]", 519912312], + [205, 28, 36, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 345161915], + [263, 39, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3425527675], + [270, 39, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3425527675], + [286, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2818803335], + [330, 37, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3425527675], + [337, 37, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3425527675], + [376, 26, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2944491302], + [391, 24, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2944491302], + [436, 7, 1049, "Metrics/MethodLength: Method has too many lines. [14/10]", 2563450827], + [455, 7, 1990, "Metrics/AbcSize: Assignment Branch Condition size for `emit_supplemental_document_postlude` is too high. [<8, 20, 6> 22.36/17]", 1604415261], + [455, 7, 1990, "Metrics/MethodLength: Method has too many lines. [24/10]", 1604415261], + [501, 7, 982, "Metrics/AbcSize: Assignment Branch Condition size for `emit_nonpreferred_document_postlude_regions` is too high. [<5, 20, 10> 22.91/17]", 7588338], + [501, 7, 982, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_nonpreferred_document_postlude_regions` is too high. [10/7]", 7588338], + [501, 7, 982, "Metrics/MethodLength: Method has too many lines. [17/10]", 7588338], + [501, 7, 982, "Metrics/PerceivedComplexity: Perceived complexity for `emit_nonpreferred_document_postlude_regions` is too high. [11/8]", 7588338], + [523, 7, 429, "Metrics/MethodLength: Method has too many lines. [11/10]", 2317545285], + [551, 7, 1153, "Metrics/MethodLength: Method has too many lines. [27/10]", 2050460902], + [581, 7, 1164, "Metrics/MethodLength: Method has too many lines. [16/10]", 293708573], + [602, 7, 1132, "Metrics/MethodLength: Method has too many lines. [15/10]", 2657257420], + [610, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193417991], + [624, 68, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [627, 19, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [630, 7, 718, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preference_for_pair` is too high. [8/7]", 3339910669], + [630, 7, 718, "Metrics/MethodLength: Method has too many lines. [12/10]", 3339910669], + [656, 7, 1442, "Metrics/MethodLength: Method has too many lines. [34/10]", 3775627321], + [723, 7, 1439, "Metrics/AbcSize: Assignment Branch Condition size for `can_merge_recursively?` is too high. [<0, 18, 13> 22.2/17]", 3986446452], + [723, 7, 1439, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `can_merge_recursively?` is too high. [13/7]", 3986446452], + [723, 7, 1439, "Metrics/MethodLength: Method has too many lines. [11/10]", 3986446452], + [723, 7, 1439, "Metrics/PerceivedComplexity: Perceived complexity for `can_merge_recursively?` is too high. [14/8]", 3986446452], + [754, 7, 368, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `flow_sequence?` is too high. [9/7]", 13791150], + [754, 7, 368, "Metrics/PerceivedComplexity: Perceived complexity for `flow_sequence?` is too high. [9/8]", 13791150], + [765, 7, 452, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `flow_mapping?` is too high. [11/7]", 4104291177], + [765, 7, 452, "Metrics/PerceivedComplexity: Perceived complexity for `flow_mapping?` is too high. [11/8]", 4104291177], + [802, 7, 705, "Metrics/AbcSize: Assignment Branch Condition size for `bare_dash_sequence_item_mapping?` is too high. [<5, 18, 8> 20.32/17]", 625586302], + [802, 7, 705, "Metrics/MethodLength: Method has too many lines. [11/10]", 625586302], + [829, 7, 2511, "Metrics/AbcSize: Assignment Branch Condition size for `emit_recursive_merge` is too high. [<0, 19, 10> 21.47/17]", 3873511358], + [829, 7, 2511, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_recursive_merge` is too high. [9/7]", 3873511358], + [829, 7, 2511, "Metrics/MethodLength: Method has too many lines. [49/10]", 3873511358], + [829, 7, 2511, "Metrics/PerceivedComplexity: Perceived complexity for `emit_recursive_merge` is too high. [11/8]", 3873511358], + [830, 9, 2388, "Metrics/BlockLength: Block has too many lines. [47/25]", 1655278799], + [906, 7, 2400, "Metrics/AbcSize: Assignment Branch Condition size for `emit_recursive_mapping_merge` is too high. [<15, 29, 14> 35.52/17]", 1648233163], + [906, 7, 2400, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_recursive_mapping_merge` is too high. [15/7]", 1648233163], + [906, 7, 2400, "Metrics/MethodLength: Method has too many lines. [44/10]", 1648233163], + [906, 7, 2400, "Metrics/PerceivedComplexity: Perceived complexity for `emit_recursive_mapping_merge` is too high. [17/8]", 1648233163], + [974, 7, 6966, "Metrics/AbcSize: Assignment Branch Condition size for `emit_recursive_sequence_merge` is too high. [<35, 84, 35> 97.5/17]", 2427419647], + [974, 7, 6966, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_recursive_sequence_merge` is too high. [30/7]", 2427419647], + [974, 7, 6966, "Metrics/MethodLength: Method has too many lines. [113/10]", 2427419647], + [974, 7, 6966, "Metrics/PerceivedComplexity: Perceived complexity for `emit_recursive_sequence_merge` is too high. [37/8]", 2427419647], + [1020, 74, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2678193523], + [1023, 9, 3871, "Metrics/BlockLength: Block has too many lines. [72/25]", 4174342864], + [1036, 28, 31, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1010804247], + [1048, 37, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2630532814], + [1064, 28, 44, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2630532814], + [1077, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2582359665], + [1102, 76, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2678193523], + [1111, 74, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2678193523], + [1115, 7, 1262, "Metrics/AbcSize: Assignment Branch Condition size for `build_sequence_item_matches` is too high. [<11, 13, 2> 17.15/17]", 3127840652], + [1115, 7, 1262, "Metrics/MethodLength: Method has too many lines. [21/10]", 3127840652], + [1146, 7, 3065, "Metrics/AbcSize: Assignment Branch Condition size for `build_refined_sequence_observation_matches` is too high. [<19, 51, 17> 57.02/17]", 2950540403], + [1146, 7, 3065, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_refined_sequence_observation_matches` is too high. [18/7]", 2950540403], + [1146, 7, 3065, "Metrics/MethodLength: Method has too many lines. [55/10]", 2950540403], + [1146, 7, 3065, "Metrics/PerceivedComplexity: Perceived complexity for `build_refined_sequence_observation_matches` is too high. [18/8]", 2950540403], + [1209, 9, 24, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 32301403], + [1261, 7, 901, "Metrics/MethodLength: Method has too many lines. [14/10]", 3298193773], + [1261, 29, 147, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3718416672], + [1285, 7, 1642, "Metrics/AbcSize: Assignment Branch Condition size for `emit_node` is too high. [<4, 22, 10> 24.49/17]", 518692521], + [1285, 7, 1642, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_node` is too high. [11/7]", 518692521], + [1285, 7, 1642, "Metrics/MethodLength: Method has too many lines. [32/10]", 518692521], + [1285, 7, 1642, "Metrics/PerceivedComplexity: Perceived complexity for `emit_node` is too high. [11/8]", 518692521], + [1285, 20, 138, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 109777589], + [1331, 7, 1577, "Metrics/AbcSize: Assignment Branch Condition size for `emit_mapping_entry` is too high. [<6, 17, 15> 23.45/17]", 3927797439], + [1331, 7, 1577, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_mapping_entry` is too high. [13/7]", 3927797439], + [1331, 7, 1577, "Metrics/MethodLength: Method has too many lines. [28/10]", 3927797439], + [1331, 7, 1577, "Metrics/PerceivedComplexity: Perceived complexity for `emit_mapping_entry` is too high. [13/8]", 3927797439], + [1331, 29, 148, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2283756321], + [1375, 7, 1975, "Metrics/AbcSize: Assignment Branch Condition size for `emit_mapping_entry_prelude` is too high. [<9, 26, 16> 31.83/17]", 3449491730], + [1375, 7, 1975, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_mapping_entry_prelude` is too high. [16/7]", 3449491730], + [1375, 7, 1975, "Metrics/MethodLength: Method has too many lines. [35/10]", 3449491730], + [1375, 7, 1975, "Metrics/PerceivedComplexity: Perceived complexity for `emit_mapping_entry_prelude` is too high. [16/8]", 3449491730], + [1419, 7, 1550, "Metrics/AbcSize: Assignment Branch Condition size for `emit_node_prelude` is too high. [<6, 17, 9> 20.15/17]", 4132652846], + [1419, 7, 1550, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_node_prelude` is too high. [10/7]", 4132652846], + [1419, 7, 1550, "Metrics/MethodLength: Method has too many lines. [26/10]", 4132652846], + [1419, 7, 1550, "Metrics/PerceivedComplexity: Perceived complexity for `emit_node_prelude` is too high. [10/8]", 4132652846], + [1463, 7, 1256, "Metrics/AbcSize: Assignment Branch Condition size for `emit_node_first_line` is too high. [<3, 16, 5> 17.03/17]", 809936874], + [1463, 7, 1256, "Metrics/MethodLength: Method has too many lines. [24/10]", 809936874], + [1492, 7, 838, "Metrics/AbcSize: Assignment Branch Condition size for `emit_removed_destination_node_comments` is too high. [<3, 16, 7> 17.72/17]", 1801654574], + [1492, 7, 838, "Metrics/MethodLength: Method has too many lines. [13/10]", 1801654574], + [1531, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2088091358], + [1551, 7, 587, "Metrics/MethodLength: Method has too many lines. [14/10]", 1778584112], + [1594, 7, 1089, "Metrics/AbcSize: Assignment Branch Condition size for `canonical_sequence_item_value` is too high. [<7, 20, 8> 22.65/17]", 2923924756], + [1594, 7, 1089, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonical_sequence_item_value` is too high. [9/7]", 2923924756], + [1594, 7, 1089, "Metrics/MethodLength: Method has too many lines. [15/10]", 2923924756], + [1594, 7, 1089, "Metrics/PerceivedComplexity: Perceived complexity for `canonical_sequence_item_value` is too high. [9/8]", 2923924756], + [1621, 7, 918, "Metrics/AbcSize: Assignment Branch Condition size for `sequence_item_observations` is too high. [<7, 26, 9> 28.39/17]", 1736204122], + [1621, 7, 918, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `sequence_item_observations` is too high. [10/7]", 1736204122], + [1621, 7, 918, "Metrics/MethodLength: Method has too many lines. [15/10]", 1736204122], + [1621, 7, 918, "Metrics/PerceivedComplexity: Perceived complexity for `sequence_item_observations` is too high. [10/8]", 1736204122], + [1626, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3762412176], + [1635, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 4096127909], + [1656, 7, 901, "Metrics/AbcSize: Assignment Branch Condition size for `trimmed_sequence_item_lines` is too high. [<11, 26, 10> 29.95/17]", 4091201884], + [1656, 7, 901, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trimmed_sequence_item_lines` is too high. [10/7]", 4091201884], + [1656, 7, 901, "Metrics/MethodLength: Method has too many lines. [15/10]", 4091201884], + [1656, 7, 901, "Metrics/PerceivedComplexity: Perceived complexity for `trimmed_sequence_item_lines` is too high. [10/8]", 4091201884], + [1678, 7, 713, "Metrics/AbcSize: Assignment Branch Condition size for `sequence_item_start_line` is too high. [<5, 22, 8> 23.94/17]", 2061460995], + [1712, 11, 61, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1718502596], + [1718, 7, 629, "Metrics/AbcSize: Assignment Branch Condition size for `effective_end_line` is too high. [<4, 14, 10> 17.66/17]", 2226115349], + [1718, 7, 629, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `effective_end_line` is too high. [10/7]", 2226115349], + [1718, 7, 629, "Metrics/PerceivedComplexity: Perceived complexity for `effective_end_line` is too high. [10/8]", 2226115349], + [1722, 41, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [1764, 7, 1381, "Metrics/AbcSize: Assignment Branch Condition size for `region_already_emitted?` is too high. [<11, 32, 14> 36.62/17]", 2166775868], + [1764, 7, 1381, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `region_already_emitted?` is too high. [13/7]", 2166775868], + [1764, 7, 1381, "Metrics/MethodLength: Method has too many lines. [26/10]", 2166775868], + [1764, 7, 1381, "Metrics/PerceivedComplexity: Perceived complexity for `region_already_emitted?` is too high. [14/8]", 2166775868], + [1804, 7, 2218, "Metrics/AbcSize: Assignment Branch Condition size for `emit_document_postlude` is too high. [<17, 30, 14> 37.22/17]", 1397438331], + [1804, 7, 2218, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_document_postlude` is too high. [15/7]", 1397438331], + [1804, 7, 2218, "Metrics/MethodLength: Method has too many lines. [27/10]", 1397438331], + [1804, 7, 2218, "Metrics/PerceivedComplexity: Perceived complexity for `emit_document_postlude` is too high. [15/8]", 1397438331], + [1848, 7, 1304, "Metrics/AbcSize: Assignment Branch Condition size for `emit_document_prelude` is too high. [<8, 28, 11> 31.13/17]", 325827008], + [1848, 7, 1304, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_document_prelude` is too high. [12/7]", 325827008], + [1848, 7, 1304, "Metrics/MethodLength: Method has too many lines. [24/10]", 325827008], + [1848, 7, 1304, "Metrics/PerceivedComplexity: Perceived complexity for `emit_document_prelude` is too high. [13/8]", 325827008], + [1896, 9, 48, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2339197345], + [1899, 7, 691, "Metrics/AbcSize: Assignment Branch Condition size for `document_leading_regions_for` is too high. [<5, 19, 14> 24.12/17]", 796439642], + [1899, 7, 691, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `document_leading_regions_for` is too high. [14/7]", 796439642], + [1899, 7, 691, "Metrics/MethodLength: Method has too many lines. [12/10]", 796439642], + [1899, 7, 691, "Metrics/PerceivedComplexity: Perceived complexity for `document_leading_regions_for` is too high. [14/8]", 796439642], + [1928, 7, 646, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonical_leading_comment_region` is too high. [10/7]", 1342472091], + [1928, 7, 646, "Metrics/PerceivedComplexity: Perceived complexity for `canonical_leading_comment_region` is too high. [10/8]", 1342472091], + [1942, 7, 1410, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_template_preamble_prefix_region` is too high. [<7, 25, 15> 29.98/17]", 449550851], + [1942, 7, 1410, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collapse_template_preamble_prefix_region` is too high. [11/7]", 449550851], + [1942, 7, 1410, "Metrics/MethodLength: Method has too many lines. [27/10]", 449550851], + [1942, 7, 1410, "Metrics/PerceivedComplexity: Perceived complexity for `collapse_template_preamble_prefix_region` is too high. [11/8]", 449550851], + [1975, 7, 991, "Metrics/AbcSize: Assignment Branch Condition size for `duplicated_template_preamble_prefix_in_first_node_leading_region?` is too high. [<7, 25, 14> 29.5/17]", 4012549279], + [1975, 7, 991, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `duplicated_template_preamble_prefix_in_first_node_leading_region?` is too high. [12/7]", 4012549279], + [1975, 7, 991, "Metrics/MethodLength: Method has too many lines. [13/10]", 4012549279], + [1975, 7, 991, "Metrics/PerceivedComplexity: Perceived complexity for `duplicated_template_preamble_prefix_in_first_node_leading_region?` is too high. [12/8]", 4012549279], + [2030, 7, 956, "Metrics/AbcSize: Assignment Branch Condition size for `document_trailing_regions_for` is too high. [<6, 16, 12> 20.88/17]", 3560026445], + [2030, 7, 956, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `document_trailing_regions_for` is too high. [12/7]", 3560026445], + [2030, 7, 956, "Metrics/PerceivedComplexity: Perceived complexity for `document_trailing_regions_for` is too high. [12/8]", 3560026445], + [2053, 7, 456, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `deflated_content_end_line` is too high. [8/7]", 3297059340], + [2089, 7, 614, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `leading_gap_line_count_for` is too high. [9/7]", 1127644346], + [2089, 7, 614, "Metrics/PerceivedComplexity: Perceived complexity for `leading_gap_line_count_for` is too high. [10/8]", 1127644346], + [2093, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 2290159738], + [2139, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [2168, 31, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [2175, 55, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [2183, 54, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [2191, 56, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [2196, 7, 822, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preferred_leading_comment_region` is too high. [10/7]", 1272157667], + [2196, 7, 822, "Metrics/PerceivedComplexity: Perceived complexity for `preferred_leading_comment_region` is too high. [10/8]", 1272157667], + [2308, 7, 465, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_interstitial_blank_lines` is too high. [9/7]", 1640065866], + [2308, 7, 465, "Metrics/PerceivedComplexity: Perceived complexity for `emit_interstitial_blank_lines` is too high. [9/8]", 1640065866], + [2320, 7, 586, "Metrics/MethodLength: Method has too many lines. [12/10]", 3310131662] + ], + "lib/psych/merge/debug_logger.rb:110646504": [ + [26, 9, 680, "Metrics/MethodLength: Method has too many lines. [12/10]", 1981451425] + ], + "lib/psych/merge/diff_mapper.rb:844380236": [ + [20, 5, 7887, "Metrics/ClassLength: Class has too many lines. [118/100]", 3492547573], + [34, 7, 471, "Metrics/MethodLength: Method has too many lines. [11/10]", 577300188], + [75, 7, 627, "Metrics/MethodLength: Method has too many lines. [12/10]", 2362564224], + [102, 7, 786, "Metrics/MethodLength: Method has too many lines. [11/10]", 1096016446], + [131, 7, 1613, "Metrics/AbcSize: Assignment Branch Condition size for `find_nested_path` is too high. [<12, 27, 20> 35.68/17]", 4005634231], + [131, 7, 1613, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_nested_path` is too high. [17/7]", 4005634231], + [131, 7, 1613, "Metrics/MethodLength: Method has too many lines. [30/10]", 4005634231], + [131, 7, 1613, "Metrics/PerceivedComplexity: Perceived complexity for `find_nested_path` is too high. [18/8]", 4005634231], + [183, 7, 758, "Metrics/MethodLength: Method has too many lines. [13/10]", 2773539171], + [204, 20, 11, "Style/NumericPredicate: Use `indent.zero?` instead of `indent == 0`.", 1189613385] + ], + "lib/psych/merge/emitter.rb:2851865662": [ + [14, 5, 7357, "Metrics/ClassLength: Class has too many lines. [147/100]", 579415518], + [138, 42, 6, "Lint/UnusedMethodArgument: Unused method argument - `region`.", 2124512157], + [151, 55, 12, "Lint/UnusedMethodArgument: Unused method argument - `current_line`.", 2091263933], + [166, 7, 560, "Metrics/AbcSize: Assignment Branch Condition size for `repeated_region_segment_length` is too high. [<6, 14, 8> 17.2/17]", 800046942], + [194, 7, 596, "Metrics/MethodLength: Method has too many lines. [12/10]", 2092207138], + [228, 7, 662, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `needs_quoting?` is too high. [10/7]", 172072954], + [228, 7, 662, "Metrics/PerceivedComplexity: Perceived complexity for `needs_quoting?` is too high. [10/8]", 172072954] + ], + "lib/psych/merge/file_analysis.rb:1868572144": [ + [13, 5, 14981, "Metrics/ClassLength: Class has too many lines. [251/100]", 3755372144], + [37, 7, 1080, "Metrics/MethodLength: Method has too many lines. [15/10]", 4243676919], + [203, 7, 533, "Metrics/MethodLength: Method has too many lines. [11/10]", 2772113363], + [237, 7, 998, "Metrics/AbcSize: Assignment Branch Condition size for `mapping_entry_attachment` is too high. [<5, 23, 7> 24.56/17]", 3001873728], + [237, 7, 998, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `mapping_entry_attachment` is too high. [8/7]", 3001873728], + [237, 7, 998, "Metrics/MethodLength: Method has too many lines. [13/10]", 3001873728], + [267, 7, 809, "Metrics/AbcSize: Assignment Branch Condition size for `full_line_comment_blocks_before` is too high. [<9, 16, 6> 19.31/17]", 2033268754], + [267, 7, 809, "Metrics/MethodLength: Method has too many lines. [22/10]", 2033268754], + [329, 7, 1353, "Metrics/AbcSize: Assignment Branch Condition size for `extract_freeze_blocks` is too high. [<12, 20, 12> 26.23/17]", 4244924302], + [329, 7, 1353, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_freeze_blocks` is too high. [10/7]", 4244924302], + [329, 7, 1353, "Metrics/MethodLength: Method has too many lines. [27/10]", 4244924302], + [329, 7, 1353, "Metrics/PerceivedComplexity: Perceived complexity for `extract_freeze_blocks` is too high. [11/8]", 4244924302], + [370, 7, 1756, "Metrics/AbcSize: Assignment Branch Condition size for `integrate_nodes_and_freeze_blocks` is too high. [<11, 28, 19> 35.58/17]", 1233865722], + [370, 7, 1756, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `integrate_nodes_and_freeze_blocks` is too high. [18/7]", 1233865722], + [370, 7, 1756, "Metrics/MethodLength: Method has too many lines. [31/10]", 1233865722], + [370, 7, 1756, "Metrics/PerceivedComplexity: Perceived complexity for `integrate_nodes_and_freeze_blocks` is too high. [19/8]", 1233865722] + ], + "lib/psych/merge/freeze_node.rb:3007012923": [ + [33, 21, 127, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1948779238] + ], + "lib/psych/merge/mapping_match_refiner.rb:3428808618": [ + [29, 5, 7580, "Metrics/ClassLength: Class has too many lines. [111/100]", 3764504760], + [121, 7, 800, "Metrics/MethodLength: Method has too many lines. [13/10]", 2814728338], + [150, 15, 20, "Style/ClassEqualityComparison: Use `instance_of?(node2.class)` instead of comparing classes.", 1212490233], + [193, 7, 270, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `sequence_similarity` is too high. [9/7]", 724822377], + [193, 7, 270, "Metrics/PerceivedComplexity: Perceived complexity for `sequence_similarity` is too high. [9/8]", 724822377], + [197, 23, 9, "Style/NumericPredicate: Use `len1.zero?` instead of `len1 == 0`.", 913205219], + [197, 36, 9, "Style/NumericPredicate: Use `len2.zero?` instead of `len2 == 0`.", 871697920], + [198, 23, 9, "Style/NumericPredicate: Use `len1.zero?` instead of `len1 == 0`.", 913205219], + [198, 36, 9, "Style/NumericPredicate: Use `len2.zero?` instead of `len2 == 0`.", 871697920], + [225, 7, 854, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<13, 29, 8> 32.77/17]", 2946547420], + [225, 7, 854, "Metrics/MethodLength: Method has too many lines. [20/10]", 2946547420] + ], + "lib/psych/merge/merge_result.rb:4276173304": [ + [140, 7, 421, "Metrics/MethodLength: Method has too many lines. [11/10]", 2459390040] + ], + "lib/psych/merge/node_wrapper.rb:1997974804": [ + [12, 5, 12280, "Metrics/ClassLength: Class has too many lines. [222/100]", 463540785], + [42, 7, 2039, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `initialize` is too high. [8/7]", 338533329], + [42, 21, 274, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 2646089467], + [144, 7, 699, "Metrics/MethodLength: Method has too many lines. [20/10]", 2676695829], + [210, 7, 985, "Metrics/MethodLength: Method has too many lines. [16/10]", 59427073], + [256, 7, 686, "Metrics/AbcSize: Assignment Branch Condition size for `compute_signature` is too high. [<4, 21, 13> 25.02/17]", 2657240579], + [256, 7, 686, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_signature` is too high. [14/7]", 2657240579], + [256, 7, 686, "Metrics/MethodLength: Method has too many lines. [18/10]", 2657240579], + [256, 7, 686, "Metrics/PerceivedComplexity: Perceived complexity for `compute_signature` is too high. [10/8]", 2657240579], + [277, 7, 425, "Metrics/MethodLength: Method has too many lines. [11/10]", 3170039988], + [310, 7, 1150, "Metrics/MethodLength: Method has too many lines. [24/10]", 647387009], + [321, 31, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [340, 7, 484, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `clamp_end_line_to_next_sibling!` is too high. [10/7]", 953824779], + [340, 7, 484, "Metrics/PerceivedComplexity: Perceived complexity for `clamp_end_line_to_next_sibling!` is too high. [10/8]", 953824779] + ], + "lib/psych/merge/smart_merger.rb:1750771088": [ + [45, 5, 10514, "Metrics/ClassLength: Class has too many lines. [192/100]", 4260193581], + [81, 7, 1336, "Metrics/MethodLength: Method has too many lines. [18/10]", 1713606127], + [81, 21, 557, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [16/5]", 1646356108], + [153, 7, 1440, "Metrics/AbcSize: Assignment Branch Condition size for `merge_with_debug` is too high. [<3, 24, 7> 25.18/17]", 695369520], + [153, 7, 1440, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_with_debug` is too high. [8/7]", 695369520], + [153, 7, 1440, "Metrics/MethodLength: Method has too many lines. [32/10]", 695369520], + [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:914772787": [ + [129, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [144, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [145, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [152, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ], + "spec/fixtures_integration_spec.rb:1717446685": [ + [3, 1, 9786, "Metrics/BlockLength: Block has too many lines. [222/25]", 1649396447], + [16, 3, 1302, "Metrics/BlockLength: Block has too many lines. [32/25]", 1546514966], + [52, 3, 2159, "Metrics/BlockLength: Block has too many lines. [28/25]", 270765486], + [109, 3, 1594, "Metrics/BlockLength: Block has too many lines. [41/25]", 568154065], + [227, 3, 1413, "Metrics/BlockLength: Block has too many lines. [29/25]", 1847754351] + ], + "spec/reproducible_merge_spec.rb:2168097366": [ + [3, 1, 5699, "Metrics/BlockLength: Block has too many lines. [107/25]", 3775945048], + [4, 3, 61, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1575360142], + [6, 3, 4847, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3343843514], + [47, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 3440433042], + [53, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3187380084] + ] +} diff --git a/gems/psych-merge/Gemfile.lock b/gems/psych-merge/Gemfile.lock index 9fa08b960..3c6701b65 100644 --- a/gems/psych-merge/Gemfile.lock +++ b/gems/psych-merge/Gemfile.lock @@ -18,39 +18,7 @@ PATH yaml-merge (= 7.1.0) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -59,192 +27,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -253,44 +36,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: yaml-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - GEM remote: https://gem.coop/ specs: @@ -310,12 +62,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -324,6 +70,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -379,6 +126,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -397,7 +153,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -537,23 +292,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -587,11 +344,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -618,7 +370,7 @@ GEM yard yard-relative_markdown_links (0.6.0) nokogiri (>= 1.14.3, < 2) - yard-timekeeper (0.2.3) + yard-timekeeper (0.2.4) version_gem (~> 1.1, >= 1.1.13) yard-yaml (0.2.3) version_gem (~> 1.1, >= 1.1.13) @@ -638,45 +390,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,17 +416,12 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) yaml-merge! yard (~> 0.9, >= 0.9.44) @@ -704,42 +430,26 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -752,27 +462,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -787,12 +489,9 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 @@ -802,7 +501,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -830,19 +528,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,14 +552,10 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -873,10 +565,9 @@ CHECKSUMS yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd yard-relative_markdown_links (0.6.0) sha256=3e5ffa85cbad9bac70bee5421774b190fb25d3bdf489323a5b3534f647d1a70e - yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 + yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 2477703a2da37224091d8705597efa45cc144bbb Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:29:39 -0600 Subject: [PATCH 241/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/commonmarker-merge/.kettle-drift.lock | 60 ++-- gems/commonmarker-merge/Gemfile | 40 +++ gems/commonmarker-merge/Gemfile.lock | 337 +------------------- gems/psych-merge/Gemfile.lock | 318 ++++++++++++++++++- gems/typescript-merge/Gemfile.lock | 353 +-------------------- 5 files changed, 418 insertions(+), 690 deletions(-) diff --git a/gems/commonmarker-merge/.kettle-drift.lock b/gems/commonmarker-merge/.kettle-drift.lock index 44ac5c29d..5b373dd8d 100644 --- a/gems/commonmarker-merge/.kettle-drift.lock +++ b/gems/commonmarker-merge/.kettle-drift.lock @@ -7,7 +7,8 @@ 119, 159, 199, - 239 + 239, + 279 ] } ], @@ -19,7 +20,8 @@ 130, 170, 210, - 250 + 250, + 290 ] } ], @@ -31,7 +33,8 @@ 120, 160, 200, - 240 + 240, + 280 ] } ], @@ -43,7 +46,8 @@ 132, 172, 212, - 252 + 252, + 292 ] } ], @@ -55,7 +59,8 @@ 135, 175, 215, - 255 + 255, + 295 ] } ], @@ -67,7 +72,8 @@ 121, 161, 201, - 241 + 241, + 281 ] } ], @@ -80,7 +86,8 @@ 139, 179, 219, - 259 + 259, + 299 ] } ], @@ -92,7 +99,8 @@ 140, 180, 220, - 260 + 260, + 300 ] } ], @@ -105,7 +113,8 @@ 126, 166, 206, - 246 + 246, + 286 ] } ], @@ -117,7 +126,8 @@ 149, 189, 229, - 269 + 269, + 309 ] } ], @@ -130,7 +140,8 @@ 118, 158, 198, - 238 + 238, + 278 ] } ], @@ -143,7 +154,8 @@ 148, 188, 228, - 268 + 268, + 308 ] } ], @@ -155,7 +167,8 @@ 124, 164, 204, - 244 + 244, + 284 ] } ], @@ -168,7 +181,8 @@ 131, 171, 211, - 251 + 251, + 291 ] } ], @@ -181,7 +195,8 @@ 127, 167, 207, - 247 + 247, + 287 ] } ], @@ -193,7 +208,8 @@ 125, 165, 205, - 245 + 245, + 285 ] } ], @@ -205,7 +221,8 @@ 142, 182, 222, - 262 + 262, + 302 ] } ], @@ -217,7 +234,8 @@ 141, 181, 221, - 261 + 261, + 301 ] } ], @@ -229,7 +247,8 @@ 136, 176, 216, - 256 + 256, + 296 ] } ], @@ -241,7 +260,8 @@ 145, 185, 225, - 265 + 265, + 305 ] } ], diff --git a/gems/commonmarker-merge/Gemfile b/gems/commonmarker-merge/Gemfile index e83cbb7e8..88b4f717b 100644 --- a/gems/commonmarker-merge/Gemfile +++ b/gems/commonmarker-merge/Gemfile @@ -271,6 +271,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/commonmarker-merge/Gemfile.lock b/gems/commonmarker-merge/Gemfile.lock index a7bd19904..930fb85f1 100644 --- a/gems/commonmarker-merge/Gemfile.lock +++ b/gems/commonmarker-merge/Gemfile.lock @@ -17,264 +17,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +35,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -363,8 +117,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +145,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +284,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +336,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -618,7 +367,7 @@ GEM yard yard-relative_markdown_links (0.6.0) nokogiri (>= 1.14.3, < 2) - yard-timekeeper (0.2.3) + yard-timekeeper (0.2.4) version_gem (~> 1.1, >= 1.1.13) yard-yaml (0.2.3) version_gem (~> 1.1, >= 1.1.13) @@ -638,45 +387,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,46 +413,30 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca @@ -740,7 +452,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +464,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +492,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +503,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +530,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +541,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,27 +554,21 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd yard-relative_markdown_links (0.6.0) sha256=3e5ffa85cbad9bac70bee5421774b190fb25d3bdf489323a5b3534f647d1a70e - yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 + yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/psych-merge/Gemfile.lock b/gems/psych-merge/Gemfile.lock index 3c6701b65..7821b07c4 100644 --- a/gems/psych-merge/Gemfile.lock +++ b/gems/psych-merge/Gemfile.lock @@ -18,7 +18,39 @@ PATH yaml-merge (= 7.1.0) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -27,7 +59,192 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -36,13 +253,28 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: yaml-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -62,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -125,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -153,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -292,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -344,6 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -390,24 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -416,12 +685,17 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) yaml-merge! yard (~> 0.9, >= 0.9.44) @@ -430,19 +704,35 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -450,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -462,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -489,9 +788,12 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 @@ -501,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -528,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -539,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -552,10 +859,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -568,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/typescript-merge/Gemfile.lock b/gems/typescript-merge/Gemfile.lock index 21c4bdfe9..244a6c9de 100644 --- a/gems/typescript-merge/Gemfile.lock +++ b/gems/typescript-merge/Gemfile.lock @@ -16,265 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +40,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +103,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +131,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +270,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +322,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +373,22 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +397,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +430,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +442,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +469,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +480,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +507,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +518,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,9 +531,6 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f @@ -871,7 +540,6 @@ CHECKSUMS unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +547,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From c5b7171686cbc539ec5450bae49912740f7fc24e Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:29:52 -0600 Subject: [PATCH 242/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/commonmarker-merge/Gemfile.lock | 333 ++++++++++++++++++- gems/kramdown-merge/.kettle-drift.lock | 60 ++-- gems/kramdown-merge/Gemfile | 40 +++ gems/kramdown-merge/Gemfile.lock | 349 +------------------- gems/prism-merge/.kettle-drift.lock | 60 ++-- gems/prism-merge/Gemfile | 70 +++- gems/prism-merge/Rakefile | 18 +- gems/prism-merge/lib/prism/merge/version.rb | 2 +- 8 files changed, 522 insertions(+), 410 deletions(-) diff --git a/gems/commonmarker-merge/Gemfile.lock b/gems/commonmarker-merge/Gemfile.lock index 930fb85f1..6aef060f6 100644 --- a/gems/commonmarker-merge/Gemfile.lock +++ b/gems/commonmarker-merge/Gemfile.lock @@ -17,13 +17,264 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: markdown-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -35,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -117,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -145,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -284,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -336,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -387,24 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -413,30 +685,46 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca @@ -452,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -464,20 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -492,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -503,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -530,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -541,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -554,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -569,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/kramdown-merge/.kettle-drift.lock b/gems/kramdown-merge/.kettle-drift.lock index 44ac5c29d..5b373dd8d 100644 --- a/gems/kramdown-merge/.kettle-drift.lock +++ b/gems/kramdown-merge/.kettle-drift.lock @@ -7,7 +7,8 @@ 119, 159, 199, - 239 + 239, + 279 ] } ], @@ -19,7 +20,8 @@ 130, 170, 210, - 250 + 250, + 290 ] } ], @@ -31,7 +33,8 @@ 120, 160, 200, - 240 + 240, + 280 ] } ], @@ -43,7 +46,8 @@ 132, 172, 212, - 252 + 252, + 292 ] } ], @@ -55,7 +59,8 @@ 135, 175, 215, - 255 + 255, + 295 ] } ], @@ -67,7 +72,8 @@ 121, 161, 201, - 241 + 241, + 281 ] } ], @@ -80,7 +86,8 @@ 139, 179, 219, - 259 + 259, + 299 ] } ], @@ -92,7 +99,8 @@ 140, 180, 220, - 260 + 260, + 300 ] } ], @@ -105,7 +113,8 @@ 126, 166, 206, - 246 + 246, + 286 ] } ], @@ -117,7 +126,8 @@ 149, 189, 229, - 269 + 269, + 309 ] } ], @@ -130,7 +140,8 @@ 118, 158, 198, - 238 + 238, + 278 ] } ], @@ -143,7 +154,8 @@ 148, 188, 228, - 268 + 268, + 308 ] } ], @@ -155,7 +167,8 @@ 124, 164, 204, - 244 + 244, + 284 ] } ], @@ -168,7 +181,8 @@ 131, 171, 211, - 251 + 251, + 291 ] } ], @@ -181,7 +195,8 @@ 127, 167, 207, - 247 + 247, + 287 ] } ], @@ -193,7 +208,8 @@ 125, 165, 205, - 245 + 245, + 285 ] } ], @@ -205,7 +221,8 @@ 142, 182, 222, - 262 + 262, + 302 ] } ], @@ -217,7 +234,8 @@ 141, 181, 221, - 261 + 261, + 301 ] } ], @@ -229,7 +247,8 @@ 136, 176, 216, - 256 + 256, + 296 ] } ], @@ -241,7 +260,8 @@ 145, 185, 225, - 265 + 265, + 305 ] } ], diff --git a/gems/kramdown-merge/Gemfile b/gems/kramdown-merge/Gemfile index 992ae9d98..d6b8bed97 100644 --- a/gems/kramdown-merge/Gemfile +++ b/gems/kramdown-merge/Gemfile @@ -271,6 +271,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/kramdown-merge/Gemfile.lock b/gems/kramdown-merge/Gemfile.lock index 59d980821..d58ffe0fb 100644 --- a/gems/kramdown-merge/Gemfile.lock +++ b/gems/kramdown-merge/Gemfile.lock @@ -17,264 +17,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -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.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +35,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +48,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +111,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +139,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +278,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +330,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -618,7 +361,7 @@ GEM yard yard-relative_markdown_links (0.6.0) nokogiri (>= 1.14.3, < 2) - yard-timekeeper (0.2.3) + yard-timekeeper (0.2.4) version_gem (~> 1.1, >= 1.1.13) yard-yaml (0.2.3) version_gem (~> 1.1, >= 1.1.13) @@ -638,45 +381,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +407,31 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +439,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,15 +451,11 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 @@ -772,8 +466,6 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +480,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +491,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +518,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +529,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,27 +542,21 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd yard-relative_markdown_links (0.6.0) sha256=3e5ffa85cbad9bac70bee5421774b190fb25d3bdf489323a5b3534f647d1a70e - yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 + yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/prism-merge/.kettle-drift.lock b/gems/prism-merge/.kettle-drift.lock index 44ac5c29d..5b373dd8d 100644 --- a/gems/prism-merge/.kettle-drift.lock +++ b/gems/prism-merge/.kettle-drift.lock @@ -7,7 +7,8 @@ 119, 159, 199, - 239 + 239, + 279 ] } ], @@ -19,7 +20,8 @@ 130, 170, 210, - 250 + 250, + 290 ] } ], @@ -31,7 +33,8 @@ 120, 160, 200, - 240 + 240, + 280 ] } ], @@ -43,7 +46,8 @@ 132, 172, 212, - 252 + 252, + 292 ] } ], @@ -55,7 +59,8 @@ 135, 175, 215, - 255 + 255, + 295 ] } ], @@ -67,7 +72,8 @@ 121, 161, 201, - 241 + 241, + 281 ] } ], @@ -80,7 +86,8 @@ 139, 179, 219, - 259 + 259, + 299 ] } ], @@ -92,7 +99,8 @@ 140, 180, 220, - 260 + 260, + 300 ] } ], @@ -105,7 +113,8 @@ 126, 166, 206, - 246 + 246, + 286 ] } ], @@ -117,7 +126,8 @@ 149, 189, 229, - 269 + 269, + 309 ] } ], @@ -130,7 +140,8 @@ 118, 158, 198, - 238 + 238, + 278 ] } ], @@ -143,7 +154,8 @@ 148, 188, 228, - 268 + 268, + 308 ] } ], @@ -155,7 +167,8 @@ 124, 164, 204, - 244 + 244, + 284 ] } ], @@ -168,7 +181,8 @@ 131, 171, 211, - 251 + 251, + 291 ] } ], @@ -181,7 +195,8 @@ 127, 167, 207, - 247 + 247, + 287 ] } ], @@ -193,7 +208,8 @@ 125, 165, 205, - 245 + 245, + 285 ] } ], @@ -205,7 +221,8 @@ 142, 182, 222, - 262 + 262, + 302 ] } ], @@ -217,7 +234,8 @@ 141, 181, 221, - 261 + 261, + 301 ] } ], @@ -229,7 +247,8 @@ 136, 176, 216, - 256 + 256, + 296 ] } ], @@ -241,7 +260,8 @@ 145, 185, 225, - 265 + 265, + 305 ] } ], diff --git a/gems/prism-merge/Gemfile b/gems/prism-merge/Gemfile index 904597caf..47c195382 100644 --- a/gems/prism-merge/Gemfile +++ b/gems/prism-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source 'https://gem.coop' +source "https://gem.coop" git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,17 +19,61 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ['~> 1.0', '>= 1.0.8'] -gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ["~> 1.0", ">= 1.0.8"] +gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ruby-merge ] -direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') +direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? + +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) + direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") + direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == "nomono" } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + if nomono_locked + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] + end + end + Kernel.send(:gem, "nomono", *nomono_activation_requirements) + require "nomono/bundler" + if direct_sibling_templating && !direct_sibling_local + ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + end + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: "STRUCTUREDMERGE", + path_env: "STRUCTUREDMERGE_DEV", + root: ["src", "my", "structuredmerge"] + ) + rescue LoadError + warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + else + ENV.delete("STRUCTUREDMERGE_DEV") + end + end + end +end if direct_sibling_gems.any? && (direct_sibling_local || @@ -289,25 +333,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? # Debugging -eval_gemfile 'gemfiles/modular/debug.gemfile' +eval_gemfile "gemfiles/modular/debug.gemfile" # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile 'gemfiles/modular/coverage.gemfile' +eval_gemfile "gemfiles/modular/coverage.gemfile" # Linting -eval_gemfile 'gemfiles/modular/style.gemfile' +eval_gemfile "gemfiles/modular/style.gemfile" # Documentation -eval_gemfile 'gemfiles/modular/documentation.gemfile' +eval_gemfile "gemfiles/modular/documentation.gemfile" # Optional -eval_gemfile 'gemfiles/modular/optional.gemfile' +eval_gemfile "gemfiles/modular/optional.gemfile" ### Std Lib Extracted Gems -eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' +eval_gemfile "gemfiles/modular/x_std_libs.gemfile" # See unlocked_deps appraisal for more details on irb inclusion -gem 'irb', '~> 1.17' # ruby >= 2.7 +gem "irb", "~> 1.17" # ruby >= 2.7 diff --git a/gems/prism-merge/Rakefile b/gems/prism-merge/Rakefile index 0413b973d..3ceda1211 100644 --- a/gems/prism-merge/Rakefile +++ b/gems/prism-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require 'kettle/drift' + require "kettle/drift" Kettle::Drift.install_tasks rescue LoadError - desc('(stub) kettle:drift:check is unavailable') - task('kettle:drift:check') do + desc("(stub) kettle:drift:check is unavailable") + task("kettle:drift:check") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:update is unavailable') - task('kettle:drift:update') do + desc("(stub) kettle:drift:update is unavailable") + task("kettle:drift:update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:force_update is unavailable') - task('kettle:drift:force_update') do + desc("(stub) kettle:drift:force_update is unavailable") + task("kettle:drift:force_update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift is unavailable') - task('kettle:drift' => 'kettle:drift:update') + desc("(stub) kettle:drift is unavailable") + task("kettle:drift" => "kettle:drift:update") end ### TEMPLATING TASKS diff --git a/gems/prism-merge/lib/prism/merge/version.rb b/gems/prism-merge/lib/prism/merge/version.rb index 29398c390..c5d5bca42 100644 --- a/gems/prism-merge/lib/prism/merge/version.rb +++ b/gems/prism-merge/lib/prism/merge/version.rb @@ -3,7 +3,7 @@ module Prism module Merge module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end From 6734344630020cb5ef1c319ab2f0dab6cc75b938 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:30:04 -0600 Subject: [PATCH 243/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/kramdown-merge/Gemfile.lock | 345 ++++++++++++++++++- gems/prism-merge/Gemfile | 68 ++-- gems/prism-merge/Gemfile.lock | 349 +------------------- gems/prism-merge/Rakefile | 18 +- gems/prism-merge/lib/prism/merge/version.rb | 2 +- 5 files changed, 389 insertions(+), 393 deletions(-) diff --git a/gems/kramdown-merge/Gemfile.lock b/gems/kramdown-merge/Gemfile.lock index d58ffe0fb..61958a3d1 100644 --- a/gems/kramdown-merge/Gemfile.lock +++ b/gems/kramdown-merge/Gemfile.lock @@ -17,13 +17,264 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: markdown-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -35,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -48,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -111,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -139,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -278,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -330,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,24 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -407,31 +685,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -439,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -451,11 +753,15 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 @@ -466,6 +772,8 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -480,10 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -491,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -518,9 +831,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -529,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -542,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/prism-merge/Gemfile b/gems/prism-merge/Gemfile index 47c195382..9e53b9a12 100644 --- a/gems/prism-merge/Gemfile +++ b/gems/prism-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source "https://gem.coop" +source 'https://gem.coop' git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,57 +19,53 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ["~> 1.0", ">= 1.0.8"] -gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ['~> 1.0', '>= 1.0.8'] +gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ruby-merge ] -direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") +direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? if direct_sibling_gems.any? && - (direct_sibling_local || - ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) - direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") - direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) begin nomono_activation_requirements = nomono_requirements - nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) if File.file?(nomono_lockfile) nomono_locked_spec = Bundler::LockfileParser - .new(Bundler.read_file(nomono_lockfile)) - .specs - .find { |spec| spec.name == "nomono" } + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } nomono_locked = nomono_locked_spec && - Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) - if nomono_locked - nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] - end - end - Kernel.send(:gem, "nomono", *nomono_activation_requirements) - require "nomono/bundler" - if direct_sibling_templating && !direct_sibling_local - ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local eval_nomono_gems( gems: direct_sibling_gems, - prefix: "STRUCTUREDMERGE", - path_env: "STRUCTUREDMERGE_DEV", - root: ["src", "my", "structuredmerge"] + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] ) rescue LoadError - warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' ensure if direct_sibling_templating && !direct_sibling_local if direct_sibling_dev_was_set - ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original else - ENV.delete("STRUCTUREDMERGE_DEV") + ENV.delete('STRUCTUREDMERGE_DEV') end end end @@ -333,25 +329,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging -eval_gemfile "gemfiles/modular/debug.gemfile" +eval_gemfile 'gemfiles/modular/debug.gemfile' # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile "gemfiles/modular/coverage.gemfile" +eval_gemfile 'gemfiles/modular/coverage.gemfile' # Linting -eval_gemfile "gemfiles/modular/style.gemfile" +eval_gemfile 'gemfiles/modular/style.gemfile' # Documentation -eval_gemfile "gemfiles/modular/documentation.gemfile" +eval_gemfile 'gemfiles/modular/documentation.gemfile' # Optional -eval_gemfile "gemfiles/modular/optional.gemfile" +eval_gemfile 'gemfiles/modular/optional.gemfile' ### Std Lib Extracted Gems -eval_gemfile "gemfiles/modular/x_std_libs.gemfile" +eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' # See unlocked_deps appraisal for more details on irb inclusion -gem "irb", "~> 1.17" # ruby >= 2.7 +gem 'irb', '~> 1.17' # ruby >= 2.7 diff --git a/gems/prism-merge/Gemfile.lock b/gems/prism-merge/Gemfile.lock index 09fa20d97..fc10185e3 100644 --- a/gems/prism-merge/Gemfile.lock +++ b/gems/prism-merge/Gemfile.lock @@ -17,264 +17,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -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.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +35,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +48,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +111,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +139,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +278,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +330,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -618,7 +361,7 @@ GEM yard yard-relative_markdown_links (0.6.0) nokogiri (>= 1.14.3, < 2) - yard-timekeeper (0.2.3) + yard-timekeeper (0.2.4) version_gem (~> 1.1, >= 1.1.13) yard-yaml (0.2.3) version_gem (~> 1.1, >= 1.1.13) @@ -638,45 +381,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -687,52 +408,30 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0.0) ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +439,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +451,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +478,11 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +490,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -835,8 +521,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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +529,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,27 +542,21 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd yard-relative_markdown_links (0.6.0) sha256=3e5ffa85cbad9bac70bee5421774b190fb25d3bdf489323a5b3534f647d1a70e - yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 + yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/prism-merge/Rakefile b/gems/prism-merge/Rakefile index 3ceda1211..0413b973d 100644 --- a/gems/prism-merge/Rakefile +++ b/gems/prism-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require "kettle/drift" + require 'kettle/drift' Kettle::Drift.install_tasks rescue LoadError - desc("(stub) kettle:drift:check is unavailable") - task("kettle:drift:check") do + desc('(stub) kettle:drift:check is unavailable') + task('kettle:drift:check') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:update is unavailable") - task("kettle:drift:update") do + desc('(stub) kettle:drift:update is unavailable') + task('kettle:drift:update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:force_update is unavailable") - task("kettle:drift:force_update") do + desc('(stub) kettle:drift:force_update is unavailable') + task('kettle:drift:force_update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift is unavailable") - task("kettle:drift" => "kettle:drift:update") + desc('(stub) kettle:drift is unavailable') + task('kettle:drift' => 'kettle:drift:update') end ### TEMPLATING TASKS diff --git a/gems/prism-merge/lib/prism/merge/version.rb b/gems/prism-merge/lib/prism/merge/version.rb index c5d5bca42..29398c390 100644 --- a/gems/prism-merge/lib/prism/merge/version.rb +++ b/gems/prism-merge/lib/prism/merge/version.rb @@ -3,7 +3,7 @@ module Prism module Merge module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end From 34115c941b682cc21fa83daa78da8288d9a66b85 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:32:41 -0600 Subject: [PATCH 244/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/kettle-jem/Gemfile.lock | 17 +- gems/kramdown-merge/Gemfile.lock | 356 ++----------------------------- gems/prism-merge/Gemfile.lock | 345 +++++++++++++++++++++++++++++- gems/smorg-rb/.kettle-drift.lock | 60 ++++-- gems/smorg-rb/Gemfile | 40 ++++ gems/smorg-rb/Gemfile.lock | 307 +++++++------------------- 6 files changed, 522 insertions(+), 603 deletions(-) diff --git a/gems/kettle-jem/Gemfile.lock b/gems/kettle-jem/Gemfile.lock index 7fdf9cf4b..d1fc9e912 100644 --- a/gems/kettle-jem/Gemfile.lock +++ b/gems/kettle-jem/Gemfile.lock @@ -265,6 +265,13 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby + specs: + tree_sitter_language_pack (1.12.5) + rb_sys (>= 0.9, < 0.9.128) + sorbet-runtime (~> 0.5) + GEM remote: https://gem.coop/ specs: @@ -404,6 +411,9 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) + rake-compiler-dock (1.12.0) + rb_sys (0.9.127) + rake-compiler-dock (= 1.12.0) rbs (4.0.3) logger prism (>= 1.6.0) @@ -595,8 +605,6 @@ GEM toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) - sorbet-runtime (~> 0.5) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -695,6 +703,7 @@ DEPENDENCIES stringio (>= 3.0) toml-merge! tree_haver! + tree_sitter_language_pack! turbo_tests2 (~> 3.1, >= 3.1.14) typescript-merge! webrick (~> 1.9) @@ -793,6 +802,8 @@ 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) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 + rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 @@ -860,7 +871,7 @@ CHECKSUMS toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) - tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) sha256=ad6743a373eeac954c1b659b17af3aff1c82918b3ce9c9dc572a7c70ff843cdd + tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 typescript-merge (7.1.0) diff --git a/gems/kramdown-merge/Gemfile.lock b/gems/kramdown-merge/Gemfile.lock index 61958a3d1..9f46700e7 100644 --- a/gems/kramdown-merge/Gemfile.lock +++ b/gems/kramdown-merge/Gemfile.lock @@ -16,265 +16,6 @@ PATH markdown-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +40,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +103,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +131,10 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +274,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +326,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +377,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +402,31 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +434,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,15 +446,11 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 @@ -772,8 +461,6 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +475,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +486,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +513,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +524,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +537,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +552,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/prism-merge/Gemfile.lock b/gems/prism-merge/Gemfile.lock index fc10185e3..d7414de22 100644 --- a/gems/prism-merge/Gemfile.lock +++ b/gems/prism-merge/Gemfile.lock @@ -17,13 +17,264 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: ruby-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + GEM remote: https://gem.coop/ specs: @@ -35,11 +286,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -48,6 +294,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -111,6 +363,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -139,6 +393,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -278,6 +533,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -330,11 +587,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,23 +638,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -408,30 +687,52 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0.0) ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -439,6 +740,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -451,19 +753,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -478,11 +788,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -490,6 +803,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -521,6 +835,8 @@ 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -529,6 +845,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -542,14 +859,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +879,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/smorg-rb/.kettle-drift.lock b/gems/smorg-rb/.kettle-drift.lock index e0e413a78..5725dfce6 100644 --- a/gems/smorg-rb/.kettle-drift.lock +++ b/gems/smorg-rb/.kettle-drift.lock @@ -9,7 +9,8 @@ 205, 245, 285, - 325 + 325, + 365 ] } ], @@ -23,7 +24,8 @@ 216, 256, 296, - 336 + 336, + 376 ] } ], @@ -37,7 +39,8 @@ 206, 246, 286, - 326 + 326, + 366 ] } ], @@ -51,7 +54,8 @@ 218, 258, 298, - 338 + 338, + 378 ] } ], @@ -65,7 +69,8 @@ 221, 261, 301, - 341 + 341, + 381 ] } ], @@ -79,7 +84,8 @@ 207, 247, 287, - 327 + 327, + 367 ] } ], @@ -94,7 +100,8 @@ 225, 265, 305, - 345 + 345, + 385 ] } ], @@ -108,7 +115,8 @@ 226, 266, 306, - 346 + 346, + 386 ] } ], @@ -123,7 +131,8 @@ 212, 252, 292, - 332 + 332, + 372 ] } ], @@ -137,7 +146,8 @@ 235, 275, 315, - 355 + 355, + 395 ] } ], @@ -152,7 +162,8 @@ 204, 244, 284, - 324 + 324, + 364 ] } ], @@ -167,7 +178,8 @@ 234, 274, 314, - 354 + 354, + 394 ] } ], @@ -181,7 +193,8 @@ 210, 250, 290, - 330 + 330, + 370 ] } ], @@ -196,7 +209,8 @@ 217, 257, 297, - 337 + 337, + 377 ] } ], @@ -211,7 +225,8 @@ 213, 253, 293, - 333 + 333, + 373 ] } ], @@ -225,7 +240,8 @@ 211, 251, 291, - 331 + 331, + 371 ] } ], @@ -239,7 +255,8 @@ 228, 268, 308, - 348 + 348, + 388 ] } ], @@ -253,7 +270,8 @@ 227, 267, 307, - 347 + 347, + 387 ] } ], @@ -267,7 +285,8 @@ 222, 262, 302, - 342 + 342, + 382 ] } ], @@ -281,7 +300,8 @@ 231, 271, 311, - 351 + 351, + 391 ] } ], diff --git a/gems/smorg-rb/Gemfile b/gems/smorg-rb/Gemfile index 74b67070a..d28b698a9 100644 --- a/gems/smorg-rb/Gemfile +++ b/gems/smorg-rb/Gemfile @@ -357,6 +357,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/smorg-rb/Gemfile.lock b/gems/smorg-rb/Gemfile.lock index 0260b354f..927369d47 100644 --- a/gems/smorg-rb/Gemfile.lock +++ b/gems/smorg-rb/Gemfile.lock @@ -1,13 +1,3 @@ -GIT - remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a - branch: fix/ruby-parser-api-methods - glob: packages/ruby/*.gemspec - specs: - tree_sitter_language_pack (1.12.5) - rb_sys (>= 0.9, < 0.9.128) - sorbet-runtime (~> 0.5) - PATH remote: . specs: @@ -22,31 +12,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: ast-merge-git (7.1.0) ast-merge (= 7.1.0) @@ -54,7 +20,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -63,53 +29,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge specs: go-merge (7.1.0) ast-merge (= 7.1.0) @@ -117,7 +37,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: json-merge (7.1.0) ast-merge (= 7.1.0) @@ -125,7 +45,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem specs: kettle-jem (7.1.0) addressable (>= 2.8, < 3) @@ -154,23 +74,7 @@ PATH yaml-merge (= 7.1.0) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) markdown-merge (= 7.1.0) @@ -178,15 +82,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: plain-merge (7.1.0) ast-merge (= 7.1.0) @@ -194,86 +90,11 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) + tree_sitter_language_pack (1.12.5) + rb_sys (>= 0.9, < 0.9.128) + sorbet-runtime (~> 0.5) GEM remote: https://gem.coop/ @@ -286,13 +107,33 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) bundler (>= 1.2.0) thor (~> 1.0) citrus (3.0.2) + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) cmdparse (3.0.7) commonmarker (2.9.0-aarch64-linux) commonmarker (2.9.0-aarch64-linux-musl) @@ -300,6 +141,10 @@ GEM commonmarker (2.9.0-x86_64-darwin) commonmarker (2.9.0-x86_64-linux) commonmarker (2.9.0-x86_64-linux-musl) + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -309,6 +154,10 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docile (1.4.1) + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -363,8 +212,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -388,11 +235,19 @@ GEM turbo_tests2 (~> 3.1, >= 3.1.12) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) 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.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) @@ -421,9 +276,18 @@ GEM prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) psych (5.4.0) date stringio + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -435,6 +299,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) rdoc (6.17.0) erb psych (>= 4.0.0) @@ -530,6 +399,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -587,11 +460,18 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -606,6 +486,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.13) + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) yard (0.9.45) yard-fence (0.9.6) rdoc (>= 6.11, < 8) @@ -618,7 +502,7 @@ GEM yard yard-relative_markdown_links (0.6.0) nokogiri (>= 1.14.3, < 2) - yard-timekeeper (0.2.3) + yard-timekeeper (0.2.4) version_gem (~> 1.1, >= 1.1.13) yard-yaml (0.2.3) version_gem (~> 1.1, >= 1.1.13) @@ -638,20 +522,11 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) @@ -659,24 +534,17 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,26 +553,19 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -716,12 +577,10 @@ CHECKSUMS ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) @@ -760,7 +619,6 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad @@ -788,7 +646,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.0) plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -835,7 +692,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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -859,14 +715,12 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -876,10 +730,9 @@ CHECKSUMS yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd yard-relative_markdown_links (0.6.0) sha256=3e5ffa85cbad9bac70bee5421774b190fb25d3bdf489323a5b3534f647d1a70e - yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 + yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 7fee1fed2178b503a4cb1a7873859b51c928b00c Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:34:10 -0600 Subject: [PATCH 245/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= 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/Gemfile.lock | 199 +++--------- gems/kettle-jem/Rakefile | 2 +- .../gemfiles/modular/coverage.gemfile | 2 +- .../gemfiles/modular/coverage_local.gemfile | 8 + .../gemfiles/modular/documentation.gemfile | 6 +- .../modular/documentation_local.gemfile | 8 + .../gemfiles/modular/erb/r3/v5.0.gemfile | 2 +- .../gemfiles/modular/erb/r4/v5.0.gemfile | 2 +- .../kettle-jem/gemfiles/modular/style.gemfile | 6 +- .../gemfiles/modular/style_local.gemfile | 8 + .../gemfiles/modular/templating_local.gemfile | 8 + gems/kettle-jem/kettle-jem.gemspec | 4 +- gems/smorg-rb/Gemfile.lock | 292 +++++++++++++----- 14 files changed, 300 insertions(+), 249 deletions(-) diff --git a/gems/kettle-jem/.rubocop_gradual.lock b/gems/kettle-jem/.rubocop_gradual.lock index b09c227c5..0334d6fb6 100644 --- a/gems/kettle-jem/.rubocop_gradual.lock +++ b/gems/kettle-jem/.rubocop_gradual.lock @@ -1,5 +1,5 @@ { - "kettle-jem.gemspec:1783780734": [ + "kettle-jem.gemspec:1742431759": [ [19, 32, 10, "Gemspec/RequiredRubyVersion: `required_ruby_version` and `TargetRubyVersion` (3.2, which may be specified in .rubocop.yml) should be equal.", 3888670706], [90, 3, 70, "Gemspec/DependencyVersion: Dependency version specification is required.", 4023754366], [91, 3, 65, "Gemspec/DependencyVersion: Dependency version specification is required.", 1638532368], diff --git a/gems/kettle-jem/Gemfile.lock b/gems/kettle-jem/Gemfile.lock index d1fc9e912..a6f8ed35b 100644 --- a/gems/kettle-jem/Gemfile.lock +++ b/gems/kettle-jem/Gemfile.lock @@ -28,7 +28,7 @@ PATH yaml-merge (= 7.1.0) 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.0) ast-crispr (= 7.1.0) @@ -36,7 +36,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-crispr (= 7.1.0) @@ -44,23 +44,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -69,14 +53,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge specs: bash-merge (7.1.0) ast-merge (= 7.1.0) @@ -84,14 +61,7 @@ PATH version_gem (~> 1.1, >= 1.1.14) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge specs: citrus-toml-merge (7.1.0) toml-merge (= 7.1.0) @@ -99,7 +69,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) commonmarker (~> 2.2) @@ -107,7 +77,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-merge (= 7.1.0) @@ -115,15 +85,7 @@ PATH version_gem (~> 1.1, >= 1.1.14) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: json-merge (7.1.0) ast-merge (= 7.1.0) @@ -131,7 +93,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) kramdown (~> 2.5) @@ -139,7 +101,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-merge (= 7.1.0) @@ -147,7 +109,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) markdown-merge (= 7.1.0) @@ -155,23 +117,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) prism (~> 1.6) @@ -179,7 +125,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-merge (= 7.1.0) @@ -188,7 +134,7 @@ PATH yaml-merge (= 7.1.0) 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.0) ast-merge (= 7.1.0) @@ -197,7 +143,7 @@ PATH version_gem (~> 1.1, >= 1.1.14) 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.0) ast-merge (= 7.1.0) @@ -205,28 +151,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: toml-merge (7.1.0) ast-merge (= 7.1.0) @@ -234,7 +159,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) citrus (~> 3.0) @@ -243,35 +168,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: yaml-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby - specs: - tree_sitter_language_pack (1.12.5) - rb_sys (>= 0.9, < 0.9.128) - sorbet-runtime (~> 0.5) - GEM remote: https://gem.coop/ specs: @@ -287,6 +190,10 @@ GEM rubocop (>= 1.0) version_gem (~> 1.1, >= 1.1.14) ast (2.4.3) + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -359,8 +266,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (3.0.1) simplecov (>= 1.0) @@ -411,9 +316,6 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) - rake-compiler-dock (1.12.0) - rb_sys (0.9.127) - rake-compiler-dock (= 1.12.0) rbs (4.0.3) logger prism (>= 1.6.0) @@ -600,11 +502,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) + sorbet-runtime (~> 0.5) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -632,7 +534,7 @@ GEM yard yard-relative_markdown_links (0.6.0) nokogiri (>= 1.14.3, < 2) - yard-timekeeper (0.2.3) + yard-timekeeper (0.2.4) version_gem (~> 1.1, >= 1.1.13) yard-yaml (0.2.3) version_gem (~> 1.1, >= 1.1.13) @@ -644,42 +546,34 @@ PLATFORMS x86_64-linux DEPENDENCIES - appraisal2 (~> 3.1, >= 3.1.4) + appraisal2 (~> 3.2, >= 3.2.0) appraisal2-rubocop (~> 1.0, >= 1.0.0) - 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.4) + erb (~> 6.0, >= 6.0.5) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) - go-merge! irb (~> 1.17) json-merge! - kettle-drift (~> 1.0, >= 1.0.5) kettle-jem! - kettle-soup-cover (~> 3.0, >= 3.0.0) + kettle-soup-cover (~> 3.0, >= 3.0.1) kettle-test (~> 2.0, >= 2.0.11) - kramdown (~> 2.5, >= 2.5.1) + kramdown (~> 2.5, >= 2.5.2) kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! prism-merge! psych-merge! rake (~> 13.0) @@ -689,33 +583,28 @@ DEPENDENCIES 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.4) - rubocop-minitest (~> 0.38, >= 0.38.1) + rubocop-lts-rspec (~> 1.0, >= 1.0.5) + rubocop-minitest (~> 0.39, >= 0.39.1) rubocop-on-rbs (~> 2.0, >= 2.0.0) rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-ruby3_2 (~> 3.0, >= 3.0.6) ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! - standard (~> 1.54, >= 1.54.0) + standard (~> 1.56, >= 1.56.0) stone_checksums (~> 1.0, >= 1.0.6) stringio (>= 3.0) toml-merge! tree_haver! - tree_sitter_language_pack! - turbo_tests2 (~> 3.1, >= 3.1.14) - typescript-merge! + turbo_tests2 (~> 3.2, >= 3.2.0) webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.3) yaml-merge! - yard (~> 0.9, >= 0.9.44) + yard (~> 0.9, >= 0.9.45) yard-fence (~> 0.9, >= 0.9.6) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) - yard-timekeeper (~> 0.2, >= 0.2.3) + yard-timekeeper (~> 0.2, >= 0.2.4) yard-yaml (~> 0.2, >= 0.2.3) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -727,13 +616,10 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 @@ -760,14 +646,12 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (3.0.1) sha256=83ebe2aa099f15781e4796b5faef0dc2720fba48f6b9d34808670b91baf271e4 @@ -790,8 +674,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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 @@ -802,8 +684,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) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 - rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 @@ -844,7 +724,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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 @@ -852,7 +731,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.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -867,14 +745,12 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) - tree_sitter_language_pack (1.12.5) + tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) sha256=ad6743a373eeac954c1b659b17af3aff1c82918b3ce9c9dc572a7c70ff843cdd tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -885,10 +761,9 @@ CHECKSUMS yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd yard-relative_markdown_links (0.6.0) sha256=3e5ffa85cbad9bac70bee5421774b190fb25d3bdf489323a5b3534f647d1a70e - yard-timekeeper (0.2.3) sha256=849a3e74a0484b1e0b5209cf86823e418b3091e21f4f143c141d38e1cc262034 + yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/kettle-jem/Rakefile b/gems/kettle-jem/Rakefile index 38324131a..c9b733eba 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.0 - 2026-07-18 +# kettle-jem Rakefile v7.1.0 - 2026-07-19 # Ruby 2.3 (Safe Navigation) or higher required # # See LICENSE.md for license information. diff --git a/gems/kettle-jem/gemfiles/modular/coverage.gemfile b/gems/kettle-jem/gemfiles/modular/coverage.gemfile index bcc758e2f..ab859db48 100644 --- a/gems/kettle-jem/gemfiles/modular/coverage.gemfile +++ b/gems/kettle-jem/gemfiles/modular/coverage.gemfile @@ -7,7 +7,7 @@ if ENV.fetch("KETTLE_RB_DEV", "false").casecmp("false").zero? # Coverage (remote/released) platform :mri do - gem "kettle-soup-cover", "~> 3.0", ">= 3.0.0", require: false + gem "kettle-soup-cover", "~> 3.0", ">= 3.0.1", require: false end else eval_gemfile "coverage_local.gemfile" diff --git a/gems/kettle-jem/gemfiles/modular/coverage_local.gemfile b/gems/kettle-jem/gemfiles/modular/coverage_local.gemfile index 091382217..458c872ec 100644 --- a/gems/kettle-jem/gemfiles/modular/coverage_local.gemfile +++ b/gems/kettle-jem/gemfiles/modular/coverage_local.gemfile @@ -3,6 +3,14 @@ # Local path overrides for development. # Loaded by the associated non-local gemfile when KETTLE_RB_DEV != "false". +# Bootstrapping nomono here cannot rely on a plain `gem "nomono", ...` line. +# Bundler records that dependency during Gemfile evaluation, but it does not +# activate that exact version before the immediate `require "nomono/bundler"`. +# If multiple compatible nomono versions are installed, RubyGems may activate +# the newest installed version while Gemfile.lock pins an older compatible one; +# Bundler then aborts with "already activated nomono X, but your Gemfile +# requires nomono Y". Prefer the locked compatible version when present, then +# activate it explicitly before requiring the Bundler DSL extension used below. nomono_activation_requirements = ["~> 1.0", ">= 1.0.8"] nomono_lockfile = File.expand_path("../../Gemfile.lock", __dir__) if File.file?(nomono_lockfile) diff --git a/gems/kettle-jem/gemfiles/modular/documentation.gemfile b/gems/kettle-jem/gemfiles/modular/documentation.gemfile index 1f30bb2e8..d8215416e 100644 --- a/gems/kettle-jem/gemfiles/modular/documentation.gemfile +++ b/gems/kettle-jem/gemfiles/modular/documentation.gemfile @@ -7,16 +7,16 @@ # # Documentation -gem "kramdown", "~> 2.5", ">= 2.5.1", require: false # Ruby >= 2.5 +gem "kramdown", "~> 2.5", ">= 2.5.2", require: false # Ruby >= 2.5 gem "kramdown-parser-gfm", "~> 1.1", require: false # Ruby >= 2.3 gem "yaml-converter", "~> 0.2", ">= 0.2.3", require: false # Ruby >= 3.2 -gem "yard", "~> 0.9", ">= 0.9.44", require: false +gem "yard", "~> 0.9", ">= 0.9.45", require: false gem "yard-junk", "~> 0.1", ">= 0.1.0", require: false # Ruby >= 3.1 gem "yard-relative_markdown_links", "~> 0.6", require: false if ENV.fetch("GALTZO_FLOSS_DEV", "false").casecmp("false").zero? gem "yard-fence", "~> 0.9", ">= 0.9.6", require: false # Ruby >= 3.2 - gem "yard-timekeeper", "~> 0.2", ">= 0.2.3", require: false + gem "yard-timekeeper", "~> 0.2", ">= 0.2.4", require: false gem "yard-yaml", "~> 0.2", ">= 0.2.3", require: false else eval_gemfile "documentation_local.gemfile" diff --git a/gems/kettle-jem/gemfiles/modular/documentation_local.gemfile b/gems/kettle-jem/gemfiles/modular/documentation_local.gemfile index 593ab7a2d..e54064b14 100644 --- a/gems/kettle-jem/gemfiles/modular/documentation_local.gemfile +++ b/gems/kettle-jem/gemfiles/modular/documentation_local.gemfile @@ -3,6 +3,14 @@ # Local path overrides for development. # Loaded by the associated non-local gemfile when GALTZO_FLOSS_DEV != "false". +# Bootstrapping nomono here cannot rely on a plain `gem "nomono", ...` line. +# Bundler records that dependency during Gemfile evaluation, but it does not +# activate that exact version before the immediate `require "nomono/bundler"`. +# If multiple compatible nomono versions are installed, RubyGems may activate +# the newest installed version while Gemfile.lock pins an older compatible one; +# Bundler then aborts with "already activated nomono X, but your Gemfile +# requires nomono Y". Prefer the locked compatible version when present, then +# activate it explicitly before requiring the Bundler DSL extension used below. nomono_activation_requirements = ["~> 1.0", ">= 1.0.8"] nomono_lockfile = File.expand_path("../../Gemfile.lock", __dir__) if File.file?(nomono_lockfile) diff --git a/gems/kettle-jem/gemfiles/modular/erb/r3/v5.0.gemfile b/gems/kettle-jem/gemfiles/modular/erb/r3/v5.0.gemfile index 765396835..5bde0e077 100644 --- a/gems/kettle-jem/gemfiles/modular/erb/r3/v5.0.gemfile +++ b/gems/kettle-jem/gemfiles/modular/erb/r3/v5.0.gemfile @@ -1 +1 @@ -gem "erb", "~> 6.0", ">= 6.0.4" # ruby >= 3.2.0 +gem "erb", "~> 6.0", ">= 6.0.5" # ruby >= 3.2.0 diff --git a/gems/kettle-jem/gemfiles/modular/erb/r4/v5.0.gemfile b/gems/kettle-jem/gemfiles/modular/erb/r4/v5.0.gemfile index 765396835..5bde0e077 100644 --- a/gems/kettle-jem/gemfiles/modular/erb/r4/v5.0.gemfile +++ b/gems/kettle-jem/gemfiles/modular/erb/r4/v5.0.gemfile @@ -1 +1 @@ -gem "erb", "~> 6.0", ">= 6.0.4" # ruby >= 3.2.0 +gem "erb", "~> 6.0", ">= 6.0.5" # ruby >= 3.2.0 diff --git a/gems/kettle-jem/gemfiles/modular/style.gemfile b/gems/kettle-jem/gemfiles/modular/style.gemfile index ea67969bd..f027dae4d 100644 --- a/gems/kettle-jem/gemfiles/modular/style.gemfile +++ b/gems/kettle-jem/gemfiles/modular/style.gemfile @@ -14,16 +14,16 @@ gem "reek", "~> 6.5", ">= 6.5.0" platform :mri do gem "appraisal2-rubocop", "~> 1.0", ">= 1.0.0", require: false gem "rubocop-gradual", "~> 0.4", ">= 0.4.0" - gem "rubocop-minitest", "~> 0.38", ">= 0.38.1" + gem "rubocop-minitest", "~> 0.39", ">= 0.39.1" gem "rubocop-on-rbs", "~> 2.0", ">= 2.0.0" # ruby >= 3.2.0 # gem "rubocop", "~> 1.73", ">= 1.73.2" # constrained by standard gem "rubocop-packaging", "~> 0.6", ">= 0.6.0" - gem "standard", "~> 1.54", ">= 1.54.0" + gem "standard", "~> 1.56", ">= 1.56.0" if ENV.fetch("RUBOCOP_LTS_LOCAL", "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.4" unless declared_gems.include?("rubocop-lts-rspec") + 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") else eval_gemfile("style_local.gemfile") diff --git a/gems/kettle-jem/gemfiles/modular/style_local.gemfile b/gems/kettle-jem/gemfiles/modular/style_local.gemfile index 0bc2edde3..64abccc9b 100644 --- a/gems/kettle-jem/gemfiles/modular/style_local.gemfile +++ b/gems/kettle-jem/gemfiles/modular/style_local.gemfile @@ -6,6 +6,14 @@ # Local path overrides for development. # Loaded by the associated non-local gemfile when RUBOCOP_LTS_LOCAL != "false". +# Bootstrapping nomono here cannot rely on a plain `gem "nomono", ...` line. +# Bundler records that dependency during Gemfile evaluation, but it does not +# activate that exact version before the immediate `require "nomono/bundler"`. +# If multiple compatible nomono versions are installed, RubyGems may activate +# the newest installed version while Gemfile.lock pins an older compatible one; +# Bundler then aborts with "already activated nomono X, but your Gemfile +# requires nomono Y". Prefer the locked compatible version when present, then +# activate it explicitly before requiring the Bundler DSL extension used below. nomono_activation_requirements = ["~> 1.0", ">= 1.0.8"] nomono_lockfile = File.expand_path("../../Gemfile.lock", __dir__) if File.file?(nomono_lockfile) diff --git a/gems/kettle-jem/gemfiles/modular/templating_local.gemfile b/gems/kettle-jem/gemfiles/modular/templating_local.gemfile index 9260d7aba..632a5c17d 100644 --- a/gems/kettle-jem/gemfiles/modular/templating_local.gemfile +++ b/gems/kettle-jem/gemfiles/modular/templating_local.gemfile @@ -4,6 +4,14 @@ # Loaded by the associated non-local gemfile when STRUCTUREDMERGE_DEV or KETTLE_RB_DEV # is not "false". +# Bootstrapping nomono here cannot rely on a plain `gem "nomono", ...` line. +# Bundler records that dependency during Gemfile evaluation, but it does not +# activate that exact version before the immediate `require "nomono/bundler"`. +# If multiple compatible nomono versions are installed, RubyGems may activate +# the newest installed version while Gemfile.lock pins an older compatible one; +# Bundler then aborts with "already activated nomono X, but your Gemfile +# requires nomono Y". Prefer the locked compatible version when present, then +# activate it explicitly before requiring the Bundler DSL extension used below. nomono_activation_requirements = ["~> 1.0", ">= 1.0.8"] nomono_lockfile = File.expand_path("../../Gemfile.lock", __dir__) if File.file?(nomono_lockfile) diff --git a/gems/kettle-jem/kettle-jem.gemspec b/gems/kettle-jem/kettle-jem.gemspec index 3b7921be1..7164ddcef 100644 --- a/gems/kettle-jem/kettle-jem.gemspec +++ b/gems/kettle-jem/kettle-jem.gemspec @@ -134,9 +134,9 @@ Gem::Specification.new do |spec| spec.add_development_dependency("require_bench", "~> 1.0", ">= 1.0.4") # ruby >= 2.2.0 # Testing - spec.add_development_dependency("appraisal2", "~> 3.1", ">= 3.1.4") # ruby >= 1.8.7, for testing against multiple versions of dependencies + spec.add_development_dependency("appraisal2", "~> 3.2", ">= 3.2.0") # ruby >= 1.8.7, for testing against multiple versions of dependencies spec.add_development_dependency("kettle-test", "~> 2.0", ">= 2.0.11") # ruby >= 4.0.0 - spec.add_development_dependency("turbo_tests2", "~> 3.1", ">= 3.1.14") # ruby >= 2.4.0, default kettle-test runner + spec.add_development_dependency("turbo_tests2", "~> 3.2", ">= 3.2.0") # ruby >= 2.4.0, default kettle-test runner # Releasing spec.add_development_dependency("ruby-progressbar", "~> 1.13") # ruby >= 0 diff --git a/gems/smorg-rb/Gemfile.lock b/gems/smorg-rb/Gemfile.lock index 927369d47..a2a7705fe 100644 --- a/gems/smorg-rb/Gemfile.lock +++ b/gems/smorg-rb/Gemfile.lock @@ -12,7 +12,31 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: ast-merge-git (7.1.0) ast-merge (= 7.1.0) @@ -20,7 +44,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) benchmark @@ -29,7 +53,53 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge specs: go-merge (7.1.0) ast-merge (= 7.1.0) @@ -37,7 +107,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-merge (= 7.1.0) @@ -45,7 +115,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem specs: kettle-jem (7.1.0) addressable (>= 2.8, < 3) @@ -74,7 +144,23 @@ PATH yaml-merge (= 7.1.0) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: markly-merge (7.1.0) markdown-merge (= 7.1.0) @@ -82,13 +168,103 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: plain-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -107,33 +283,13 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) bundler (>= 1.2.0) thor (~> 1.0) citrus (3.0.2) - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) cmdparse (3.0.7) commonmarker (2.9.0-aarch64-linux) commonmarker (2.9.0-aarch64-linux-musl) @@ -141,10 +297,6 @@ GEM commonmarker (2.9.0-x86_64-darwin) commonmarker (2.9.0-x86_64-linux) commonmarker (2.9.0-x86_64-linux-musl) - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -154,10 +306,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docile (1.4.1) - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -212,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -235,19 +385,11 @@ GEM turbo_tests2 (~> 3.1, >= 3.1.12) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) 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.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) @@ -276,18 +418,9 @@ GEM prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) psych (5.4.0) date stringio - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -299,11 +432,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) rdoc (6.17.0) erb psych (>= 4.0.0) @@ -399,10 +527,6 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -460,18 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -486,10 +603,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.13) - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) yard (0.9.45) yard-fence (0.9.6) rdoc (>= 6.11, < 8) @@ -522,11 +635,20 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) @@ -534,17 +656,24 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -553,19 +682,26 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -577,10 +713,12 @@ CHECKSUMS ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) @@ -619,6 +757,7 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad @@ -646,6 +785,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.0) plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -692,6 +832,7 @@ 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -715,12 +856,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -733,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 2e9dc71c71b247de44acaed5459ac300d94bcf00 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:34:33 -0600 Subject: [PATCH 246/347] Lock kettle-jem templating to vendored TSLP --- gems/kettle-jem/Gemfile.lock | 175 ++++++++++++++++++++++++++++++----- 1 file changed, 150 insertions(+), 25 deletions(-) diff --git a/gems/kettle-jem/Gemfile.lock b/gems/kettle-jem/Gemfile.lock index a6f8ed35b..982d196a0 100644 --- a/gems/kettle-jem/Gemfile.lock +++ b/gems/kettle-jem/Gemfile.lock @@ -28,7 +28,7 @@ PATH yaml-merge (= 7.1.0) 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.0) ast-crispr (= 7.1.0) @@ -36,7 +36,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-crispr (= 7.1.0) @@ -44,7 +44,23 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -53,7 +69,14 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge specs: bash-merge (7.1.0) ast-merge (= 7.1.0) @@ -61,7 +84,14 @@ PATH version_gem (~> 1.1, >= 1.1.14) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge specs: citrus-toml-merge (7.1.0) toml-merge (= 7.1.0) @@ -69,7 +99,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) commonmarker (~> 2.2) @@ -77,7 +107,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-merge (= 7.1.0) @@ -85,7 +115,15 @@ PATH version_gem (~> 1.1, >= 1.1.14) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: json-merge (7.1.0) ast-merge (= 7.1.0) @@ -93,7 +131,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) kramdown (~> 2.5) @@ -101,7 +139,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-merge (= 7.1.0) @@ -109,7 +147,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) markdown-merge (= 7.1.0) @@ -117,7 +155,23 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge specs: prism-merge (7.1.0) prism (~> 1.6) @@ -125,7 +179,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-merge (= 7.1.0) @@ -134,7 +188,7 @@ PATH yaml-merge (= 7.1.0) 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.0) ast-merge (= 7.1.0) @@ -143,7 +197,7 @@ PATH version_gem (~> 1.1, >= 1.1.14) 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.0) ast-merge (= 7.1.0) @@ -151,7 +205,28 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: toml-merge (7.1.0) ast-merge (= 7.1.0) @@ -159,7 +234,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) citrus (~> 3.0) @@ -168,13 +243,35 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: yaml-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby + specs: + tree_sitter_language_pack (1.12.5) + rb_sys (>= 0.9, < 0.9.128) + sorbet-runtime (~> 0.5) + GEM remote: https://gem.coop/ specs: @@ -190,10 +287,6 @@ GEM rubocop (>= 1.0) version_gem (~> 1.1, >= 1.1.14) ast (2.4.3) - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -266,6 +359,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (3.0.1) simplecov (>= 1.0) @@ -316,6 +411,9 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) + rake-compiler-dock (1.12.0) + rb_sys (0.9.127) + rake-compiler-dock (= 1.12.0) rbs (4.0.3) logger prism (>= 1.6.0) @@ -502,11 +600,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) - sorbet-runtime (~> 0.5) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -548,11 +646,15 @@ PLATFORMS DEPENDENCIES appraisal2 (~> 3.2, >= 3.2.0) appraisal2-rubocop (~> 1.0, >= 1.0.0) + 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! @@ -562,8 +664,10 @@ DEPENDENCIES erb (~> 6.0, >= 6.0.5) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) + go-merge! irb (~> 1.17) json-merge! + kettle-drift (~> 1.0, >= 1.0.5) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.1) kettle-test (~> 2.0, >= 2.0.11) @@ -574,6 +678,8 @@ DEPENDENCIES markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! prism-merge! psych-merge! rake (~> 13.0) @@ -590,12 +696,16 @@ 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.6) stringio (>= 3.0) toml-merge! tree_haver! + tree_sitter_language_pack! turbo_tests2 (~> 3.2, >= 3.2.0) + typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.3) yaml-merge! @@ -605,6 +715,7 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.4) yard-yaml (~> 0.2, >= 0.2.3) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -616,10 +727,13 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 @@ -646,12 +760,14 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (3.0.1) sha256=83ebe2aa099f15781e4796b5faef0dc2720fba48f6b9d34808670b91baf271e4 @@ -674,6 +790,8 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 @@ -684,6 +802,8 @@ 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) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 + rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 @@ -724,6 +844,7 @@ 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 @@ -731,6 +852,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.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -745,12 +867,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) - tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) sha256=ad6743a373eeac954c1b659b17af3aff1c82918b3ce9c9dc572a7c70ff843cdd + tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -764,6 +888,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 351921de7dc0954d9104e0e6d7a0c8fd21443609 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:35:17 -0600 Subject: [PATCH 247/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-crispr-ruby-prism/.kettle-drift.lock | 60 ++- gems/ast-crispr-ruby-prism/Gemfile | 40 ++ gems/ast-crispr-ruby-prism/Gemfile.lock | 345 +------------ gems/ast-crispr/.kettle-drift.lock | 60 ++- gems/ast-crispr/.rubocop_gradual.lock | 213 -------- gems/ast-crispr/Gemfile | 40 ++ gems/ast-crispr/Gemfile.lock | 418 ++++++++++++++-- gems/ast-merge/Gemfile.lock | 17 +- gems/tree_haver/.rubocop_gradual.lock | 467 ----------------- gems/tree_haver/Gemfile | 22 +- gems/tree_haver/Gemfile.lock | 468 +++++++++++++----- gems/tree_haver/Rakefile | 18 +- gems/tree_haver/bin/yard | 2 +- gems/tree_haver/lib/tree_haver/version.rb | 2 +- 14 files changed, 908 insertions(+), 1264 deletions(-) delete mode 100644 gems/ast-crispr/.rubocop_gradual.lock delete mode 100644 gems/tree_haver/.rubocop_gradual.lock diff --git a/gems/ast-crispr-ruby-prism/.kettle-drift.lock b/gems/ast-crispr-ruby-prism/.kettle-drift.lock index 5b373dd8d..309d406e1 100644 --- a/gems/ast-crispr-ruby-prism/.kettle-drift.lock +++ b/gems/ast-crispr-ruby-prism/.kettle-drift.lock @@ -8,7 +8,8 @@ 159, 199, 239, - 279 + 279, + 319 ] } ], @@ -21,7 +22,8 @@ 170, 210, 250, - 290 + 290, + 330 ] } ], @@ -34,7 +36,8 @@ 160, 200, 240, - 280 + 280, + 320 ] } ], @@ -47,7 +50,8 @@ 172, 212, 252, - 292 + 292, + 332 ] } ], @@ -60,7 +64,8 @@ 175, 215, 255, - 295 + 295, + 335 ] } ], @@ -73,7 +78,8 @@ 161, 201, 241, - 281 + 281, + 321 ] } ], @@ -87,7 +93,8 @@ 179, 219, 259, - 299 + 299, + 339 ] } ], @@ -100,7 +107,8 @@ 180, 220, 260, - 300 + 300, + 340 ] } ], @@ -114,7 +122,8 @@ 166, 206, 246, - 286 + 286, + 326 ] } ], @@ -127,7 +136,8 @@ 189, 229, 269, - 309 + 309, + 349 ] } ], @@ -141,7 +151,8 @@ 158, 198, 238, - 278 + 278, + 318 ] } ], @@ -155,7 +166,8 @@ 188, 228, 268, - 308 + 308, + 348 ] } ], @@ -168,7 +180,8 @@ 164, 204, 244, - 284 + 284, + 324 ] } ], @@ -182,7 +195,8 @@ 171, 211, 251, - 291 + 291, + 331 ] } ], @@ -196,7 +210,8 @@ 167, 207, 247, - 287 + 287, + 327 ] } ], @@ -209,7 +224,8 @@ 165, 205, 245, - 285 + 285, + 325 ] } ], @@ -222,7 +238,8 @@ 182, 222, 262, - 302 + 302, + 342 ] } ], @@ -235,7 +252,8 @@ 181, 221, 261, - 301 + 301, + 341 ] } ], @@ -248,7 +266,8 @@ 176, 216, 256, - 296 + 296, + 336 ] } ], @@ -261,7 +280,8 @@ 185, 225, 265, - 305 + 305, + 345 ] } ], diff --git a/gems/ast-crispr-ruby-prism/Gemfile b/gems/ast-crispr-ruby-prism/Gemfile index 86cb14176..4b95af676 100644 --- a/gems/ast-crispr-ruby-prism/Gemfile +++ b/gems/ast-crispr-ruby-prism/Gemfile @@ -311,6 +311,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/ast-crispr-ruby-prism/Gemfile.lock b/gems/ast-crispr-ruby-prism/Gemfile.lock index 753787e1c..f71a1ee42 100644 --- a/gems/ast-crispr-ruby-prism/Gemfile.lock +++ b/gems/ast-crispr-ruby-prism/Gemfile.lock @@ -1,13 +1,3 @@ -GIT - remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a - branch: fix/ruby-parser-api-methods - glob: packages/ruby/*.gemspec - specs: - tree_sitter_language_pack (1.12.5) - rb_sys (>= 0.9, < 0.9.128) - sorbet-runtime (~> 0.5) - PATH remote: . specs: @@ -17,15 +7,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) ast-merge (= 7.1.0) @@ -33,247 +15,11 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) + tree_sitter_language_pack (1.12.5) + rb_sys (>= 0.9, < 0.9.128) + sorbet-runtime (~> 0.5) GEM remote: https://gem.coop/ @@ -286,6 +32,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,8 +45,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -359,8 +108,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -389,7 +136,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-x86_64-linux-gnu) racc (~> 1.4) @@ -575,11 +321,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -622,44 +368,23 @@ DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -668,26 +393,18 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -695,23 +412,14 @@ CHECKSUMS appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -719,7 +427,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -732,27 +439,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-x86_64-linux-gnu) sha256=379fae440b28915e3f19d752ce2dcf8465ed2b2fbefd2a7ca0dd497bc981a06a nokogiri (1.19.4-x86_64-linux-musl) sha256=17dfb7c1fa194ae02fbf7c51a7afc8d278045ab3fdacfd86f91d02d7b274470b @@ -763,14 +462,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -778,7 +473,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -806,11 +500,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -820,7 +512,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -834,19 +525,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -854,7 +540,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ast-crispr/.kettle-drift.lock b/gems/ast-crispr/.kettle-drift.lock index 5b373dd8d..309d406e1 100644 --- a/gems/ast-crispr/.kettle-drift.lock +++ b/gems/ast-crispr/.kettle-drift.lock @@ -8,7 +8,8 @@ 159, 199, 239, - 279 + 279, + 319 ] } ], @@ -21,7 +22,8 @@ 170, 210, 250, - 290 + 290, + 330 ] } ], @@ -34,7 +36,8 @@ 160, 200, 240, - 280 + 280, + 320 ] } ], @@ -47,7 +50,8 @@ 172, 212, 252, - 292 + 292, + 332 ] } ], @@ -60,7 +64,8 @@ 175, 215, 255, - 295 + 295, + 335 ] } ], @@ -73,7 +78,8 @@ 161, 201, 241, - 281 + 281, + 321 ] } ], @@ -87,7 +93,8 @@ 179, 219, 259, - 299 + 299, + 339 ] } ], @@ -100,7 +107,8 @@ 180, 220, 260, - 300 + 300, + 340 ] } ], @@ -114,7 +122,8 @@ 166, 206, 246, - 286 + 286, + 326 ] } ], @@ -127,7 +136,8 @@ 189, 229, 269, - 309 + 309, + 349 ] } ], @@ -141,7 +151,8 @@ 158, 198, 238, - 278 + 278, + 318 ] } ], @@ -155,7 +166,8 @@ 188, 228, 268, - 308 + 308, + 348 ] } ], @@ -168,7 +180,8 @@ 164, 204, 244, - 284 + 284, + 324 ] } ], @@ -182,7 +195,8 @@ 171, 211, 251, - 291 + 291, + 331 ] } ], @@ -196,7 +210,8 @@ 167, 207, 247, - 287 + 287, + 327 ] } ], @@ -209,7 +224,8 @@ 165, 205, 245, - 285 + 285, + 325 ] } ], @@ -222,7 +238,8 @@ 182, 222, 262, - 302 + 302, + 342 ] } ], @@ -235,7 +252,8 @@ 181, 221, 261, - 301 + 301, + 341 ] } ], @@ -248,7 +266,8 @@ 176, 216, 256, - 296 + 296, + 336 ] } ], @@ -261,7 +280,8 @@ 185, 225, 265, - 305 + 305, + 345 ] } ], diff --git a/gems/ast-crispr/.rubocop_gradual.lock b/gems/ast-crispr/.rubocop_gradual.lock deleted file mode 100644 index d920cf89f..000000000 --- a/gems/ast-crispr/.rubocop_gradual.lock +++ /dev/null @@ -1,213 +0,0 @@ -{ - ".simplecov:3928423310": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:918344237": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "ast-crispr.gemspec:2262341056": [ - [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/ast-crispr.rb:247837913": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`ast-crispr.rb`) should use snake_case.", 5381] - ], - "lib/ast/crispr.rb:3730230259": [ - [12, 5, 11, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Error`.", 62528179], - [22, 5, 11, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Limit`.", 51888158], - [47, 7, 622, "Metrics/MethodLength: Method has too many lines. [14/10]", 2816807495], - [61, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], - [65, 7, 1168, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_hash` is too high. [<6, 29, 10> 31.26/17]", 3515286222], - [65, 7, 1168, "Metrics/MethodLength: Method has too many lines. [27/10]", 3515286222], - [90, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3685471369], - [96, 7, 822, "Metrics/AbcSize: Assignment Branch Condition size for `constraint_for_operator` is too high. [<5, 11, 13> 17.75/17]", 1402705503], - [96, 7, 822, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `constraint_for_operator` is too high. [8/7]", 1402705503], - [96, 7, 822, "Metrics/MethodLength: Method has too many lines. [19/10]", 1402705503], - [124, 5, 11, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Match`.", 52676120], - [127, 21, 73, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 344717847], - [172, 5, 18, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::MatchProfile`.", 365273299], - [172, 5, 4350, "Metrics/ClassLength: Class has too many lines. [115/100]", 1575766989], - [273, 7, 596, "Metrics/MethodLength: Method has too many lines. [14/10]", 2070486858], - [314, 5, 24, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::DestinationProfile`.", 3442102524], - [314, 5, 4581, "Metrics/ClassLength: Class has too many lines. [119/100]", 3503477661], - [352, 21, 126, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 931636409], - [417, 7, 667, "Metrics/MethodLength: Method has too many lines. [15/10]", 4004247638], - [460, 5, 27, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::DestinationResolution`.", 1305107769], - [474, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::StructureProfile`.", 614380405], - [512, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::SelectionProfile`.", 2464089216], - [531, 21, 165, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1182500333], - [566, 7, 585, "Metrics/MethodLength: Method has too many lines. [13/10]", 13786997], - [583, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::OperationProfile`.", 1974079861], - [607, 21, 188, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2526147676], - [662, 7, 478, "Metrics/MethodLength: Method has too many lines. [11/10]", 795235914], - [695, 7, 10, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Adapters::Null`.", 3515430288], - [728, 5, 21, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::DocumentContext`.", 594998459], - [788, 5, 19, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::OwnerSelector`.", 3092459999], - [791, 21, 81, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2293822273], - [853, 7, 606, "Metrics/MethodLength: Method has too many lines. [16/10]", 422136278], - [883, 5, 16, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::Selectors`.", 2133324825], - [883, 5, 5586, "Metrics/ModuleLength: Module has too many lines. [130/100]", 3440946513], - [886, 7, 1642, "Metrics/AbcSize: Assignment Branch Condition size for `owner_filter` is too high. [<6, 18, 11> 21.93/17]", 3224577904], - [886, 7, 1642, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `owner_filter` is too high. [10/7]", 3224577904], - [886, 7, 1642, "Metrics/MethodLength: Method has too many lines. [37/10]", 3224577904], - [886, 7, 1642, "Metrics/PerceivedComplexity: Perceived complexity for `owner_filter` is too high. [11/8]", 3224577904], - [886, 23, 135, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3231562627], - [930, 7, 1936, "Metrics/AbcSize: Assignment Branch Condition size for `comment_region_owned_owner` is too high. [<7, 16, 7> 18.81/17]", 2629441148], - [930, 7, 1936, "Metrics/MethodLength: Method has too many lines. [40/10]", 2629441148], - [930, 37, 190, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 4159525724], - [931, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 940069302], - [975, 7, 1731, "Metrics/AbcSize: Assignment Branch Condition size for `line_block` is too high. [<12, 22, 14> 28.71/17]", 1307990669], - [975, 7, 1731, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `line_block` is too high. [12/7]", 1307990669], - [975, 7, 1731, "Metrics/MethodLength: Method has too many lines. [38/10]", 1307990669], - [975, 7, 1731, "Metrics/PerceivedComplexity: Perceived complexity for `line_block` is too high. [12/8]", 1307990669], - [975, 21, 130, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 515174999], - [1027, 5, 23, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::OperationSupport`.", 343849029], - [1027, 5, 6491, "Metrics/ModuleLength: Module has too many lines. [139/100]", 2271788056], - [1072, 7, 1758, "Metrics/AbcSize: Assignment Branch Condition size for `insertion_from` is too high. [<5, 21, 11> 24.23/17]", 29011294], - [1072, 7, 1758, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `insertion_from` is too high. [9/7]", 29011294], - [1072, 7, 1758, "Metrics/MethodLength: Method has too many lines. [28/10]", 29011294], - [1072, 7, 1758, "Metrics/PerceivedComplexity: Perceived complexity for `insertion_from` is too high. [10/8]", 29011294], - [1115, 7, 827, "Metrics/AbcSize: Assignment Branch Condition size for `splice_after_anchor` is too high. [<4, 19, 2> 19.52/17]", 14691010], - [1115, 7, 827, "Metrics/MethodLength: Method has too many lines. [16/10]", 14691010], - [1119, 9, 72, "Style/RaiseArgs: Provide an exception class and message as arguments to `raise`.", 789091243], - [1121, 23, 72, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 2503424841], - [1153, 9, 25, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 768340433], - [1197, 5, 26, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::OperationProfilable`.", 4114431854], - [1206, 7, 19, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::OperationProfilable::ClassMethods`.", 3606528253], - [1218, 5, 13, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Replace`.", 1563590855], - [1243, 7, 643, "Metrics/AbcSize: Assignment Branch Condition size for `call` is too high. [<10, 32, 3> 33.66/17]", 3656683885], - [1243, 7, 643, "Metrics/MethodLength: Method has too many lines. [14/10]", 3656683885], - [1262, 5, 12, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Delete`.", 2011475922], - [1286, 7, 538, "Metrics/AbcSize: Assignment Branch Condition size for `call` is too high. [<7, 21, 1> 22.16/17]", 2655200768], - [1286, 7, 538, "Metrics/MethodLength: Method has too many lines. [13/10]", 2655200768], - [1304, 5, 12, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Insert`.", 1590185308], - [1338, 5, 10, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Move`.", 3515667002], - [1366, 7, 1182, "Metrics/AbcSize: Assignment Branch Condition size for `call` is too high. [<14, 40, 7> 42.95/17]", 172197360], - [1366, 7, 1182, "Metrics/MethodLength: Method has too many lines. [22/10]", 172197360], - [1383, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2688172402], - [1396, 3, 13, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr`.", 315644438], - [1396, 3, 12758, "Metrics/ModuleLength: Module has too many lines. [180/100]", 2662313186], - [1397, 5, 33, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::ProfileReportCompatibility`.", 3039519892], - [1419, 5, 18, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::MatchProfile`.", 365273299], - [1431, 7, 28, "Lint/DuplicateMethods: Method `Ast::Crispr::MatchProfile#normalize_start_boundary` is defined at both lib/ast/crispr.rb:292 and lib/ast/crispr.rb:1431.", 2362701855], - [1435, 7, 26, "Lint/DuplicateMethods: Method `Ast::Crispr::MatchProfile#normalize_end_boundary` is defined at both lib/ast/crispr.rb:299 and lib/ast/crispr.rb:1435.", 2613594544], - [1439, 7, 26, "Lint/DuplicateMethods: Method `Ast::Crispr::MatchProfile#normalize_payload_kind` is defined at both lib/ast/crispr.rb:306 and lib/ast/crispr.rb:1439.", 2604742721], - [1444, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::SelectionProfile`.", 2464089216], - [1466, 7, 14, "Lint/DuplicateMethods: Method `Ast::Crispr::SelectionProfile#initialize` is defined at both lib/ast/crispr.rb:531 and lib/ast/crispr.rb:1466.", 956205738], - [1466, 7, 773, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `initialize` is too high. [8/7]", 771809109], - [1466, 7, 773, "Metrics/MethodLength: Method has too many lines. [11/10]", 771809109], - [1466, 21, 190, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 4167448336], - [1481, 7, 1286, "Metrics/AbcSize: Assignment Branch Condition size for `report` is too high. [<5, 29, 13> 32.17/17]", 1720478959], - [1481, 7, 1286, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report` is too high. [11/7]", 1720478959], - [1481, 7, 1286, "Metrics/MethodLength: Method has too many lines. [17/10]", 1720478959], - [1481, 7, 1286, "Metrics/PerceivedComplexity: Perceived complexity for `report` is too high. [11/8]", 1720478959], - [1496, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 1470192175], - [1520, 5, 24, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::DestinationProfile`.", 3442102524], - [1534, 7, 29, "Lint/DuplicateMethods: Method `Ast::Crispr::DestinationProfile#normalize_resolution_kind` is defined at both lib/ast/crispr.rb:437 and lib/ast/crispr.rb:1534.", 99310177], - [1538, 7, 31, "Lint/DuplicateMethods: Method `Ast::Crispr::DestinationProfile#normalize_resolution_source` is defined at both lib/ast/crispr.rb:444 and lib/ast/crispr.rb:1538.", 1692065396], - [1542, 7, 29, "Lint/DuplicateMethods: Method `Ast::Crispr::DestinationProfile#normalize_anchor_boundary` is defined at both lib/ast/crispr.rb:452 and lib/ast/crispr.rb:1542.", 3028754726], - [1547, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::OperationProfile`.", 1974079861], - [1550, 7, 733, "Metrics/MethodLength: Method has too many lines. [13/10]", 2619513218], - [1570, 7, 25, "Lint/DuplicateMethods: Method `Ast::Crispr::OperationProfile#normalize_requirement` is defined at both lib/ast/crispr.rb:678 and lib/ast/crispr.rb:1570.", 440444039], - [1574, 7, 32, "Lint/DuplicateMethods: Method `Ast::Crispr::OperationProfile#normalize_replacement_source` is defined at both lib/ast/crispr.rb:686 and lib/ast/crispr.rb:1574.", 3533021156], - [1579, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::StructureProfile`.", 614380405], - [1595, 5, 6309, "Metrics/ClassLength: Class has too many lines. [172/100]", 1270437788], - [1600, 7, 2717, "Metrics/MethodLength: Method has too many lines. [67/10]", 1469599129], - [1665, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 259030389], - [1678, 28, 247, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3385598543], - [1710, 28, 242, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1038219895] - ], - "lib/ast/crispr/rspec/shared_examples/destination_profile.rb:2529475135": [ - [3, 1, 2386, "Metrics/BlockLength: Block has too many lines. [28/25]", 2846758965], - [4, 3, 2311, "Metrics/BlockLength: Block has too many lines. [26/25]", 2123267236] - ], - "lib/ast/crispr/rspec/shared_examples/match_profile.rb:2566447993": [ - [3, 1, 1997, "Metrics/BlockLength: Block has too many lines. [26/25]", 1032277788] - ], - "lib/ast/crispr/rspec/shared_examples/operation_profile.rb:3583567850": [ - [3, 1, 2148, "Metrics/BlockLength: Block has too many lines. [26/25]", 2745151209] - ], - "spec/old_runtime_spec.rb:1564590841": [ - [3, 1, 17728, "Metrics/BlockLength: Block has too many lines. [383/25]", 205400157], - [4, 3, 69, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3712453399], - [5, 3, 68, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1429320782], - [6, 3, 59, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 253007150], - [8, 3, 891, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 361389624], - [18, 37, 11, "Lint/UnusedMethodArgument: Unused method argument - `owner_scope`.", 3846606321], - [22, 46, 6, "Lint/UnusedMethodArgument: Unused method argument - `region`.", 2124512157], - [22, 64, 11, "Lint/UnusedMethodArgument: Unused method argument - `owner_scope`.", 3846606321], - [73, 3, 8534, "Metrics/BlockLength: Block has too many lines. [176/25]", 3042299525], - [313, 3, 3640, "Metrics/BlockLength: Block has too many lines. [72/25]", 1133370152], - [418, 3, 1663, "Metrics/BlockLength: Block has too many lines. [41/25]", 115074475] - ] -} diff --git a/gems/ast-crispr/Gemfile b/gems/ast-crispr/Gemfile index 20ffdcaed..da2e0b9e5 100644 --- a/gems/ast-crispr/Gemfile +++ b/gems/ast-crispr/Gemfile @@ -311,6 +311,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/ast-crispr/Gemfile.lock b/gems/ast-crispr/Gemfile.lock index ed60004ae..a708f53d0 100644 --- a/gems/ast-crispr/Gemfile.lock +++ b/gems/ast-crispr/Gemfile.lock @@ -1,13 +1,3 @@ -GIT - remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a - branch: fix/ruby-parser-api-methods - glob: packages/ruby/*.gemspec - specs: - tree_sitter_language_pack (1.12.5) - rb_sys (>= 0.9, < 0.9.128) - sorbet-runtime (~> 0.5) - PATH remote: . specs: @@ -16,6 +6,288 @@ PATH service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby + specs: + tree_sitter_language_pack (1.12.5) + rb_sys (>= 0.9, < 0.9.128) + sorbet-runtime (~> 0.5) + GEM remote: https://gem.coop/ specs: @@ -27,11 +299,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +307,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -48,7 +321,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -104,15 +376,6 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -131,6 +394,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -275,22 +539,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -324,11 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -376,22 +636,44 @@ DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-drift! + kettle-jem! + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -400,18 +682,26 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -419,20 +709,34 @@ CHECKSUMS appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -445,19 +749,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -472,10 +784,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -483,6 +799,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -510,18 +827,19 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -535,14 +853,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -550,6 +873,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ast-merge/Gemfile.lock b/gems/ast-merge/Gemfile.lock index bde262090..1545c3450 100644 --- a/gems/ast-merge/Gemfile.lock +++ b/gems/ast-merge/Gemfile.lock @@ -1,13 +1,3 @@ -GIT - remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a - branch: fix/ruby-parser-api-methods - glob: packages/ruby/*.gemspec - specs: - tree_sitter_language_pack (1.12.5) - rb_sys (>= 0.9, < 0.9.128) - sorbet-runtime (~> 0.5) - PATH remote: . specs: @@ -275,6 +265,13 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby + specs: + tree_sitter_language_pack (1.12.5) + rb_sys (>= 0.9, < 0.9.128) + sorbet-runtime (~> 0.5) + GEM remote: https://gem.coop/ specs: diff --git a/gems/tree_haver/.rubocop_gradual.lock b/gems/tree_haver/.rubocop_gradual.lock deleted file mode 100644 index 2a04c6a43..000000000 --- a/gems/tree_haver/.rubocop_gradual.lock +++ /dev/null @@ -1,467 +0,0 @@ -{ - ".simplecov:3575099246": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Gemfile:31081928": [ - [28, 1, 59, "Lint/EmptyConditionalBody: Avoid `if` branches without a body.", 4279378582] - ], - "Rakefile:1868927885": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/tree_haver.rb:2762889207": [ - [49, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465], - [49, 1, 15892, "Metrics/ModuleLength: Module has too many lines. [421/100]", 2307494458], - [67, 3, 566, "Metrics/MethodLength: Method has too many lines. [12/10]", 1536513137], - [124, 3, 272, "Metrics/MethodLength: Method has too many lines. [11/10]", 505877912], - [156, 3, 543, "Metrics/MethodLength: Method has too many lines. [14/10]", 3733215372], - [221, 3, 458, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `backend_module` is too high. [9/7]", 73937708], - [221, 3, 458, "Metrics/MethodLength: Method has too many lines. [12/10]", 73937708], - [221, 3, 458, "Metrics/PerceivedComplexity: Perceived complexity for `backend_module` is too high. [9/8]", 73937708], - [257, 3, 1024, "Metrics/AbcSize: Assignment Branch Condition size for `register_language` is too high. [<0, 20, 10> 22.36/17]", 53014028], - [257, 3, 1024, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `register_language` is too high. [11/7]", 53014028], - [257, 3, 1024, "Metrics/MethodLength: Method has too many lines. [12/10]", 53014028], - [257, 3, 1024, "Metrics/PerceivedComplexity: Perceived complexity for `register_language` is too high. [11/8]", 53014028], - [257, 24, 150, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 893242366], - [282, 3, 1521, "Metrics/AbcSize: Assignment Branch Condition size for `parser_for` is too high. [<12, 27, 14> 32.7/17]", 498764853], - [282, 3, 1521, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parser_for` is too high. [15/7]", 498764853], - [282, 3, 1521, "Metrics/MethodLength: Method has too many lines. [30/10]", 498764853], - [282, 3, 1521, "Metrics/PerceivedComplexity: Perceived complexity for `parser_for` is too high. [15/8]", 498764853], - [325, 3, 2089, "Metrics/MethodLength: Method has too many lines. [51/10]", 2791676388], - [379, 3, 704, "Metrics/AbcSize: Assignment Branch Condition size for `requested_backend_type` is too high. [<4, 17, 9> 19.65/17]", 3087691662], - [379, 3, 704, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `requested_backend_type` is too high. [8/7]", 3087691662], - [379, 3, 704, "Metrics/MethodLength: Method has too many lines. [14/10]", 3087691662], - [379, 3, 704, "Metrics/PerceivedComplexity: Perceived complexity for `requested_backend_type` is too high. [9/8]", 3087691662], - [409, 3, 696, "Metrics/MethodLength: Method has too many lines. [14/10]", 307274721], - [502, 3, 489, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `backend_module_for` is too high. [10/7]", 3448932255], - [502, 3, 489, "Metrics/MethodLength: Method has too many lines. [22/10]", 3448932255] - ], - "lib/tree_haver/backend_api.rb:3354059061": [ - [30, 3, 12181, "Metrics/ModuleLength: Module has too many lines. [243/100]", 205645546], - [139, 5, 8882, "Metrics/ClassLength: Class has too many lines. [180/100]", 4281605197], - [145, 7, 1502, "Metrics/AbcSize: Assignment Branch Condition size for `validate` is too high. [<4, 22, 10> 24.49/17]", 747017743], - [145, 7, 1502, "Metrics/MethodLength: Method has too many lines. [31/10]", 747017743], - [145, 7, 1502, "Metrics/PerceivedComplexity: Perceived complexity for `validate` is too high. [11/8]", 747017743], - [213, 7, 903, "Metrics/MethodLength: Method has too many lines. [24/10]", 3041411230], - [261, 7, 1271, "Metrics/AbcSize: Assignment Branch Condition size for `validate_capabilities_hash` is too high. [<7, 27, 7> 28.76/17]", 3965262932], - [261, 7, 1271, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_capabilities_hash` is too high. [8/7]", 3965262932], - [261, 7, 1271, "Metrics/MethodLength: Method has too many lines. [25/10]", 3965262932], - [277, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2253399502], - [296, 7, 908, "Metrics/AbcSize: Assignment Branch Condition size for `validate_language` is too high. [<6, 17, 4> 18.47/17]", 733551867], - [315, 7, 797, "Metrics/AbcSize: Assignment Branch Condition size for `validate_parser` is too high. [<5, 16, 7> 18.17/17]", 1229041751], - [315, 7, 797, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_parser` is too high. [8/7]", 1229041751], - [315, 7, 797, "Metrics/MethodLength: Method has too many lines. [15/10]", 1229041751], - [349, 7, 862, "Metrics/AbcSize: Assignment Branch Condition size for `validate_node_class` is too high. [<8, 18, 8> 21.26/17]", 1873188195], - [349, 7, 862, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_node_class` is too high. [8/7]", 1873188195], - [349, 7, 862, "Metrics/MethodLength: Method has too many lines. [20/10]", 1873188195], - [349, 7, 862, "Metrics/PerceivedComplexity: Perceived complexity for `validate_node_class` is too high. [9/8]", 1873188195], - [375, 11, 20, "Naming/PredicatePrefix: Rename `has_method_or_alias?` to `method_or_alias?`.", 285116235] - ], - "lib/tree_haver/backend_context.rb:159197618": [ - [3, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465] - ], - "lib/tree_haver/backend_registry.rb:4046212912": [ - [4, 3, 22, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver::BackendRegistry`.", 733935278], - [4, 3, 5121, "Metrics/ModuleLength: Module has too many lines. [152/100]", 1483988260], - [39, 5, 382, "Metrics/MethodLength: Method has too many lines. [11/10]", 2000730238], - [48, 16, 1, "Style/DoubleNegation: Avoid the use of double negation (`!!`).", 177540], - [55, 5, 889, "Metrics/AbcSize: Assignment Branch Condition size for `register_tag` is too high. [<5, 20, 5> 21.21/17]", 2276764069], - [55, 5, 889, "Metrics/MethodLength: Method has too many lines. [18/10]", 2276764069], - [105, 5, 397, "Metrics/MethodLength: Method has too many lines. [11/10]", 4007185633] - ], - "lib/tree_haver/backends/citrus.rb:3181984499": [ - [40, 9, 449, "Metrics/MethodLength: Method has too many lines. [11/10]", 1138819533], - [173, 11, 1133, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [11/7]", 2613019266], - [173, 11, 1133, "Metrics/MethodLength: Method has too many lines. [16/10]", 2613019266], - [173, 11, 1133, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [11/8]", 2613019266], - [230, 9, 597, "Metrics/MethodLength: Method has too many lines. [12/10]", 3923424594], - [403, 9, 810, "Metrics/AbcSize: Assignment Branch Condition size for `structural?` is too high. [<3, 19, 8> 20.83/17]", 3166173256], - [403, 9, 810, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structural?` is too high. [9/7]", 3166173256], - [403, 9, 810, "Metrics/MethodLength: Method has too many lines. [12/10]", 3166173256], - [403, 9, 810, "Metrics/PerceivedComplexity: Perceived complexity for `structural?` is too high. [9/8]", 3166173256], - [436, 9, 1272, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_type_from_event` is too high. [9/7]", 2022108773], - [436, 9, 1272, "Metrics/MethodLength: Method has too many lines. [16/10]", 2022108773], - [436, 9, 1272, "Metrics/PerceivedComplexity: Perceived complexity for `extract_type_from_event` is too high. [10/8]", 2022108773], - [460, 11, 207, "Style/CaseLikeIf: Convert `if-elsif` to `case-when`.", 1995588659], - [476, 61, 10, "Style/NumericPredicate: Use `offset.positive?` instead of `offset > 0`.", 2454414278] - ], - "lib/tree_haver/backends/ffi.rb:691415497": [ - [83, 9, 853, "Metrics/MethodLength: Method has too many lines. [15/10]", 1876257977], - [147, 7, 7352, "Metrics/ModuleLength: Module has too many lines. [111/100]", 4125377349], - [148, 9, 7320, "Metrics/ClassLength: Class has too many lines. [109/100]", 1130902814], - [183, 11, 559, "Metrics/MethodLength: Method has too many lines. [11/10]", 678018999], - [232, 11, 4265, "Metrics/AbcSize: Assignment Branch Condition size for `try_load!` is too high. [<11, 40, 10> 42.67/17]", 2312962113], - [232, 11, 4265, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `try_load!` is too high. [10/7]", 2312962113], - [232, 11, 4265, "Metrics/MethodLength: Method has too many lines. [58/10]", 2312962113], - [232, 11, 4265, "Metrics/PerceivedComplexity: Perceived complexity for `try_load!` is too high. [11/8]", 2312962113], - [260, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2086221887], - [262, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2163360042], - [367, 9, 312, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `<=>` is too high. [8/7]", 2433292528], - [437, 11, 4377, "Metrics/AbcSize: Assignment Branch Condition size for `from_library` is too high. [<16, 30, 18> 38.47/17]", 3403850855], - [437, 11, 4377, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [17/7]", 3403850855], - [437, 11, 4377, "Metrics/MethodLength: Method has too many lines. [43/10]", 3403850855], - [437, 11, 4377, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [19/8]", 3403850855], - [437, 47, 4, "Lint/UnusedMethodArgument: Unused method argument - `name`.", 2087876002], - [502, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2415433817], - [554, 9, 3159, "Metrics/AbcSize: Assignment Branch Condition size for `language=` is too high. [<4, 44, 11> 45.53/17]", 1815427493], - [554, 9, 3159, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `language=` is too high. [10/7]", 1815427493], - [554, 9, 3159, "Metrics/MethodLength: Method has too many lines. [40/10]", 1815427493], - [554, 9, 3159, "Metrics/PerceivedComplexity: Perceived complexity for `language=` is too high. [10/8]", 1815427493], - [715, 7, 10494, "Metrics/ClassLength: Class has too many lines. [129/100]", 3710916551], - [744, 45, 9, "Style/NumericPredicate: Use `index.negative?` instead of `index < 0`.", 4215255415], - [807, 13, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183], - [889, 21, 9, "Style/NumericPredicate: Use `index.negative?` instead of `index < 0`.", 4215255415], - [933, 9, 694, "Metrics/AbcSize: Assignment Branch Condition size for `descendant_for_point_range` is too high. [<7, 21, 5> 22.69/17]", 979329510], - [953, 9, 706, "Metrics/AbcSize: Assignment Branch Condition size for `named_descendant_for_point_range` is too high. [<7, 21, 5> 22.69/17]", 2494446138] - ], - "lib/tree_haver/backends/java.rb:3360169733": [ - [134, 7, 815, "Metrics/AbcSize: Assignment Branch Condition size for `configure_native_library_path!` is too high. [<4, 17, 6> 18.47/17]", 1362415302], - [227, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3409700051], - [260, 7, 9885, "Metrics/ClassLength: Class has too many lines. [114/100]", 136252046], - [292, 9, 312, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `<=>` is too high. [8/7]", 2433292528], - [340, 11, 4098, "Metrics/AbcSize: Assignment Branch Condition size for `from_library` is too high. [<19, 32, 14> 39.76/17]", 3050250526], - [340, 11, 4098, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [14/7]", 3050250526], - [340, 11, 4098, "Metrics/MethodLength: Method has too many lines. [48/10]", 3050250526], - [340, 11, 4098, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [16/8]", 3050250526], - [426, 11, 2084, "Metrics/AbcSize: Assignment Branch Condition size for `load_by_name` is too high. [<11, 17, 6> 21.12/17]", 226213748], - [426, 11, 2084, "Metrics/MethodLength: Method has too many lines. [35/10]", 226213748], - [542, 9, 1016, "Metrics/MethodLength: Method has too many lines. [17/10]", 4123264427], - [649, 9, 702, "Metrics/MethodLength: Method has too many lines. [14/10]", 1334016319], - [649, 17, 89, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3152137646], - [728, 9, 583, "Metrics/MethodLength: Method has too many lines. [11/10]", 2457478600], - [816, 13, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183] - ], - "lib/tree_haver/backends/mri.rb:863330290": [ - [59, 9, 916, "Metrics/MethodLength: Method has too many lines. [15/10]", 749971754], - [179, 9, 312, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `<=>` is too high. [8/7]", 2433292528], - [232, 11, 1562, "Metrics/MethodLength: Method has too many lines. [11/10]", 3858647816] - ], - "lib/tree_haver/backends/parslet.rb:4170691266": [ - [41, 9, 323, "Metrics/MethodLength: Method has too many lines. [11/10]", 694290592], - [108, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193340030], - [172, 11, 1133, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [11/7]", 2613019266], - [172, 11, 1133, "Metrics/MethodLength: Method has too many lines. [16/10]", 2613019266], - [172, 11, 1133, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [11/8]", 2613019266], - [246, 9, 591, "Metrics/MethodLength: Method has too many lines. [12/10]", 3007454066], - [335, 7, 6287, "Metrics/ClassLength: Class has too many lines. [155/100]", 3100555518], - [362, 9, 452, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `start_byte` is too high. [8/7]", 2663206926], - [362, 9, 452, "Metrics/MethodLength: Method has too many lines. [12/10]", 2663206926], - [380, 9, 557, "Metrics/MethodLength: Method has too many lines. [12/10]", 2982914846], - [443, 9, 404, "Metrics/MethodLength: Method has too many lines. [11/10]", 1111982079], - [495, 61, 10, "Style/NumericPredicate: Use `offset.positive?` instead of `offset > 0`.", 2454414278], - [501, 9, 313, "Metrics/MethodLength: Method has too many lines. [13/10]", 1927903077], - [519, 9, 448, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_first_slice` is too high. [8/7]", 229178429], - [519, 9, 448, "Metrics/MethodLength: Method has too many lines. [16/10]", 229178429], - [524, 17, 11, "Style/HashEachMethods: Use `each_value` instead of `values.each`.", 236538172], - [539, 9, 461, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_last_slice` is too high. [8/7]", 3960808114], - [539, 9, 461, "Metrics/MethodLength: Method has too many lines. [16/10]", 3960808114] - ], - "lib/tree_haver/backends/prism.rb:265399087": [ - [39, 9, 448, "Metrics/MethodLength: Method has too many lines. [11/10]", 2383415890], - [70, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 721867551], - [71, 9, 712, "Metrics/MethodLength: Method has too many lines. [12/10]", 1576927704], - [145, 41, 6, "Lint/UnusedMethodArgument: Unused method argument - `symbol`.", 2153517219], - [182, 9, 554, "Metrics/MethodLength: Method has too many lines. [16/10]", 3452414947], - [250, 13, 11, "Naming/PredicatePrefix: Rename `has_errors?` to `errors?`.", 1181419252], - [275, 69, 27, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1979346241], - [301, 13, 64, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1942915391], - [305, 9, 519, "Metrics/AbcSize: Assignment Branch Condition size for `classify_comment_hint` is too high. [<5, 20, 5> 21.21/17]", 869270335], - [485, 13, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183], - [554, 24, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] - ], - "lib/tree_haver/backends/psych.rb:1528613408": [ - [30, 9, 448, "Metrics/MethodLength: Method has too many lines. [11/10]", 2367418678], - [59, 9, 601, "Metrics/MethodLength: Method has too many lines. [11/10]", 2824278890], - [342, 9, 901, "Metrics/AbcSize: Assignment Branch Condition size for `extract_text_from_location` is too high. [<8, 23, 18> 30.28/17]", 1252700264], - [342, 9, 901, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_text_from_location` is too high. [14/7]", 1252700264], - [342, 9, 901, "Metrics/MethodLength: Method has too many lines. [22/10]", 1252700264], - [342, 9, 901, "Metrics/PerceivedComplexity: Perceived complexity for `extract_text_from_location` is too high. [16/8]", 1252700264] - ], - "lib/tree_haver/backends/rust.rb:3784474048": [ - [52, 9, 548, "Metrics/MethodLength: Method has too many lines. [15/10]", 3791803966], - [156, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548] - ], - "lib/tree_haver/backends/tslp.rb:1702759733": [ - [18, 9, 559, "Metrics/MethodLength: Method has too many lines. [14/10]", 1306507697], - [68, 7, 14, "Style/Documentation: Missing top-level documentation comment for `class TreeHaver::Backends::Tslp::Language`.", 3674592793], - [80, 7, 12, "Style/Documentation: Missing top-level documentation comment for `class TreeHaver::Backends::Tslp::Parser`.", 2485220908], - [81, 9, 582, "Metrics/AbcSize: Assignment Branch Condition size for `parse` is too high. [<2, 17, 4> 17.58/17]", 103430155], - [103, 7, 10, "Style/Documentation: Missing top-level documentation comment for `class TreeHaver::Backends::Tslp::Tree`.", 3516465773], - [109, 7, 10, "Style/Documentation: Missing top-level documentation comment for `class TreeHaver::Backends::Tslp::Node`.", 3515419275], - [143, 13, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183] - ], - "lib/tree_haver/base/comment.rb:699160654": [ - [10, 5, 8183, "Metrics/ClassLength: Class has too many lines. [152/100]", 4001235397] - ], - "lib/tree_haver/base/node.rb:586469776": [ - [36, 5, 7668, "Metrics/ClassLength: Class has too many lines. [156/100]", 171773185], - [162, 11, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183], - [208, 27, 8, "Style/NumericPredicate: Use `cmp.zero?` instead of `cmp == 0`.", 736104011], - [239, 7, 888, "Metrics/AbcSize: Assignment Branch Condition size for `source_position` is too high. [<6, 20, 12> 24.08/17]", 3968023659], - [239, 7, 888, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `source_position` is too high. [9/7]", 3968023659], - [239, 7, 888, "Metrics/MethodLength: Method has too many lines. [28/10]", 3968023659], - [239, 7, 888, "Metrics/PerceivedComplexity: Perceived complexity for `source_position` is too high. [13/8]", 3968023659], - [306, 7, 355, "Metrics/MethodLength: Method has too many lines. [11/10]", 1012295608] - ], - "lib/tree_haver/base/tree.rb:3081630142": [ - [89, 15, 145, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1155535733], - [103, 11, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183] - ], - "lib/tree_haver/citrus_grammar_finder.rb:2540014236": [ - [31, 3, 7013, "Metrics/ClassLength: Class has too many lines. [102/100]", 245808593], - [66, 5, 3770, "Metrics/AbcSize: Assignment Branch Condition size for `available?` is too high. [<16, 52, 21> 58.32/17]", 3886463212], - [66, 5, 3770, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `available?` is too high. [22/7]", 3886463212], - [66, 5, 3770, "Metrics/MethodLength: Method has too many lines. [50/10]", 3886463212], - [66, 5, 3770, "Metrics/PerceivedComplexity: Perceived complexity for `available?` is too high. [22/8]", 3886463212], - [94, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858894] - ], - "lib/tree_haver/contracts.rb:1571706604": [ - [3, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465], - [3, 1, 28139, "Metrics/ModuleLength: Module has too many lines. [924/100]", 3701899480], - [91, 5, 732, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 18, 2> 18.11/17]", 3031678572], - [91, 5, 732, "Metrics/MethodLength: Method has too many lines. [17/10]", 3031678572], - [170, 5, 697, "Metrics/MethodLength: Method has too many lines. [18/10]", 389212725], - [231, 5, 507, "Metrics/MethodLength: Method has too many lines. [13/10]", 2631332781], - [329, 5, 580, "Metrics/MethodLength: Method has too many lines. [13/10]", 2166080747], - [558, 5, 558, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 17, 4> 17.46/17]", 2109105399], - [558, 5, 558, "Metrics/MethodLength: Method has too many lines. [18/10]", 2109105399], - [610, 3, 780, "Metrics/AbcSize: Assignment Branch Condition size for `library_path_errors` is too high. [<3, 20, 10> 22.56/17]", 1003454820], - [610, 3, 780, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `library_path_errors` is too high. [10/7]", 1003454820], - [610, 3, 780, "Metrics/MethodLength: Method has too many lines. [14/10]", 1003454820], - [610, 3, 780, "Metrics/PerceivedComplexity: Perceived complexity for `library_path_errors` is too high. [10/8]", 1003454820], - [652, 3, 686, "Metrics/MethodLength: Method has too many lines. [16/10]", 2530945134], - [674, 3, 483, "Metrics/MethodLength: Method has too many lines. [15/10]", 3654427448], - [693, 3, 511, "Metrics/MethodLength: Method has too many lines. [16/10]", 145071639], - [770, 5, 384, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 19, 6> 19.92/17]", 1287649270], - [841, 5, 449, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [10/7]", 1722332092], - [841, 5, 449, "Metrics/PerceivedComplexity: Perceived complexity for `to_h` is too high. [10/8]", 1722332092], - [873, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177610], - [874, 5, 420, "Metrics/MethodLength: Method has too many lines. [12/10]", 722580369], - [914, 42, 8, "Lint/StructNewOverride: `:entries` member overrides `Struct#entries` and it may be unexpected.", 999966509], - [937, 3, 473, "Metrics/MethodLength: Method has too many lines. [18/10]", 1284459726], - [958, 3, 655, "Metrics/AbcSize: Assignment Branch Condition size for `byte_offset_for_point` is too high. [<7, 25, 14> 29.5/17]", 1278853347], - [958, 3, 655, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `byte_offset_for_point` is too high. [9/7]", 1278853347], - [958, 3, 655, "Metrics/MethodLength: Method has too many lines. [17/10]", 1278853347], - [958, 3, 655, "Metrics/PerceivedComplexity: Perceived complexity for `byte_offset_for_point` is too high. [10/8]", 1278853347] - ], - "lib/tree_haver/grammar_finder.rb:3107533528": [ - [55, 3, 13660, "Metrics/ClassLength: Class has too many lines. [200/100]", 1847629568], - [155, 5, 1710, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_library_path` is too high. [8/7]", 4164717952], - [155, 5, 1710, "Metrics/MethodLength: Method has too many lines. [25/10]", 4164717952], - [269, 7, 845, "Metrics/MethodLength: Method has too many lines. [12/10]", 916567473], - [315, 5, 577, "Metrics/MethodLength: Method has too many lines. [16/10]", 651056353], - [340, 5, 623, "Metrics/MethodLength: Method has too many lines. [14/10]", 1438381615], - [360, 5, 846, "Metrics/MethodLength: Method has too many lines. [12/10]", 667615068], - [398, 5, 653, "Metrics/MethodLength: Method has too many lines. [12/10]", 1765172995] - ], - "lib/tree_haver/kaitai_backend.rb:335397596": [ - [3, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465] - ], - "lib/tree_haver/language.rb:2775049278": [ - [39, 3, 12087, "Metrics/ModuleLength: Module has too many lines. [115/100]", 221887443], - [40, 5, 12061, "Metrics/ClassLength: Class has too many lines. [113/100]", 309443185], - [89, 7, 1966, "Metrics/AbcSize: Assignment Branch Condition size for `from_library` is too high. [<4, 20, 10> 22.72/17]", 980659500], - [89, 7, 1966, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [9/7]", 980659500], - [89, 7, 1966, "Metrics/MethodLength: Method has too many lines. [31/10]", 980659500], - [89, 7, 1966, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [11/8]", 980659500], - [114, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177538], - [156, 7, 4289, "Metrics/AbcSize: Assignment Branch Condition size for `method_missing` is too high. [<10, 39, 30> 50.21/17]", 1314689525], - [156, 7, 4289, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `method_missing` is too high. [24/7]", 1314689525], - [156, 7, 4289, "Metrics/MethodLength: Method has too many lines. [56/10]", 1314689525], - [156, 7, 4289, "Metrics/PerceivedComplexity: Perceived complexity for `method_missing` is too high. [26/8]", 1314689525], - [274, 7, 786, "Metrics/MethodLength: Method has too many lines. [12/10]", 3697766033] - ], - "lib/tree_haver/language_pack.rb:3024861237": [ - [3, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465] - ], - "lib/tree_haver/language_registry.rb:3950096220": [ - [83, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861089] - ], - "lib/tree_haver/library_path_utils.rb:1552423902": [ - [32, 5, 861, "Metrics/MethodLength: Method has too many lines. [12/10]", 1638068630] - ], - "lib/tree_haver/node.rb:715762930": [ - [62, 3, 16601, "Metrics/ClassLength: Class has too many lines. [237/100]", 2290466920], - [136, 5, 708, "Metrics/AbcSize: Assignment Branch Condition size for `start_point` is too high. [<2, 19, 7> 20.35/17]", 2066418249], - [136, 5, 708, "Metrics/MethodLength: Method has too many lines. [17/10]", 2066418249], - [161, 5, 694, "Metrics/AbcSize: Assignment Branch Condition size for `end_point` is too high. [<2, 19, 7> 20.35/17]", 2127773446], - [161, 5, 694, "Metrics/MethodLength: Method has too many lines. [17/10]", 2127773446], - [232, 5, 948, "Metrics/AbcSize: Assignment Branch Condition size for `text` is too high. [<1, 14, 11> 17.83/17]", 748349201], - [232, 5, 948, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `text` is too high. [9/7]", 748349201], - [232, 5, 948, "Metrics/MethodLength: Method has too many lines. [16/10]", 748349201], - [232, 5, 948, "Metrics/PerceivedComplexity: Perceived complexity for `text` is too high. [11/8]", 748349201], - [259, 9, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183], - [328, 5, 994, "Metrics/AbcSize: Assignment Branch Condition size for `named_child` is too high. [<6, 13, 10> 17.46/17]", 3449163117], - [328, 5, 994, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `named_child` is too high. [9/7]", 3449163117], - [328, 5, 994, "Metrics/MethodLength: Method has too many lines. [21/10]", 3449163117], - [328, 5, 994, "Metrics/PerceivedComplexity: Perceived complexity for `named_child` is too high. [10/8]", 3449163117], - [366, 5, 734, "Metrics/MethodLength: Method has too many lines. [15/10]", 3099919150], - [425, 7, 4, "Style/EmptyElse: Redundant `else`-clause.", 2087423834] - ], - "lib/tree_haver/parser.rb:1959976510": [ - [71, 3, 15231, "Metrics/ClassLength: Class has too many lines. [181/100]", 2262931609], - [84, 5, 938, "Metrics/MethodLength: Method has too many lines. [13/10]", 569209133], - [116, 5, 844, "Metrics/MethodLength: Method has too many lines. [11/10]", 3700471369], - [141, 5, 583, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `backend` is too high. [9/7]", 942469984], - [141, 5, 583, "Metrics/MethodLength: Method has too many lines. [20/10]", 942469984], - [237, 5, 1114, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_string` is too high. [8/7]", 2146281390], - [237, 5, 1114, "Metrics/MethodLength: Method has too many lines. [16/10]", 2146281390], - [237, 5, 1114, "Metrics/PerceivedComplexity: Perceived complexity for `parse_string` is too high. [10/8]", 2146281390], - [273, 5, 1162, "Metrics/AbcSize: Assignment Branch Condition size for `switch_backend_for_language` is too high. [<10, 11, 11> 18.49/17]", 3918477333], - [273, 5, 1162, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `switch_backend_for_language` is too high. [11/7]", 3918477333], - [273, 5, 1162, "Metrics/MethodLength: Method has too many lines. [26/10]", 3918477333], - [273, 5, 1162, "Metrics/PerceivedComplexity: Perceived complexity for `switch_backend_for_language` is too high. [9/8]", 3918477333], - [320, 5, 3598, "Metrics/AbcSize: Assignment Branch Condition size for `unwrap_language` is too high. [<4, 32, 32> 45.43/17]", 2683894777], - [320, 5, 3598, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `unwrap_language` is too high. [29/7]", 2683894777], - [320, 5, 3598, "Metrics/MethodLength: Method has too many lines. [55/10]", 2683894777], - [320, 5, 3598, "Metrics/PerceivedComplexity: Perceived complexity for `unwrap_language` is too high. [23/8]", 2683894777], - [414, 5, 892, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `try_reload_language_for_backend` is too high. [9/7]", 1872419716], - [414, 5, 892, "Metrics/MethodLength: Method has too many lines. [14/10]", 1872419716], - [414, 5, 892, "Metrics/PerceivedComplexity: Perceived complexity for `try_reload_language_for_backend` is too high. [9/8]", 1872419716] - ], - "lib/tree_haver/parslet_grammar_finder.rb:756779364": [ - [32, 3, 6418, "Metrics/ClassLength: Class has too many lines. [105/100]", 2916347470], - [67, 5, 2630, "Metrics/AbcSize: Assignment Branch Condition size for `available?` is too high. [<14, 39, 19> 45.59/17]", 1827795944], - [67, 5, 2630, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `available?` is too high. [20/7]", 1827795944], - [67, 5, 2630, "Metrics/MethodLength: Method has too many lines. [43/10]", 1827795944], - [67, 5, 2630, "Metrics/PerceivedComplexity: Perceived complexity for `available?` is too high. [20/8]", 1827795944] - ], - "lib/tree_haver/path_validator.rb:1827441298": [ - [31, 3, 11571, "Metrics/ModuleLength: Module has too many lines. [133/100]", 3916793077], - [71, 5, 1048, "Metrics/AbcSize: Assignment Branch Condition size for `trusted_directories` is too high. [<4, 16, 5> 17.23/17]", 2683168069], - [71, 5, 1048, "Metrics/MethodLength: Method has too many lines. [13/10]", 2683168069], - [182, 5, 1000, "Metrics/AbcSize: Assignment Branch Condition size for `safe_library_path?` is too high. [<1, 15, 15> 21.24/17]", 3331427816], - [182, 5, 1000, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `safe_library_path?` is too high. [15/7]", 3331427816], - [182, 5, 1000, "Metrics/MethodLength: Method has too many lines. [11/10]", 3331427816], - [182, 5, 1000, "Metrics/PerceivedComplexity: Perceived complexity for `safe_library_path?` is too high. [15/8]", 3331427816], - [314, 5, 911, "Metrics/AbcSize: Assignment Branch Condition size for `validation_errors` is too high. [<2, 21, 13> 24.78/17]", 1249065882], - [314, 5, 911, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validation_errors` is too high. [13/7]", 1249065882], - [314, 5, 911, "Metrics/MethodLength: Method has too many lines. [14/10]", 1249065882], - [314, 5, 911, "Metrics/PerceivedComplexity: Perceived complexity for `validation_errors` is too high. [13/8]", 1249065882], - [345, 9, 20, "Naming/PredicatePrefix: Rename `has_valid_extension?` to `valid_extension?`.", 2041908655] - ], - "lib/tree_haver/peg_backends.rb:2882446693": [ - [3, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465], - [37, 3, 611, "Metrics/MethodLength: Method has too many lines. [21/10]", 2394303132], - [39, 11, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [61, 3, 377, "Metrics/MethodLength: Method has too many lines. [13/10]", 1137341195] - ], - "lib/tree_haver/rspec/dependency_tags.rb:2954930617": [ - [7, 5, 21, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver::RSpec::DependencyTags`.", 2626933713] - ], - "lib/tree_haver/tree.rb:3332079774": [ - [129, 5, 1443, "Metrics/AbcSize: Assignment Branch Condition size for `edit` is too high. [<8, 18, 7> 20.9/17]", 4208399016], - [129, 5, 1443, "Metrics/MethodLength: Method has too many lines. [24/10]", 4208399016], - [129, 13, 89, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3152137646] - ], - "spec/backend_registry_spec.rb:229950927": [ - [5, 1, 3102, "Metrics/BlockLength: Block has too many lines. [62/25]", 3416335650] - ], - "spec/backends/tslp_spec.rb:1444201405": [ - [5, 1, 5497, "Metrics/BlockLength: Block has too many lines. [121/25]", 4279461260], - [30, 3, 1477, "Metrics/BlockLength: Block has too many lines. [32/25]", 2492475187], - [112, 3, 1352, "Metrics/BlockLength: Block has too many lines. [29/25]", 2972556266] - ], - "spec/fixtures_integration_spec.rb:3457821347": [ - [3, 1, 48556, "Metrics/BlockLength: Block has too many lines. [1006/25]", 2138474637], - [108, 3, 1282, "Metrics/BlockLength: Block has too many lines. [29/25]", 505243730], - [141, 3, 1840, "Metrics/BlockLength: Block has too many lines. [35/25]", 1365684528], - [180, 3, 1365, "Metrics/BlockLength: Block has too many lines. [33/25]", 1597100003], - [247, 3, 2110, "Metrics/BlockLength: Block has too many lines. [41/25]", 219204301], - [294, 3, 2166, "Metrics/BlockLength: Block has too many lines. [27/25]", 2219571348], - [354, 3, 1786, "Metrics/BlockLength: Block has too many lines. [30/25]", 1655451032], - [432, 3, 1345, "Metrics/BlockLength: Block has too many lines. [26/25]", 1188499098], - [534, 3, 3250, "Metrics/BlockLength: Block has too many lines. [64/25]", 2852118886], - [589, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 2115564430], - [602, 3, 752, "Metrics/AbcSize: Assignment Branch Condition size for `normalized_tree_node` is too high. [<0, 19, 4> 19.42/17]", 1725197185], - [602, 3, 752, "Metrics/MethodLength: Method has too many lines. [18/10]", 1725197185], - [623, 3, 850, "Metrics/AbcSize: Assignment Branch Condition size for `backend_capability` is too high. [<0, 20, 0> 20/17]", 3278569026], - [623, 3, 850, "Metrics/MethodLength: Method has too many lines. [14/10]", 3278569026], - [640, 3, 744, "Metrics/MethodLength: Method has too many lines. [13/10]", 1675624229], - [679, 3, 492, "Metrics/MethodLength: Method has too many lines. [11/10]", 4123526878], - [714, 3, 566, "Metrics/AbcSize: Assignment Branch Condition size for `parse_error_tolerance` is too high. [<1, 17, 1> 17.06/17]", 933590597], - [714, 3, 566, "Metrics/MethodLength: Method has too many lines. [14/10]", 933590597], - [739, 3, 2652, "Metrics/BlockLength: Block has too many lines. [47/25]", 214520278], - [1039, 7, 87, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3860036845], - [1045, 7, 60, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1411318317], - [1063, 3, 1334, "Metrics/BlockLength: Block has too many lines. [41/25]", 1427111445], - [1069, 7, 134, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1166944291], - [1075, 7, 60, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1411318317], - [1085, 7, 134, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1166944291], - [1091, 7, 60, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1411318317] - ], - "tree_haver.gemspec:665267582": [ - [16, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1512975621], - [129, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [146, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [147, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [154, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ] -} diff --git a/gems/tree_haver/Gemfile b/gems/tree_haver/Gemfile index 5209ba280..b1afe238c 100644 --- a/gems/tree_haver/Gemfile +++ b/gems/tree_haver/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source 'https://gem.coop' +source "https://gem.coop" git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,8 +19,8 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ['~> 1.0', '>= 1.0.8'] -gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ["~> 1.0", ">= 1.0.8"] +gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = @@ -29,25 +29,25 @@ if !tslp_declared_by_templating && tslp_dev.to_s.empty? end # Modular sibling dependencies (env-switched inside each modular Gemfile) -eval_gemfile 'gemfiles/modular/templating.gemfile' +eval_gemfile "gemfiles/modular/templating.gemfile" # Debugging -eval_gemfile 'gemfiles/modular/debug.gemfile' +eval_gemfile "gemfiles/modular/debug.gemfile" # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile 'gemfiles/modular/coverage.gemfile' +eval_gemfile "gemfiles/modular/coverage.gemfile" # Linting -eval_gemfile 'gemfiles/modular/style.gemfile' +eval_gemfile "gemfiles/modular/style.gemfile" # Documentation -eval_gemfile 'gemfiles/modular/documentation.gemfile' +eval_gemfile "gemfiles/modular/documentation.gemfile" # Optional -eval_gemfile 'gemfiles/modular/optional.gemfile' +eval_gemfile "gemfiles/modular/optional.gemfile" ### Std Lib Extracted Gems -eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' +eval_gemfile "gemfiles/modular/x_std_libs.gemfile" # See unlocked_deps appraisal for more details on irb inclusion -gem 'irb', '~> 1.17' # ruby >= 2.7 +gem "irb", "~> 1.17" # ruby >= 2.7 diff --git a/gems/tree_haver/Gemfile.lock b/gems/tree_haver/Gemfile.lock index 3fc8fdf81..086fa3943 100644 --- a/gems/tree_haver/Gemfile.lock +++ b/gems/tree_haver/Gemfile.lock @@ -7,59 +7,311 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -GEM - remote: https://gem.coop/ +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - ansi (1.6.0) - appraisal2 (3.2.0) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - ast (2.4.3) - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) ast-crispr-markdown-markly (7.1.0) ast-crispr (= 7.1.0) markly-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) prism (>= 1.0) version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: ast-merge (7.1.0) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) - backports (3.25.3) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: bash-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby + specs: + tree_sitter_language_pack (1.12.5) + rb_sys (>= 0.9, < 0.9.128) + sorbet-runtime (~> 0.5) + +GEM + remote: https://gem.coop/ + specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + ansi (1.6.0) + appraisal2 (3.2.0) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + 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) citrus (3.0.2) - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) cmdparse (3.0.7) commonmarker (2.9.0-aarch64-linux) commonmarker (2.9.0-aarch64-linux-musl) commonmarker (2.9.0-arm64-darwin) commonmarker (2.9.0-x86_64-linux) commonmarker (2.9.0-x86_64-linux-musl) - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -68,11 +320,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -122,52 +369,12 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -181,24 +388,12 @@ GEM turbo_tests2 (~> 3.1, >= 3.1.12) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) 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.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -224,31 +419,20 @@ GEM prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) psych (5.4.0) date stringio - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) 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.127) + rake-compiler-dock (= 1.12.0) rbs (4.0.3) logger prism (>= 1.6.0) tsort - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) rdoc (6.17.0) erb psych (>= 4.0.0) @@ -344,10 +528,6 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -356,22 +536,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -407,19 +583,9 @@ GEM version_gem (~> 1.1, >= 1.1.13) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.9.0.pre.rc.40-aarch64-linux) - sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.9.0.pre.rc.40-arm64-darwin) - sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) - sorbet-runtime (~> 0.5) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -434,10 +600,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.13) - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) yard (0.9.45) yard-fence (0.9.6) rdoc (>= 6.11, < 8) @@ -470,24 +632,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem (>= 7.0) - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-drift! + kettle-jem! + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -496,20 +679,28 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml (~> 0.3) + toml-merge! toml-rb (~> 4.1) tree_haver! + tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -520,10 +711,13 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) @@ -540,7 +734,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -554,16 +747,17 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -587,6 +781,8 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 @@ -597,6 +793,8 @@ 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) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 + rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 @@ -630,15 +828,15 @@ 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -656,11 +854,10 @@ CHECKSUMS toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) - tree_sitter_language_pack (1.9.0.pre.rc.40-aarch64-linux) sha256=c882f4039a1a84a8ed782ef5381a8556acdb53538055d0b9b30d0cd85a0f1b0a - tree_sitter_language_pack (1.9.0.pre.rc.40-arm64-darwin) sha256=b3dc68837a1a626afcbe1abb779cd987e9828a43c78e98cc70aa7e58957f3ef8 - tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) sha256=ad6743a373eeac954c1b659b17af3aff1c82918b3ce9c9dc572a7c70ff843cdd + tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -673,6 +870,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/tree_haver/Rakefile b/gems/tree_haver/Rakefile index ab2dc23d9..0a3c6f7a9 100644 --- a/gems/tree_haver/Rakefile +++ b/gems/tree_haver/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require 'kettle/drift' + require "kettle/drift" Kettle::Drift.install_tasks rescue LoadError - desc('(stub) kettle:drift:check is unavailable') - task('kettle:drift:check') do + desc("(stub) kettle:drift:check is unavailable") + task("kettle:drift:check") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:update is unavailable') - task('kettle:drift:update') do + desc("(stub) kettle:drift:update is unavailable") + task("kettle:drift:update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:force_update is unavailable') - task('kettle:drift:force_update') do + desc("(stub) kettle:drift:force_update is unavailable") + task("kettle:drift:force_update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift is unavailable') - task('kettle:drift' => 'kettle:drift:update') + desc("(stub) kettle:drift is unavailable") + task("kettle:drift" => "kettle:drift:update") end ### TEMPLATING TASKS diff --git a/gems/tree_haver/bin/yard b/gems/tree_haver/bin/yard index 5d516ad6f..a7e8b6eed 100755 --- a/gems/tree_haver/bin/yard +++ b/gems/tree_haver/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec('bundle', 'exec', 'rake', 'yard') +exec("bundle", "exec", "rake", "yard") diff --git a/gems/tree_haver/lib/tree_haver/version.rb b/gems/tree_haver/lib/tree_haver/version.rb index 43365bf4e..9bd0db819 100644 --- a/gems/tree_haver/lib/tree_haver/version.rb +++ b/gems/tree_haver/lib/tree_haver/version.rb @@ -2,7 +2,7 @@ module TreeHaver module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end From 603effbdf99329ec910d8fc58b2489dabcd60ec2 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:35:20 -0600 Subject: [PATCH 248/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-crispr/.rubocop_gradual.lock | 213 ++++++++++++++ gems/ast-crispr/Gemfile.lock | 388 +++----------------------- gems/tree_haver/Gemfile | 22 +- gems/tree_haver/Rakefile | 18 +- gems/tree_haver/bin/yard | 2 +- 5 files changed, 267 insertions(+), 376 deletions(-) create mode 100644 gems/ast-crispr/.rubocop_gradual.lock diff --git a/gems/ast-crispr/.rubocop_gradual.lock b/gems/ast-crispr/.rubocop_gradual.lock new file mode 100644 index 000000000..d920cf89f --- /dev/null +++ b/gems/ast-crispr/.rubocop_gradual.lock @@ -0,0 +1,213 @@ +{ + ".simplecov:3928423310": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:918344237": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "ast-crispr.gemspec:2262341056": [ + [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/ast-crispr.rb:247837913": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`ast-crispr.rb`) should use snake_case.", 5381] + ], + "lib/ast/crispr.rb:3730230259": [ + [12, 5, 11, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Error`.", 62528179], + [22, 5, 11, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Limit`.", 51888158], + [47, 7, 622, "Metrics/MethodLength: Method has too many lines. [14/10]", 2816807495], + [61, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], + [65, 7, 1168, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_hash` is too high. [<6, 29, 10> 31.26/17]", 3515286222], + [65, 7, 1168, "Metrics/MethodLength: Method has too many lines. [27/10]", 3515286222], + [90, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3685471369], + [96, 7, 822, "Metrics/AbcSize: Assignment Branch Condition size for `constraint_for_operator` is too high. [<5, 11, 13> 17.75/17]", 1402705503], + [96, 7, 822, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `constraint_for_operator` is too high. [8/7]", 1402705503], + [96, 7, 822, "Metrics/MethodLength: Method has too many lines. [19/10]", 1402705503], + [124, 5, 11, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Match`.", 52676120], + [127, 21, 73, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 344717847], + [172, 5, 18, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::MatchProfile`.", 365273299], + [172, 5, 4350, "Metrics/ClassLength: Class has too many lines. [115/100]", 1575766989], + [273, 7, 596, "Metrics/MethodLength: Method has too many lines. [14/10]", 2070486858], + [314, 5, 24, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::DestinationProfile`.", 3442102524], + [314, 5, 4581, "Metrics/ClassLength: Class has too many lines. [119/100]", 3503477661], + [352, 21, 126, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 931636409], + [417, 7, 667, "Metrics/MethodLength: Method has too many lines. [15/10]", 4004247638], + [460, 5, 27, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::DestinationResolution`.", 1305107769], + [474, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::StructureProfile`.", 614380405], + [512, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::SelectionProfile`.", 2464089216], + [531, 21, 165, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1182500333], + [566, 7, 585, "Metrics/MethodLength: Method has too many lines. [13/10]", 13786997], + [583, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::OperationProfile`.", 1974079861], + [607, 21, 188, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2526147676], + [662, 7, 478, "Metrics/MethodLength: Method has too many lines. [11/10]", 795235914], + [695, 7, 10, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Adapters::Null`.", 3515430288], + [728, 5, 21, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::DocumentContext`.", 594998459], + [788, 5, 19, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::OwnerSelector`.", 3092459999], + [791, 21, 81, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2293822273], + [853, 7, 606, "Metrics/MethodLength: Method has too many lines. [16/10]", 422136278], + [883, 5, 16, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::Selectors`.", 2133324825], + [883, 5, 5586, "Metrics/ModuleLength: Module has too many lines. [130/100]", 3440946513], + [886, 7, 1642, "Metrics/AbcSize: Assignment Branch Condition size for `owner_filter` is too high. [<6, 18, 11> 21.93/17]", 3224577904], + [886, 7, 1642, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `owner_filter` is too high. [10/7]", 3224577904], + [886, 7, 1642, "Metrics/MethodLength: Method has too many lines. [37/10]", 3224577904], + [886, 7, 1642, "Metrics/PerceivedComplexity: Perceived complexity for `owner_filter` is too high. [11/8]", 3224577904], + [886, 23, 135, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3231562627], + [930, 7, 1936, "Metrics/AbcSize: Assignment Branch Condition size for `comment_region_owned_owner` is too high. [<7, 16, 7> 18.81/17]", 2629441148], + [930, 7, 1936, "Metrics/MethodLength: Method has too many lines. [40/10]", 2629441148], + [930, 37, 190, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 4159525724], + [931, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 940069302], + [975, 7, 1731, "Metrics/AbcSize: Assignment Branch Condition size for `line_block` is too high. [<12, 22, 14> 28.71/17]", 1307990669], + [975, 7, 1731, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `line_block` is too high. [12/7]", 1307990669], + [975, 7, 1731, "Metrics/MethodLength: Method has too many lines. [38/10]", 1307990669], + [975, 7, 1731, "Metrics/PerceivedComplexity: Perceived complexity for `line_block` is too high. [12/8]", 1307990669], + [975, 21, 130, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 515174999], + [1027, 5, 23, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::OperationSupport`.", 343849029], + [1027, 5, 6491, "Metrics/ModuleLength: Module has too many lines. [139/100]", 2271788056], + [1072, 7, 1758, "Metrics/AbcSize: Assignment Branch Condition size for `insertion_from` is too high. [<5, 21, 11> 24.23/17]", 29011294], + [1072, 7, 1758, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `insertion_from` is too high. [9/7]", 29011294], + [1072, 7, 1758, "Metrics/MethodLength: Method has too many lines. [28/10]", 29011294], + [1072, 7, 1758, "Metrics/PerceivedComplexity: Perceived complexity for `insertion_from` is too high. [10/8]", 29011294], + [1115, 7, 827, "Metrics/AbcSize: Assignment Branch Condition size for `splice_after_anchor` is too high. [<4, 19, 2> 19.52/17]", 14691010], + [1115, 7, 827, "Metrics/MethodLength: Method has too many lines. [16/10]", 14691010], + [1119, 9, 72, "Style/RaiseArgs: Provide an exception class and message as arguments to `raise`.", 789091243], + [1121, 23, 72, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 2503424841], + [1153, 9, 25, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 768340433], + [1197, 5, 26, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::OperationProfilable`.", 4114431854], + [1206, 7, 19, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::OperationProfilable::ClassMethods`.", 3606528253], + [1218, 5, 13, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Replace`.", 1563590855], + [1243, 7, 643, "Metrics/AbcSize: Assignment Branch Condition size for `call` is too high. [<10, 32, 3> 33.66/17]", 3656683885], + [1243, 7, 643, "Metrics/MethodLength: Method has too many lines. [14/10]", 3656683885], + [1262, 5, 12, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Delete`.", 2011475922], + [1286, 7, 538, "Metrics/AbcSize: Assignment Branch Condition size for `call` is too high. [<7, 21, 1> 22.16/17]", 2655200768], + [1286, 7, 538, "Metrics/MethodLength: Method has too many lines. [13/10]", 2655200768], + [1304, 5, 12, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Insert`.", 1590185308], + [1338, 5, 10, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::Move`.", 3515667002], + [1366, 7, 1182, "Metrics/AbcSize: Assignment Branch Condition size for `call` is too high. [<14, 40, 7> 42.95/17]", 172197360], + [1366, 7, 1182, "Metrics/MethodLength: Method has too many lines. [22/10]", 172197360], + [1383, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2688172402], + [1396, 3, 13, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr`.", 315644438], + [1396, 3, 12758, "Metrics/ModuleLength: Module has too many lines. [180/100]", 2662313186], + [1397, 5, 33, "Style/Documentation: Missing top-level documentation comment for `module Ast::Crispr::ProfileReportCompatibility`.", 3039519892], + [1419, 5, 18, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::MatchProfile`.", 365273299], + [1431, 7, 28, "Lint/DuplicateMethods: Method `Ast::Crispr::MatchProfile#normalize_start_boundary` is defined at both lib/ast/crispr.rb:292 and lib/ast/crispr.rb:1431.", 2362701855], + [1435, 7, 26, "Lint/DuplicateMethods: Method `Ast::Crispr::MatchProfile#normalize_end_boundary` is defined at both lib/ast/crispr.rb:299 and lib/ast/crispr.rb:1435.", 2613594544], + [1439, 7, 26, "Lint/DuplicateMethods: Method `Ast::Crispr::MatchProfile#normalize_payload_kind` is defined at both lib/ast/crispr.rb:306 and lib/ast/crispr.rb:1439.", 2604742721], + [1444, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::SelectionProfile`.", 2464089216], + [1466, 7, 14, "Lint/DuplicateMethods: Method `Ast::Crispr::SelectionProfile#initialize` is defined at both lib/ast/crispr.rb:531 and lib/ast/crispr.rb:1466.", 956205738], + [1466, 7, 773, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `initialize` is too high. [8/7]", 771809109], + [1466, 7, 773, "Metrics/MethodLength: Method has too many lines. [11/10]", 771809109], + [1466, 21, 190, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 4167448336], + [1481, 7, 1286, "Metrics/AbcSize: Assignment Branch Condition size for `report` is too high. [<5, 29, 13> 32.17/17]", 1720478959], + [1481, 7, 1286, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report` is too high. [11/7]", 1720478959], + [1481, 7, 1286, "Metrics/MethodLength: Method has too many lines. [17/10]", 1720478959], + [1481, 7, 1286, "Metrics/PerceivedComplexity: Perceived complexity for `report` is too high. [11/8]", 1720478959], + [1496, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 1470192175], + [1520, 5, 24, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::DestinationProfile`.", 3442102524], + [1534, 7, 29, "Lint/DuplicateMethods: Method `Ast::Crispr::DestinationProfile#normalize_resolution_kind` is defined at both lib/ast/crispr.rb:437 and lib/ast/crispr.rb:1534.", 99310177], + [1538, 7, 31, "Lint/DuplicateMethods: Method `Ast::Crispr::DestinationProfile#normalize_resolution_source` is defined at both lib/ast/crispr.rb:444 and lib/ast/crispr.rb:1538.", 1692065396], + [1542, 7, 29, "Lint/DuplicateMethods: Method `Ast::Crispr::DestinationProfile#normalize_anchor_boundary` is defined at both lib/ast/crispr.rb:452 and lib/ast/crispr.rb:1542.", 3028754726], + [1547, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::OperationProfile`.", 1974079861], + [1550, 7, 733, "Metrics/MethodLength: Method has too many lines. [13/10]", 2619513218], + [1570, 7, 25, "Lint/DuplicateMethods: Method `Ast::Crispr::OperationProfile#normalize_requirement` is defined at both lib/ast/crispr.rb:678 and lib/ast/crispr.rb:1570.", 440444039], + [1574, 7, 32, "Lint/DuplicateMethods: Method `Ast::Crispr::OperationProfile#normalize_replacement_source` is defined at both lib/ast/crispr.rb:686 and lib/ast/crispr.rb:1574.", 3533021156], + [1579, 5, 22, "Style/Documentation: Missing top-level documentation comment for `class Ast::Crispr::StructureProfile`.", 614380405], + [1595, 5, 6309, "Metrics/ClassLength: Class has too many lines. [172/100]", 1270437788], + [1600, 7, 2717, "Metrics/MethodLength: Method has too many lines. [67/10]", 1469599129], + [1665, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 259030389], + [1678, 28, 247, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3385598543], + [1710, 28, 242, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1038219895] + ], + "lib/ast/crispr/rspec/shared_examples/destination_profile.rb:2529475135": [ + [3, 1, 2386, "Metrics/BlockLength: Block has too many lines. [28/25]", 2846758965], + [4, 3, 2311, "Metrics/BlockLength: Block has too many lines. [26/25]", 2123267236] + ], + "lib/ast/crispr/rspec/shared_examples/match_profile.rb:2566447993": [ + [3, 1, 1997, "Metrics/BlockLength: Block has too many lines. [26/25]", 1032277788] + ], + "lib/ast/crispr/rspec/shared_examples/operation_profile.rb:3583567850": [ + [3, 1, 2148, "Metrics/BlockLength: Block has too many lines. [26/25]", 2745151209] + ], + "spec/old_runtime_spec.rb:1564590841": [ + [3, 1, 17728, "Metrics/BlockLength: Block has too many lines. [383/25]", 205400157], + [4, 3, 69, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3712453399], + [5, 3, 68, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1429320782], + [6, 3, 59, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 253007150], + [8, 3, 891, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 361389624], + [18, 37, 11, "Lint/UnusedMethodArgument: Unused method argument - `owner_scope`.", 3846606321], + [22, 46, 6, "Lint/UnusedMethodArgument: Unused method argument - `region`.", 2124512157], + [22, 64, 11, "Lint/UnusedMethodArgument: Unused method argument - `owner_scope`.", 3846606321], + [73, 3, 8534, "Metrics/BlockLength: Block has too many lines. [176/25]", 3042299525], + [313, 3, 3640, "Metrics/BlockLength: Block has too many lines. [72/25]", 1133370152], + [418, 3, 1663, "Metrics/BlockLength: Block has too many lines. [41/25]", 115074475] + ] +} diff --git a/gems/ast-crispr/Gemfile.lock b/gems/ast-crispr/Gemfile.lock index a708f53d0..2760d97db 100644 --- a/gems/ast-crispr/Gemfile.lock +++ b/gems/ast-crispr/Gemfile.lock @@ -7,31 +7,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -39,248 +15,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -307,12 +41,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -321,6 +49,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -376,6 +105,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -394,7 +132,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -539,18 +276,22 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -584,11 +325,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -636,44 +377,23 @@ DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -682,26 +402,18 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -709,34 +421,20 @@ CHECKSUMS appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -749,27 +447,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -784,14 +474,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -799,7 +485,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -827,19 +512,18 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -853,19 +537,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -873,7 +552,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/tree_haver/Gemfile b/gems/tree_haver/Gemfile index b1afe238c..5209ba280 100644 --- a/gems/tree_haver/Gemfile +++ b/gems/tree_haver/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source "https://gem.coop" +source 'https://gem.coop' git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,8 +19,8 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ["~> 1.0", ">= 1.0.8"] -gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ['~> 1.0', '>= 1.0.8'] +gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = @@ -29,25 +29,25 @@ if !tslp_declared_by_templating && tslp_dev.to_s.empty? end # Modular sibling dependencies (env-switched inside each modular Gemfile) -eval_gemfile "gemfiles/modular/templating.gemfile" +eval_gemfile 'gemfiles/modular/templating.gemfile' # Debugging -eval_gemfile "gemfiles/modular/debug.gemfile" +eval_gemfile 'gemfiles/modular/debug.gemfile' # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile "gemfiles/modular/coverage.gemfile" +eval_gemfile 'gemfiles/modular/coverage.gemfile' # Linting -eval_gemfile "gemfiles/modular/style.gemfile" +eval_gemfile 'gemfiles/modular/style.gemfile' # Documentation -eval_gemfile "gemfiles/modular/documentation.gemfile" +eval_gemfile 'gemfiles/modular/documentation.gemfile' # Optional -eval_gemfile "gemfiles/modular/optional.gemfile" +eval_gemfile 'gemfiles/modular/optional.gemfile' ### Std Lib Extracted Gems -eval_gemfile "gemfiles/modular/x_std_libs.gemfile" +eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' # See unlocked_deps appraisal for more details on irb inclusion -gem "irb", "~> 1.17" # ruby >= 2.7 +gem 'irb', '~> 1.17' # ruby >= 2.7 diff --git a/gems/tree_haver/Rakefile b/gems/tree_haver/Rakefile index 0a3c6f7a9..ab2dc23d9 100644 --- a/gems/tree_haver/Rakefile +++ b/gems/tree_haver/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require "kettle/drift" + require 'kettle/drift' Kettle::Drift.install_tasks rescue LoadError - desc("(stub) kettle:drift:check is unavailable") - task("kettle:drift:check") do + desc('(stub) kettle:drift:check is unavailable') + task('kettle:drift:check') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:update is unavailable") - task("kettle:drift:update") do + desc('(stub) kettle:drift:update is unavailable') + task('kettle:drift:update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:force_update is unavailable") - task("kettle:drift:force_update") do + desc('(stub) kettle:drift:force_update is unavailable') + task('kettle:drift:force_update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift is unavailable") - task("kettle:drift" => "kettle:drift:update") + desc('(stub) kettle:drift is unavailable') + task('kettle:drift' => 'kettle:drift:update') end ### TEMPLATING TASKS diff --git a/gems/tree_haver/bin/yard b/gems/tree_haver/bin/yard index a7e8b6eed..5d516ad6f 100755 --- a/gems/tree_haver/bin/yard +++ b/gems/tree_haver/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec("bundle", "exec", "rake", "yard") +exec('bundle', 'exec', 'rake', 'yard') From a95d77240ab6b9b2ecdfb70d5a973e5a65387719 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:35:24 -0600 Subject: [PATCH 249/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-crispr-ruby-prism/Gemfile.lock | 334 ++++++++++++++- gems/ast-crispr/Gemfile.lock | 337 +++++++++++++++- gems/ast-merge/.kettle-drift.lock | 60 ++- gems/ast-merge/Gemfile | 70 +++- gems/ast-merge/Rakefile | 18 +- gems/ast-merge/lib/ast/merge/version.rb | 2 +- gems/markdown-merge/Gemfile.lock | 370 ++++++++++++++++- gems/tree_haver/.rubocop_gradual.lock | 467 +++++++++++++++++++++ gems/tree_haver/Gemfile.lock | 468 +++++++--------------- gems/tree_haver/lib/tree_haver/version.rb | 2 +- 10 files changed, 1714 insertions(+), 414 deletions(-) create mode 100644 gems/tree_haver/.rubocop_gradual.lock diff --git a/gems/ast-crispr-ruby-prism/Gemfile.lock b/gems/ast-crispr-ruby-prism/Gemfile.lock index f71a1ee42..95bd2e289 100644 --- a/gems/ast-crispr-ruby-prism/Gemfile.lock +++ b/gems/ast-crispr-ruby-prism/Gemfile.lock @@ -7,13 +7,264 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: ast-crispr (7.1.0) ast-merge (= 7.1.0) service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -32,11 +283,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -45,6 +291,8 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -108,6 +356,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -136,6 +386,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-x86_64-linux-gnu) racc (~> 1.4) @@ -321,11 +572,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -368,23 +619,44 @@ DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -393,18 +665,26 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -412,14 +692,23 @@ CHECKSUMS appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -427,6 +716,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -439,19 +729,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-x86_64-linux-gnu) sha256=379fae440b28915e3f19d752ce2dcf8465ed2b2fbefd2a7ca0dd497bc981a06a nokogiri (1.19.4-x86_64-linux-musl) sha256=17dfb7c1fa194ae02fbf7c51a7afc8d278045ab3fdacfd86f91d02d7b274470b @@ -462,10 +760,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -473,6 +775,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -500,9 +803,11 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -512,6 +817,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -525,14 +831,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -540,6 +851,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ast-crispr/Gemfile.lock b/gems/ast-crispr/Gemfile.lock index 2760d97db..b731cdd46 100644 --- a/gems/ast-crispr/Gemfile.lock +++ b/gems/ast-crispr/Gemfile.lock @@ -7,7 +7,31 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -15,6 +39,232 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -41,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -104,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -132,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -325,11 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -377,23 +636,44 @@ DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -402,18 +682,26 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -421,13 +709,27 @@ CHECKSUMS appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -435,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -447,19 +750,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -474,10 +785,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -485,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -512,9 +828,11 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -524,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -537,14 +856,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -552,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ast-merge/.kettle-drift.lock b/gems/ast-merge/.kettle-drift.lock index 7854ba3b4..d58d979f9 100644 --- a/gems/ast-merge/.kettle-drift.lock +++ b/gems/ast-merge/.kettle-drift.lock @@ -8,7 +8,8 @@ 159, 199, 239, - 279 + 279, + 319 ] } ], @@ -21,7 +22,8 @@ 170, 210, 250, - 290 + 290, + 330 ] } ], @@ -34,7 +36,8 @@ 160, 200, 240, - 280 + 280, + 320 ] } ], @@ -47,7 +50,8 @@ 172, 212, 252, - 292 + 292, + 332 ] } ], @@ -60,7 +64,8 @@ 175, 215, 255, - 295 + 295, + 335 ] } ], @@ -73,7 +78,8 @@ 161, 201, 241, - 281 + 281, + 321 ] } ], @@ -87,7 +93,8 @@ 179, 219, 259, - 299 + 299, + 339 ] } ], @@ -100,7 +107,8 @@ 180, 220, 260, - 300 + 300, + 340 ] } ], @@ -114,7 +122,8 @@ 166, 206, 246, - 286 + 286, + 326 ] } ], @@ -127,7 +136,8 @@ 189, 229, 269, - 309 + 309, + 349 ] } ], @@ -141,7 +151,8 @@ 158, 198, 238, - 278 + 278, + 318 ] } ], @@ -155,7 +166,8 @@ 188, 228, 268, - 308 + 308, + 348 ] } ], @@ -168,7 +180,8 @@ 164, 204, 244, - 284 + 284, + 324 ] } ], @@ -182,7 +195,8 @@ 171, 211, 251, - 291 + 291, + 331 ] } ], @@ -196,7 +210,8 @@ 167, 207, 247, - 287 + 287, + 327 ] } ], @@ -209,7 +224,8 @@ 165, 205, 245, - 285 + 285, + 325 ] } ], @@ -222,7 +238,8 @@ 182, 222, 262, - 302 + 302, + 342 ] } ], @@ -235,7 +252,8 @@ 181, 221, 261, - 301 + 301, + 341 ] } ], @@ -248,7 +266,8 @@ 176, 216, 256, - 296 + 296, + 336 ] } ], @@ -261,7 +280,8 @@ 185, 225, 265, - 305 + 305, + 345 ] } ], diff --git a/gems/ast-merge/Gemfile b/gems/ast-merge/Gemfile index 883a8e0dc..9fb5133cc 100644 --- a/gems/ast-merge/Gemfile +++ b/gems/ast-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source 'https://gem.coop' +source "https://gem.coop" git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,17 +19,61 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ['~> 1.0', '>= 1.0.8'] -gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ["~> 1.0", ">= 1.0.8"] +gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ tree_haver ] -direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') +direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? + +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) + direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") + direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == "nomono" } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + if nomono_locked + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] + end + end + Kernel.send(:gem, "nomono", *nomono_activation_requirements) + require "nomono/bundler" + if direct_sibling_templating && !direct_sibling_local + ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + end + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: "STRUCTUREDMERGE", + path_env: "STRUCTUREDMERGE_DEV", + root: ["src", "my", "structuredmerge"] + ) + rescue LoadError + warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + else + ENV.delete("STRUCTUREDMERGE_DEV") + end + end + end +end if direct_sibling_gems.any? && (direct_sibling_local || @@ -329,25 +373,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? # Debugging -eval_gemfile 'gemfiles/modular/debug.gemfile' +eval_gemfile "gemfiles/modular/debug.gemfile" # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile 'gemfiles/modular/coverage.gemfile' +eval_gemfile "gemfiles/modular/coverage.gemfile" # Linting -eval_gemfile 'gemfiles/modular/style.gemfile' +eval_gemfile "gemfiles/modular/style.gemfile" # Documentation -eval_gemfile 'gemfiles/modular/documentation.gemfile' +eval_gemfile "gemfiles/modular/documentation.gemfile" # Optional -eval_gemfile 'gemfiles/modular/optional.gemfile' +eval_gemfile "gemfiles/modular/optional.gemfile" ### Std Lib Extracted Gems -eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' +eval_gemfile "gemfiles/modular/x_std_libs.gemfile" # See unlocked_deps appraisal for more details on irb inclusion -gem 'irb', '~> 1.17' # ruby >= 2.7 +gem "irb", "~> 1.17" # ruby >= 2.7 diff --git a/gems/ast-merge/Rakefile b/gems/ast-merge/Rakefile index 339c9a3cb..6b4e21dec 100644 --- a/gems/ast-merge/Rakefile +++ b/gems/ast-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require 'kettle/drift' + require "kettle/drift" Kettle::Drift.install_tasks rescue LoadError - desc('(stub) kettle:drift:check is unavailable') - task('kettle:drift:check') do + desc("(stub) kettle:drift:check is unavailable") + task("kettle:drift:check") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:update is unavailable') - task('kettle:drift:update') do + desc("(stub) kettle:drift:update is unavailable") + task("kettle:drift:update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:force_update is unavailable') - task('kettle:drift:force_update') do + desc("(stub) kettle:drift:force_update is unavailable") + task("kettle:drift:force_update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift is unavailable') - task('kettle:drift' => 'kettle:drift:update') + desc("(stub) kettle:drift is unavailable") + task("kettle:drift" => "kettle:drift:update") end ### TEMPLATING TASKS diff --git a/gems/ast-merge/lib/ast/merge/version.rb b/gems/ast-merge/lib/ast/merge/version.rb index 6e7dc90f7..3ef823f4d 100644 --- a/gems/ast-merge/lib/ast/merge/version.rb +++ b/gems/ast-merge/lib/ast/merge/version.rb @@ -3,7 +3,7 @@ module Ast module Merge module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/markdown-merge/Gemfile.lock b/gems/markdown-merge/Gemfile.lock index 0fdd2d4f9..3e631c3cf 100644 --- a/gems/markdown-merge/Gemfile.lock +++ b/gems/markdown-merge/Gemfile.lock @@ -1,13 +1,3 @@ -GIT - remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a - branch: fix/ruby-parser-api-methods - glob: packages/ruby/*.gemspec - specs: - tree_sitter_language_pack (1.12.5) - rb_sys (>= 0.9, < 0.9.128) - sorbet-runtime (~> 0.5) - PATH remote: . specs: @@ -16,6 +6,272 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby + specs: + tree_sitter_language_pack (1.12.5) + rb_sys (>= 0.9, < 0.9.128) + sorbet-runtime (~> 0.5) + GEM remote: https://gem.coop/ specs: @@ -27,11 +283,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -103,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -131,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -322,11 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -373,23 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -398,31 +682,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -430,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -442,20 +750,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -470,10 +785,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -481,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -508,9 +828,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -519,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -532,14 +856,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -547,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/tree_haver/.rubocop_gradual.lock b/gems/tree_haver/.rubocop_gradual.lock new file mode 100644 index 000000000..2a04c6a43 --- /dev/null +++ b/gems/tree_haver/.rubocop_gradual.lock @@ -0,0 +1,467 @@ +{ + ".simplecov:3575099246": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Gemfile:31081928": [ + [28, 1, 59, "Lint/EmptyConditionalBody: Avoid `if` branches without a body.", 4279378582] + ], + "Rakefile:1868927885": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/tree_haver.rb:2762889207": [ + [49, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465], + [49, 1, 15892, "Metrics/ModuleLength: Module has too many lines. [421/100]", 2307494458], + [67, 3, 566, "Metrics/MethodLength: Method has too many lines. [12/10]", 1536513137], + [124, 3, 272, "Metrics/MethodLength: Method has too many lines. [11/10]", 505877912], + [156, 3, 543, "Metrics/MethodLength: Method has too many lines. [14/10]", 3733215372], + [221, 3, 458, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `backend_module` is too high. [9/7]", 73937708], + [221, 3, 458, "Metrics/MethodLength: Method has too many lines. [12/10]", 73937708], + [221, 3, 458, "Metrics/PerceivedComplexity: Perceived complexity for `backend_module` is too high. [9/8]", 73937708], + [257, 3, 1024, "Metrics/AbcSize: Assignment Branch Condition size for `register_language` is too high. [<0, 20, 10> 22.36/17]", 53014028], + [257, 3, 1024, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `register_language` is too high. [11/7]", 53014028], + [257, 3, 1024, "Metrics/MethodLength: Method has too many lines. [12/10]", 53014028], + [257, 3, 1024, "Metrics/PerceivedComplexity: Perceived complexity for `register_language` is too high. [11/8]", 53014028], + [257, 24, 150, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 893242366], + [282, 3, 1521, "Metrics/AbcSize: Assignment Branch Condition size for `parser_for` is too high. [<12, 27, 14> 32.7/17]", 498764853], + [282, 3, 1521, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parser_for` is too high. [15/7]", 498764853], + [282, 3, 1521, "Metrics/MethodLength: Method has too many lines. [30/10]", 498764853], + [282, 3, 1521, "Metrics/PerceivedComplexity: Perceived complexity for `parser_for` is too high. [15/8]", 498764853], + [325, 3, 2089, "Metrics/MethodLength: Method has too many lines. [51/10]", 2791676388], + [379, 3, 704, "Metrics/AbcSize: Assignment Branch Condition size for `requested_backend_type` is too high. [<4, 17, 9> 19.65/17]", 3087691662], + [379, 3, 704, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `requested_backend_type` is too high. [8/7]", 3087691662], + [379, 3, 704, "Metrics/MethodLength: Method has too many lines. [14/10]", 3087691662], + [379, 3, 704, "Metrics/PerceivedComplexity: Perceived complexity for `requested_backend_type` is too high. [9/8]", 3087691662], + [409, 3, 696, "Metrics/MethodLength: Method has too many lines. [14/10]", 307274721], + [502, 3, 489, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `backend_module_for` is too high. [10/7]", 3448932255], + [502, 3, 489, "Metrics/MethodLength: Method has too many lines. [22/10]", 3448932255] + ], + "lib/tree_haver/backend_api.rb:3354059061": [ + [30, 3, 12181, "Metrics/ModuleLength: Module has too many lines. [243/100]", 205645546], + [139, 5, 8882, "Metrics/ClassLength: Class has too many lines. [180/100]", 4281605197], + [145, 7, 1502, "Metrics/AbcSize: Assignment Branch Condition size for `validate` is too high. [<4, 22, 10> 24.49/17]", 747017743], + [145, 7, 1502, "Metrics/MethodLength: Method has too many lines. [31/10]", 747017743], + [145, 7, 1502, "Metrics/PerceivedComplexity: Perceived complexity for `validate` is too high. [11/8]", 747017743], + [213, 7, 903, "Metrics/MethodLength: Method has too many lines. [24/10]", 3041411230], + [261, 7, 1271, "Metrics/AbcSize: Assignment Branch Condition size for `validate_capabilities_hash` is too high. [<7, 27, 7> 28.76/17]", 3965262932], + [261, 7, 1271, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_capabilities_hash` is too high. [8/7]", 3965262932], + [261, 7, 1271, "Metrics/MethodLength: Method has too many lines. [25/10]", 3965262932], + [277, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2253399502], + [296, 7, 908, "Metrics/AbcSize: Assignment Branch Condition size for `validate_language` is too high. [<6, 17, 4> 18.47/17]", 733551867], + [315, 7, 797, "Metrics/AbcSize: Assignment Branch Condition size for `validate_parser` is too high. [<5, 16, 7> 18.17/17]", 1229041751], + [315, 7, 797, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_parser` is too high. [8/7]", 1229041751], + [315, 7, 797, "Metrics/MethodLength: Method has too many lines. [15/10]", 1229041751], + [349, 7, 862, "Metrics/AbcSize: Assignment Branch Condition size for `validate_node_class` is too high. [<8, 18, 8> 21.26/17]", 1873188195], + [349, 7, 862, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_node_class` is too high. [8/7]", 1873188195], + [349, 7, 862, "Metrics/MethodLength: Method has too many lines. [20/10]", 1873188195], + [349, 7, 862, "Metrics/PerceivedComplexity: Perceived complexity for `validate_node_class` is too high. [9/8]", 1873188195], + [375, 11, 20, "Naming/PredicatePrefix: Rename `has_method_or_alias?` to `method_or_alias?`.", 285116235] + ], + "lib/tree_haver/backend_context.rb:159197618": [ + [3, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465] + ], + "lib/tree_haver/backend_registry.rb:4046212912": [ + [4, 3, 22, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver::BackendRegistry`.", 733935278], + [4, 3, 5121, "Metrics/ModuleLength: Module has too many lines. [152/100]", 1483988260], + [39, 5, 382, "Metrics/MethodLength: Method has too many lines. [11/10]", 2000730238], + [48, 16, 1, "Style/DoubleNegation: Avoid the use of double negation (`!!`).", 177540], + [55, 5, 889, "Metrics/AbcSize: Assignment Branch Condition size for `register_tag` is too high. [<5, 20, 5> 21.21/17]", 2276764069], + [55, 5, 889, "Metrics/MethodLength: Method has too many lines. [18/10]", 2276764069], + [105, 5, 397, "Metrics/MethodLength: Method has too many lines. [11/10]", 4007185633] + ], + "lib/tree_haver/backends/citrus.rb:3181984499": [ + [40, 9, 449, "Metrics/MethodLength: Method has too many lines. [11/10]", 1138819533], + [173, 11, 1133, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [11/7]", 2613019266], + [173, 11, 1133, "Metrics/MethodLength: Method has too many lines. [16/10]", 2613019266], + [173, 11, 1133, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [11/8]", 2613019266], + [230, 9, 597, "Metrics/MethodLength: Method has too many lines. [12/10]", 3923424594], + [403, 9, 810, "Metrics/AbcSize: Assignment Branch Condition size for `structural?` is too high. [<3, 19, 8> 20.83/17]", 3166173256], + [403, 9, 810, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structural?` is too high. [9/7]", 3166173256], + [403, 9, 810, "Metrics/MethodLength: Method has too many lines. [12/10]", 3166173256], + [403, 9, 810, "Metrics/PerceivedComplexity: Perceived complexity for `structural?` is too high. [9/8]", 3166173256], + [436, 9, 1272, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_type_from_event` is too high. [9/7]", 2022108773], + [436, 9, 1272, "Metrics/MethodLength: Method has too many lines. [16/10]", 2022108773], + [436, 9, 1272, "Metrics/PerceivedComplexity: Perceived complexity for `extract_type_from_event` is too high. [10/8]", 2022108773], + [460, 11, 207, "Style/CaseLikeIf: Convert `if-elsif` to `case-when`.", 1995588659], + [476, 61, 10, "Style/NumericPredicate: Use `offset.positive?` instead of `offset > 0`.", 2454414278] + ], + "lib/tree_haver/backends/ffi.rb:691415497": [ + [83, 9, 853, "Metrics/MethodLength: Method has too many lines. [15/10]", 1876257977], + [147, 7, 7352, "Metrics/ModuleLength: Module has too many lines. [111/100]", 4125377349], + [148, 9, 7320, "Metrics/ClassLength: Class has too many lines. [109/100]", 1130902814], + [183, 11, 559, "Metrics/MethodLength: Method has too many lines. [11/10]", 678018999], + [232, 11, 4265, "Metrics/AbcSize: Assignment Branch Condition size for `try_load!` is too high. [<11, 40, 10> 42.67/17]", 2312962113], + [232, 11, 4265, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `try_load!` is too high. [10/7]", 2312962113], + [232, 11, 4265, "Metrics/MethodLength: Method has too many lines. [58/10]", 2312962113], + [232, 11, 4265, "Metrics/PerceivedComplexity: Perceived complexity for `try_load!` is too high. [11/8]", 2312962113], + [260, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2086221887], + [262, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2163360042], + [367, 9, 312, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `<=>` is too high. [8/7]", 2433292528], + [437, 11, 4377, "Metrics/AbcSize: Assignment Branch Condition size for `from_library` is too high. [<16, 30, 18> 38.47/17]", 3403850855], + [437, 11, 4377, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [17/7]", 3403850855], + [437, 11, 4377, "Metrics/MethodLength: Method has too many lines. [43/10]", 3403850855], + [437, 11, 4377, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [19/8]", 3403850855], + [437, 47, 4, "Lint/UnusedMethodArgument: Unused method argument - `name`.", 2087876002], + [502, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2415433817], + [554, 9, 3159, "Metrics/AbcSize: Assignment Branch Condition size for `language=` is too high. [<4, 44, 11> 45.53/17]", 1815427493], + [554, 9, 3159, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `language=` is too high. [10/7]", 1815427493], + [554, 9, 3159, "Metrics/MethodLength: Method has too many lines. [40/10]", 1815427493], + [554, 9, 3159, "Metrics/PerceivedComplexity: Perceived complexity for `language=` is too high. [10/8]", 1815427493], + [715, 7, 10494, "Metrics/ClassLength: Class has too many lines. [129/100]", 3710916551], + [744, 45, 9, "Style/NumericPredicate: Use `index.negative?` instead of `index < 0`.", 4215255415], + [807, 13, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183], + [889, 21, 9, "Style/NumericPredicate: Use `index.negative?` instead of `index < 0`.", 4215255415], + [933, 9, 694, "Metrics/AbcSize: Assignment Branch Condition size for `descendant_for_point_range` is too high. [<7, 21, 5> 22.69/17]", 979329510], + [953, 9, 706, "Metrics/AbcSize: Assignment Branch Condition size for `named_descendant_for_point_range` is too high. [<7, 21, 5> 22.69/17]", 2494446138] + ], + "lib/tree_haver/backends/java.rb:3360169733": [ + [134, 7, 815, "Metrics/AbcSize: Assignment Branch Condition size for `configure_native_library_path!` is too high. [<4, 17, 6> 18.47/17]", 1362415302], + [227, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3409700051], + [260, 7, 9885, "Metrics/ClassLength: Class has too many lines. [114/100]", 136252046], + [292, 9, 312, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `<=>` is too high. [8/7]", 2433292528], + [340, 11, 4098, "Metrics/AbcSize: Assignment Branch Condition size for `from_library` is too high. [<19, 32, 14> 39.76/17]", 3050250526], + [340, 11, 4098, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [14/7]", 3050250526], + [340, 11, 4098, "Metrics/MethodLength: Method has too many lines. [48/10]", 3050250526], + [340, 11, 4098, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [16/8]", 3050250526], + [426, 11, 2084, "Metrics/AbcSize: Assignment Branch Condition size for `load_by_name` is too high. [<11, 17, 6> 21.12/17]", 226213748], + [426, 11, 2084, "Metrics/MethodLength: Method has too many lines. [35/10]", 226213748], + [542, 9, 1016, "Metrics/MethodLength: Method has too many lines. [17/10]", 4123264427], + [649, 9, 702, "Metrics/MethodLength: Method has too many lines. [14/10]", 1334016319], + [649, 17, 89, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3152137646], + [728, 9, 583, "Metrics/MethodLength: Method has too many lines. [11/10]", 2457478600], + [816, 13, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183] + ], + "lib/tree_haver/backends/mri.rb:863330290": [ + [59, 9, 916, "Metrics/MethodLength: Method has too many lines. [15/10]", 749971754], + [179, 9, 312, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `<=>` is too high. [8/7]", 2433292528], + [232, 11, 1562, "Metrics/MethodLength: Method has too many lines. [11/10]", 3858647816] + ], + "lib/tree_haver/backends/parslet.rb:4170691266": [ + [41, 9, 323, "Metrics/MethodLength: Method has too many lines. [11/10]", 694290592], + [108, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193340030], + [172, 11, 1133, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [11/7]", 2613019266], + [172, 11, 1133, "Metrics/MethodLength: Method has too many lines. [16/10]", 2613019266], + [172, 11, 1133, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [11/8]", 2613019266], + [246, 9, 591, "Metrics/MethodLength: Method has too many lines. [12/10]", 3007454066], + [335, 7, 6287, "Metrics/ClassLength: Class has too many lines. [155/100]", 3100555518], + [362, 9, 452, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `start_byte` is too high. [8/7]", 2663206926], + [362, 9, 452, "Metrics/MethodLength: Method has too many lines. [12/10]", 2663206926], + [380, 9, 557, "Metrics/MethodLength: Method has too many lines. [12/10]", 2982914846], + [443, 9, 404, "Metrics/MethodLength: Method has too many lines. [11/10]", 1111982079], + [495, 61, 10, "Style/NumericPredicate: Use `offset.positive?` instead of `offset > 0`.", 2454414278], + [501, 9, 313, "Metrics/MethodLength: Method has too many lines. [13/10]", 1927903077], + [519, 9, 448, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_first_slice` is too high. [8/7]", 229178429], + [519, 9, 448, "Metrics/MethodLength: Method has too many lines. [16/10]", 229178429], + [524, 17, 11, "Style/HashEachMethods: Use `each_value` instead of `values.each`.", 236538172], + [539, 9, 461, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_last_slice` is too high. [8/7]", 3960808114], + [539, 9, 461, "Metrics/MethodLength: Method has too many lines. [16/10]", 3960808114] + ], + "lib/tree_haver/backends/prism.rb:265399087": [ + [39, 9, 448, "Metrics/MethodLength: Method has too many lines. [11/10]", 2383415890], + [70, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 721867551], + [71, 9, 712, "Metrics/MethodLength: Method has too many lines. [12/10]", 1576927704], + [145, 41, 6, "Lint/UnusedMethodArgument: Unused method argument - `symbol`.", 2153517219], + [182, 9, 554, "Metrics/MethodLength: Method has too many lines. [16/10]", 3452414947], + [250, 13, 11, "Naming/PredicatePrefix: Rename `has_errors?` to `errors?`.", 1181419252], + [275, 69, 27, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1979346241], + [301, 13, 64, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1942915391], + [305, 9, 519, "Metrics/AbcSize: Assignment Branch Condition size for `classify_comment_hint` is too high. [<5, 20, 5> 21.21/17]", 869270335], + [485, 13, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183], + [554, 24, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] + ], + "lib/tree_haver/backends/psych.rb:1528613408": [ + [30, 9, 448, "Metrics/MethodLength: Method has too many lines. [11/10]", 2367418678], + [59, 9, 601, "Metrics/MethodLength: Method has too many lines. [11/10]", 2824278890], + [342, 9, 901, "Metrics/AbcSize: Assignment Branch Condition size for `extract_text_from_location` is too high. [<8, 23, 18> 30.28/17]", 1252700264], + [342, 9, 901, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_text_from_location` is too high. [14/7]", 1252700264], + [342, 9, 901, "Metrics/MethodLength: Method has too many lines. [22/10]", 1252700264], + [342, 9, 901, "Metrics/PerceivedComplexity: Perceived complexity for `extract_text_from_location` is too high. [16/8]", 1252700264] + ], + "lib/tree_haver/backends/rust.rb:3784474048": [ + [52, 9, 548, "Metrics/MethodLength: Method has too many lines. [15/10]", 3791803966], + [156, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548] + ], + "lib/tree_haver/backends/tslp.rb:1702759733": [ + [18, 9, 559, "Metrics/MethodLength: Method has too many lines. [14/10]", 1306507697], + [68, 7, 14, "Style/Documentation: Missing top-level documentation comment for `class TreeHaver::Backends::Tslp::Language`.", 3674592793], + [80, 7, 12, "Style/Documentation: Missing top-level documentation comment for `class TreeHaver::Backends::Tslp::Parser`.", 2485220908], + [81, 9, 582, "Metrics/AbcSize: Assignment Branch Condition size for `parse` is too high. [<2, 17, 4> 17.58/17]", 103430155], + [103, 7, 10, "Style/Documentation: Missing top-level documentation comment for `class TreeHaver::Backends::Tslp::Tree`.", 3516465773], + [109, 7, 10, "Style/Documentation: Missing top-level documentation comment for `class TreeHaver::Backends::Tslp::Node`.", 3515419275], + [143, 13, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183] + ], + "lib/tree_haver/base/comment.rb:699160654": [ + [10, 5, 8183, "Metrics/ClassLength: Class has too many lines. [152/100]", 4001235397] + ], + "lib/tree_haver/base/node.rb:586469776": [ + [36, 5, 7668, "Metrics/ClassLength: Class has too many lines. [156/100]", 171773185], + [162, 11, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183], + [208, 27, 8, "Style/NumericPredicate: Use `cmp.zero?` instead of `cmp == 0`.", 736104011], + [239, 7, 888, "Metrics/AbcSize: Assignment Branch Condition size for `source_position` is too high. [<6, 20, 12> 24.08/17]", 3968023659], + [239, 7, 888, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `source_position` is too high. [9/7]", 3968023659], + [239, 7, 888, "Metrics/MethodLength: Method has too many lines. [28/10]", 3968023659], + [239, 7, 888, "Metrics/PerceivedComplexity: Perceived complexity for `source_position` is too high. [13/8]", 3968023659], + [306, 7, 355, "Metrics/MethodLength: Method has too many lines. [11/10]", 1012295608] + ], + "lib/tree_haver/base/tree.rb:3081630142": [ + [89, 15, 145, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1155535733], + [103, 11, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183] + ], + "lib/tree_haver/citrus_grammar_finder.rb:2540014236": [ + [31, 3, 7013, "Metrics/ClassLength: Class has too many lines. [102/100]", 245808593], + [66, 5, 3770, "Metrics/AbcSize: Assignment Branch Condition size for `available?` is too high. [<16, 52, 21> 58.32/17]", 3886463212], + [66, 5, 3770, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `available?` is too high. [22/7]", 3886463212], + [66, 5, 3770, "Metrics/MethodLength: Method has too many lines. [50/10]", 3886463212], + [66, 5, 3770, "Metrics/PerceivedComplexity: Perceived complexity for `available?` is too high. [22/8]", 3886463212], + [94, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858894] + ], + "lib/tree_haver/contracts.rb:1571706604": [ + [3, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465], + [3, 1, 28139, "Metrics/ModuleLength: Module has too many lines. [924/100]", 3701899480], + [91, 5, 732, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 18, 2> 18.11/17]", 3031678572], + [91, 5, 732, "Metrics/MethodLength: Method has too many lines. [17/10]", 3031678572], + [170, 5, 697, "Metrics/MethodLength: Method has too many lines. [18/10]", 389212725], + [231, 5, 507, "Metrics/MethodLength: Method has too many lines. [13/10]", 2631332781], + [329, 5, 580, "Metrics/MethodLength: Method has too many lines. [13/10]", 2166080747], + [558, 5, 558, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 17, 4> 17.46/17]", 2109105399], + [558, 5, 558, "Metrics/MethodLength: Method has too many lines. [18/10]", 2109105399], + [610, 3, 780, "Metrics/AbcSize: Assignment Branch Condition size for `library_path_errors` is too high. [<3, 20, 10> 22.56/17]", 1003454820], + [610, 3, 780, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `library_path_errors` is too high. [10/7]", 1003454820], + [610, 3, 780, "Metrics/MethodLength: Method has too many lines. [14/10]", 1003454820], + [610, 3, 780, "Metrics/PerceivedComplexity: Perceived complexity for `library_path_errors` is too high. [10/8]", 1003454820], + [652, 3, 686, "Metrics/MethodLength: Method has too many lines. [16/10]", 2530945134], + [674, 3, 483, "Metrics/MethodLength: Method has too many lines. [15/10]", 3654427448], + [693, 3, 511, "Metrics/MethodLength: Method has too many lines. [16/10]", 145071639], + [770, 5, 384, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 19, 6> 19.92/17]", 1287649270], + [841, 5, 449, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [10/7]", 1722332092], + [841, 5, 449, "Metrics/PerceivedComplexity: Perceived complexity for `to_h` is too high. [10/8]", 1722332092], + [873, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177610], + [874, 5, 420, "Metrics/MethodLength: Method has too many lines. [12/10]", 722580369], + [914, 42, 8, "Lint/StructNewOverride: `:entries` member overrides `Struct#entries` and it may be unexpected.", 999966509], + [937, 3, 473, "Metrics/MethodLength: Method has too many lines. [18/10]", 1284459726], + [958, 3, 655, "Metrics/AbcSize: Assignment Branch Condition size for `byte_offset_for_point` is too high. [<7, 25, 14> 29.5/17]", 1278853347], + [958, 3, 655, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `byte_offset_for_point` is too high. [9/7]", 1278853347], + [958, 3, 655, "Metrics/MethodLength: Method has too many lines. [17/10]", 1278853347], + [958, 3, 655, "Metrics/PerceivedComplexity: Perceived complexity for `byte_offset_for_point` is too high. [10/8]", 1278853347] + ], + "lib/tree_haver/grammar_finder.rb:3107533528": [ + [55, 3, 13660, "Metrics/ClassLength: Class has too many lines. [200/100]", 1847629568], + [155, 5, 1710, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_library_path` is too high. [8/7]", 4164717952], + [155, 5, 1710, "Metrics/MethodLength: Method has too many lines. [25/10]", 4164717952], + [269, 7, 845, "Metrics/MethodLength: Method has too many lines. [12/10]", 916567473], + [315, 5, 577, "Metrics/MethodLength: Method has too many lines. [16/10]", 651056353], + [340, 5, 623, "Metrics/MethodLength: Method has too many lines. [14/10]", 1438381615], + [360, 5, 846, "Metrics/MethodLength: Method has too many lines. [12/10]", 667615068], + [398, 5, 653, "Metrics/MethodLength: Method has too many lines. [12/10]", 1765172995] + ], + "lib/tree_haver/kaitai_backend.rb:335397596": [ + [3, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465] + ], + "lib/tree_haver/language.rb:2775049278": [ + [39, 3, 12087, "Metrics/ModuleLength: Module has too many lines. [115/100]", 221887443], + [40, 5, 12061, "Metrics/ClassLength: Class has too many lines. [113/100]", 309443185], + [89, 7, 1966, "Metrics/AbcSize: Assignment Branch Condition size for `from_library` is too high. [<4, 20, 10> 22.72/17]", 980659500], + [89, 7, 1966, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [9/7]", 980659500], + [89, 7, 1966, "Metrics/MethodLength: Method has too many lines. [31/10]", 980659500], + [89, 7, 1966, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [11/8]", 980659500], + [114, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177538], + [156, 7, 4289, "Metrics/AbcSize: Assignment Branch Condition size for `method_missing` is too high. [<10, 39, 30> 50.21/17]", 1314689525], + [156, 7, 4289, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `method_missing` is too high. [24/7]", 1314689525], + [156, 7, 4289, "Metrics/MethodLength: Method has too many lines. [56/10]", 1314689525], + [156, 7, 4289, "Metrics/PerceivedComplexity: Perceived complexity for `method_missing` is too high. [26/8]", 1314689525], + [274, 7, 786, "Metrics/MethodLength: Method has too many lines. [12/10]", 3697766033] + ], + "lib/tree_haver/language_pack.rb:3024861237": [ + [3, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465] + ], + "lib/tree_haver/language_registry.rb:3950096220": [ + [83, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861089] + ], + "lib/tree_haver/library_path_utils.rb:1552423902": [ + [32, 5, 861, "Metrics/MethodLength: Method has too many lines. [12/10]", 1638068630] + ], + "lib/tree_haver/node.rb:715762930": [ + [62, 3, 16601, "Metrics/ClassLength: Class has too many lines. [237/100]", 2290466920], + [136, 5, 708, "Metrics/AbcSize: Assignment Branch Condition size for `start_point` is too high. [<2, 19, 7> 20.35/17]", 2066418249], + [136, 5, 708, "Metrics/MethodLength: Method has too many lines. [17/10]", 2066418249], + [161, 5, 694, "Metrics/AbcSize: Assignment Branch Condition size for `end_point` is too high. [<2, 19, 7> 20.35/17]", 2127773446], + [161, 5, 694, "Metrics/MethodLength: Method has too many lines. [17/10]", 2127773446], + [232, 5, 948, "Metrics/AbcSize: Assignment Branch Condition size for `text` is too high. [<1, 14, 11> 17.83/17]", 748349201], + [232, 5, 948, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `text` is too high. [9/7]", 748349201], + [232, 5, 948, "Metrics/MethodLength: Method has too many lines. [16/10]", 748349201], + [232, 5, 948, "Metrics/PerceivedComplexity: Perceived complexity for `text` is too high. [11/8]", 748349201], + [259, 9, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183], + [328, 5, 994, "Metrics/AbcSize: Assignment Branch Condition size for `named_child` is too high. [<6, 13, 10> 17.46/17]", 3449163117], + [328, 5, 994, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `named_child` is too high. [9/7]", 3449163117], + [328, 5, 994, "Metrics/MethodLength: Method has too many lines. [21/10]", 3449163117], + [328, 5, 994, "Metrics/PerceivedComplexity: Perceived complexity for `named_child` is too high. [10/8]", 3449163117], + [366, 5, 734, "Metrics/MethodLength: Method has too many lines. [15/10]", 3099919150], + [425, 7, 4, "Style/EmptyElse: Redundant `else`-clause.", 2087423834] + ], + "lib/tree_haver/parser.rb:1959976510": [ + [71, 3, 15231, "Metrics/ClassLength: Class has too many lines. [181/100]", 2262931609], + [84, 5, 938, "Metrics/MethodLength: Method has too many lines. [13/10]", 569209133], + [116, 5, 844, "Metrics/MethodLength: Method has too many lines. [11/10]", 3700471369], + [141, 5, 583, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `backend` is too high. [9/7]", 942469984], + [141, 5, 583, "Metrics/MethodLength: Method has too many lines. [20/10]", 942469984], + [237, 5, 1114, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_string` is too high. [8/7]", 2146281390], + [237, 5, 1114, "Metrics/MethodLength: Method has too many lines. [16/10]", 2146281390], + [237, 5, 1114, "Metrics/PerceivedComplexity: Perceived complexity for `parse_string` is too high. [10/8]", 2146281390], + [273, 5, 1162, "Metrics/AbcSize: Assignment Branch Condition size for `switch_backend_for_language` is too high. [<10, 11, 11> 18.49/17]", 3918477333], + [273, 5, 1162, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `switch_backend_for_language` is too high. [11/7]", 3918477333], + [273, 5, 1162, "Metrics/MethodLength: Method has too many lines. [26/10]", 3918477333], + [273, 5, 1162, "Metrics/PerceivedComplexity: Perceived complexity for `switch_backend_for_language` is too high. [9/8]", 3918477333], + [320, 5, 3598, "Metrics/AbcSize: Assignment Branch Condition size for `unwrap_language` is too high. [<4, 32, 32> 45.43/17]", 2683894777], + [320, 5, 3598, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `unwrap_language` is too high. [29/7]", 2683894777], + [320, 5, 3598, "Metrics/MethodLength: Method has too many lines. [55/10]", 2683894777], + [320, 5, 3598, "Metrics/PerceivedComplexity: Perceived complexity for `unwrap_language` is too high. [23/8]", 2683894777], + [414, 5, 892, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `try_reload_language_for_backend` is too high. [9/7]", 1872419716], + [414, 5, 892, "Metrics/MethodLength: Method has too many lines. [14/10]", 1872419716], + [414, 5, 892, "Metrics/PerceivedComplexity: Perceived complexity for `try_reload_language_for_backend` is too high. [9/8]", 1872419716] + ], + "lib/tree_haver/parslet_grammar_finder.rb:756779364": [ + [32, 3, 6418, "Metrics/ClassLength: Class has too many lines. [105/100]", 2916347470], + [67, 5, 2630, "Metrics/AbcSize: Assignment Branch Condition size for `available?` is too high. [<14, 39, 19> 45.59/17]", 1827795944], + [67, 5, 2630, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `available?` is too high. [20/7]", 1827795944], + [67, 5, 2630, "Metrics/MethodLength: Method has too many lines. [43/10]", 1827795944], + [67, 5, 2630, "Metrics/PerceivedComplexity: Perceived complexity for `available?` is too high. [20/8]", 1827795944] + ], + "lib/tree_haver/path_validator.rb:1827441298": [ + [31, 3, 11571, "Metrics/ModuleLength: Module has too many lines. [133/100]", 3916793077], + [71, 5, 1048, "Metrics/AbcSize: Assignment Branch Condition size for `trusted_directories` is too high. [<4, 16, 5> 17.23/17]", 2683168069], + [71, 5, 1048, "Metrics/MethodLength: Method has too many lines. [13/10]", 2683168069], + [182, 5, 1000, "Metrics/AbcSize: Assignment Branch Condition size for `safe_library_path?` is too high. [<1, 15, 15> 21.24/17]", 3331427816], + [182, 5, 1000, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `safe_library_path?` is too high. [15/7]", 3331427816], + [182, 5, 1000, "Metrics/MethodLength: Method has too many lines. [11/10]", 3331427816], + [182, 5, 1000, "Metrics/PerceivedComplexity: Perceived complexity for `safe_library_path?` is too high. [15/8]", 3331427816], + [314, 5, 911, "Metrics/AbcSize: Assignment Branch Condition size for `validation_errors` is too high. [<2, 21, 13> 24.78/17]", 1249065882], + [314, 5, 911, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validation_errors` is too high. [13/7]", 1249065882], + [314, 5, 911, "Metrics/MethodLength: Method has too many lines. [14/10]", 1249065882], + [314, 5, 911, "Metrics/PerceivedComplexity: Perceived complexity for `validation_errors` is too high. [13/8]", 1249065882], + [345, 9, 20, "Naming/PredicatePrefix: Rename `has_valid_extension?` to `valid_extension?`.", 2041908655] + ], + "lib/tree_haver/peg_backends.rb:2882446693": [ + [3, 1, 16, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver`.", 3627168465], + [37, 3, 611, "Metrics/MethodLength: Method has too many lines. [21/10]", 2394303132], + [39, 11, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [61, 3, 377, "Metrics/MethodLength: Method has too many lines. [13/10]", 1137341195] + ], + "lib/tree_haver/rspec/dependency_tags.rb:2954930617": [ + [7, 5, 21, "Style/Documentation: Missing top-level documentation comment for `module TreeHaver::RSpec::DependencyTags`.", 2626933713] + ], + "lib/tree_haver/tree.rb:3332079774": [ + [129, 5, 1443, "Metrics/AbcSize: Assignment Branch Condition size for `edit` is too high. [<8, 18, 7> 20.9/17]", 4208399016], + [129, 5, 1443, "Metrics/MethodLength: Method has too many lines. [24/10]", 4208399016], + [129, 13, 89, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3152137646] + ], + "spec/backend_registry_spec.rb:229950927": [ + [5, 1, 3102, "Metrics/BlockLength: Block has too many lines. [62/25]", 3416335650] + ], + "spec/backends/tslp_spec.rb:1444201405": [ + [5, 1, 5497, "Metrics/BlockLength: Block has too many lines. [121/25]", 4279461260], + [30, 3, 1477, "Metrics/BlockLength: Block has too many lines. [32/25]", 2492475187], + [112, 3, 1352, "Metrics/BlockLength: Block has too many lines. [29/25]", 2972556266] + ], + "spec/fixtures_integration_spec.rb:3457821347": [ + [3, 1, 48556, "Metrics/BlockLength: Block has too many lines. [1006/25]", 2138474637], + [108, 3, 1282, "Metrics/BlockLength: Block has too many lines. [29/25]", 505243730], + [141, 3, 1840, "Metrics/BlockLength: Block has too many lines. [35/25]", 1365684528], + [180, 3, 1365, "Metrics/BlockLength: Block has too many lines. [33/25]", 1597100003], + [247, 3, 2110, "Metrics/BlockLength: Block has too many lines. [41/25]", 219204301], + [294, 3, 2166, "Metrics/BlockLength: Block has too many lines. [27/25]", 2219571348], + [354, 3, 1786, "Metrics/BlockLength: Block has too many lines. [30/25]", 1655451032], + [432, 3, 1345, "Metrics/BlockLength: Block has too many lines. [26/25]", 1188499098], + [534, 3, 3250, "Metrics/BlockLength: Block has too many lines. [64/25]", 2852118886], + [589, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 2115564430], + [602, 3, 752, "Metrics/AbcSize: Assignment Branch Condition size for `normalized_tree_node` is too high. [<0, 19, 4> 19.42/17]", 1725197185], + [602, 3, 752, "Metrics/MethodLength: Method has too many lines. [18/10]", 1725197185], + [623, 3, 850, "Metrics/AbcSize: Assignment Branch Condition size for `backend_capability` is too high. [<0, 20, 0> 20/17]", 3278569026], + [623, 3, 850, "Metrics/MethodLength: Method has too many lines. [14/10]", 3278569026], + [640, 3, 744, "Metrics/MethodLength: Method has too many lines. [13/10]", 1675624229], + [679, 3, 492, "Metrics/MethodLength: Method has too many lines. [11/10]", 4123526878], + [714, 3, 566, "Metrics/AbcSize: Assignment Branch Condition size for `parse_error_tolerance` is too high. [<1, 17, 1> 17.06/17]", 933590597], + [714, 3, 566, "Metrics/MethodLength: Method has too many lines. [14/10]", 933590597], + [739, 3, 2652, "Metrics/BlockLength: Block has too many lines. [47/25]", 214520278], + [1039, 7, 87, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3860036845], + [1045, 7, 60, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1411318317], + [1063, 3, 1334, "Metrics/BlockLength: Block has too many lines. [41/25]", 1427111445], + [1069, 7, 134, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1166944291], + [1075, 7, 60, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1411318317], + [1085, 7, 134, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1166944291], + [1091, 7, 60, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1411318317] + ], + "tree_haver.gemspec:665267582": [ + [16, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1512975621], + [129, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [146, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [147, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [154, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ] +} diff --git a/gems/tree_haver/Gemfile.lock b/gems/tree_haver/Gemfile.lock index 086fa3943..3fc8fdf81 100644 --- a/gems/tree_haver/Gemfile.lock +++ b/gems/tree_haver/Gemfile.lock @@ -7,311 +7,59 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /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) + ansi (1.6.0) + appraisal2 (3.2.0) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + ast (2.4.3) + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) ast-crispr-markdown-markly (7.1.0) ast-crispr (= 7.1.0) markly-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) prism (>= 1.0) version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: ast-merge (7.1.0) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: + backports (3.25.3) bash-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby - specs: - tree_sitter_language_pack (1.12.5) - rb_sys (>= 0.9, < 0.9.128) - sorbet-runtime (~> 0.5) - -GEM - remote: https://gem.coop/ - specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - ansi (1.6.0) - appraisal2 (3.2.0) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - 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) citrus (3.0.2) + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) cmdparse (3.0.7) commonmarker (2.9.0-aarch64-linux) commonmarker (2.9.0-aarch64-linux-musl) commonmarker (2.9.0-arm64-darwin) commonmarker (2.9.0-x86_64-linux) commonmarker (2.9.0-x86_64-linux-musl) + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -320,6 +68,11 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -369,12 +122,52 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -388,12 +181,24 @@ GEM turbo_tests2 (~> 3.1, >= 3.1.12) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) 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.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -419,20 +224,31 @@ GEM prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) psych (5.4.0) date stringio + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) 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.127) - rake-compiler-dock (= 1.12.0) rbs (4.0.3) logger prism (>= 1.6.0) tsort + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) rdoc (6.17.0) erb psych (>= 4.0.0) @@ -528,6 +344,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -536,18 +356,22 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -583,9 +407,19 @@ GEM version_gem (~> 1.1, >= 1.1.13) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_sitter_language_pack (1.9.0.pre.rc.40-aarch64-linux) + sorbet-runtime (~> 0.5) + tree_sitter_language_pack (1.9.0.pre.rc.40-arm64-darwin) + sorbet-runtime (~> 0.5) + tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) + sorbet-runtime (~> 0.5) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -600,6 +434,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.13) + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) yard (0.9.45) yard-fence (0.9.6) rdoc (>= 6.11, < 8) @@ -632,45 +470,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem (>= 7.0) + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -679,28 +496,20 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml (~> 0.3) - toml-merge! toml-rb (~> 4.1) tree_haver! - tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -711,13 +520,10 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) @@ -734,6 +540,7 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -747,17 +554,16 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -781,8 +587,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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 @@ -793,8 +597,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) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 - rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 @@ -828,15 +630,15 @@ 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -854,10 +656,11 @@ CHECKSUMS toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) - tree_sitter_language_pack (1.12.5) + tree_sitter_language_pack (1.9.0.pre.rc.40-aarch64-linux) sha256=c882f4039a1a84a8ed782ef5381a8556acdb53538055d0b9b30d0cd85a0f1b0a + tree_sitter_language_pack (1.9.0.pre.rc.40-arm64-darwin) sha256=b3dc68837a1a626afcbe1abb779cd987e9828a43c78e98cc70aa7e58957f3ef8 + tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) sha256=ad6743a373eeac954c1b659b17af3aff1c82918b3ce9c9dc572a7c70ff843cdd tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -870,7 +673,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/tree_haver/lib/tree_haver/version.rb b/gems/tree_haver/lib/tree_haver/version.rb index 9bd0db819..43365bf4e 100644 --- a/gems/tree_haver/lib/tree_haver/version.rb +++ b/gems/tree_haver/lib/tree_haver/version.rb @@ -2,7 +2,7 @@ module TreeHaver module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end From 0fc8d27d5c2920dc3e5db9aa64454b28bb2a2367 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:36:10 -0600 Subject: [PATCH 250/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile.lock | 2 +- .../.kettle-drift.lock | 60 +- gems/ast-crispr-markdown-markly/Gemfile | 40 + gems/ast-crispr-markdown-markly/Gemfile.lock | 43 +- gems/ast-merge/.rubocop_gradual.lock | 2839 ----------------- gems/ast-merge/Gemfile.lock | 365 +-- gems/ast-merge/bin/yard | 2 +- gems/ast-template/Gemfile.lock | 354 +- gems/binary-merge/Gemfile.lock | 352 +- gems/citrus-toml-merge/Gemfile.lock | 352 +- gems/commonmarker-merge/Gemfile.lock | 344 +- gems/go-merge/Gemfile.lock | 353 +- gems/markdown-merge/.kettle-drift.lock | 60 +- gems/markdown-merge/.rubocop_gradual.lock | 608 ---- gems/markdown-merge/Gemfile | 40 + gems/markdown-merge/Gemfile.lock | 59 +- gems/markly-merge/.kettle-drift.lock | 60 +- gems/markly-merge/.rubocop_gradual.lock | 126 - gems/markly-merge/Gemfile | 40 + gems/markly-merge/Gemfile.lock | 422 ++- gems/markly-merge/lib/markly/merge/version.rb | 2 +- gems/parslet-toml-merge/Gemfile.lock | 353 +- gems/prism-merge/Gemfile.lock | 356 +-- gems/psych-merge/Gemfile.lock | 355 +-- gems/rbs-merge/Gemfile.lock | 350 +- gems/ruby-merge/Gemfile.lock | 353 +- gems/rust-merge/Gemfile.lock | 353 +- gems/tree_haver/Gemfile.lock | 27 +- gems/zip-merge/Gemfile.lock | 352 +- 29 files changed, 811 insertions(+), 8211 deletions(-) delete mode 100644 gems/ast-merge/.rubocop_gradual.lock delete mode 100644 gems/markdown-merge/.rubocop_gradual.lock delete mode 100644 gems/markly-merge/.rubocop_gradual.lock diff --git a/Gemfile.lock b/Gemfile.lock index 010a51949..87ffbd17f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -464,7 +464,7 @@ DEPENDENCIES toml-rb (~> 4.1) tree_haver! tree_sitter_language_pack! - turbo_tests2 (~> 3.1, >= 3.1.14) + turbo_tests2 (~> 3.2, ~> 3.1, >= 3.2.0, >= 3.1.14) typescript-merge! yaml-merge! zip-merge! diff --git a/gems/ast-crispr-markdown-markly/.kettle-drift.lock b/gems/ast-crispr-markdown-markly/.kettle-drift.lock index 98e9f541b..3aa07e7e9 100644 --- a/gems/ast-crispr-markdown-markly/.kettle-drift.lock +++ b/gems/ast-crispr-markdown-markly/.kettle-drift.lock @@ -8,7 +8,8 @@ 160, 200, 240, - 280 + 280, + 320 ] } ], @@ -21,7 +22,8 @@ 171, 211, 251, - 291 + 291, + 331 ] } ], @@ -34,7 +36,8 @@ 161, 201, 241, - 281 + 281, + 321 ] } ], @@ -47,7 +50,8 @@ 173, 213, 253, - 293 + 293, + 333 ] } ], @@ -60,7 +64,8 @@ 176, 216, 256, - 296 + 296, + 336 ] } ], @@ -73,7 +78,8 @@ 162, 202, 242, - 282 + 282, + 322 ] } ], @@ -87,7 +93,8 @@ 180, 220, 260, - 300 + 300, + 340 ] } ], @@ -100,7 +107,8 @@ 181, 221, 261, - 301 + 301, + 341 ] } ], @@ -114,7 +122,8 @@ 167, 207, 247, - 287 + 287, + 327 ] } ], @@ -127,7 +136,8 @@ 190, 230, 270, - 310 + 310, + 350 ] } ], @@ -141,7 +151,8 @@ 159, 199, 239, - 279 + 279, + 319 ] } ], @@ -155,7 +166,8 @@ 189, 229, 269, - 309 + 309, + 349 ] } ], @@ -168,7 +180,8 @@ 165, 205, 245, - 285 + 285, + 325 ] } ], @@ -182,7 +195,8 @@ 172, 212, 252, - 292 + 292, + 332 ] } ], @@ -196,7 +210,8 @@ 168, 208, 248, - 288 + 288, + 328 ] } ], @@ -209,7 +224,8 @@ 166, 206, 246, - 286 + 286, + 326 ] } ], @@ -222,7 +238,8 @@ 183, 223, 263, - 303 + 303, + 343 ] } ], @@ -235,7 +252,8 @@ 182, 222, 262, - 302 + 302, + 342 ] } ], @@ -248,7 +266,8 @@ 177, 217, 257, - 297 + 297, + 337 ] } ], @@ -261,7 +280,8 @@ 186, 226, 266, - 306 + 306, + 346 ] } ], diff --git a/gems/ast-crispr-markdown-markly/Gemfile b/gems/ast-crispr-markdown-markly/Gemfile index 38a30deed..27a154bb3 100644 --- a/gems/ast-crispr-markdown-markly/Gemfile +++ b/gems/ast-crispr-markdown-markly/Gemfile @@ -312,6 +312,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/ast-crispr-markdown-markly/Gemfile.lock b/gems/ast-crispr-markdown-markly/Gemfile.lock index 7bc4ae187..8d6bd15a9 100644 --- a/gems/ast-crispr-markdown-markly/Gemfile.lock +++ b/gems/ast-crispr-markdown-markly/Gemfile.lock @@ -1,13 +1,3 @@ -GIT - remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a - branch: fix/ruby-parser-api-methods - glob: packages/ruby/*.gemspec - specs: - tree_sitter_language_pack (1.12.5) - rb_sys (>= 0.9, < 0.9.128) - sorbet-runtime (~> 0.5) - PATH remote: . specs: @@ -16,6 +6,29 @@ PATH markly-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby + specs: + tree_sitter_language_pack (1.12.5) + rb_sys (>= 0.9, < 0.9.128) + sorbet-runtime (~> 0.5) + GEM remote: https://gem.coop/ specs: @@ -27,10 +40,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) ast-merge (7.1.0) benchmark token-resolver (~> 2.0, >= 2.0.4) @@ -140,10 +149,6 @@ GEM tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -388,6 +393,7 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + ast-crispr! ast-crispr-markdown-markly! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) @@ -401,6 +407,7 @@ DEPENDENCIES kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-parser-gfm (~> 1.1) + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) rake (~> 13.0) diff --git a/gems/ast-merge/.rubocop_gradual.lock b/gems/ast-merge/.rubocop_gradual.lock deleted file mode 100644 index bc6712ed3..000000000 --- a/gems/ast-merge/.rubocop_gradual.lock +++ /dev/null @@ -1,2839 +0,0 @@ -{ - ".simplecov:3463276878": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:429706125": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "ast-merge.gemspec:1182320030": [ - [16, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1168797721], - [129, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [144, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [145, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [152, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/ast-merge.rb:3005639624": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`ast-merge.rb`) should use snake_case.", 5381] - ], - "lib/ast/merge.rb:3429747270": [ - [11, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge`.", 2866359175], - [11, 3, 270037, "Metrics/ModuleLength: Module has too many lines. [5702/100]", 2847709439], - [22, 5, 16, "Style/Documentation: Missing top-level documentation comment for `class Ast::Merge::ParseError`.", 362242086], - [33, 7, 362, "Metrics/AbcSize: Assignment Branch Condition size for `build_message` is too high. [<2, 16, 6> 17.2/17]", 3988736327], - [47, 5, 31, "Style/Documentation: Missing top-level documentation comment for `class Ast::Merge::PlaceholderCollisionError`.", 218924302], - [161, 7, 337, "Metrics/MethodLength: Method has too many lines. [11/10]", 2388996629], - [178, 7, 327, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [8/7]", 979795121], - [309, 7, 383, "Metrics/MethodLength: Method has too many lines. [11/10]", 634650261], - [473, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 3450568485], - [474, 7, 461, "Metrics/MethodLength: Method has too many lines. [12/10]", 43929779], - [491, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1299979089], - [492, 7, 377, "Metrics/MethodLength: Method has too many lines. [11/10]", 3704151253], - [508, 121, 39, "Layout/LineLength: Line is too long. [159/120]", 85503958], - [509, 7, 447, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [8/7]", 298553749], - [509, 7, 447, "Metrics/MethodLength: Method has too many lines. [12/10]", 298553749], - [538, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1441148616], - [539, 7, 453, "Metrics/MethodLength: Method has too many lines. [14/10]", 1899007021], - [558, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193342990], - [559, 7, 400, "Metrics/MethodLength: Method has too many lines. [11/10]", 298553749], - [588, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860750], - [589, 7, 411, "Metrics/MethodLength: Method has too many lines. [12/10]", 2893925621], - [606, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3137791633], - [607, 7, 454, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [8/7]", 298553749], - [607, 7, 454, "Metrics/MethodLength: Method has too many lines. [12/10]", 298553749], - [666, 7, 385, "Metrics/MethodLength: Method has too many lines. [11/10]", 794265461], - [703, 7, 419, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [10/7]", 3313546353], - [703, 7, 419, "Metrics/PerceivedComplexity: Perceived complexity for `to_h` is too high. [10/8]", 3313546353], - [753, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 398187770], - [765, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 2746783933], - [812, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860841], - [820, 121, 156, "Layout/LineLength: Line is too long. [276/120]", 1149525480], - [825, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 2538424426], - [837, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 2285382915], - [847, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3962419360], - [860, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 398187770], - [862, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3195178507], - [866, 121, 85, "Layout/LineLength: Line is too long. [205/120]", 4238980637], - [868, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 2678411233], - [870, 121, 39, "Layout/LineLength: Line is too long. [159/120]", 4028520110], - [881, 121, 110, "Layout/LineLength: Line is too long. [230/120]", 3837814921], - [895, 5, 2283, "Metrics/MethodLength: Method has too many lines. [57/10]", 2282416447], - [955, 5, 2654, "Metrics/MethodLength: Method has too many lines. [63/10]", 2491520565], - [1006, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1823519875], - [1015, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1874311968], - [1021, 5, 10660, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_downstream_merge_gem_feature_matrix` is too high. [<0, 21, 0> 21/17]", 2277322577], - [1021, 5, 10660, "Metrics/MethodLength: Method has too many lines. [248/10]", 2277322577], - [1272, 5, 1546, "Metrics/MethodLength: Method has too many lines. [37/10]", 208933754], - [1306, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 2658452668], - [1312, 5, 4206, "Metrics/MethodLength: Method has too many lines. [96/10]", 1997530776], - [1389, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 183246985], - [1405, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 3268438356], - [1411, 5, 1598, "Metrics/MethodLength: Method has too many lines. [46/10]", 849757258], - [1454, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1323237892], - [1460, 5, 1164, "Metrics/MethodLength: Method has too many lines. [36/10]", 1477831421], - [1493, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 931876829], - [1499, 5, 1699, "Metrics/MethodLength: Method has too many lines. [43/10]", 1125544678], - [1545, 5, 1016, "Metrics/MethodLength: Method has too many lines. [27/10]", 2194427985], - [1575, 5, 1058, "Metrics/MethodLength: Method has too many lines. [30/10]", 47860722], - [1608, 5, 1186, "Metrics/MethodLength: Method has too many lines. [31/10]", 676863486], - [1636, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 2689509078], - [1642, 5, 1517, "Metrics/MethodLength: Method has too many lines. [41/10]", 3855445172], - [1655, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 817380904], - [1680, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 409671963], - [1686, 5, 2116, "Metrics/MethodLength: Method has too many lines. [61/10]", 524104794], - [1750, 5, 820, "Metrics/MethodLength: Method has too many lines. [12/10]", 1888457180], - [1750, 37, 298, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 789483382], - [1751, 121, 100, "Layout/LineLength: Line is too long. [220/120]", 3288750271], - [1766, 5, 3595, "Metrics/AbcSize: Assignment Branch Condition size for `initial_profile_promotion_policy` is too high. [<9, 20, 0> 21.93/17]", 83685787], - [1766, 5, 3595, "Metrics/MethodLength: Method has too many lines. [77/10]", 83685787], - [1846, 5, 768, "Metrics/MethodLength: Method has too many lines. [17/10]", 314059802], - [1867, 5, 1493, "Metrics/AbcSize: Assignment Branch Condition size for `evaluate_profile_selection_requirement` is too high. [<7, 23, 9> 25.67/17]", 3177555163], - [1867, 5, 1493, "Metrics/MethodLength: Method has too many lines. [29/10]", 3177555163], - [1868, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2145168012], - [1875, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 683002336], - [1909, 5, 985, "Metrics/AbcSize: Assignment Branch Condition size for `profile_promotion_blocking_reasons` is too high. [<4, 25, 13> 28.46/17]", 1146627465], - [1909, 5, 985, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `profile_promotion_blocking_reasons` is too high. [10/7]", 1146627465], - [1909, 5, 985, "Metrics/MethodLength: Method has too many lines. [18/10]", 1146627465], - [1909, 5, 985, "Metrics/PerceivedComplexity: Perceived complexity for `profile_promotion_blocking_reasons` is too high. [10/8]", 1146627465], - [1930, 5, 3173, "Metrics/AbcSize: Assignment Branch Condition size for `validate_language_backend_profile` is too high. [<25, 68, 20> 75.16/17]", 2100389324], - [1930, 5, 3173, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_language_backend_profile` is too high. [21/7]", 2100389324], - [1930, 5, 3173, "Metrics/MethodLength: Method has too many lines. [60/10]", 2100389324], - [1930, 5, 3173, "Metrics/PerceivedComplexity: Perceived complexity for `validate_language_backend_profile` is too high. [23/8]", 2100389324], - [2002, 5, 1523, "Metrics/AbcSize: Assignment Branch Condition size for `validate_backend_inventory` is too high. [<13, 38, 13> 42.21/17]", 1899037537], - [2002, 5, 1523, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_backend_inventory` is too high. [13/7]", 1899037537], - [2002, 5, 1523, "Metrics/MethodLength: Method has too many lines. [25/10]", 1899037537], - [2002, 5, 1523, "Metrics/PerceivedComplexity: Perceived complexity for `validate_backend_inventory` is too high. [13/8]", 1899037537], - [2045, 5, 906, "Metrics/MethodLength: Method has too many lines. [20/10]", 3137959843], - [2068, 5, 2744, "Metrics/AbcSize: Assignment Branch Condition size for `detect_raw_merge_inconsistencies` is too high. [<8, 43, 21> 48.52/17]", 3717440692], - [2068, 5, 2744, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_raw_merge_inconsistencies` is too high. [17/7]", 3717440692], - [2068, 5, 2744, "Metrics/MethodLength: Method has too many lines. [53/10]", 3717440692], - [2068, 5, 2744, "Metrics/PerceivedComplexity: Perceived complexity for `detect_raw_merge_inconsistencies` is too high. [17/8]", 3717440692], - [2083, 7, 1894, "Metrics/BlockLength: Block has too many lines. [33/25]", 758887611], - [2129, 5, 762, "Metrics/MethodLength: Method has too many lines. [11/10]", 3021402342], - [2143, 5, 490, "Metrics/MethodLength: Method has too many lines. [11/10]", 578473475], - [2157, 5, 881, "Metrics/AbcSize: Assignment Branch Condition size for `execute_independent_commutative_insertions` is too high. [<6, 16, 7> 18.47/17]", 259417386], - [2157, 5, 881, "Metrics/MethodLength: Method has too many lines. [21/10]", 259417386], - [2184, 5, 1107, "Metrics/AbcSize: Assignment Branch Condition size for `execute_independent_keyed_member_edits` is too high. [<10, 31, 15> 35.86/17]", 4271501385], - [2184, 5, 1107, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `execute_independent_keyed_member_edits` is too high. [14/7]", 4271501385], - [2184, 5, 1107, "Metrics/MethodLength: Method has too many lines. [24/10]", 4271501385], - [2184, 5, 1107, "Metrics/PerceivedComplexity: Perceived complexity for `execute_independent_keyed_member_edits` is too high. [14/8]", 4271501385], - [2228, 5, 3149, "Metrics/AbcSize: Assignment Branch Condition size for `parse_compact_ruleset` is too high. [<16, 68, 24> 73.86/17]", 3149098803], - [2228, 5, 3149, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_compact_ruleset` is too high. [22/7]", 3149098803], - [2228, 5, 3149, "Metrics/MethodLength: Method has too many lines. [67/10]", 3149098803], - [2228, 5, 3149, "Metrics/PerceivedComplexity: Perceived complexity for `parse_compact_ruleset` is too high. [23/8]", 3149098803], - [2234, 7, 2544, "Metrics/BlockLength: Block has too many lines. [50/25]", 2484860466], - [2261, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193420054], - [2307, 5, 2658, "Metrics/AbcSize: Assignment Branch Condition size for `compact_ruleset_feature_profile` is too high. [<11, 67, 38> 77.81/17]", 4022599673], - [2307, 5, 2658, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compact_ruleset_feature_profile` is too high. [29/7]", 4022599673], - [2307, 5, 2658, "Metrics/MethodLength: Method has too many lines. [66/10]", 4022599673], - [2307, 5, 2658, "Metrics/PerceivedComplexity: Perceived complexity for `compact_ruleset_feature_profile` is too high. [16/8]", 4022599673], - [2325, 7, 2243, "Metrics/BlockLength: Block has too many lines. [47/25]", 965041772], - [2392, 5, 2733, "Metrics/AbcSize: Assignment Branch Condition size for `classify_template_target_path` is too high. [<4, 36, 23> 42.91/17]", 3661828596], - [2392, 5, 2733, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `classify_template_target_path` is too high. [21/7]", 3661828596], - [2392, 5, 2733, "Metrics/MethodLength: Method has too many lines. [39/10]", 3661828596], - [2392, 5, 2733, "Metrics/PerceivedComplexity: Perceived complexity for `classify_template_target_path` is too high. [17/8]", 3661828596], - [2424, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [2438, 5, 416, "Metrics/MethodLength: Method has too many lines. [12/10]", 1388641773], - [2481, 5, 388, "Metrics/MethodLength: Method has too many lines. [12/10]", 2360583514], - [2510, 5, 820, "Metrics/MethodLength: Method has too many lines. [13/10]", 354674808], - [2526, 5, 929, "Metrics/AbcSize: Assignment Branch Condition size for `enrich_template_plan_entries` is too high. [<9, 12, 10> 18.03/17]", 2666747528], - [2526, 5, 929, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `enrich_template_plan_entries` is too high. [9/7]", 2666747528], - [2526, 5, 929, "Metrics/MethodLength: Method has too many lines. [19/10]", 2666747528], - [2526, 5, 929, "Metrics/PerceivedComplexity: Perceived complexity for `enrich_template_plan_entries` is too high. [10/8]", 2666747528], - [2549, 5, 1245, "Metrics/AbcSize: Assignment Branch Condition size for `enrich_template_plan_entries_with_token_state` is too high. [<11, 23, 14> 29.09/17]", 1507113977], - [2549, 5, 1245, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `enrich_template_plan_entries_with_token_state` is too high. [13/7]", 1507113977], - [2549, 5, 1245, "Metrics/MethodLength: Method has too many lines. [19/10]", 1507113977], - [2549, 5, 1245, "Metrics/PerceivedComplexity: Perceived complexity for `enrich_template_plan_entries_with_token_state` is too high. [13/8]", 1507113977], - [2573, 5, 1353, "Metrics/AbcSize: Assignment Branch Condition size for `prepare_template_entries` is too high. [<6, 18, 11> 21.93/17]", 2774310942], - [2573, 5, 1353, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `prepare_template_entries` is too high. [11/7]", 2774310942], - [2573, 5, 1353, "Metrics/MethodLength: Method has too many lines. [24/10]", 2774310942], - [2573, 5, 1353, "Metrics/PerceivedComplexity: Perceived complexity for `prepare_template_entries` is too high. [12/8]", 2774310942], - [2603, 5, 1494, "Metrics/AbcSize: Assignment Branch Condition size for `plan_template_execution` is too high. [<8, 22, 17> 28.93/17]", 3876421385], - [2603, 5, 1494, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `plan_template_execution` is too high. [14/7]", 3876421385], - [2603, 5, 1494, "Metrics/MethodLength: Method has too many lines. [29/10]", 3876421385], - [2603, 5, 1494, "Metrics/PerceivedComplexity: Perceived complexity for `plan_template_execution` is too high. [15/8]", 3876421385], - [2604, 7, 1421, "Metrics/BlockLength: Block has too many lines. [27/25]", 2887810383], - [2637, 5, 822, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 2749235529], - [2637, 37, 220, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 447165880], - [2638, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 518382509], - [2652, 5, 2060, "Metrics/AbcSize: Assignment Branch Condition size for `preview_template_execution` is too high. [<11, 42, 26> 50.61/17]", 2270817206], - [2652, 5, 2060, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preview_template_execution` is too high. [25/7]", 2270817206], - [2652, 5, 2060, "Metrics/MethodLength: Method has too many lines. [39/10]", 2270817206], - [2652, 5, 2060, "Metrics/PerceivedComplexity: Perceived complexity for `preview_template_execution` is too high. [23/8]", 2270817206], - [2662, 7, 1809, "Metrics/BlockLength: Block has too many lines. [28/25]", 310337564], - [2700, 5, 2513, "Metrics/AbcSize: Assignment Branch Condition size for `apply_template_execution` is too high. [<14, 50, 25> 57.63/17]", 177708331], - [2700, 5, 2513, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_template_execution` is too high. [26/7]", 177708331], - [2700, 5, 2513, "Metrics/MethodLength: Method has too many lines. [50/10]", 177708331], - [2700, 5, 2513, "Metrics/PerceivedComplexity: Perceived complexity for `apply_template_execution` is too high. [23/8]", 177708331], - [2711, 7, 2239, "Metrics/BlockLength: Block has too many lines. [38/25]", 1651205014], - [2761, 5, 1696, "Metrics/AbcSize: Assignment Branch Condition size for `evaluate_template_tree_convergence` is too high. [<11, 29, 17> 35.37/17]", 2507998041], - [2761, 5, 1696, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `evaluate_template_tree_convergence` is too high. [17/7]", 2507998041], - [2761, 5, 1696, "Metrics/MethodLength: Method has too many lines. [35/10]", 2507998041], - [2761, 5, 1696, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 2507998041], - [2761, 5, 1696, "Metrics/PerceivedComplexity: Perceived complexity for `evaluate_template_tree_convergence` is too high. [17/8]", 2507998041], - [2761, 43, 198, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 4214374277], - [2762, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 2983874608], - [2804, 5, 688, "Metrics/MethodLength: Method has too many lines. [15/10]", 3064253784], - [2804, 5, 688, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 3064253784], - [2804, 36, 216, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 448029307], - [2805, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3840139076], - [2848, 5, 664, "Metrics/MethodLength: Method has too many lines. [13/10]", 995637868], - [2848, 5, 664, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 995637868], - [2848, 53, 202, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 4227116196], - [2849, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 418683952], - [2866, 5, 649, "Metrics/MethodLength: Method has too many lines. [13/10]", 1831524792], - [2866, 5, 649, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 1831524792], - [2866, 54, 178, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2962381850], - [2867, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 3690915627], - [2884, 5, 1280, "Metrics/AbcSize: Assignment Branch Condition size for `apply_template_tree_execution_to_directory` is too high. [<6, 16, 6> 18.11/17]", 305449363], - [2884, 5, 1280, "Metrics/MethodLength: Method has too many lines. [23/10]", 305449363], - [2884, 5, 1280, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 305449363], - [2884, 51, 200, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1352434212], - [2885, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 1139621482], - [2913, 5, 2199, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_tree_run` is too high. [<15, 42, 31> 54.31/17]", 975627723], - [2913, 5, 2199, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_tree_run` is too high. [25/7]", 975627723], - [2913, 5, 2199, "Metrics/MethodLength: Method has too many lines. [38/10]", 975627723], - [2913, 5, 2199, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_tree_run` is too high. [26/8]", 975627723], - [2957, 5, 1515, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_apply` is too high. [<13, 35, 21> 42.84/17]", 3710254295], - [2957, 5, 1515, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_directory_apply` is too high. [17/7]", 3710254295], - [2957, 5, 1515, "Metrics/MethodLength: Method has too many lines. [26/10]", 3710254295], - [2957, 5, 1515, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_directory_apply` is too high. [17/8]", 3710254295], - [2972, 20, 1, "Style/DoubleNegation: Avoid the use of double negation (`!!`).", 177540], - [2989, 5, 1656, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_plan` is too high. [<11, 24, 25> 36.36/17]", 2946319293], - [2989, 5, 1656, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_directory_plan` is too high. [18/7]", 2946319293], - [2989, 5, 1656, "Metrics/MethodLength: Method has too many lines. [36/10]", 2946319293], - [2989, 5, 1656, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_directory_plan` is too high. [16/8]", 2946319293], - [3061, 7, 9, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 3648222389], - [3082, 5, 410, "Metrics/MethodLength: Method has too many lines. [12/10]", 248324428], - [3088, 7, 11, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 848344986], - [3132, 5, 712, "Metrics/MethodLength: Method has too many lines. [12/10]", 2500743043], - [3132, 27, 178, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 873705194], - [3132, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3023611470], - [3158, 42, 167, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2002181571], - [3171, 5, 1097, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structured_edit_selection_profile` is too high. [8/7]", 1149325233], - [3171, 5, 1097, "Metrics/MethodLength: Method has too many lines. [14/10]", 1149325233], - [3171, 42, 311, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 3814063337], - [3172, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 198450264], - [3185, 34, 47, "Style/SafeNavigation: Use safe navigation (`&.`) instead of checking if an object exists before calling the method.", 3204815976], - [3190, 5, 869, "Metrics/MethodLength: Method has too many lines. [11/10]", 83957392], - [3190, 41, 250, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1486072775], - [3191, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1967186495], - [3201, 36, 47, "Style/SafeNavigation: Use safe navigation (`&.`) instead of checking if an object exists before calling the method.", 3204815976], - [3206, 5, 1156, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structured_edit_match_profile` is too high. [10/7]", 4112674787], - [3206, 5, 1156, "Metrics/MethodLength: Method has too many lines. [15/10]", 4112674787], - [3206, 5, 1156, "Metrics/PerceivedComplexity: Perceived complexity for `structured_edit_match_profile` is too high. [10/8]", 4112674787], - [3206, 38, 321, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [12/5]", 823565876], - [3207, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859667], - [3208, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3673982236], - [3226, 5, 933, "Metrics/MethodLength: Method has too many lines. [14/10]", 2099388915], - [3226, 37, 319, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [12/5]", 250907892], - [3227, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177545], - [3228, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 4154814685], - [3245, 5, 907, "Metrics/MethodLength: Method has too many lines. [12/10]", 2242846328], - [3245, 42, 275, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 246196330], - [3246, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1439117336], - [3262, 5, 1057, "Metrics/MethodLength: Method has too many lines. [14/10]", 2891607970], - [3262, 44, 323, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 1386547750], - [3263, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1676243675], - [3264, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 4154814685], - [3281, 5, 1375, "Metrics/AbcSize: Assignment Branch Condition size for `structured_edit_request` is too high. [<11, 25, 10> 29.09/17]", 4153786554], - [3281, 5, 1375, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structured_edit_request` is too high. [11/7]", 4153786554], - [3281, 5, 1375, "Metrics/MethodLength: Method has too many lines. [16/10]", 4153786554], - [3281, 5, 1375, "Metrics/PerceivedComplexity: Perceived complexity for `structured_edit_request` is too high. [11/8]", 4153786554], - [3281, 32, 370, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [13/5]", 2381882467], - [3282, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177545], - [3303, 5, 728, "Metrics/MethodLength: Method has too many lines. [11/10]", 4026157473], - [3303, 31, 175, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 773121544], - [3335, 5, 597, "Metrics/MethodLength: Method has too many lines. [11/10]", 4143495860], - [3374, 5, 577, "Metrics/MethodLength: Method has too many lines. [11/10]", 4169131743], - [3389, 5, 1011, "Metrics/AbcSize: Assignment Branch Condition size for `structured_edit_execution_report` is too high. [<7, 16, 7> 18.81/17]", 876221899], - [3389, 5, 1011, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structured_edit_execution_report` is too high. [8/7]", 876221899], - [3389, 5, 1011, "Metrics/MethodLength: Method has too many lines. [12/10]", 876221899], - [3389, 41, 245, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 2484440861], - [3390, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 4036992717], - [3415, 55, 170, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 668161765], - [3438, 5, 819, "Metrics/MethodLength: Method has too many lines. [12/10]", 2287133436], - [3438, 56, 217, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3198032135], - [3439, 121, 51, "Layout/LineLength: Line is too long. [171/120]", 3526181051], - [3472, 5, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 1853778635], - [3481, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], - [3513, 5, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 1132214891], - [3522, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], - [3544, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 556747511], - [3553, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1808630920], - [3575, 5, 708, "Metrics/MethodLength: Method has too many lines. [11/10]", 3590891170], - [3584, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1367166441], - [3607, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 689748855], - [3616, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1808630920], - [3638, 5, 708, "Metrics/MethodLength: Method has too many lines. [11/10]", 1478642210], - [3647, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1367166441], - [3671, 5, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 239506091], - [3680, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], - [3702, 5, 693, "Metrics/MethodLength: Method has too many lines. [11/10]", 3803476550], - [3711, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], - [3734, 5, 728, "Metrics/MethodLength: Method has too many lines. [11/10]", 748161230], - [3743, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 2807086497], - [3765, 5, 758, "Metrics/MethodLength: Method has too many lines. [11/10]", 3900524558], - [3774, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3463884836], - [3798, 5, 748, "Metrics/MethodLength: Method has too many lines. [11/10]", 2076716686], - [3807, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 609414023], - [3829, 5, 778, "Metrics/MethodLength: Method has too many lines. [11/10]", 867958318], - [3833, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193343749], - [3838, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 1202823007], - [3862, 5, 728, "Metrics/MethodLength: Method has too many lines. [11/10]", 2078323790], - [3871, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 2807086497], - [3893, 5, 758, "Metrics/MethodLength: Method has too many lines. [11/10]", 121025422], - [3902, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3463884836], - [3924, 5, 733, "Metrics/MethodLength: Method has too many lines. [11/10]", 1216456558], - [3933, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 145839927], - [3955, 5, 763, "Metrics/MethodLength: Method has too many lines. [11/10]", 2946525998], - [3964, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 275709226], - [3988, 5, 768, "Metrics/MethodLength: Method has too many lines. [11/10]", 3281402414], - [3992, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177656], - [3997, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 1427340581], - [4034, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3673982236], - [4091, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193417070], - [4102, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2768444], - [4109, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3833204035], - [4117, 5, 863, "Metrics/MethodLength: Method has too many lines. [11/10]", 3731153486], - [4121, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 4054494590], - [4126, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 2084326338], - [4132, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 4201858364], - [4136, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861122], - [4140, 5, 873, "Metrics/MethodLength: Method has too many lines. [11/10]", 1866057614], - [4144, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3893180930], - [4149, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 863421408], - [4155, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 3247130491], - [4159, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1171438608], - [4163, 5, 883, "Metrics/MethodLength: Method has too many lines. [11/10]", 2352924462], - [4163, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860841], - [4164, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861334], - [4167, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 465221046], - [4172, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 1922522532], - [4188, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 4067226670], - [4192, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2033573170], - [4196, 5, 893, "Metrics/MethodLength: Method has too many lines. [11/10]", 1633175534], - [4196, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087926422], - [4197, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087421565], - [4200, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 615151909], - [4205, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 884393597], - [4231, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 417844693], - [4235, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1233681340], - [4239, 5, 903, "Metrics/MethodLength: Method has too many lines. [11/10]", 3964877742], - [4239, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873471], - [4240, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1322899615], - [4243, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 3471008807], - [4248, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 627945471], - [4254, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 2960084092], - [4258, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2148514258], - [4262, 5, 913, "Metrics/MethodLength: Method has too many lines. [11/10]", 385546958], - [4262, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2970472935], - [4263, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3808956371], - [4266, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 3412499338], - [4271, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 3274208144], - [4277, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 4275923717], - [4285, 5, 848, "Metrics/MethodLength: Method has too many lines. [11/10]", 457851502], - [4289, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 413805135], - [4294, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 951908917], - [4300, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 1859200227], - [4308, 5, 808, "Metrics/MethodLength: Method has too many lines. [11/10]", 884695726], - [4312, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 2011807620], - [4317, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 384138219], - [4323, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1176320663], - [4331, 5, 798, "Metrics/MethodLength: Method has too many lines. [11/10]", 1422521838], - [4335, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3247420006], - [4340, 121, 35, "Layout/LineLength: Line is too long. [155/120]", 1408316702], - [4346, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 938465266], - [4354, 5, 803, "Metrics/MethodLength: Method has too many lines. [11/10]", 2370839950], - [4358, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 74128911], - [4363, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 1364659899], - [4369, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2059517661], - [4377, 5, 803, "Metrics/MethodLength: Method has too many lines. [11/10]", 3379336814], - [4381, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 74128911], - [4386, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 1364659899], - [4434, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 4281772560], - [4442, 5, 833, "Metrics/MethodLength: Method has too many lines. [11/10]", 3245498510], - [4446, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3542644754], - [4451, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1916814773], - [4457, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 859690879], - [4465, 5, 833, "Metrics/MethodLength: Method has too many lines. [11/10]", 4138830126], - [4469, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3542644754], - [4474, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1916814773], - [4480, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3880141603], - [4488, 5, 828, "Metrics/MethodLength: Method has too many lines. [11/10]", 3621010990], - [4492, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3917260126], - [4497, 121, 41, "Layout/LineLength: Line is too long. [161/120]", 1879260859], - [4503, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1776611011], - [4511, 5, 838, "Metrics/MethodLength: Method has too many lines. [11/10]", 514585454], - [4515, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1353518231], - [4520, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 1228459824], - [4526, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 3932349968], - [4530, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087903307], - [4534, 5, 878, "Metrics/MethodLength: Method has too many lines. [11/10]", 1525737454], - [4534, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], - [4535, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177538], - [4538, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 2895681070], - [4543, 121, 51, "Layout/LineLength: Line is too long. [171/120]", 4040662298], - [4549, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 66929045], - [4557, 5, 808, "Metrics/MethodLength: Method has too many lines. [11/10]", 1626746606], - [4561, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 2011807620], - [4566, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 384138219], - [4580, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 849230508], - [4588, 5, 838, "Metrics/MethodLength: Method has too many lines. [11/10]", 3531122670], - [4592, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1353518231], - [4597, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 1228459824], - [4612, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1176320663], - [4620, 5, 798, "Metrics/MethodLength: Method has too many lines. [11/10]", 1118421486], - [4624, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3247420006], - [4629, 121, 35, "Layout/LineLength: Line is too long. [155/120]", 1408316702], - [4651, 5, 693, "Metrics/MethodLength: Method has too many lines. [11/10]", 1668406662], - [4660, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], - [4674, 5, 648, "Metrics/MethodLength: Method has too many lines. [11/10]", 3479836893], - [4683, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193343749], - [4705, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 3147549879], - [4714, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1808630920], - [4749, 5, 677, "Metrics/MethodLength: Method has too many lines. [11/10]", 1206941784], - [4758, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3937819337], - [4781, 5, 672, "Metrics/MethodLength: Method has too many lines. [11/10]", 3634903061], - [4790, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], - [4812, 5, 683, "Metrics/MethodLength: Method has too many lines. [11/10]", 3417053461], - [4821, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], - [4845, 5, 668, "Metrics/MethodLength: Method has too many lines. [11/10]", 1540762726], - [4854, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1808630920], - [4876, 5, 698, "Metrics/MethodLength: Method has too many lines. [11/10]", 2804825893], - [4885, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1367166441], - [4908, 5, 683, "Metrics/MethodLength: Method has too many lines. [11/10]", 3165010613], - [4917, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], - [4939, 5, 713, "Metrics/MethodLength: Method has too many lines. [11/10]", 2795628035], - [4948, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 497133415], - [4954, 5, 864, "Metrics/MethodLength: Method has too many lines. [12/10]", 1086224878], - [4954, 50, 268, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 4022739767], - [4955, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1607400384], - [4979, 5, 658, "Metrics/MethodLength: Method has too many lines. [11/10]", 3999796489], - [4988, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 102058825], - [5002, 59, 179, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1569981428], - [5003, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 1515849732], - [5034, 5, 694, "Metrics/MethodLength: Method has too many lines. [11/10]", 3830236120], - [5043, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2250857971], - [5057, 5, 673, "Metrics/MethodLength: Method has too many lines. [11/10]", 2413908653], - [5066, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1225026887], - [5080, 5, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 3935895659], - [5089, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], - [5103, 5, 692, "Metrics/MethodLength: Method has too many lines. [11/10]", 3660669627], - [5112, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3558241761], - [5126, 5, 612, "Metrics/MethodLength: Method has too many lines. [11/10]", 100391811], - [5165, 5, 693, "Metrics/MethodLength: Method has too many lines. [11/10]", 3138587622], - [5174, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], - [5196, 5, 688, "Metrics/MethodLength: Method has too many lines. [11/10]", 2736088861], - [5205, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1992103013], - [5228, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 2275602867], - [5237, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3598350322], - [5260, 5, 602, "Metrics/MethodLength: Method has too many lines. [11/10]", 3023166371], - [5275, 36, 181, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1071580945], - [5288, 5, 787, "Metrics/AbcSize: Assignment Branch Condition size for `group_projected_child_review_cases` is too high. [<4, 17, 4> 17.92/17]", 3391527151], - [5288, 5, 787, "Metrics/MethodLength: Method has too many lines. [18/10]", 3391527151], - [5312, 5, 705, "Metrics/MethodLength: Method has too many lines. [13/10]", 2629923275], - [5339, 5, 547, "Metrics/MethodLength: Method has too many lines. [12/10]", 1911190850], - [5364, 5, 1516, "Metrics/AbcSize: Assignment Branch Condition size for `review_projected_child_groups` is too high. [<11, 21, 9> 25.36/17]", 3333110579], - [5364, 5, 1516, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `review_projected_child_groups` is too high. [8/7]", 3333110579], - [5364, 5, 1516, "Metrics/MethodLength: Method has too many lines. [39/10]", 3333110579], - [5364, 5, 1516, "Metrics/PerceivedComplexity: Perceived complexity for `review_projected_child_groups` is too high. [9/8]", 3333110579], - [5398, 7, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], - [5410, 5, 562, "Metrics/MethodLength: Method has too many lines. [14/10]", 3083915102], - [5429, 5, 1898, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_delegated_child_outputs` is too high. [<11, 21, 6> 24.45/17]", 2739722546], - [5429, 5, 1898, "Metrics/MethodLength: Method has too many lines. [49/10]", 2739722546], - [5484, 5, 942, "Metrics/AbcSize: Assignment Branch Condition size for `execute_nested_merge` is too high. [<3, 17, 6> 18.28/17]", 766157172], - [5484, 5, 942, "Metrics/MethodLength: Method has too many lines. [20/10]", 766157172], - [5484, 29, 144, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1404367793], - [5511, 5, 652, "Metrics/MethodLength: Method has too many lines. [13/10]", 2105803856], - [5530, 38, 140, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1682835820], - [5560, 5, 577, "Metrics/MethodLength: Method has too many lines. [12/10]", 2659610443], - [5629, 5, 569, "Metrics/MethodLength: Method has too many lines. [14/10]", 20616641], - [5657, 5, 772, "Metrics/AbcSize: Assignment Branch Condition size for `conformance_manifest_review_request_ids` is too high. [<7, 16, 8> 19.21/17]", 3577418475], - [5657, 5, 772, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `conformance_manifest_review_request_ids` is too high. [9/7]", 3577418475], - [5657, 5, 772, "Metrics/MethodLength: Method has too many lines. [14/10]", 3577418475], - [5657, 5, 772, "Metrics/PerceivedComplexity: Perceived complexity for `conformance_manifest_review_request_ids` is too high. [9/8]", 3577418475], - [5711, 5, 606, "Metrics/MethodLength: Method has too many lines. [11/10]", 2675086662], - [5726, 5, 562, "Metrics/MethodLength: Method has too many lines. [11/10]", 3811715870], - [5741, 5, 578, "Metrics/MethodLength: Method has too many lines. [11/10]", 1776197415], - [5756, 5, 1298, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_conformance_family_context` is too high. [<7, 28, 9> 30.23/17]", 4265202259], - [5756, 5, 1298, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `resolve_conformance_family_context` is too high. [10/7]", 4265202259], - [5756, 5, 1298, "Metrics/MethodLength: Method has too many lines. [23/10]", 4265202259], - [5756, 5, 1298, "Metrics/PerceivedComplexity: Perceived complexity for `resolve_conformance_family_context` is too high. [10/8]", 4265202259], - [5785, 5, 1994, "Metrics/AbcSize: Assignment Branch Condition size for `review_conformance_family_context` is too high. [<12, 24, 10> 28.64/17]", 2834851944], - [5785, 5, 1994, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `review_conformance_family_context` is too high. [10/7]", 2834851944], - [5785, 5, 1994, "Metrics/MethodLength: Method has too many lines. [41/10]", 2834851944], - [5785, 5, 1994, "Metrics/PerceivedComplexity: Perceived complexity for `review_conformance_family_context` is too high. [11/8]", 2834851944], - [5808, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 641612328], - [5845, 5, 1844, "Metrics/AbcSize: Assignment Branch Condition size for `select_conformance_case` is too high. [<2, 43, 14> 45.27/17]", 670673209], - [5845, 5, 1844, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `select_conformance_case` is too high. [14/7]", 670673209], - [5845, 5, 1844, "Metrics/MethodLength: Method has too many lines. [30/10]", 670673209], - [5845, 5, 1844, "Metrics/PerceivedComplexity: Perceived complexity for `select_conformance_case` is too high. [16/8]", 670673209], - [5850, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 2135503892], - [5852, 121, 41, "Layout/LineLength: Line is too long. [161/120]", 3932054828], - [5861, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 3169124957], - [5883, 5, 509, "Metrics/MethodLength: Method has too many lines. [11/10]", 3552283123], - [5972, 5, 4195, "Metrics/AbcSize: Assignment Branch Condition size for `review_conformance_manifest` is too high. [<37, 63, 16> 74.79/17]", 2166560528], - [5972, 5, 4195, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `review_conformance_manifest` is too high. [14/7]", 2166560528], - [5972, 5, 4195, "Metrics/MethodLength: Method has too many lines. [89/10]", 2166560528], - [5972, 5, 4195, "Metrics/PerceivedComplexity: Perceived complexity for `review_conformance_manifest` is too high. [17/8]", 2166560528], - [6037, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2746826653], - [6053, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 3035993839], - [6075, 5, 676, "Metrics/MethodLength: Method has too many lines. [15/10]", 3048335475], - [6098, 5, 1054, "Metrics/AbcSize: Assignment Branch Condition size for `plan_conformance_suite` is too high. [<11, 18, 8> 22.56/17]", 1855254788], - [6098, 5, 1054, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `plan_conformance_suite` is too high. [8/7]", 1855254788], - [6098, 5, 1054, "Metrics/MethodLength: Method has too many lines. [25/10]", 1855254788], - [6098, 31, 84, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 172854173], - [6163, 5, 1274, "Metrics/AbcSize: Assignment Branch Condition size for `plan_named_conformance_suites_with_diagnostics` is too high. [<11, 21, 7> 24.72/17]", 3991300730], - [6163, 5, 1274, "Metrics/MethodLength: Method has too many lines. [27/10]", 3991300730], - [6190, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 3035993839], - [6255, 5, 2071, "Metrics/AbcSize: Assignment Branch Condition size for `review_decision_for_family_context` is too high. [<7, 22, 16> 28.09/17]", 4245377184], - [6255, 5, 2071, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `review_decision_for_family_context` is too high. [12/7]", 4245377184], - [6255, 5, 2071, "Metrics/MethodLength: Method has too many lines. [46/10]", 4245377184], - [6255, 5, 2071, "Metrics/PerceivedComplexity: Perceived complexity for `review_decision_for_family_context` is too high. [12/8]", 4245377184], - [6260, 7, 1766, "Metrics/BlockLength: Block has too many lines. [40/25]", 65448241], - [6312, 5, 686, "Metrics/MethodLength: Method has too many lines. [13/10]", 4030291682] - ], - "lib/ast/merge/ast_node.rb:2037773320": [ - [44, 5, 7086, "Metrics/ClassLength: Class has too many lines. [114/100]", 201314721], - [220, 11, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183] - ], - "lib/ast/merge/comment/attachment.rb:2388154769": [ - [42, 23, 180, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3775370530], - [75, 24, 2, "Lint/SafeNavigationConsistency: Use `.` instead of unnecessary `&.`.", 5858765], - [81, 25, 2, "Lint/SafeNavigationConsistency: Use `.` instead of unnecessary `&.`.", 5858765], - [114, 9, 410, "Metrics/AbcSize: Assignment Branch Condition size for `inspect` is too high. [<1, 17, 4> 17.49/17]", 605978105], - [115, 32, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] - ], - "lib/ast/merge/comment/augmenter.rb:633395157": [ - [12, 7, 13967, "Metrics/ClassLength: Class has too many lines. [291/100]", 2806660144], - [33, 9, 721, "Metrics/MethodLength: Method has too many lines. [16/10]", 200402816], - [33, 23, 91, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2938734913], - [64, 9, 1335, "Metrics/AbcSize: Assignment Branch Condition size for `build!` is too high. [<12, 29, 6> 31.95/17]", 3904283188], - [64, 9, 1335, "Metrics/MethodLength: Method has too many lines. [22/10]", 3904283188], - [94, 9, 867, "Metrics/AbcSize: Assignment Branch Condition size for `infer_leading_comments` is too high. [<8, 19, 14> 24.92/17]", 1941464872], - [94, 9, 867, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_leading_comments` is too high. [11/7]", 1941464872], - [94, 9, 867, "Metrics/MethodLength: Method has too many lines. [20/10]", 1941464872], - [94, 9, 867, "Metrics/PerceivedComplexity: Perceived complexity for `infer_leading_comments` is too high. [12/8]", 1941464872], - [122, 9, 429, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_inline_comments` is too high. [8/7]", 2688935834], - [133, 9, 934, "Metrics/AbcSize: Assignment Branch Condition size for `infer_trailing_comments` is too high. [<8, 21, 18> 28.79/17]", 1551855281], - [133, 9, 934, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_trailing_comments` is too high. [15/7]", 1551855281], - [133, 9, 934, "Metrics/MethodLength: Method has too many lines. [20/10]", 1551855281], - [133, 9, 934, "Metrics/PerceivedComplexity: Perceived complexity for `infer_trailing_comments` is too high. [15/8]", 1551855281], - [160, 9, 488, "Metrics/AbcSize: Assignment Branch Condition size for `infer_postlude!` is too high. [<5, 17, 8> 19.44/17]", 2562637949], - [160, 9, 488, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_postlude!` is too high. [8/7]", 2562637949], - [173, 9, 1529, "Metrics/AbcSize: Assignment Branch Condition size for `infer_remaining_regions!` is too high. [<12, 27, 23> 37.44/17]", 3911657050], - [173, 9, 1529, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_remaining_regions!` is too high. [18/7]", 3911657050], - [173, 9, 1529, "Metrics/MethodLength: Method has too many lines. [28/10]", 3911657050], - [173, 9, 1529, "Metrics/PerceivedComplexity: Perceived complexity for `infer_remaining_regions!` is too high. [20/8]", 3911657050], - [216, 9, 507, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split_preamble_group` is too high. [8/7]", 336784898], - [231, 9, 588, "Metrics/MethodLength: Method has too many lines. [17/10]", 3445626532], - [274, 9, 965, "Metrics/AbcSize: Assignment Branch Condition size for `build_region` is too high. [<6, 17, 7> 19.34/17]", 344809006], - [274, 9, 965, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_region` is too high. [8/7]", 344809006], - [274, 9, 965, "Metrics/MethodLength: Method has too many lines. [24/10]", 344809006] - ], - "lib/ast/merge/comment/block.rb:3806757604": [ - [31, 7, 6754, "Metrics/ClassLength: Class has too many lines. [106/100]", 2308582303], - [57, 9, 1059, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<12, 13, 14> 22.56/17]", 2656171724], - [57, 9, 1059, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `initialize` is too high. [14/7]", 2656171724], - [57, 9, 1059, "Metrics/MethodLength: Method has too many lines. [21/10]", 2656171724], - [57, 9, 1059, "Metrics/PerceivedComplexity: Perceived complexity for `initialize` is too high. [15/8]", 2656171724], - [113, 9, 511, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `freeze_action` is too high. [9/7]", 55014877], - [113, 9, 511, "Metrics/MethodLength: Method has too many lines. [12/10]", 55014877], - [113, 9, 511, "Metrics/PerceivedComplexity: Perceived complexity for `freeze_action` is too high. [9/8]", 55014877], - [181, 9, 439, "Metrics/AbcSize: Assignment Branch Condition size for `first_meaningful_content` is too high. [<2, 16, 11> 19.52/17]", 680479883], - [181, 9, 439, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `first_meaningful_content` is too high. [11/7]", 680479883], - [181, 9, 439, "Metrics/PerceivedComplexity: Perceived complexity for `first_meaningful_content` is too high. [12/8]", 680479883], - [197, 9, 765, "Metrics/AbcSize: Assignment Branch Condition size for `extract_block_content` is too high. [<7, 24, 9> 26.57/17]", 621871624], - [197, 9, 765, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_block_content` is too high. [9/7]", 621871624], - [197, 9, 765, "Metrics/PerceivedComplexity: Perceived complexity for `extract_block_content` is too high. [9/8]", 621871624] - ], - "lib/ast/merge/comment/c_style_tracker_base.rb:1569556520": [ - [22, 7, 15053, "Metrics/ClassLength: Class has too many lines. [284/100]", 3599183270], - [83, 9, 509, "Metrics/MethodLength: Method has too many lines. [11/10]", 1639553915], - [102, 9, 492, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `leading_comments_before` is too high. [8/7]", 3127043491], - [102, 9, 492, "Metrics/MethodLength: Method has too many lines. [11/10]", 3127043491], - [124, 9, 487, "Metrics/MethodLength: Method has too many lines. [11/10]", 1869933531], - [176, 9, 713, "Metrics/AbcSize: Assignment Branch Condition size for `trailing_comments_after` is too high. [<6, 12, 13> 18.68/17]", 543703521], - [176, 9, 713, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trailing_comments_after` is too high. [11/7]", 543703521], - [176, 9, 713, "Metrics/MethodLength: Method has too many lines. [14/10]", 543703521], - [176, 9, 713, "Metrics/PerceivedComplexity: Perceived complexity for `trailing_comments_after` is too high. [11/8]", 543703521], - [184, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177549], - [202, 9, 598, "Metrics/MethodLength: Method has too many lines. [12/10]", 1628921093], - [222, 9, 1271, "Metrics/MethodLength: Method has too many lines. [21/10]", 612335469], - [222, 35, 137, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1823300034], - [329, 35, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [348, 9, 2271, "Metrics/AbcSize: Assignment Branch Condition size for `extract_comments` is too high. [<17, 32, 13> 38.5/17]", 2751274968], - [348, 9, 2271, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_comments` is too high. [14/7]", 2751274968], - [348, 9, 2271, "Metrics/MethodLength: Method has too many lines. [59/10]", 2751274968], - [348, 9, 2271, "Metrics/PerceivedComplexity: Perceived complexity for `extract_comments` is too high. [14/8]", 2751274968], - [353, 11, 2045, "Metrics/BlockLength: Block has too many lines. [52/25]", 575665179], - [418, 9, 659, "Metrics/MethodLength: Method has too many lines. [15/10]", 177254901], - [439, 71, 4, "Lint/UnusedMethodArgument: Unused method argument - `line`.", 2087656651], - [439, 78, 8, "Lint/UnusedMethodArgument: Unused method argument - `line_num`.", 622661090] - ], - "lib/ast/merge/comment/hash_tracker_base.rb:861186417": [ - [32, 7, 19362, "Metrics/ClassLength: Class has too many lines. [221/100]", 1031055222], - [118, 9, 444, "Metrics/MethodLength: Method has too many lines. [11/10]", 3347260807], - [142, 9, 921, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `leading_comments_before` is too high. [8/7]", 415734636], - [142, 9, 921, "Metrics/MethodLength: Method has too many lines. [11/10]", 415734636], - [172, 9, 440, "Metrics/MethodLength: Method has too many lines. [11/10]", 2464474004], - [225, 9, 623, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trailing_comments_after` is too high. [10/7]", 543703521], - [225, 9, 623, "Metrics/MethodLength: Method has too many lines. [12/10]", 543703521], - [225, 9, 623, "Metrics/PerceivedComplexity: Perceived complexity for `trailing_comments_after` is too high. [10/8]", 543703521], - [249, 9, 551, "Metrics/MethodLength: Method has too many lines. [12/10]", 2783654570], - [278, 9, 1271, "Metrics/MethodLength: Method has too many lines. [21/10]", 612335469], - [278, 35, 137, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1823300034], - [374, 35, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [439, 9, 826, "Metrics/MethodLength: Method has too many lines. [12/10]", 1706632542] - ], - "lib/ast/merge/comment/parser.rb:2674748021": [ - [34, 7, 8372, "Metrics/ClassLength: Class has too many lines. [141/100]", 2541983664], - [84, 9, 357, "Metrics/MethodLength: Method has too many lines. [12/10]", 2265493710], - [104, 9, 545, "Metrics/AbcSize: Assignment Branch Condition size for `auto_detect_style` is too high. [<5, 17, 7> 19.05/17]", 868366444], - [104, 9, 545, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `auto_detect_style` is too high. [8/7]", 868366444], - [125, 9, 1650, "Metrics/AbcSize: Assignment Branch Condition size for `parse_line_comments` is too high. [<8, 28, 7> 29.95/17]", 1511562163], - [125, 9, 1650, "Metrics/MethodLength: Method has too many lines. [31/10]", 1511562163], - [176, 9, 2670, "Metrics/AbcSize: Assignment Branch Condition size for `parse_with_block_comments` is too high. [<15, 47, 15> 51.57/17]", 2963765048], - [176, 9, 2670, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_with_block_comments` is too high. [15/7]", 2963765048], - [176, 9, 2670, "Metrics/MethodLength: Method has too many lines. [47/10]", 2963765048], - [176, 9, 2670, "Metrics/PerceivedComplexity: Perceived complexity for `parse_with_block_comments` is too high. [16/8]", 2963765048], - [181, 11, 2390, "Metrics/BlockLength: Block has too many lines. [40/25]", 3720582340] - ], - "lib/ast/merge/comment/quoted_hash_line_parser.rb:2878420841": [ - [74, 9, 458, "Metrics/MethodLength: Method has too many lines. [11/10]", 1526360697], - [91, 9, 620, "Metrics/AbcSize: Assignment Branch Condition size for `inline_result` is too high. [<3, 16, 6> 17.35/17]", 2706755447], - [91, 9, 620, "Metrics/MethodLength: Method has too many lines. [14/10]", 2706755447] - ], - "lib/ast/merge/comment/region_merge_policy.rb:176745155": [ - [23, 23, 98, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1029631546], - [55, 9, 423, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `freeze_sensitive?` is too high. [8/7]", 4102661282], - [61, 41, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [61, 85, 2, "Lint/SafeNavigationConsistency: Use `.` instead of unnecessary `&.`.", 5858765], - [96, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3491399903] - ], - "lib/ast/merge/comment/style.rb:3045051983": [ - [27, 7, 9109, "Metrics/ClassLength: Class has too many lines. [143/100]", 131723516], - [142, 11, 911, "Metrics/MethodLength: Method has too many lines. [17/10]", 355862493], - [142, 23, 164, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 668558018], - [203, 23, 164, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 668558018] - ], - "lib/ast/merge/comment/tracked_hash_adapter.rb:3235547929": [ - [99, 11, 553, "Metrics/AbcSize: Assignment Branch Condition size for `line_text_from` is too high. [<4, 20, 4> 20.78/17]", 2680273536], - [99, 11, 553, "Metrics/MethodLength: Method has too many lines. [13/10]", 2680273536] - ], - "lib/ast/merge/composite_match_refiner.rb:1718969703": [ - [58, 7, 668, "Metrics/MethodLength: Method has too many lines. [14/10]", 2649148714] - ], - "lib/ast/merge/conflict_resolver_base.rb:765343263": [ - [69, 5, 14959, "Metrics/ClassLength: Class has too many lines. [170/100]", 633092728], - [156, 7, 919, "Metrics/MethodLength: Method has too many lines. [13/10]", 1701319380], - [156, 21, 200, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3369976202], - [367, 7, 972, "Metrics/MethodLength: Method has too many lines. [22/10]", 2870739148], - [434, 47, 13, "Style/NumericPredicate: Use `recursive.positive?` instead of `recursive > 0`.", 462999281], - [436, 99, 14, "Style/NumericPredicate: Use `recursive.zero?` instead of `recursive == 0`.", 2394069519] - ], - "lib/ast/merge/content_match_refiner.rb:3628272158": [ - [47, 5, 7719, "Metrics/ClassLength: Class has too many lines. [108/100]", 651494487], - [87, 7, 750, "Metrics/MethodLength: Method has too many lines. [17/10]", 3624290009], - [165, 37, 48, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 953994744], - [232, 7, 846, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<13, 29, 8> 32.77/17]", 3597737347], - [232, 7, 846, "Metrics/MethodLength: Method has too many lines. [20/10]", 3597737347] - ], - "lib/ast/merge/debug_logger.rb:1783610128": [ - [72, 5, 7614, "Metrics/ModuleLength: Module has too many lines. [118/100]", 736598454], - [85, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 941621], - [206, 7, 584, "Metrics/AbcSize: Assignment Branch Condition size for `time` is too high. [<3, 17, 2> 17.38/17]", 3468868523], - [206, 7, 584, "Metrics/MethodLength: Method has too many lines. [14/10]", 3468868523], - [269, 7, 450, "Metrics/PerceivedComplexity: Perceived complexity for `extract_lines` is too high. [9/8]", 680738666], - [287, 7, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631] - ], - "lib/ast/merge/detector/base.rb:343830240": [ - [175, 25, 73, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2991095115] - ], - "lib/ast/merge/detector/fenced_code_block.rb:3555142063": [ - [36, 7, 6302, "Metrics/ClassLength: Class has too many lines. [116/100]", 852968953], - [71, 9, 2492, "Metrics/AbcSize: Assignment Branch Condition size for `detect_all` is too high. [<31, 28, 12> 43.46/17]", 3575218793], - [71, 9, 2492, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_all` is too high. [11/7]", 3575218793], - [71, 9, 2492, "Metrics/MethodLength: Method has too many lines. [54/10]", 3575218793], - [71, 9, 2492, "Metrics/PerceivedComplexity: Perceived complexity for `detect_all` is too high. [13/8]", 3575218793], - [84, 11, 2060, "Metrics/BlockLength: Block has too many lines. [41/25]", 1744553779] - ], - "lib/ast/merge/detector/mergeable.rb:354817747": [ - [54, 7, 11933, "Metrics/ModuleLength: Module has too many lines. [140/100]", 1453034870], - [162, 9, 601, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_region_configs` is too high. [8/7]", 1278024890], - [162, 9, 601, "Metrics/MethodLength: Method has too many lines. [16/10]", 1278024890], - [189, 9, 1054, "Metrics/AbcSize: Assignment Branch Condition size for `extract_regions` is too high. [<11, 16, 3> 19.65/17]", 663241096], - [189, 9, 1054, "Metrics/MethodLength: Method has too many lines. [20/10]", 663241096], - [285, 9, 1005, "Metrics/AbcSize: Assignment Branch Condition size for `merge_and_substitute_regions` is too high. [<16, 19, 4> 25.16/17]", 4123525156], - [285, 9, 1005, "Metrics/MethodLength: Method has too many lines. [16/10]", 4123525156], - [318, 9, 1369, "Metrics/AbcSize: Assignment Branch Condition size for `merge_region` is too high. [<11, 20, 14> 26.78/17]", 746321843], - [318, 9, 1369, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_region` is too high. [15/7]", 746321843], - [318, 9, 1369, "Metrics/MethodLength: Method has too many lines. [16/10]", 746321843], - [318, 9, 1369, "Metrics/PerceivedComplexity: Perceived complexity for `merge_region` is too high. [15/8]", 746321843] - ], - "lib/ast/merge/detector/toml_frontmatter.rb:3255696517": [ - [50, 9, 892, "Metrics/MethodLength: Method has too many lines. [20/10]", 3132005303] - ], - "lib/ast/merge/detector/yaml_frontmatter.rb:2551474823": [ - [49, 9, 958, "Metrics/MethodLength: Method has too many lines. [20/10]", 3132005303] - ], - "lib/ast/merge/diff_mapper_base.rb:3204989377": [ - [22, 5, 7793, "Metrics/ClassLength: Class has too many lines. [141/100]", 2217731166], - [80, 7, 2598, "Metrics/AbcSize: Assignment Branch Condition size for `parse_diff` is too high. [<21, 31, 15> 40.34/17]", 939898835], - [80, 7, 2598, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_diff` is too high. [16/7]", 939898835], - [80, 7, 2598, "Metrics/MethodLength: Method has too many lines. [65/10]", 939898835], - [80, 7, 2598, "Metrics/PerceivedComplexity: Perceived complexity for `parse_diff` is too high. [12/8]", 939898835], - [90, 9, 2162, "Metrics/BlockLength: Block has too many lines. [50/25]", 3403609416], - [169, 7, 394, "Metrics/MethodLength: Method has too many lines. [11/10]", 2028641628] - ], - "lib/ast/merge/emitter_base.rb:655463559": [ - [26, 5, 14449, "Metrics/ClassLength: Class has too many lines. [226/100]", 2015391034], - [95, 7, 653, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_comment_region` is too high. [9/7]", 24580929], - [95, 7, 653, "Metrics/MethodLength: Method has too many lines. [12/10]", 24580929], - [95, 7, 653, "Metrics/PerceivedComplexity: Perceived complexity for `emit_comment_region` is too high. [9/8]", 24580929], - [120, 7, 1311, "Metrics/AbcSize: Assignment Branch Condition size for `emit_comment_attachment` is too high. [<5, 25, 16> 30.1/17]", 964928813], - [120, 7, 1311, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_comment_attachment` is too high. [17/7]", 964928813], - [120, 7, 1311, "Metrics/MethodLength: Method has too many lines. [17/10]", 964928813], - [120, 7, 1311, "Metrics/PerceivedComplexity: Perceived complexity for `emit_comment_attachment` is too high. [17/8]", 964928813], - [120, 34, 127, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 628879795], - [152, 7, 984, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_layout_gap` is too high. [8/7]", 1954418889], - [152, 7, 984, "Metrics/MethodLength: Method has too many lines. [13/10]", 1954418889], - [152, 7, 984, "Metrics/PerceivedComplexity: Perceived complexity for `emit_layout_gap` is too high. [9/8]", 1954418889], - [152, 26, 136, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3839882587], - [183, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861198], - [184, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087656651], - [186, 7, 1307, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_layout_attachment` is too high. [9/7]", 708408665], - [186, 7, 1307, "Metrics/MethodLength: Method has too many lines. [26/10]", 708408665], - [186, 7, 1307, "Metrics/PerceivedComplexity: Perceived complexity for `emit_layout_attachment` is too high. [9/8]", 708408665], - [186, 33, 218, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1552587384], - [187, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 1763090185], - [189, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1371312610], - [256, 31, 17, "Style/NumericPredicate: Use `@indent_level.positive?` instead of `@indent_level > 0`.", 1892475678], - [302, 56, 12, "Lint/UnusedMethodArgument: Unused method argument - `current_line`. You can also write as `inline_comment_region_target_column(*)` if you want the method to accept any arguments but don't care about them.", 2091263933], - [306, 42, 6, "Lint/UnusedMethodArgument: Unused method argument - `region`.", 2124512157], - [306, 51, 13, "Lint/UnusedMethodArgument: Unused method argument - `target_column`.", 3246375805], - [321, 7, 1141, "Metrics/AbcSize: Assignment Branch Condition size for `inline_comment_node_text` is too high. [<6, 29, 8> 30.68/17]", 2583471562], - [321, 7, 1141, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `inline_comment_node_text` is too high. [9/7]", 2583471562], - [321, 7, 1141, "Metrics/MethodLength: Method has too many lines. [22/10]", 2583471562], - [321, 7, 1141, "Metrics/PerceivedComplexity: Perceived complexity for `inline_comment_node_text` is too high. [9/8]", 2583471562], - [339, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861626], - [350, 7, 510, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_region_gap_lines` is too high. [8/7]", 1999747697], - [350, 7, 510, "Metrics/PerceivedComplexity: Perceived complexity for `emit_region_gap_lines` is too high. [9/8]", 1999747697] - ], - "lib/ast/merge/emitter_line_metadata_support.rb:3153033769": [ - [5, 5, 33, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::EmitterLineMetadataSupport`.", 2926748997], - [23, 7, 541, "Metrics/MethodLength: Method has too many lines. [12/10]", 2407359355] - ], - "lib/ast/merge/file_aligner_base.rb:2160333224": [ - [13, 5, 8206, "Metrics/ClassLength: Class has too many lines. [203/100]", 2982381587], - [27, 7, 2329, "Metrics/AbcSize: Assignment Branch Condition size for `align` is too high. [<19, 39, 14> 45.59/17]", 1243937217], - [27, 7, 2329, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `align` is too high. [14/7]", 1243937217], - [27, 7, 2329, "Metrics/MethodLength: Method has too many lines. [56/10]", 1243937217], - [27, 7, 2329, "Metrics/PerceivedComplexity: Perceived complexity for `align` is too high. [14/8]", 1243937217], - [167, 7, 655, "Metrics/MethodLength: Method has too many lines. [14/10]", 2468821688], - [199, 7, 455, "Metrics/MethodLength: Method has too many lines. [13/10]", 2361153066], - [218, 7, 1557, "Metrics/AbcSize: Assignment Branch Condition size for `apply_match_refiner!` is too high. [<10, 28, 12> 32.06/17]", 2386945712], - [218, 7, 1557, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_match_refiner!` is too high. [13/7]", 2386945712], - [218, 7, 1557, "Metrics/MethodLength: Method has too many lines. [31/10]", 2386945712], - [218, 7, 1557, "Metrics/PerceivedComplexity: Perceived complexity for `apply_match_refiner!` is too high. [13/8]", 2386945712] - ], - "lib/ast/merge/file_analyzable.rb:607555963": [ - [36, 5, 31229, "Metrics/ModuleLength: Module has too many lines. [316/100]", 1247752256], - [99, 19, 9, "Style/NumericPredicate: Use `index.negative?` instead of `index < 0`.", 4215255415], - [148, 7, 793, "Metrics/MethodLength: Method has too many lines. [22/10]", 1467470910], - [202, 7, 771, "Metrics/MethodLength: Method has too many lines. [16/10]", 1412317163], - [344, 7, 844, "Metrics/MethodLength: Method has too many lines. [12/10]", 2335919661], - [369, 7, 730, "Metrics/MethodLength: Method has too many lines. [11/10]", 1047958652], - [431, 7, 863, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_layout_owned_comment_attachment` is too high. [<0, 20, 4> 20.4/17]", 3284843691], - [431, 7, 863, "Metrics/MethodLength: Method has too many lines. [17/10]", 3284843691], - [481, 7, 683, "Metrics/MethodLength: Method has too many lines. [15/10]", 241044926], - [520, 14, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [614, 7, 6095, "Metrics/AbcSize: Assignment Branch Condition size for `generate_signature` is too high. [<4, 21, 13> 25.02/17]", 2828809875], - [614, 7, 6095, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `generate_signature` is too high. [11/7]", 2828809875], - [614, 7, 6095, "Metrics/MethodLength: Method has too many lines. [30/10]", 2828809875], - [614, 7, 6095, "Metrics/PerceivedComplexity: Perceived complexity for `generate_signature` is too high. [14/8]", 2828809875], - [676, 24, 390, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 3279112483] - ], - "lib/ast/merge/freeze_node_base.rb:2110274026": [ - [59, 5, 14572, "Metrics/ClassLength: Class has too many lines. [171/100]", 3038607603], - [108, 25, 545, "Style/MutableConstant: Freeze mutable objects assigned to constants.", 2366014160], - [186, 9, 1100, "Metrics/MethodLength: Method has too many lines. [15/10]", 2506841532], - [288, 7, 758, "Metrics/MethodLength: Method has too many lines. [11/10]", 136868205], - [288, 21, 276, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 1720059801], - [335, 7, 660, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `reason` is too high. [8/7]", 3127566048], - [418, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] - ], - "lib/ast/merge/healer.rb:3642412735": [ - [18, 7, 588, "Metrics/MethodLength: Method has too many lines. [15/10]", 3172269921], - [18, 17, 84, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1781025196], - [41, 7, 687, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `filter_items` is too high. [8/7]", 1200842691], - [41, 7, 687, "Metrics/MethodLength: Method has too many lines. [17/10]", 1200842691], - [41, 7, 687, "Metrics/PerceivedComplexity: Perceived complexity for `filter_items` is too high. [9/8]", 1200842691], - [41, 23, 130, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 33939503] - ], - "lib/ast/merge/jaccard_similarity.rb:678558736": [ - [87, 19, 1, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 177604], - [87, 22, 1, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 177607] - ], - "lib/ast/merge/key_path_partial_template_merger_base.rb:1818613864": [ - [22, 5, 6114, "Metrics/ClassLength: Class has too many lines. [155/100]", 1269962119], - [43, 21, 214, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 3637591635], - [68, 7, 489, "Metrics/MethodLength: Method has too many lines. [12/10]", 3170411580], - [118, 7, 640, "Metrics/AbcSize: Assignment Branch Condition size for `find_key_path` is too high. [<8, 14, 10> 18.97/17]", 2613403604], - [118, 7, 640, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_key_path` is too high. [8/7]", 2613403604], - [118, 7, 640, "Metrics/MethodLength: Method has too many lines. [16/10]", 2613403604], - [118, 7, 640, "Metrics/PerceivedComplexity: Perceived complexity for `find_key_path` is too high. [9/8]", 2613403604], - [140, 7, 536, "Metrics/MethodLength: Method has too many lines. [17/10]", 3598062652], - [168, 7, 804, "Metrics/MethodLength: Method has too many lines. [19/10]", 2773364183] - ], - "lib/ast/merge/layout.rb:3670500101": [ - [23, 36, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] - ], - "lib/ast/merge/layout/augmenter.rb:2556116722": [ - [8, 7, 5498, "Metrics/ClassLength: Class has too many lines. [129/100]", 3693754698], - [21, 23, 125, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 3395039982], - [53, 9, 1795, "Metrics/AbcSize: Assignment Branch Condition size for `build!` is too high. [<20, 32, 17> 41.39/17]", 3542913254], - [53, 9, 1795, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build!` is too high. [15/7]", 3542913254], - [53, 9, 1795, "Metrics/MethodLength: Method has too many lines. [43/10]", 3542913254], - [53, 9, 1795, "Metrics/PerceivedComplexity: Perceived complexity for `build!` is too high. [15/8]", 3542913254], - [58, 11, 1227, "Metrics/BlockLength: Block has too many lines. [29/25]", 55360131], - [105, 9, 504, "Metrics/MethodLength: Method has too many lines. [16/10]", 1953725517] - ], - "lib/ast/merge/layout/gap.rb:1678106201": [ - [11, 7, 7558, "Metrics/ClassLength: Class has too many lines. [151/100]", 2254377349], - [23, 9, 655, "Metrics/MethodLength: Method has too many lines. [11/10]", 3584854768], - [23, 23, 146, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 361396001], - [157, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859545], - [162, 9, 303, "Metrics/MethodLength: Method has too many lines. [12/10]", 2236444774], - [203, 9, 688, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_adjacency!` is too high. [10/7]", 1112786311], - [203, 9, 688, "Metrics/MethodLength: Method has too many lines. [13/10]", 1112786311] - ], - "lib/ast/merge/match_refiner_base.rb:1760054866": [ - [248, 7, 503, "Metrics/MethodLength: Method has too many lines. [11/10]", 2844230268], - [275, 7, 1056, "Metrics/AbcSize: Assignment Branch Condition size for `greedy_match` is too high. [<9, 24, 8> 26.85/17]", 2497617815], - [275, 7, 1056, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `greedy_match` is too high. [8/7]", 2497617815], - [275, 7, 1056, "Metrics/MethodLength: Method has too many lines. [24/10]", 2497617815] - ], - "lib/ast/merge/merge_result_base.rb:764500297": [ - [17, 5, 18646, "Metrics/ClassLength: Class has too many lines. [335/100]", 314460772], - [88, 21, 187, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1067369198], - [187, 7, 843, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_blank_line_runs!` is too high. [<12, 12, 10> 19.7/17]", 2347011594], - [187, 7, 843, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_blank_line_runs!` is too high. [9/7]", 2347011594], - [187, 7, 843, "Metrics/MethodLength: Method has too many lines. [22/10]", 2347011594], - [187, 7, 843, "Metrics/PerceivedComplexity: Perceived complexity for `normalize_blank_line_runs!` is too high. [10/8]", 2347011594], - [227, 7, 1004, "Metrics/MethodLength: Method has too many lines. [21/10]", 59539336], - [227, 35, 211, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 709487711], - [266, 7, 602, "Metrics/MethodLength: Method has too many lines. [13/10]", 320027623], - [341, 7, 927, "Metrics/AbcSize: Assignment Branch Condition size for `validate_review_state_compatibility!` is too high. [<8, 15, 4> 17.46/17]", 1596840080], - [341, 7, 927, "Metrics/MethodLength: Method has too many lines. [16/10]", 1596840080], - [403, 7, 936, "Metrics/AbcSize: Assignment Branch Condition size for `review_state_metadata` is too high. [<7, 18, 4> 19.72/17]", 4128292066], - [403, 7, 936, "Metrics/MethodLength: Method has too many lines. [14/10]", 4128292066], - [413, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 20421901], - [438, 7, 1194, "Metrics/MethodLength: Method has too many lines. [21/10]", 4289697646], - [448, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3342583337] - ], - "lib/ast/merge/merger_config.rb:3582657829": [ - [46, 5, 10581, "Metrics/ClassLength: Class has too many lines. [148/100]", 1598770872], - [96, 21, 234, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 720509970] - ], - "lib/ast/merge/navigable/injection_point_finder.rb:4117743218": [ - [45, 9, 1707, "Metrics/AbcSize: Assignment Branch Condition size for `find` is too high. [<9, 18, 17> 26.34/17]", 1445381162], - [45, 9, 1707, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find` is too high. [15/7]", 1445381162], - [45, 9, 1707, "Metrics/MethodLength: Method has too many lines. [28/10]", 1445381162], - [45, 9, 1707, "Metrics/PerceivedComplexity: Perceived complexity for `find` is too high. [16/8]", 1445381162], - [45, 17, 156, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 3876813166] - ], - "lib/ast/merge/navigable/statement.rb:3050515622": [ - [42, 7, 11078, "Metrics/ClassLength: Class has too many lines. [179/100]", 2550894515], - [96, 11, 550, "Metrics/AbcSize: Assignment Branch Condition size for `find_matching` is too high. [<7, 16, 12> 21.19/17]", 3492534565], - [96, 11, 550, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_matching` is too high. [12/7]", 3492534565], - [96, 11, 550, "Metrics/PerceivedComplexity: Perceived complexity for `find_matching` is too high. [12/8]", 3492534565], - [222, 13, 20, "Naming/PredicatePrefix: Rename `has_tree_navigation?` to `tree_navigation?`.", 733442156] - ], - "lib/ast/merge/node_typing.rb:4008165135": [ - [175, 9, 694, "Metrics/MethodLength: Method has too many lines. [12/10]", 777909930], - [213, 9, 891, "Metrics/AbcSize: Assignment Branch Condition size for `find_typing_callable` is too high. [<3, 23, 13> 26.59/17]", 3835052858], - [213, 9, 891, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_typing_callable` is too high. [14/7]", 3835052858], - [213, 9, 891, "Metrics/PerceivedComplexity: Perceived complexity for `find_typing_callable` is too high. [14/8]", 3835052858] - ], - "lib/ast/merge/node_wrapper_base.rb:3796877358": [ - [62, 5, 10228, "Metrics/ClassLength: Class has too many lines. [135/100]", 3832956007], - [92, 21, 81, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 4261369704] - ], - "lib/ast/merge/owner_selection.rb:2568070127": [ - [9, 7, 757, "Metrics/MethodLength: Method has too many lines. [13/10]", 2069564552] - ], - "lib/ast/merge/partial_template_merger_base.rb:2252899061": [ - [27, 5, 16780, "Metrics/ClassLength: Class has too many lines. [266/100]", 2205844189], - [48, 23, 81, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2112244807], - [106, 7, 757, "Metrics/MethodLength: Method has too many lines. [11/10]", 571708764], - [106, 21, 293, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 871709580], - [135, 7, 788, "Metrics/AbcSize: Assignment Branch Condition size for `merge` is too high. [<4, 19, 5> 20.05/17]", 467674580], - [135, 7, 788, "Metrics/MethodLength: Method has too many lines. [13/10]", 467674580], - [213, 7, 533, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_matcher` is too high. [<7, 20, 6> 22.02/17]", 1798972396], - [238, 7, 922, "Metrics/MethodLength: Method has too many lines. [25/10]", 1846154069], - [242, 25, 37, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 939456830], - [251, 25, 31, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 1024894473], - [268, 7, 1905, "Metrics/AbcSize: Assignment Branch Condition size for `perform_section_merge` is too high. [<13, 15, 2> 19.95/17]", 2711014340], - [268, 7, 1905, "Metrics/MethodLength: Method has too many lines. [34/10]", 2711014340], - [316, 50, 15, "Lint/UnusedMethodArgument: Unused method argument - `section_context`.", 2872123372], - [334, 7, 690, "Metrics/MethodLength: Method has too many lines. [14/10]", 1807124523], - [367, 7, 1122, "Metrics/AbcSize: Assignment Branch Condition size for `build_merged_content` is too high. [<1, 29, 14> 32.22/17]", 3938410418], - [367, 7, 1122, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_merged_content` is too high. [15/7]", 3938410418], - [367, 7, 1122, "Metrics/MethodLength: Method has too many lines. [18/10]", 3938410418], - [367, 7, 1122, "Metrics/PerceivedComplexity: Perceived complexity for `build_merged_content` is too high. [15/8]", 3938410418], - [397, 7, 596, "Metrics/MethodLength: Method has too many lines. [12/10]", 2602121883], - [397, 32, 144, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1463491208], - [414, 7, 1589, "Metrics/AbcSize: Assignment Branch Condition size for `source_splice_plan_for` is too high. [<6, 18, 9> 21/17]", 2889667289], - [414, 7, 1589, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `source_splice_plan_for` is too high. [9/7]", 2889667289], - [414, 7, 1589, "Metrics/MethodLength: Method has too many lines. [30/10]", 2889667289], - [414, 7, 1589, "Metrics/PerceivedComplexity: Perceived complexity for `source_splice_plan_for` is too high. [9/8]", 2889667289] - ], - "lib/ast/merge/recipe/config.rb:3990762705": [ - [54, 7, 14970, "Metrics/ClassLength: Class has too many lines. [296/100]", 2492031021], - [142, 9, 673, "Metrics/MethodLength: Method has too many lines. [12/10]", 3011978845], - [170, 9, 484, "Metrics/MethodLength: Method has too many lines. [15/10]", 183356432], - [246, 9, 710, "Metrics/AbcSize: Assignment Branch Condition size for `parse_injection` is too high. [<8, 13, 8> 17.23/17]", 641239814], - [246, 9, 710, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_injection` is too high. [9/7]", 641239814], - [246, 9, 710, "Metrics/MethodLength: Method has too many lines. [16/10]", 641239814], - [246, 9, 710, "Metrics/PerceivedComplexity: Perceived complexity for `parse_injection` is too high. [9/8]", 641239814], - [278, 9, 871, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_step` is too high. [8/7]", 3989307721], - [278, 9, 871, "Metrics/MethodLength: Method has too many lines. [20/10]", 3989307721], - [338, 9, 1758, "Metrics/AbcSize: Assignment Branch Condition size for `parse_step_merge_overrides` is too high. [<11, 43, 25> 50.94/17]", 806370438], - [338, 9, 1758, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_step_merge_overrides` is too high. [22/7]", 806370438], - [338, 9, 1758, "Metrics/MethodLength: Method has too many lines. [30/10]", 806370438], - [338, 9, 1758, "Metrics/PerceivedComplexity: Perceived complexity for `parse_step_merge_overrides` is too high. [22/8]", 806370438], - [373, 9, 566, "Metrics/MethodLength: Method has too many lines. [14/10]", 3671206955], - [391, 9, 547, "Metrics/MethodLength: Method has too many lines. [16/10]", 3273587697], - [459, 9, 799, "Metrics/AbcSize: Assignment Branch Condition size for `validate_injection!` is too high. [<2, 15, 12> 19.31/17]", 1665903587], - [459, 9, 799, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_injection!` is too high. [13/7]", 1665903587], - [459, 9, 799, "Metrics/MethodLength: Method has too many lines. [11/10]", 1665903587], - [459, 9, 799, "Metrics/PerceivedComplexity: Perceived complexity for `validate_injection!` is too high. [13/8]", 1665903587] - ], - "lib/ast/merge/recipe/preset.rb:2311326866": [ - [195, 9, 662, "Metrics/MethodLength: Method has too many lines. [12/10]", 1640897447] - ], - "lib/ast/merge/recipe/runner.rb:2243867806": [ - [27, 7, 28612, "Metrics/ClassLength: Class has too many lines. [547/100]", 79000832], - [73, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1411864995], - [77, 23, 136, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1636278032], - [92, 9, 849, "Metrics/MethodLength: Method has too many lines. [14/10]", 3083064345], - [128, 24, 129, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2642826282], - [210, 9, 788, "Metrics/MethodLength: Method has too many lines. [23/10]", 743008161], - [241, 9, 3397, "Metrics/AbcSize: Assignment Branch Condition size for `create_partial_template_merger` is too high. [<3, 52, 16> 54.49/17]", 2086180075], - [241, 9, 3397, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `create_partial_template_merger` is too high. [14/7]", 2086180075], - [241, 9, 3397, "Metrics/MethodLength: Method has too many lines. [63/10]", 2086180075], - [241, 9, 3397, "Metrics/PerceivedComplexity: Perceived complexity for `create_partial_template_merger` is too high. [13/8]", 2086180075], - [250, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2857356312], - [274, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177538], - [312, 9, 2210, "Metrics/AbcSize: Assignment Branch Condition size for `create_smart_merger` is too high. [<1, 39, 7> 39.64/17]", 1694660188], - [312, 9, 2210, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `create_smart_merger` is too high. [8/7]", 1694660188], - [312, 9, 2210, "Metrics/MethodLength: Method has too many lines. [45/10]", 1694660188], - [357, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 195423462], - [370, 9, 1087, "Metrics/MethodLength: Method has too many lines. [24/10]", 3850049530], - [370, 31, 124, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3466458723], - [401, 9, 1008, "Metrics/MethodLength: Method has too many lines. [19/10]", 2010895303], - [401, 25, 143, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2360959504], - [424, 9, 1263, "Metrics/AbcSize: Assignment Branch Condition size for `execute_partial_merge_step` is too high. [<3, 22, 1> 22.23/17]", 2850918453], - [424, 9, 1263, "Metrics/MethodLength: Method has too many lines. [25/10]", 2850918453], - [453, 9, 835, "Metrics/MethodLength: Method has too many lines. [14/10]", 1478843287], - [471, 9, 808, "Metrics/MethodLength: Method has too many lines. [15/10]", 1127254660], - [471, 37, 155, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 838578768], - [491, 9, 1126, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_smart_merge_result` is too high. [<8, 17, 12> 22.29/17]", 1786697339], - [491, 9, 1126, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_smart_merge_result` is too high. [9/7]", 1786697339], - [491, 9, 1126, "Metrics/MethodLength: Method has too many lines. [23/10]", 1786697339], - [491, 9, 1126, "Metrics/PerceivedComplexity: Perceived complexity for `normalize_smart_merge_result` is too high. [11/8]", 1786697339], - [518, 9, 2523, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_script_step_result` is too high. [<5, 40, 32> 51.47/17]", 2162420067], - [518, 9, 2523, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_script_step_result` is too high. [26/7]", 2162420067], - [518, 9, 2523, "Metrics/MethodLength: Method has too many lines. [48/10]", 2162420067], - [518, 9, 2523, "Metrics/PerceivedComplexity: Perceived complexity for `normalize_script_step_result` is too high. [29/8]", 2162420067], - [547, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 93872446], - [556, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 1527250939], - [586, 11, 155, "Style/HashTransformKeys: Prefer `transform_keys` over `each_with_object`.", 837503672], - [591, 9, 698, "Metrics/MethodLength: Method has too many lines. [11/10]", 1116310304], - [635, 9, 2582, "Metrics/AbcSize: Assignment Branch Condition size for `create_result_from_steps` is too high. [<8, 30, 31> 43.87/17]", 2040042265], - [635, 9, 2582, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `create_result_from_steps` is too high. [23/7]", 2040042265], - [635, 9, 2582, "Metrics/MethodLength: Method has too many lines. [60/10]", 2040042265], - [635, 9, 2582, "Metrics/PerceivedComplexity: Perceived complexity for `create_result_from_steps` is too high. [27/8]", 2040042265], - [635, 37, 133, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 789257106], - [649, 42, 40, "Style/SymbolProc: Pass `&:has_anchor` as an argument to `any?` instead of a block.", 4233626321] - ], - "lib/ast/merge/recipe/script_loader.rb:1397873218": [ - [145, 9, 1126, "Metrics/AbcSize: Assignment Branch Condition size for `load_script_file` is too high. [<6, 19, 4> 20.32/17]", 3417625171], - [145, 9, 1126, "Metrics/MethodLength: Method has too many lines. [17/10]", 3417625171] - ], - "lib/ast/merge/rspec/comment_behavior_matrix_adapters.rb:3429217018": [ - [9, 46, 341, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 532439002], - [31, 9, 901, "Metrics/MethodLength: Method has too many lines. [11/10]", 584608092], - [31, 59, 308, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 883491898], - [54, 9, 1269, "Metrics/MethodLength: Method has too many lines. [20/10]", 1021031182], - [65, 51, 6, "Lint/UnusedBlockArgument: Unused block argument - `inline`. If it's necessary, use `_` or `_inline` as an argument name to indicate that it won't be used.", 1605470060], - [69, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 4226982364], - [70, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1440420861] - ], - "lib/ast/merge/rspec/conformance_fixtures.rb:1295759615": [ - [6, 7, 26, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::RSpec::ConformanceFixtures`.", 90066768], - [9, 9, 1432, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_conformance_fixture_support` is too high. [<10, 30, 33> 45.71/17]", 518714108], - [9, 9, 1432, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_conformance_fixture_support` is too high. [33/7]", 518714108], - [9, 9, 1432, "Metrics/MethodLength: Method has too many lines. [25/10]", 518714108], - [9, 9, 1432, "Metrics/PerceivedComplexity: Perceived complexity for `normalize_conformance_fixture_support` is too high. [31/8]", 518714108] - ], - "lib/ast/merge/rspec/dependency_tags_config.rb:3604516304": [ - [30, 1, 2102, "Metrics/BlockLength: Block has too many lines. [26/25]", 113766065] - ], - "lib/ast/merge/rspec/merge_gem_registry.rb:3009576030": [ - [58, 7, 12129, "Metrics/ModuleLength: Module has too many lines. [158/100]", 335549747], - [90, 9, 780, "Metrics/MethodLength: Method has too many lines. [14/10]", 978965737], - [90, 21, 99, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3580433546], - [118, 9, 650, "Metrics/MethodLength: Method has too many lines. [12/10]", 3143160805], - [118, 31, 130, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2575863904], - [143, 9, 823, "Metrics/MethodLength: Method has too many lines. [17/10]", 4033116153], - [200, 9, 765, "Metrics/AbcSize: Assignment Branch Condition size for `register_known_gems` is too high. [<3, 17, 3> 17.52/17]", 1367620151], - [200, 9, 765, "Metrics/MethodLength: Method has too many lines. [17/10]", 1367620151] - ], - "lib/ast/merge/rspec/shared_examples.rb:2878318351": [ - [29, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 330577472] - ], - "lib/ast/merge/rspec/shared_examples/comment_behavior_matrix.rb:3695671858": [ - [36, 1, 27847, "Metrics/BlockLength: Block has too many lines. [540/25]", 3796645407], - [38, 55, 15, "Style/SymbolProc: Pass `&:value` as an argument to `lambda` instead of a block.", 1808354951], - [42, 64, 23, "Style/SymbolProc: Pass `&:statements` as an argument to `lambda` instead of a block.", 277221641], - [69, 3, 4455, "Metrics/BlockLength: Block has too many lines. [82/25]", 3672334777], - [72, 5, 1763, "Metrics/BlockLength: Block has too many lines. [34/25]", 164750821], - [165, 3, 22093, "Metrics/BlockLength: Block has too many lines. [429/25]", 229312375], - [292, 5, 1918, "Metrics/BlockLength: Block has too many lines. [29/25]", 1312741055], - [323, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1902517440], - [325, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 173482512], - [328, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 167607404], - [476, 5, 1605, "Metrics/BlockLength: Block has too many lines. [35/25]", 1943633697], - [677, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1902517440] - ], - "lib/ast/merge/rspec/shared_examples/conflict_resolver_base.rb:624045197": [ - [30, 1, 7893, "Metrics/BlockLength: Block has too many lines. [197/25]", 3450672926], - [37, 3, 1372, "Metrics/BlockLength: Block has too many lines. [33/25]", 3389152504], - [83, 3, 1206, "Metrics/BlockLength: Block has too many lines. [35/25]", 1580202348], - [128, 3, 1177, "Metrics/BlockLength: Block has too many lines. [33/25]", 2178974049], - [215, 3, 2443, "Metrics/BlockLength: Block has too many lines. [51/25]", 2538475273], - [219, 5, 1909, "Metrics/BlockLength: Block has too many lines. [35/25]", 880175101], - [279, 1, 2518, "Metrics/BlockLength: Block has too many lines. [74/25]", 958151448], - [286, 3, 2235, "Metrics/BlockLength: Block has too many lines. [70/25]", 2123260684], - [391, 1, 1317, "Metrics/BlockLength: Block has too many lines. [37/25]", 2321517041], - [439, 1, 1639, "Metrics/BlockLength: Block has too many lines. [37/25]", 276150366] - ], - "lib/ast/merge/rspec/shared_examples/debug_logger.rb:2747003588": [ - [23, 1, 4741, "Metrics/BlockLength: Block has too many lines. [121/25]", 3341338388], - [47, 3, 976, "Metrics/BlockLength: Block has too many lines. [27/25]", 2640321404], - [85, 3, 1452, "Metrics/BlockLength: Block has too many lines. [34/25]", 554663062] - ], - "lib/ast/merge/rspec/shared_examples/feature_profile.rb:4172143324": [ - [30, 1, 4249, "Metrics/BlockLength: Block has too many lines. [53/25]", 3787230403] - ], - "lib/ast/merge/rspec/shared_examples/file_analyzable.rb:2391547213": [ - [44, 1, 6468, "Metrics/BlockLength: Block has too many lines. [145/25]", 3744642916] - ], - "lib/ast/merge/rspec/shared_examples/freeze_node_base.rb:1711126715": [ - [23, 1, 5952, "Metrics/BlockLength: Block has too many lines. [157/25]", 3152271039], - [29, 3, 2836, "Metrics/BlockLength: Block has too many lines. [69/25]", 2082270913], - [115, 3, 1552, "Metrics/BlockLength: Block has too many lines. [46/25]", 4180117745] - ], - "lib/ast/merge/rspec/shared_examples/layout_attachment.rb:4130619694": [ - [30, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 1263574869], - [31, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 4282300883] - ], - "lib/ast/merge/rspec/shared_examples/layout_augmenter.rb:1928277603": [ - [18, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1311107624], - [19, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1311107624] - ], - "lib/ast/merge/rspec/shared_examples/merge_result_base.rb:2962043558": [ - [18, 1, 2330, "Metrics/BlockLength: Block has too many lines. [67/25]", 3496673178], - [53, 3, 1271, "Metrics/BlockLength: Block has too many lines. [42/25]", 2278976858] - ], - "lib/ast/merge/rspec/shared_examples/merger_config.rb:2413785902": [ - [18, 1, 8240, "Metrics/BlockLength: Block has too many lines. [193/25]", 3665443345], - [57, 3, 1628, "Metrics/BlockLength: Block has too many lines. [32/25]", 7828299], - [98, 3, 1266, "Metrics/BlockLength: Block has too many lines. [28/25]", 317929439], - [159, 3, 1740, "Metrics/BlockLength: Block has too many lines. [42/25]", 1736487820], - [217, 3, 1373, "Metrics/BlockLength: Block has too many lines. [30/25]", 442933563] - ], - "lib/ast/merge/rspec/shared_examples/recipe_preset_contract.rb:1495545061": [ - [7, 1, 2558, "Metrics/BlockLength: Block has too many lines. [51/25]", 4091815632] - ], - "lib/ast/merge/rspec/shared_examples/removal_mode_compliance.rb:3645548199": [ - [24, 1, 1860, "Metrics/BlockLength: Block has too many lines. [33/25]", 1115825136] - ], - "lib/ast/merge/rspec/shared_examples/reproducible_merge.rb:2276592459": [ - [51, 1, 2030, "Metrics/BlockLength: Block has too many lines. [52/25]", 563553381] - ], - "lib/ast/merge/rspec/shared_examples/reproducible_partial_merge.rb:524436129": [ - [3, 1, 2321, "Metrics/BlockLength: Block has too many lines. [44/25]", 3206099540] - ], - "lib/ast/merge/rspec/shared_examples/runtime_debug_contract.rb:4244040583": [ - [8, 1, 2808, "Metrics/BlockLength: Block has too many lines. [48/25]", 3274492878] - ], - "lib/ast/merge/rspec/shared_examples/unresolved_helper_contract.rb:2916431464": [ - [9, 1, 5998, "Metrics/BlockLength: Block has too many lines. [126/25]", 4174562424], - [94, 3, 1515, "Metrics/BlockLength: Block has too many lines. [32/25]", 1928238376] - ], - "lib/ast/merge/rspec/shared_examples/unresolved_review_state_transport_contract.rb:3368966854": [ - [14, 1, 3386, "Metrics/BlockLength: Block has too many lines. [68/25]", 2910343214], - [65, 3, 317, "Metrics/MethodLength: Method has too many lines. [12/10]", 2653897690] - ], - "lib/ast/merge/rspec/shared_examples/unresolved_runtime_contract.rb:1424234700": [ - [10, 1, 2652, "Metrics/BlockLength: Block has too many lines. [42/25]", 960283638], - [31, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2892620242], - [46, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193437756] - ], - "lib/ast/merge/rspec/shared_examples/unresolved_runtime_debug_contract.rb:2897026147": [ - [25, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2418171787], - [26, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 235635831] - ], - "lib/ast/merge/ruleset/config.rb:4242726919": [ - [7, 7, 3664, "Metrics/ClassLength: Class has too many lines. [101/100]", 1968929597], - [36, 9, 933, "Metrics/MethodLength: Method has too many lines. [15/10]", 3334511209], - [36, 23, 319, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [15/5]", 1652945408], - [65, 9, 515, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 18, 3> 18.25/17]", 2614325513], - [65, 9, 515, "Metrics/MethodLength: Method has too many lines. [14/10]", 2614325513] - ], - "lib/ast/merge/ruleset/feature_profile.rb:3980745364": [ - [12, 7, 6054, "Metrics/ClassLength: Class has too many lines. [155/100]", 2818730231], - [29, 9, 1351, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<17, 18, 7> 25.73/17]", 2248702332], - [29, 9, 1351, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `initialize` is too high. [8/7]", 2248702332], - [29, 9, 1351, "Metrics/MethodLength: Method has too many lines. [17/10]", 2248702332], - [29, 23, 422, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 1415781648], - [138, 9, 1509, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 36, 6> 36.5/17]", 3793816437], - [138, 9, 1509, "Metrics/MethodLength: Method has too many lines. [31/10]", 3793816437] - ], - "lib/ast/merge/ruleset/parser.rb:698282871": [ - [7, 7, 9396, "Metrics/ClassLength: Class has too many lines. [199/100]", 1305123525], - [43, 9, 473, "Metrics/AbcSize: Assignment Branch Condition size for `parse` is too high. [<0, 17, 2> 17.12/17]", 1400394586], - [43, 9, 473, "Metrics/MethodLength: Method has too many lines. [12/10]", 1400394586], - [71, 9, 1053, "Metrics/MethodLength: Method has too many lines. [24/10]", 1569959910], - [101, 9, 1123, "Metrics/AbcSize: Assignment Branch Condition size for `parse_single_value_directive!` is too high. [<7, 13, 10> 17.83/17]", 706129883], - [101, 9, 1123, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_single_value_directive!` is too high. [8/7]", 706129883], - [101, 9, 1123, "Metrics/MethodLength: Method has too many lines. [24/10]", 706129883], - [170, 9, 605, "Metrics/MethodLength: Method has too many lines. [11/10]", 336127382], - [186, 9, 687, "Metrics/MethodLength: Method has too many lines. [11/10]", 2962844982] - ], - "lib/ast/merge/ruleset/profile_vocabulary.rb:2359837647": [ - [7, 7, 3956, "Metrics/ModuleLength: Module has too many lines. [107/100]", 1680256705] - ], - "lib/ast/merge/ruleset/runtime_declaration.rb:1016848190": [ - [18, 9, 819, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<11, 13, 5> 17.75/17]", 4043304883], - [18, 9, 819, "Metrics/MethodLength: Method has too many lines. [11/10]", 4043304883], - [18, 23, 240, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 3868000276], - [49, 9, 551, "Metrics/MethodLength: Method has too many lines. [13/10]", 448215861] - ], - "lib/ast/merge/ruleset/runtime_translator.rb:3255492631": [ - [9, 11, 816, "Metrics/MethodLength: Method has too many lines. [19/10]", 225301385], - [31, 11, 986, "Metrics/AbcSize: Assignment Branch Condition size for `feature_profile` is too high. [<1, 17, 0> 17.03/17]", 1395467476], - [31, 11, 986, "Metrics/MethodLength: Method has too many lines. [19/10]", 1395467476] - ], - "lib/ast/merge/ruleset/support_style_resolver.rb:508975884": [ - [9, 11, 864, "Metrics/MethodLength: Method has too many lines. [22/10]", 3902551296] - ], - "lib/ast/merge/runtime/child_result.rb:4083710804": [ - [16, 9, 698, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<7, 16, 2> 17.58/17]", 2208366179], - [16, 23, 227, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 3688358290], - [38, 9, 584, "Metrics/MethodLength: Method has too many lines. [11/10]", 3113479157], - [55, 11, 106, "Style/HashTransformKeys: Prefer `transform_keys` over `each_with_object`.", 4262612225] - ], - "lib/ast/merge/runtime/delegate.rb:3607371286": [ - [17, 23, 285, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 2793452069] - ], - "lib/ast/merge/runtime/diagnostic.rb:805162185": [ - [10, 23, 72, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1875462867] - ], - "lib/ast/merge/runtime/operation.rb:1030261783": [ - [20, 9, 767, "Metrics/MethodLength: Method has too many lines. [11/10]", 2728174753], - [20, 23, 278, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 694444911], - [100, 9, 617, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<2, 24, 6> 24.82/17]", 1175382849], - [100, 9, 617, "Metrics/MethodLength: Method has too many lines. [11/10]", 1175382849] - ], - "lib/ast/merge/runtime/resolution_case.rb:250040454": [ - [8, 9, 707, "Metrics/AbcSize: Assignment Branch Condition size for `from_h` is too high. [<1, 19, 6> 19.95/17]", 2592154170], - [29, 23, 189, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 818714714], - [81, 11, 111, "Style/HashTransformKeys: Prefer `transform_keys` over `each_with_object`.", 2712537644] - ], - "lib/ast/merge/runtime/root_session_support.rb:1917388966": [ - [10, 9, 2153, "Metrics/AbcSize: Assignment Branch Condition size for `start_runtime_root_session!` is too high. [<5, 20, 3> 20.83/17]", 1888056651], - [10, 9, 2153, "Metrics/MethodLength: Method has too many lines. [41/10]", 1888056651], - [10, 40, 421, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 2297301282], - [60, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2312419928], - [68, 9, 771, "Metrics/MethodLength: Method has too many lines. [13/10]", 1787620786], - [68, 43, 191, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3635875424] - ], - "lib/ast/merge/runtime/session.rb:628419040": [ - [66, 9, 1203, "Metrics/AbcSize: Assignment Branch Condition size for `summary` is too high. [<5, 43, 13> 45.2/17]", 550888870], - [66, 9, 1203, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `summary` is too high. [14/7]", 550888870], - [66, 9, 1203, "Metrics/MethodLength: Method has too many lines. [20/10]", 550888870], - [66, 9, 1203, "Metrics/PerceivedComplexity: Perceived complexity for `summary` is too high. [14/8]", 550888870] - ], - "lib/ast/merge/runtime/surface.rb:3684795905": [ - [17, 23, 230, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 469229117], - [44, 9, 418, "Metrics/MethodLength: Method has too many lines. [11/10]", 998969973] - ], - "lib/ast/merge/section_typing.rb:4261989256": [ - [112, 9, 710, "Metrics/MethodLength: Method has too many lines. [15/10]", 3600335459], - [176, 9, 67, "Lint/MissingSuper: Call `super` to initialize state of the parent class.", 4077537758], - [216, 9, 85, "Lint/MissingSuper: Call `super` to initialize state of the parent class.", 3648782014], - [245, 9, 1446, "Metrics/AbcSize: Assignment Branch Condition size for `merge_sections` is too high. [<13, 20, 12> 26.7/17]", 525095633], - [245, 9, 1446, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_sections` is too high. [12/7]", 525095633], - [245, 9, 1446, "Metrics/MethodLength: Method has too many lines. [28/10]", 525095633], - [245, 9, 1446, "Metrics/PerceivedComplexity: Perceived complexity for `merge_sections` is too high. [13/8]", 525095633] - ], - "lib/ast/merge/smart_merger_base.rb:4189972287": [ - [109, 5, 15324, "Metrics/ClassLength: Class has too many lines. [172/100]", 3547407870], - [214, 7, 1974, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<20, 14, 5> 24.92/17]", 2211610736], - [214, 7, 1974, "Metrics/MethodLength: Method has too many lines. [23/10]", 2211610736], - [214, 21, 443, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [15/5]", 1530523783], - [424, 7, 1312, "Metrics/AbcSize: Assignment Branch Condition size for `parse_and_analyze` is too high. [<7, 25, 11> 28.2/17]", 1640248187], - [424, 7, 1312, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_and_analyze` is too high. [10/7]", 1640248187], - [424, 7, 1312, "Metrics/MethodLength: Method has too many lines. [15/10]", 1640248187], - [424, 7, 1312, "Metrics/PerceivedComplexity: Perceived complexity for `parse_and_analyze` is too high. [10/8]", 1640248187], - [517, 12, 52, "Style/NumericPredicate: Use `result_class.instance_method(:initialize).arity.zero?` instead of `result_class.instance_method(:initialize).arity == 0`.", 1312375552] - ], - "lib/ast/merge/structural_edit/boundary.rb:2838060197": [ - [20, 23, 93, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3901214537], - [41, 38, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [51, 38, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [60, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087440865] - ], - "lib/ast/merge/structural_edit/boundary_support.rb:2036464761": [ - [31, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861061], - [32, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 97596930] - ], - "lib/ast/merge/structural_edit/plan_set.rb:538463647": [ - [116, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 2855200692] - ], - "lib/ast/merge/structural_edit/rehome_plan.rb:2152178780": [ - [23, 23, 123, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3433617242], - [100, 9, 519, "Metrics/MethodLength: Method has too many lines. [11/10]", 318006380], - [136, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 2367140872] - ], - "lib/ast/merge/structural_edit/remove_plan.rb:1189569486": [ - [11, 7, 9717, "Metrics/ClassLength: Class has too many lines. [160/100]", 3652701475], - [25, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861091], - [27, 9, 1409, "Metrics/MethodLength: Method has too many lines. [22/10]", 3344870777], - [27, 23, 255, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 3970946607], - [28, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 1637059282], - [36, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859104], - [196, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 1617827253], - [224, 9, 1032, "Metrics/MethodLength: Method has too many lines. [20/10]", 968444047] - ], - "lib/ast/merge/structural_edit/remove_plan_support.rb:877461974": [ - [9, 9, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631], - [19, 9, 1429, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_remove_plan` is too high. [8/7]", 4091314919], - [19, 9, 1429, "Metrics/MethodLength: Method has too many lines. [32/10]", 4091314919] - ], - "lib/ast/merge/structural_edit/splice_plan.rb:2675806114": [ - [39, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1683893295], - [42, 23, 203, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3653221702], - [113, 9, 517, "Metrics/MethodLength: Method has too many lines. [11/10]", 634912361] - ], - "lib/ast/merge/structured_emitter_provenance_support.rb:445323365": [ - [5, 5, 41, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::StructuredEmitterProvenanceSupport`.", 3548518830] - ], - "lib/ast/merge/structured_review_apply_support.rb:3649736380": [ - [5, 5, 35, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::StructuredReviewApplySupport`.", 1282380463], - [22, 7, 782, "Metrics/AbcSize: Assignment Branch Condition size for `current_output_span_for` is too high. [<6, 19, 11> 22.76/17]", 4137750179], - [22, 7, 782, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `current_output_span_for` is too high. [8/7]", 4137750179], - [22, 7, 782, "Metrics/MethodLength: Method has too many lines. [14/10]", 4137750179], - [42, 7, 595, "Metrics/MethodLength: Method has too many lines. [12/10]", 2080934521], - [60, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3151172498] - ], - "lib/ast/merge/text/conflict_resolver.rb:989169286": [ - [19, 7, 9182, "Metrics/ClassLength: Class has too many lines. [159/100]", 1070563745], - [28, 23, 211, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2639535499], - [53, 9, 2507, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_batch` is too high. [<15, 34, 5> 37.5/17]", 825130797], - [53, 9, 2507, "Metrics/MethodLength: Method has too many lines. [44/10]", 825130797], - [196, 9, 2458, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_matched_pair` is too high. [<2, 30, 11> 32.02/17]", 4037214978], - [196, 9, 2458, "Metrics/MethodLength: Method has too many lines. [46/10]", 4037214978] - ], - "lib/ast/merge/text/file_analysis.rb:1530312707": [ - [106, 9, 1484, "Metrics/AbcSize: Assignment Branch Condition size for `parse_statements` is too high. [<11, 15, 6> 19.54/17]", 1858083071], - [106, 9, 1484, "Metrics/MethodLength: Method has too many lines. [34/10]", 1858083071], - [160, 9, 449, "Metrics/MethodLength: Method has too many lines. [11/10]", 1902035813] - ], - "lib/ast/merge/text/line_node.rb:3385927013": [ - [145, 9, 699, "Metrics/MethodLength: Method has too many lines. [17/10]", 2201872249] - ], - "lib/ast/merge/text/section_splitter.rb:129704488": [ - [141, 9, 1442, "Metrics/AbcSize: Assignment Branch Condition size for `merge_section_lists` is too high. [<13, 20, 6> 24.6/17]", 3551729170], - [141, 9, 1442, "Metrics/MethodLength: Method has too many lines. [23/10]", 3551729170], - [322, 9, 1767, "Metrics/AbcSize: Assignment Branch Condition size for `split` is too high. [<11, 29, 10> 32.59/17]", 2207922758], - [322, 9, 1767, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split` is too high. [10/7]", 2207922758], - [322, 9, 1767, "Metrics/MethodLength: Method has too many lines. [46/10]", 2207922758], - [322, 9, 1767, "Metrics/PerceivedComplexity: Perceived complexity for `split` is too high. [13/8]", 2207922758], - [328, 11, 1019, "Metrics/BlockLength: Block has too many lines. [26/25]", 1561634792] - ], - "lib/ast/merge/text/smart_merger.rb:2405807903": [ - [67, 9, 831, "Metrics/MethodLength: Method has too many lines. [12/10]", 584426022], - [67, 23, 350, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 3074172637] - ], - "lib/ast/merge/trailing_groups/alignment_sort.rb:2593404330": [ - [40, 9, 513, "Metrics/MethodLength: Method has too many lines. [12/10]", 89360683] - ], - "lib/ast/merge/trailing_groups/core.rb:4231959665": [ - [61, 9, 812, "Metrics/MethodLength: Method has too many lines. [17/10]", 1777526069], - [101, 9, 998, "Metrics/AbcSize: Assignment Branch Condition size for `flush_ready_trailing_groups` is too high. [<8, 18, 15> 24.76/17]", 2397698441], - [101, 9, 998, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `flush_ready_trailing_groups` is too high. [13/7]", 2397698441], - [101, 9, 998, "Metrics/MethodLength: Method has too many lines. [17/10]", 2397698441], - [101, 9, 998, "Metrics/PerceivedComplexity: Perceived complexity for `flush_ready_trailing_groups` is too high. [13/8]", 2397698441] - ], - "lib/ast/merge/trailing_groups/dest_iterate.rb:3897205087": [ - [69, 9, 751, "Metrics/MethodLength: Method has too many lines. [12/10]", 3915657972], - [69, 47, 199, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2545849044] - ], - "lib/ast/merge/unresolved_support.rb:2881272494": [ - [7, 5, 24, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::UnresolvedSupport`.", 990281691], - [7, 5, 4392, "Metrics/ModuleLength: Module has too many lines. [116/100]", 3475162940], - [32, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [67, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [85, 7, 1038, "Metrics/MethodLength: Method has too many lines. [14/10]", 3139619197], - [85, 40, 338, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 71164914] - ], - "spec/ast/merge/ast_node_spec.rb:1362065144": [ - [3, 1, 8199, "Metrics/BlockLength: Block has too many lines. [254/25]", 1649868231], - [18, 3, 1030, "Metrics/BlockLength: Block has too many lines. [33/25]", 1409835577] - ], - "spec/ast/merge/block_directive_spec.rb:2305756581": [ - [3, 1, 5181, "Metrics/BlockLength: Block has too many lines. [138/25]", 1887900896], - [128, 3, 1391, "Metrics/BlockLength: Block has too many lines. [39/25]", 3626371694] - ], - "spec/ast/merge/comment/attachment_spec.rb:2571833836": [ - [3, 1, 5536, "Metrics/BlockLength: Block has too many lines. [150/25]", 1841571757], - [93, 3, 1639, "Metrics/BlockLength: Block has too many lines. [37/25]", 212730671] - ], - "spec/ast/merge/comment/augmenter_spec.rb:4266625483": [ - [3, 1, 9141, "Metrics/BlockLength: Block has too many lines. [212/25]", 530365996], - [16, 3, 6849, "Metrics/BlockLength: Block has too many lines. [154/25]", 503152628], - [200, 3, 1244, "Metrics/BlockLength: Block has too many lines. [33/25]", 3565041107] - ], - "spec/ast/merge/comment/block_spec.rb:4138473890": [ - [3, 1, 9021, "Metrics/BlockLength: Block has too many lines. [250/25]", 1617505173], - [8, 3, 1115, "Metrics/BlockLength: Block has too many lines. [27/25]", 2958989619], - [93, 3, 1127, "Metrics/BlockLength: Block has too many lines. [33/25]", 196340527], - [123, 45, 16, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 155572628], - [159, 3, 1432, "Metrics/BlockLength: Block has too many lines. [35/25]", 281400319] - ], - "spec/ast/merge/comment/c_style_tracker_base_spec.rb:3154319400": [ - [3, 1, 5816, "Metrics/BlockLength: Block has too many lines. [133/25]", 680831933], - [100, 3, 1450, "Metrics/BlockLength: Block has too many lines. [35/25]", 4153882185] - ], - "spec/ast/merge/comment/capability_spec.rb:2763521225": [ - [3, 1, 3522, "Metrics/BlockLength: Block has too many lines. [89/25]", 1487980773], - [4, 3, 1954, "Metrics/BlockLength: Block has too many lines. [41/25]", 160187362] - ], - "spec/ast/merge/comment/empty_spec.rb:1801324640": [ - [3, 1, 2584, "Metrics/BlockLength: Block has too many lines. [70/25]", 270179899], - [4, 3, 1047, "Metrics/BlockLength: Block has too many lines. [27/25]", 3056449816] - ], - "spec/ast/merge/comment/hash_tracker_base_spec.rb:3624528747": [ - [3, 1, 9653, "Metrics/BlockLength: Block has too many lines. [271/25]", 3748659406], - [8, 3, 1210, "Metrics/BlockLength: Block has too many lines. [37/25]", 2566766302], - [21, 7, 872, "Metrics/AbcSize: Assignment Branch Condition size for `extract_comments` is too high. [<7, 24, 5> 25.5/17]", 1213080161], - [21, 7, 872, "Metrics/MethodLength: Method has too many lines. [25/10]", 1213080161], - [275, 3, 1171, "Metrics/BlockLength: Block has too many lines. [29/25]", 1425466742] - ], - "spec/ast/merge/comment/line_spec.rb:1487829548": [ - [3, 1, 5291, "Metrics/BlockLength: Block has too many lines. [128/25]", 587604747], - [6, 3, 1573, "Metrics/BlockLength: Block has too many lines. [37/25]", 4105920006] - ], - "spec/ast/merge/comment/parser_spec.rb:2443973508": [ - [3, 1, 9855, "Metrics/BlockLength: Block has too many lines. [237/25]", 404174977], - [4, 3, 1013, "Metrics/BlockLength: Block has too many lines. [26/25]", 182655397], - [38, 3, 1282, "Metrics/BlockLength: Block has too many lines. [28/25]", 2303702609] - ], - "spec/ast/merge/comment/quoted_hash_line_parser_spec.rb:3795390831": [ - [3, 1, 1810, "Metrics/BlockLength: Block has too many lines. [44/25]", 2575838586], - [6, 3, 1700, "Metrics/BlockLength: Block has too many lines. [41/25]", 1553834548] - ], - "spec/ast/merge/comment/region_merge_policy_spec.rb:4175996936": [ - [3, 1, 3618, "Metrics/BlockLength: Block has too many lines. [75/25]", 4006378358], - [11, 3, 2752, "Metrics/BlockLength: Block has too many lines. [52/25]", 494211987] - ], - "spec/ast/merge/comment/region_spec.rb:2674736508": [ - [3, 1, 4033, "Metrics/BlockLength: Block has too many lines. [91/25]", 1828104331] - ], - "spec/ast/merge/comment/style_spec.rb:1875195890": [ - [3, 1, 4040, "Metrics/BlockLength: Block has too many lines. [101/25]", 2759361650] - ], - "spec/ast/merge/comment/support_style_spec.rb:1350169032": [ - [3, 1, 1577, "Metrics/BlockLength: Block has too many lines. [39/25]", 3414039011] - ], - "spec/ast/merge/comment/tracked_hash_adapter_spec.rb:1256807736": [ - [3, 1, 4482, "Metrics/BlockLength: Block has too many lines. [97/25]", 264417763], - [4, 3, 3101, "Metrics/BlockLength: Block has too many lines. [63/25]", 1050939978], - [81, 3, 1313, "Metrics/BlockLength: Block has too many lines. [30/25]", 515655104] - ], - "spec/ast/merge/comment_spec.rb:81945459": [ - [3, 1, 15888, "Metrics/BlockLength: Block has too many lines. [384/25]", 2229554982], - [4, 3, 3957, "Metrics/BlockLength: Block has too many lines. [84/25]", 660667217], - [5, 5, 1187, "Metrics/BlockLength: Block has too many lines. [26/25]", 241562105], - [105, 3, 1371, "Metrics/BlockLength: Block has too many lines. [30/25]", 1901983597], - [159, 3, 1296, "Metrics/BlockLength: Block has too many lines. [30/25]", 1749880380], - [239, 3, 1151, "Metrics/BlockLength: Block has too many lines. [28/25]", 183967322], - [272, 3, 2004, "Metrics/BlockLength: Block has too many lines. [45/25]", 2594323837], - [349, 3, 3220, "Metrics/BlockLength: Block has too many lines. [83/25]", 790417809], - [350, 5, 2347, "Metrics/BlockLength: Block has too many lines. [60/25]", 4016801881] - ], - "spec/ast/merge/composite_match_refiner_spec.rb:2888297870": [ - [3, 1, 6152, "Metrics/BlockLength: Block has too many lines. [143/25]", 3308692548], - [55, 3, 4118, "Metrics/BlockLength: Block has too many lines. [87/25]", 1405655464] - ], - "spec/ast/merge/conflict_resolver_base_spec.rb:3331938447": [ - [5, 1, 20643, "Metrics/BlockLength: Block has too many lines. [516/25]", 3129196558], - [14, 59, 14, "Lint/UnusedMethodArgument: Unused method argument - `template_index`.", 1809801172], - [14, 76, 10, "Lint/UnusedMethodArgument: Unused method argument - `dest_index`.", 2703999490], - [47, 61, 14, "Lint/UnusedMethodArgument: Unused method argument - `template_index`. You can also write as `resolve_node_pair(*)` if you want the method to accept any arguments but don't care about them.", 1809801172], - [47, 78, 10, "Lint/UnusedMethodArgument: Unused method argument - `dest_index`. You can also write as `resolve_node_pair(*)` if you want the method to accept any arguments but don't care about them.", 2703999490], - [105, 3, 17203, "Metrics/BlockLength: Block has too many lines. [425/25]", 1114912980], - [154, 5, 1797, "Metrics/BlockLength: Block has too many lines. [37/25]", 515146940], - [203, 5, 1373, "Metrics/BlockLength: Block has too many lines. [32/25]", 603210832], - [292, 5, 2874, "Metrics/BlockLength: Block has too many lines. [77/25]", 3918129775], - [341, 7, 1292, "Metrics/BlockLength: Block has too many lines. [34/25]", 1769555944], - [402, 5, 1857, "Metrics/BlockLength: Block has too many lines. [44/25]", 1516406612], - [456, 5, 1209, "Metrics/BlockLength: Block has too many lines. [31/25]", 430489898], - [514, 5, 2021, "Metrics/BlockLength: Block has too many lines. [37/25]", 144128170], - [515, 7, 1953, "Metrics/BlockLength: Block has too many lines. [35/25]", 1574966248], - [567, 5, 1500, "Metrics/BlockLength: Block has too many lines. [40/25]", 2509466150] - ], - "spec/ast/merge/content_match_refiner_spec.rb:4058001158": [ - [3, 1, 14348, "Metrics/BlockLength: Block has too many lines. [318/25]", 1171164704], - [25, 3, 1238, "Metrics/BlockLength: Block has too many lines. [29/25]", 2139810386], - [63, 3, 4077, "Metrics/BlockLength: Block has too many lines. [95/25]", 3471153375], - [325, 3, 2213, "Metrics/BlockLength: Block has too many lines. [37/25]", 3370370915] - ], - "spec/ast/merge/debug_logger_spec.rb:429510168": [ - [3, 1, 17306, "Metrics/BlockLength: Block has too many lines. [358/25]", 2287792973], - [251, 3, 1598, "Metrics/BlockLength: Block has too many lines. [27/25]", 3227542816], - [358, 3, 5118, "Metrics/BlockLength: Block has too many lines. [77/25]", 1759761803] - ], - "spec/ast/merge/detector/base_spec.rb:4157102211": [ - [3, 1, 3172, "Metrics/BlockLength: Block has too many lines. [100/25]", 3745104028], - [11, 7, 498, "Metrics/MethodLength: Method has too many lines. [13/10]", 3178368155], - [49, 3, 900, "Metrics/BlockLength: Block has too many lines. [28/25]", 2333048204] - ], - "spec/ast/merge/detector/fenced_code_block_spec.rb:495797689": [ - [3, 1, 11589, "Metrics/BlockLength: Block has too many lines. [363/25]", 3764545134], - [38, 3, 4467, "Metrics/BlockLength: Block has too many lines. [150/25]", 1597401000], - [41, 5, 1077, "Metrics/BlockLength: Block has too many lines. [31/25]", 2269642514], - [115, 5, 848, "Metrics/BlockLength: Block has too many lines. [27/25]", 1704866975], - [220, 3, 4815, "Metrics/BlockLength: Block has too many lines. [146/25]", 3797214474] - ], - "spec/ast/merge/detector/mergeable_spec.rb:1307688846": [ - [3, 1, 23175, "Metrics/BlockLength: Block has too many lines. [654/25]", 2932391114], - [77, 3, 2079, "Metrics/BlockLength: Block has too many lines. [53/25]", 1093085347], - [177, 3, 2217, "Metrics/BlockLength: Block has too many lines. [69/25]", 926985871], - [188, 5, 948, "Metrics/BlockLength: Block has too many lines. [26/25]", 4186135901], - [225, 5, 898, "Metrics/BlockLength: Block has too many lines. [31/25]", 513446836], - [266, 3, 1168, "Metrics/BlockLength: Block has too many lines. [29/25]", 774699411], - [304, 3, 1188, "Metrics/BlockLength: Block has too many lines. [27/25]", 4282853126], - [339, 3, 918, "Metrics/BlockLength: Block has too many lines. [28/25]", 1759590109], - [372, 3, 870, "Metrics/BlockLength: Block has too many lines. [28/25]", 131542026], - [410, 3, 3768, "Metrics/BlockLength: Block has too many lines. [111/25]", 181819560], - [483, 5, 1536, "Metrics/BlockLength: Block has too many lines. [47/25]", 385085357], - [540, 3, 1891, "Metrics/BlockLength: Block has too many lines. [52/25]", 602757329], - [664, 3, 1927, "Metrics/BlockLength: Block has too many lines. [56/25]", 48062261], - [691, 5, 1146, "Metrics/BlockLength: Block has too many lines. [31/25]", 1961728737], - [721, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3104497040], - [729, 3, 1625, "Metrics/BlockLength: Block has too many lines. [46/25]", 1570579215] - ], - "spec/ast/merge/detector/region_spec.rb:594725562": [ - [3, 1, 8128, "Metrics/BlockLength: Block has too many lines. [290/25]", 1984713692], - [4, 3, 806, "Metrics/BlockLength: Block has too many lines. [28/25]", 1515087192], - [58, 3, 1236, "Metrics/BlockLength: Block has too many lines. [45/25]", 2464968707], - [128, 3, 1063, "Metrics/BlockLength: Block has too many lines. [33/25]", 239148700], - [250, 3, 2010, "Metrics/BlockLength: Block has too many lines. [76/25]", 2595033382] - ], - "spec/ast/merge/detector/toml_frontmatter_spec.rb:1135160129": [ - [3, 1, 6717, "Metrics/BlockLength: Block has too many lines. [218/25]", 2273975625], - [12, 3, 5534, "Metrics/BlockLength: Block has too many lines. [187/25]", 538920673], - [13, 5, 1456, "Metrics/BlockLength: Block has too many lines. [38/25]", 3113759139] - ], - "spec/ast/merge/detector/yaml_frontmatter_spec.rb:2467934365": [ - [3, 1, 6702, "Metrics/BlockLength: Block has too many lines. [213/25]", 3083039982], - [12, 3, 5056, "Metrics/BlockLength: Block has too many lines. [170/25]", 1889948780], - [13, 5, 1438, "Metrics/BlockLength: Block has too many lines. [38/25]", 1736912391], - [219, 3, 1396, "Metrics/BlockLength: Block has too many lines. [33/25]", 2446467851] - ], - "spec/ast/merge/diff_mapper_base_spec.rb:1771546518": [ - [5, 1, 8521, "Metrics/BlockLength: Block has too many lines. [248/25]", 1057580573], - [22, 9, 44, "Style/InverseMethods: Use `reject` instead of inverting `select`.", 3063843489], - [46, 3, 3878, "Metrics/BlockLength: Block has too many lines. [116/25]", 2874032080], - [47, 5, 1938, "Metrics/BlockLength: Block has too many lines. [48/25]", 1904497583], - [191, 3, 1488, "Metrics/BlockLength: Block has too many lines. [43/25]", 1632956840] - ], - "spec/ast/merge/emitter_base_spec.rb:4197360291": [ - [3, 1, 11215, "Metrics/BlockLength: Block has too many lines. [282/25]", 4254840781], - [30, 3, 4393, "Metrics/BlockLength: Block has too many lines. [102/25]", 3992142376], - [134, 58, 12, "Lint/UnusedMethodArgument: Unused method argument - `current_line`. You can also write as `inline_comment_region_target_column(*)` if you want the method to accept any arguments but don't care about them.", 2091263933], - [138, 44, 6, "Lint/UnusedMethodArgument: Unused method argument - `region`.", 2124512157], - [159, 3, 1815, "Metrics/BlockLength: Block has too many lines. [39/25]", 719023387], - [206, 3, 2233, "Metrics/BlockLength: Block has too many lines. [62/25]", 3754339775], - [312, 3, 1059, "Metrics/BlockLength: Block has too many lines. [26/25]", 375007123] - ], - "spec/ast/merge/fictive_language_harness_spec.rb:1179155480": [ - [6, 1, 6693, "Metrics/BlockLength: Block has too many lines. [143/25]", 245088433], - [7, 3, 1968, "Metrics/BlockLength: Block has too many lines. [36/25]", 4161580169], - [58, 3, 1230, "Metrics/BlockLength: Block has too many lines. [34/25]", 990452676], - [103, 3, 2668, "Metrics/BlockLength: Block has too many lines. [51/25]", 1755027956] - ], - "spec/ast/merge/file_aligner_base_spec.rb:91275387": [ - [5, 1, 9948, "Metrics/BlockLength: Block has too many lines. [217/25]", 3354563411], - [6, 3, 1490, "Metrics/BlockLength: Block has too many lines. [45/25]", 563330990], - [95, 3, 7495, "Metrics/BlockLength: Block has too many lines. [129/25]", 598770279], - [103, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3749416415], - [163, 5, 1489, "Metrics/BlockLength: Block has too many lines. [26/25]", 2910876949] - ], - "spec/ast/merge/file_analyzable_spec.rb:3816965829": [ - [3, 1, 12458, "Metrics/BlockLength: Block has too many lines. [272/25]", 216138965], - [25, 3, 9603, "Metrics/BlockLength: Block has too many lines. [202/25]", 2508188172], - [297, 3, 1214, "Metrics/BlockLength: Block has too many lines. [30/25]", 777182624] - ], - "spec/ast/merge/freezable_spec.rb:559280324": [ - [5, 1, 5033, "Metrics/BlockLength: Block has too many lines. [123/25]", 3070666859], - [6, 3, 1199, "Metrics/BlockLength: Block has too many lines. [34/25]", 4058875636], - [66, 3, 1530, "Metrics/BlockLength: Block has too many lines. [31/25]", 1670675428] - ], - "spec/ast/merge/freeze_node_base_spec.rb:2962962931": [ - [3, 1, 21887, "Metrics/BlockLength: Block has too many lines. [560/25]", 567315021], - [48, 3, 1369, "Metrics/BlockLength: Block has too many lines. [38/25]", 3363160391], - [131, 3, 2739, "Metrics/BlockLength: Block has too many lines. [56/25]", 2008289622], - [205, 3, 1586, "Metrics/BlockLength: Block has too many lines. [35/25]", 4179606047], - [251, 3, 977, "Metrics/BlockLength: Block has too many lines. [26/25]", 1240612851], - [287, 3, 1130, "Metrics/BlockLength: Block has too many lines. [28/25]", 2511265379], - [322, 3, 5029, "Metrics/BlockLength: Block has too many lines. [126/25]", 739537566], - [598, 3, 3055, "Metrics/BlockLength: Block has too many lines. [81/25]", 145217296] - ], - "spec/ast/merge/healer_spec.rb:877829793": [ - [3, 1, 4896, "Metrics/BlockLength: Block has too many lines. [148/25]", 1074378773], - [19, 3, 1333, "Metrics/BlockLength: Block has too many lines. [38/25]", 2940878263], - [24, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193432399], - [61, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085379023], - [67, 3, 2985, "Metrics/BlockLength: Block has too many lines. [93/25]", 4032786576] - ], - "spec/ast/merge/jaccard_similarity_spec.rb:3984307047": [ - [3, 1, 2659, "Metrics/BlockLength: Block has too many lines. [71/25]", 1122516612], - [6, 3, 1484, "Metrics/BlockLength: Block has too many lines. [38/25]", 3367914637], - [55, 3, 1090, "Metrics/BlockLength: Block has too many lines. [28/25]", 2629339264] - ], - "spec/ast/merge/key_path_partial_template_merger_base_spec.rb:2189485360": [ - [5, 1, 5955, "Metrics/BlockLength: Block has too many lines. [138/25]", 91542958], - [35, 3, 1217, "Metrics/BlockLength: Block has too many lines. [33/25]", 2663081123], - [97, 3, 3019, "Metrics/BlockLength: Block has too many lines. [54/25]", 1411952192] - ], - "spec/ast/merge/layout/attachment_spec.rb:3814294426": [ - [3, 1, 1799, "Metrics/BlockLength: Block has too many lines. [34/25]", 1283153367] - ], - "spec/ast/merge/layout/augmenter_spec.rb:3633045915": [ - [3, 1, 4412, "Metrics/BlockLength: Block has too many lines. [92/25]", 2690553031], - [20, 3, 2725, "Metrics/BlockLength: Block has too many lines. [54/25]", 3645203819] - ], - "spec/ast/merge/layout/gap_spec.rb:4232058283": [ - [3, 1, 2758, "Metrics/BlockLength: Block has too many lines. [72/25]", 2052697931], - [9, 3, 1290, "Metrics/BlockLength: Block has too many lines. [28/25]", 3175967312] - ], - "spec/ast/merge/match_refiner_base_spec.rb:3961767223": [ - [3, 1, 10604, "Metrics/BlockLength: Block has too many lines. [301/25]", 4290485382], - [4, 3, 1146, "Metrics/BlockLength: Block has too many lines. [37/25]", 108051658], - [50, 3, 1005, "Metrics/BlockLength: Block has too many lines. [28/25]", 3807648246], - [125, 3, 1026, "Metrics/BlockLength: Block has too many lines. [27/25]", 2896086726], - [162, 3, 4464, "Metrics/BlockLength: Block has too many lines. [114/25]", 2878217135], - [218, 5, 1112, "Metrics/BlockLength: Block has too many lines. [30/25]", 1605825436], - [224, 11, 104, "Style/HashLikeCase: Consider replacing `case-when` with a hash lookup.", 4220899731], - [247, 11, 132, "Style/HashLikeCase: Consider replacing `case-when` with a hash lookup.", 3401820780], - [258, 5, 1642, "Metrics/BlockLength: Block has too many lines. [35/25]", 1288881729], - [337, 3, 1108, "Metrics/BlockLength: Block has too many lines. [33/25]", 2139263963] - ], - "spec/ast/merge/match_score_base_spec.rb:2340739872": [ - [3, 1, 15213, "Metrics/BlockLength: Block has too many lines. [372/25]", 1512747000], - [4, 3, 1553, "Metrics/BlockLength: Block has too many lines. [41/25]", 2789289940], - [43, 20, 2, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 5862747], - [43, 24, 2, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 5862744], - [56, 3, 1041, "Metrics/BlockLength: Block has too many lines. [29/25]", 3729310115], - [152, 3, 3259, "Metrics/BlockLength: Block has too many lines. [82/25]", 1438003770], - [258, 3, 2199, "Metrics/BlockLength: Block has too many lines. [43/25]", 3386602801], - [320, 3, 1684, "Metrics/BlockLength: Block has too many lines. [35/25]", 3807719546], - [365, 14, 16, "Lint/FloatComparison: Avoid equality comparisons of floats as they are unreliable.", 3787748956], - [369, 3, 1696, "Metrics/BlockLength: Block has too many lines. [36/25]", 3172214426], - [417, 3, 1792, "Metrics/BlockLength: Block has too many lines. [45/25]", 3557977606], - [438, 5, 1121, "Metrics/BlockLength: Block has too many lines. [26/25]", 4236927298] - ], - "spec/ast/merge/merge_result_base_spec.rb:2262708492": [ - [3, 1, 19471, "Metrics/BlockLength: Block has too many lines. [529/25]", 4106058751], - [38, 3, 2735, "Metrics/BlockLength: Block has too many lines. [80/25]", 1103243845], - [279, 3, 1611, "Metrics/BlockLength: Block has too many lines. [39/25]", 1928511417], - [280, 5, 1203, "Metrics/BlockLength: Block has too many lines. [26/25]", 857223227], - [326, 3, 2070, "Metrics/BlockLength: Block has too many lines. [48/25]", 2552826824], - [385, 3, 5769, "Metrics/BlockLength: Block has too many lines. [140/25]", 1457747735], - [511, 5, 1306, "Metrics/BlockLength: Block has too many lines. [29/25]", 2980786372], - [574, 3, 1308, "Metrics/BlockLength: Block has too many lines. [32/25]", 1342704008] - ], - "spec/ast/merge/merger_config_spec.rb:663896662": [ - [5, 1, 7314, "Metrics/BlockLength: Block has too many lines. [189/25]", 1279589310], - [11, 3, 1180, "Metrics/BlockLength: Block has too many lines. [26/25]", 1014009176], - [45, 3, 1151, "Metrics/BlockLength: Block has too many lines. [26/25]", 785276703], - [79, 3, 3574, "Metrics/BlockLength: Block has too many lines. [97/25]", 969726064], - [126, 5, 1158, "Metrics/BlockLength: Block has too many lines. [29/25]", 389808524] - ], - "spec/ast/merge/navigable/injection_point_finder_spec.rb:3693754765": [ - [3, 1, 5152, "Metrics/BlockLength: Block has too many lines. [123/25]", 3265221808], - [15, 3, 4026, "Metrics/BlockLength: Block has too many lines. [96/25]", 1482695302], - [63, 5, 2337, "Metrics/BlockLength: Block has too many lines. [54/25]", 2678200297] - ], - "spec/ast/merge/navigable/injection_point_spec.rb:3295717447": [ - [3, 1, 6032, "Metrics/BlockLength: Block has too many lines. [161/25]", 805025024], - [77, 3, 1083, "Metrics/BlockLength: Block has too many lines. [28/25]", 3091139104] - ], - "spec/ast/merge/navigable/statement_spec.rb:2965726260": [ - [3, 1, 18289, "Metrics/BlockLength: Block has too many lines. [510/25]", 4119203121], - [102, 3, 3570, "Metrics/BlockLength: Block has too many lines. [97/25]", 3287535168], - [156, 5, 2030, "Metrics/BlockLength: Block has too many lines. [51/25]", 3299963733], - [251, 3, 1338, "Metrics/BlockLength: Block has too many lines. [37/25]", 844559624], - [411, 3, 1550, "Metrics/BlockLength: Block has too many lines. [42/25]", 3851790429], - [465, 3, 1372, "Metrics/BlockLength: Block has too many lines. [41/25]", 3782869383] - ], - "spec/ast/merge/node_typing/frozen_wrapper_spec.rb:3823345520": [ - [3, 1, 4532, "Metrics/BlockLength: Block has too many lines. [117/25]", 3944573785] - ], - "spec/ast/merge/node_typing/normalizer_spec.rb:1976431423": [ - [4, 1, 8679, "Metrics/BlockLength: Block has too many lines. [219/25]", 938207310], - [65, 3, 1137, "Metrics/BlockLength: Block has too many lines. [26/25]", 3180807289], - [101, 3, 1404, "Metrics/BlockLength: Block has too many lines. [28/25]", 1094334251], - [216, 3, 875, "Metrics/BlockLength: Block has too many lines. [26/25]", 2755551247] - ], - "spec/ast/merge/node_typing/wrapper_spec.rb:3211588263": [ - [3, 1, 3469, "Metrics/BlockLength: Block has too many lines. [92/25]", 638644563] - ], - "spec/ast/merge/node_typing_spec.rb:4080661389": [ - [3, 1, 12728, "Metrics/BlockLength: Block has too many lines. [333/25]", 3927571381], - [132, 3, 3704, "Metrics/BlockLength: Block has too many lines. [98/25]", 2130243754], - [208, 5, 1267, "Metrics/BlockLength: Block has too many lines. [31/25]", 2816753725], - [265, 3, 1298, "Metrics/BlockLength: Block has too many lines. [33/25]", 3320876250], - [311, 3, 3803, "Metrics/BlockLength: Block has too many lines. [100/25]", 2743470911] - ], - "spec/ast/merge/node_wrapper_base_spec.rb:2252820285": [ - [3, 1, 11681, "Metrics/BlockLength: Block has too many lines. [307/25]", 1698593962], - [32, 3, 2341, "Metrics/BlockLength: Block has too many lines. [68/25]", 1594381363], - [179, 3, 2568, "Metrics/BlockLength: Block has too many lines. [51/25]", 1269052990], - [294, 3, 1252, "Metrics/BlockLength: Block has too many lines. [26/25]", 4220822180], - [329, 3, 1963, "Metrics/BlockLength: Block has too many lines. [39/25]", 1623030031] - ], - "spec/ast/merge/owner_selection_spec.rb:1894901093": [ - [3, 1, 1356, "Metrics/BlockLength: Block has too many lines. [35/25]", 1030003775] - ], - "spec/ast/merge/partial_template_merger_base_spec.rb:3412991027": [ - [3, 1, 7073, "Metrics/BlockLength: Block has too many lines. [145/25]", 3415302240], - [16, 9, 43, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3196404056], - [22, 9, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 4116824817], - [48, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [96, 3, 4220, "Metrics/BlockLength: Block has too many lines. [68/25]", 3464417459], - [97, 5, 2029, "Metrics/BlockLength: Block has too many lines. [27/25]", 3297854360], - [138, 5, 2122, "Metrics/BlockLength: Block has too many lines. [37/25]", 1592076374] - ], - "spec/ast/merge/recipe/config_spec.rb:3917288551": [ - [3, 1, 21041, "Metrics/BlockLength: Block has too many lines. [611/25]", 2431235923], - [72, 3, 1653, "Metrics/BlockLength: Block has too many lines. [36/25]", 2702780755], - [174, 3, 1465, "Metrics/BlockLength: Block has too many lines. [44/25]", 2326126933], - [226, 3, 3419, "Metrics/BlockLength: Block has too many lines. [89/25]", 798604841], - [327, 3, 1398, "Metrics/BlockLength: Block has too many lines. [34/25]", 3113267700], - [474, 3, 1184, "Metrics/BlockLength: Block has too many lines. [39/25]", 2599756030], - [519, 3, 4630, "Metrics/BlockLength: Block has too many lines. [147/25]", 1245526575] - ], - "spec/ast/merge/recipe/preset_spec.rb:818394232": [ - [3, 1, 6696, "Metrics/BlockLength: Block has too many lines. [173/25]", 3205615892] - ], - "spec/ast/merge/recipe/runner_spec.rb:3689194117": [ - [3, 1, 46798, "Metrics/BlockLength: Block has too many lines. [1104/25]", 3220015076], - [48, 3, 1128, "Metrics/BlockLength: Block has too many lines. [26/25]", 910457645], - [108, 3, 3036, "Metrics/BlockLength: Block has too many lines. [92/25]", 2112378918], - [132, 5, 881, "Metrics/BlockLength: Block has too many lines. [27/25]", 3842010356], - [177, 5, 918, "Metrics/BlockLength: Block has too many lines. [27/25]", 2152367239], - [295, 3, 1383, "Metrics/BlockLength: Block has too many lines. [41/25]", 2141027559], - [362, 3, 1653, "Metrics/BlockLength: Block has too many lines. [33/25]", 1536472295], - [449, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3960802027], - [497, 3, 7959, "Metrics/BlockLength: Block has too many lines. [200/25]", 3739116912], - [556, 5, 1225, "Metrics/BlockLength: Block has too many lines. [31/25]", 195497726], - [740, 3, 6977, "Metrics/BlockLength: Block has too many lines. [145/25]", 2805535296], - [748, 5, 2241, "Metrics/BlockLength: Block has too many lines. [49/25]", 2552233173], - [805, 5, 3007, "Metrics/BlockLength: Block has too many lines. [59/25]", 708771722], - [877, 5, 1444, "Metrics/BlockLength: Block has too many lines. [26/25]", 3274225022], - [911, 3, 3258, "Metrics/BlockLength: Block has too many lines. [85/25]", 2346849758], - [1012, 3, 2710, "Metrics/BlockLength: Block has too many lines. [71/25]", 3801821877], - [1029, 5, 1547, "Metrics/BlockLength: Block has too many lines. [42/25]", 2962020615], - [1109, 3, 2240, "Metrics/BlockLength: Block has too many lines. [35/25]", 1139957345], - [1115, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], - [1117, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], - [1119, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1801369636], - [1121, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2652710920], - [1123, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1375785821], - [1125, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 632755459], - [1160, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], - [1162, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], - [1164, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1375785821], - [1176, 3, 1472, "Metrics/BlockLength: Block has too many lines. [31/25]", 844153987], - [1181, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1239303812], - [1183, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1251336963], - [1216, 3, 2277, "Metrics/BlockLength: Block has too many lines. [43/25]", 4287127386], - [1221, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], - [1223, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2652710920], - [1225, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1375785821], - [1227, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 632755459], - [1274, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3420615328] - ], - "spec/ast/merge/recipe/script_loader_spec.rb:2136892097": [ - [3, 1, 8554, "Metrics/BlockLength: Block has too many lines. [237/25]", 2314425369], - [45, 3, 2842, "Metrics/BlockLength: Block has too many lines. [75/25]", 168902852], - [155, 3, 1400, "Metrics/BlockLength: Block has too many lines. [39/25]", 1611123964] - ], - "spec/ast/merge/rspec/shared_examples/feature_profile_spec.rb:2654837708": [ - [5, 1, 1140, "Metrics/BlockLength: Block has too many lines. [31/25]", 678325840] - ], - "spec/ast/merge/rspec/shared_examples/file_analyzable_spec.rb:1833922303": [ - [58, 3, 970, "Metrics/AbcSize: Assignment Branch Condition size for `detect_freeze_blocks` is too high. [<16, 9, 5> 19.03/17]", 1533823667], - [58, 3, 970, "Metrics/MethodLength: Method has too many lines. [31/10]", 1533823667], - [104, 1, 1216, "Metrics/BlockLength: Block has too many lines. [39/25]", 1009012120], - [105, 3, 1159, "Metrics/BlockLength: Block has too many lines. [38/25]", 1361521205] - ], - "spec/ast/merge/rspec/shared_examples/layout_attachment_spec.rb:714796658": [ - [8, 1, 957, "Metrics/BlockLength: Block has too many lines. [28/25]", 3738990548] - ], - "spec/ast/merge/rspec/shared_examples/recipe_preset_contract_spec.rb:669158728": [ - [6, 1, 1577, "Metrics/BlockLength: Block has too many lines. [41/25]", 2157464290], - [7, 3, 1512, "Metrics/BlockLength: Block has too many lines. [39/25]", 1968160370], - [44, 5, 401, "Metrics/AbcSize: Assignment Branch Condition size for `run_verify_loaded_preset` is too high. [<0, 26, 0> 26/17]", 2960760840] - ], - "spec/ast/merge/rspec/shared_examples/removal_mode_compliance_spec.rb:31388352": [ - [6, 22, 2, "Style/MutableConstant: Freeze mutable objects assigned to constants.", 5861859], - [44, 1, 2546, "Metrics/BlockLength: Block has too many lines. [77/25]", 3740028971], - [45, 3, 1350, "Metrics/BlockLength: Block has too many lines. [41/25]", 2793151667], - [94, 3, 1128, "Metrics/BlockLength: Block has too many lines. [32/25]", 2527000512], - [95, 5, 1081, "Metrics/BlockLength: Block has too many lines. [30/25]", 3825359844] - ], - "spec/ast/merge/rspec/shared_examples/reproducible_partial_merge_spec.rb:2862326360": [ - [19, 3, 600, "Metrics/MethodLength: Method has too many lines. [13/10]", 1542875905] - ], - "spec/ast/merge/ruleset/config_spec.rb:1860949041": [ - [3, 1, 9431, "Metrics/BlockLength: Block has too many lines. [236/25]", 4015119559], - [24, 3, 5341, "Metrics/BlockLength: Block has too many lines. [149/25]", 2361087446], - [25, 5, 1064, "Metrics/BlockLength: Block has too many lines. [26/25]", 603056104], - [226, 3, 2125, "Metrics/BlockLength: Block has too many lines. [36/25]", 1640873170] - ], - "spec/ast/merge/ruleset/declaration_objects_spec.rb:3827892270": [ - [3, 1, 1881, "Metrics/BlockLength: Block has too many lines. [47/25]", 1770376910] - ], - "spec/ast/merge/ruleset/feature_profile_spec.rb:2241111096": [ - [3, 1, 4189, "Metrics/BlockLength: Block has too many lines. [86/25]", 1116963550], - [4, 3, 4129, "Metrics/BlockLength: Block has too many lines. [84/25]", 117079811], - [5, 5, 2391, "Metrics/BlockLength: Block has too many lines. [45/25]", 1800077283] - ], - "spec/ast/merge/ruleset/parser_spec.rb:386407767": [ - [3, 1, 5670, "Metrics/BlockLength: Block has too many lines. [144/25]", 3425850453], - [4, 3, 5618, "Metrics/BlockLength: Block has too many lines. [143/25]", 246633759] - ], - "spec/ast/merge/ruleset/profile_vocabulary_spec.rb:2570869276": [ - [3, 1, 2095, "Metrics/BlockLength: Block has too many lines. [46/25]", 3214342662] - ], - "spec/ast/merge/ruleset/support_style_resolver_spec.rb:640167644": [ - [3, 1, 1625, "Metrics/BlockLength: Block has too many lines. [49/25]", 2066834885], - [4, 3, 1559, "Metrics/BlockLength: Block has too many lines. [47/25]", 1169495477] - ], - "spec/ast/merge/runtime_spec.rb:3962589694": [ - [5, 1, 24649, "Metrics/BlockLength: Block has too many lines. [664/25]", 2634021188], - [76, 3, 1459, "Metrics/BlockLength: Block has too many lines. [41/25]", 3744002593], - [125, 3, 1417, "Metrics/BlockLength: Block has too many lines. [33/25]", 4087615381], - [166, 3, 2549, "Metrics/BlockLength: Block has too many lines. [69/25]", 3150260095], - [175, 5, 1068, "Metrics/BlockLength: Block has too many lines. [26/25]", 2933114685], - [247, 3, 1668, "Metrics/BlockLength: Block has too many lines. [39/25]", 2386637993], - [259, 5, 1265, "Metrics/BlockLength: Block has too many lines. [27/25]", 3157806167], - [321, 3, 10884, "Metrics/BlockLength: Block has too many lines. [295/25]", 1889265918], - [322, 5, 1879, "Metrics/BlockLength: Block has too many lines. [46/25]", 2536583521], - [373, 5, 3938, "Metrics/BlockLength: Block has too many lines. [108/25]", 340276027], - [486, 5, 1270, "Metrics/BlockLength: Block has too many lines. [38/25]", 3844174392], - [528, 5, 3728, "Metrics/BlockLength: Block has too many lines. [95/25]", 3779381786], - [630, 3, 3240, "Metrics/BlockLength: Block has too many lines. [84/25]", 3856725067], - [656, 5, 1649, "Metrics/BlockLength: Block has too many lines. [40/25]", 3713662683] - ], - "spec/ast/merge/section_typing_spec.rb:2580971307": [ - [3, 1, 14786, "Metrics/BlockLength: Block has too many lines. [344/25]", 2925587076], - [4, 3, 1940, "Metrics/BlockLength: Block has too many lines. [50/25]", 3362429388], - [67, 3, 3684, "Metrics/BlockLength: Block has too many lines. [96/25]", 3864076664], - [120, 5, 1998, "Metrics/BlockLength: Block has too many lines. [50/25]", 411620722], - [183, 3, 1415, "Metrics/BlockLength: Block has too many lines. [37/25]", 3323012675], - [192, 5, 1124, "Metrics/BlockLength: Block has too many lines. [28/25]", 966216762], - [229, 3, 1610, "Metrics/BlockLength: Block has too many lines. [38/25]", 1499957007], - [229, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 1025596574], - [279, 3, 4437, "Metrics/BlockLength: Block has too many lines. [80/25]", 423587151], - [356, 36, 23, "Style/SymbolProc: Pass `&:unclassified?` as an argument to `find` instead of a block.", 563945984], - [369, 36, 23, "Style/SymbolProc: Pass `&:unclassified?` as an argument to `find` instead of a block.", 563945984], - [375, 3, 1630, "Metrics/BlockLength: Block has too many lines. [31/25]", 1675144727] - ], - "spec/ast/merge/smart_merger_base_spec.rb:1904727390": [ - [3, 1, 13253, "Metrics/BlockLength: Block has too many lines. [398/25]", 3611753358], - [30, 9, 10, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 1099697163], - [87, 3, 1851, "Metrics/BlockLength: Block has too many lines. [40/25]", 3729571903], - [210, 3, 925, "Metrics/BlockLength: Block has too many lines. [35/25]", 2001100899], - [344, 3, 709, "Metrics/BlockLength: Block has too many lines. [27/25]", 3041950416], - [415, 3, 1074, "Metrics/BlockLength: Block has too many lines. [35/25]", 956635689], - [416, 5, 1026, "Metrics/BlockLength: Block has too many lines. [33/25]", 1993879652], - [461, 3, 1031, "Metrics/BlockLength: Block has too many lines. [31/25]", 35315996] - ], - "spec/ast/merge/structural_edit/boundary_support_spec.rb:863387845": [ - [3, 1, 4226, "Metrics/BlockLength: Block has too many lines. [86/25]", 1889771490], - [16, 9, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1304492024], - [22, 9, 41, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3828424401], - [59, 3, 1294, "Metrics/BlockLength: Block has too many lines. [26/25]", 3038774774] - ], - "spec/ast/merge/structural_edit/plan_set_spec.rb:3633263362": [ - [3, 1, 5945, "Metrics/BlockLength: Block has too many lines. [180/25]", 3883285271], - [14, 3, 2139, "Metrics/BlockLength: Block has too many lines. [72/25]", 3558415255], - [128, 3, 1412, "Metrics/BlockLength: Block has too many lines. [39/25]", 1216754705] - ], - "spec/ast/merge/structural_edit/remove_plan_spec.rb:3569534665": [ - [3, 1, 6442, "Metrics/BlockLength: Block has too many lines. [134/25]", 3440814588], - [39, 3, 3768, "Metrics/BlockLength: Block has too many lines. [75/25]", 876721813], - [127, 3, 1439, "Metrics/BlockLength: Block has too many lines. [29/25]", 3378195351] - ], - "spec/ast/merge/structural_edit/remove_plan_support_spec.rb:800158061": [ - [3, 1, 2893, "Metrics/BlockLength: Block has too many lines. [62/25]", 3748446914], - [16, 9, 43, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3196404056], - [22, 9, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 4116824817], - [29, 3, 2091, "Metrics/BlockLength: Block has too many lines. [39/25]", 1684933040], - [30, 5, 1653, "Metrics/BlockLength: Block has too many lines. [27/25]", 2456404305] - ], - "spec/ast/merge/structural_edit/splice_plan_spec.rb:3331205681": [ - [3, 1, 3159, "Metrics/BlockLength: Block has too many lines. [83/25]", 2234926397], - [16, 3, 1837, "Metrics/BlockLength: Block has too many lines. [46/25]", 2935991482], - [42, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860750] - ], - "spec/ast/merge/text/conflict_resolver_spec.rb:3810004132": [ - [5, 1, 9102, "Metrics/BlockLength: Block has too many lines. [218/25]", 672115618], - [33, 3, 8206, "Metrics/BlockLength: Block has too many lines. [194/25]", 259803246], - [78, 5, 1920, "Metrics/BlockLength: Block has too many lines. [45/25]", 3965182334], - [139, 5, 1918, "Metrics/BlockLength: Block has too many lines. [44/25]", 3707046125] - ], - "spec/ast/merge/text/file_analysis_spec.rb:3430380445": [ - [5, 1, 8842, "Metrics/BlockLength: Block has too many lines. [205/25]", 4255187284], - [6, 3, 1323, "Metrics/BlockLength: Block has too many lines. [29/25]", 2518912953], - [47, 3, 1830, "Metrics/BlockLength: Block has too many lines. [43/25]", 3685770590], - [135, 3, 1620, "Metrics/BlockLength: Block has too many lines. [35/25]", 3089951119] - ], - "spec/ast/merge/text/line_node_spec.rb:1757790485": [ - [5, 1, 4739, "Metrics/BlockLength: Block has too many lines. [131/25]", 1487875238] - ], - "spec/ast/merge/text/merge_result_spec.rb:589380024": [ - [5, 1, 1541, "Metrics/BlockLength: Block has too many lines. [40/25]", 2828087992] - ], - "spec/ast/merge/text/section_splitter_spec.rb:804308722": [ - [4, 1, 5705, "Metrics/BlockLength: Block has too many lines. [209/25]", 4175363685], - [5, 3, 794, "Metrics/BlockLength: Block has too many lines. [28/25]", 2386862842], - [42, 3, 1126, "Metrics/BlockLength: Block has too many lines. [45/25]", 1507887296], - [95, 3, 746, "Metrics/BlockLength: Block has too many lines. [30/25]", 1759029412], - [131, 3, 1169, "Metrics/BlockLength: Block has too many lines. [45/25]", 1412318991], - [184, 3, 754, "Metrics/BlockLength: Block has too many lines. [30/25]", 2717556691], - [246, 1, 16648, "Metrics/BlockLength: Block has too many lines. [428/25]", 3166834694], - [370, 3, 1640, "Metrics/BlockLength: Block has too many lines. [46/25]", 2049342960], - [424, 3, 3237, "Metrics/BlockLength: Block has too many lines. [102/25]", 2357275144], - [540, 3, 3505, "Metrics/BlockLength: Block has too many lines. [67/25]", 2112469350], - [619, 3, 3586, "Metrics/BlockLength: Block has too many lines. [90/25]", 3866409298], - [620, 5, 1650, "Metrics/BlockLength: Block has too many lines. [48/25]", 289235626], - [622, 9, 1474, "Metrics/AbcSize: Assignment Branch Condition size for `split` is too high. [<8, 21, 7> 23.54/17]", 557655357], - [622, 9, 1474, "Metrics/MethodLength: Method has too many lines. [41/10]", 557655357], - [622, 9, 1474, "Metrics/PerceivedComplexity: Perceived complexity for `split` is too high. [9/8]", 557655357], - [628, 11, 1237, "Metrics/BlockLength: Block has too many lines. [33/25]", 1134667672], - [717, 29, 44, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 2169354946], - [723, 29, 44, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 2169354946], - [751, 1, 3128, "Metrics/BlockLength: Block has too many lines. [85/25]", 2082776744], - [769, 3, 1744, "Metrics/BlockLength: Block has too many lines. [46/25]", 223880162], - [770, 5, 1258, "Metrics/BlockLength: Block has too many lines. [31/25]", 2245422869] - ], - "spec/ast/merge/text/smart_merger_spec.rb:4128732567": [ - [3, 1, 8057, "Metrics/BlockLength: Block has too many lines. [210/25]", 1690443322], - [4, 3, 1135, "Metrics/BlockLength: Block has too many lines. [28/25]", 3788979655], - [58, 3, 4438, "Metrics/BlockLength: Block has too many lines. [106/25]", 2613192474], - [187, 3, 1053, "Metrics/BlockLength: Block has too many lines. [26/25]", 803567817], - [220, 3, 892, "Metrics/BlockLength: Block has too many lines. [28/25]", 2001100899] - ], - "spec/ast/merge/text/word_node_spec.rb:1457011521": [ - [5, 1, 3264, "Metrics/BlockLength: Block has too many lines. [74/25]", 677733430] - ], - "spec/ast/merge/token_match_refiner_spec.rb:3180314913": [ - [3, 1, 4000, "Metrics/BlockLength: Block has too many lines. [80/25]", 1630791278], - [8, 3, 2912, "Metrics/BlockLength: Block has too many lines. [60/25]", 529772148] - ], - "spec/ast/merge/trailing_groups/alignment_sort_spec.rb:1594915480": [ - [5, 1, 4710, "Metrics/BlockLength: Block has too many lines. [114/25]", 2499296583], - [14, 3, 2140, "Metrics/BlockLength: Block has too many lines. [47/25]", 3871799493], - [95, 3, 1482, "Metrics/BlockLength: Block has too many lines. [35/25]", 1088314263] - ], - "spec/ast/merge/trailing_groups/core_spec.rb:2651131504": [ - [5, 1, 9601, "Metrics/BlockLength: Block has too many lines. [242/25]", 598045669], - [22, 3, 3728, "Metrics/BlockLength: Block has too many lines. [87/25]", 1304580063], - [119, 3, 3931, "Metrics/BlockLength: Block has too many lines. [99/25]", 2464218479], - [186, 5, 1322, "Metrics/BlockLength: Block has too many lines. [30/25]", 427915501], - [187, 7, 1267, "Metrics/BlockLength: Block has too many lines. [28/25]", 861882691], - [245, 3, 1306, "Metrics/BlockLength: Block has too many lines. [34/25]", 86572459] - ], - "spec/ast/merge/trailing_groups/dest_iterate_spec.rb:3632880085": [ - [5, 1, 5523, "Metrics/BlockLength: Block has too many lines. [131/25]", 3077369183], - [19, 3, 3990, "Metrics/BlockLength: Block has too many lines. [91/25]", 593259616], - [39, 35, 12, "Style/SymbolProc: Pass `&:sig` as an argument to `lambda` instead of a block.", 3587754320], - [54, 33, 23, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 384283629], - [89, 35, 13, "Style/SymbolProc: Pass `&:name` as an argument to `lambda` instead of a block.", 3561384234], - [98, 35, 12, "Style/SymbolProc: Pass `&:sig` as an argument to `lambda` instead of a block.", 3587754320], - [113, 35, 12, "Style/SymbolProc: Pass `&:sig` as an argument to `lambda` instead of a block.", 3587754320] - ], - "spec/ast/merge/unresolved_policy_spec.rb:2561713656": [ - [3, 1, 1333, "Metrics/BlockLength: Block has too many lines. [33/25]", 4109547889] - ], - "spec/ast/merge/unresolved_review_state_spec.rb:3186871217": [ - [3, 1, 1038, "Metrics/BlockLength: Block has too many lines. [31/25]", 1325553035] - ], - "spec/ast/merge_rspec_conformance_fixtures_spec.rb:251774004": [ - [5, 1, 2119, "Metrics/BlockLength: Block has too many lines. [55/25]", 1724925683], - [6, 3, 1203, "Metrics/BlockLength: Block has too many lines. [29/25]", 3306863581] - ], - "spec/ast/merge_spec.rb:664670069": [ - [3, 1, 3113, "Metrics/BlockLength: Block has too many lines. [74/25]", 4034649501], - [9, 3, 2227, "Metrics/BlockLength: Block has too many lines. [51/25]", 578300230], - [10, 5, 2182, "Metrics/BlockLength: Block has too many lines. [49/25]", 2758871265] - ], - "spec/base_substrate_spec.rb:2864492094": [ - [5, 1, 5800, "Metrics/BlockLength: Block has too many lines. [143/25]", 784801982], - [6, 3, 192, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 680981873], - [13, 3, 378, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1223797442], - [31, 3, 628, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 2123191050], - [53, 3, 429, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3536712197], - [69, 3, 24, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 2280792512], - [70, 3, 78, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 604224776], - [72, 3, 146, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3315091322] - ], - "spec/fixtures_integration_spec.rb:1145500459": [ - [595, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859109], - [758, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 576909008], - [881, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087900170], - [1806, 3, 816, "Metrics/MethodLength: Method has too many lines. [13/10]", 170960660], - [1806, 39, 213, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 635200700], - [1807, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3976306097], - [1831, 38, 80, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3297939075], - [1916, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1745553512], - [1917, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 118067488], - [1918, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 196190368], - [1919, 121, 41, "Layout/LineLength: Line is too long. [161/120]", 3371256193], - [2090, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3241114703], - [2428, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], - [2567, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], - [2991, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3697593604], - [2992, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], - [3113, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179435314], - [3122, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1182194285], - [3124, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 3886107031], - [3151, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1751849111], - [3152, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1519587684], - [3153, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 4086262880], - [3170, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3568081822], - [3171, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1776876782], - [3173, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [3174, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1751849111], - [3176, 121, 73, "Layout/LineLength: Line is too long. [193/120]", 3322243646], - [3178, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1715153206], - [3179, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [3180, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 504997180], - [3181, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 1146860021], - [3182, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 2312101607], - [3183, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1423779161], - [3184, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1900897138], - [3185, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 1689840383], - [3186, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 1589056236], - [3188, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 763176550], - [3194, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3957871310], - [3196, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 763176550], - [3198, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 919916608], - [3199, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 919916608], - [3200, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3957871310], - [3201, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 4073040612], - [3202, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 763176550], - [3203, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 667593075], - [3205, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1310972770], - [3206, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 311387795], - [3207, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 724840266], - [3208, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 2555878310], - [3209, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1781078972], - [3210, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [3213, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [3214, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1658060570], - [3215, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 3085728851], - [3216, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3129400559], - [3217, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3197516464], - [3218, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087771520], - [3219, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3837194228], - [3220, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1312323543], - [3221, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 2356847623], - [3222, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [3223, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3428073441], - [3224, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 2891080552], - [3225, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3080737172], - [3226, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 170445026], - [3227, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3240051869], - [3228, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 4266052680], - [3229, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3376297786], - [3230, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 398435913], - [3231, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 4134940256], - [3232, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 30370035], - [3233, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 2862546359], - [3234, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1901388514], - [3235, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 838864274], - [3236, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 3437460384], - [3237, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1567003152], - [3238, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2609066305], - [3239, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 4043187090], - [3240, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3866430009], - [3241, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 2182699083], - [3242, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 3958792129], - [3243, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3449926560], - [3244, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 399774089], - [3245, 121, 68, "Layout/LineLength: Line is too long. [188/120]", 2119246799], - [3247, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3592658842], - [3248, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2905723409], - [3249, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 3930305198], - [3250, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 4186230052], - [3251, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [3252, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2700200720], - [3253, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 1630526402], - [3254, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3669244926], - [3255, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2814234644], - [3256, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3109415933], - [3257, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3643275044], - [3258, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 3825290660], - [3259, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1751849111], - [3260, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 4112285398], - [3261, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 1684279672], - [3262, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 1616506266], - [3264, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [3265, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1330093223], - [3266, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 4084555566], - [3267, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 2466867154], - [3268, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 4088314613], - [3269, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 2416893689], - [3270, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 683312682], - [3271, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 2516517934], - [3272, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2414563355], - [3273, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 2232595211], - [3274, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 2940789369], - [3275, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 941259913], - [3276, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2133508098], - [3277, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1621975014], - [3278, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 35985461], - [3279, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 746016305], - [3280, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 435488100], - [3281, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 2581129172], - [3282, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 3495900774], - [3283, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1413120342], - [3284, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], - [3285, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2333800791], - [3286, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 2576906206], - [3287, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 2986659874], - [3288, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2811932564], - [3289, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 1970813291], - [3290, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 2904941246], - [3291, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3745922508], - [3292, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 735247237], - [3293, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3731320885], - [3294, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 3896022034], - [3295, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 2827048584], - [3296, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 2548596663], - [3297, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 3812352018], - [3298, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 1280243910], - [3299, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 1742643292], - [3300, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 3056442430], - [3301, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 3144363287], - [3302, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 477297993], - [3303, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 3657857971], - [3304, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3913984414], - [3305, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 336201058], - [3306, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 485418789], - [3307, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 453253839], - [3308, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3673833034], - [3309, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 1552836890], - [3310, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 2714635965], - [3311, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 9336999], - [3312, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 584857208], - [3313, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1394865213], - [3314, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 3973222761], - [3315, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 2020040051], - [3316, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 3060994335], - [3317, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 196286917], - [3318, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 4168514178], - [3319, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 810581246], - [3320, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 1473417372], - [3321, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 3008376885], - [3322, 121, 84, "Layout/LineLength: Line is too long. [204/120]", 454816400], - [3323, 121, 88, "Layout/LineLength: Line is too long. [208/120]", 1416223705], - [3324, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 2896813919], - [3325, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 957293983], - [3326, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 2118117430], - [3327, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 1367404612], - [3328, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 2459902188], - [3329, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 461483815], - [3330, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 2791596520], - [3331, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 203085787], - [3332, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 2942095139], - [3333, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 131861965], - [3334, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 3340827551], - [3335, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 102582610], - [3336, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 762789354], - [3337, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 3478337442], - [3338, 121, 112, "Layout/LineLength: Line is too long. [232/120]", 4010607435], - [3339, 121, 132, "Layout/LineLength: Line is too long. [252/120]", 3754747587], - [3340, 121, 136, "Layout/LineLength: Line is too long. [256/120]", 379336923], - [3341, 121, 108, "Layout/LineLength: Line is too long. [228/120]", 3366353902], - [3342, 121, 128, "Layout/LineLength: Line is too long. [248/120]", 1686898289], - [3343, 121, 132, "Layout/LineLength: Line is too long. [252/120]", 2005192241], - [3344, 121, 104, "Layout/LineLength: Line is too long. [224/120]", 1868634464], - [3345, 121, 124, "Layout/LineLength: Line is too long. [244/120]", 3939743614], - [3346, 121, 128, "Layout/LineLength: Line is too long. [248/120]", 2978506702], - [3347, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 3909866928], - [3348, 121, 118, "Layout/LineLength: Line is too long. [238/120]", 2853032177], - [3349, 121, 122, "Layout/LineLength: Line is too long. [242/120]", 2968366309], - [3350, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 1753663643], - [3351, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 3387619436], - [3352, 121, 106, "Layout/LineLength: Line is too long. [226/120]", 197895496], - [3353, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 576181861], - [3354, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 2809313444], - [3355, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 3963067112], - [3356, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 1121380327], - [3357, 121, 100, "Layout/LineLength: Line is too long. [220/120]", 31591211], - [3358, 121, 104, "Layout/LineLength: Line is too long. [224/120]", 1946129497], - [3359, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 767185096], - [3360, 121, 100, "Layout/LineLength: Line is too long. [220/120]", 1092646020], - [3361, 121, 104, "Layout/LineLength: Line is too long. [224/120]", 1328841270], - [3362, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 2663749624], - [3363, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 430318647], - [3364, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 1650234037], - [3365, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 1082269805], - [3366, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 316397809], - [3367, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 3145391348], - [3368, 121, 112, "Layout/LineLength: Line is too long. [232/120]", 2808088654], - [3369, 121, 116, "Layout/LineLength: Line is too long. [236/120]", 1035513748], - [3370, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 2552800539], - [3371, 121, 112, "Layout/LineLength: Line is too long. [232/120]", 1727699169], - [3372, 121, 116, "Layout/LineLength: Line is too long. [236/120]", 1171566267], - [3373, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 2994775049], - [3374, 121, 110, "Layout/LineLength: Line is too long. [230/120]", 3860489151], - [3375, 121, 114, "Layout/LineLength: Line is too long. [234/120]", 959496607], - [3376, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 1694222439], - [3377, 121, 114, "Layout/LineLength: Line is too long. [234/120]", 1501186331], - [3378, 121, 118, "Layout/LineLength: Line is too long. [238/120]", 4059659418], - [3379, 121, 110, "Layout/LineLength: Line is too long. [230/120]", 1899868779], - [3380, 121, 130, "Layout/LineLength: Line is too long. [250/120]", 323324279], - [3381, 121, 134, "Layout/LineLength: Line is too long. [254/120]", 3956414359], - [3382, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 3506644741], - [3383, 121, 116, "Layout/LineLength: Line is too long. [236/120]", 936139074], - [3384, 121, 136, "Layout/LineLength: Line is too long. [256/120]", 4153213512], - [3385, 121, 140, "Layout/LineLength: Line is too long. [260/120]", 1491976338], - [3386, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 4061753206], - [3387, 121, 106, "Layout/LineLength: Line is too long. [226/120]", 2410434304], - [3388, 121, 124, "Layout/LineLength: Line is too long. [244/120]", 3518300264], - [3389, 121, 144, "Layout/LineLength: Line is too long. [264/120]", 1040696046], - [3390, 121, 148, "Layout/LineLength: Line is too long. [268/120]", 139604188], - [3391, 121, 120, "Layout/LineLength: Line is too long. [240/120]", 231937793], - [3392, 121, 140, "Layout/LineLength: Line is too long. [260/120]", 1835509805], - [3393, 121, 144, "Layout/LineLength: Line is too long. [264/120]", 1629218396], - [3394, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 2312875700], - [3395, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 2933374083], - [3396, 121, 106, "Layout/LineLength: Line is too long. [226/120]", 1719349671], - [3397, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 2555579810], - [3398, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 2023551624], - [3399, 121, 114, "Layout/LineLength: Line is too long. [234/120]", 955231924], - [3400, 121, 118, "Layout/LineLength: Line is too long. [238/120]", 4232993781], - [3401, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 3472954835], - [3402, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 3211922285], - [3403, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 2874956332], - [3404, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 1360335840], - [3405, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2135379556], - [3406, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3242768475], - [3407, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 2789115918], - [3408, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3346448124], - [3409, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1538469817], - [3410, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1543041113], - [3411, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 3344741438], - [3412, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2188404009], - [3413, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1330398779], - [3414, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 332468826], - [3415, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 1905397598], - [3416, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 438831062], - [3417, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 3377667334], - [3418, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3232541734], - [3420, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2130930429], - [3421, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 3684939371], - [3423, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2361951097], - [3424, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 1211447462], - [3425, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3309872691], - [3426, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 360053761], - [3427, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 1310136493], - [3428, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1950686342], - [3429, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 1397845826], - [3430, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 4191304724], - [3431, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2354128498], - [3432, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 1865717453], - [3433, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 24220542], - [3434, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 2618612673], - [3437, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3422918867], - [3438, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3689431739], - [3482, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 4093564799], - [3488, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1662653970], - [3489, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3967501655], - [3490, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2178516622], - [3491, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 1345346561], - [3505, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193466072], - [3625, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 3612393276], - [3626, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 797303985], - [3629, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1606320605], - [3649, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1776876782], - [3653, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 828742791], - [3673, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3294617581], - [3683, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3519842846], - [3693, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1966440909], - [3694, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053864], - [3700, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1606320605], - [3723, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 1340744311], - [3742, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1741893077], - [3743, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053865], - [3747, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193405204], - [3761, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1401226501], - [3764, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085352569], - [3767, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 696523922], - [3782, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], - [3792, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2746826653], - [4208, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1138870161], - [4770, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], - [4781, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 2132299307], - [4828, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087775098], - [4839, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 757851079], - [4875, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], - [4886, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 441649198], - [4909, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087903295], - [4921, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 170442008], - [4930, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], - [4932, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1888875443], - [4969, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 398433651], - [4980, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3921367744], - [5003, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2422819473], - [5009, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 194583095], - [5015, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1901385496], - [5024, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 490810486], - [5026, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 586287746], - [5030, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1310969752], - [5050, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087389205], - [5062, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2609063547], - [5071, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], - [5073, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1370761696], - [5096, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 2208661169], - [5102, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1862604658], - [5108, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 3958789371], - [5117, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3449594464], - [5119, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 692050524], - [5123, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 802172558], - [5193, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2406691660], - [5228, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], - [5239, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1811982742], - [5266, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2562189319], - [5272, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193430346], - [5278, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2814237166], - [5287, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2189106693], - [5289, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 3874870868], - [5293, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179474914], - [5326, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1751845165], - [5337, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2617230371], - [5341, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], - [5382, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], - [5393, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3793790598], - [5428, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 4088312783], - [5439, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3220724736], - [5443, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087899888], - [5462, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2552888401], - [5468, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 194583095], - [5474, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2414559905], - [5483, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 626762179], - [5485, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3969284923], - [5489, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 1893261414], - [5521, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2133507320], - [5532, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 2101353476], - [5536, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087685705], - [5555, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2431380437], - [5561, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 194583095], - [5567, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 435489438], - [5576, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 1520878209], - [5578, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 2238995076], - [5582, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 2789405913], - [5615, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], - [5626, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3409328196], - [5649, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087858069], - [5661, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2811935086], - [5670, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], - [5672, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1113346693], - [5676, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3227128786], - [5696, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 48793812], - [5702, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 338440584], - [5708, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 735248703], - [5717, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 927473097], - [5719, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 1394536741], - [5723, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3134012967], - [5742, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 2967615316], - [5748, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 2810710931], - [5754, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 2548594701], - [5757, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860796], - [5759, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], - [5763, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3549194295], - [5765, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 1074004741], - [5769, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 2874423564], - [5772, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087576526], - [5774, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], - [5789, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 1696848307], - [5795, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 2883501659], - [5801, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 3056443076], - [5806, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193405204], - [5810, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 1487412605], - [5812, 121, 51, "Layout/LineLength: Line is too long. [171/120]", 2021571284], - [5816, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1975782995], - [5819, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860796], - [5821, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193405204], - [5826, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 183236849], - [5835, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 856018753], - [5838, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], - [5841, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 2146546324], - [5847, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3913983076], - [5850, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 3491931666], - [5852, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3536323546], - [5856, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 356581191], - [5858, 121, 63, "Layout/LineLength: Line is too long. [183/120]", 4144657639], - [5862, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 1478616653], - [5865, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1774852021], - [5867, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3536323546], - [5882, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3884289787], - [5888, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 1001503687], - [5894, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3673836976], - [5903, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 3164908550], - [5905, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 1134300778], - [5909, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1797165224], - [5928, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 2508143995], - [5934, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 3002532188], - [5940, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 584857986], - [5943, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860796], - [5945, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], - [5949, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 749691384], - [5951, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 3389354954], - [5955, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 3402045699], - [5958, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087576526], - [5960, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], - [5974, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 2447716612], - [5980, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3201685099], - [5986, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 3060990885], - [5995, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 29396315], - [5997, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 1228645365], - [6001, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1436742837], - [6020, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 716917214], - [6026, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 2175814211], - [6032, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 1473420390], - [6035, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193433391], - [6037, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1422839111], - [6041, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 1571170198], - [6043, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 2175059093], - [6047, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3886666417], - [6050, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 176753677], - [6052, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1422839111], - [6068, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 3471319495], - [6074, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 1274038477], - [6080, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 2896814693], - [6083, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087576526], - [6085, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114086530], - [6089, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 250433828], - [6091, 121, 59, "Layout/LineLength: Line is too long. [179/120]", 3910556848], - [6095, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4002014976], - [6098, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 3491931666], - [6100, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114086530], - [6194, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861664], - [6208, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087932582], - [6222, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861664], - [6238, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 876012844], - [6240, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1756764194], - [6241, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 4173216735], - [6244, 121, 75, "Layout/LineLength: Line is too long. [195/120]", 911964425], - [6245, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 173266907], - [6246, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1412705933], - [6249, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1756764194], - [6250, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 2605683750], - [6253, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 3182252139], - [6255, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1652557742], - [6259, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 2240437058], - [6260, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 173266907], - [6261, 121, 101, "Layout/LineLength: Line is too long. [221/120]", 3694598076], - [6263, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861152], - [6264, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179079542], - [6265, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 3528944411], - [6268, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3020159378], - [6270, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1652557742], - [6276, 121, 84, "Layout/LineLength: Line is too long. [204/120]", 420843234], - [6278, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1401226501], - [6279, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 442915368], - [6282, 121, 79, "Layout/LineLength: Line is too long. [199/120]", 4212444955], - [6283, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053864], - [6284, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1373660924], - [6287, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1401226501], - [6288, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 1539225758], - [6291, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3020159378], - [6293, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 4240691845], - [6297, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 674553335], - [6298, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053864], - [6299, 121, 105, "Layout/LineLength: Line is too long. [225/120]", 4163432287], - [6301, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2089555761], - [6302, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2034687276], - [6303, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 3710905302], - [6306, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 4204667212], - [6308, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 4240691845], - [6314, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 2071493433], - [6316, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085352569], - [6317, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 2853066942], - [6320, 121, 71, "Layout/LineLength: Line is too long. [191/120]", 2771467828], - [6321, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193425976], - [6322, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3025157142], - [6325, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085352569], - [6326, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 3340824101], - [6329, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 3999804761], - [6331, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1999310973], - [6335, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 835016333], - [6336, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193425976], - [6337, 121, 97, "Layout/LineLength: Line is too long. [217/120]", 3575893945], - [6340, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193405945], - [6341, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 1755858308], - [6344, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 3182252139], - [6346, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1999310973], - [6352, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 3033080032], - [6354, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177549], - [6355, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 2720985203], - [6358, 121, 65, "Layout/LineLength: Line is too long. [185/120]", 3233424320], - [6360, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873483], - [6363, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177549], - [6364, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 131859703], - [6367, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1943494546], - [6369, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 4016166830], - [6373, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 1350760977], - [6375, 121, 91, "Layout/LineLength: Line is too long. [211/120]", 4098706554], - [6379, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 4059724765], - [6382, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1651955548], - [6384, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 4016166830], - [6390, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 1057495720], - [6393, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1621971220], - [6396, 121, 49, "Layout/LineLength: Line is too long. [169/120]", 1585717593], - [6402, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 2942094233], - [6405, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2624667704], - [6407, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2317051977], - [6411, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 1321610634], - [6413, 121, 75, "Layout/LineLength: Line is too long. [195/120]", 2854688831], - [6417, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 4185465554], - [6420, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1169781875], - [6422, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2317051977], - [6428, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 1916545020], - [6431, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1422839111], - [6434, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 910134593], - [6440, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 203086561], - [6443, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2939363812], - [6445, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3155638331], - [6449, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 1955758062], - [6451, 121, 71, "Layout/LineLength: Line is too long. [191/120]", 3737424359], - [6455, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 3597620692], - [6458, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2624667704], - [6460, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3155638331], - [6466, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 1036052399], - [6469, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114086530], - [6472, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 1268266488], - [6478, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 2791598354], - [6481, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1302589368], - [6483, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3533902728], - [6487, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 3942276897], - [6489, 121, 73, "Layout/LineLength: Line is too long. [193/120]", 1175941460], - [6493, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 679697318], - [6496, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 28126263], - [6498, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3533902728], - [6499, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 181895237], - [6504, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 4057848448], - [6507, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114086530], - [6510, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 4067769399], - [6516, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 461482909], - [6519, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1302589368], - [6521, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3533902728], - [6525, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 3561204590], - [6527, 121, 73, "Layout/LineLength: Line is too long. [193/120]", 880160795], - [6531, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 1614719145], - [6534, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 28126263], - [6536, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3533902728], - [6537, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 181895237], - [6584, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193432306], - [6598, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 1645945966], - [6601, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3212740609], - [6604, 121, 59, "Layout/LineLength: Line is too long. [179/120]", 3982698123], - [6606, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193425997], - [6610, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 2663750402], - [6613, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2420297272], - [6615, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1164389943], - [6619, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 3483121581], - [6621, 121, 85, "Layout/LineLength: Line is too long. [205/120]", 2271668600], - [6625, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 804794365], - [6628, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3659367004], - [6630, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1164389943], - [6631, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 561395486], - [6636, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 1251661057], - [6639, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3212740609], - [6642, 121, 59, "Layout/LineLength: Line is too long. [179/120]", 3210109508], - [6644, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193425997], - [6648, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 430316685], - [6651, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2420297272], - [6653, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1164389943], - [6657, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 2428160226], - [6659, 121, 85, "Layout/LineLength: Line is too long. [205/120]", 2663295671], - [6663, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 2822109938], - [6666, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3659367004], - [6668, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1164389943], - [6669, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 561395486], - [6674, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 857639785], - [6677, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3669622788], - [6680, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 140453799], - [6682, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860765], - [6686, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 1650236431], - [6689, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 150699323], - [6691, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 50618962], - [6695, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 4205571164], - [6697, 121, 83, "Layout/LineLength: Line is too long. [203/120]", 1549528021], - [6701, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 1325488145], - [6704, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1510711065], - [6706, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 50618962], - [6712, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 3043205563], - [6715, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2381137493], - [6718, 121, 61, "Layout/LineLength: Line is too long. [181/120]", 2200345195], - [6720, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087926498], - [6724, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 1082269527], - [6727, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1510711065], - [6729, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1104064739], - [6733, 121, 68, "Layout/LineLength: Line is too long. [188/120]", 1652941658], - [6735, 121, 87, "Layout/LineLength: Line is too long. [207/120]", 1440323819], - [6739, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 802896260], - [6742, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1943494546], - [6744, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1104064739], - [6750, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 788730815], - [6752, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2034687276], - [6753, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 4226330106], - [6756, 121, 77, "Layout/LineLength: Line is too long. [197/120]", 2414796320], - [6757, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873470], - [6758, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3090817832], - [6761, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2034687276], - [6762, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 2839148677], - [6765, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 2393983240], - [6767, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 2581936864], - [6771, 121, 84, "Layout/LineLength: Line is too long. [204/120]", 3923254945], - [6772, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873470], - [6773, 121, 103, "Layout/LineLength: Line is too long. [223/120]", 580639726], - [6775, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193419246], - [6776, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1756764194], - [6777, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 3202758044], - [6780, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 912651721], - [6782, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 2581936864], - [6786, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1164293389], - [6799, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860840], - [6800, 121, 88, "Layout/LineLength: Line is too long. [208/120]", 574552570], - [6802, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3845073641], - [6803, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 543375177], - [6806, 121, 83, "Layout/LineLength: Line is too long. [203/120]", 222410330], - [6807, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3025157219], - [6808, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1904561434], - [6811, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 489872984], - [6812, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 97325617], - [6815, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 4204667212], - [6817, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 4062673070], - [6821, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 1451915960], - [6822, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3025157219], - [6823, 121, 109, "Layout/LineLength: Line is too long. [229/120]", 4200529758], - [6825, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1497831350], - [6826, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 4214367244], - [6827, 121, 84, "Layout/LineLength: Line is too long. [204/120]", 399603517], - [6830, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3423548875], - [6832, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 4062673070], - [6836, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3279830097], - [6848, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 659167322], - [6860, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087926423], - [6861, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 3300294193], - [6863, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3172850966], - [6864, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 2396187736], - [6867, 121, 87, "Layout/LineLength: Line is too long. [207/120]", 1991888901], - [6868, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1954380402], - [6869, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2589970962], - [6872, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 42340644], - [6873, 121, 67, "Layout/LineLength: Line is too long. [187/120]", 479235996], - [6876, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3423548875], - [6878, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1462541970], - [6882, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 1373978781], - [6883, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1954380402], - [6884, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 280641011], - [6886, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1664110553], - [6887, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1009650381], - [6888, 121, 88, "Layout/LineLength: Line is too long. [208/120]", 909329343], - [6891, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 2977589831], - [6893, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1462541970], - [6898, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873470], - [6899, 121, 61, "Layout/LineLength: Line is too long. [181/120]", 1904101094], - [6901, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2229256255], - [6902, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 1839090017], - [6905, 121, 91, "Layout/LineLength: Line is too long. [211/120]", 4260980907], - [6906, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 4253118453], - [6907, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1536690221], - [6909, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861152], - [6910, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 209824656], - [6911, 121, 71, "Layout/LineLength: Line is too long. [191/120]", 1530496074], - [6914, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 2977589831], - [6916, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3261436902], - [6920, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 3762694917], - [6921, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 4253118453], - [6922, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 3196230010], - [6924, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3165598659], - [6925, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 4264469493], - [6926, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 3140690958], - [6929, 121, 35, "Layout/LineLength: Line is too long. [155/120]", 2999583208], - [6931, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3261436902], - [6937, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 326070599], - [6940, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1621971220], - [6943, 121, 49, "Layout/LineLength: Line is too long. [169/120]", 1689000214], - [6949, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 2459904022], - [6952, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2624667704], - [6954, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2317051977], - [6958, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 2842872837], - [6960, 121, 75, "Layout/LineLength: Line is too long. [195/120]", 423884656], - [6964, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 2673769885], - [6967, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1169781875], - [6969, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2317051977], - [6970, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2126253911], - [6986, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 2388292564], - [6989, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2381137493], - [6992, 121, 61, "Layout/LineLength: Line is too long. [181/120]", 1136762660], - [6994, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087926498], - [6998, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 2555581016], - [7001, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1510711065], - [7003, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1104064739], - [7007, 121, 68, "Layout/LineLength: Line is too long. [188/120]", 1986812885], - [7009, 121, 87, "Layout/LineLength: Line is too long. [207/120]", 1864036132], - [7013, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 3590180043], - [7016, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1943494546], - [7018, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1104064739], - [7019, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2382712010], - [7029, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1791534645], - [7034, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 2403815412], - [7037, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1422839111], - [7040, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 4046048864], - [7046, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 3472955113], - [7049, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2939363812], - [7051, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3155638331], - [7055, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3911469720], - [7057, 121, 71, "Layout/LineLength: Line is too long. [191/120]", 272433263], - [7061, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 634420444], - [7064, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2624667704], - [7066, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3155638331], - [7067, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2088324682], - [7080, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087906711], - [7092, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2135380894], - [7101, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], - [7103, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 4280757685], - [7107, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 161599970], - [7141, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053789], - [7176, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2188407955], - [7187, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3692322233], - [7191, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087557694], - [7214, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3197512522], - [7223, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858840], - [7225, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 85298067], - [7282, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193418403], - [7288, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193418403], - [7311, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087432474], - [7323, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2361949763], - [7332, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], - [7334, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 581045160], - [7338, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 4235011647], - [7357, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1898147766], - [7363, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177560], - [7369, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 1310140439], - [7378, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 681770239], - [7380, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3821940657], - [7384, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], - [7404, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861292], - [7416, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2354124424], - [7425, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087922021], - [7427, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 3921370162], - [8020, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 4083054536], - [8048, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 4083054536], - [8077, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 4083054536], - [8135, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 632953222], - [8164, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 732995265], - [8214, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 1886249927], - [8376, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 578751979], - [8377, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3803540269], - [8386, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2238403955], - [8387, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1028441932], - [8388, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 1975950909], - [8443, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1244043798] - ], - "spec/integration/freeze_node_edge_cases_spec.rb:3416491031": [ - [6, 1, 28959, "Metrics/BlockLength: Block has too many lines. [663/25]", 3473768018], - [7, 3, 2985, "Metrics/BlockLength: Block has too many lines. [57/25]", 436154415], - [8, 5, 2934, "Metrics/BlockLength: Block has too many lines. [55/25]", 1963918102], - [78, 3, 6091, "Metrics/BlockLength: Block has too many lines. [136/25]", 232153494], - [98, 5, 3053, "Metrics/BlockLength: Block has too many lines. [69/25]", 1442974101], - [202, 5, 1691, "Metrics/BlockLength: Block has too many lines. [29/25]", 985654389], - [241, 3, 8515, "Metrics/BlockLength: Block has too many lines. [176/25]", 2776676526], - [473, 3, 2024, "Metrics/BlockLength: Block has too many lines. [55/25]", 1048101963], - [474, 5, 890, "Metrics/BlockLength: Block has too many lines. [26/25]", 753961540], - [543, 3, 4511, "Metrics/BlockLength: Block has too many lines. [116/25]", 1227615145], - [693, 3, 1660, "Metrics/BlockLength: Block has too many lines. [43/25]", 1881888061], - [694, 5, 1107, "Metrics/BlockLength: Block has too many lines. [26/25]", 368095693] - ], - "spec/integration/gem_family_section_merge_spec.rb:1744383089": [ - [164, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 93655697] - ], - "spec/integration/integration_spec.rb:2239247043": [ - [14, 1, 4488, "Metrics/BlockLength: Block has too many lines. [88/25]", 206207480], - [15, 3, 3267, "Metrics/BlockLength: Block has too many lines. [62/25]", 1323899085], - [40, 5, 2263, "Metrics/BlockLength: Block has too many lines. [48/25]", 3172595581] - ], - "spec/integration/link_reference_preservation_spec.rb:3764298162": [ - [6, 1, 2646, "Metrics/BlockLength: Block has too many lines. [48/25]", 3396410609], - [19, 3, 2058, "Metrics/BlockLength: Block has too many lines. [33/25]", 163363949] - ], - "spec/integration/markly_merge_spec.rb:3076950975": [ - [3, 1, 22886, "Metrics/BlockLength: Block has too many lines. [670/25]", 1408138744], - [62, 3, 7192, "Metrics/BlockLength: Block has too many lines. [189/25]", 1890889324], - [63, 5, 1678, "Metrics/BlockLength: Block has too many lines. [41/25]", 2587582896], - [115, 5, 1808, "Metrics/BlockLength: Block has too many lines. [48/25]", 3381172795], - [147, 46, 21, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 451071547], - [171, 5, 1134, "Metrics/BlockLength: Block has too many lines. [30/25]", 2526618199], - [220, 5, 1335, "Metrics/BlockLength: Block has too many lines. [32/25]", 2790596215], - [311, 3, 2008, "Metrics/BlockLength: Block has too many lines. [66/25]", 2640155627], - [394, 3, 1052, "Metrics/BlockLength: Block has too many lines. [27/25]", 3988836255], - [440, 3, 2950, "Metrics/BlockLength: Block has too many lines. [89/25]", 961031348], - [441, 5, 1352, "Metrics/BlockLength: Block has too many lines. [37/25]", 1952365669], - [495, 5, 1550, "Metrics/BlockLength: Block has too many lines. [48/25]", 2400197001], - [561, 3, 1665, "Metrics/BlockLength: Block has too many lines. [52/25]", 3884776329], - [650, 3, 1919, "Metrics/BlockLength: Block has too many lines. [57/25]", 2594646583], - [725, 3, 1644, "Metrics/BlockLength: Block has too many lines. [45/25]", 2348710811], - [791, 3, 1600, "Metrics/BlockLength: Block has too many lines. [46/25]", 3683503747] - ], - "spec/integration/partial_template_merger_table_merge_spec.rb:3504046892": [ - [7, 1, 7402, "Metrics/BlockLength: Block has too many lines. [164/25]", 3368892126], - [9, 3, 2986, "Metrics/BlockLength: Block has too many lines. [67/25]", 2267114449], - [65, 5, 1359, "Metrics/BlockLength: Block has too many lines. [28/25]", 3145143002], - [102, 3, 997, "Metrics/BlockLength: Block has too many lines. [26/25]", 3156068215], - [147, 3, 3009, "Metrics/BlockLength: Block has too many lines. [65/25]", 994160212], - [202, 5, 1401, "Metrics/BlockLength: Block has too many lines. [28/25]", 3038951618] - ], - "spec/integration/table_formatting_preservation_spec.rb:3943985446": [ - [6, 1, 3086, "Metrics/BlockLength: Block has too many lines. [56/25]", 2210897849], - [19, 3, 2374, "Metrics/BlockLength: Block has too many lines. [40/25]", 668961519], - [33, 5, 1847, "Metrics/BlockLength: Block has too many lines. [28/25]", 3433318963] - ], - "spec/integration/text_merge_spec.rb:884566200": [ - [6, 1, 7747, "Metrics/BlockLength: Block has too many lines. [204/25]", 2372984305], - [60, 3, 1113, "Metrics/BlockLength: Block has too many lines. [34/25]", 3399970957], - [67, 5, 860, "Metrics/BlockLength: Block has too many lines. [27/25]", 2337191560], - [103, 3, 916, "Metrics/BlockLength: Block has too many lines. [28/25]", 4082963348], - [149, 3, 3001, "Metrics/BlockLength: Block has too many lines. [74/25]", 7776854] - ], - "spec/support/fictive_language_harness.rb:1770581700": [ - [85, 7, 733, "Metrics/AbcSize: Assignment Branch Condition size for `extract_comments` is too high. [<5, 16, 5> 17.49/17]", 1127096515], - [85, 7, 733, "Metrics/MethodLength: Method has too many lines. [22/10]", 1127096515], - [117, 21, 129, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 681912759], - [182, 7, 1084, "Metrics/AbcSize: Assignment Branch Condition size for `parse_statements` is too high. [<9, 28, 7> 30.23/17]", 3123785685], - [182, 7, 1084, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_statements` is too high. [8/7]", 3123785685], - [182, 7, 1084, "Metrics/MethodLength: Method has too many lines. [24/10]", 3123785685], - [233, 5, 9879, "Metrics/ClassLength: Class has too many lines. [228/100]", 3231256134], - [236, 21, 208, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2970487173], - [257, 7, 1981, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_batch` is too high. [<16, 32, 4> 36/17]", 4125392918], - [257, 7, 1981, "Metrics/MethodLength: Method has too many lines. [42/10]", 4125392918], - [342, 7, 778, "Metrics/MethodLength: Method has too many lines. [18/10]", 4189873983], - [364, 7, 844, "Metrics/MethodLength: Method has too many lines. [19/10]", 526186683], - [449, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087956942], - [464, 7, 1065, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_template_preamble_prefix_region` is too high. [<6, 24, 11> 27.07/17]", 2332280467], - [464, 7, 1065, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collapse_template_preamble_prefix_region` is too high. [10/7]", 2332280467], - [464, 7, 1065, "Metrics/MethodLength: Method has too many lines. [20/10]", 2332280467], - [464, 7, 1065, "Metrics/PerceivedComplexity: Perceived complexity for `collapse_template_preamble_prefix_region` is too high. [10/8]", 2332280467] - ], - "spec/support/testable_node.rb:1110514732": [ - [10, 7, 573, "Metrics/MethodLength: Method has too many lines. [12/10]", 798847435], - [10, 22, 226, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 2319398994], - [40, 7, 642, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<11, 14, 6> 18.79/17]", 2249578474], - [40, 21, 131, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 1786967686] - ] -} diff --git a/gems/ast-merge/Gemfile.lock b/gems/ast-merge/Gemfile.lock index 1545c3450..65791e91f 100644 --- a/gems/ast-merge/Gemfile.lock +++ b/gems/ast-merge/Gemfile.lock @@ -1,3 +1,13 @@ +GIT + remote: https://github.com/structuredmerge/tree-sitter-language-pack.git + revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a + branch: fix/ruby-parser-api-methods + glob: packages/ruby/*.gemspec + specs: + tree_sitter_language_pack (1.12.5) + rb_sys (>= 0.9, < 0.9.128) + sorbet-runtime (~> 0.5) + PATH remote: . specs: @@ -7,271 +17,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby - specs: - tree_sitter_language_pack (1.12.5) - rb_sys (>= 0.9, < 0.9.128) - sorbet-runtime (~> 0.5) - GEM remote: https://gem.coop/ specs: @@ -291,12 +36,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -360,8 +99,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -390,7 +127,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -530,8 +266,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -584,11 +318,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -635,45 +369,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -682,54 +394,31 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -737,7 +426,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -750,27 +438,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -785,14 +465,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -800,7 +476,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -828,12 +503,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -842,7 +514,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,19 +527,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +542,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ast-merge/bin/yard b/gems/ast-merge/bin/yard index 5d516ad6f..a7e8b6eed 100755 --- a/gems/ast-merge/bin/yard +++ b/gems/ast-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec('bundle', 'exec', 'rake', 'yard') +exec("bundle", "exec", "rake", "yard") diff --git a/gems/ast-template/Gemfile.lock b/gems/ast-template/Gemfile.lock index f763e88a6..c907b076e 100644 --- a/gems/ast-template/Gemfile.lock +++ b/gems/ast-template/Gemfile.lock @@ -15,266 +15,6 @@ PATH ast-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +26,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +39,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +102,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +130,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +269,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +321,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +372,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +397,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +430,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +442,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +469,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +480,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +507,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +518,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +531,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +546,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/binary-merge/Gemfile.lock b/gems/binary-merge/Gemfile.lock index a228ee13e..01e2a0936 100644 --- a/gems/binary-merge/Gemfile.lock +++ b/gems/binary-merge/Gemfile.lock @@ -15,266 +15,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -294,12 +34,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +97,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +125,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +264,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -584,14 +313,11 @@ GEM delegate (~> 0.1) rspec (~> 3.0) timecop (>= 0.7, < 1) - token-resolver (2.0.4) + tree_haver (7.1.0) + citrus (~> 3.0) parslet (~> 2.0) - version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +364,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +389,31 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) - ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +421,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +433,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +460,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +471,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +498,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +509,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -858,20 +521,14 @@ CHECKSUMS thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73 timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 - token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +536,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) 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 5eadec344..58a2cdbd6 100644 --- a/gems/citrus-toml-merge/Gemfile.lock +++ b/gems/citrus-toml-merge/Gemfile.lock @@ -16,265 +16,6 @@ PATH toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +40,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +103,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +131,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +270,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +322,18 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +380,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +405,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +438,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +450,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +477,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +488,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +515,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +526,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +539,16 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +556,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/commonmarker-merge/Gemfile.lock b/gems/commonmarker-merge/Gemfile.lock index 6aef060f6..e08527df8 100644 --- a/gems/commonmarker-merge/Gemfile.lock +++ b/gems/commonmarker-merge/Gemfile.lock @@ -16,265 +16,6 @@ PATH markdown-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -363,8 +109,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +137,10 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +280,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +332,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +383,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,46 +408,30 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca @@ -740,7 +447,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +459,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +487,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +498,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +525,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +536,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +549,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +564,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/go-merge/Gemfile.lock b/gems/go-merge/Gemfile.lock index 0afc11a39..c7dbff1d4 100644 --- a/gems/go-merge/Gemfile.lock +++ b/gems/go-merge/Gemfile.lock @@ -16,265 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +40,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +103,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +131,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +270,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +322,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +373,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +398,31 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +430,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -758,22 +447,15 @@ CHECKSUMS io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +470,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +481,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +508,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +519,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +532,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +547,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/markdown-merge/.kettle-drift.lock b/gems/markdown-merge/.kettle-drift.lock index 98e9f541b..3aa07e7e9 100644 --- a/gems/markdown-merge/.kettle-drift.lock +++ b/gems/markdown-merge/.kettle-drift.lock @@ -8,7 +8,8 @@ 160, 200, 240, - 280 + 280, + 320 ] } ], @@ -21,7 +22,8 @@ 171, 211, 251, - 291 + 291, + 331 ] } ], @@ -34,7 +36,8 @@ 161, 201, 241, - 281 + 281, + 321 ] } ], @@ -47,7 +50,8 @@ 173, 213, 253, - 293 + 293, + 333 ] } ], @@ -60,7 +64,8 @@ 176, 216, 256, - 296 + 296, + 336 ] } ], @@ -73,7 +78,8 @@ 162, 202, 242, - 282 + 282, + 322 ] } ], @@ -87,7 +93,8 @@ 180, 220, 260, - 300 + 300, + 340 ] } ], @@ -100,7 +107,8 @@ 181, 221, 261, - 301 + 301, + 341 ] } ], @@ -114,7 +122,8 @@ 167, 207, 247, - 287 + 287, + 327 ] } ], @@ -127,7 +136,8 @@ 190, 230, 270, - 310 + 310, + 350 ] } ], @@ -141,7 +151,8 @@ 159, 199, 239, - 279 + 279, + 319 ] } ], @@ -155,7 +166,8 @@ 189, 229, 269, - 309 + 309, + 349 ] } ], @@ -168,7 +180,8 @@ 165, 205, 245, - 285 + 285, + 325 ] } ], @@ -182,7 +195,8 @@ 172, 212, 252, - 292 + 292, + 332 ] } ], @@ -196,7 +210,8 @@ 168, 208, 248, - 288 + 288, + 328 ] } ], @@ -209,7 +224,8 @@ 166, 206, 246, - 286 + 286, + 326 ] } ], @@ -222,7 +238,8 @@ 183, 223, 263, - 303 + 303, + 343 ] } ], @@ -235,7 +252,8 @@ 182, 222, 262, - 302 + 302, + 342 ] } ], @@ -248,7 +266,8 @@ 177, 217, 257, - 297 + 297, + 337 ] } ], @@ -261,7 +280,8 @@ 186, 226, 266, - 306 + 306, + 346 ] } ], diff --git a/gems/markdown-merge/.rubocop_gradual.lock b/gems/markdown-merge/.rubocop_gradual.lock deleted file mode 100644 index 4f8201218..000000000 --- a/gems/markdown-merge/.rubocop_gradual.lock +++ /dev/null @@ -1,608 +0,0 @@ -{ - ".simplecov:862493710": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:1018150957": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/markdown-merge.rb:1671676898": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`markdown-merge.rb`) should use snake_case.", 5381] - ], - "lib/markdown/merge.rb:3835020687": [ - [11, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Markdown::Merge`.", 2866359175], - [11, 3, 23539, "Metrics/ModuleLength: Module has too many lines. [564/100]", 3838590514], - [22, 5, 16, "Style/Documentation: Missing top-level documentation comment for `class Markdown::Merge::ParseError`.", 362242086], - [104, 5, 990, "Metrics/MethodLength: Method has too many lines. [23/10]", 650805533], - [133, 5, 678, "Metrics/AbcSize: Assignment Branch Condition size for `match_markdown_owners` is too high. [<10, 23, 8> 26.32/17]", 2124140148], - [133, 5, 678, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `match_markdown_owners` is too high. [9/7]", 2124140148], - [133, 5, 678, "Metrics/PerceivedComplexity: Perceived complexity for `match_markdown_owners` is too high. [9/8]", 2124140148], - [146, 5, 1188, "Metrics/AbcSize: Assignment Branch Condition size for `merge_markdown` is too high. [<10, 25, 8> 28.09/17]", 3592129796], - [146, 5, 1188, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_markdown` is too high. [9/7]", 3592129796], - [146, 5, 1188, "Metrics/MethodLength: Method has too many lines. [23/10]", 3592129796], - [146, 5, 1188, "Metrics/PerceivedComplexity: Perceived complexity for `merge_markdown` is too high. [9/8]", 3592129796], - [175, 5, 513, "Metrics/MethodLength: Method has too many lines. [13/10]", 912081106], - [193, 5, 747, "Metrics/MethodLength: Method has too many lines. [16/10]", 3172863125], - [224, 5, 1513, "Metrics/AbcSize: Assignment Branch Condition size for `apply_markdown_delegated_child_outputs` is too high. [<16, 37, 9> 41.3/17]", 3320736661], - [224, 5, 1513, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_markdown_delegated_child_outputs` is too high. [10/7]", 3320736661], - [224, 5, 1513, "Metrics/MethodLength: Method has too many lines. [30/10]", 3320736661], - [224, 5, 1513, "Metrics/PerceivedComplexity: Perceived complexity for `apply_markdown_delegated_child_outputs` is too high. [10/8]", 3320736661], - [262, 5, 1058, "Metrics/MethodLength: Method has too many lines. [23/10]", 2000305522], - [289, 5, 1103, "Metrics/MethodLength: Method has too many lines. [23/10]", 2615729942], - [289, 52, 144, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3050457682], - [317, 5, 817, "Metrics/MethodLength: Method has too many lines. [13/10]", 322304706], - [322, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 2378183959], - [335, 5, 805, "Metrics/MethodLength: Method has too many lines. [13/10]", 935244360], - [340, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 2974266470], - [353, 5, 722, "Metrics/MethodLength: Method has too many lines. [12/10]", 1758487766], - [358, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 3013228499], - [370, 5, 730, "Metrics/MethodLength: Method has too many lines. [12/10]", 3297037131], - [375, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 3013228499], - [401, 5, 1584, "Metrics/AbcSize: Assignment Branch Condition size for `collect_markdown_owners` is too high. [<21, 32, 13> 40.42/17]", 572024212], - [401, 5, 1584, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_markdown_owners` is too high. [11/7]", 572024212], - [401, 5, 1584, "Metrics/MethodLength: Method has too many lines. [45/10]", 572024212], - [401, 5, 1584, "Metrics/PerceivedComplexity: Perceived complexity for `collect_markdown_owners` is too high. [11/8]", 572024212], - [455, 5, 1147, "Metrics/AbcSize: Assignment Branch Condition size for `markdown_owner_start_indices` is too high. [<21, 22, 11> 32.34/17]", 12516264], - [455, 5, 1147, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `markdown_owner_start_indices` is too high. [9/7]", 12516264], - [455, 5, 1147, "Metrics/MethodLength: Method has too many lines. [33/10]", 12516264], - [455, 5, 1147, "Metrics/PerceivedComplexity: Perceived complexity for `markdown_owner_start_indices` is too high. [9/8]", 12516264], - [496, 5, 602, "Metrics/AbcSize: Assignment Branch Condition size for `collect_markdown_sections` is too high. [<9, 20, 6> 22.74/17]", 1946206422], - [496, 5, 602, "Metrics/MethodLength: Method has too many lines. [14/10]", 1946206422], - [504, 7, 11, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 848344986], - [515, 5, 1097, "Metrics/AbcSize: Assignment Branch Condition size for `markdown_fence_ranges` is too high. [<19, 21, 11> 30.38/17]", 2035260313], - [515, 5, 1097, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `markdown_fence_ranges` is too high. [8/7]", 2035260313], - [515, 5, 1097, "Metrics/MethodLength: Method has too many lines. [31/10]", 2035260313], - [531, 13, 227, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 1054958538], - [553, 5, 323, "Metrics/MethodLength: Method has too many lines. [14/10]", 2041170985], - [589, 5, 525, "Metrics/MethodLength: Method has too many lines. [11/10]", 1507618315] - ], - "lib/markdown/merge/backend_support.rb:1723133349": [ - [6, 5, 6677, "Metrics/ModuleLength: Module has too many lines. [151/100]", 1497234257], - [18, 7, 524, "Metrics/MethodLength: Method has too many lines. [13/10]", 2550700841], - [34, 7, 913, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `configure_markdown_only_language_class!` is too high. [9/7]", 2175633707], - [34, 7, 913, "Metrics/MethodLength: Method has too many lines. [14/10]", 2175633707], - [34, 7, 913, "Metrics/PerceivedComplexity: Perceived complexity for `configure_markdown_only_language_class!` is too high. [10/8]", 2175633707], - [37, 11, 658, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [9/7]", 353826273], - [37, 11, 658, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [10/8]", 353826273], - [44, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1312231069], - [54, 7, 1263, "Metrics/AbcSize: Assignment Branch Condition size for `configure_node_link_and_navigation!` is too high. [<3, 28, 3> 28.32/17]", 122101535], - [54, 7, 1263, "Metrics/MethodLength: Method has too many lines. [20/10]", 122101535], - [98, 7, 976, "Metrics/MethodLength: Method has too many lines. [24/10]", 2694447150], - [132, 7, 618, "Metrics/MethodLength: Method has too many lines. [11/10]", 2027069469], - [150, 7, 888, "Metrics/MethodLength: Method has too many lines. [21/10]", 3721642530] - ], - "lib/markdown/merge/cleanse/block_spacing.rb:2917446564": [ - [32, 7, 7186, "Metrics/ClassLength: Class has too many lines. [138/100]", 1732896955], - [132, 9, 465, "Metrics/AbcSize: Assignment Branch Condition size for `fix` is too high. [<6, 16, 5> 17.8/17]", 341373851], - [150, 9, 1964, "Metrics/AbcSize: Assignment Branch Condition size for `analyze` is too high. [<9, 25, 16> 31.02/17]", 2558819309], - [150, 9, 1964, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `analyze` is too high. [14/7]", 2558819309], - [150, 9, 1964, "Metrics/MethodLength: Method has too many lines. [23/10]", 2558819309], - [150, 9, 1964, "Metrics/PerceivedComplexity: Perceived complexity for `analyze` is too high. [14/8]", 2558819309], - [160, 25, 7, "Style/NumericPredicate: Use `idx.positive?` instead of `idx > 0`.", 1825176542], - [192, 40, 20, "Style/NumericPredicate: Use `html_block_depth.positive?` instead of `html_block_depth > 0`.", 3208734130] - ], - "lib/markdown/merge/cleanse/code_fence_spacing.rb:1353147449": [ - [161, 9, 1524, "Metrics/AbcSize: Assignment Branch Condition size for `code_blocks` is too high. [<18, 20, 12> 29.46/17]", 2467942971], - [161, 9, 1524, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `code_blocks` is too high. [12/7]", 2467942971], - [161, 9, 1524, "Metrics/MethodLength: Method has too many lines. [35/10]", 2467942971], - [161, 9, 1524, "Metrics/PerceivedComplexity: Perceived complexity for `code_blocks` is too high. [12/8]", 2467942971], - [169, 11, 1293, "Metrics/BlockLength: Block has too many lines. [27/25]", 3238939023], - [249, 9, 884, "Metrics/AbcSize: Assignment Branch Condition size for `parse_fence_line` is too high. [<7, 15, 6> 17.61/17]", 1033947369], - [249, 9, 884, "Metrics/MethodLength: Method has too many lines. [19/10]", 1033947369] - ], - "lib/markdown/merge/cleanse/condensed_link_refs.rb:3659937794": [ - [85, 7, 12174, "Metrics/ClassLength: Class has too many lines. [115/100]", 3309007721], - [200, 9, 874, "Metrics/AbcSize: Assignment Branch Condition size for `definitions` is too high. [<6, 14, 10> 18.22/17]", 1976258109], - [200, 9, 874, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `definitions` is too high. [9/7]", 1976258109], - [200, 9, 874, "Metrics/MethodLength: Method has too many lines. [13/10]", 1976258109], - [200, 9, 874, "Metrics/PerceivedComplexity: Perceived complexity for `definitions` is too high. [9/8]", 1976258109], - [213, 43, 17, "Style/NumericPredicate: Use `first_bracket.positive?` instead of `first_bracket > 0`.", 1095960710], - [273, 13, 30, "Naming/PredicatePrefix: Rename `has_content_before_definition?` to `content_before_definition?`.", 213744570], - [298, 9, 997, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_line` is too high. [9/7]", 2139717575], - [298, 9, 997, "Metrics/MethodLength: Method has too many lines. [13/10]", 2139717575], - [298, 9, 997, "Metrics/PerceivedComplexity: Perceived complexity for `parse_line` is too high. [9/8]", 2139717575], - [352, 9, 1214, "Metrics/AbcSize: Assignment Branch Condition size for `expand_line` is too high. [<10, 20, 17> 28.09/17]", 149412459], - [352, 9, 1214, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `expand_line` is too high. [14/7]", 149412459], - [352, 9, 1214, "Metrics/MethodLength: Method has too many lines. [21/10]", 149412459], - [352, 9, 1214, "Metrics/PerceivedComplexity: Perceived complexity for `expand_line` is too high. [15/8]", 149412459], - [358, 37, 17, "Style/NumericPredicate: Use `first_bracket.positive?` instead of `first_bracket > 0`.", 1095960710] - ], - "lib/markdown/merge/cleanse/templating_corruption.rb:3945009912": [ - [59, 9, 384, "Metrics/AbcSize: Assignment Branch Condition size for `append_issues` is too high. [<0, 17, 2> 17.12/17]", 2550677275] - ], - "lib/markdown/merge/code_block_merger.rb:1362562532": [ - [32, 5, 27618, "Metrics/ClassLength: Class has too many lines. [554/100]", 1891552237], - [120, 7, 543, "Metrics/MethodLength: Method has too many lines. [11/10]", 625040368], - [120, 28, 92, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3691835500], - [135, 7, 666, "Metrics/MethodLength: Method has too many lines. [13/10]", 4153783419], - [156, 7, 2796, "Metrics/AbcSize: Assignment Branch Condition size for `merge_code_blocks_with_runtime` is too high. [<5, 52, 11> 53.39/17]", 4194925058], - [156, 7, 2796, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_code_blocks_with_runtime` is too high. [10/7]", 4194925058], - [156, 7, 2796, "Metrics/MethodLength: Method has too many lines. [63/10]", 4194925058], - [156, 7, 2796, "Metrics/PerceivedComplexity: Perceived complexity for `merge_code_blocks_with_runtime` is too high. [12/8]", 4194925058], - [156, 41, 125, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1827509670], - [227, 7, 1778, "Metrics/AbcSize: Assignment Branch Condition size for `build_runtime_operation` is too high. [<3, 24, 4> 24.52/17]", 3746845105], - [227, 7, 1778, "Metrics/MethodLength: Method has too many lines. [31/10]", 3746845105], - [227, 34, 86, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3153149164], - [239, 39, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [290, 7, 528, "Metrics/MethodLength: Method has too many lines. [14/10]", 3045714289], - [307, 7, 2407, "Metrics/AbcSize: Assignment Branch Condition size for `merge_runtime_surface` is too high. [<1, 50, 7> 50.5/17]", 3818534251], - [307, 7, 2407, "Metrics/MethodLength: Method has too many lines. [53/10]", 3818534251], - [365, 7, 2502, "Metrics/AbcSize: Assignment Branch Condition size for `perform_code_block_merge` is too high. [<8, 34, 16> 38.42/17]", 3120245149], - [365, 7, 2502, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `perform_code_block_merge` is too high. [14/7]", 3120245149], - [365, 7, 2502, "Metrics/MethodLength: Method has too many lines. [57/10]", 3120245149], - [365, 7, 2502, "Metrics/PerceivedComplexity: Perceived complexity for `perform_code_block_merge` is too high. [16/8]", 3120245149], - [365, 35, 83, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2137984385], - [435, 7, 1289, "Metrics/MethodLength: Method has too many lines. [33/10]", 3304634912], - [435, 43, 154, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2516842130], - [473, 7, 755, "Metrics/MethodLength: Method has too many lines. [15/10]", 2207072637], - [473, 35, 127, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2610889879], - [492, 38, 167, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 372116680], - [492, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193417996], - [506, 37, 166, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 321759336], - [506, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861061], - [547, 19, 20, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 3860798338], - [574, 9, 109, "Lint/RescueException: Avoid rescuing the `Exception` class. Perhaps you meant to rescue `StandardError`?", 2421726137], - [575, 21, 50, "Style/ClassEqualityComparison: Use `instance_of?(::RSpec::Mocks::MockExpectationError)` instead of comparing classes.", 952914844], - [592, 9, 797, "Metrics/MethodLength: Method has too many lines. [18/10]", 4001935536], - [622, 9, 800, "Metrics/MethodLength: Method has too many lines. [18/10]", 2519636656], - [652, 9, 798, "Metrics/MethodLength: Method has too many lines. [18/10]", 2048436912], - [680, 9, 1160, "Metrics/MethodLength: Method has too many lines. [26/10]", 45677001], - [718, 9, 798, "Metrics/MethodLength: Method has too many lines. [18/10]", 3475080240] - ], - "lib/markdown/merge/comment_tracker.rb:167569374": [ - [19, 7, 374, "Metrics/MethodLength: Method has too many lines. [11/10]", 3280949001] - ], - "lib/markdown/merge/conflict_resolver.rb:686298490": [ - [29, 5, 6207, "Metrics/ClassLength: Class has too many lines. [122/100]", 3761260950], - [57, 7, 1217, "Metrics/MethodLength: Method has too many lines. [32/10]", 3372247297], - [57, 55, 14, "Lint/UnusedMethodArgument: Unused method argument - `template_index`.", 1809801172], - [57, 72, 10, "Lint/UnusedMethodArgument: Unused method argument - `dest_index`.", 2703999490], - [112, 7, 1811, "Metrics/AbcSize: Assignment Branch Condition size for `unresolved_resolution` is too high. [<6, 22, 5> 23.35/17]", 391291522], - [112, 7, 1811, "Metrics/MethodLength: Method has too many lines. [39/10]", 391291522], - [161, 7, 605, "Metrics/MethodLength: Method has too many lines. [12/10]", 577293020] - ], - "lib/markdown/merge/file_aligner.rb:841305081": [ - [27, 5, 19046, "Metrics/ClassLength: Class has too many lines. [364/100]", 3915220059], - [57, 7, 1853, "Metrics/AbcSize: Assignment Branch Condition size for `apply_match_refiner!` is too high. [<13, 31, 14> 36.41/17]", 3500652553], - [57, 7, 1853, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_match_refiner!` is too high. [15/7]", 3500652553], - [57, 7, 1853, "Metrics/MethodLength: Method has too many lines. [35/10]", 3500652553], - [57, 7, 1853, "Metrics/PerceivedComplexity: Perceived complexity for `apply_match_refiner!` is too high. [15/8]", 3500652553], - [112, 7, 312, "Metrics/MethodLength: Method has too many lines. [11/10]", 2670750985], - [132, 9, 46, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 4265307642], - [133, 11, 78, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1464832319], - [139, 7, 644, "Metrics/AbcSize: Assignment Branch Condition size for `build_heading_owner_paths` is too high. [<8, 20, 8> 22.98/17]", 2892981198], - [139, 7, 644, "Metrics/MethodLength: Method has too many lines. [13/10]", 2892981198], - [176, 7, 1056, "Metrics/AbcSize: Assignment Branch Condition size for `adjacent_section_hijack_repair_compatible?` is too high. [<4, 25, 8> 26.55/17]", 2068902935], - [176, 7, 1056, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `adjacent_section_hijack_repair_compatible?` is too high. [8/7]", 2068902935], - [176, 7, 1056, "Metrics/MethodLength: Method has too many lines. [11/10]", 2068902935], - [204, 7, 685, "Metrics/MethodLength: Method has too many lines. [12/10]", 3293058437], - [221, 7, 762, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `next_same_owner_match_for_template_only_entry` is too high. [8/7]", 681984620], - [250, 7, 829, "Metrics/MethodLength: Method has too many lines. [15/10]", 3104261185], - [309, 7, 759, "Metrics/MethodLength: Method has too many lines. [11/10]", 4043392433], - [342, 7, 540, "Metrics/AbcSize: Assignment Branch Condition size for `synthetic_section_label_paragraph?` is too high. [<3, 15, 11> 18.84/17]", 569218077], - [342, 7, 540, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `synthetic_section_label_paragraph?` is too high. [9/7]", 569218077], - [342, 7, 540, "Metrics/PerceivedComplexity: Perceived complexity for `synthetic_section_label_paragraph?` is too high. [9/8]", 569218077], - [347, 38, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [385, 47, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [385, 85, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [429, 7, 792, "Metrics/AbcSize: Assignment Branch Condition size for `neighboring_heading_signatures` is too high. [<7, 17, 8> 20.05/17]", 653610323], - [429, 7, 792, "Metrics/MethodLength: Method has too many lines. [14/10]", 653610323], - [466, 7, 879, "Metrics/AbcSize: Assignment Branch Condition size for `first_list_item_anchor` is too high. [<6, 22, 9> 24.52/17]", 1144304252], - [466, 7, 879, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `first_list_item_anchor` is too high. [9/7]", 1144304252], - [466, 7, 879, "Metrics/MethodLength: Method has too many lines. [21/10]", 1144304252], - [466, 7, 879, "Metrics/PerceivedComplexity: Perceived complexity for `first_list_item_anchor` is too high. [10/8]", 1144304252] - ], - "lib/markdown/merge/file_analysis.rb:1169434297": [ - [41, 5, 12695, "Metrics/ClassLength: Class has too many lines. [183/100]", 3122418242], - [168, 7, 2960, "Metrics/AbcSize: Assignment Branch Condition size for `compute_parser_signature` is too high. [<13, 36, 18> 42.3/17]", 1002271909], - [168, 7, 2960, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_parser_signature` is too high. [17/7]", 1002271909], - [168, 7, 2960, "Metrics/MethodLength: Method has too many lines. [42/10]", 1002271909], - [168, 7, 2960, "Metrics/PerceivedComplexity: Perceived complexity for `compute_parser_signature` is too high. [11/8]", 1002271909], - [290, 7, 777, "Metrics/MethodLength: Method has too many lines. [14/10]", 1287754637], - [328, 7, 558, "Metrics/MethodLength: Method has too many lines. [15/10]", 3417342515] - ], - "lib/markdown/merge/file_analysis_base.rb:678024820": [ - [37, 5, 26494, "Metrics/ClassLength: Class has too many lines. [405/100]", 2769422452], - [60, 7, 1360, "Metrics/MethodLength: Method has too many lines. [18/10]", 90913983], - [261, 7, 3539, "Metrics/AbcSize: Assignment Branch Condition size for `compute_parser_signature` is too high. [<16, 43, 19> 49.66/17]", 3466910865], - [261, 7, 3539, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_parser_signature` is too high. [18/7]", 3466910865], - [261, 7, 3539, "Metrics/MethodLength: Method has too many lines. [45/10]", 3466910865], - [261, 7, 3539, "Metrics/PerceivedComplexity: Perceived complexity for `compute_parser_signature` is too high. [11/8]", 3466910865], - [467, 7, 1153, "Metrics/AbcSize: Assignment Branch Condition size for `collect_top_level_nodes_with_gaps` is too high. [<10, 16, 7> 20.12/17]", 2190890907], - [467, 7, 1153, "Metrics/MethodLength: Method has too many lines. [18/10]", 2190890907], - [524, 7, 944, "Metrics/AbcSize: Assignment Branch Condition size for `integrate_gap_nodes` is too high. [<10, 14, 9> 19.42/17]", 2618792164], - [524, 7, 944, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `integrate_gap_nodes` is too high. [9/7]", 2618792164], - [524, 7, 944, "Metrics/MethodLength: Method has too many lines. [17/10]", 2618792164], - [524, 7, 944, "Metrics/PerceivedComplexity: Perceived complexity for `integrate_gap_nodes` is too high. [9/8]", 2618792164], - [536, 50, 7, "Style/NumericPredicate: Use `idx.positive?` instead of `idx > 0`.", 1825176542], - [565, 7, 2225, "Metrics/AbcSize: Assignment Branch Condition size for `find_freeze_markers` is too high. [<16, 30, 15> 37.16/17]", 263815919], - [565, 7, 2225, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_freeze_markers` is too high. [16/7]", 263815919], - [565, 7, 2225, "Metrics/MethodLength: Method has too many lines. [39/10]", 263815919], - [565, 7, 2225, "Metrics/PerceivedComplexity: Perceived complexity for `find_freeze_markers` is too high. [16/8]", 263815919], - [588, 15, 101, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 2762675417], - [611, 23, 26, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 2775329597], - [630, 7, 708, "Metrics/MethodLength: Method has too many lines. [19/10]", 1535336850], - [663, 7, 859, "Metrics/MethodLength: Method has too many lines. [19/10]", 1633852183], - [706, 7, 595, "Metrics/MethodLength: Method has too many lines. [14/10]", 2922601775], - [730, 7, 1145, "Metrics/AbcSize: Assignment Branch Condition size for `integrate_nodes_with_freeze_blocks` is too high. [<12, 17, 16> 26.25/17]", 2481642790], - [730, 7, 1145, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `integrate_nodes_with_freeze_blocks` is too high. [13/7]", 2481642790], - [730, 7, 1145, "Metrics/MethodLength: Method has too many lines. [22/10]", 2481642790], - [730, 7, 1145, "Metrics/PerceivedComplexity: Perceived complexity for `integrate_nodes_with_freeze_blocks` is too high. [13/8]", 2481642790] - ], - "lib/markdown/merge/freeze_node.rb:2861044075": [ - [39, 21, 86, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 4263110221] - ], - "lib/markdown/merge/gap_line_node.rb:2230943204": [ - [40, 7, 461, "Metrics/MethodLength: Method has too many lines. [11/10]", 1038026861], - [75, 7, 1087, "Metrics/MethodLength: Method has too many lines. [17/10]", 690589617], - [75, 7, 1087, "Metrics/PerceivedComplexity: Perceived complexity for `signature` is too high. [10/8]", 690589617], - [76, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] - ], - "lib/markdown/merge/link_definition_node.rb:526538026": [ - [54, 7, 413, "Metrics/MethodLength: Method has too many lines. [11/10]", 449561622] - ], - "lib/markdown/merge/link_parser.rb:1096919687": [ - [30, 5, 12509, "Metrics/ClassLength: Class has too many lines. [179/100]", 1758727291], - [168, 7, 459, "Metrics/MethodLength: Method has too many lines. [11/10]", 518494532], - [239, 7, 945, "Metrics/AbcSize: Assignment Branch Condition size for `build_link_tree` is too high. [<12, 18, 13> 25.24/17]", 3590515429], - [239, 7, 945, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_link_tree` is too high. [10/7]", 3590515429], - [239, 7, 945, "Metrics/MethodLength: Method has too many lines. [19/10]", 3590515429], - [239, 7, 945, "Metrics/PerceivedComplexity: Perceived complexity for `build_link_tree` is too high. [10/8]", 3590515429], - [297, 7, 738, "Metrics/AbcSize: Assignment Branch Condition size for `find_constructs` is too high. [<9, 9, 15> 19.67/17]", 1944426624], - [297, 7, 738, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_constructs` is too high. [9/7]", 1944426624], - [297, 7, 738, "Metrics/MethodLength: Method has too many lines. [20/10]", 1944426624], - [297, 7, 738, "Metrics/PerceivedComplexity: Perceived complexity for `find_constructs` is too high. [10/8]", 1944426624], - [308, 31, 7, "Style/NumericPredicate: Use `idx.positive?` instead of `idx > 0`.", 1825176542], - [326, 7, 1492, "Metrics/AbcSize: Assignment Branch Condition size for `try_parse_construct_at` is too high. [<7, 26, 13> 29.9/17]", 751157862], - [326, 7, 1492, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `try_parse_construct_at` is too high. [9/7]", 751157862], - [326, 7, 1492, "Metrics/MethodLength: Method has too many lines. [32/10]", 751157862], - [326, 7, 1492, "Metrics/PerceivedComplexity: Perceived complexity for `try_parse_construct_at` is too high. [10/8]", 751157862], - [371, 7, 332, "Metrics/MethodLength: Method has too many lines. [13/10]", 766454795], - [381, 27, 10, "Style/NumericPredicate: Use `depth.zero?` instead of `depth == 0`.", 3245914040], - [389, 7, 679, "Metrics/AbcSize: Assignment Branch Condition size for `find_paren_end` is too high. [<12, 5, 12> 17.69/17]", 3435642705], - [389, 7, 679, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_paren_end` is too high. [10/7]", 3435642705], - [389, 7, 679, "Metrics/MethodLength: Method has too many lines. [24/10]", 3435642705], - [389, 7, 679, "Metrics/PerceivedComplexity: Perceived complexity for `find_paren_end` is too high. [10/8]", 3435642705], - [410, 29, 10, "Style/NumericPredicate: Use `depth.zero?` instead of `depth == 0`.", 3245914040] - ], - "lib/markdown/merge/link_reference_rehydrator.rb:2522597032": [ - [28, 5, 10014, "Metrics/ClassLength: Class has too many lines. [171/100]", 3685995823], - [89, 7, 955, "Metrics/AbcSize: Assignment Branch Condition size for `rehydrate` is too high. [<6, 21, 4> 22.2/17]", 4193701], - [89, 7, 955, "Metrics/MethodLength: Method has too many lines. [12/10]", 4193701], - [138, 7, 1280, "Metrics/MethodLength: Method has too many lines. [20/10]", 2243922075], - [138, 7, 1280, "Metrics/PerceivedComplexity: Perceived complexity for `collect_nested_replacements` is too high. [10/8]", 2243922075], - [181, 7, 1844, "Metrics/AbcSize: Assignment Branch Condition size for `process_parent_with_children` is too high. [<11, 30, 10> 33.48/17]", 1412317448], - [181, 7, 1844, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `process_parent_with_children` is too high. [9/7]", 1412317448], - [181, 7, 1844, "Metrics/MethodLength: Method has too many lines. [29/10]", 1412317448], - [181, 7, 1844, "Metrics/PerceivedComplexity: Perceived complexity for `process_parent_with_children` is too high. [9/8]", 1412317448], - [230, 7, 672, "Metrics/AbcSize: Assignment Branch Condition size for `build_definition_maps` is too high. [<18, 18, 5> 25.94/17]", 2626750147], - [230, 7, 672, "Metrics/MethodLength: Method has too many lines. [15/10]", 2626750147], - [265, 7, 594, "Metrics/MethodLength: Method has too many lines. [21/10]", 1835317302], - [292, 7, 598, "Metrics/MethodLength: Method has too many lines. [21/10]", 1975952876] - ], - "lib/markdown/merge/list_match_refiner.rb:2863813265": [ - [28, 7, 760, "Metrics/AbcSize: Assignment Branch Condition size for `compute_similarity` is too high. [<6, 20, 4> 21.26/17]", 4078625426], - [28, 7, 760, "Metrics/MethodLength: Method has too many lines. [13/10]", 4078625426] - ], - "lib/markdown/merge/list_merger.rb:1304801063": [ - [33, 5, 10963, "Metrics/ClassLength: Class has too many lines. [214/100]", 602699468], - [48, 7, 1267, "Metrics/MethodLength: Method has too many lines. [22/10]", 3289445396], - [48, 22, 295, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 992893951], - [76, 20, 23, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 1178765246], - [86, 7, 474, "Metrics/MethodLength: Method has too many lines. [14/10]", 3392803095], - [110, 7, 2384, "Metrics/AbcSize: Assignment Branch Condition size for `align_items` is too high. [<29, 55, 24> 66.65/17]", 452537823], - [110, 7, 2384, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `align_items` is too high. [22/7]", 452537823], - [110, 7, 2384, "Metrics/MethodLength: Method has too many lines. [44/10]", 452537823], - [110, 7, 2384, "Metrics/PerceivedComplexity: Perceived complexity for `align_items` is too high. [23/8]", 452537823], - [179, 7, 2546, "Metrics/AbcSize: Assignment Branch Condition size for `emit_lines` is too high. [<24, 40, 13> 48.43/17]", 2868796461], - [179, 7, 2546, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_lines` is too high. [10/7]", 2868796461], - [179, 7, 2546, "Metrics/MethodLength: Method has too many lines. [48/10]", 2868796461], - [179, 7, 2546, "Metrics/PerceivedComplexity: Perceived complexity for `emit_lines` is too high. [9/8]", 2868796461], - [179, 21, 167, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3110781545], - [186, 9, 2214, "Metrics/BlockLength: Block has too many lines. [41/25]", 27504812], - [267, 7, 1113, "Metrics/MethodLength: Method has too many lines. [21/10]", 2701858480], - [267, 32, 165, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 4189168652] - ], - "lib/markdown/merge/merge_result.rb:3204455982": [ - [35, 5, 18456, "Metrics/ClassLength: Class has too many lines. [336/100]", 549816393], - [47, 21, 99, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1708164346], - [99, 11, 18, "Naming/PredicatePrefix: Rename `has_frozen_blocks?` to `frozen_blocks?`.", 2714608976], - [174, 7, 987, "Metrics/MethodLength: Method has too many lines. [14/10]", 199512025], - [178, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 2749193064], - [197, 7, 719, "Metrics/MethodLength: Method has too many lines. [11/10]", 3478479763], - [214, 7, 3130, "Metrics/AbcSize: Assignment Branch Condition size for `apply_grouped_delegated_block!` is too high. [<37, 72, 21> 83.63/17]", 3965639779], - [214, 7, 3130, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_grouped_delegated_block!` is too high. [21/7]", 3965639779], - [214, 7, 3130, "Metrics/MethodLength: Method has too many lines. [49/10]", 3965639779], - [214, 7, 3130, "Metrics/PerceivedComplexity: Perceived complexity for `apply_grouped_delegated_block!` is too high. [21/8]", 3965639779], - [218, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 2758428109], - [227, 9, 22, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 3561198282], - [232, 9, 22, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 3561198282], - [237, 9, 22, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 3561198282], - [267, 7, 956, "Metrics/AbcSize: Assignment Branch Condition size for `apply_output_range_resolutions_descending!` is too high. [<8, 26, 8> 28.35/17]", 410698269], - [267, 7, 956, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_output_range_resolutions_descending!` is too high. [8/7]", 410698269], - [267, 7, 956, "Metrics/MethodLength: Method has too many lines. [13/10]", 410698269], - [269, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1650842885], - [304, 7, 1607, "Metrics/AbcSize: Assignment Branch Condition size for `remap_delegated_cases_after_apply` is too high. [<5, 20, 1> 20.64/17]", 2805002106], - [304, 7, 1607, "Metrics/MethodLength: Method has too many lines. [25/10]", 2805002106], - [304, 44, 174, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2563452319], - [352, 7, 664, "Metrics/MethodLength: Method has too many lines. [13/10]", 2283269648], - [402, 7, 605, "Metrics/MethodLength: Method has too many lines. [12/10]", 219211686], - [418, 7, 622, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `sanitize_review_state_metadata` is too high. [8/7]", 656017698], - [418, 7, 622, "Metrics/MethodLength: Method has too many lines. [16/10]", 656017698], - [439, 7, 1110, "Metrics/AbcSize: Assignment Branch Condition size for `validate_review_state_compatibility!` is too high. [<7, 18, 13> 23.28/17]", 3899925007], - [439, 7, 1110, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_review_state_compatibility!` is too high. [11/7]", 3899925007], - [439, 7, 1110, "Metrics/MethodLength: Method has too many lines. [18/10]", 3899925007], - [439, 7, 1110, "Metrics/PerceivedComplexity: Perceived complexity for `validate_review_state_compatibility!` is too high. [11/8]", 3899925007], - [453, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 2530059826], - [460, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861331] - ], - "lib/markdown/merge/output_builder.rb:48145848": [ - [23, 5, 8640, "Metrics/ClassLength: Class has too many lines. [115/100]", 1155429967], - [47, 7, 2071, "Metrics/AbcSize: Assignment Branch Condition size for `add_node_source` is too high. [<6, 15, 12> 20.12/17]", 555854176], - [47, 7, 2071, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `add_node_source` is too high. [12/7]", 555854176], - [47, 7, 2071, "Metrics/MethodLength: Method has too many lines. [15/10]", 555854176], - [47, 7, 2071, "Metrics/PerceivedComplexity: Perceived complexity for `add_node_source` is too high. [12/8]", 555854176], - [60, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 527167630], - [61, 121, 67, "Layout/LineLength: Line is too long. [187/120]", 2893319489], - [62, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 2876999963], - [63, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 4139918410], - [92, 38, 9, "Style/NumericPredicate: Use `count.positive?` instead of `count > 0`.", 3986027816], - [122, 7, 370, "Metrics/MethodLength: Method has too many lines. [11/10]", 616591631], - [224, 7, 878, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_parser_node_source` is too high. [10/7]", 227721314], - [224, 7, 878, "Metrics/MethodLength: Method has too many lines. [13/10]", 227721314], - [224, 7, 878, "Metrics/PerceivedComplexity: Perceived complexity for `extract_parser_node_source` is too high. [11/8]", 227721314] - ], - "lib/markdown/merge/partial_template_merger.rb:3110525012": [ - [32, 5, 20691, "Metrics/ClassLength: Class has too many lines. [336/100]", 496419120], - [71, 7, 1040, "Metrics/MethodLength: Method has too many lines. [17/10]", 2144648319], - [71, 21, 417, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 1226086326], - [109, 7, 1065, "Metrics/AbcSize: Assignment Branch Condition size for `merge` is too high. [<7, 19, 6> 21.12/17]", 3976180000], - [109, 7, 1065, "Metrics/MethodLength: Method has too many lines. [25/10]", 3976180000], - [145, 7, 912, "Metrics/MethodLength: Method has too many lines. [15/10]", 2077585004], - [265, 7, 1401, "Metrics/AbcSize: Assignment Branch Condition size for `find_section_end` is too high. [<8, 28, 11> 31.13/17]", 1420600674], - [265, 7, 1401, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_section_end` is too high. [10/7]", 1420600674], - [265, 7, 1401, "Metrics/MethodLength: Method has too many lines. [20/10]", 1420600674], - [265, 7, 1401, "Metrics/PerceivedComplexity: Perceived complexity for `find_section_end` is too high. [10/8]", 1420600674], - [311, 7, 1101, "Metrics/AbcSize: Assignment Branch Condition size for `node_to_source` is too high. [<6, 15, 15> 22.05/17]", 3635207151], - [311, 7, 1101, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `node_to_source` is too high. [13/7]", 3635207151], - [311, 7, 1101, "Metrics/MethodLength: Method has too many lines. [20/10]", 3635207151], - [311, 7, 1101, "Metrics/PerceivedComplexity: Perceived complexity for `node_to_source` is too high. [14/8]", 3635207151], - [318, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [323, 42, 14, "Style/NumericPredicate: Use `start_line.positive?` instead of `start_line > 0`.", 792111162], - [345, 7, 643, "Metrics/MethodLength: Method has too many lines. [17/10]", 998852567], - [364, 34, 10, "Style/NumericPredicate: Use `value.zero?` instead of `value == 0`.", 4076387742], - [367, 7, 2760, "Metrics/AbcSize: Assignment Branch Condition size for `preserved_destination_insertions` is too high. [<19, 28, 14> 36.62/17]", 414221184], - [367, 7, 2760, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preserved_destination_insertions` is too high. [13/7]", 414221184], - [367, 7, 2760, "Metrics/MethodLength: Method has too many lines. [49/10]", 414221184], - [367, 7, 2760, "Metrics/PerceivedComplexity: Perceived complexity for `preserved_destination_insertions` is too high. [15/8]", 414221184], - [381, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 682972477], - [426, 7, 1058, "Metrics/MethodLength: Method has too many lines. [16/10]", 932075153], - [475, 7, 1040, "Metrics/AbcSize: Assignment Branch Condition size for `render_template_with_preserved_insertions` is too high. [<10, 18, 10> 22.89/17]", 1699694974], - [475, 7, 1040, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `render_template_with_preserved_insertions` is too high. [9/7]", 1699694974], - [475, 7, 1040, "Metrics/MethodLength: Method has too many lines. [21/10]", 1699694974], - [475, 7, 1040, "Metrics/PerceivedComplexity: Perceived complexity for `render_template_with_preserved_insertions` is too high. [9/8]", 1699694974], - [504, 7, 454, "Metrics/MethodLength: Method has too many lines. [12/10]", 3433907112] - ], - "lib/markdown/merge/preservation_support.rb:3687269889": [ - [13, 5, 10105, "Metrics/ModuleLength: Module has too many lines. [212/100]", 674454], - [24, 7, 572, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `standalone_comment_node?` is too high. [9/7]", 349869031], - [24, 7, 572, "Metrics/PerceivedComplexity: Perceived complexity for `standalone_comment_node?` is too high. [9/8]", 349869031], - [116, 7, 655, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `remove_plan_preserved_comment_regions` is too high. [8/7]", 2103873816], - [116, 7, 655, "Metrics/MethodLength: Method has too many lines. [12/10]", 2103873816], - [178, 7, 1301, "Metrics/AbcSize: Assignment Branch Condition size for `remove_plan_comment_insertion_specs` is too high. [<5, 22, 8> 23.94/17]", 698043371], - [178, 7, 1301, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `remove_plan_comment_insertion_specs` is too high. [9/7]", 698043371], - [178, 7, 1301, "Metrics/MethodLength: Method has too many lines. [22/10]", 698043371], - [178, 7, 1301, "Metrics/PerceivedComplexity: Perceived complexity for `remove_plan_comment_insertion_specs` is too high. [9/8]", 698043371], - [193, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045570401], - [217, 7, 737, "Metrics/MethodLength: Method has too many lines. [13/10]", 3882071587], - [248, 28, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [271, 7, 704, "Metrics/MethodLength: Method has too many lines. [13/10]", 2605835865], - [271, 52, 139, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1766111143] - ], - "lib/markdown/merge/smart_merger.rb:1245982439": [ - [151, 7, 1405, "Metrics/MethodLength: Method has too many lines. [19/10]", 2830703815], - [151, 21, 501, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [13/5]", 1104874368], - [229, 7, 1140, "Metrics/AbcSize: Assignment Branch Condition size for `node_to_source` is too high. [<5, 15, 9> 18.19/17]", 1515173572], - [229, 7, 1140, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `node_to_source` is too high. [9/7]", 1515173572], - [229, 7, 1140, "Metrics/MethodLength: Method has too many lines. [13/10]", 1515173572], - [229, 7, 1140, "Metrics/PerceivedComplexity: Perceived complexity for `node_to_source` is too high. [10/8]", 1515173572] - ], - "lib/markdown/merge/smart_merger_base.rb:950545235": [ - [43, 5, 59104, "Metrics/ClassLength: Class has too many lines. [984/100]", 1046238359], - [148, 7, 3731, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<20, 19, 10> 29.34/17]", 50319656], - [148, 7, 3731, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `initialize` is too high. [11/7]", 50319656], - [148, 7, 3731, "Metrics/MethodLength: Method has too many lines. [66/10]", 50319656], - [148, 7, 3731, "Metrics/PerceivedComplexity: Perceived complexity for `initialize` is too high. [9/8]", 50319656], - [148, 21, 606, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [17/5]", 4006929896], - [294, 7, 1760, "Metrics/AbcSize: Assignment Branch Condition size for `merge_result` is too high. [<15, 19, 7> 25.2/17]", 3628731818], - [294, 7, 1760, "Metrics/MethodLength: Method has too many lines. [31/10]", 3628731818], - [297, 25, 1662, "Metrics/BlockLength: Block has too many lines. [28/25]", 1167387512], - [343, 7, 1195, "Metrics/AbcSize: Assignment Branch Condition size for `merge_with_debug` is too high. [<3, 20, 17> 26.42/17]", 1763663260], - [343, 7, 1195, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_with_debug` is too high. [18/7]", 1763663260], - [343, 7, 1195, "Metrics/MethodLength: Method has too many lines. [27/10]", 1763663260], - [343, 7, 1195, "Metrics/PerceivedComplexity: Perceived complexity for `merge_with_debug` is too high. [18/8]", 1763663260], - [383, 7, 1862, "Metrics/AbcSize: Assignment Branch Condition size for `prepare_runtime_session!` is too high. [<4, 24, 1> 24.35/17]", 546014873], - [383, 7, 1862, "Metrics/MethodLength: Method has too many lines. [45/10]", 546014873], - [432, 7, 1064, "Metrics/MethodLength: Method has too many lines. [21/10]", 214902707], - [490, 7, 438, "Metrics/MethodLength: Method has too many lines. [11/10]", 1759076310], - [505, 31, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [529, 7, 788, "Metrics/MethodLength: Method has too many lines. [13/10]", 690316762], - [553, 7, 1538, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_cross_source_preamble_prefixes` is too high. [<9, 18, 6> 21/17]", 1970988374], - [553, 7, 1538, "Metrics/MethodLength: Method has too many lines. [25/10]", 1970988374], - [586, 7, 644, "Metrics/AbcSize: Assignment Branch Condition size for `leading_standalone_comment_run` is too high. [<8, 14, 7> 17.58/17]", 4188914818], - [586, 7, 644, "Metrics/MethodLength: Method has too many lines. [17/10]", 4188914818], - [614, 7, 1576, "Metrics/AbcSize: Assignment Branch Condition size for `process_alignment` is too high. [<15, 14, 10> 22.83/17]", 3967135783], - [614, 7, 1576, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `process_alignment` is too high. [11/7]", 3967135783], - [614, 7, 1576, "Metrics/MethodLength: Method has too many lines. [31/10]", 3967135783], - [614, 7, 1576, "Metrics/PerceivedComplexity: Perceived complexity for `process_alignment` is too high. [9/8]", 3967135783], - [656, 7, 2871, "Metrics/AbcSize: Assignment Branch Condition size for `process_match_to_builder` is too high. [<17, 39, 19> 46.59/17]", 608053079], - [656, 7, 2871, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `process_match_to_builder` is too high. [19/7]", 608053079], - [656, 7, 2871, "Metrics/MethodLength: Method has too many lines. [50/10]", 608053079], - [656, 7, 2871, "Metrics/PerceivedComplexity: Perceived complexity for `process_match_to_builder` is too high. [18/8]", 608053079], - [720, 7, 867, "Metrics/MethodLength: Method has too many lines. [18/10]", 2946023513], - [764, 7, 670, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `consumed_link_definitions_within` is too high. [8/7]", 2596009659], - [764, 7, 670, "Metrics/MethodLength: Method has too many lines. [11/10]", 2596009659], - [774, 9, 8, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 359839059], - [782, 45, 50, "Style/ClassEqualityComparison: Use `instance_of?(::RSpec::Mocks::MockExpectationError)` instead of comparing classes.", 952914844], - [797, 7, 939, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_node_typing` is too high. [8/7]", 2526108526], - [797, 7, 939, "Metrics/MethodLength: Method has too many lines. [14/10]", 2526108526], - [849, 7, 1297, "Metrics/AbcSize: Assignment Branch Condition size for `try_inner_merge_list_to_builder` is too high. [<8, 20, 8> 22.98/17]", 2844551967], - [849, 7, 1297, "Metrics/MethodLength: Method has too many lines. [25/10]", 2844551967], - [849, 42, 71, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3479074024], - [885, 7, 1361, "Metrics/AbcSize: Assignment Branch Condition size for `try_inner_merge_code_block_to_builder` is too high. [<7, 19, 6> 21.12/17]", 2468334280], - [885, 7, 1361, "Metrics/MethodLength: Method has too many lines. [29/10]", 2468334280], - [885, 48, 71, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3479074024], - [918, 7, 1923, "Metrics/AbcSize: Assignment Branch Condition size for `remap_delegated_unresolved_cases` is too high. [<8, 23, 5> 24.86/17]", 2261924082], - [918, 7, 1923, "Metrics/MethodLength: Method has too many lines. [35/10]", 2261924082], - [922, 9, 1535, "Metrics/BlockLength: Block has too many lines. [31/25]", 838301956], - [983, 7, 657, "Metrics/MethodLength: Method has too many lines. [15/10]", 4047906352], - [1027, 7, 411, "Metrics/MethodLength: Method has too many lines. [13/10]", 4206078535], - [1053, 7, 3160, "Metrics/AbcSize: Assignment Branch Condition size for `process_dest_only_to_builder` is too high. [<14, 41, 24> 49.53/17]", 1311626075], - [1053, 7, 3160, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `process_dest_only_to_builder` is too high. [25/7]", 1311626075], - [1053, 7, 3160, "Metrics/MethodLength: Method has too many lines. [51/10]", 1311626075], - [1053, 7, 3160, "Metrics/PerceivedComplexity: Perceived complexity for `process_dest_only_to_builder` is too high. [25/8]", 1311626075], - [1053, 39, 177, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2740785193], - [1167, 7, 395, "Metrics/MethodLength: Method has too many lines. [11/10]", 433430016], - [1204, 7, 465, "Metrics/MethodLength: Method has too many lines. [12/10]", 1101864061], - [1261, 7, 861, "Metrics/MethodLength: Method has too many lines. [16/10]", 2380789170], - [1314, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193431734], - [1317, 7, 1039, "Metrics/AbcSize: Assignment Branch Condition size for `kept_node_for_link_ownership` is too high. [<4, 17, 9> 19.65/17]", 849664480], - [1317, 7, 1039, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `kept_node_for_link_ownership` is too high. [8/7]", 849664480], - [1317, 7, 1039, "Metrics/MethodLength: Method has too many lines. [24/10]", 849664480], - [1348, 7, 797, "Metrics/MethodLength: Method has too many lines. [12/10]", 3928797316], - [1384, 7, 610, "Metrics/AbcSize: Assignment Branch Condition size for `link_reference_signatures_within` is too high. [<6, 15, 6> 17.23/17]", 2255263809], - [1390, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177625], - [1457, 7, 1360, "Metrics/MethodLength: Method has too many lines. [19/10]", 1607654950] - ], - "lib/markdown/merge/table_match_algorithm.rb:784102633": [ - [31, 5, 17084, "Metrics/ClassLength: Class has too many lines. [241/100]", 3870100216], - [71, 21, 130, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2234186342], - [86, 7, 537, "Metrics/MethodLength: Method has too many lines. [11/10]", 695685542], - [112, 7, 872, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<13, 29, 8> 32.77/17]", 3623880915], - [112, 7, 872, "Metrics/MethodLength: Method has too many lines. [20/10]", 3623880915], - [264, 7, 1291, "Metrics/AbcSize: Assignment Branch Condition size for `collect_text_recursive` is too high. [<5, 22, 13> 26.04/17]", 1898702827], - [264, 7, 1291, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_text_recursive` is too high. [12/7]", 1898702827], - [264, 7, 1291, "Metrics/MethodLength: Method has too many lines. [26/10]", 1898702827], - [264, 7, 1291, "Metrics/PerceivedComplexity: Perceived complexity for `collect_text_recursive` is too high. [15/8]", 1898702827], - [292, 24, 43, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 2747201274], - [303, 7, 644, "Metrics/AbcSize: Assignment Branch Condition size for `compute_header_match` is too high. [<6, 20, 9> 22.74/17]", 2910662900], - [303, 7, 644, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_header_match` is too high. [10/7]", 2910662900], - [303, 7, 644, "Metrics/MethodLength: Method has too many lines. [11/10]", 2910662900], - [303, 7, 644, "Metrics/PerceivedComplexity: Perceived complexity for `compute_header_match` is too high. [10/8]", 2910662900], - [330, 7, 927, "Metrics/AbcSize: Assignment Branch Condition size for `compute_first_column_match` is too high. [<14, 22, 14> 29.6/17]", 2043865784], - [330, 7, 927, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_first_column_match` is too high. [14/7]", 2043865784], - [330, 7, 927, "Metrics/MethodLength: Method has too many lines. [15/10]", 2043865784], - [330, 7, 927, "Metrics/PerceivedComplexity: Perceived complexity for `compute_first_column_match` is too high. [14/8]", 2043865784], - [331, 28, 19, "Style/SymbolProc: Pass `&:first` as an argument to `map` instead of a block.", 2561207191], - [332, 28, 19, "Style/SymbolProc: Pass `&:first` as an argument to `map` instead of a block.", 2561207191], - [352, 9, 15, "Style/NumericPredicate: Use `total_cells.positive?` instead of `total_cells > 0`.", 1010733923], - [362, 7, 1037, "Metrics/AbcSize: Assignment Branch Condition size for `compute_row_content_match` is too high. [<10, 15, 12> 21.66/17]", 1855353124], - [362, 7, 1037, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_row_content_match` is too high. [11/7]", 1855353124], - [362, 7, 1037, "Metrics/MethodLength: Method has too many lines. [21/10]", 1855353124], - [362, 7, 1037, "Metrics/PerceivedComplexity: Perceived complexity for `compute_row_content_match` is too high. [11/8]", 1855353124], - [404, 23, 14, "Style/NumericPredicate: Use `max_cells.zero?` instead of `max_cells == 0`.", 2427124139], - [423, 7, 1091, "Metrics/AbcSize: Assignment Branch Condition size for `compute_total_cells_match` is too high. [<14, 18, 12> 25.77/17]", 413080451], - [423, 7, 1091, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_total_cells_match` is too high. [11/7]", 413080451], - [423, 7, 1091, "Metrics/MethodLength: Method has too many lines. [24/10]", 413080451], - [423, 7, 1091, "Metrics/PerceivedComplexity: Perceived complexity for `compute_total_cells_match` is too high. [11/8]", 413080451], - [492, 23, 17, "Style/NumericPredicate: Use `total_weight.zero?` instead of `total_weight == 0`.", 3158357864] - ], - "lib/markdown/merge/table_match_refiner.rb:4203940079": [ - [118, 35, 50, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1492696344] - ], - "lib/markdown/merge/whitespace_normalizer.rb:121777318": [ - [33, 5, 6779, "Metrics/ClassLength: Class has too many lines. [115/100]", 3048764740], - [103, 7, 418, "Metrics/MethodLength: Method has too many lines. [11/10]", 3165373284], - [126, 7, 1750, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_excessive_blank_lines` is too high. [<12, 12, 10> 19.7/17]", 1435694128], - [126, 7, 1750, "Metrics/MethodLength: Method has too many lines. [36/10]", 1435694128], - [188, 7, 1270, "Metrics/AbcSize: Assignment Branch Condition size for `remove_blank_lines_between_link_refs` is too high. [<12, 22, 13> 28.23/17]", 1324661552], - [188, 7, 1270, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `remove_blank_lines_between_link_refs` is too high. [9/7]", 1324661552], - [188, 7, 1270, "Metrics/MethodLength: Method has too many lines. [29/10]", 1324661552], - [188, 7, 1270, "Metrics/PerceivedComplexity: Perceived complexity for `remove_blank_lines_between_link_refs` is too high. [10/8]", 1324661552], - [207, 15, 54, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 831575245] - ], - "lib/markdown/merge/wrapper_support.rb:1758973456": [ - [6, 5, 7266, "Metrics/ModuleLength: Module has too many lines. [161/100]", 2849920033], - [29, 7, 1214, "Metrics/MethodLength: Method has too many lines. [19/10]", 1280688859], - [29, 19, 250, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 4150728370], - [78, 7, 1452, "Metrics/MethodLength: Method has too many lines. [18/10]", 3670315588], - [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:3964894686": [ - [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ], - "spec/fixtures_integration_spec.rb:1958067822": [ - [3, 1, 15884, "Metrics/BlockLength: Block has too many lines. [383/25]", 1004800925] - ] -} diff --git a/gems/markdown-merge/Gemfile b/gems/markdown-merge/Gemfile index d0a8c1e61..deb8ee463 100644 --- a/gems/markdown-merge/Gemfile +++ b/gems/markdown-merge/Gemfile @@ -312,6 +312,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/markdown-merge/Gemfile.lock b/gems/markdown-merge/Gemfile.lock index 3e631c3cf..37fccb45c 100644 --- a/gems/markdown-merge/Gemfile.lock +++ b/gems/markdown-merge/Gemfile.lock @@ -265,6 +265,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -305,7 +321,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -360,18 +375,7 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -535,22 +539,18 @@ GEM silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -656,9 +656,9 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) + kettle-drift! kettle-jem! - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! @@ -736,7 +736,6 @@ CHECKSUMS delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 @@ -757,10 +756,10 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa kramdown-merge (7.1.0) @@ -835,13 +834,11 @@ CHECKSUMS rust-merge (7.1.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 diff --git a/gems/markly-merge/.kettle-drift.lock b/gems/markly-merge/.kettle-drift.lock index 5b373dd8d..309d406e1 100644 --- a/gems/markly-merge/.kettle-drift.lock +++ b/gems/markly-merge/.kettle-drift.lock @@ -8,7 +8,8 @@ 159, 199, 239, - 279 + 279, + 319 ] } ], @@ -21,7 +22,8 @@ 170, 210, 250, - 290 + 290, + 330 ] } ], @@ -34,7 +36,8 @@ 160, 200, 240, - 280 + 280, + 320 ] } ], @@ -47,7 +50,8 @@ 172, 212, 252, - 292 + 292, + 332 ] } ], @@ -60,7 +64,8 @@ 175, 215, 255, - 295 + 295, + 335 ] } ], @@ -73,7 +78,8 @@ 161, 201, 241, - 281 + 281, + 321 ] } ], @@ -87,7 +93,8 @@ 179, 219, 259, - 299 + 299, + 339 ] } ], @@ -100,7 +107,8 @@ 180, 220, 260, - 300 + 300, + 340 ] } ], @@ -114,7 +122,8 @@ 166, 206, 246, - 286 + 286, + 326 ] } ], @@ -127,7 +136,8 @@ 189, 229, 269, - 309 + 309, + 349 ] } ], @@ -141,7 +151,8 @@ 158, 198, 238, - 278 + 278, + 318 ] } ], @@ -155,7 +166,8 @@ 188, 228, 268, - 308 + 308, + 348 ] } ], @@ -168,7 +180,8 @@ 164, 204, 244, - 284 + 284, + 324 ] } ], @@ -182,7 +195,8 @@ 171, 211, 251, - 291 + 291, + 331 ] } ], @@ -196,7 +210,8 @@ 167, 207, 247, - 287 + 287, + 327 ] } ], @@ -209,7 +224,8 @@ 165, 205, 245, - 285 + 285, + 325 ] } ], @@ -222,7 +238,8 @@ 182, 222, 262, - 302 + 302, + 342 ] } ], @@ -235,7 +252,8 @@ 181, 221, 261, - 301 + 301, + 341 ] } ], @@ -248,7 +266,8 @@ 176, 216, 256, - 296 + 296, + 336 ] } ], @@ -261,7 +280,8 @@ 185, 225, 265, - 305 + 305, + 345 ] } ], diff --git a/gems/markly-merge/.rubocop_gradual.lock b/gems/markly-merge/.rubocop_gradual.lock deleted file mode 100644 index 7b6a96fee..000000000 --- a/gems/markly-merge/.rubocop_gradual.lock +++ /dev/null @@ -1,126 +0,0 @@ -{ - ".simplecov:3376604078": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:1376789005": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/markly-merge.rb:2425755333": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`markly-merge.rb`) should use snake_case.", 5381] - ], - "lib/markly/merge.rb:2367262886": [ - [10, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Markly::Merge`.", 2866359175], - [10, 3, 22686, "Metrics/ModuleLength: Module has too many lines. [484/100]", 3039251951], - [11, 5, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631], - [56, 5, 1957, "Metrics/MethodLength: Method has too many lines. [42/10]", 2638032592], - [101, 5, 1815, "Metrics/MethodLength: Method has too many lines. [37/10]", 421864374], - [141, 5, 1063, "Metrics/MethodLength: Method has too many lines. [23/10]", 598358845], - [179, 5, 523, "Metrics/MethodLength: Method has too many lines. [11/10]", 3598278634], - [193, 5, 1855, "Metrics/MethodLength: Method has too many lines. [37/10]", 2215035372], - [194, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2184804663], - [233, 5, 7461, "Metrics/AbcSize: Assignment Branch Condition size for `markdown_structured_edit_batch_report_projection` is too high. [<1, 30, 0> 30.02/17]", 958979462], - [233, 5, 7461, "Metrics/MethodLength: Method has too many lines. [139/10]", 958979462], - [234, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2184804663], - [253, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 4247938618], - [291, 121, 69, "Layout/LineLength: Line is too long. [189/120]", 713082266], - [375, 5, 928, "Metrics/MethodLength: Method has too many lines. [24/10]", 2523239963], - [416, 5, 613, "Metrics/MethodLength: Method has too many lines. [11/10]", 2967276583], - [416, 52, 144, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3050457682] - ], - "lib/markly/merge/backend.rb:1783442402": [ - [115, 9, 517, "Metrics/MethodLength: Method has too many lines. [14/10]", 66093445], - [207, 9, 453, "Metrics/AbcSize: Assignment Branch Condition size for `text` is too high. [<1, 16, 7> 17.49/17]", 2420537429], - [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:1833318890": [ - [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ], - "spec/fixtures_integration_spec.rb:2168126107": [ - [3, 1, 14870, "Metrics/BlockLength: Block has too many lines. [337/25]", 605418848], - [16, 3, 1325, "Metrics/BlockLength: Block has too many lines. [28/25]", 928093310], - [224, 3, 1341, "Metrics/BlockLength: Block has too many lines. [26/25]", 2630958569], - [307, 3, 1352, "Metrics/BlockLength: Block has too many lines. [30/25]", 2376182886], - [342, 3, 1378, "Metrics/BlockLength: Block has too many lines. [29/25]", 3678391303] - ], - "spec/markly/merge/partial_template_merger_integration_spec.rb:2767758749": [ - [5, 1, 4127, "Metrics/BlockLength: Block has too many lines. [107/25]", 2704075138], - [25, 3, 1109, "Metrics/BlockLength: Block has too many lines. [30/25]", 2339832693], - [84, 3, 1236, "Metrics/BlockLength: Block has too many lines. [30/25]", 503179966], - [84, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 567791365] - ], - "spec/reproducible_merge_spec.rb:1557187402": [ - [6, 1, 1458, "Metrics/BlockLength: Block has too many lines. [35/25]", 100797552] - ] -} diff --git a/gems/markly-merge/Gemfile b/gems/markly-merge/Gemfile index 591b5ca72..285849f50 100644 --- a/gems/markly-merge/Gemfile +++ b/gems/markly-merge/Gemfile @@ -311,6 +311,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/markly-merge/Gemfile.lock b/gems/markly-merge/Gemfile.lock index b51d50fa5..3d1e25b8d 100644 --- a/gems/markly-merge/Gemfile.lock +++ b/gems/markly-merge/Gemfile.lock @@ -1,13 +1,3 @@ -GIT - remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a - branch: fix/ruby-parser-api-methods - glob: packages/ruby/*.gemspec - specs: - tree_sitter_language_pack (1.12.5) - rb_sys (>= 0.9, < 0.9.128) - sorbet-runtime (~> 0.5) - PATH remote: . specs: @@ -16,6 +6,288 @@ PATH markly (~> 0.9) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby + specs: + tree_sitter_language_pack (1.12.5) + rb_sys (>= 0.9, < 0.9.128) + sorbet-runtime (~> 0.5) + GEM remote: https://gem.coop/ specs: @@ -27,11 +299,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +307,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -48,7 +321,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -104,15 +376,6 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -131,10 +394,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) @@ -275,25 +534,23 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -327,11 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -378,23 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-drift! + kettle-jem! + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -403,38 +682,61 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -447,15 +749,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 @@ -477,10 +784,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -488,6 +799,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -515,17 +827,19 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -539,14 +853,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -554,6 +873,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/markly-merge/lib/markly/merge/version.rb b/gems/markly-merge/lib/markly/merge/version.rb index 3bfd8e9b0..b4ff2ffeb 100644 --- a/gems/markly-merge/lib/markly/merge/version.rb +++ b/gems/markly-merge/lib/markly/merge/version.rb @@ -3,7 +3,7 @@ module Markly module Merge module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/parslet-toml-merge/Gemfile.lock b/gems/parslet-toml-merge/Gemfile.lock index 7bfa19abd..8433bd8b5 100644 --- a/gems/parslet-toml-merge/Gemfile.lock +++ b/gems/parslet-toml-merge/Gemfile.lock @@ -16,265 +16,6 @@ PATH toml-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +40,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +103,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +131,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +270,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -589,9 +324,15 @@ GEM version_gem (~> 1.1, >= 1.1.13) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +379,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +404,31 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +436,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +448,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -789,13 +476,10 @@ CHECKSUMS parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 parslet-toml-merge (7.1.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +487,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +514,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +525,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -861,17 +540,14 @@ CHECKSUMS token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +555,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/prism-merge/Gemfile.lock b/gems/prism-merge/Gemfile.lock index d7414de22..cbe976c4c 100644 --- a/gems/prism-merge/Gemfile.lock +++ b/gems/prism-merge/Gemfile.lock @@ -16,265 +16,6 @@ PATH ruby-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +40,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +103,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +131,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -530,11 +267,13 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +326,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +377,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +402,31 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +434,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +446,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +473,11 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +485,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -835,8 +516,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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +524,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +537,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +552,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/psych-merge/Gemfile.lock b/gems/psych-merge/Gemfile.lock index 7821b07c4..86f6dc934 100644 --- a/gems/psych-merge/Gemfile.lock +++ b/gems/psych-merge/Gemfile.lock @@ -17,264 +17,6 @@ PATH version_gem (~> 1.1, >= 1.1.9) yaml-merge (= 7.1.0) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +28,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +41,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +104,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +132,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +271,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +323,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -606,6 +342,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.13) + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) yard (0.9.45) yard-fence (0.9.6) rdoc (>= 6.11, < 8) @@ -638,45 +378,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +403,31 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +435,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +447,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,12 +474,9 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 @@ -803,7 +486,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +513,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +524,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,14 +537,10 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -879,7 +553,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/rbs-merge/Gemfile.lock b/gems/rbs-merge/Gemfile.lock index 9b37f4b6c..927e7294a 100644 --- a/gems/rbs-merge/Gemfile.lock +++ b/gems/rbs-merge/Gemfile.lock @@ -17,264 +17,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +28,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,11 +41,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -362,8 +104,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -392,7 +132,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -530,8 +269,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -584,11 +321,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -635,42 +372,20 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.2, >= 3.2.0) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.3, >= 2.3.7) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) rbs-merge! @@ -682,54 +397,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.2, >= 3.2.0) - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -737,7 +430,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -750,27 +442,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -784,14 +468,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -827,12 +507,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -841,7 +518,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -855,19 +531,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -875,7 +546,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ruby-merge/Gemfile.lock b/gems/ruby-merge/Gemfile.lock index d7aa907b8..06cd06678 100644 --- a/gems/ruby-merge/Gemfile.lock +++ b/gems/ruby-merge/Gemfile.lock @@ -16,265 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +40,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +103,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +131,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +270,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +322,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +373,22 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -687,52 +399,30 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0.0) ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +430,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +442,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +469,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +480,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -835,8 +511,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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +519,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +532,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +547,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/rust-merge/Gemfile.lock b/gems/rust-merge/Gemfile.lock index 38105ec32..161d64f62 100644 --- a/gems/rust-merge/Gemfile.lock +++ b/gems/rust-merge/Gemfile.lock @@ -16,265 +16,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -286,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -294,12 +40,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +103,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +131,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +270,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -587,11 +322,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +373,22 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,54 +397,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +430,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +442,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +469,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +480,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +507,10 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +519,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -859,19 +532,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -879,7 +547,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/tree_haver/Gemfile.lock b/gems/tree_haver/Gemfile.lock index 3fc8fdf81..d36806ac5 100644 --- a/gems/tree_haver/Gemfile.lock +++ b/gems/tree_haver/Gemfile.lock @@ -51,9 +51,6 @@ GEM toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.9) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) commonmarker (2.9.0-x86_64-linux) commonmarker (2.9.0-x86_64-linux-musl) commonmarker-merge (7.1.0) @@ -200,12 +197,6 @@ GEM markly (~> 0.9) version_gem (~> 1.1, >= 1.1.9) mutex_m (0.3.0) - nokogiri (1.19.4-aarch64-linux-gnu) - racc (~> 1.4) - nokogiri (1.19.4-aarch64-linux-musl) - racc (~> 1.4) - nokogiri (1.19.4-arm64-darwin) - racc (~> 1.4) nokogiri (1.19.4-x86_64-linux-gnu) racc (~> 1.4) nokogiri (1.19.4-x86_64-linux-musl) @@ -414,10 +405,6 @@ GEM toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.9.0.pre.rc.40-aarch64-linux) - sorbet-runtime (~> 0.5) - tree_sitter_language_pack (1.9.0.pre.rc.40-arm64-darwin) - sorbet-runtime (~> 0.5) tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) sorbet-runtime (~> 0.5) tsort (0.2.0) @@ -459,10 +446,6 @@ GEM zlib (3.2.3) PLATFORMS - aarch64-linux - aarch64-linux-gnu - aarch64-linux-musl - arm64-darwin x86_64-linux x86_64-linux-gnu x86_64-linux-musl @@ -528,9 +511,6 @@ CHECKSUMS citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e commonmarker-merge (7.1.0) @@ -575,9 +555,6 @@ CHECKSUMS markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 - 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 nokogiri (1.19.4-x86_64-linux-gnu) sha256=379fae440b28915e3f19d752ce2dcf8465ed2b2fbefd2a7ca0dd497bc981a06a nokogiri (1.19.4-x86_64-linux-musl) sha256=17dfb7c1fa194ae02fbf7c51a7afc8d278045ab3fdacfd86f91d02d7b274470b nomono (1.0.8) sha256=bf4b9b426cbf216ab17b70db474f691b8ae1f1e29de8db4b0ecd405e6e7e1c80 @@ -656,9 +633,7 @@ CHECKSUMS toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) - tree_sitter_language_pack (1.9.0.pre.rc.40-aarch64-linux) sha256=c882f4039a1a84a8ed782ef5381a8556acdb53538055d0b9b30d0cd85a0f1b0a - tree_sitter_language_pack (1.9.0.pre.rc.40-arm64-darwin) sha256=b3dc68837a1a626afcbe1abb779cd987e9828a43c78e98cc70aa7e58957f3ef8 - tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) sha256=ad6743a373eeac954c1b659b17af3aff1c82918b3ce9c9dc572a7c70ff843cdd + tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 diff --git a/gems/zip-merge/Gemfile.lock b/gems/zip-merge/Gemfile.lock index 7eff2c3ec..fe1ac1d76 100644 --- a/gems/zip-merge/Gemfile.lock +++ b/gems/zip-merge/Gemfile.lock @@ -15,266 +15,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - GEM remote: https://gem.coop/ specs: @@ -294,12 +34,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -363,8 +97,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -393,7 +125,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -533,8 +264,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -584,14 +313,11 @@ GEM delegate (~> 0.1) rspec (~> 3.0) timecop (>= 0.7, < 1) - token-resolver (2.0.4) + tree_haver (7.1.0) + citrus (~> 3.0) parslet (~> 2.0) - version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -638,45 +364,22 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -685,19 +388,12 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) @@ -711,28 +407,12 @@ CHECKSUMS ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) - ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -740,7 +420,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -753,27 +432,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -788,14 +459,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -803,7 +470,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -831,12 +497,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -845,7 +508,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -858,20 +520,14 @@ CHECKSUMS thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73 timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 - token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd From 71ff8981f67552691efe7c66bb5df3bb27d073fb Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:36:14 -0600 Subject: [PATCH 251/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/markdown-merge/.rubocop_gradual.lock | 608 ++++++++++++++++++ gems/markdown-merge/Gemfile.lock | 378 +---------- gems/markly-merge/.rubocop_gradual.lock | 126 ++++ gems/markly-merge/lib/markly/merge/version.rb | 2 +- 4 files changed, 764 insertions(+), 350 deletions(-) create mode 100644 gems/markdown-merge/.rubocop_gradual.lock create mode 100644 gems/markly-merge/.rubocop_gradual.lock diff --git a/gems/markdown-merge/.rubocop_gradual.lock b/gems/markdown-merge/.rubocop_gradual.lock new file mode 100644 index 000000000..4f8201218 --- /dev/null +++ b/gems/markdown-merge/.rubocop_gradual.lock @@ -0,0 +1,608 @@ +{ + ".simplecov:862493710": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:1018150957": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/markdown-merge.rb:1671676898": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`markdown-merge.rb`) should use snake_case.", 5381] + ], + "lib/markdown/merge.rb:3835020687": [ + [11, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Markdown::Merge`.", 2866359175], + [11, 3, 23539, "Metrics/ModuleLength: Module has too many lines. [564/100]", 3838590514], + [22, 5, 16, "Style/Documentation: Missing top-level documentation comment for `class Markdown::Merge::ParseError`.", 362242086], + [104, 5, 990, "Metrics/MethodLength: Method has too many lines. [23/10]", 650805533], + [133, 5, 678, "Metrics/AbcSize: Assignment Branch Condition size for `match_markdown_owners` is too high. [<10, 23, 8> 26.32/17]", 2124140148], + [133, 5, 678, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `match_markdown_owners` is too high. [9/7]", 2124140148], + [133, 5, 678, "Metrics/PerceivedComplexity: Perceived complexity for `match_markdown_owners` is too high. [9/8]", 2124140148], + [146, 5, 1188, "Metrics/AbcSize: Assignment Branch Condition size for `merge_markdown` is too high. [<10, 25, 8> 28.09/17]", 3592129796], + [146, 5, 1188, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_markdown` is too high. [9/7]", 3592129796], + [146, 5, 1188, "Metrics/MethodLength: Method has too many lines. [23/10]", 3592129796], + [146, 5, 1188, "Metrics/PerceivedComplexity: Perceived complexity for `merge_markdown` is too high. [9/8]", 3592129796], + [175, 5, 513, "Metrics/MethodLength: Method has too many lines. [13/10]", 912081106], + [193, 5, 747, "Metrics/MethodLength: Method has too many lines. [16/10]", 3172863125], + [224, 5, 1513, "Metrics/AbcSize: Assignment Branch Condition size for `apply_markdown_delegated_child_outputs` is too high. [<16, 37, 9> 41.3/17]", 3320736661], + [224, 5, 1513, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_markdown_delegated_child_outputs` is too high. [10/7]", 3320736661], + [224, 5, 1513, "Metrics/MethodLength: Method has too many lines. [30/10]", 3320736661], + [224, 5, 1513, "Metrics/PerceivedComplexity: Perceived complexity for `apply_markdown_delegated_child_outputs` is too high. [10/8]", 3320736661], + [262, 5, 1058, "Metrics/MethodLength: Method has too many lines. [23/10]", 2000305522], + [289, 5, 1103, "Metrics/MethodLength: Method has too many lines. [23/10]", 2615729942], + [289, 52, 144, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3050457682], + [317, 5, 817, "Metrics/MethodLength: Method has too many lines. [13/10]", 322304706], + [322, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 2378183959], + [335, 5, 805, "Metrics/MethodLength: Method has too many lines. [13/10]", 935244360], + [340, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 2974266470], + [353, 5, 722, "Metrics/MethodLength: Method has too many lines. [12/10]", 1758487766], + [358, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 3013228499], + [370, 5, 730, "Metrics/MethodLength: Method has too many lines. [12/10]", 3297037131], + [375, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 3013228499], + [401, 5, 1584, "Metrics/AbcSize: Assignment Branch Condition size for `collect_markdown_owners` is too high. [<21, 32, 13> 40.42/17]", 572024212], + [401, 5, 1584, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_markdown_owners` is too high. [11/7]", 572024212], + [401, 5, 1584, "Metrics/MethodLength: Method has too many lines. [45/10]", 572024212], + [401, 5, 1584, "Metrics/PerceivedComplexity: Perceived complexity for `collect_markdown_owners` is too high. [11/8]", 572024212], + [455, 5, 1147, "Metrics/AbcSize: Assignment Branch Condition size for `markdown_owner_start_indices` is too high. [<21, 22, 11> 32.34/17]", 12516264], + [455, 5, 1147, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `markdown_owner_start_indices` is too high. [9/7]", 12516264], + [455, 5, 1147, "Metrics/MethodLength: Method has too many lines. [33/10]", 12516264], + [455, 5, 1147, "Metrics/PerceivedComplexity: Perceived complexity for `markdown_owner_start_indices` is too high. [9/8]", 12516264], + [496, 5, 602, "Metrics/AbcSize: Assignment Branch Condition size for `collect_markdown_sections` is too high. [<9, 20, 6> 22.74/17]", 1946206422], + [496, 5, 602, "Metrics/MethodLength: Method has too many lines. [14/10]", 1946206422], + [504, 7, 11, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 848344986], + [515, 5, 1097, "Metrics/AbcSize: Assignment Branch Condition size for `markdown_fence_ranges` is too high. [<19, 21, 11> 30.38/17]", 2035260313], + [515, 5, 1097, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `markdown_fence_ranges` is too high. [8/7]", 2035260313], + [515, 5, 1097, "Metrics/MethodLength: Method has too many lines. [31/10]", 2035260313], + [531, 13, 227, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 1054958538], + [553, 5, 323, "Metrics/MethodLength: Method has too many lines. [14/10]", 2041170985], + [589, 5, 525, "Metrics/MethodLength: Method has too many lines. [11/10]", 1507618315] + ], + "lib/markdown/merge/backend_support.rb:1723133349": [ + [6, 5, 6677, "Metrics/ModuleLength: Module has too many lines. [151/100]", 1497234257], + [18, 7, 524, "Metrics/MethodLength: Method has too many lines. [13/10]", 2550700841], + [34, 7, 913, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `configure_markdown_only_language_class!` is too high. [9/7]", 2175633707], + [34, 7, 913, "Metrics/MethodLength: Method has too many lines. [14/10]", 2175633707], + [34, 7, 913, "Metrics/PerceivedComplexity: Perceived complexity for `configure_markdown_only_language_class!` is too high. [10/8]", 2175633707], + [37, 11, 658, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `from_library` is too high. [9/7]", 353826273], + [37, 11, 658, "Metrics/PerceivedComplexity: Perceived complexity for `from_library` is too high. [10/8]", 353826273], + [44, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1312231069], + [54, 7, 1263, "Metrics/AbcSize: Assignment Branch Condition size for `configure_node_link_and_navigation!` is too high. [<3, 28, 3> 28.32/17]", 122101535], + [54, 7, 1263, "Metrics/MethodLength: Method has too many lines. [20/10]", 122101535], + [98, 7, 976, "Metrics/MethodLength: Method has too many lines. [24/10]", 2694447150], + [132, 7, 618, "Metrics/MethodLength: Method has too many lines. [11/10]", 2027069469], + [150, 7, 888, "Metrics/MethodLength: Method has too many lines. [21/10]", 3721642530] + ], + "lib/markdown/merge/cleanse/block_spacing.rb:2917446564": [ + [32, 7, 7186, "Metrics/ClassLength: Class has too many lines. [138/100]", 1732896955], + [132, 9, 465, "Metrics/AbcSize: Assignment Branch Condition size for `fix` is too high. [<6, 16, 5> 17.8/17]", 341373851], + [150, 9, 1964, "Metrics/AbcSize: Assignment Branch Condition size for `analyze` is too high. [<9, 25, 16> 31.02/17]", 2558819309], + [150, 9, 1964, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `analyze` is too high. [14/7]", 2558819309], + [150, 9, 1964, "Metrics/MethodLength: Method has too many lines. [23/10]", 2558819309], + [150, 9, 1964, "Metrics/PerceivedComplexity: Perceived complexity for `analyze` is too high. [14/8]", 2558819309], + [160, 25, 7, "Style/NumericPredicate: Use `idx.positive?` instead of `idx > 0`.", 1825176542], + [192, 40, 20, "Style/NumericPredicate: Use `html_block_depth.positive?` instead of `html_block_depth > 0`.", 3208734130] + ], + "lib/markdown/merge/cleanse/code_fence_spacing.rb:1353147449": [ + [161, 9, 1524, "Metrics/AbcSize: Assignment Branch Condition size for `code_blocks` is too high. [<18, 20, 12> 29.46/17]", 2467942971], + [161, 9, 1524, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `code_blocks` is too high. [12/7]", 2467942971], + [161, 9, 1524, "Metrics/MethodLength: Method has too many lines. [35/10]", 2467942971], + [161, 9, 1524, "Metrics/PerceivedComplexity: Perceived complexity for `code_blocks` is too high. [12/8]", 2467942971], + [169, 11, 1293, "Metrics/BlockLength: Block has too many lines. [27/25]", 3238939023], + [249, 9, 884, "Metrics/AbcSize: Assignment Branch Condition size for `parse_fence_line` is too high. [<7, 15, 6> 17.61/17]", 1033947369], + [249, 9, 884, "Metrics/MethodLength: Method has too many lines. [19/10]", 1033947369] + ], + "lib/markdown/merge/cleanse/condensed_link_refs.rb:3659937794": [ + [85, 7, 12174, "Metrics/ClassLength: Class has too many lines. [115/100]", 3309007721], + [200, 9, 874, "Metrics/AbcSize: Assignment Branch Condition size for `definitions` is too high. [<6, 14, 10> 18.22/17]", 1976258109], + [200, 9, 874, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `definitions` is too high. [9/7]", 1976258109], + [200, 9, 874, "Metrics/MethodLength: Method has too many lines. [13/10]", 1976258109], + [200, 9, 874, "Metrics/PerceivedComplexity: Perceived complexity for `definitions` is too high. [9/8]", 1976258109], + [213, 43, 17, "Style/NumericPredicate: Use `first_bracket.positive?` instead of `first_bracket > 0`.", 1095960710], + [273, 13, 30, "Naming/PredicatePrefix: Rename `has_content_before_definition?` to `content_before_definition?`.", 213744570], + [298, 9, 997, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_line` is too high. [9/7]", 2139717575], + [298, 9, 997, "Metrics/MethodLength: Method has too many lines. [13/10]", 2139717575], + [298, 9, 997, "Metrics/PerceivedComplexity: Perceived complexity for `parse_line` is too high. [9/8]", 2139717575], + [352, 9, 1214, "Metrics/AbcSize: Assignment Branch Condition size for `expand_line` is too high. [<10, 20, 17> 28.09/17]", 149412459], + [352, 9, 1214, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `expand_line` is too high. [14/7]", 149412459], + [352, 9, 1214, "Metrics/MethodLength: Method has too many lines. [21/10]", 149412459], + [352, 9, 1214, "Metrics/PerceivedComplexity: Perceived complexity for `expand_line` is too high. [15/8]", 149412459], + [358, 37, 17, "Style/NumericPredicate: Use `first_bracket.positive?` instead of `first_bracket > 0`.", 1095960710] + ], + "lib/markdown/merge/cleanse/templating_corruption.rb:3945009912": [ + [59, 9, 384, "Metrics/AbcSize: Assignment Branch Condition size for `append_issues` is too high. [<0, 17, 2> 17.12/17]", 2550677275] + ], + "lib/markdown/merge/code_block_merger.rb:1362562532": [ + [32, 5, 27618, "Metrics/ClassLength: Class has too many lines. [554/100]", 1891552237], + [120, 7, 543, "Metrics/MethodLength: Method has too many lines. [11/10]", 625040368], + [120, 28, 92, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3691835500], + [135, 7, 666, "Metrics/MethodLength: Method has too many lines. [13/10]", 4153783419], + [156, 7, 2796, "Metrics/AbcSize: Assignment Branch Condition size for `merge_code_blocks_with_runtime` is too high. [<5, 52, 11> 53.39/17]", 4194925058], + [156, 7, 2796, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_code_blocks_with_runtime` is too high. [10/7]", 4194925058], + [156, 7, 2796, "Metrics/MethodLength: Method has too many lines. [63/10]", 4194925058], + [156, 7, 2796, "Metrics/PerceivedComplexity: Perceived complexity for `merge_code_blocks_with_runtime` is too high. [12/8]", 4194925058], + [156, 41, 125, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1827509670], + [227, 7, 1778, "Metrics/AbcSize: Assignment Branch Condition size for `build_runtime_operation` is too high. [<3, 24, 4> 24.52/17]", 3746845105], + [227, 7, 1778, "Metrics/MethodLength: Method has too many lines. [31/10]", 3746845105], + [227, 34, 86, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3153149164], + [239, 39, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [290, 7, 528, "Metrics/MethodLength: Method has too many lines. [14/10]", 3045714289], + [307, 7, 2407, "Metrics/AbcSize: Assignment Branch Condition size for `merge_runtime_surface` is too high. [<1, 50, 7> 50.5/17]", 3818534251], + [307, 7, 2407, "Metrics/MethodLength: Method has too many lines. [53/10]", 3818534251], + [365, 7, 2502, "Metrics/AbcSize: Assignment Branch Condition size for `perform_code_block_merge` is too high. [<8, 34, 16> 38.42/17]", 3120245149], + [365, 7, 2502, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `perform_code_block_merge` is too high. [14/7]", 3120245149], + [365, 7, 2502, "Metrics/MethodLength: Method has too many lines. [57/10]", 3120245149], + [365, 7, 2502, "Metrics/PerceivedComplexity: Perceived complexity for `perform_code_block_merge` is too high. [16/8]", 3120245149], + [365, 35, 83, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2137984385], + [435, 7, 1289, "Metrics/MethodLength: Method has too many lines. [33/10]", 3304634912], + [435, 43, 154, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2516842130], + [473, 7, 755, "Metrics/MethodLength: Method has too many lines. [15/10]", 2207072637], + [473, 35, 127, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2610889879], + [492, 38, 167, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 372116680], + [492, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193417996], + [506, 37, 166, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 321759336], + [506, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861061], + [547, 19, 20, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 3860798338], + [574, 9, 109, "Lint/RescueException: Avoid rescuing the `Exception` class. Perhaps you meant to rescue `StandardError`?", 2421726137], + [575, 21, 50, "Style/ClassEqualityComparison: Use `instance_of?(::RSpec::Mocks::MockExpectationError)` instead of comparing classes.", 952914844], + [592, 9, 797, "Metrics/MethodLength: Method has too many lines. [18/10]", 4001935536], + [622, 9, 800, "Metrics/MethodLength: Method has too many lines. [18/10]", 2519636656], + [652, 9, 798, "Metrics/MethodLength: Method has too many lines. [18/10]", 2048436912], + [680, 9, 1160, "Metrics/MethodLength: Method has too many lines. [26/10]", 45677001], + [718, 9, 798, "Metrics/MethodLength: Method has too many lines. [18/10]", 3475080240] + ], + "lib/markdown/merge/comment_tracker.rb:167569374": [ + [19, 7, 374, "Metrics/MethodLength: Method has too many lines. [11/10]", 3280949001] + ], + "lib/markdown/merge/conflict_resolver.rb:686298490": [ + [29, 5, 6207, "Metrics/ClassLength: Class has too many lines. [122/100]", 3761260950], + [57, 7, 1217, "Metrics/MethodLength: Method has too many lines. [32/10]", 3372247297], + [57, 55, 14, "Lint/UnusedMethodArgument: Unused method argument - `template_index`.", 1809801172], + [57, 72, 10, "Lint/UnusedMethodArgument: Unused method argument - `dest_index`.", 2703999490], + [112, 7, 1811, "Metrics/AbcSize: Assignment Branch Condition size for `unresolved_resolution` is too high. [<6, 22, 5> 23.35/17]", 391291522], + [112, 7, 1811, "Metrics/MethodLength: Method has too many lines. [39/10]", 391291522], + [161, 7, 605, "Metrics/MethodLength: Method has too many lines. [12/10]", 577293020] + ], + "lib/markdown/merge/file_aligner.rb:841305081": [ + [27, 5, 19046, "Metrics/ClassLength: Class has too many lines. [364/100]", 3915220059], + [57, 7, 1853, "Metrics/AbcSize: Assignment Branch Condition size for `apply_match_refiner!` is too high. [<13, 31, 14> 36.41/17]", 3500652553], + [57, 7, 1853, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_match_refiner!` is too high. [15/7]", 3500652553], + [57, 7, 1853, "Metrics/MethodLength: Method has too many lines. [35/10]", 3500652553], + [57, 7, 1853, "Metrics/PerceivedComplexity: Perceived complexity for `apply_match_refiner!` is too high. [15/8]", 3500652553], + [112, 7, 312, "Metrics/MethodLength: Method has too many lines. [11/10]", 2670750985], + [132, 9, 46, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 4265307642], + [133, 11, 78, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1464832319], + [139, 7, 644, "Metrics/AbcSize: Assignment Branch Condition size for `build_heading_owner_paths` is too high. [<8, 20, 8> 22.98/17]", 2892981198], + [139, 7, 644, "Metrics/MethodLength: Method has too many lines. [13/10]", 2892981198], + [176, 7, 1056, "Metrics/AbcSize: Assignment Branch Condition size for `adjacent_section_hijack_repair_compatible?` is too high. [<4, 25, 8> 26.55/17]", 2068902935], + [176, 7, 1056, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `adjacent_section_hijack_repair_compatible?` is too high. [8/7]", 2068902935], + [176, 7, 1056, "Metrics/MethodLength: Method has too many lines. [11/10]", 2068902935], + [204, 7, 685, "Metrics/MethodLength: Method has too many lines. [12/10]", 3293058437], + [221, 7, 762, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `next_same_owner_match_for_template_only_entry` is too high. [8/7]", 681984620], + [250, 7, 829, "Metrics/MethodLength: Method has too many lines. [15/10]", 3104261185], + [309, 7, 759, "Metrics/MethodLength: Method has too many lines. [11/10]", 4043392433], + [342, 7, 540, "Metrics/AbcSize: Assignment Branch Condition size for `synthetic_section_label_paragraph?` is too high. [<3, 15, 11> 18.84/17]", 569218077], + [342, 7, 540, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `synthetic_section_label_paragraph?` is too high. [9/7]", 569218077], + [342, 7, 540, "Metrics/PerceivedComplexity: Perceived complexity for `synthetic_section_label_paragraph?` is too high. [9/8]", 569218077], + [347, 38, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [385, 47, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [385, 85, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [429, 7, 792, "Metrics/AbcSize: Assignment Branch Condition size for `neighboring_heading_signatures` is too high. [<7, 17, 8> 20.05/17]", 653610323], + [429, 7, 792, "Metrics/MethodLength: Method has too many lines. [14/10]", 653610323], + [466, 7, 879, "Metrics/AbcSize: Assignment Branch Condition size for `first_list_item_anchor` is too high. [<6, 22, 9> 24.52/17]", 1144304252], + [466, 7, 879, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `first_list_item_anchor` is too high. [9/7]", 1144304252], + [466, 7, 879, "Metrics/MethodLength: Method has too many lines. [21/10]", 1144304252], + [466, 7, 879, "Metrics/PerceivedComplexity: Perceived complexity for `first_list_item_anchor` is too high. [10/8]", 1144304252] + ], + "lib/markdown/merge/file_analysis.rb:1169434297": [ + [41, 5, 12695, "Metrics/ClassLength: Class has too many lines. [183/100]", 3122418242], + [168, 7, 2960, "Metrics/AbcSize: Assignment Branch Condition size for `compute_parser_signature` is too high. [<13, 36, 18> 42.3/17]", 1002271909], + [168, 7, 2960, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_parser_signature` is too high. [17/7]", 1002271909], + [168, 7, 2960, "Metrics/MethodLength: Method has too many lines. [42/10]", 1002271909], + [168, 7, 2960, "Metrics/PerceivedComplexity: Perceived complexity for `compute_parser_signature` is too high. [11/8]", 1002271909], + [290, 7, 777, "Metrics/MethodLength: Method has too many lines. [14/10]", 1287754637], + [328, 7, 558, "Metrics/MethodLength: Method has too many lines. [15/10]", 3417342515] + ], + "lib/markdown/merge/file_analysis_base.rb:678024820": [ + [37, 5, 26494, "Metrics/ClassLength: Class has too many lines. [405/100]", 2769422452], + [60, 7, 1360, "Metrics/MethodLength: Method has too many lines. [18/10]", 90913983], + [261, 7, 3539, "Metrics/AbcSize: Assignment Branch Condition size for `compute_parser_signature` is too high. [<16, 43, 19> 49.66/17]", 3466910865], + [261, 7, 3539, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_parser_signature` is too high. [18/7]", 3466910865], + [261, 7, 3539, "Metrics/MethodLength: Method has too many lines. [45/10]", 3466910865], + [261, 7, 3539, "Metrics/PerceivedComplexity: Perceived complexity for `compute_parser_signature` is too high. [11/8]", 3466910865], + [467, 7, 1153, "Metrics/AbcSize: Assignment Branch Condition size for `collect_top_level_nodes_with_gaps` is too high. [<10, 16, 7> 20.12/17]", 2190890907], + [467, 7, 1153, "Metrics/MethodLength: Method has too many lines. [18/10]", 2190890907], + [524, 7, 944, "Metrics/AbcSize: Assignment Branch Condition size for `integrate_gap_nodes` is too high. [<10, 14, 9> 19.42/17]", 2618792164], + [524, 7, 944, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `integrate_gap_nodes` is too high. [9/7]", 2618792164], + [524, 7, 944, "Metrics/MethodLength: Method has too many lines. [17/10]", 2618792164], + [524, 7, 944, "Metrics/PerceivedComplexity: Perceived complexity for `integrate_gap_nodes` is too high. [9/8]", 2618792164], + [536, 50, 7, "Style/NumericPredicate: Use `idx.positive?` instead of `idx > 0`.", 1825176542], + [565, 7, 2225, "Metrics/AbcSize: Assignment Branch Condition size for `find_freeze_markers` is too high. [<16, 30, 15> 37.16/17]", 263815919], + [565, 7, 2225, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_freeze_markers` is too high. [16/7]", 263815919], + [565, 7, 2225, "Metrics/MethodLength: Method has too many lines. [39/10]", 263815919], + [565, 7, 2225, "Metrics/PerceivedComplexity: Perceived complexity for `find_freeze_markers` is too high. [16/8]", 263815919], + [588, 15, 101, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 2762675417], + [611, 23, 26, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 2775329597], + [630, 7, 708, "Metrics/MethodLength: Method has too many lines. [19/10]", 1535336850], + [663, 7, 859, "Metrics/MethodLength: Method has too many lines. [19/10]", 1633852183], + [706, 7, 595, "Metrics/MethodLength: Method has too many lines. [14/10]", 2922601775], + [730, 7, 1145, "Metrics/AbcSize: Assignment Branch Condition size for `integrate_nodes_with_freeze_blocks` is too high. [<12, 17, 16> 26.25/17]", 2481642790], + [730, 7, 1145, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `integrate_nodes_with_freeze_blocks` is too high. [13/7]", 2481642790], + [730, 7, 1145, "Metrics/MethodLength: Method has too many lines. [22/10]", 2481642790], + [730, 7, 1145, "Metrics/PerceivedComplexity: Perceived complexity for `integrate_nodes_with_freeze_blocks` is too high. [13/8]", 2481642790] + ], + "lib/markdown/merge/freeze_node.rb:2861044075": [ + [39, 21, 86, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 4263110221] + ], + "lib/markdown/merge/gap_line_node.rb:2230943204": [ + [40, 7, 461, "Metrics/MethodLength: Method has too many lines. [11/10]", 1038026861], + [75, 7, 1087, "Metrics/MethodLength: Method has too many lines. [17/10]", 690589617], + [75, 7, 1087, "Metrics/PerceivedComplexity: Perceived complexity for `signature` is too high. [10/8]", 690589617], + [76, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] + ], + "lib/markdown/merge/link_definition_node.rb:526538026": [ + [54, 7, 413, "Metrics/MethodLength: Method has too many lines. [11/10]", 449561622] + ], + "lib/markdown/merge/link_parser.rb:1096919687": [ + [30, 5, 12509, "Metrics/ClassLength: Class has too many lines. [179/100]", 1758727291], + [168, 7, 459, "Metrics/MethodLength: Method has too many lines. [11/10]", 518494532], + [239, 7, 945, "Metrics/AbcSize: Assignment Branch Condition size for `build_link_tree` is too high. [<12, 18, 13> 25.24/17]", 3590515429], + [239, 7, 945, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_link_tree` is too high. [10/7]", 3590515429], + [239, 7, 945, "Metrics/MethodLength: Method has too many lines. [19/10]", 3590515429], + [239, 7, 945, "Metrics/PerceivedComplexity: Perceived complexity for `build_link_tree` is too high. [10/8]", 3590515429], + [297, 7, 738, "Metrics/AbcSize: Assignment Branch Condition size for `find_constructs` is too high. [<9, 9, 15> 19.67/17]", 1944426624], + [297, 7, 738, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_constructs` is too high. [9/7]", 1944426624], + [297, 7, 738, "Metrics/MethodLength: Method has too many lines. [20/10]", 1944426624], + [297, 7, 738, "Metrics/PerceivedComplexity: Perceived complexity for `find_constructs` is too high. [10/8]", 1944426624], + [308, 31, 7, "Style/NumericPredicate: Use `idx.positive?` instead of `idx > 0`.", 1825176542], + [326, 7, 1492, "Metrics/AbcSize: Assignment Branch Condition size for `try_parse_construct_at` is too high. [<7, 26, 13> 29.9/17]", 751157862], + [326, 7, 1492, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `try_parse_construct_at` is too high. [9/7]", 751157862], + [326, 7, 1492, "Metrics/MethodLength: Method has too many lines. [32/10]", 751157862], + [326, 7, 1492, "Metrics/PerceivedComplexity: Perceived complexity for `try_parse_construct_at` is too high. [10/8]", 751157862], + [371, 7, 332, "Metrics/MethodLength: Method has too many lines. [13/10]", 766454795], + [381, 27, 10, "Style/NumericPredicate: Use `depth.zero?` instead of `depth == 0`.", 3245914040], + [389, 7, 679, "Metrics/AbcSize: Assignment Branch Condition size for `find_paren_end` is too high. [<12, 5, 12> 17.69/17]", 3435642705], + [389, 7, 679, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_paren_end` is too high. [10/7]", 3435642705], + [389, 7, 679, "Metrics/MethodLength: Method has too many lines. [24/10]", 3435642705], + [389, 7, 679, "Metrics/PerceivedComplexity: Perceived complexity for `find_paren_end` is too high. [10/8]", 3435642705], + [410, 29, 10, "Style/NumericPredicate: Use `depth.zero?` instead of `depth == 0`.", 3245914040] + ], + "lib/markdown/merge/link_reference_rehydrator.rb:2522597032": [ + [28, 5, 10014, "Metrics/ClassLength: Class has too many lines. [171/100]", 3685995823], + [89, 7, 955, "Metrics/AbcSize: Assignment Branch Condition size for `rehydrate` is too high. [<6, 21, 4> 22.2/17]", 4193701], + [89, 7, 955, "Metrics/MethodLength: Method has too many lines. [12/10]", 4193701], + [138, 7, 1280, "Metrics/MethodLength: Method has too many lines. [20/10]", 2243922075], + [138, 7, 1280, "Metrics/PerceivedComplexity: Perceived complexity for `collect_nested_replacements` is too high. [10/8]", 2243922075], + [181, 7, 1844, "Metrics/AbcSize: Assignment Branch Condition size for `process_parent_with_children` is too high. [<11, 30, 10> 33.48/17]", 1412317448], + [181, 7, 1844, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `process_parent_with_children` is too high. [9/7]", 1412317448], + [181, 7, 1844, "Metrics/MethodLength: Method has too many lines. [29/10]", 1412317448], + [181, 7, 1844, "Metrics/PerceivedComplexity: Perceived complexity for `process_parent_with_children` is too high. [9/8]", 1412317448], + [230, 7, 672, "Metrics/AbcSize: Assignment Branch Condition size for `build_definition_maps` is too high. [<18, 18, 5> 25.94/17]", 2626750147], + [230, 7, 672, "Metrics/MethodLength: Method has too many lines. [15/10]", 2626750147], + [265, 7, 594, "Metrics/MethodLength: Method has too many lines. [21/10]", 1835317302], + [292, 7, 598, "Metrics/MethodLength: Method has too many lines. [21/10]", 1975952876] + ], + "lib/markdown/merge/list_match_refiner.rb:2863813265": [ + [28, 7, 760, "Metrics/AbcSize: Assignment Branch Condition size for `compute_similarity` is too high. [<6, 20, 4> 21.26/17]", 4078625426], + [28, 7, 760, "Metrics/MethodLength: Method has too many lines. [13/10]", 4078625426] + ], + "lib/markdown/merge/list_merger.rb:1304801063": [ + [33, 5, 10963, "Metrics/ClassLength: Class has too many lines. [214/100]", 602699468], + [48, 7, 1267, "Metrics/MethodLength: Method has too many lines. [22/10]", 3289445396], + [48, 22, 295, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 992893951], + [76, 20, 23, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 1178765246], + [86, 7, 474, "Metrics/MethodLength: Method has too many lines. [14/10]", 3392803095], + [110, 7, 2384, "Metrics/AbcSize: Assignment Branch Condition size for `align_items` is too high. [<29, 55, 24> 66.65/17]", 452537823], + [110, 7, 2384, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `align_items` is too high. [22/7]", 452537823], + [110, 7, 2384, "Metrics/MethodLength: Method has too many lines. [44/10]", 452537823], + [110, 7, 2384, "Metrics/PerceivedComplexity: Perceived complexity for `align_items` is too high. [23/8]", 452537823], + [179, 7, 2546, "Metrics/AbcSize: Assignment Branch Condition size for `emit_lines` is too high. [<24, 40, 13> 48.43/17]", 2868796461], + [179, 7, 2546, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_lines` is too high. [10/7]", 2868796461], + [179, 7, 2546, "Metrics/MethodLength: Method has too many lines. [48/10]", 2868796461], + [179, 7, 2546, "Metrics/PerceivedComplexity: Perceived complexity for `emit_lines` is too high. [9/8]", 2868796461], + [179, 21, 167, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3110781545], + [186, 9, 2214, "Metrics/BlockLength: Block has too many lines. [41/25]", 27504812], + [267, 7, 1113, "Metrics/MethodLength: Method has too many lines. [21/10]", 2701858480], + [267, 32, 165, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 4189168652] + ], + "lib/markdown/merge/merge_result.rb:3204455982": [ + [35, 5, 18456, "Metrics/ClassLength: Class has too many lines. [336/100]", 549816393], + [47, 21, 99, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1708164346], + [99, 11, 18, "Naming/PredicatePrefix: Rename `has_frozen_blocks?` to `frozen_blocks?`.", 2714608976], + [174, 7, 987, "Metrics/MethodLength: Method has too many lines. [14/10]", 199512025], + [178, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 2749193064], + [197, 7, 719, "Metrics/MethodLength: Method has too many lines. [11/10]", 3478479763], + [214, 7, 3130, "Metrics/AbcSize: Assignment Branch Condition size for `apply_grouped_delegated_block!` is too high. [<37, 72, 21> 83.63/17]", 3965639779], + [214, 7, 3130, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_grouped_delegated_block!` is too high. [21/7]", 3965639779], + [214, 7, 3130, "Metrics/MethodLength: Method has too many lines. [49/10]", 3965639779], + [214, 7, 3130, "Metrics/PerceivedComplexity: Perceived complexity for `apply_grouped_delegated_block!` is too high. [21/8]", 3965639779], + [218, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 2758428109], + [227, 9, 22, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 3561198282], + [232, 9, 22, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 3561198282], + [237, 9, 22, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 3561198282], + [267, 7, 956, "Metrics/AbcSize: Assignment Branch Condition size for `apply_output_range_resolutions_descending!` is too high. [<8, 26, 8> 28.35/17]", 410698269], + [267, 7, 956, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_output_range_resolutions_descending!` is too high. [8/7]", 410698269], + [267, 7, 956, "Metrics/MethodLength: Method has too many lines. [13/10]", 410698269], + [269, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1650842885], + [304, 7, 1607, "Metrics/AbcSize: Assignment Branch Condition size for `remap_delegated_cases_after_apply` is too high. [<5, 20, 1> 20.64/17]", 2805002106], + [304, 7, 1607, "Metrics/MethodLength: Method has too many lines. [25/10]", 2805002106], + [304, 44, 174, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2563452319], + [352, 7, 664, "Metrics/MethodLength: Method has too many lines. [13/10]", 2283269648], + [402, 7, 605, "Metrics/MethodLength: Method has too many lines. [12/10]", 219211686], + [418, 7, 622, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `sanitize_review_state_metadata` is too high. [8/7]", 656017698], + [418, 7, 622, "Metrics/MethodLength: Method has too many lines. [16/10]", 656017698], + [439, 7, 1110, "Metrics/AbcSize: Assignment Branch Condition size for `validate_review_state_compatibility!` is too high. [<7, 18, 13> 23.28/17]", 3899925007], + [439, 7, 1110, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_review_state_compatibility!` is too high. [11/7]", 3899925007], + [439, 7, 1110, "Metrics/MethodLength: Method has too many lines. [18/10]", 3899925007], + [439, 7, 1110, "Metrics/PerceivedComplexity: Perceived complexity for `validate_review_state_compatibility!` is too high. [11/8]", 3899925007], + [453, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 2530059826], + [460, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861331] + ], + "lib/markdown/merge/output_builder.rb:48145848": [ + [23, 5, 8640, "Metrics/ClassLength: Class has too many lines. [115/100]", 1155429967], + [47, 7, 2071, "Metrics/AbcSize: Assignment Branch Condition size for `add_node_source` is too high. [<6, 15, 12> 20.12/17]", 555854176], + [47, 7, 2071, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `add_node_source` is too high. [12/7]", 555854176], + [47, 7, 2071, "Metrics/MethodLength: Method has too many lines. [15/10]", 555854176], + [47, 7, 2071, "Metrics/PerceivedComplexity: Perceived complexity for `add_node_source` is too high. [12/8]", 555854176], + [60, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 527167630], + [61, 121, 67, "Layout/LineLength: Line is too long. [187/120]", 2893319489], + [62, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 2876999963], + [63, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 4139918410], + [92, 38, 9, "Style/NumericPredicate: Use `count.positive?` instead of `count > 0`.", 3986027816], + [122, 7, 370, "Metrics/MethodLength: Method has too many lines. [11/10]", 616591631], + [224, 7, 878, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_parser_node_source` is too high. [10/7]", 227721314], + [224, 7, 878, "Metrics/MethodLength: Method has too many lines. [13/10]", 227721314], + [224, 7, 878, "Metrics/PerceivedComplexity: Perceived complexity for `extract_parser_node_source` is too high. [11/8]", 227721314] + ], + "lib/markdown/merge/partial_template_merger.rb:3110525012": [ + [32, 5, 20691, "Metrics/ClassLength: Class has too many lines. [336/100]", 496419120], + [71, 7, 1040, "Metrics/MethodLength: Method has too many lines. [17/10]", 2144648319], + [71, 21, 417, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 1226086326], + [109, 7, 1065, "Metrics/AbcSize: Assignment Branch Condition size for `merge` is too high. [<7, 19, 6> 21.12/17]", 3976180000], + [109, 7, 1065, "Metrics/MethodLength: Method has too many lines. [25/10]", 3976180000], + [145, 7, 912, "Metrics/MethodLength: Method has too many lines. [15/10]", 2077585004], + [265, 7, 1401, "Metrics/AbcSize: Assignment Branch Condition size for `find_section_end` is too high. [<8, 28, 11> 31.13/17]", 1420600674], + [265, 7, 1401, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_section_end` is too high. [10/7]", 1420600674], + [265, 7, 1401, "Metrics/MethodLength: Method has too many lines. [20/10]", 1420600674], + [265, 7, 1401, "Metrics/PerceivedComplexity: Perceived complexity for `find_section_end` is too high. [10/8]", 1420600674], + [311, 7, 1101, "Metrics/AbcSize: Assignment Branch Condition size for `node_to_source` is too high. [<6, 15, 15> 22.05/17]", 3635207151], + [311, 7, 1101, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `node_to_source` is too high. [13/7]", 3635207151], + [311, 7, 1101, "Metrics/MethodLength: Method has too many lines. [20/10]", 3635207151], + [311, 7, 1101, "Metrics/PerceivedComplexity: Perceived complexity for `node_to_source` is too high. [14/8]", 3635207151], + [318, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [323, 42, 14, "Style/NumericPredicate: Use `start_line.positive?` instead of `start_line > 0`.", 792111162], + [345, 7, 643, "Metrics/MethodLength: Method has too many lines. [17/10]", 998852567], + [364, 34, 10, "Style/NumericPredicate: Use `value.zero?` instead of `value == 0`.", 4076387742], + [367, 7, 2760, "Metrics/AbcSize: Assignment Branch Condition size for `preserved_destination_insertions` is too high. [<19, 28, 14> 36.62/17]", 414221184], + [367, 7, 2760, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preserved_destination_insertions` is too high. [13/7]", 414221184], + [367, 7, 2760, "Metrics/MethodLength: Method has too many lines. [49/10]", 414221184], + [367, 7, 2760, "Metrics/PerceivedComplexity: Perceived complexity for `preserved_destination_insertions` is too high. [15/8]", 414221184], + [381, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 682972477], + [426, 7, 1058, "Metrics/MethodLength: Method has too many lines. [16/10]", 932075153], + [475, 7, 1040, "Metrics/AbcSize: Assignment Branch Condition size for `render_template_with_preserved_insertions` is too high. [<10, 18, 10> 22.89/17]", 1699694974], + [475, 7, 1040, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `render_template_with_preserved_insertions` is too high. [9/7]", 1699694974], + [475, 7, 1040, "Metrics/MethodLength: Method has too many lines. [21/10]", 1699694974], + [475, 7, 1040, "Metrics/PerceivedComplexity: Perceived complexity for `render_template_with_preserved_insertions` is too high. [9/8]", 1699694974], + [504, 7, 454, "Metrics/MethodLength: Method has too many lines. [12/10]", 3433907112] + ], + "lib/markdown/merge/preservation_support.rb:3687269889": [ + [13, 5, 10105, "Metrics/ModuleLength: Module has too many lines. [212/100]", 674454], + [24, 7, 572, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `standalone_comment_node?` is too high. [9/7]", 349869031], + [24, 7, 572, "Metrics/PerceivedComplexity: Perceived complexity for `standalone_comment_node?` is too high. [9/8]", 349869031], + [116, 7, 655, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `remove_plan_preserved_comment_regions` is too high. [8/7]", 2103873816], + [116, 7, 655, "Metrics/MethodLength: Method has too many lines. [12/10]", 2103873816], + [178, 7, 1301, "Metrics/AbcSize: Assignment Branch Condition size for `remove_plan_comment_insertion_specs` is too high. [<5, 22, 8> 23.94/17]", 698043371], + [178, 7, 1301, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `remove_plan_comment_insertion_specs` is too high. [9/7]", 698043371], + [178, 7, 1301, "Metrics/MethodLength: Method has too many lines. [22/10]", 698043371], + [178, 7, 1301, "Metrics/PerceivedComplexity: Perceived complexity for `remove_plan_comment_insertion_specs` is too high. [9/8]", 698043371], + [193, 9, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045570401], + [217, 7, 737, "Metrics/MethodLength: Method has too many lines. [13/10]", 3882071587], + [248, 28, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [271, 7, 704, "Metrics/MethodLength: Method has too many lines. [13/10]", 2605835865], + [271, 52, 139, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1766111143] + ], + "lib/markdown/merge/smart_merger.rb:1245982439": [ + [151, 7, 1405, "Metrics/MethodLength: Method has too many lines. [19/10]", 2830703815], + [151, 21, 501, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [13/5]", 1104874368], + [229, 7, 1140, "Metrics/AbcSize: Assignment Branch Condition size for `node_to_source` is too high. [<5, 15, 9> 18.19/17]", 1515173572], + [229, 7, 1140, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `node_to_source` is too high. [9/7]", 1515173572], + [229, 7, 1140, "Metrics/MethodLength: Method has too many lines. [13/10]", 1515173572], + [229, 7, 1140, "Metrics/PerceivedComplexity: Perceived complexity for `node_to_source` is too high. [10/8]", 1515173572] + ], + "lib/markdown/merge/smart_merger_base.rb:950545235": [ + [43, 5, 59104, "Metrics/ClassLength: Class has too many lines. [984/100]", 1046238359], + [148, 7, 3731, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<20, 19, 10> 29.34/17]", 50319656], + [148, 7, 3731, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `initialize` is too high. [11/7]", 50319656], + [148, 7, 3731, "Metrics/MethodLength: Method has too many lines. [66/10]", 50319656], + [148, 7, 3731, "Metrics/PerceivedComplexity: Perceived complexity for `initialize` is too high. [9/8]", 50319656], + [148, 21, 606, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [17/5]", 4006929896], + [294, 7, 1760, "Metrics/AbcSize: Assignment Branch Condition size for `merge_result` is too high. [<15, 19, 7> 25.2/17]", 3628731818], + [294, 7, 1760, "Metrics/MethodLength: Method has too many lines. [31/10]", 3628731818], + [297, 25, 1662, "Metrics/BlockLength: Block has too many lines. [28/25]", 1167387512], + [343, 7, 1195, "Metrics/AbcSize: Assignment Branch Condition size for `merge_with_debug` is too high. [<3, 20, 17> 26.42/17]", 1763663260], + [343, 7, 1195, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_with_debug` is too high. [18/7]", 1763663260], + [343, 7, 1195, "Metrics/MethodLength: Method has too many lines. [27/10]", 1763663260], + [343, 7, 1195, "Metrics/PerceivedComplexity: Perceived complexity for `merge_with_debug` is too high. [18/8]", 1763663260], + [383, 7, 1862, "Metrics/AbcSize: Assignment Branch Condition size for `prepare_runtime_session!` is too high. [<4, 24, 1> 24.35/17]", 546014873], + [383, 7, 1862, "Metrics/MethodLength: Method has too many lines. [45/10]", 546014873], + [432, 7, 1064, "Metrics/MethodLength: Method has too many lines. [21/10]", 214902707], + [490, 7, 438, "Metrics/MethodLength: Method has too many lines. [11/10]", 1759076310], + [505, 31, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [529, 7, 788, "Metrics/MethodLength: Method has too many lines. [13/10]", 690316762], + [553, 7, 1538, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_cross_source_preamble_prefixes` is too high. [<9, 18, 6> 21/17]", 1970988374], + [553, 7, 1538, "Metrics/MethodLength: Method has too many lines. [25/10]", 1970988374], + [586, 7, 644, "Metrics/AbcSize: Assignment Branch Condition size for `leading_standalone_comment_run` is too high. [<8, 14, 7> 17.58/17]", 4188914818], + [586, 7, 644, "Metrics/MethodLength: Method has too many lines. [17/10]", 4188914818], + [614, 7, 1576, "Metrics/AbcSize: Assignment Branch Condition size for `process_alignment` is too high. [<15, 14, 10> 22.83/17]", 3967135783], + [614, 7, 1576, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `process_alignment` is too high. [11/7]", 3967135783], + [614, 7, 1576, "Metrics/MethodLength: Method has too many lines. [31/10]", 3967135783], + [614, 7, 1576, "Metrics/PerceivedComplexity: Perceived complexity for `process_alignment` is too high. [9/8]", 3967135783], + [656, 7, 2871, "Metrics/AbcSize: Assignment Branch Condition size for `process_match_to_builder` is too high. [<17, 39, 19> 46.59/17]", 608053079], + [656, 7, 2871, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `process_match_to_builder` is too high. [19/7]", 608053079], + [656, 7, 2871, "Metrics/MethodLength: Method has too many lines. [50/10]", 608053079], + [656, 7, 2871, "Metrics/PerceivedComplexity: Perceived complexity for `process_match_to_builder` is too high. [18/8]", 608053079], + [720, 7, 867, "Metrics/MethodLength: Method has too many lines. [18/10]", 2946023513], + [764, 7, 670, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `consumed_link_definitions_within` is too high. [8/7]", 2596009659], + [764, 7, 670, "Metrics/MethodLength: Method has too many lines. [11/10]", 2596009659], + [774, 9, 8, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 359839059], + [782, 45, 50, "Style/ClassEqualityComparison: Use `instance_of?(::RSpec::Mocks::MockExpectationError)` instead of comparing classes.", 952914844], + [797, 7, 939, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_node_typing` is too high. [8/7]", 2526108526], + [797, 7, 939, "Metrics/MethodLength: Method has too many lines. [14/10]", 2526108526], + [849, 7, 1297, "Metrics/AbcSize: Assignment Branch Condition size for `try_inner_merge_list_to_builder` is too high. [<8, 20, 8> 22.98/17]", 2844551967], + [849, 7, 1297, "Metrics/MethodLength: Method has too many lines. [25/10]", 2844551967], + [849, 42, 71, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3479074024], + [885, 7, 1361, "Metrics/AbcSize: Assignment Branch Condition size for `try_inner_merge_code_block_to_builder` is too high. [<7, 19, 6> 21.12/17]", 2468334280], + [885, 7, 1361, "Metrics/MethodLength: Method has too many lines. [29/10]", 2468334280], + [885, 48, 71, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3479074024], + [918, 7, 1923, "Metrics/AbcSize: Assignment Branch Condition size for `remap_delegated_unresolved_cases` is too high. [<8, 23, 5> 24.86/17]", 2261924082], + [918, 7, 1923, "Metrics/MethodLength: Method has too many lines. [35/10]", 2261924082], + [922, 9, 1535, "Metrics/BlockLength: Block has too many lines. [31/25]", 838301956], + [983, 7, 657, "Metrics/MethodLength: Method has too many lines. [15/10]", 4047906352], + [1027, 7, 411, "Metrics/MethodLength: Method has too many lines. [13/10]", 4206078535], + [1053, 7, 3160, "Metrics/AbcSize: Assignment Branch Condition size for `process_dest_only_to_builder` is too high. [<14, 41, 24> 49.53/17]", 1311626075], + [1053, 7, 3160, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `process_dest_only_to_builder` is too high. [25/7]", 1311626075], + [1053, 7, 3160, "Metrics/MethodLength: Method has too many lines. [51/10]", 1311626075], + [1053, 7, 3160, "Metrics/PerceivedComplexity: Perceived complexity for `process_dest_only_to_builder` is too high. [25/8]", 1311626075], + [1053, 39, 177, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2740785193], + [1167, 7, 395, "Metrics/MethodLength: Method has too many lines. [11/10]", 433430016], + [1204, 7, 465, "Metrics/MethodLength: Method has too many lines. [12/10]", 1101864061], + [1261, 7, 861, "Metrics/MethodLength: Method has too many lines. [16/10]", 2380789170], + [1314, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193431734], + [1317, 7, 1039, "Metrics/AbcSize: Assignment Branch Condition size for `kept_node_for_link_ownership` is too high. [<4, 17, 9> 19.65/17]", 849664480], + [1317, 7, 1039, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `kept_node_for_link_ownership` is too high. [8/7]", 849664480], + [1317, 7, 1039, "Metrics/MethodLength: Method has too many lines. [24/10]", 849664480], + [1348, 7, 797, "Metrics/MethodLength: Method has too many lines. [12/10]", 3928797316], + [1384, 7, 610, "Metrics/AbcSize: Assignment Branch Condition size for `link_reference_signatures_within` is too high. [<6, 15, 6> 17.23/17]", 2255263809], + [1390, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177625], + [1457, 7, 1360, "Metrics/MethodLength: Method has too many lines. [19/10]", 1607654950] + ], + "lib/markdown/merge/table_match_algorithm.rb:784102633": [ + [31, 5, 17084, "Metrics/ClassLength: Class has too many lines. [241/100]", 3870100216], + [71, 21, 130, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2234186342], + [86, 7, 537, "Metrics/MethodLength: Method has too many lines. [11/10]", 695685542], + [112, 7, 872, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<13, 29, 8> 32.77/17]", 3623880915], + [112, 7, 872, "Metrics/MethodLength: Method has too many lines. [20/10]", 3623880915], + [264, 7, 1291, "Metrics/AbcSize: Assignment Branch Condition size for `collect_text_recursive` is too high. [<5, 22, 13> 26.04/17]", 1898702827], + [264, 7, 1291, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_text_recursive` is too high. [12/7]", 1898702827], + [264, 7, 1291, "Metrics/MethodLength: Method has too many lines. [26/10]", 1898702827], + [264, 7, 1291, "Metrics/PerceivedComplexity: Perceived complexity for `collect_text_recursive` is too high. [15/8]", 1898702827], + [292, 24, 43, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 2747201274], + [303, 7, 644, "Metrics/AbcSize: Assignment Branch Condition size for `compute_header_match` is too high. [<6, 20, 9> 22.74/17]", 2910662900], + [303, 7, 644, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_header_match` is too high. [10/7]", 2910662900], + [303, 7, 644, "Metrics/MethodLength: Method has too many lines. [11/10]", 2910662900], + [303, 7, 644, "Metrics/PerceivedComplexity: Perceived complexity for `compute_header_match` is too high. [10/8]", 2910662900], + [330, 7, 927, "Metrics/AbcSize: Assignment Branch Condition size for `compute_first_column_match` is too high. [<14, 22, 14> 29.6/17]", 2043865784], + [330, 7, 927, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_first_column_match` is too high. [14/7]", 2043865784], + [330, 7, 927, "Metrics/MethodLength: Method has too many lines. [15/10]", 2043865784], + [330, 7, 927, "Metrics/PerceivedComplexity: Perceived complexity for `compute_first_column_match` is too high. [14/8]", 2043865784], + [331, 28, 19, "Style/SymbolProc: Pass `&:first` as an argument to `map` instead of a block.", 2561207191], + [332, 28, 19, "Style/SymbolProc: Pass `&:first` as an argument to `map` instead of a block.", 2561207191], + [352, 9, 15, "Style/NumericPredicate: Use `total_cells.positive?` instead of `total_cells > 0`.", 1010733923], + [362, 7, 1037, "Metrics/AbcSize: Assignment Branch Condition size for `compute_row_content_match` is too high. [<10, 15, 12> 21.66/17]", 1855353124], + [362, 7, 1037, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_row_content_match` is too high. [11/7]", 1855353124], + [362, 7, 1037, "Metrics/MethodLength: Method has too many lines. [21/10]", 1855353124], + [362, 7, 1037, "Metrics/PerceivedComplexity: Perceived complexity for `compute_row_content_match` is too high. [11/8]", 1855353124], + [404, 23, 14, "Style/NumericPredicate: Use `max_cells.zero?` instead of `max_cells == 0`.", 2427124139], + [423, 7, 1091, "Metrics/AbcSize: Assignment Branch Condition size for `compute_total_cells_match` is too high. [<14, 18, 12> 25.77/17]", 413080451], + [423, 7, 1091, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_total_cells_match` is too high. [11/7]", 413080451], + [423, 7, 1091, "Metrics/MethodLength: Method has too many lines. [24/10]", 413080451], + [423, 7, 1091, "Metrics/PerceivedComplexity: Perceived complexity for `compute_total_cells_match` is too high. [11/8]", 413080451], + [492, 23, 17, "Style/NumericPredicate: Use `total_weight.zero?` instead of `total_weight == 0`.", 3158357864] + ], + "lib/markdown/merge/table_match_refiner.rb:4203940079": [ + [118, 35, 50, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1492696344] + ], + "lib/markdown/merge/whitespace_normalizer.rb:121777318": [ + [33, 5, 6779, "Metrics/ClassLength: Class has too many lines. [115/100]", 3048764740], + [103, 7, 418, "Metrics/MethodLength: Method has too many lines. [11/10]", 3165373284], + [126, 7, 1750, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_excessive_blank_lines` is too high. [<12, 12, 10> 19.7/17]", 1435694128], + [126, 7, 1750, "Metrics/MethodLength: Method has too many lines. [36/10]", 1435694128], + [188, 7, 1270, "Metrics/AbcSize: Assignment Branch Condition size for `remove_blank_lines_between_link_refs` is too high. [<12, 22, 13> 28.23/17]", 1324661552], + [188, 7, 1270, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `remove_blank_lines_between_link_refs` is too high. [9/7]", 1324661552], + [188, 7, 1270, "Metrics/MethodLength: Method has too many lines. [29/10]", 1324661552], + [188, 7, 1270, "Metrics/PerceivedComplexity: Perceived complexity for `remove_blank_lines_between_link_refs` is too high. [10/8]", 1324661552], + [207, 15, 54, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 831575245] + ], + "lib/markdown/merge/wrapper_support.rb:1758973456": [ + [6, 5, 7266, "Metrics/ModuleLength: Module has too many lines. [161/100]", 2849920033], + [29, 7, 1214, "Metrics/MethodLength: Method has too many lines. [19/10]", 1280688859], + [29, 19, 250, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 4150728370], + [78, 7, 1452, "Metrics/MethodLength: Method has too many lines. [18/10]", 3670315588], + [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:3964894686": [ + [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ], + "spec/fixtures_integration_spec.rb:1958067822": [ + [3, 1, 15884, "Metrics/BlockLength: Block has too many lines. [383/25]", 1004800925] + ] +} diff --git a/gems/markdown-merge/Gemfile.lock b/gems/markdown-merge/Gemfile.lock index 37fccb45c..b1451146e 100644 --- a/gems/markdown-merge/Gemfile.lock +++ b/gems/markdown-merge/Gemfile.lock @@ -7,39 +7,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -48,193 +16,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -242,45 +24,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -307,12 +50,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -321,6 +58,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -376,6 +114,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -394,7 +141,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -534,23 +280,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -584,11 +332,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -635,45 +378,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -682,61 +404,39 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -749,27 +449,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -784,14 +477,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -799,7 +488,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -827,19 +515,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -853,19 +539,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -873,7 +554,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/markly-merge/.rubocop_gradual.lock b/gems/markly-merge/.rubocop_gradual.lock new file mode 100644 index 000000000..7b6a96fee --- /dev/null +++ b/gems/markly-merge/.rubocop_gradual.lock @@ -0,0 +1,126 @@ +{ + ".simplecov:3376604078": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:1376789005": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/markly-merge.rb:2425755333": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`markly-merge.rb`) should use snake_case.", 5381] + ], + "lib/markly/merge.rb:2367262886": [ + [10, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Markly::Merge`.", 2866359175], + [10, 3, 22686, "Metrics/ModuleLength: Module has too many lines. [484/100]", 3039251951], + [11, 5, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631], + [56, 5, 1957, "Metrics/MethodLength: Method has too many lines. [42/10]", 2638032592], + [101, 5, 1815, "Metrics/MethodLength: Method has too many lines. [37/10]", 421864374], + [141, 5, 1063, "Metrics/MethodLength: Method has too many lines. [23/10]", 598358845], + [179, 5, 523, "Metrics/MethodLength: Method has too many lines. [11/10]", 3598278634], + [193, 5, 1855, "Metrics/MethodLength: Method has too many lines. [37/10]", 2215035372], + [194, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2184804663], + [233, 5, 7461, "Metrics/AbcSize: Assignment Branch Condition size for `markdown_structured_edit_batch_report_projection` is too high. [<1, 30, 0> 30.02/17]", 958979462], + [233, 5, 7461, "Metrics/MethodLength: Method has too many lines. [139/10]", 958979462], + [234, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2184804663], + [253, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 4247938618], + [291, 121, 69, "Layout/LineLength: Line is too long. [189/120]", 713082266], + [375, 5, 928, "Metrics/MethodLength: Method has too many lines. [24/10]", 2523239963], + [416, 5, 613, "Metrics/MethodLength: Method has too many lines. [11/10]", 2967276583], + [416, 52, 144, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3050457682] + ], + "lib/markly/merge/backend.rb:1783442402": [ + [115, 9, 517, "Metrics/MethodLength: Method has too many lines. [14/10]", 66093445], + [207, 9, 453, "Metrics/AbcSize: Assignment Branch Condition size for `text` is too high. [<1, 16, 7> 17.49/17]", 2420537429], + [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:1833318890": [ + [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ], + "spec/fixtures_integration_spec.rb:2168126107": [ + [3, 1, 14870, "Metrics/BlockLength: Block has too many lines. [337/25]", 605418848], + [16, 3, 1325, "Metrics/BlockLength: Block has too many lines. [28/25]", 928093310], + [224, 3, 1341, "Metrics/BlockLength: Block has too many lines. [26/25]", 2630958569], + [307, 3, 1352, "Metrics/BlockLength: Block has too many lines. [30/25]", 2376182886], + [342, 3, 1378, "Metrics/BlockLength: Block has too many lines. [29/25]", 3678391303] + ], + "spec/markly/merge/partial_template_merger_integration_spec.rb:2767758749": [ + [5, 1, 4127, "Metrics/BlockLength: Block has too many lines. [107/25]", 2704075138], + [25, 3, 1109, "Metrics/BlockLength: Block has too many lines. [30/25]", 2339832693], + [84, 3, 1236, "Metrics/BlockLength: Block has too many lines. [30/25]", 503179966], + [84, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 567791365] + ], + "spec/reproducible_merge_spec.rb:1557187402": [ + [6, 1, 1458, "Metrics/BlockLength: Block has too many lines. [35/25]", 100797552] + ] +} diff --git a/gems/markly-merge/lib/markly/merge/version.rb b/gems/markly-merge/lib/markly/merge/version.rb index b4ff2ffeb..3bfd8e9b0 100644 --- a/gems/markly-merge/lib/markly/merge/version.rb +++ b/gems/markly-merge/lib/markly/merge/version.rb @@ -3,7 +3,7 @@ module Markly module Merge module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end From a1658bb2c89833ccfa63494e568e303f239b947f Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:36:19 -0600 Subject: [PATCH 252/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-crispr-markdown-markly/Gemfile.lock | 335 +++++++++++++++- gems/markdown-merge/Gemfile.lock | 327 ++++++++++++++- gems/markly-merge/Gemfile.lock | 394 ++----------------- 3 files changed, 682 insertions(+), 374 deletions(-) diff --git a/gems/ast-crispr-markdown-markly/Gemfile.lock b/gems/ast-crispr-markdown-markly/Gemfile.lock index 8d6bd15a9..d12e8b14c 100644 --- a/gems/ast-crispr-markdown-markly/Gemfile.lock +++ b/gems/ast-crispr-markdown-markly/Gemfile.lock @@ -7,7 +7,15 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: ast-crispr (7.1.0) ast-merge (= 7.1.0) @@ -15,13 +23,248 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: markly-merge (7.1.0) markdown-merge (= 7.1.0) markly (~> 0.9) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -40,11 +283,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -53,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,10 +390,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) @@ -342,11 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -395,23 +637,43 @@ DEPENDENCIES appraisal2 (~> 3.0, >= 3.0.6) 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -420,18 +682,26 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -440,13 +710,26 @@ CHECKSUMS ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -454,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -466,15 +750,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 @@ -496,10 +785,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -507,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -534,9 +828,11 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -546,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -559,14 +856,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -574,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/markdown-merge/Gemfile.lock b/gems/markdown-merge/Gemfile.lock index b1451146e..3e631c3cf 100644 --- a/gems/markdown-merge/Gemfile.lock +++ b/gems/markdown-merge/Gemfile.lock @@ -7,7 +7,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -16,7 +48,193 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -24,6 +242,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -50,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -113,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -141,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -280,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -332,6 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -378,24 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -404,32 +682,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -437,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -449,20 +750,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -477,10 +785,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -488,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -515,9 +828,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -526,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -539,14 +856,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -554,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/markly-merge/Gemfile.lock b/gems/markly-merge/Gemfile.lock index 3d1e25b8d..38b789f7e 100644 --- a/gems/markly-merge/Gemfile.lock +++ b/gems/markly-merge/Gemfile.lock @@ -7,280 +7,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -299,6 +32,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -307,12 +45,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -321,6 +53,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -376,6 +109,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -534,23 +276,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -584,11 +328,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -635,45 +379,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -682,61 +405,38 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -749,20 +449,15 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 @@ -784,14 +479,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -799,7 +490,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -827,19 +517,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -853,19 +541,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -873,7 +556,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 30de8e16852b4e5c5f7d174c34c91b84bf1f3587 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:37:08 -0600 Subject: [PATCH 253/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-merge-git/.kettle-drift.lock | 60 ++- gems/ast-merge-git/Gemfile | 40 ++ gems/ast-merge-git/Gemfile.lock | 45 ++- gems/ast-merge/Gemfile | 68 ++-- gems/ast-merge/Rakefile | 18 +- gems/ast-merge/bin/yard | 2 +- gems/ast-merge/lib/ast/merge/version.rb | 2 +- gems/json-merge/.kettle-drift.lock | 60 ++- gems/json-merge/.rubocop_gradual.lock | 283 ------------- gems/json-merge/Gemfile | 40 ++ gems/json-merge/Gemfile.lock | 421 +++++++++++++++++--- gems/json-merge/lib/json/merge/version.rb | 2 +- gems/markly-merge/Gemfile.lock | 343 +++++++++++++++- gems/plain-merge/.kettle-drift.lock | 60 ++- gems/plain-merge/.rubocop_gradual.lock | 106 ----- gems/plain-merge/Gemfile | 70 +++- gems/plain-merge/Gemfile.lock | 421 +++++++++++++++++--- gems/plain-merge/Rakefile | 18 +- gems/plain-merge/bin/yard | 2 +- gems/plain-merge/lib/plain/merge/version.rb | 2 +- 20 files changed, 1418 insertions(+), 645 deletions(-) delete mode 100644 gems/json-merge/.rubocop_gradual.lock delete mode 100644 gems/plain-merge/.rubocop_gradual.lock diff --git a/gems/ast-merge-git/.kettle-drift.lock b/gems/ast-merge-git/.kettle-drift.lock index 98e9f541b..3aa07e7e9 100644 --- a/gems/ast-merge-git/.kettle-drift.lock +++ b/gems/ast-merge-git/.kettle-drift.lock @@ -8,7 +8,8 @@ 160, 200, 240, - 280 + 280, + 320 ] } ], @@ -21,7 +22,8 @@ 171, 211, 251, - 291 + 291, + 331 ] } ], @@ -34,7 +36,8 @@ 161, 201, 241, - 281 + 281, + 321 ] } ], @@ -47,7 +50,8 @@ 173, 213, 253, - 293 + 293, + 333 ] } ], @@ -60,7 +64,8 @@ 176, 216, 256, - 296 + 296, + 336 ] } ], @@ -73,7 +78,8 @@ 162, 202, 242, - 282 + 282, + 322 ] } ], @@ -87,7 +93,8 @@ 180, 220, 260, - 300 + 300, + 340 ] } ], @@ -100,7 +107,8 @@ 181, 221, 261, - 301 + 301, + 341 ] } ], @@ -114,7 +122,8 @@ 167, 207, 247, - 287 + 287, + 327 ] } ], @@ -127,7 +136,8 @@ 190, 230, 270, - 310 + 310, + 350 ] } ], @@ -141,7 +151,8 @@ 159, 199, 239, - 279 + 279, + 319 ] } ], @@ -155,7 +166,8 @@ 189, 229, 269, - 309 + 309, + 349 ] } ], @@ -168,7 +180,8 @@ 165, 205, 245, - 285 + 285, + 325 ] } ], @@ -182,7 +195,8 @@ 172, 212, 252, - 292 + 292, + 332 ] } ], @@ -196,7 +210,8 @@ 168, 208, 248, - 288 + 288, + 328 ] } ], @@ -209,7 +224,8 @@ 166, 206, 246, - 286 + 286, + 326 ] } ], @@ -222,7 +238,8 @@ 183, 223, 263, - 303 + 303, + 343 ] } ], @@ -235,7 +252,8 @@ 182, 222, 262, - 302 + 302, + 342 ] } ], @@ -248,7 +266,8 @@ 177, 217, 257, - 297 + 297, + 337 ] } ], @@ -261,7 +280,8 @@ 186, 226, 266, - 306 + 306, + 346 ] } ], diff --git a/gems/ast-merge-git/Gemfile b/gems/ast-merge-git/Gemfile index 2b20b477a..237d7e166 100644 --- a/gems/ast-merge-git/Gemfile +++ b/gems/ast-merge-git/Gemfile @@ -312,6 +312,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/ast-merge-git/Gemfile.lock b/gems/ast-merge-git/Gemfile.lock index f73aec09a..36a221e10 100644 --- a/gems/ast-merge-git/Gemfile.lock +++ b/gems/ast-merge-git/Gemfile.lock @@ -1,13 +1,3 @@ -GIT - remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a - branch: fix/ruby-parser-api-methods - glob: packages/ruby/*.gemspec - specs: - tree_sitter_language_pack (1.12.5) - rb_sys (>= 0.9, < 0.9.128) - sorbet-runtime (~> 0.5) - PATH remote: . specs: @@ -16,6 +6,30 @@ PATH json-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby + specs: + tree_sitter_language_pack (1.12.5) + rb_sys (>= 0.9, < 0.9.128) + sorbet-runtime (~> 0.5) + GEM remote: https://gem.coop/ specs: @@ -27,11 +41,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -98,10 +107,6 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) @@ -377,6 +382,7 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + ast-merge! ast-merge-git! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) @@ -385,6 +391,7 @@ DEPENDENCIES gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) diff --git a/gems/ast-merge/Gemfile b/gems/ast-merge/Gemfile index 9fb5133cc..b8c56c3c0 100644 --- a/gems/ast-merge/Gemfile +++ b/gems/ast-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source "https://gem.coop" +source 'https://gem.coop' git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,57 +19,53 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ["~> 1.0", ">= 1.0.8"] -gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ['~> 1.0', '>= 1.0.8'] +gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ tree_haver ] -direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") +direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? if direct_sibling_gems.any? && - (direct_sibling_local || - ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) - direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") - direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) begin nomono_activation_requirements = nomono_requirements - nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) if File.file?(nomono_lockfile) nomono_locked_spec = Bundler::LockfileParser - .new(Bundler.read_file(nomono_lockfile)) - .specs - .find { |spec| spec.name == "nomono" } + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } nomono_locked = nomono_locked_spec && - Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) - if nomono_locked - nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] - end - end - Kernel.send(:gem, "nomono", *nomono_activation_requirements) - require "nomono/bundler" - if direct_sibling_templating && !direct_sibling_local - ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local eval_nomono_gems( gems: direct_sibling_gems, - prefix: "STRUCTUREDMERGE", - path_env: "STRUCTUREDMERGE_DEV", - root: ["src", "my", "structuredmerge"] + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] ) rescue LoadError - warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' ensure if direct_sibling_templating && !direct_sibling_local if direct_sibling_dev_was_set - ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original else - ENV.delete("STRUCTUREDMERGE_DEV") + ENV.delete('STRUCTUREDMERGE_DEV') end end end @@ -373,25 +369,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging -eval_gemfile "gemfiles/modular/debug.gemfile" +eval_gemfile 'gemfiles/modular/debug.gemfile' # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile "gemfiles/modular/coverage.gemfile" +eval_gemfile 'gemfiles/modular/coverage.gemfile' # Linting -eval_gemfile "gemfiles/modular/style.gemfile" +eval_gemfile 'gemfiles/modular/style.gemfile' # Documentation -eval_gemfile "gemfiles/modular/documentation.gemfile" +eval_gemfile 'gemfiles/modular/documentation.gemfile' # Optional -eval_gemfile "gemfiles/modular/optional.gemfile" +eval_gemfile 'gemfiles/modular/optional.gemfile' ### Std Lib Extracted Gems -eval_gemfile "gemfiles/modular/x_std_libs.gemfile" +eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' # See unlocked_deps appraisal for more details on irb inclusion -gem "irb", "~> 1.17" # ruby >= 2.7 +gem 'irb', '~> 1.17' # ruby >= 2.7 diff --git a/gems/ast-merge/Rakefile b/gems/ast-merge/Rakefile index 6b4e21dec..339c9a3cb 100644 --- a/gems/ast-merge/Rakefile +++ b/gems/ast-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require "kettle/drift" + require 'kettle/drift' Kettle::Drift.install_tasks rescue LoadError - desc("(stub) kettle:drift:check is unavailable") - task("kettle:drift:check") do + desc('(stub) kettle:drift:check is unavailable') + task('kettle:drift:check') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:update is unavailable") - task("kettle:drift:update") do + desc('(stub) kettle:drift:update is unavailable') + task('kettle:drift:update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:force_update is unavailable") - task("kettle:drift:force_update") do + desc('(stub) kettle:drift:force_update is unavailable') + task('kettle:drift:force_update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift is unavailable") - task("kettle:drift" => "kettle:drift:update") + desc('(stub) kettle:drift is unavailable') + task('kettle:drift' => 'kettle:drift:update') end ### TEMPLATING TASKS diff --git a/gems/ast-merge/bin/yard b/gems/ast-merge/bin/yard index a7e8b6eed..5d516ad6f 100755 --- a/gems/ast-merge/bin/yard +++ b/gems/ast-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec("bundle", "exec", "rake", "yard") +exec('bundle', 'exec', 'rake', 'yard') diff --git a/gems/ast-merge/lib/ast/merge/version.rb b/gems/ast-merge/lib/ast/merge/version.rb index 3ef823f4d..6e7dc90f7 100644 --- a/gems/ast-merge/lib/ast/merge/version.rb +++ b/gems/ast-merge/lib/ast/merge/version.rb @@ -3,7 +3,7 @@ module Ast module Merge module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/json-merge/.kettle-drift.lock b/gems/json-merge/.kettle-drift.lock index 98e9f541b..3aa07e7e9 100644 --- a/gems/json-merge/.kettle-drift.lock +++ b/gems/json-merge/.kettle-drift.lock @@ -8,7 +8,8 @@ 160, 200, 240, - 280 + 280, + 320 ] } ], @@ -21,7 +22,8 @@ 171, 211, 251, - 291 + 291, + 331 ] } ], @@ -34,7 +36,8 @@ 161, 201, 241, - 281 + 281, + 321 ] } ], @@ -47,7 +50,8 @@ 173, 213, 253, - 293 + 293, + 333 ] } ], @@ -60,7 +64,8 @@ 176, 216, 256, - 296 + 296, + 336 ] } ], @@ -73,7 +78,8 @@ 162, 202, 242, - 282 + 282, + 322 ] } ], @@ -87,7 +93,8 @@ 180, 220, 260, - 300 + 300, + 340 ] } ], @@ -100,7 +107,8 @@ 181, 221, 261, - 301 + 301, + 341 ] } ], @@ -114,7 +122,8 @@ 167, 207, 247, - 287 + 287, + 327 ] } ], @@ -127,7 +136,8 @@ 190, 230, 270, - 310 + 310, + 350 ] } ], @@ -141,7 +151,8 @@ 159, 199, 239, - 279 + 279, + 319 ] } ], @@ -155,7 +166,8 @@ 189, 229, 269, - 309 + 309, + 349 ] } ], @@ -168,7 +180,8 @@ 165, 205, 245, - 285 + 285, + 325 ] } ], @@ -182,7 +195,8 @@ 172, 212, 252, - 292 + 292, + 332 ] } ], @@ -196,7 +210,8 @@ 168, 208, 248, - 288 + 288, + 328 ] } ], @@ -209,7 +224,8 @@ 166, 206, 246, - 286 + 286, + 326 ] } ], @@ -222,7 +238,8 @@ 183, 223, 263, - 303 + 303, + 343 ] } ], @@ -235,7 +252,8 @@ 182, 222, 262, - 302 + 302, + 342 ] } ], @@ -248,7 +266,8 @@ 177, 217, 257, - 297 + 297, + 337 ] } ], @@ -261,7 +280,8 @@ 186, 226, 266, - 306 + 306, + 346 ] } ], diff --git a/gems/json-merge/.rubocop_gradual.lock b/gems/json-merge/.rubocop_gradual.lock deleted file mode 100644 index 1f13b2bf6..000000000 --- a/gems/json-merge/.rubocop_gradual.lock +++ /dev/null @@ -1,283 +0,0 @@ -{ - ".simplecov:3644224046": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:2931360525": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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:1457364349": [ - [16, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1168797721], - [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ], - "lib/json-merge.rb:4173905501": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`json-merge.rb`) should use snake_case.", 5381] - ], - "lib/json/merge.rb:2128431218": [ - [11, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Json::Merge`.", 2866359175], - [11, 3, 9848, "Metrics/ModuleLength: Module has too many lines. [271/100]", 4082365503], - [21, 5, 16, "Style/Documentation: Missing top-level documentation comment for `class Json::Merge::ParseError`.", 362242086], - [65, 5, 941, "Metrics/AbcSize: Assignment Branch Condition size for `parse_json` is too high. [<3, 19, 9> 21.24/17]", 2519832432], - [65, 5, 941, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_json` is too high. [8/7]", 2519832432], - [65, 5, 941, "Metrics/MethodLength: Method has too many lines. [24/10]", 2519832432], - [98, 5, 780, "Metrics/MethodLength: Method has too many lines. [17/10]", 3747710599], - [131, 5, 621, "Metrics/AbcSize: Assignment Branch Condition size for `json_value_for_source` is too high. [<3, 17, 7> 18.63/17]", 3652201615], - [131, 5, 621, "Metrics/MethodLength: Method has too many lines. [11/10]", 3652201615], - [147, 5, 759, "Metrics/AbcSize: Assignment Branch Condition size for `json_value_for_node` is too high. [<6, 21, 12> 24.92/17]", 2618715974], - [147, 5, 759, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `json_value_for_node` is too high. [13/7]", 2618715974], - [147, 5, 759, "Metrics/MethodLength: Method has too many lines. [23/10]", 2618715974], - [174, 5, 555, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `decode_json_string_literal` is too high. [11/7]", 4144578840], - [174, 5, 555, "Metrics/MethodLength: Method has too many lines. [16/10]", 4144578840], - [238, 5, 691, "Metrics/MethodLength: Method has too many lines. [18/10]", 4010630320], - [261, 5, 528, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_trailing_comma` is too high. [8/7]", 4057979016], - [261, 5, 528, "Metrics/MethodLength: Method has too many lines. [13/10]", 4057979016], - [302, 5, 787, "Metrics/AbcSize: Assignment Branch Condition size for `advance_scanner_state` is too high. [<8, 12, 24> 28/17]", 2437181548], - [302, 5, 787, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `advance_scanner_state` is too high. [15/7]", 2437181548], - [302, 5, 787, "Metrics/MethodLength: Method has too many lines. [25/10]", 2437181548], - [302, 5, 787, "Metrics/PerceivedComplexity: Perceived complexity for `advance_scanner_state` is too high. [17/8]", 2437181548] - ], - "lib/json/merge/comment_tracker.rb:3472563198": [ - [19, 48, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] - ], - "lib/json/merge/conflict_resolver.rb:301712181": [ - [11, 5, 55081, "Metrics/ClassLength: Class has too many lines. [1053/100]", 4044265605], - [33, 7, 998, "Metrics/MethodLength: Method has too many lines. [16/10]", 2622185411], - [33, 21, 308, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [12/5]", 958959236], - [34, 121, 95, "Layout/LineLength: Line is too long. [215/120]", 3448296820], - [58, 7, 1143, "Metrics/MethodLength: Method has too many lines. [21/10]", 2302471255], - [107, 7, 4969, "Metrics/AbcSize: Assignment Branch Condition size for `merge_node_lists_to_emitter` is too high. [<29, 62, 22> 71.9/17]", 3145241362], - [107, 7, 4969, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_node_lists_to_emitter` is too high. [20/7]", 3145241362], - [107, 7, 4969, "Metrics/MethodLength: Method has too many lines. [82/10]", 3145241362], - [107, 7, 4969, "Metrics/PerceivedComplexity: Perceived complexity for `merge_node_lists_to_emitter` is too high. [22/8]", 3145241362], - [146, 9, 2759, "Metrics/BlockLength: Block has too many lines. [50/25]", 385678694], - [239, 7, 5585, "Metrics/AbcSize: Assignment Branch Condition size for `merge_matched_nodes_to_emitter` is too high. [<15, 45, 20> 51.48/17]", 3947285535], - [239, 7, 5585, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_matched_nodes_to_emitter` is too high. [17/7]", 3947285535], - [239, 7, 5585, "Metrics/MethodLength: Method has too many lines. [102/10]", 3947285535], - [239, 7, 5585, "Metrics/PerceivedComplexity: Perceived complexity for `merge_matched_nodes_to_emitter` is too high. [21/8]", 3947285535], - [277, 13, 1934, "Metrics/BlockLength: Block has too many lines. [31/25]", 884303795], - [306, 17, 181, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 898629436], - [363, 7, 895, "Metrics/MethodLength: Method has too many lines. [23/10]", 2982353847], - [392, 7, 718, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preference_for_pair` is too high. [8/7]", 3339910669], - [392, 7, 718, "Metrics/MethodLength: Method has too many lines. [12/10]", 3339910669], - [418, 7, 1636, "Metrics/MethodLength: Method has too many lines. [37/10]", 514235298], - [473, 25, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [493, 7, 5501, "Metrics/AbcSize: Assignment Branch Condition size for `emit_node` is too high. [<18, 82, 31> 89.49/17]", 1826498333], - [493, 7, 5501, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_node` is too high. [29/7]", 1826498333], - [493, 7, 5501, "Metrics/MethodLength: Method has too many lines. [109/10]", 1826498333], - [493, 7, 5501, "Metrics/PerceivedComplexity: Perceived complexity for `emit_node` is too high. [36/8]", 1826498333], - [522, 15, 1572, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 3256756034], - [554, 15, 654, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 3730688879], - [569, 17, 287, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 3369588943], - [618, 7, 1424, "Metrics/AbcSize: Assignment Branch Condition size for `emit_atomic_node` is too high. [<7, 14, 7> 17.15/17]", 776263089], - [618, 7, 1424, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_atomic_node` is too high. [8/7]", 776263089], - [618, 7, 1424, "Metrics/MethodLength: Method has too many lines. [22/10]", 776263089], - [666, 7, 242, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `recursively_merge_pair_values?` is too high. [8/7]", 3319997574], - [682, 7, 1642, "Metrics/AbcSize: Assignment Branch Condition size for `preferred_available_inline_attachment` is too high. [<14, 14, 14> 24.25/17]", 1854381957], - [682, 7, 1642, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preferred_available_inline_attachment` is too high. [13/7]", 1854381957], - [682, 7, 1642, "Metrics/MethodLength: Method has too many lines. [27/10]", 1854381957], - [682, 7, 1642, "Metrics/PerceivedComplexity: Perceived complexity for `preferred_available_inline_attachment` is too high. [14/8]", 1854381957], - [682, 48, 154, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 358586640], - [687, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 4196003793], - [719, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], - [725, 33, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [730, 7, 1761, "Metrics/AbcSize: Assignment Branch Condition size for `emit_preferred_leading_comments_for` is too high. [<4, 39, 16> 42.34/17]", 1923098835], - [730, 7, 1761, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_preferred_leading_comments_for` is too high. [16/7]", 1923098835], - [730, 7, 1761, "Metrics/MethodLength: Method has too many lines. [26/10]", 1923098835], - [730, 7, 1761, "Metrics/PerceivedComplexity: Perceived complexity for `emit_preferred_leading_comments_for` is too high. [17/8]", 1923098835], - [764, 7, 1600, "Metrics/AbcSize: Assignment Branch Condition size for `emit_leading_comments_for` is too high. [<5, 37, 10> 38.65/17]", 2686936477], - [764, 7, 1600, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_leading_comments_for` is too high. [11/7]", 2686936477], - [764, 7, 1600, "Metrics/MethodLength: Method has too many lines. [26/10]", 2686936477], - [764, 7, 1600, "Metrics/PerceivedComplexity: Perceived complexity for `emit_leading_comments_for` is too high. [11/8]", 2686936477], - [765, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [799, 7, 1573, "Metrics/AbcSize: Assignment Branch Condition size for `canonical_leading_comment_region` is too high. [<8, 28, 14> 32.31/17]", 151098026], - [799, 7, 1573, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonical_leading_comment_region` is too high. [12/7]", 151098026], - [799, 7, 1573, "Metrics/MethodLength: Method has too many lines. [29/10]", 151098026], - [799, 7, 1573, "Metrics/PerceivedComplexity: Perceived complexity for `canonical_leading_comment_region` is too high. [12/8]", 151098026], - [837, 7, 1315, "Metrics/AbcSize: Assignment Branch Condition size for `canonical_tracked_leading_comments` is too high. [<8, 21, 12> 25.48/17]", 3806475230], - [837, 7, 1315, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonical_tracked_leading_comments` is too high. [11/7]", 3806475230], - [837, 7, 1315, "Metrics/MethodLength: Method has too many lines. [21/10]", 3806475230], - [837, 7, 1315, "Metrics/PerceivedComplexity: Perceived complexity for `canonical_tracked_leading_comments` is too high. [11/8]", 3806475230], - [867, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [872, 7, 574, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `dedup_warning_context` is too high. [9/7]", 840557709], - [872, 7, 574, "Metrics/PerceivedComplexity: Perceived complexity for `dedup_warning_context` is too high. [9/8]", 840557709], - [875, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [876, 48, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [877, 48, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], - [917, 7, 687, "Metrics/AbcSize: Assignment Branch Condition size for `equivalent_owner?` is too high. [<0, 17, 19> 25.5/17]", 1122406222], - [917, 7, 687, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `equivalent_owner?` is too high. [15/7]", 1122406222], - [917, 7, 687, "Metrics/MethodLength: Method has too many lines. [14/10]", 1122406222], - [917, 7, 687, "Metrics/PerceivedComplexity: Perceived complexity for `equivalent_owner?` is too high. [16/8]", 1122406222], - [957, 7, 762, "Metrics/MethodLength: Method has too many lines. [13/10]", 341822255], - [976, 7, 701, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `shared_line_comment_attachment_for` is too high. [9/7]", 2431043907], - [976, 7, 701, "Metrics/MethodLength: Method has too many lines. [13/10]", 2431043907], - [976, 7, 701, "Metrics/PerceivedComplexity: Perceived complexity for `shared_line_comment_attachment_for` is too high. [9/8]", 2431043907], - [1018, 7, 617, "Metrics/AbcSize: Assignment Branch Condition size for `emit_container_trailing_lines` is too high. [<2, 17, 3> 17.38/17]", 2119480325], - [1043, 7, 723, "Metrics/AbcSize: Assignment Branch Condition size for `trailing_container_line_range` is too high. [<4, 15, 11> 19.03/17]", 3162486186], - [1043, 7, 723, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trailing_container_line_range` is too high. [10/7]", 3162486186], - [1043, 7, 723, "Metrics/MethodLength: Method has too many lines. [13/10]", 3162486186], - [1043, 7, 723, "Metrics/PerceivedComplexity: Perceived complexity for `trailing_container_line_range` is too high. [11/8]", 3162486186], - [1061, 7, 503, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_comment_and_blank_lines_in_range` is too high. [9/7]", 2774366077], - [1061, 7, 503, "Metrics/MethodLength: Method has too many lines. [11/10]", 2774366077], - [1061, 7, 503, "Metrics/PerceivedComplexity: Perceived complexity for `emit_comment_and_blank_lines_in_range` is too high. [9/8]", 2774366077], - [1108, 7, 945, "Metrics/MethodLength: Method has too many lines. [14/10]", 1167897124], - [1155, 7, 832, "Metrics/AbcSize: Assignment Branch Condition size for `removed_inline_block_comment_at` is too high. [<6, 26, 7> 27.59/17]", 890096863], - [1155, 7, 832, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `removed_inline_block_comment_at` is too high. [8/7]", 890096863], - [1155, 7, 832, "Metrics/MethodLength: Method has too many lines. [19/10]", 890096863], - [1212, 7, 1587, "Metrics/AbcSize: Assignment Branch Condition size for `emit_document_prelude` is too high. [<12, 40, 22> 47.2/17]", 1354199117], - [1212, 7, 1587, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_document_prelude` is too high. [21/7]", 1354199117], - [1212, 7, 1587, "Metrics/MethodLength: Method has too many lines. [35/10]", 1354199117], - [1212, 7, 1587, "Metrics/PerceivedComplexity: Perceived complexity for `emit_document_prelude` is too high. [22/8]", 1354199117], - [1256, 7, 1281, "Metrics/AbcSize: Assignment Branch Condition size for `emit_document_postlude` is too high. [<9, 31, 21> 38.51/17]", 1869501446], - [1256, 7, 1281, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_document_postlude` is too high. [20/7]", 1869501446], - [1256, 7, 1281, "Metrics/MethodLength: Method has too many lines. [23/10]", 1869501446], - [1256, 7, 1281, "Metrics/PerceivedComplexity: Perceived complexity for `emit_document_postlude` is too high. [20/8]", 1869501446], - [1276, 121, 104, "Layout/LineLength: Line is too long. [224/120]", 1511565389], - [1288, 9, 48, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2339197345], - [1334, 7, 1002, "Metrics/AbcSize: Assignment Branch Condition size for `build_refined_matches` is too high. [<11, 16, 8> 21/17]", 2274245926], - [1334, 7, 1002, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_refined_matches` is too high. [9/7]", 2274245926], - [1334, 7, 1002, "Metrics/MethodLength: Method has too many lines. [18/10]", 2274245926], - [1334, 7, 1002, "Metrics/PerceivedComplexity: Perceived complexity for `build_refined_matches` is too high. [9/8]", 2274245926] - ], - "lib/json/merge/emitter.rb:3208422098": [ - [16, 5, 6329, "Metrics/ClassLength: Class has too many lines. [140/100]", 1868859478], - [183, 7, 586, "Metrics/MethodLength: Method has too many lines. [14/10]", 4015595961] - ], - "lib/json/merge/file_analysis.rb:1768951794": [ - [7, 5, 8750, "Metrics/ClassLength: Class has too many lines. [234/100]", 3986988439], - [20, 7, 897, "Metrics/MethodLength: Method has too many lines. [16/10]", 2945813957], - [83, 9, 6, "Naming/MemoizedInstanceVariableName: Memoized variable `@nodes` does not match method name `statements`. Use `@statements` instead.", 2756313398], - [182, 7, 530, "Metrics/MethodLength: Method has too many lines. [12/10]", 2217856870], - [202, 7, 601, "Metrics/MethodLength: Method has too many lines. [13/10]", 1694972597], - [222, 7, 679, "Metrics/AbcSize: Assignment Branch Condition size for `collect_parse_errors` is too high. [<1, 19, 11> 21.98/17]", 1780421309], - [222, 7, 679, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_parse_errors` is too high. [11/7]", 1780421309], - [222, 7, 679, "Metrics/MethodLength: Method has too many lines. [13/10]", 1780421309], - [222, 7, 679, "Metrics/PerceivedComplexity: Perceived complexity for `collect_parse_errors` is too high. [11/8]", 1780421309], - [239, 7, 1373, "Metrics/AbcSize: Assignment Branch Condition size for `extract_freeze_blocks` is too high. [<16, 23, 14> 31.32/17]", 2629976180], - [239, 7, 1373, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_freeze_blocks` is too high. [12/7]", 2629976180], - [239, 7, 1373, "Metrics/MethodLength: Method has too many lines. [33/10]", 2629976180], - [239, 7, 1373, "Metrics/PerceivedComplexity: Perceived complexity for `extract_freeze_blocks` is too high. [14/8]", 2629976180], - [283, 7, 575, "Metrics/AbcSize: Assignment Branch Condition size for `integrate_nodes_and_freeze_blocks` is too high. [<8, 19, 10> 22.91/17]", 1313409663], - [283, 7, 575, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `integrate_nodes_and_freeze_blocks` is too high. [11/7]", 1313409663], - [283, 7, 575, "Metrics/MethodLength: Method has too many lines. [13/10]", 1313409663], - [283, 7, 575, "Metrics/PerceivedComplexity: Perceived complexity for `integrate_nodes_and_freeze_blocks` is too high. [11/8]", 1313409663] - ], - "lib/json/merge/freeze_node.rb:340454761": [ - [11, 21, 97, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 4181995290] - ], - "lib/json/merge/merge_result.rb:1135594830": [ - [140, 7, 421, "Metrics/MethodLength: Method has too many lines. [11/10]", 2459390040] - ], - "lib/json/merge/node_wrapper.rb:3026997700": [ - [7, 5, 5691, "Metrics/ClassLength: Class has too many lines. [189/100]", 2496649131], - [71, 7, 397, "Metrics/MethodLength: Method has too many lines. [11/10]", 3404369104], - [173, 7, 1322, "Metrics/AbcSize: Assignment Branch Condition size for `compute_signature` is too high. [<10, 26, 24> 36.77/17]", 2934899487], - [173, 7, 1322, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_signature` is too high. [22/7]", 2934899487], - [173, 7, 1322, "Metrics/MethodLength: Method has too many lines. [41/10]", 2934899487], - [173, 7, 1322, "Metrics/PerceivedComplexity: Perceived complexity for `compute_signature` is too high. [18/8]", 2934899487], - [220, 7, 831, "Metrics/AbcSize: Assignment Branch Condition size for `extract_object_keys` is too high. [<8, 13, 10> 18.25/17]", 4156563372], - [220, 7, 831, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_object_keys` is too high. [10/7]", 4156563372], - [220, 7, 831, "Metrics/MethodLength: Method has too many lines. [22/10]", 4156563372], - [220, 7, 831, "Metrics/PerceivedComplexity: Perceived complexity for `extract_object_keys` is too high. [10/8]", 4156563372] - ], - "lib/json/merge/object_match_refiner.rb:337747923": [ - [29, 5, 10245, "Metrics/ClassLength: Class has too many lines. [143/100]", 1652456083], - [148, 7, 652, "Metrics/AbcSize: Assignment Branch Condition size for `compute_object_similarity` is too high. [<6, 18, 4> 19.39/17]", 1704835547], - [172, 7, 382, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_fuzzy_key_matches` is too high. [8/7]", 1938411487], - [226, 7, 709, "Metrics/MethodLength: Method has too many lines. [13/10]", 1853541937], - [277, 23, 9, "Style/NumericPredicate: Use `len1.zero?` instead of `len1 == 0`.", 913205219], - [277, 36, 9, "Style/NumericPredicate: Use `len2.zero?` instead of `len2 == 0`.", 871697920], - [278, 23, 9, "Style/NumericPredicate: Use `len1.zero?` instead of `len1 == 0`.", 913205219], - [278, 36, 9, "Style/NumericPredicate: Use `len2.zero?` instead of `len2 == 0`.", 871697920], - [305, 7, 854, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<13, 29, 8> 32.77/17]", 2946547420], - [305, 7, 854, "Metrics/MethodLength: Method has too many lines. [20/10]", 2946547420] - ], - "lib/json/merge/smart_merger.rb:1431245415": [ - [24, 5, 8706, "Metrics/ClassLength: Class has too many lines. [183/100]", 745649819], - [44, 7, 1369, "Metrics/MethodLength: Method has too many lines. [20/10]", 1509468182], - [44, 21, 472, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [15/5]", 700498762], - [117, 7, 1318, "Metrics/AbcSize: Assignment Branch Condition size for `merge_with_debug` is too high. [<3, 24, 7> 25.18/17]", 1535809936], - [117, 7, 1318, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_with_debug` is too high. [8/7]", 1535809936], - [117, 7, 1318, "Metrics/MethodLength: Method has too many lines. [30/10]", 1535809936], - [188, 7, 574, "Metrics/MethodLength: Method has too many lines. [13/10]", 1857730257], - [221, 7, 1053, "Metrics/MethodLength: Method has too many lines. [24/10]", 3329630813] - ], - "spec/fixtures_integration_spec.rb:2941021946": [ - [3, 1, 7914, "Metrics/BlockLength: Block has too many lines. [163/25]", 4258553307], - [85, 60, 25, "Style/SymbolProc: Pass `&:compact` as an argument to `map` instead of a block.", 2107480170], - [93, 59, 25, "Style/SymbolProc: Pass `&:compact` as an argument to `map` instead of a block.", 2107480170], - [157, 3, 801, "Metrics/BlockLength: Block has too many lines. [27/25]", 716259872] - ], - "spec/reproducible_merge_spec.rb:133932627": [ - [5, 1, 1854, "Metrics/BlockLength: Block has too many lines. [40/25]", 671932104] - ] -} diff --git a/gems/json-merge/Gemfile b/gems/json-merge/Gemfile index 3cfe7f4a6..d806d806a 100644 --- a/gems/json-merge/Gemfile +++ b/gems/json-merge/Gemfile @@ -312,6 +312,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/json-merge/Gemfile.lock b/gems/json-merge/Gemfile.lock index 937db6db5..86f853d22 100644 --- a/gems/json-merge/Gemfile.lock +++ b/gems/json-merge/Gemfile.lock @@ -1,13 +1,3 @@ -GIT - remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a - branch: fix/ruby-parser-api-methods - glob: packages/ruby/*.gemspec - specs: - tree_sitter_language_pack (1.12.5) - rb_sys (>= 0.9, < 0.9.128) - sorbet-runtime (~> 0.5) - PATH remote: . specs: @@ -16,6 +6,288 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby + specs: + tree_sitter_language_pack (1.12.5) + rb_sys (>= 0.9, < 0.9.128) + sorbet-runtime (~> 0.5) + GEM remote: https://gem.coop/ specs: @@ -27,11 +299,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +307,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -48,7 +321,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -104,15 +376,6 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -131,6 +394,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,25 +534,23 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -322,11 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -373,23 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-drift! + kettle-jem! + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -398,38 +682,61 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -442,20 +749,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -470,10 +784,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -481,6 +799,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -508,17 +827,19 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -532,14 +853,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -547,6 +873,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/json-merge/lib/json/merge/version.rb b/gems/json-merge/lib/json/merge/version.rb index 13f521eb3..d02d9f1a5 100644 --- a/gems/json-merge/lib/json/merge/version.rb +++ b/gems/json-merge/lib/json/merge/version.rb @@ -3,7 +3,7 @@ module Json module Merge module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/markly-merge/Gemfile.lock b/gems/markly-merge/Gemfile.lock index 38b789f7e..31b99ab8d 100644 --- a/gems/markly-merge/Gemfile.lock +++ b/gems/markly-merge/Gemfile.lock @@ -7,13 +7,264 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: markdown-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -32,11 +283,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -45,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -108,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -276,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -328,11 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -379,24 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -405,31 +682,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -437,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -449,15 +750,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 @@ -479,10 +785,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -490,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -517,9 +828,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -528,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -541,14 +856,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -556,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/plain-merge/.kettle-drift.lock b/gems/plain-merge/.kettle-drift.lock index 98e9f541b..3aa07e7e9 100644 --- a/gems/plain-merge/.kettle-drift.lock +++ b/gems/plain-merge/.kettle-drift.lock @@ -8,7 +8,8 @@ 160, 200, 240, - 280 + 280, + 320 ] } ], @@ -21,7 +22,8 @@ 171, 211, 251, - 291 + 291, + 331 ] } ], @@ -34,7 +36,8 @@ 161, 201, 241, - 281 + 281, + 321 ] } ], @@ -47,7 +50,8 @@ 173, 213, 253, - 293 + 293, + 333 ] } ], @@ -60,7 +64,8 @@ 176, 216, 256, - 296 + 296, + 336 ] } ], @@ -73,7 +78,8 @@ 162, 202, 242, - 282 + 282, + 322 ] } ], @@ -87,7 +93,8 @@ 180, 220, 260, - 300 + 300, + 340 ] } ], @@ -100,7 +107,8 @@ 181, 221, 261, - 301 + 301, + 341 ] } ], @@ -114,7 +122,8 @@ 167, 207, 247, - 287 + 287, + 327 ] } ], @@ -127,7 +136,8 @@ 190, 230, 270, - 310 + 310, + 350 ] } ], @@ -141,7 +151,8 @@ 159, 199, 239, - 279 + 279, + 319 ] } ], @@ -155,7 +166,8 @@ 189, 229, 269, - 309 + 309, + 349 ] } ], @@ -168,7 +180,8 @@ 165, 205, 245, - 285 + 285, + 325 ] } ], @@ -182,7 +195,8 @@ 172, 212, 252, - 292 + 292, + 332 ] } ], @@ -196,7 +210,8 @@ 168, 208, 248, - 288 + 288, + 328 ] } ], @@ -209,7 +224,8 @@ 166, 206, 246, - 286 + 286, + 326 ] } ], @@ -222,7 +238,8 @@ 183, 223, 263, - 303 + 303, + 343 ] } ], @@ -235,7 +252,8 @@ 182, 222, 262, - 302 + 302, + 342 ] } ], @@ -248,7 +266,8 @@ 177, 217, 257, - 297 + 297, + 337 ] } ], @@ -261,7 +280,8 @@ 186, 226, 266, - 306 + 306, + 346 ] } ], diff --git a/gems/plain-merge/.rubocop_gradual.lock b/gems/plain-merge/.rubocop_gradual.lock deleted file mode 100644 index 2200cf1b9..000000000 --- a/gems/plain-merge/.rubocop_gradual.lock +++ /dev/null @@ -1,106 +0,0 @@ -{ - ".simplecov:3133826638": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "Rakefile:4149951629": [ - [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], - [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], - [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], - [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] - ], - "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ - [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.", 177542] - ], - "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ - [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.", 177542] - ], - "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ - [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.", 177542] - ], - "gemfiles/modular/rspec.gemfile:2263543889": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] - ], - "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ - [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.", 177542] - ], - "gemfiles/modular/x_std_libs.gemfile:2324400122": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] - ], - "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ - [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] - ], - "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ - [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] - ], - "lib/plain-merge.rb:619298015": [ - [1, 1, 0, "Naming/FileName: The name of this source file (`plain-merge.rb`) should use snake_case.", 5381] - ], - "lib/plain/merge.rb:3584995729": [ - [9, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Plain::Merge`.", 2866359175], - [9, 3, 7932, "Metrics/ModuleLength: Module has too many lines. [211/100]", 719656966], - [42, 5, 645, "Metrics/MethodLength: Method has too many lines. [21/10]", 3773389417], - [69, 5, 513, "Metrics/AbcSize: Assignment Branch Condition size for `similarity_score` is too high. [<9, 17, 3> 19.47/17]", 594433443], - [69, 5, 513, "Metrics/MethodLength: Method has too many lines. [12/10]", 594433443], - [87, 9, 10, "Naming/PredicatePrefix: Rename `is_similar` to `similar?`.", 1730577729], - [96, 5, 2163, "Metrics/AbcSize: Assignment Branch Condition size for `match_text_blocks` is too high. [<25, 36, 16> 46.66/17]", 1824707567], - [96, 5, 2163, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `match_text_blocks` is too high. [14/7]", 1824707567], - [96, 5, 2163, "Metrics/MethodLength: Method has too many lines. [50/10]", 1824707567], - [96, 5, 2163, "Metrics/PerceivedComplexity: Perceived complexity for `match_text_blocks` is too high. [14/8]", 1824707567], - [119, 7, 1032, "Style/CombinableLoops: Combine this loop with the previous loop.", 2654397768], - [158, 5, 683, "Metrics/AbcSize: Assignment Branch Condition size for `merge_text` is too high. [<11, 16, 4> 19.82/17]", 3448903566], - [158, 5, 683, "Metrics/MethodLength: Method has too many lines. [14/10]", 3448903566], - [178, 5, 633, "Metrics/AbcSize: Assignment Branch Condition size for `refined_text_similarity` is too high. [<3, 17, 0> 17.26/17]", 2185070085], - [208, 5, 700, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<8, 31, 8> 33/17]", 1827550752], - [208, 5, 700, "Metrics/MethodLength: Method has too many lines. [18/10]", 1827550752] - ], - "plain-merge.gemspec:3762840848": [ - [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], - [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], - [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], - [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] - ], - "spec/fixtures_integration_spec.rb:922433761": [ - [3, 1, 3550, "Metrics/BlockLength: Block has too many lines. [77/25]", 4225834063] - ] -} diff --git a/gems/plain-merge/Gemfile b/gems/plain-merge/Gemfile index f4c3f25f7..3400b4412 100644 --- a/gems/plain-merge/Gemfile +++ b/gems/plain-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source 'https://gem.coop' +source "https://gem.coop" git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,18 +19,62 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ['~> 1.0', '>= 1.0.8'] -gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ["~> 1.0", ">= 1.0.8"] +gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ast-merge tree_haver ] -direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') +direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? + +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) + direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") + direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == "nomono" } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + if nomono_locked + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] + end + end + Kernel.send(:gem, "nomono", *nomono_activation_requirements) + require "nomono/bundler" + if direct_sibling_templating && !direct_sibling_local + ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + end + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: "STRUCTUREDMERGE", + path_env: "STRUCTUREDMERGE_DEV", + root: ["src", "my", "structuredmerge"] + ) + rescue LoadError + warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + else + ENV.delete("STRUCTUREDMERGE_DEV") + end + end + end +end if direct_sibling_gems.any? && (direct_sibling_local || @@ -330,25 +374,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? +eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? # Debugging -eval_gemfile 'gemfiles/modular/debug.gemfile' +eval_gemfile "gemfiles/modular/debug.gemfile" # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile 'gemfiles/modular/coverage.gemfile' +eval_gemfile "gemfiles/modular/coverage.gemfile" # Linting -eval_gemfile 'gemfiles/modular/style.gemfile' +eval_gemfile "gemfiles/modular/style.gemfile" # Documentation -eval_gemfile 'gemfiles/modular/documentation.gemfile' +eval_gemfile "gemfiles/modular/documentation.gemfile" # Optional -eval_gemfile 'gemfiles/modular/optional.gemfile' +eval_gemfile "gemfiles/modular/optional.gemfile" ### Std Lib Extracted Gems -eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' +eval_gemfile "gemfiles/modular/x_std_libs.gemfile" # See unlocked_deps appraisal for more details on irb inclusion -gem 'irb', '~> 1.17' # ruby >= 2.7 +gem "irb", "~> 1.17" # ruby >= 2.7 diff --git a/gems/plain-merge/Gemfile.lock b/gems/plain-merge/Gemfile.lock index 502a6d94b..a9cf2d227 100644 --- a/gems/plain-merge/Gemfile.lock +++ b/gems/plain-merge/Gemfile.lock @@ -1,13 +1,3 @@ -GIT - remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a - branch: fix/ruby-parser-api-methods - glob: packages/ruby/*.gemspec - specs: - tree_sitter_language_pack (1.12.5) - rb_sys (>= 0.9, < 0.9.128) - sorbet-runtime (~> 0.5) - PATH remote: . specs: @@ -16,6 +6,288 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-drift + specs: + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) + +PATH + remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover + specs: + kettle-soup-cover (3.0.1) + simplecov (>= 1.0) + simplecov-cobertura (>= 4.0) + simplecov-console (~> 0.9, >= 0.9.5) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_lcov_formatter (~> 0.9, >= 0.9.0) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby + specs: + tree_sitter_language_pack (1.12.5) + rb_sys (>= 0.9, < 0.9.128) + sorbet-runtime (~> 0.5) + GEM remote: https://gem.coop/ specs: @@ -27,11 +299,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +307,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -48,7 +321,6 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) - docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -104,15 +376,6 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) - kettle-soup-cover (1.1.3) - simplecov (~> 0.22) - simplecov-cobertura (~> 3.0) - simplecov-console (~> 0.9, >= 0.9.3) - simplecov-html (~> 0.13, >= 0.13.1) - simplecov-lcov (~> 0.8) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_json_formatter (~> 0.1, >= 0.1.4) - version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -131,6 +394,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,25 +534,23 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.2.0) + simplecov (1.0.2) + simplecov-cobertura (4.0.0) rexml - simplecov (~> 0.19) + simplecov (~> 1.0) simplecov-console (0.9.5) ansi simplecov terminal-table - simplecov-html (0.13.2) - simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_json_formatter (0.1.4) + simplecov_lcov_formatter (0.9.0) + simplecov (>= 0.18) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -322,11 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -373,23 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-soup-cover (~> 1.0, >= 1.1.3) + kettle-drift! + kettle-jem! + kettle-soup-cover! kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -398,38 +682,61 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -442,19 +749,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad + kettle-soup-cover (3.0.1) kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -469,11 +784,14 @@ 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.0) plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -481,6 +799,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -508,17 +827,19 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 + simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 - simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 - simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -532,14 +853,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -547,6 +873,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/plain-merge/Rakefile b/gems/plain-merge/Rakefile index c1132c880..571409183 100644 --- a/gems/plain-merge/Rakefile +++ b/gems/plain-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require 'kettle/drift' + require "kettle/drift" Kettle::Drift.install_tasks rescue LoadError - desc('(stub) kettle:drift:check is unavailable') - task('kettle:drift:check') do + desc("(stub) kettle:drift:check is unavailable") + task("kettle:drift:check") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:update is unavailable') - task('kettle:drift:update') do + desc("(stub) kettle:drift:update is unavailable") + task("kettle:drift:update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift:force_update is unavailable') - task('kettle:drift:force_update') do + desc("(stub) kettle:drift:force_update is unavailable") + task("kettle:drift:force_update") do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc('(stub) kettle:drift is unavailable') - task('kettle:drift' => 'kettle:drift:update') + desc("(stub) kettle:drift is unavailable") + task("kettle:drift" => "kettle:drift:update") end ### TEMPLATING TASKS diff --git a/gems/plain-merge/bin/yard b/gems/plain-merge/bin/yard index 5d516ad6f..a7e8b6eed 100755 --- a/gems/plain-merge/bin/yard +++ b/gems/plain-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec('bundle', 'exec', 'rake', 'yard') +exec("bundle", "exec", "rake", "yard") diff --git a/gems/plain-merge/lib/plain/merge/version.rb b/gems/plain-merge/lib/plain/merge/version.rb index e6b3a5844..aab4f67c1 100644 --- a/gems/plain-merge/lib/plain/merge/version.rb +++ b/gems/plain-merge/lib/plain/merge/version.rb @@ -3,7 +3,7 @@ module Plain module Merge module Version - VERSION = '7.1.0' + VERSION = "7.1.0" end VERSION = Version::VERSION # Traditional Constant Location end From 33e0c85d1523672aa2199dd822d86d8803a2a84b Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:37:16 -0600 Subject: [PATCH 254/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/json-merge/.rubocop_gradual.lock | 283 +++++++++++++ gems/json-merge/Gemfile.lock | 421 +++----------------- gems/json-merge/lib/json/merge/version.rb | 2 +- gems/plain-merge/.rubocop_gradual.lock | 106 +++++ gems/plain-merge/Gemfile | 68 ++-- gems/plain-merge/Gemfile.lock | 378 ++---------------- gems/plain-merge/Rakefile | 18 +- gems/plain-merge/bin/yard | 2 +- gems/plain-merge/lib/plain/merge/version.rb | 2 +- 9 files changed, 509 insertions(+), 771 deletions(-) create mode 100644 gems/json-merge/.rubocop_gradual.lock create mode 100644 gems/plain-merge/.rubocop_gradual.lock diff --git a/gems/json-merge/.rubocop_gradual.lock b/gems/json-merge/.rubocop_gradual.lock new file mode 100644 index 000000000..1f13b2bf6 --- /dev/null +++ b/gems/json-merge/.rubocop_gradual.lock @@ -0,0 +1,283 @@ +{ + ".simplecov:3644224046": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:2931360525": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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:1457364349": [ + [16, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1168797721], + [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ], + "lib/json-merge.rb:4173905501": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`json-merge.rb`) should use snake_case.", 5381] + ], + "lib/json/merge.rb:2128431218": [ + [11, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Json::Merge`.", 2866359175], + [11, 3, 9848, "Metrics/ModuleLength: Module has too many lines. [271/100]", 4082365503], + [21, 5, 16, "Style/Documentation: Missing top-level documentation comment for `class Json::Merge::ParseError`.", 362242086], + [65, 5, 941, "Metrics/AbcSize: Assignment Branch Condition size for `parse_json` is too high. [<3, 19, 9> 21.24/17]", 2519832432], + [65, 5, 941, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_json` is too high. [8/7]", 2519832432], + [65, 5, 941, "Metrics/MethodLength: Method has too many lines. [24/10]", 2519832432], + [98, 5, 780, "Metrics/MethodLength: Method has too many lines. [17/10]", 3747710599], + [131, 5, 621, "Metrics/AbcSize: Assignment Branch Condition size for `json_value_for_source` is too high. [<3, 17, 7> 18.63/17]", 3652201615], + [131, 5, 621, "Metrics/MethodLength: Method has too many lines. [11/10]", 3652201615], + [147, 5, 759, "Metrics/AbcSize: Assignment Branch Condition size for `json_value_for_node` is too high. [<6, 21, 12> 24.92/17]", 2618715974], + [147, 5, 759, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `json_value_for_node` is too high. [13/7]", 2618715974], + [147, 5, 759, "Metrics/MethodLength: Method has too many lines. [23/10]", 2618715974], + [174, 5, 555, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `decode_json_string_literal` is too high. [11/7]", 4144578840], + [174, 5, 555, "Metrics/MethodLength: Method has too many lines. [16/10]", 4144578840], + [238, 5, 691, "Metrics/MethodLength: Method has too many lines. [18/10]", 4010630320], + [261, 5, 528, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_trailing_comma` is too high. [8/7]", 4057979016], + [261, 5, 528, "Metrics/MethodLength: Method has too many lines. [13/10]", 4057979016], + [302, 5, 787, "Metrics/AbcSize: Assignment Branch Condition size for `advance_scanner_state` is too high. [<8, 12, 24> 28/17]", 2437181548], + [302, 5, 787, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `advance_scanner_state` is too high. [15/7]", 2437181548], + [302, 5, 787, "Metrics/MethodLength: Method has too many lines. [25/10]", 2437181548], + [302, 5, 787, "Metrics/PerceivedComplexity: Perceived complexity for `advance_scanner_state` is too high. [17/8]", 2437181548] + ], + "lib/json/merge/comment_tracker.rb:3472563198": [ + [19, 48, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] + ], + "lib/json/merge/conflict_resolver.rb:301712181": [ + [11, 5, 55081, "Metrics/ClassLength: Class has too many lines. [1053/100]", 4044265605], + [33, 7, 998, "Metrics/MethodLength: Method has too many lines. [16/10]", 2622185411], + [33, 21, 308, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [12/5]", 958959236], + [34, 121, 95, "Layout/LineLength: Line is too long. [215/120]", 3448296820], + [58, 7, 1143, "Metrics/MethodLength: Method has too many lines. [21/10]", 2302471255], + [107, 7, 4969, "Metrics/AbcSize: Assignment Branch Condition size for `merge_node_lists_to_emitter` is too high. [<29, 62, 22> 71.9/17]", 3145241362], + [107, 7, 4969, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_node_lists_to_emitter` is too high. [20/7]", 3145241362], + [107, 7, 4969, "Metrics/MethodLength: Method has too many lines. [82/10]", 3145241362], + [107, 7, 4969, "Metrics/PerceivedComplexity: Perceived complexity for `merge_node_lists_to_emitter` is too high. [22/8]", 3145241362], + [146, 9, 2759, "Metrics/BlockLength: Block has too many lines. [50/25]", 385678694], + [239, 7, 5585, "Metrics/AbcSize: Assignment Branch Condition size for `merge_matched_nodes_to_emitter` is too high. [<15, 45, 20> 51.48/17]", 3947285535], + [239, 7, 5585, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_matched_nodes_to_emitter` is too high. [17/7]", 3947285535], + [239, 7, 5585, "Metrics/MethodLength: Method has too many lines. [102/10]", 3947285535], + [239, 7, 5585, "Metrics/PerceivedComplexity: Perceived complexity for `merge_matched_nodes_to_emitter` is too high. [21/8]", 3947285535], + [277, 13, 1934, "Metrics/BlockLength: Block has too many lines. [31/25]", 884303795], + [306, 17, 181, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 898629436], + [363, 7, 895, "Metrics/MethodLength: Method has too many lines. [23/10]", 2982353847], + [392, 7, 718, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preference_for_pair` is too high. [8/7]", 3339910669], + [392, 7, 718, "Metrics/MethodLength: Method has too many lines. [12/10]", 3339910669], + [418, 7, 1636, "Metrics/MethodLength: Method has too many lines. [37/10]", 514235298], + [473, 25, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [493, 7, 5501, "Metrics/AbcSize: Assignment Branch Condition size for `emit_node` is too high. [<18, 82, 31> 89.49/17]", 1826498333], + [493, 7, 5501, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_node` is too high. [29/7]", 1826498333], + [493, 7, 5501, "Metrics/MethodLength: Method has too many lines. [109/10]", 1826498333], + [493, 7, 5501, "Metrics/PerceivedComplexity: Perceived complexity for `emit_node` is too high. [36/8]", 1826498333], + [522, 15, 1572, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 3256756034], + [554, 15, 654, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 3730688879], + [569, 17, 287, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 3369588943], + [618, 7, 1424, "Metrics/AbcSize: Assignment Branch Condition size for `emit_atomic_node` is too high. [<7, 14, 7> 17.15/17]", 776263089], + [618, 7, 1424, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_atomic_node` is too high. [8/7]", 776263089], + [618, 7, 1424, "Metrics/MethodLength: Method has too many lines. [22/10]", 776263089], + [666, 7, 242, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `recursively_merge_pair_values?` is too high. [8/7]", 3319997574], + [682, 7, 1642, "Metrics/AbcSize: Assignment Branch Condition size for `preferred_available_inline_attachment` is too high. [<14, 14, 14> 24.25/17]", 1854381957], + [682, 7, 1642, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preferred_available_inline_attachment` is too high. [13/7]", 1854381957], + [682, 7, 1642, "Metrics/MethodLength: Method has too many lines. [27/10]", 1854381957], + [682, 7, 1642, "Metrics/PerceivedComplexity: Perceived complexity for `preferred_available_inline_attachment` is too high. [14/8]", 1854381957], + [682, 48, 154, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 358586640], + [687, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 4196003793], + [719, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], + [725, 33, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [730, 7, 1761, "Metrics/AbcSize: Assignment Branch Condition size for `emit_preferred_leading_comments_for` is too high. [<4, 39, 16> 42.34/17]", 1923098835], + [730, 7, 1761, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_preferred_leading_comments_for` is too high. [16/7]", 1923098835], + [730, 7, 1761, "Metrics/MethodLength: Method has too many lines. [26/10]", 1923098835], + [730, 7, 1761, "Metrics/PerceivedComplexity: Perceived complexity for `emit_preferred_leading_comments_for` is too high. [17/8]", 1923098835], + [764, 7, 1600, "Metrics/AbcSize: Assignment Branch Condition size for `emit_leading_comments_for` is too high. [<5, 37, 10> 38.65/17]", 2686936477], + [764, 7, 1600, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_leading_comments_for` is too high. [11/7]", 2686936477], + [764, 7, 1600, "Metrics/MethodLength: Method has too many lines. [26/10]", 2686936477], + [764, 7, 1600, "Metrics/PerceivedComplexity: Perceived complexity for `emit_leading_comments_for` is too high. [11/8]", 2686936477], + [765, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [799, 7, 1573, "Metrics/AbcSize: Assignment Branch Condition size for `canonical_leading_comment_region` is too high. [<8, 28, 14> 32.31/17]", 151098026], + [799, 7, 1573, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonical_leading_comment_region` is too high. [12/7]", 151098026], + [799, 7, 1573, "Metrics/MethodLength: Method has too many lines. [29/10]", 151098026], + [799, 7, 1573, "Metrics/PerceivedComplexity: Perceived complexity for `canonical_leading_comment_region` is too high. [12/8]", 151098026], + [837, 7, 1315, "Metrics/AbcSize: Assignment Branch Condition size for `canonical_tracked_leading_comments` is too high. [<8, 21, 12> 25.48/17]", 3806475230], + [837, 7, 1315, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `canonical_tracked_leading_comments` is too high. [11/7]", 3806475230], + [837, 7, 1315, "Metrics/MethodLength: Method has too many lines. [21/10]", 3806475230], + [837, 7, 1315, "Metrics/PerceivedComplexity: Perceived complexity for `canonical_tracked_leading_comments` is too high. [11/8]", 3806475230], + [867, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [872, 7, 574, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `dedup_warning_context` is too high. [9/7]", 840557709], + [872, 7, 574, "Metrics/PerceivedComplexity: Perceived complexity for `dedup_warning_context` is too high. [9/8]", 840557709], + [875, 27, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [876, 48, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [877, 48, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [917, 7, 687, "Metrics/AbcSize: Assignment Branch Condition size for `equivalent_owner?` is too high. [<0, 17, 19> 25.5/17]", 1122406222], + [917, 7, 687, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `equivalent_owner?` is too high. [15/7]", 1122406222], + [917, 7, 687, "Metrics/MethodLength: Method has too many lines. [14/10]", 1122406222], + [917, 7, 687, "Metrics/PerceivedComplexity: Perceived complexity for `equivalent_owner?` is too high. [16/8]", 1122406222], + [957, 7, 762, "Metrics/MethodLength: Method has too many lines. [13/10]", 341822255], + [976, 7, 701, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `shared_line_comment_attachment_for` is too high. [9/7]", 2431043907], + [976, 7, 701, "Metrics/MethodLength: Method has too many lines. [13/10]", 2431043907], + [976, 7, 701, "Metrics/PerceivedComplexity: Perceived complexity for `shared_line_comment_attachment_for` is too high. [9/8]", 2431043907], + [1018, 7, 617, "Metrics/AbcSize: Assignment Branch Condition size for `emit_container_trailing_lines` is too high. [<2, 17, 3> 17.38/17]", 2119480325], + [1043, 7, 723, "Metrics/AbcSize: Assignment Branch Condition size for `trailing_container_line_range` is too high. [<4, 15, 11> 19.03/17]", 3162486186], + [1043, 7, 723, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trailing_container_line_range` is too high. [10/7]", 3162486186], + [1043, 7, 723, "Metrics/MethodLength: Method has too many lines. [13/10]", 3162486186], + [1043, 7, 723, "Metrics/PerceivedComplexity: Perceived complexity for `trailing_container_line_range` is too high. [11/8]", 3162486186], + [1061, 7, 503, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_comment_and_blank_lines_in_range` is too high. [9/7]", 2774366077], + [1061, 7, 503, "Metrics/MethodLength: Method has too many lines. [11/10]", 2774366077], + [1061, 7, 503, "Metrics/PerceivedComplexity: Perceived complexity for `emit_comment_and_blank_lines_in_range` is too high. [9/8]", 2774366077], + [1108, 7, 945, "Metrics/MethodLength: Method has too many lines. [14/10]", 1167897124], + [1155, 7, 832, "Metrics/AbcSize: Assignment Branch Condition size for `removed_inline_block_comment_at` is too high. [<6, 26, 7> 27.59/17]", 890096863], + [1155, 7, 832, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `removed_inline_block_comment_at` is too high. [8/7]", 890096863], + [1155, 7, 832, "Metrics/MethodLength: Method has too many lines. [19/10]", 890096863], + [1212, 7, 1587, "Metrics/AbcSize: Assignment Branch Condition size for `emit_document_prelude` is too high. [<12, 40, 22> 47.2/17]", 1354199117], + [1212, 7, 1587, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_document_prelude` is too high. [21/7]", 1354199117], + [1212, 7, 1587, "Metrics/MethodLength: Method has too many lines. [35/10]", 1354199117], + [1212, 7, 1587, "Metrics/PerceivedComplexity: Perceived complexity for `emit_document_prelude` is too high. [22/8]", 1354199117], + [1256, 7, 1281, "Metrics/AbcSize: Assignment Branch Condition size for `emit_document_postlude` is too high. [<9, 31, 21> 38.51/17]", 1869501446], + [1256, 7, 1281, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_document_postlude` is too high. [20/7]", 1869501446], + [1256, 7, 1281, "Metrics/MethodLength: Method has too many lines. [23/10]", 1869501446], + [1256, 7, 1281, "Metrics/PerceivedComplexity: Perceived complexity for `emit_document_postlude` is too high. [20/8]", 1869501446], + [1276, 121, 104, "Layout/LineLength: Line is too long. [224/120]", 1511565389], + [1288, 9, 48, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 2339197345], + [1334, 7, 1002, "Metrics/AbcSize: Assignment Branch Condition size for `build_refined_matches` is too high. [<11, 16, 8> 21/17]", 2274245926], + [1334, 7, 1002, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_refined_matches` is too high. [9/7]", 2274245926], + [1334, 7, 1002, "Metrics/MethodLength: Method has too many lines. [18/10]", 2274245926], + [1334, 7, 1002, "Metrics/PerceivedComplexity: Perceived complexity for `build_refined_matches` is too high. [9/8]", 2274245926] + ], + "lib/json/merge/emitter.rb:3208422098": [ + [16, 5, 6329, "Metrics/ClassLength: Class has too many lines. [140/100]", 1868859478], + [183, 7, 586, "Metrics/MethodLength: Method has too many lines. [14/10]", 4015595961] + ], + "lib/json/merge/file_analysis.rb:1768951794": [ + [7, 5, 8750, "Metrics/ClassLength: Class has too many lines. [234/100]", 3986988439], + [20, 7, 897, "Metrics/MethodLength: Method has too many lines. [16/10]", 2945813957], + [83, 9, 6, "Naming/MemoizedInstanceVariableName: Memoized variable `@nodes` does not match method name `statements`. Use `@statements` instead.", 2756313398], + [182, 7, 530, "Metrics/MethodLength: Method has too many lines. [12/10]", 2217856870], + [202, 7, 601, "Metrics/MethodLength: Method has too many lines. [13/10]", 1694972597], + [222, 7, 679, "Metrics/AbcSize: Assignment Branch Condition size for `collect_parse_errors` is too high. [<1, 19, 11> 21.98/17]", 1780421309], + [222, 7, 679, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collect_parse_errors` is too high. [11/7]", 1780421309], + [222, 7, 679, "Metrics/MethodLength: Method has too many lines. [13/10]", 1780421309], + [222, 7, 679, "Metrics/PerceivedComplexity: Perceived complexity for `collect_parse_errors` is too high. [11/8]", 1780421309], + [239, 7, 1373, "Metrics/AbcSize: Assignment Branch Condition size for `extract_freeze_blocks` is too high. [<16, 23, 14> 31.32/17]", 2629976180], + [239, 7, 1373, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_freeze_blocks` is too high. [12/7]", 2629976180], + [239, 7, 1373, "Metrics/MethodLength: Method has too many lines. [33/10]", 2629976180], + [239, 7, 1373, "Metrics/PerceivedComplexity: Perceived complexity for `extract_freeze_blocks` is too high. [14/8]", 2629976180], + [283, 7, 575, "Metrics/AbcSize: Assignment Branch Condition size for `integrate_nodes_and_freeze_blocks` is too high. [<8, 19, 10> 22.91/17]", 1313409663], + [283, 7, 575, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `integrate_nodes_and_freeze_blocks` is too high. [11/7]", 1313409663], + [283, 7, 575, "Metrics/MethodLength: Method has too many lines. [13/10]", 1313409663], + [283, 7, 575, "Metrics/PerceivedComplexity: Perceived complexity for `integrate_nodes_and_freeze_blocks` is too high. [11/8]", 1313409663] + ], + "lib/json/merge/freeze_node.rb:340454761": [ + [11, 21, 97, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 4181995290] + ], + "lib/json/merge/merge_result.rb:1135594830": [ + [140, 7, 421, "Metrics/MethodLength: Method has too many lines. [11/10]", 2459390040] + ], + "lib/json/merge/node_wrapper.rb:3026997700": [ + [7, 5, 5691, "Metrics/ClassLength: Class has too many lines. [189/100]", 2496649131], + [71, 7, 397, "Metrics/MethodLength: Method has too many lines. [11/10]", 3404369104], + [173, 7, 1322, "Metrics/AbcSize: Assignment Branch Condition size for `compute_signature` is too high. [<10, 26, 24> 36.77/17]", 2934899487], + [173, 7, 1322, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_signature` is too high. [22/7]", 2934899487], + [173, 7, 1322, "Metrics/MethodLength: Method has too many lines. [41/10]", 2934899487], + [173, 7, 1322, "Metrics/PerceivedComplexity: Perceived complexity for `compute_signature` is too high. [18/8]", 2934899487], + [220, 7, 831, "Metrics/AbcSize: Assignment Branch Condition size for `extract_object_keys` is too high. [<8, 13, 10> 18.25/17]", 4156563372], + [220, 7, 831, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_object_keys` is too high. [10/7]", 4156563372], + [220, 7, 831, "Metrics/MethodLength: Method has too many lines. [22/10]", 4156563372], + [220, 7, 831, "Metrics/PerceivedComplexity: Perceived complexity for `extract_object_keys` is too high. [10/8]", 4156563372] + ], + "lib/json/merge/object_match_refiner.rb:337747923": [ + [29, 5, 10245, "Metrics/ClassLength: Class has too many lines. [143/100]", 1652456083], + [148, 7, 652, "Metrics/AbcSize: Assignment Branch Condition size for `compute_object_similarity` is too high. [<6, 18, 4> 19.39/17]", 1704835547], + [172, 7, 382, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compute_fuzzy_key_matches` is too high. [8/7]", 1938411487], + [226, 7, 709, "Metrics/MethodLength: Method has too many lines. [13/10]", 1853541937], + [277, 23, 9, "Style/NumericPredicate: Use `len1.zero?` instead of `len1 == 0`.", 913205219], + [277, 36, 9, "Style/NumericPredicate: Use `len2.zero?` instead of `len2 == 0`.", 871697920], + [278, 23, 9, "Style/NumericPredicate: Use `len1.zero?` instead of `len1 == 0`.", 913205219], + [278, 36, 9, "Style/NumericPredicate: Use `len2.zero?` instead of `len2 == 0`.", 871697920], + [305, 7, 854, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<13, 29, 8> 32.77/17]", 2946547420], + [305, 7, 854, "Metrics/MethodLength: Method has too many lines. [20/10]", 2946547420] + ], + "lib/json/merge/smart_merger.rb:1431245415": [ + [24, 5, 8706, "Metrics/ClassLength: Class has too many lines. [183/100]", 745649819], + [44, 7, 1369, "Metrics/MethodLength: Method has too many lines. [20/10]", 1509468182], + [44, 21, 472, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [15/5]", 700498762], + [117, 7, 1318, "Metrics/AbcSize: Assignment Branch Condition size for `merge_with_debug` is too high. [<3, 24, 7> 25.18/17]", 1535809936], + [117, 7, 1318, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_with_debug` is too high. [8/7]", 1535809936], + [117, 7, 1318, "Metrics/MethodLength: Method has too many lines. [30/10]", 1535809936], + [188, 7, 574, "Metrics/MethodLength: Method has too many lines. [13/10]", 1857730257], + [221, 7, 1053, "Metrics/MethodLength: Method has too many lines. [24/10]", 3329630813] + ], + "spec/fixtures_integration_spec.rb:2941021946": [ + [3, 1, 7914, "Metrics/BlockLength: Block has too many lines. [163/25]", 4258553307], + [85, 60, 25, "Style/SymbolProc: Pass `&:compact` as an argument to `map` instead of a block.", 2107480170], + [93, 59, 25, "Style/SymbolProc: Pass `&:compact` as an argument to `map` instead of a block.", 2107480170], + [157, 3, 801, "Metrics/BlockLength: Block has too many lines. [27/25]", 716259872] + ], + "spec/reproducible_merge_spec.rb:133932627": [ + [5, 1, 1854, "Metrics/BlockLength: Block has too many lines. [40/25]", 671932104] + ] +} diff --git a/gems/json-merge/Gemfile.lock b/gems/json-merge/Gemfile.lock index 86f853d22..937db6db5 100644 --- a/gems/json-merge/Gemfile.lock +++ b/gems/json-merge/Gemfile.lock @@ -1,293 +1,21 @@ -PATH - remote: . - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem +GIT + remote: https://github.com/structuredmerge/tree-sitter-language-pack.git + revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a + branch: fix/ruby-parser-api-methods + glob: packages/ruby/*.gemspec specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) + tree_sitter_language_pack (1.12.5) + rb_sys (>= 0.9, < 0.9.128) + sorbet-runtime (~> 0.5) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + remote: . specs: - yaml-merge (7.1.0) + json-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby - specs: - tree_sitter_language_pack (1.12.5) - rb_sys (>= 0.9, < 0.9.128) - sorbet-runtime (~> 0.5) - GEM remote: https://gem.coop/ specs: @@ -299,6 +27,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -307,12 +40,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -321,6 +48,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -376,6 +104,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -394,7 +131,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -534,23 +270,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -584,11 +322,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -635,45 +373,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -682,61 +398,38 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -749,27 +442,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -784,14 +470,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -799,7 +481,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -827,19 +508,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -853,19 +532,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -873,7 +547,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/json-merge/lib/json/merge/version.rb b/gems/json-merge/lib/json/merge/version.rb index d02d9f1a5..13f521eb3 100644 --- a/gems/json-merge/lib/json/merge/version.rb +++ b/gems/json-merge/lib/json/merge/version.rb @@ -3,7 +3,7 @@ module Json module Merge module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end diff --git a/gems/plain-merge/.rubocop_gradual.lock b/gems/plain-merge/.rubocop_gradual.lock new file mode 100644 index 000000000..2200cf1b9 --- /dev/null +++ b/gems/plain-merge/.rubocop_gradual.lock @@ -0,0 +1,106 @@ +{ + ".simplecov:3133826638": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:4149951629": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/plain-merge.rb:619298015": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`plain-merge.rb`) should use snake_case.", 5381] + ], + "lib/plain/merge.rb:3584995729": [ + [9, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Plain::Merge`.", 2866359175], + [9, 3, 7932, "Metrics/ModuleLength: Module has too many lines. [211/100]", 719656966], + [42, 5, 645, "Metrics/MethodLength: Method has too many lines. [21/10]", 3773389417], + [69, 5, 513, "Metrics/AbcSize: Assignment Branch Condition size for `similarity_score` is too high. [<9, 17, 3> 19.47/17]", 594433443], + [69, 5, 513, "Metrics/MethodLength: Method has too many lines. [12/10]", 594433443], + [87, 9, 10, "Naming/PredicatePrefix: Rename `is_similar` to `similar?`.", 1730577729], + [96, 5, 2163, "Metrics/AbcSize: Assignment Branch Condition size for `match_text_blocks` is too high. [<25, 36, 16> 46.66/17]", 1824707567], + [96, 5, 2163, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `match_text_blocks` is too high. [14/7]", 1824707567], + [96, 5, 2163, "Metrics/MethodLength: Method has too many lines. [50/10]", 1824707567], + [96, 5, 2163, "Metrics/PerceivedComplexity: Perceived complexity for `match_text_blocks` is too high. [14/8]", 1824707567], + [119, 7, 1032, "Style/CombinableLoops: Combine this loop with the previous loop.", 2654397768], + [158, 5, 683, "Metrics/AbcSize: Assignment Branch Condition size for `merge_text` is too high. [<11, 16, 4> 19.82/17]", 3448903566], + [158, 5, 683, "Metrics/MethodLength: Method has too many lines. [14/10]", 3448903566], + [178, 5, 633, "Metrics/AbcSize: Assignment Branch Condition size for `refined_text_similarity` is too high. [<3, 17, 0> 17.26/17]", 2185070085], + [208, 5, 700, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<8, 31, 8> 33/17]", 1827550752], + [208, 5, 700, "Metrics/MethodLength: Method has too many lines. [18/10]", 1827550752] + ], + "plain-merge.gemspec:3762840848": [ + [128, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [143, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [144, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [151, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ], + "spec/fixtures_integration_spec.rb:922433761": [ + [3, 1, 3550, "Metrics/BlockLength: Block has too many lines. [77/25]", 4225834063] + ] +} diff --git a/gems/plain-merge/Gemfile b/gems/plain-merge/Gemfile index 3400b4412..816a830b3 100644 --- a/gems/plain-merge/Gemfile +++ b/gems/plain-merge/Gemfile @@ -6,7 +6,7 @@ # kettle-jem will then preserve content between those markers across template runs. # kettle-jem:unfreeze -source "https://gem.coop" +source 'https://gem.coop' git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" } git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } @@ -19,58 +19,54 @@ git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" } gemspec # Local workspace dependency wiring for *_local.gemfile overrides -nomono_requirements = ["~> 1.0", ">= 1.0.8"] -gem "nomono", *nomono_requirements, require: false # ruby >= 2.2 +nomono_requirements = ['~> 1.0', '>= 1.0.8'] +gem 'nomono', *nomono_requirements, require: false # ruby >= 2.2 # Direct sibling dependencies (env-switched via STRUCTUREDMERGE_DEV) direct_sibling_gems = %w[ ast-merge tree_haver ] -direct_sibling_dev = ENV.fetch("STRUCTUREDMERGE_DEV", "") +direct_sibling_dev = ENV.fetch('STRUCTUREDMERGE_DEV', '') direct_sibling_local = !direct_sibling_dev.empty? && !%w[false 0 no off].include?(direct_sibling_dev.downcase) -direct_sibling_templating = ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +direct_sibling_templating = ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? if direct_sibling_gems.any? && - (direct_sibling_local || - ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?) - direct_sibling_dev_was_set = ENV.key?("STRUCTUREDMERGE_DEV") - direct_sibling_dev_original = ENV.fetch("STRUCTUREDMERGE_DEV", nil) + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) begin nomono_activation_requirements = nomono_requirements - nomono_lockfile = File.expand_path("Gemfile.lock", __dir__) + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) if File.file?(nomono_lockfile) nomono_locked_spec = Bundler::LockfileParser - .new(Bundler.read_file(nomono_lockfile)) - .specs - .find { |spec| spec.name == "nomono" } + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } nomono_locked = nomono_locked_spec && - Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) - if nomono_locked - nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] - end - end - Kernel.send(:gem, "nomono", *nomono_activation_requirements) - require "nomono/bundler" - if direct_sibling_templating && !direct_sibling_local - ENV["STRUCTUREDMERGE_DEV"] = File.expand_path("..", __dir__) + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local eval_nomono_gems( gems: direct_sibling_gems, - prefix: "STRUCTUREDMERGE", - path_env: "STRUCTUREDMERGE_DEV", - root: ["src", "my", "structuredmerge"] + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] ) rescue LoadError - warn "Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies." + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' ensure if direct_sibling_templating && !direct_sibling_local if direct_sibling_dev_was_set - ENV["STRUCTUREDMERGE_DEV"] = direct_sibling_dev_original + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original else - ENV.delete("STRUCTUREDMERGE_DEV") + ENV.delete('STRUCTUREDMERGE_DEV') end end end @@ -374,25 +370,25 @@ unless tslp_declared_by_templating end # Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths) -eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? +eval_gemfile 'gemfiles/modular/templating.gemfile' if ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero? # Debugging -eval_gemfile "gemfiles/modular/debug.gemfile" +eval_gemfile 'gemfiles/modular/debug.gemfile' # Code Coverage (env-switched: KETTLE_RB_DEV=true for local paths) -eval_gemfile "gemfiles/modular/coverage.gemfile" +eval_gemfile 'gemfiles/modular/coverage.gemfile' # Linting -eval_gemfile "gemfiles/modular/style.gemfile" +eval_gemfile 'gemfiles/modular/style.gemfile' # Documentation -eval_gemfile "gemfiles/modular/documentation.gemfile" +eval_gemfile 'gemfiles/modular/documentation.gemfile' # Optional -eval_gemfile "gemfiles/modular/optional.gemfile" +eval_gemfile 'gemfiles/modular/optional.gemfile' ### Std Lib Extracted Gems -eval_gemfile "gemfiles/modular/x_std_libs.gemfile" +eval_gemfile 'gemfiles/modular/x_std_libs.gemfile' # See unlocked_deps appraisal for more details on irb inclusion -gem "irb", "~> 1.17" # ruby >= 2.7 +gem 'irb', '~> 1.17' # ruby >= 2.7 diff --git a/gems/plain-merge/Gemfile.lock b/gems/plain-merge/Gemfile.lock index a9cf2d227..79234d5aa 100644 --- a/gems/plain-merge/Gemfile.lock +++ b/gems/plain-merge/Gemfile.lock @@ -7,39 +7,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -48,193 +16,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -242,45 +24,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-drift - specs: - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) - -PATH - remote: /var/home/pboling/src/my/kettle-dev/kettle-soup-cover - specs: - kettle-soup-cover (3.0.1) - simplecov (>= 1.0) - simplecov-cobertura (>= 4.0) - simplecov-console (~> 0.9, >= 0.9.5) - simplecov-rcov (~> 0.3, >= 0.3.7) - simplecov_lcov_formatter (~> 0.9, >= 0.9.0) - PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -307,12 +50,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -321,6 +58,7 @@ GEM delegate (0.6.1) diff-lcs (1.6.2) diffy (3.4.4) + docile (1.4.1) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -376,6 +114,15 @@ GEM kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) kettle-rb (0.1.4) + kettle-soup-cover (1.1.3) + simplecov (~> 0.22) + simplecov-cobertura (~> 3.0) + simplecov-console (~> 0.9, >= 0.9.3) + simplecov-html (~> 0.13, >= 0.13.1) + simplecov-lcov (~> 0.8) + simplecov-rcov (~> 0.3, >= 0.3.7) + simplecov_json_formatter (~> 0.1, >= 0.1.4) + version_gem (~> 1.1, >= 1.1.9) kettle-test (2.0.11) appraisal2 (~> 3.0, >= 3.0.6) backports (~> 3.0) @@ -394,7 +141,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -534,23 +280,25 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) - simplecov (1.0.2) - simplecov-cobertura (4.0.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (3.2.0) rexml - simplecov (~> 1.0) + simplecov (~> 0.19) simplecov-console (0.9.5) ansi simplecov terminal-table + simplecov-html (0.13.2) + simplecov-lcov (0.9.0) simplecov-rcov (0.3.7) simplecov (>= 0.4.1) - simplecov_lcov_formatter (0.9.0) - simplecov (>= 0.18) + simplecov_json_formatter (0.1.4) sorbet-runtime (0.6.13342) standard (1.56.0) language_server-protocol (~> 3.17.0.2) @@ -584,11 +332,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -635,45 +378,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift! - kettle-jem! - kettle-soup-cover! + kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -682,61 +404,39 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 delegate (0.6.1) sha256=54cf946cacfe05b1c23114edd8fbd8d54e9cea7abf36b95130ab53cc88b8f7e4 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 - dotenv-merge (7.1.0) + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -749,27 +449,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 - kettle-soup-cover (3.0.1) + kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -784,14 +476,11 @@ 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.0) plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -799,7 +488,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -827,19 +515,17 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 - simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 - simplecov-cobertura (4.0.0) sha256=e4fb3159b1ecea545b44f5452a8611305323e78ad23eae8aed35924d072e01ea + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc - simplecov_lcov_formatter (0.9.0) sha256=4c1839bb31dcf7a8f7a6474c94ed228aa03b994e9dd5e1965e58b4121b049bed - smorg-rb (7.1.0) + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -853,19 +539,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -873,7 +554,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/plain-merge/Rakefile b/gems/plain-merge/Rakefile index 571409183..c1132c880 100644 --- a/gems/plain-merge/Rakefile +++ b/gems/plain-merge/Rakefile @@ -130,23 +130,23 @@ end ### DUPLICATE DRIFT TASKS begin - require "kettle/drift" + require 'kettle/drift' Kettle::Drift.install_tasks rescue LoadError - desc("(stub) kettle:drift:check is unavailable") - task("kettle:drift:check") do + desc('(stub) kettle:drift:check is unavailable') + task('kettle:drift:check') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:update is unavailable") - task("kettle:drift:update") do + desc('(stub) kettle:drift:update is unavailable') + task('kettle:drift:update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift:force_update is unavailable") - task("kettle:drift:force_update") do + desc('(stub) kettle:drift:force_update is unavailable') + task('kettle:drift:force_update') do warn("NOTE: kettle-drift isn't installed, or is disabled for #{RUBY_VERSION} in the current environment") end - desc("(stub) kettle:drift is unavailable") - task("kettle:drift" => "kettle:drift:update") + desc('(stub) kettle:drift is unavailable') + task('kettle:drift' => 'kettle:drift:update') end ### TEMPLATING TASKS diff --git a/gems/plain-merge/bin/yard b/gems/plain-merge/bin/yard index a7e8b6eed..5d516ad6f 100755 --- a/gems/plain-merge/bin/yard +++ b/gems/plain-merge/bin/yard @@ -12,4 +12,4 @@ # `yard` / `bin/yard`. Keep this binstub as a handoff to the task so # humans and tools that reach for `bin/yard` still run the full docs # workflow with post-processing hooks. -exec("bundle", "exec", "rake", "yard") +exec('bundle', 'exec', 'rake', 'yard') diff --git a/gems/plain-merge/lib/plain/merge/version.rb b/gems/plain-merge/lib/plain/merge/version.rb index aab4f67c1..e6b3a5844 100644 --- a/gems/plain-merge/lib/plain/merge/version.rb +++ b/gems/plain-merge/lib/plain/merge/version.rb @@ -3,7 +3,7 @@ module Plain module Merge module Version - VERSION = "7.1.0" + VERSION = '7.1.0' end VERSION = Version::VERSION # Traditional Constant Location end From 0f87df0c88059a1b6d65eb0cd00dbcca8c53196b Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:38:08 -0600 Subject: [PATCH 255/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-merge/.rubocop_gradual.lock | 2839 ++++++++++++++++++++++++++ gems/ast-merge/Gemfile.lock | 32 +- gems/json-merge/Gemfile.lock | 47 +- gems/plain-merge/Gemfile.lock | 327 ++- 4 files changed, 3208 insertions(+), 37 deletions(-) create mode 100644 gems/ast-merge/.rubocop_gradual.lock diff --git a/gems/ast-merge/.rubocop_gradual.lock b/gems/ast-merge/.rubocop_gradual.lock new file mode 100644 index 000000000..bc6712ed3 --- /dev/null +++ b/gems/ast-merge/.rubocop_gradual.lock @@ -0,0 +1,2839 @@ +{ + ".simplecov:3463276878": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "Rakefile:429706125": [ + [18, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 174264873], + [79, 3, 1023, "Metrics/BlockLength: Block has too many lines. [32/25]", 54868638], + [163, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1367093088], + [166, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3881946477] + ], + "ast-merge.gemspec:1182320030": [ + [16, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1168797721], + [129, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2821357214], + [144, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3888612416], + [145, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 981994949], + [152, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 4229808912] + ], + "gemfiles/modular/benchmark/r4/v0.5.gemfile:3644720371": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/benchmark/vHEAD.gemfile:2838879269": [ + [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.", 177542] + ], + "gemfiles/modular/erb/r2/v3.0.gemfile:1688285565": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r3/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/r4/v5.0.gemfile:2150258305": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/erb/vHEAD.gemfile:981929959": [ + [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.", 177542] + ], + "gemfiles/modular/mutex_m/r2/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r3/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/r4/v0.3.gemfile:4055275004": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/mutex_m/vHEAD.gemfile:556854763": [ + [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.", 177542] + ], + "gemfiles/modular/rspec.gemfile:2263543889": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177602] + ], + "gemfiles/modular/stringio/r2/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r3/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/r4/v3.0.gemfile:821604304": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/stringio/vHEAD.gemfile:1045839691": [ + [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.", 177542] + ], + "gemfiles/modular/x_std_libs.gemfile:2324400122": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177542] + ], + "gemfiles/modular/x_std_libs/r2/libs.gemfile:36276542": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r3/libs.gemfile:4030570297": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/r4/libs.gemfile:909736663": [ + [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177600] + ], + "gemfiles/modular/x_std_libs/vHEAD.gemfile:907917303": [ + [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] + ], + "lib/ast-merge.rb:3005639624": [ + [1, 1, 0, "Naming/FileName: The name of this source file (`ast-merge.rb`) should use snake_case.", 5381] + ], + "lib/ast/merge.rb:3429747270": [ + [11, 3, 12, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge`.", 2866359175], + [11, 3, 270037, "Metrics/ModuleLength: Module has too many lines. [5702/100]", 2847709439], + [22, 5, 16, "Style/Documentation: Missing top-level documentation comment for `class Ast::Merge::ParseError`.", 362242086], + [33, 7, 362, "Metrics/AbcSize: Assignment Branch Condition size for `build_message` is too high. [<2, 16, 6> 17.2/17]", 3988736327], + [47, 5, 31, "Style/Documentation: Missing top-level documentation comment for `class Ast::Merge::PlaceholderCollisionError`.", 218924302], + [161, 7, 337, "Metrics/MethodLength: Method has too many lines. [11/10]", 2388996629], + [178, 7, 327, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [8/7]", 979795121], + [309, 7, 383, "Metrics/MethodLength: Method has too many lines. [11/10]", 634650261], + [473, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 3450568485], + [474, 7, 461, "Metrics/MethodLength: Method has too many lines. [12/10]", 43929779], + [491, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1299979089], + [492, 7, 377, "Metrics/MethodLength: Method has too many lines. [11/10]", 3704151253], + [508, 121, 39, "Layout/LineLength: Line is too long. [159/120]", 85503958], + [509, 7, 447, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [8/7]", 298553749], + [509, 7, 447, "Metrics/MethodLength: Method has too many lines. [12/10]", 298553749], + [538, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1441148616], + [539, 7, 453, "Metrics/MethodLength: Method has too many lines. [14/10]", 1899007021], + [558, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193342990], + [559, 7, 400, "Metrics/MethodLength: Method has too many lines. [11/10]", 298553749], + [588, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860750], + [589, 7, 411, "Metrics/MethodLength: Method has too many lines. [12/10]", 2893925621], + [606, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3137791633], + [607, 7, 454, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [8/7]", 298553749], + [607, 7, 454, "Metrics/MethodLength: Method has too many lines. [12/10]", 298553749], + [666, 7, 385, "Metrics/MethodLength: Method has too many lines. [11/10]", 794265461], + [703, 7, 419, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `to_h` is too high. [10/7]", 3313546353], + [703, 7, 419, "Metrics/PerceivedComplexity: Perceived complexity for `to_h` is too high. [10/8]", 3313546353], + [753, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 398187770], + [765, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 2746783933], + [812, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860841], + [820, 121, 156, "Layout/LineLength: Line is too long. [276/120]", 1149525480], + [825, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 2538424426], + [837, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 2285382915], + [847, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3962419360], + [860, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 398187770], + [862, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3195178507], + [866, 121, 85, "Layout/LineLength: Line is too long. [205/120]", 4238980637], + [868, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 2678411233], + [870, 121, 39, "Layout/LineLength: Line is too long. [159/120]", 4028520110], + [881, 121, 110, "Layout/LineLength: Line is too long. [230/120]", 3837814921], + [895, 5, 2283, "Metrics/MethodLength: Method has too many lines. [57/10]", 2282416447], + [955, 5, 2654, "Metrics/MethodLength: Method has too many lines. [63/10]", 2491520565], + [1006, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1823519875], + [1015, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1874311968], + [1021, 5, 10660, "Metrics/AbcSize: Assignment Branch Condition size for `ruby_downstream_merge_gem_feature_matrix` is too high. [<0, 21, 0> 21/17]", 2277322577], + [1021, 5, 10660, "Metrics/MethodLength: Method has too many lines. [248/10]", 2277322577], + [1272, 5, 1546, "Metrics/MethodLength: Method has too many lines. [37/10]", 208933754], + [1306, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 2658452668], + [1312, 5, 4206, "Metrics/MethodLength: Method has too many lines. [96/10]", 1997530776], + [1389, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 183246985], + [1405, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 3268438356], + [1411, 5, 1598, "Metrics/MethodLength: Method has too many lines. [46/10]", 849757258], + [1454, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1323237892], + [1460, 5, 1164, "Metrics/MethodLength: Method has too many lines. [36/10]", 1477831421], + [1493, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 931876829], + [1499, 5, 1699, "Metrics/MethodLength: Method has too many lines. [43/10]", 1125544678], + [1545, 5, 1016, "Metrics/MethodLength: Method has too many lines. [27/10]", 2194427985], + [1575, 5, 1058, "Metrics/MethodLength: Method has too many lines. [30/10]", 47860722], + [1608, 5, 1186, "Metrics/MethodLength: Method has too many lines. [31/10]", 676863486], + [1636, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 2689509078], + [1642, 5, 1517, "Metrics/MethodLength: Method has too many lines. [41/10]", 3855445172], + [1655, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 817380904], + [1680, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 409671963], + [1686, 5, 2116, "Metrics/MethodLength: Method has too many lines. [61/10]", 524104794], + [1750, 5, 820, "Metrics/MethodLength: Method has too many lines. [12/10]", 1888457180], + [1750, 37, 298, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 789483382], + [1751, 121, 100, "Layout/LineLength: Line is too long. [220/120]", 3288750271], + [1766, 5, 3595, "Metrics/AbcSize: Assignment Branch Condition size for `initial_profile_promotion_policy` is too high. [<9, 20, 0> 21.93/17]", 83685787], + [1766, 5, 3595, "Metrics/MethodLength: Method has too many lines. [77/10]", 83685787], + [1846, 5, 768, "Metrics/MethodLength: Method has too many lines. [17/10]", 314059802], + [1867, 5, 1493, "Metrics/AbcSize: Assignment Branch Condition size for `evaluate_profile_selection_requirement` is too high. [<7, 23, 9> 25.67/17]", 3177555163], + [1867, 5, 1493, "Metrics/MethodLength: Method has too many lines. [29/10]", 3177555163], + [1868, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2145168012], + [1875, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 683002336], + [1909, 5, 985, "Metrics/AbcSize: Assignment Branch Condition size for `profile_promotion_blocking_reasons` is too high. [<4, 25, 13> 28.46/17]", 1146627465], + [1909, 5, 985, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `profile_promotion_blocking_reasons` is too high. [10/7]", 1146627465], + [1909, 5, 985, "Metrics/MethodLength: Method has too many lines. [18/10]", 1146627465], + [1909, 5, 985, "Metrics/PerceivedComplexity: Perceived complexity for `profile_promotion_blocking_reasons` is too high. [10/8]", 1146627465], + [1930, 5, 3173, "Metrics/AbcSize: Assignment Branch Condition size for `validate_language_backend_profile` is too high. [<25, 68, 20> 75.16/17]", 2100389324], + [1930, 5, 3173, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_language_backend_profile` is too high. [21/7]", 2100389324], + [1930, 5, 3173, "Metrics/MethodLength: Method has too many lines. [60/10]", 2100389324], + [1930, 5, 3173, "Metrics/PerceivedComplexity: Perceived complexity for `validate_language_backend_profile` is too high. [23/8]", 2100389324], + [2002, 5, 1523, "Metrics/AbcSize: Assignment Branch Condition size for `validate_backend_inventory` is too high. [<13, 38, 13> 42.21/17]", 1899037537], + [2002, 5, 1523, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_backend_inventory` is too high. [13/7]", 1899037537], + [2002, 5, 1523, "Metrics/MethodLength: Method has too many lines. [25/10]", 1899037537], + [2002, 5, 1523, "Metrics/PerceivedComplexity: Perceived complexity for `validate_backend_inventory` is too high. [13/8]", 1899037537], + [2045, 5, 906, "Metrics/MethodLength: Method has too many lines. [20/10]", 3137959843], + [2068, 5, 2744, "Metrics/AbcSize: Assignment Branch Condition size for `detect_raw_merge_inconsistencies` is too high. [<8, 43, 21> 48.52/17]", 3717440692], + [2068, 5, 2744, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_raw_merge_inconsistencies` is too high. [17/7]", 3717440692], + [2068, 5, 2744, "Metrics/MethodLength: Method has too many lines. [53/10]", 3717440692], + [2068, 5, 2744, "Metrics/PerceivedComplexity: Perceived complexity for `detect_raw_merge_inconsistencies` is too high. [17/8]", 3717440692], + [2083, 7, 1894, "Metrics/BlockLength: Block has too many lines. [33/25]", 758887611], + [2129, 5, 762, "Metrics/MethodLength: Method has too many lines. [11/10]", 3021402342], + [2143, 5, 490, "Metrics/MethodLength: Method has too many lines. [11/10]", 578473475], + [2157, 5, 881, "Metrics/AbcSize: Assignment Branch Condition size for `execute_independent_commutative_insertions` is too high. [<6, 16, 7> 18.47/17]", 259417386], + [2157, 5, 881, "Metrics/MethodLength: Method has too many lines. [21/10]", 259417386], + [2184, 5, 1107, "Metrics/AbcSize: Assignment Branch Condition size for `execute_independent_keyed_member_edits` is too high. [<10, 31, 15> 35.86/17]", 4271501385], + [2184, 5, 1107, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `execute_independent_keyed_member_edits` is too high. [14/7]", 4271501385], + [2184, 5, 1107, "Metrics/MethodLength: Method has too many lines. [24/10]", 4271501385], + [2184, 5, 1107, "Metrics/PerceivedComplexity: Perceived complexity for `execute_independent_keyed_member_edits` is too high. [14/8]", 4271501385], + [2228, 5, 3149, "Metrics/AbcSize: Assignment Branch Condition size for `parse_compact_ruleset` is too high. [<16, 68, 24> 73.86/17]", 3149098803], + [2228, 5, 3149, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_compact_ruleset` is too high. [22/7]", 3149098803], + [2228, 5, 3149, "Metrics/MethodLength: Method has too many lines. [67/10]", 3149098803], + [2228, 5, 3149, "Metrics/PerceivedComplexity: Perceived complexity for `parse_compact_ruleset` is too high. [23/8]", 3149098803], + [2234, 7, 2544, "Metrics/BlockLength: Block has too many lines. [50/25]", 2484860466], + [2261, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193420054], + [2307, 5, 2658, "Metrics/AbcSize: Assignment Branch Condition size for `compact_ruleset_feature_profile` is too high. [<11, 67, 38> 77.81/17]", 4022599673], + [2307, 5, 2658, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `compact_ruleset_feature_profile` is too high. [29/7]", 4022599673], + [2307, 5, 2658, "Metrics/MethodLength: Method has too many lines. [66/10]", 4022599673], + [2307, 5, 2658, "Metrics/PerceivedComplexity: Perceived complexity for `compact_ruleset_feature_profile` is too high. [16/8]", 4022599673], + [2325, 7, 2243, "Metrics/BlockLength: Block has too many lines. [47/25]", 965041772], + [2392, 5, 2733, "Metrics/AbcSize: Assignment Branch Condition size for `classify_template_target_path` is too high. [<4, 36, 23> 42.91/17]", 3661828596], + [2392, 5, 2733, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `classify_template_target_path` is too high. [21/7]", 3661828596], + [2392, 5, 2733, "Metrics/MethodLength: Method has too many lines. [39/10]", 3661828596], + [2392, 5, 2733, "Metrics/PerceivedComplexity: Perceived complexity for `classify_template_target_path` is too high. [17/8]", 3661828596], + [2424, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [2438, 5, 416, "Metrics/MethodLength: Method has too many lines. [12/10]", 1388641773], + [2481, 5, 388, "Metrics/MethodLength: Method has too many lines. [12/10]", 2360583514], + [2510, 5, 820, "Metrics/MethodLength: Method has too many lines. [13/10]", 354674808], + [2526, 5, 929, "Metrics/AbcSize: Assignment Branch Condition size for `enrich_template_plan_entries` is too high. [<9, 12, 10> 18.03/17]", 2666747528], + [2526, 5, 929, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `enrich_template_plan_entries` is too high. [9/7]", 2666747528], + [2526, 5, 929, "Metrics/MethodLength: Method has too many lines. [19/10]", 2666747528], + [2526, 5, 929, "Metrics/PerceivedComplexity: Perceived complexity for `enrich_template_plan_entries` is too high. [10/8]", 2666747528], + [2549, 5, 1245, "Metrics/AbcSize: Assignment Branch Condition size for `enrich_template_plan_entries_with_token_state` is too high. [<11, 23, 14> 29.09/17]", 1507113977], + [2549, 5, 1245, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `enrich_template_plan_entries_with_token_state` is too high. [13/7]", 1507113977], + [2549, 5, 1245, "Metrics/MethodLength: Method has too many lines. [19/10]", 1507113977], + [2549, 5, 1245, "Metrics/PerceivedComplexity: Perceived complexity for `enrich_template_plan_entries_with_token_state` is too high. [13/8]", 1507113977], + [2573, 5, 1353, "Metrics/AbcSize: Assignment Branch Condition size for `prepare_template_entries` is too high. [<6, 18, 11> 21.93/17]", 2774310942], + [2573, 5, 1353, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `prepare_template_entries` is too high. [11/7]", 2774310942], + [2573, 5, 1353, "Metrics/MethodLength: Method has too many lines. [24/10]", 2774310942], + [2573, 5, 1353, "Metrics/PerceivedComplexity: Perceived complexity for `prepare_template_entries` is too high. [12/8]", 2774310942], + [2603, 5, 1494, "Metrics/AbcSize: Assignment Branch Condition size for `plan_template_execution` is too high. [<8, 22, 17> 28.93/17]", 3876421385], + [2603, 5, 1494, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `plan_template_execution` is too high. [14/7]", 3876421385], + [2603, 5, 1494, "Metrics/MethodLength: Method has too many lines. [29/10]", 3876421385], + [2603, 5, 1494, "Metrics/PerceivedComplexity: Perceived complexity for `plan_template_execution` is too high. [15/8]", 3876421385], + [2604, 7, 1421, "Metrics/BlockLength: Block has too many lines. [27/25]", 2887810383], + [2637, 5, 822, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 2749235529], + [2637, 37, 220, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 447165880], + [2638, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 518382509], + [2652, 5, 2060, "Metrics/AbcSize: Assignment Branch Condition size for `preview_template_execution` is too high. [<11, 42, 26> 50.61/17]", 2270817206], + [2652, 5, 2060, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `preview_template_execution` is too high. [25/7]", 2270817206], + [2652, 5, 2060, "Metrics/MethodLength: Method has too many lines. [39/10]", 2270817206], + [2652, 5, 2060, "Metrics/PerceivedComplexity: Perceived complexity for `preview_template_execution` is too high. [23/8]", 2270817206], + [2662, 7, 1809, "Metrics/BlockLength: Block has too many lines. [28/25]", 310337564], + [2700, 5, 2513, "Metrics/AbcSize: Assignment Branch Condition size for `apply_template_execution` is too high. [<14, 50, 25> 57.63/17]", 177708331], + [2700, 5, 2513, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_template_execution` is too high. [26/7]", 177708331], + [2700, 5, 2513, "Metrics/MethodLength: Method has too many lines. [50/10]", 177708331], + [2700, 5, 2513, "Metrics/PerceivedComplexity: Perceived complexity for `apply_template_execution` is too high. [23/8]", 177708331], + [2711, 7, 2239, "Metrics/BlockLength: Block has too many lines. [38/25]", 1651205014], + [2761, 5, 1696, "Metrics/AbcSize: Assignment Branch Condition size for `evaluate_template_tree_convergence` is too high. [<11, 29, 17> 35.37/17]", 2507998041], + [2761, 5, 1696, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `evaluate_template_tree_convergence` is too high. [17/7]", 2507998041], + [2761, 5, 1696, "Metrics/MethodLength: Method has too many lines. [35/10]", 2507998041], + [2761, 5, 1696, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 2507998041], + [2761, 5, 1696, "Metrics/PerceivedComplexity: Perceived complexity for `evaluate_template_tree_convergence` is too high. [17/8]", 2507998041], + [2761, 43, 198, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 4214374277], + [2762, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 2983874608], + [2804, 5, 688, "Metrics/MethodLength: Method has too many lines. [15/10]", 3064253784], + [2804, 5, 688, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 3064253784], + [2804, 36, 216, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 448029307], + [2805, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3840139076], + [2848, 5, 664, "Metrics/MethodLength: Method has too many lines. [13/10]", 995637868], + [2848, 5, 664, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 995637868], + [2848, 53, 202, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 4227116196], + [2849, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 418683952], + [2866, 5, 649, "Metrics/MethodLength: Method has too many lines. [13/10]", 1831524792], + [2866, 5, 649, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 1831524792], + [2866, 54, 178, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2962381850], + [2867, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 3690915627], + [2884, 5, 1280, "Metrics/AbcSize: Assignment Branch Condition size for `apply_template_tree_execution_to_directory` is too high. [<6, 16, 6> 18.11/17]", 305449363], + [2884, 5, 1280, "Metrics/MethodLength: Method has too many lines. [23/10]", 305449363], + [2884, 5, 1280, "Metrics/ParameterLists: Method has too many optional parameters. [5/3]", 305449363], + [2884, 51, 200, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1352434212], + [2885, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 1139621482], + [2913, 5, 2199, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_tree_run` is too high. [<15, 42, 31> 54.31/17]", 975627723], + [2913, 5, 2199, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_tree_run` is too high. [25/7]", 975627723], + [2913, 5, 2199, "Metrics/MethodLength: Method has too many lines. [38/10]", 975627723], + [2913, 5, 2199, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_tree_run` is too high. [26/8]", 975627723], + [2957, 5, 1515, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_apply` is too high. [<13, 35, 21> 42.84/17]", 3710254295], + [2957, 5, 1515, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_directory_apply` is too high. [17/7]", 3710254295], + [2957, 5, 1515, "Metrics/MethodLength: Method has too many lines. [26/10]", 3710254295], + [2957, 5, 1515, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_directory_apply` is too high. [17/8]", 3710254295], + [2972, 20, 1, "Style/DoubleNegation: Avoid the use of double negation (`!!`).", 177540], + [2989, 5, 1656, "Metrics/AbcSize: Assignment Branch Condition size for `report_template_directory_plan` is too high. [<11, 24, 25> 36.36/17]", 2946319293], + [2989, 5, 1656, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `report_template_directory_plan` is too high. [18/7]", 2946319293], + [2989, 5, 1656, "Metrics/MethodLength: Method has too many lines. [36/10]", 2946319293], + [2989, 5, 1656, "Metrics/PerceivedComplexity: Perceived complexity for `report_template_directory_plan` is too high. [16/8]", 2946319293], + [3061, 7, 9, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 3648222389], + [3082, 5, 410, "Metrics/MethodLength: Method has too many lines. [12/10]", 248324428], + [3088, 7, 11, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 848344986], + [3132, 5, 712, "Metrics/MethodLength: Method has too many lines. [12/10]", 2500743043], + [3132, 27, 178, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 873705194], + [3132, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3023611470], + [3158, 42, 167, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2002181571], + [3171, 5, 1097, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structured_edit_selection_profile` is too high. [8/7]", 1149325233], + [3171, 5, 1097, "Metrics/MethodLength: Method has too many lines. [14/10]", 1149325233], + [3171, 42, 311, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 3814063337], + [3172, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 198450264], + [3185, 34, 47, "Style/SafeNavigation: Use safe navigation (`&.`) instead of checking if an object exists before calling the method.", 3204815976], + [3190, 5, 869, "Metrics/MethodLength: Method has too many lines. [11/10]", 83957392], + [3190, 41, 250, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1486072775], + [3191, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1967186495], + [3201, 36, 47, "Style/SafeNavigation: Use safe navigation (`&.`) instead of checking if an object exists before calling the method.", 3204815976], + [3206, 5, 1156, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structured_edit_match_profile` is too high. [10/7]", 4112674787], + [3206, 5, 1156, "Metrics/MethodLength: Method has too many lines. [15/10]", 4112674787], + [3206, 5, 1156, "Metrics/PerceivedComplexity: Perceived complexity for `structured_edit_match_profile` is too high. [10/8]", 4112674787], + [3206, 38, 321, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [12/5]", 823565876], + [3207, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859667], + [3208, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3673982236], + [3226, 5, 933, "Metrics/MethodLength: Method has too many lines. [14/10]", 2099388915], + [3226, 37, 319, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [12/5]", 250907892], + [3227, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177545], + [3228, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 4154814685], + [3245, 5, 907, "Metrics/MethodLength: Method has too many lines. [12/10]", 2242846328], + [3245, 42, 275, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 246196330], + [3246, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1439117336], + [3262, 5, 1057, "Metrics/MethodLength: Method has too many lines. [14/10]", 2891607970], + [3262, 44, 323, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 1386547750], + [3263, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1676243675], + [3264, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 4154814685], + [3281, 5, 1375, "Metrics/AbcSize: Assignment Branch Condition size for `structured_edit_request` is too high. [<11, 25, 10> 29.09/17]", 4153786554], + [3281, 5, 1375, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structured_edit_request` is too high. [11/7]", 4153786554], + [3281, 5, 1375, "Metrics/MethodLength: Method has too many lines. [16/10]", 4153786554], + [3281, 5, 1375, "Metrics/PerceivedComplexity: Perceived complexity for `structured_edit_request` is too high. [11/8]", 4153786554], + [3281, 32, 370, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [13/5]", 2381882467], + [3282, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177545], + [3303, 5, 728, "Metrics/MethodLength: Method has too many lines. [11/10]", 4026157473], + [3303, 31, 175, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 773121544], + [3335, 5, 597, "Metrics/MethodLength: Method has too many lines. [11/10]", 4143495860], + [3374, 5, 577, "Metrics/MethodLength: Method has too many lines. [11/10]", 4169131743], + [3389, 5, 1011, "Metrics/AbcSize: Assignment Branch Condition size for `structured_edit_execution_report` is too high. [<7, 16, 7> 18.81/17]", 876221899], + [3389, 5, 1011, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `structured_edit_execution_report` is too high. [8/7]", 876221899], + [3389, 5, 1011, "Metrics/MethodLength: Method has too many lines. [12/10]", 876221899], + [3389, 41, 245, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 2484440861], + [3390, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 4036992717], + [3415, 55, 170, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 668161765], + [3438, 5, 819, "Metrics/MethodLength: Method has too many lines. [12/10]", 2287133436], + [3438, 56, 217, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3198032135], + [3439, 121, 51, "Layout/LineLength: Line is too long. [171/120]", 3526181051], + [3472, 5, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 1853778635], + [3481, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], + [3513, 5, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 1132214891], + [3522, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], + [3544, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 556747511], + [3553, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1808630920], + [3575, 5, 708, "Metrics/MethodLength: Method has too many lines. [11/10]", 3590891170], + [3584, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1367166441], + [3607, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 689748855], + [3616, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1808630920], + [3638, 5, 708, "Metrics/MethodLength: Method has too many lines. [11/10]", 1478642210], + [3647, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1367166441], + [3671, 5, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 239506091], + [3680, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], + [3702, 5, 693, "Metrics/MethodLength: Method has too many lines. [11/10]", 3803476550], + [3711, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], + [3734, 5, 728, "Metrics/MethodLength: Method has too many lines. [11/10]", 748161230], + [3743, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 2807086497], + [3765, 5, 758, "Metrics/MethodLength: Method has too many lines. [11/10]", 3900524558], + [3774, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3463884836], + [3798, 5, 748, "Metrics/MethodLength: Method has too many lines. [11/10]", 2076716686], + [3807, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 609414023], + [3829, 5, 778, "Metrics/MethodLength: Method has too many lines. [11/10]", 867958318], + [3833, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193343749], + [3838, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 1202823007], + [3862, 5, 728, "Metrics/MethodLength: Method has too many lines. [11/10]", 2078323790], + [3871, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 2807086497], + [3893, 5, 758, "Metrics/MethodLength: Method has too many lines. [11/10]", 121025422], + [3902, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3463884836], + [3924, 5, 733, "Metrics/MethodLength: Method has too many lines. [11/10]", 1216456558], + [3933, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 145839927], + [3955, 5, 763, "Metrics/MethodLength: Method has too many lines. [11/10]", 2946525998], + [3964, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 275709226], + [3988, 5, 768, "Metrics/MethodLength: Method has too many lines. [11/10]", 3281402414], + [3992, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177656], + [3997, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 1427340581], + [4034, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3673982236], + [4091, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193417070], + [4102, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2768444], + [4109, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3833204035], + [4117, 5, 863, "Metrics/MethodLength: Method has too many lines. [11/10]", 3731153486], + [4121, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 4054494590], + [4126, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 2084326338], + [4132, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 4201858364], + [4136, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861122], + [4140, 5, 873, "Metrics/MethodLength: Method has too many lines. [11/10]", 1866057614], + [4144, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3893180930], + [4149, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 863421408], + [4155, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 3247130491], + [4159, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1171438608], + [4163, 5, 883, "Metrics/MethodLength: Method has too many lines. [11/10]", 2352924462], + [4163, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860841], + [4164, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861334], + [4167, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 465221046], + [4172, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 1922522532], + [4188, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 4067226670], + [4192, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2033573170], + [4196, 5, 893, "Metrics/MethodLength: Method has too many lines. [11/10]", 1633175534], + [4196, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087926422], + [4197, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087421565], + [4200, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 615151909], + [4205, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 884393597], + [4231, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 417844693], + [4235, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1233681340], + [4239, 5, 903, "Metrics/MethodLength: Method has too many lines. [11/10]", 3964877742], + [4239, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873471], + [4240, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1322899615], + [4243, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 3471008807], + [4248, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 627945471], + [4254, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 2960084092], + [4258, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2148514258], + [4262, 5, 913, "Metrics/MethodLength: Method has too many lines. [11/10]", 385546958], + [4262, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2970472935], + [4263, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3808956371], + [4266, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 3412499338], + [4271, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 3274208144], + [4277, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 4275923717], + [4285, 5, 848, "Metrics/MethodLength: Method has too many lines. [11/10]", 457851502], + [4289, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 413805135], + [4294, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 951908917], + [4300, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 1859200227], + [4308, 5, 808, "Metrics/MethodLength: Method has too many lines. [11/10]", 884695726], + [4312, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 2011807620], + [4317, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 384138219], + [4323, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1176320663], + [4331, 5, 798, "Metrics/MethodLength: Method has too many lines. [11/10]", 1422521838], + [4335, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3247420006], + [4340, 121, 35, "Layout/LineLength: Line is too long. [155/120]", 1408316702], + [4346, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 938465266], + [4354, 5, 803, "Metrics/MethodLength: Method has too many lines. [11/10]", 2370839950], + [4358, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 74128911], + [4363, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 1364659899], + [4369, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2059517661], + [4377, 5, 803, "Metrics/MethodLength: Method has too many lines. [11/10]", 3379336814], + [4381, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 74128911], + [4386, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 1364659899], + [4434, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 4281772560], + [4442, 5, 833, "Metrics/MethodLength: Method has too many lines. [11/10]", 3245498510], + [4446, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3542644754], + [4451, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1916814773], + [4457, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 859690879], + [4465, 5, 833, "Metrics/MethodLength: Method has too many lines. [11/10]", 4138830126], + [4469, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3542644754], + [4474, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1916814773], + [4480, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3880141603], + [4488, 5, 828, "Metrics/MethodLength: Method has too many lines. [11/10]", 3621010990], + [4492, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3917260126], + [4497, 121, 41, "Layout/LineLength: Line is too long. [161/120]", 1879260859], + [4503, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1776611011], + [4511, 5, 838, "Metrics/MethodLength: Method has too many lines. [11/10]", 514585454], + [4515, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1353518231], + [4520, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 1228459824], + [4526, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 3932349968], + [4530, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087903307], + [4534, 5, 878, "Metrics/MethodLength: Method has too many lines. [11/10]", 1525737454], + [4534, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], + [4535, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177538], + [4538, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 2895681070], + [4543, 121, 51, "Layout/LineLength: Line is too long. [171/120]", 4040662298], + [4549, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 66929045], + [4557, 5, 808, "Metrics/MethodLength: Method has too many lines. [11/10]", 1626746606], + [4561, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 2011807620], + [4566, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 384138219], + [4580, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 849230508], + [4588, 5, 838, "Metrics/MethodLength: Method has too many lines. [11/10]", 3531122670], + [4592, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1353518231], + [4597, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 1228459824], + [4612, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1176320663], + [4620, 5, 798, "Metrics/MethodLength: Method has too many lines. [11/10]", 1118421486], + [4624, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3247420006], + [4629, 121, 35, "Layout/LineLength: Line is too long. [155/120]", 1408316702], + [4651, 5, 693, "Metrics/MethodLength: Method has too many lines. [11/10]", 1668406662], + [4660, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], + [4674, 5, 648, "Metrics/MethodLength: Method has too many lines. [11/10]", 3479836893], + [4683, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193343749], + [4705, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 3147549879], + [4714, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1808630920], + [4749, 5, 677, "Metrics/MethodLength: Method has too many lines. [11/10]", 1206941784], + [4758, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 3937819337], + [4781, 5, 672, "Metrics/MethodLength: Method has too many lines. [11/10]", 3634903061], + [4790, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], + [4812, 5, 683, "Metrics/MethodLength: Method has too many lines. [11/10]", 3417053461], + [4821, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], + [4845, 5, 668, "Metrics/MethodLength: Method has too many lines. [11/10]", 1540762726], + [4854, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 1808630920], + [4876, 5, 698, "Metrics/MethodLength: Method has too many lines. [11/10]", 2804825893], + [4885, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1367166441], + [4908, 5, 683, "Metrics/MethodLength: Method has too many lines. [11/10]", 3165010613], + [4917, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], + [4939, 5, 713, "Metrics/MethodLength: Method has too many lines. [11/10]", 2795628035], + [4948, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 497133415], + [4954, 5, 864, "Metrics/MethodLength: Method has too many lines. [12/10]", 1086224878], + [4954, 50, 268, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 4022739767], + [4955, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1607400384], + [4979, 5, 658, "Metrics/MethodLength: Method has too many lines. [11/10]", 3999796489], + [4988, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 102058825], + [5002, 59, 179, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1569981428], + [5003, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 1515849732], + [5034, 5, 694, "Metrics/MethodLength: Method has too many lines. [11/10]", 3830236120], + [5043, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2250857971], + [5057, 5, 673, "Metrics/MethodLength: Method has too many lines. [11/10]", 2413908653], + [5066, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1225026887], + [5080, 5, 663, "Metrics/MethodLength: Method has too many lines. [11/10]", 3935895659], + [5089, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2162352564], + [5103, 5, 692, "Metrics/MethodLength: Method has too many lines. [11/10]", 3660669627], + [5112, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3558241761], + [5126, 5, 612, "Metrics/MethodLength: Method has too many lines. [11/10]", 100391811], + [5165, 5, 693, "Metrics/MethodLength: Method has too many lines. [11/10]", 3138587622], + [5174, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 926808928], + [5196, 5, 688, "Metrics/MethodLength: Method has too many lines. [11/10]", 2736088861], + [5205, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1992103013], + [5228, 5, 678, "Metrics/MethodLength: Method has too many lines. [11/10]", 2275602867], + [5237, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3598350322], + [5260, 5, 602, "Metrics/MethodLength: Method has too many lines. [11/10]", 3023166371], + [5275, 36, 181, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1071580945], + [5288, 5, 787, "Metrics/AbcSize: Assignment Branch Condition size for `group_projected_child_review_cases` is too high. [<4, 17, 4> 17.92/17]", 3391527151], + [5288, 5, 787, "Metrics/MethodLength: Method has too many lines. [18/10]", 3391527151], + [5312, 5, 705, "Metrics/MethodLength: Method has too many lines. [13/10]", 2629923275], + [5339, 5, 547, "Metrics/MethodLength: Method has too many lines. [12/10]", 1911190850], + [5364, 5, 1516, "Metrics/AbcSize: Assignment Branch Condition size for `review_projected_child_groups` is too high. [<11, 21, 9> 25.36/17]", 3333110579], + [5364, 5, 1516, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `review_projected_child_groups` is too high. [8/7]", 3333110579], + [5364, 5, 1516, "Metrics/MethodLength: Method has too many lines. [39/10]", 3333110579], + [5364, 5, 1516, "Metrics/PerceivedComplexity: Perceived complexity for `review_projected_child_groups` is too high. [9/8]", 3333110579], + [5398, 7, 7, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 4045560504], + [5410, 5, 562, "Metrics/MethodLength: Method has too many lines. [14/10]", 3083915102], + [5429, 5, 1898, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_delegated_child_outputs` is too high. [<11, 21, 6> 24.45/17]", 2739722546], + [5429, 5, 1898, "Metrics/MethodLength: Method has too many lines. [49/10]", 2739722546], + [5484, 5, 942, "Metrics/AbcSize: Assignment Branch Condition size for `execute_nested_merge` is too high. [<3, 17, 6> 18.28/17]", 766157172], + [5484, 5, 942, "Metrics/MethodLength: Method has too many lines. [20/10]", 766157172], + [5484, 29, 144, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1404367793], + [5511, 5, 652, "Metrics/MethodLength: Method has too many lines. [13/10]", 2105803856], + [5530, 38, 140, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1682835820], + [5560, 5, 577, "Metrics/MethodLength: Method has too many lines. [12/10]", 2659610443], + [5629, 5, 569, "Metrics/MethodLength: Method has too many lines. [14/10]", 20616641], + [5657, 5, 772, "Metrics/AbcSize: Assignment Branch Condition size for `conformance_manifest_review_request_ids` is too high. [<7, 16, 8> 19.21/17]", 3577418475], + [5657, 5, 772, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `conformance_manifest_review_request_ids` is too high. [9/7]", 3577418475], + [5657, 5, 772, "Metrics/MethodLength: Method has too many lines. [14/10]", 3577418475], + [5657, 5, 772, "Metrics/PerceivedComplexity: Perceived complexity for `conformance_manifest_review_request_ids` is too high. [9/8]", 3577418475], + [5711, 5, 606, "Metrics/MethodLength: Method has too many lines. [11/10]", 2675086662], + [5726, 5, 562, "Metrics/MethodLength: Method has too many lines. [11/10]", 3811715870], + [5741, 5, 578, "Metrics/MethodLength: Method has too many lines. [11/10]", 1776197415], + [5756, 5, 1298, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_conformance_family_context` is too high. [<7, 28, 9> 30.23/17]", 4265202259], + [5756, 5, 1298, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `resolve_conformance_family_context` is too high. [10/7]", 4265202259], + [5756, 5, 1298, "Metrics/MethodLength: Method has too many lines. [23/10]", 4265202259], + [5756, 5, 1298, "Metrics/PerceivedComplexity: Perceived complexity for `resolve_conformance_family_context` is too high. [10/8]", 4265202259], + [5785, 5, 1994, "Metrics/AbcSize: Assignment Branch Condition size for `review_conformance_family_context` is too high. [<12, 24, 10> 28.64/17]", 2834851944], + [5785, 5, 1994, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `review_conformance_family_context` is too high. [10/7]", 2834851944], + [5785, 5, 1994, "Metrics/MethodLength: Method has too many lines. [41/10]", 2834851944], + [5785, 5, 1994, "Metrics/PerceivedComplexity: Perceived complexity for `review_conformance_family_context` is too high. [11/8]", 2834851944], + [5808, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 641612328], + [5845, 5, 1844, "Metrics/AbcSize: Assignment Branch Condition size for `select_conformance_case` is too high. [<2, 43, 14> 45.27/17]", 670673209], + [5845, 5, 1844, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `select_conformance_case` is too high. [14/7]", 670673209], + [5845, 5, 1844, "Metrics/MethodLength: Method has too many lines. [30/10]", 670673209], + [5845, 5, 1844, "Metrics/PerceivedComplexity: Perceived complexity for `select_conformance_case` is too high. [16/8]", 670673209], + [5850, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 2135503892], + [5852, 121, 41, "Layout/LineLength: Line is too long. [161/120]", 3932054828], + [5861, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 3169124957], + [5883, 5, 509, "Metrics/MethodLength: Method has too many lines. [11/10]", 3552283123], + [5972, 5, 4195, "Metrics/AbcSize: Assignment Branch Condition size for `review_conformance_manifest` is too high. [<37, 63, 16> 74.79/17]", 2166560528], + [5972, 5, 4195, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `review_conformance_manifest` is too high. [14/7]", 2166560528], + [5972, 5, 4195, "Metrics/MethodLength: Method has too many lines. [89/10]", 2166560528], + [5972, 5, 4195, "Metrics/PerceivedComplexity: Perceived complexity for `review_conformance_manifest` is too high. [17/8]", 2166560528], + [6037, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2746826653], + [6053, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 3035993839], + [6075, 5, 676, "Metrics/MethodLength: Method has too many lines. [15/10]", 3048335475], + [6098, 5, 1054, "Metrics/AbcSize: Assignment Branch Condition size for `plan_conformance_suite` is too high. [<11, 18, 8> 22.56/17]", 1855254788], + [6098, 5, 1054, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `plan_conformance_suite` is too high. [8/7]", 1855254788], + [6098, 5, 1054, "Metrics/MethodLength: Method has too many lines. [25/10]", 1855254788], + [6098, 31, 84, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 172854173], + [6163, 5, 1274, "Metrics/AbcSize: Assignment Branch Condition size for `plan_named_conformance_suites_with_diagnostics` is too high. [<11, 21, 7> 24.72/17]", 3991300730], + [6163, 5, 1274, "Metrics/MethodLength: Method has too many lines. [27/10]", 3991300730], + [6190, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 3035993839], + [6255, 5, 2071, "Metrics/AbcSize: Assignment Branch Condition size for `review_decision_for_family_context` is too high. [<7, 22, 16> 28.09/17]", 4245377184], + [6255, 5, 2071, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `review_decision_for_family_context` is too high. [12/7]", 4245377184], + [6255, 5, 2071, "Metrics/MethodLength: Method has too many lines. [46/10]", 4245377184], + [6255, 5, 2071, "Metrics/PerceivedComplexity: Perceived complexity for `review_decision_for_family_context` is too high. [12/8]", 4245377184], + [6260, 7, 1766, "Metrics/BlockLength: Block has too many lines. [40/25]", 65448241], + [6312, 5, 686, "Metrics/MethodLength: Method has too many lines. [13/10]", 4030291682] + ], + "lib/ast/merge/ast_node.rb:2037773320": [ + [44, 5, 7086, "Metrics/ClassLength: Class has too many lines. [114/100]", 201314721], + [220, 11, 10, "Naming/PredicatePrefix: Rename `has_error?` to `error?`.", 946854183] + ], + "lib/ast/merge/comment/attachment.rb:2388154769": [ + [42, 23, 180, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3775370530], + [75, 24, 2, "Lint/SafeNavigationConsistency: Use `.` instead of unnecessary `&.`.", 5858765], + [81, 25, 2, "Lint/SafeNavigationConsistency: Use `.` instead of unnecessary `&.`.", 5858765], + [114, 9, 410, "Metrics/AbcSize: Assignment Branch Condition size for `inspect` is too high. [<1, 17, 4> 17.49/17]", 605978105], + [115, 32, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] + ], + "lib/ast/merge/comment/augmenter.rb:633395157": [ + [12, 7, 13967, "Metrics/ClassLength: Class has too many lines. [291/100]", 2806660144], + [33, 9, 721, "Metrics/MethodLength: Method has too many lines. [16/10]", 200402816], + [33, 23, 91, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 2938734913], + [64, 9, 1335, "Metrics/AbcSize: Assignment Branch Condition size for `build!` is too high. [<12, 29, 6> 31.95/17]", 3904283188], + [64, 9, 1335, "Metrics/MethodLength: Method has too many lines. [22/10]", 3904283188], + [94, 9, 867, "Metrics/AbcSize: Assignment Branch Condition size for `infer_leading_comments` is too high. [<8, 19, 14> 24.92/17]", 1941464872], + [94, 9, 867, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_leading_comments` is too high. [11/7]", 1941464872], + [94, 9, 867, "Metrics/MethodLength: Method has too many lines. [20/10]", 1941464872], + [94, 9, 867, "Metrics/PerceivedComplexity: Perceived complexity for `infer_leading_comments` is too high. [12/8]", 1941464872], + [122, 9, 429, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_inline_comments` is too high. [8/7]", 2688935834], + [133, 9, 934, "Metrics/AbcSize: Assignment Branch Condition size for `infer_trailing_comments` is too high. [<8, 21, 18> 28.79/17]", 1551855281], + [133, 9, 934, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_trailing_comments` is too high. [15/7]", 1551855281], + [133, 9, 934, "Metrics/MethodLength: Method has too many lines. [20/10]", 1551855281], + [133, 9, 934, "Metrics/PerceivedComplexity: Perceived complexity for `infer_trailing_comments` is too high. [15/8]", 1551855281], + [160, 9, 488, "Metrics/AbcSize: Assignment Branch Condition size for `infer_postlude!` is too high. [<5, 17, 8> 19.44/17]", 2562637949], + [160, 9, 488, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_postlude!` is too high. [8/7]", 2562637949], + [173, 9, 1529, "Metrics/AbcSize: Assignment Branch Condition size for `infer_remaining_regions!` is too high. [<12, 27, 23> 37.44/17]", 3911657050], + [173, 9, 1529, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `infer_remaining_regions!` is too high. [18/7]", 3911657050], + [173, 9, 1529, "Metrics/MethodLength: Method has too many lines. [28/10]", 3911657050], + [173, 9, 1529, "Metrics/PerceivedComplexity: Perceived complexity for `infer_remaining_regions!` is too high. [20/8]", 3911657050], + [216, 9, 507, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split_preamble_group` is too high. [8/7]", 336784898], + [231, 9, 588, "Metrics/MethodLength: Method has too many lines. [17/10]", 3445626532], + [274, 9, 965, "Metrics/AbcSize: Assignment Branch Condition size for `build_region` is too high. [<6, 17, 7> 19.34/17]", 344809006], + [274, 9, 965, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_region` is too high. [8/7]", 344809006], + [274, 9, 965, "Metrics/MethodLength: Method has too many lines. [24/10]", 344809006] + ], + "lib/ast/merge/comment/block.rb:3806757604": [ + [31, 7, 6754, "Metrics/ClassLength: Class has too many lines. [106/100]", 2308582303], + [57, 9, 1059, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<12, 13, 14> 22.56/17]", 2656171724], + [57, 9, 1059, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `initialize` is too high. [14/7]", 2656171724], + [57, 9, 1059, "Metrics/MethodLength: Method has too many lines. [21/10]", 2656171724], + [57, 9, 1059, "Metrics/PerceivedComplexity: Perceived complexity for `initialize` is too high. [15/8]", 2656171724], + [113, 9, 511, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `freeze_action` is too high. [9/7]", 55014877], + [113, 9, 511, "Metrics/MethodLength: Method has too many lines. [12/10]", 55014877], + [113, 9, 511, "Metrics/PerceivedComplexity: Perceived complexity for `freeze_action` is too high. [9/8]", 55014877], + [181, 9, 439, "Metrics/AbcSize: Assignment Branch Condition size for `first_meaningful_content` is too high. [<2, 16, 11> 19.52/17]", 680479883], + [181, 9, 439, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `first_meaningful_content` is too high. [11/7]", 680479883], + [181, 9, 439, "Metrics/PerceivedComplexity: Perceived complexity for `first_meaningful_content` is too high. [12/8]", 680479883], + [197, 9, 765, "Metrics/AbcSize: Assignment Branch Condition size for `extract_block_content` is too high. [<7, 24, 9> 26.57/17]", 621871624], + [197, 9, 765, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_block_content` is too high. [9/7]", 621871624], + [197, 9, 765, "Metrics/PerceivedComplexity: Perceived complexity for `extract_block_content` is too high. [9/8]", 621871624] + ], + "lib/ast/merge/comment/c_style_tracker_base.rb:1569556520": [ + [22, 7, 15053, "Metrics/ClassLength: Class has too many lines. [284/100]", 3599183270], + [83, 9, 509, "Metrics/MethodLength: Method has too many lines. [11/10]", 1639553915], + [102, 9, 492, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `leading_comments_before` is too high. [8/7]", 3127043491], + [102, 9, 492, "Metrics/MethodLength: Method has too many lines. [11/10]", 3127043491], + [124, 9, 487, "Metrics/MethodLength: Method has too many lines. [11/10]", 1869933531], + [176, 9, 713, "Metrics/AbcSize: Assignment Branch Condition size for `trailing_comments_after` is too high. [<6, 12, 13> 18.68/17]", 543703521], + [176, 9, 713, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trailing_comments_after` is too high. [11/7]", 543703521], + [176, 9, 713, "Metrics/MethodLength: Method has too many lines. [14/10]", 543703521], + [176, 9, 713, "Metrics/PerceivedComplexity: Perceived complexity for `trailing_comments_after` is too high. [11/8]", 543703521], + [184, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177549], + [202, 9, 598, "Metrics/MethodLength: Method has too many lines. [12/10]", 1628921093], + [222, 9, 1271, "Metrics/MethodLength: Method has too many lines. [21/10]", 612335469], + [222, 35, 137, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1823300034], + [329, 35, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [348, 9, 2271, "Metrics/AbcSize: Assignment Branch Condition size for `extract_comments` is too high. [<17, 32, 13> 38.5/17]", 2751274968], + [348, 9, 2271, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `extract_comments` is too high. [14/7]", 2751274968], + [348, 9, 2271, "Metrics/MethodLength: Method has too many lines. [59/10]", 2751274968], + [348, 9, 2271, "Metrics/PerceivedComplexity: Perceived complexity for `extract_comments` is too high. [14/8]", 2751274968], + [353, 11, 2045, "Metrics/BlockLength: Block has too many lines. [52/25]", 575665179], + [418, 9, 659, "Metrics/MethodLength: Method has too many lines. [15/10]", 177254901], + [439, 71, 4, "Lint/UnusedMethodArgument: Unused method argument - `line`.", 2087656651], + [439, 78, 8, "Lint/UnusedMethodArgument: Unused method argument - `line_num`.", 622661090] + ], + "lib/ast/merge/comment/hash_tracker_base.rb:861186417": [ + [32, 7, 19362, "Metrics/ClassLength: Class has too many lines. [221/100]", 1031055222], + [118, 9, 444, "Metrics/MethodLength: Method has too many lines. [11/10]", 3347260807], + [142, 9, 921, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `leading_comments_before` is too high. [8/7]", 415734636], + [142, 9, 921, "Metrics/MethodLength: Method has too many lines. [11/10]", 415734636], + [172, 9, 440, "Metrics/MethodLength: Method has too many lines. [11/10]", 2464474004], + [225, 9, 623, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `trailing_comments_after` is too high. [10/7]", 543703521], + [225, 9, 623, "Metrics/MethodLength: Method has too many lines. [12/10]", 543703521], + [225, 9, 623, "Metrics/PerceivedComplexity: Perceived complexity for `trailing_comments_after` is too high. [10/8]", 543703521], + [249, 9, 551, "Metrics/MethodLength: Method has too many lines. [12/10]", 2783654570], + [278, 9, 1271, "Metrics/MethodLength: Method has too many lines. [21/10]", 612335469], + [278, 35, 137, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1823300034], + [374, 35, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [439, 9, 826, "Metrics/MethodLength: Method has too many lines. [12/10]", 1706632542] + ], + "lib/ast/merge/comment/parser.rb:2674748021": [ + [34, 7, 8372, "Metrics/ClassLength: Class has too many lines. [141/100]", 2541983664], + [84, 9, 357, "Metrics/MethodLength: Method has too many lines. [12/10]", 2265493710], + [104, 9, 545, "Metrics/AbcSize: Assignment Branch Condition size for `auto_detect_style` is too high. [<5, 17, 7> 19.05/17]", 868366444], + [104, 9, 545, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `auto_detect_style` is too high. [8/7]", 868366444], + [125, 9, 1650, "Metrics/AbcSize: Assignment Branch Condition size for `parse_line_comments` is too high. [<8, 28, 7> 29.95/17]", 1511562163], + [125, 9, 1650, "Metrics/MethodLength: Method has too many lines. [31/10]", 1511562163], + [176, 9, 2670, "Metrics/AbcSize: Assignment Branch Condition size for `parse_with_block_comments` is too high. [<15, 47, 15> 51.57/17]", 2963765048], + [176, 9, 2670, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_with_block_comments` is too high. [15/7]", 2963765048], + [176, 9, 2670, "Metrics/MethodLength: Method has too many lines. [47/10]", 2963765048], + [176, 9, 2670, "Metrics/PerceivedComplexity: Perceived complexity for `parse_with_block_comments` is too high. [16/8]", 2963765048], + [181, 11, 2390, "Metrics/BlockLength: Block has too many lines. [40/25]", 3720582340] + ], + "lib/ast/merge/comment/quoted_hash_line_parser.rb:2878420841": [ + [74, 9, 458, "Metrics/MethodLength: Method has too many lines. [11/10]", 1526360697], + [91, 9, 620, "Metrics/AbcSize: Assignment Branch Condition size for `inline_result` is too high. [<3, 16, 6> 17.35/17]", 2706755447], + [91, 9, 620, "Metrics/MethodLength: Method has too many lines. [14/10]", 2706755447] + ], + "lib/ast/merge/comment/region_merge_policy.rb:176745155": [ + [23, 23, 98, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1029631546], + [55, 9, 423, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `freeze_sensitive?` is too high. [8/7]", 4102661282], + [61, 41, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [61, 85, 2, "Lint/SafeNavigationConsistency: Use `.` instead of unnecessary `&.`.", 5858765], + [96, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3491399903] + ], + "lib/ast/merge/comment/style.rb:3045051983": [ + [27, 7, 9109, "Metrics/ClassLength: Class has too many lines. [143/100]", 131723516], + [142, 11, 911, "Metrics/MethodLength: Method has too many lines. [17/10]", 355862493], + [142, 23, 164, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 668558018], + [203, 23, 164, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 668558018] + ], + "lib/ast/merge/comment/tracked_hash_adapter.rb:3235547929": [ + [99, 11, 553, "Metrics/AbcSize: Assignment Branch Condition size for `line_text_from` is too high. [<4, 20, 4> 20.78/17]", 2680273536], + [99, 11, 553, "Metrics/MethodLength: Method has too many lines. [13/10]", 2680273536] + ], + "lib/ast/merge/composite_match_refiner.rb:1718969703": [ + [58, 7, 668, "Metrics/MethodLength: Method has too many lines. [14/10]", 2649148714] + ], + "lib/ast/merge/conflict_resolver_base.rb:765343263": [ + [69, 5, 14959, "Metrics/ClassLength: Class has too many lines. [170/100]", 633092728], + [156, 7, 919, "Metrics/MethodLength: Method has too many lines. [13/10]", 1701319380], + [156, 21, 200, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3369976202], + [367, 7, 972, "Metrics/MethodLength: Method has too many lines. [22/10]", 2870739148], + [434, 47, 13, "Style/NumericPredicate: Use `recursive.positive?` instead of `recursive > 0`.", 462999281], + [436, 99, 14, "Style/NumericPredicate: Use `recursive.zero?` instead of `recursive == 0`.", 2394069519] + ], + "lib/ast/merge/content_match_refiner.rb:3628272158": [ + [47, 5, 7719, "Metrics/ClassLength: Class has too many lines. [108/100]", 651494487], + [87, 7, 750, "Metrics/MethodLength: Method has too many lines. [17/10]", 3624290009], + [165, 37, 48, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 953994744], + [232, 7, 846, "Metrics/AbcSize: Assignment Branch Condition size for `levenshtein_distance` is too high. [<13, 29, 8> 32.77/17]", 3597737347], + [232, 7, 846, "Metrics/MethodLength: Method has too many lines. [20/10]", 3597737347] + ], + "lib/ast/merge/debug_logger.rb:1783610128": [ + [72, 5, 7614, "Metrics/ModuleLength: Module has too many lines. [118/100]", 736598454], + [85, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 941621], + [206, 7, 584, "Metrics/AbcSize: Assignment Branch Condition size for `time` is too high. [<3, 17, 2> 17.38/17]", 3468868523], + [206, 7, 584, "Metrics/MethodLength: Method has too many lines. [14/10]", 3468868523], + [269, 7, 450, "Metrics/PerceivedComplexity: Perceived complexity for `extract_lines` is too high. [9/8]", 680738666], + [287, 7, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631] + ], + "lib/ast/merge/detector/base.rb:343830240": [ + [175, 25, 73, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2991095115] + ], + "lib/ast/merge/detector/fenced_code_block.rb:3555142063": [ + [36, 7, 6302, "Metrics/ClassLength: Class has too many lines. [116/100]", 852968953], + [71, 9, 2492, "Metrics/AbcSize: Assignment Branch Condition size for `detect_all` is too high. [<31, 28, 12> 43.46/17]", 3575218793], + [71, 9, 2492, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `detect_all` is too high. [11/7]", 3575218793], + [71, 9, 2492, "Metrics/MethodLength: Method has too many lines. [54/10]", 3575218793], + [71, 9, 2492, "Metrics/PerceivedComplexity: Perceived complexity for `detect_all` is too high. [13/8]", 3575218793], + [84, 11, 2060, "Metrics/BlockLength: Block has too many lines. [41/25]", 1744553779] + ], + "lib/ast/merge/detector/mergeable.rb:354817747": [ + [54, 7, 11933, "Metrics/ModuleLength: Module has too many lines. [140/100]", 1453034870], + [162, 9, 601, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_region_configs` is too high. [8/7]", 1278024890], + [162, 9, 601, "Metrics/MethodLength: Method has too many lines. [16/10]", 1278024890], + [189, 9, 1054, "Metrics/AbcSize: Assignment Branch Condition size for `extract_regions` is too high. [<11, 16, 3> 19.65/17]", 663241096], + [189, 9, 1054, "Metrics/MethodLength: Method has too many lines. [20/10]", 663241096], + [285, 9, 1005, "Metrics/AbcSize: Assignment Branch Condition size for `merge_and_substitute_regions` is too high. [<16, 19, 4> 25.16/17]", 4123525156], + [285, 9, 1005, "Metrics/MethodLength: Method has too many lines. [16/10]", 4123525156], + [318, 9, 1369, "Metrics/AbcSize: Assignment Branch Condition size for `merge_region` is too high. [<11, 20, 14> 26.78/17]", 746321843], + [318, 9, 1369, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_region` is too high. [15/7]", 746321843], + [318, 9, 1369, "Metrics/MethodLength: Method has too many lines. [16/10]", 746321843], + [318, 9, 1369, "Metrics/PerceivedComplexity: Perceived complexity for `merge_region` is too high. [15/8]", 746321843] + ], + "lib/ast/merge/detector/toml_frontmatter.rb:3255696517": [ + [50, 9, 892, "Metrics/MethodLength: Method has too many lines. [20/10]", 3132005303] + ], + "lib/ast/merge/detector/yaml_frontmatter.rb:2551474823": [ + [49, 9, 958, "Metrics/MethodLength: Method has too many lines. [20/10]", 3132005303] + ], + "lib/ast/merge/diff_mapper_base.rb:3204989377": [ + [22, 5, 7793, "Metrics/ClassLength: Class has too many lines. [141/100]", 2217731166], + [80, 7, 2598, "Metrics/AbcSize: Assignment Branch Condition size for `parse_diff` is too high. [<21, 31, 15> 40.34/17]", 939898835], + [80, 7, 2598, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_diff` is too high. [16/7]", 939898835], + [80, 7, 2598, "Metrics/MethodLength: Method has too many lines. [65/10]", 939898835], + [80, 7, 2598, "Metrics/PerceivedComplexity: Perceived complexity for `parse_diff` is too high. [12/8]", 939898835], + [90, 9, 2162, "Metrics/BlockLength: Block has too many lines. [50/25]", 3403609416], + [169, 7, 394, "Metrics/MethodLength: Method has too many lines. [11/10]", 2028641628] + ], + "lib/ast/merge/emitter_base.rb:655463559": [ + [26, 5, 14449, "Metrics/ClassLength: Class has too many lines. [226/100]", 2015391034], + [95, 7, 653, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_comment_region` is too high. [9/7]", 24580929], + [95, 7, 653, "Metrics/MethodLength: Method has too many lines. [12/10]", 24580929], + [95, 7, 653, "Metrics/PerceivedComplexity: Perceived complexity for `emit_comment_region` is too high. [9/8]", 24580929], + [120, 7, 1311, "Metrics/AbcSize: Assignment Branch Condition size for `emit_comment_attachment` is too high. [<5, 25, 16> 30.1/17]", 964928813], + [120, 7, 1311, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_comment_attachment` is too high. [17/7]", 964928813], + [120, 7, 1311, "Metrics/MethodLength: Method has too many lines. [17/10]", 964928813], + [120, 7, 1311, "Metrics/PerceivedComplexity: Perceived complexity for `emit_comment_attachment` is too high. [17/8]", 964928813], + [120, 34, 127, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 628879795], + [152, 7, 984, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_layout_gap` is too high. [8/7]", 1954418889], + [152, 7, 984, "Metrics/MethodLength: Method has too many lines. [13/10]", 1954418889], + [152, 7, 984, "Metrics/PerceivedComplexity: Perceived complexity for `emit_layout_gap` is too high. [9/8]", 1954418889], + [152, 26, 136, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3839882587], + [183, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861198], + [184, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087656651], + [186, 7, 1307, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_layout_attachment` is too high. [9/7]", 708408665], + [186, 7, 1307, "Metrics/MethodLength: Method has too many lines. [26/10]", 708408665], + [186, 7, 1307, "Metrics/PerceivedComplexity: Perceived complexity for `emit_layout_attachment` is too high. [9/8]", 708408665], + [186, 33, 218, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1552587384], + [187, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 1763090185], + [189, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1371312610], + [256, 31, 17, "Style/NumericPredicate: Use `@indent_level.positive?` instead of `@indent_level > 0`.", 1892475678], + [302, 56, 12, "Lint/UnusedMethodArgument: Unused method argument - `current_line`. You can also write as `inline_comment_region_target_column(*)` if you want the method to accept any arguments but don't care about them.", 2091263933], + [306, 42, 6, "Lint/UnusedMethodArgument: Unused method argument - `region`.", 2124512157], + [306, 51, 13, "Lint/UnusedMethodArgument: Unused method argument - `target_column`.", 3246375805], + [321, 7, 1141, "Metrics/AbcSize: Assignment Branch Condition size for `inline_comment_node_text` is too high. [<6, 29, 8> 30.68/17]", 2583471562], + [321, 7, 1141, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `inline_comment_node_text` is too high. [9/7]", 2583471562], + [321, 7, 1141, "Metrics/MethodLength: Method has too many lines. [22/10]", 2583471562], + [321, 7, 1141, "Metrics/PerceivedComplexity: Perceived complexity for `inline_comment_node_text` is too high. [9/8]", 2583471562], + [339, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861626], + [350, 7, 510, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `emit_region_gap_lines` is too high. [8/7]", 1999747697], + [350, 7, 510, "Metrics/PerceivedComplexity: Perceived complexity for `emit_region_gap_lines` is too high. [9/8]", 1999747697] + ], + "lib/ast/merge/emitter_line_metadata_support.rb:3153033769": [ + [5, 5, 33, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::EmitterLineMetadataSupport`.", 2926748997], + [23, 7, 541, "Metrics/MethodLength: Method has too many lines. [12/10]", 2407359355] + ], + "lib/ast/merge/file_aligner_base.rb:2160333224": [ + [13, 5, 8206, "Metrics/ClassLength: Class has too many lines. [203/100]", 2982381587], + [27, 7, 2329, "Metrics/AbcSize: Assignment Branch Condition size for `align` is too high. [<19, 39, 14> 45.59/17]", 1243937217], + [27, 7, 2329, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `align` is too high. [14/7]", 1243937217], + [27, 7, 2329, "Metrics/MethodLength: Method has too many lines. [56/10]", 1243937217], + [27, 7, 2329, "Metrics/PerceivedComplexity: Perceived complexity for `align` is too high. [14/8]", 1243937217], + [167, 7, 655, "Metrics/MethodLength: Method has too many lines. [14/10]", 2468821688], + [199, 7, 455, "Metrics/MethodLength: Method has too many lines. [13/10]", 2361153066], + [218, 7, 1557, "Metrics/AbcSize: Assignment Branch Condition size for `apply_match_refiner!` is too high. [<10, 28, 12> 32.06/17]", 2386945712], + [218, 7, 1557, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `apply_match_refiner!` is too high. [13/7]", 2386945712], + [218, 7, 1557, "Metrics/MethodLength: Method has too many lines. [31/10]", 2386945712], + [218, 7, 1557, "Metrics/PerceivedComplexity: Perceived complexity for `apply_match_refiner!` is too high. [13/8]", 2386945712] + ], + "lib/ast/merge/file_analyzable.rb:607555963": [ + [36, 5, 31229, "Metrics/ModuleLength: Module has too many lines. [316/100]", 1247752256], + [99, 19, 9, "Style/NumericPredicate: Use `index.negative?` instead of `index < 0`.", 4215255415], + [148, 7, 793, "Metrics/MethodLength: Method has too many lines. [22/10]", 1467470910], + [202, 7, 771, "Metrics/MethodLength: Method has too many lines. [16/10]", 1412317163], + [344, 7, 844, "Metrics/MethodLength: Method has too many lines. [12/10]", 2335919661], + [369, 7, 730, "Metrics/MethodLength: Method has too many lines. [11/10]", 1047958652], + [431, 7, 863, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_layout_owned_comment_attachment` is too high. [<0, 20, 4> 20.4/17]", 3284843691], + [431, 7, 863, "Metrics/MethodLength: Method has too many lines. [17/10]", 3284843691], + [481, 7, 683, "Metrics/MethodLength: Method has too many lines. [15/10]", 241044926], + [520, 14, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [614, 7, 6095, "Metrics/AbcSize: Assignment Branch Condition size for `generate_signature` is too high. [<4, 21, 13> 25.02/17]", 2828809875], + [614, 7, 6095, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `generate_signature` is too high. [11/7]", 2828809875], + [614, 7, 6095, "Metrics/MethodLength: Method has too many lines. [30/10]", 2828809875], + [614, 7, 6095, "Metrics/PerceivedComplexity: Perceived complexity for `generate_signature` is too high. [14/8]", 2828809875], + [676, 24, 390, "Metrics/BlockNesting: Avoid more than 3 levels of block nesting.", 3279112483] + ], + "lib/ast/merge/freeze_node_base.rb:2110274026": [ + [59, 5, 14572, "Metrics/ClassLength: Class has too many lines. [171/100]", 3038607603], + [108, 25, 545, "Style/MutableConstant: Freeze mutable objects assigned to constants.", 2366014160], + [186, 9, 1100, "Metrics/MethodLength: Method has too many lines. [15/10]", 2506841532], + [288, 7, 758, "Metrics/MethodLength: Method has too many lines. [11/10]", 136868205], + [288, 21, 276, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 1720059801], + [335, 7, 660, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `reason` is too high. [8/7]", 3127566048], + [418, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] + ], + "lib/ast/merge/healer.rb:3642412735": [ + [18, 7, 588, "Metrics/MethodLength: Method has too many lines. [15/10]", 3172269921], + [18, 17, 84, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1781025196], + [41, 7, 687, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `filter_items` is too high. [8/7]", 1200842691], + [41, 7, 687, "Metrics/MethodLength: Method has too many lines. [17/10]", 1200842691], + [41, 7, 687, "Metrics/PerceivedComplexity: Perceived complexity for `filter_items` is too high. [9/8]", 1200842691], + [41, 23, 130, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 33939503] + ], + "lib/ast/merge/jaccard_similarity.rb:678558736": [ + [87, 19, 1, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 177604], + [87, 22, 1, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 177607] + ], + "lib/ast/merge/key_path_partial_template_merger_base.rb:1818613864": [ + [22, 5, 6114, "Metrics/ClassLength: Class has too many lines. [155/100]", 1269962119], + [43, 21, 214, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 3637591635], + [68, 7, 489, "Metrics/MethodLength: Method has too many lines. [12/10]", 3170411580], + [118, 7, 640, "Metrics/AbcSize: Assignment Branch Condition size for `find_key_path` is too high. [<8, 14, 10> 18.97/17]", 2613403604], + [118, 7, 640, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_key_path` is too high. [8/7]", 2613403604], + [118, 7, 640, "Metrics/MethodLength: Method has too many lines. [16/10]", 2613403604], + [118, 7, 640, "Metrics/PerceivedComplexity: Perceived complexity for `find_key_path` is too high. [9/8]", 2613403604], + [140, 7, 536, "Metrics/MethodLength: Method has too many lines. [17/10]", 3598062652], + [168, 7, 804, "Metrics/MethodLength: Method has too many lines. [19/10]", 2773364183] + ], + "lib/ast/merge/layout.rb:3670500101": [ + [23, 36, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765] + ], + "lib/ast/merge/layout/augmenter.rb:2556116722": [ + [8, 7, 5498, "Metrics/ClassLength: Class has too many lines. [129/100]", 3693754698], + [21, 23, 125, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 3395039982], + [53, 9, 1795, "Metrics/AbcSize: Assignment Branch Condition size for `build!` is too high. [<20, 32, 17> 41.39/17]", 3542913254], + [53, 9, 1795, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build!` is too high. [15/7]", 3542913254], + [53, 9, 1795, "Metrics/MethodLength: Method has too many lines. [43/10]", 3542913254], + [53, 9, 1795, "Metrics/PerceivedComplexity: Perceived complexity for `build!` is too high. [15/8]", 3542913254], + [58, 11, 1227, "Metrics/BlockLength: Block has too many lines. [29/25]", 55360131], + [105, 9, 504, "Metrics/MethodLength: Method has too many lines. [16/10]", 1953725517] + ], + "lib/ast/merge/layout/gap.rb:1678106201": [ + [11, 7, 7558, "Metrics/ClassLength: Class has too many lines. [151/100]", 2254377349], + [23, 9, 655, "Metrics/MethodLength: Method has too many lines. [11/10]", 3584854768], + [23, 23, 146, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 361396001], + [157, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859545], + [162, 9, 303, "Metrics/MethodLength: Method has too many lines. [12/10]", 2236444774], + [203, 9, 688, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_adjacency!` is too high. [10/7]", 1112786311], + [203, 9, 688, "Metrics/MethodLength: Method has too many lines. [13/10]", 1112786311] + ], + "lib/ast/merge/match_refiner_base.rb:1760054866": [ + [248, 7, 503, "Metrics/MethodLength: Method has too many lines. [11/10]", 2844230268], + [275, 7, 1056, "Metrics/AbcSize: Assignment Branch Condition size for `greedy_match` is too high. [<9, 24, 8> 26.85/17]", 2497617815], + [275, 7, 1056, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `greedy_match` is too high. [8/7]", 2497617815], + [275, 7, 1056, "Metrics/MethodLength: Method has too many lines. [24/10]", 2497617815] + ], + "lib/ast/merge/merge_result_base.rb:764500297": [ + [17, 5, 18646, "Metrics/ClassLength: Class has too many lines. [335/100]", 314460772], + [88, 21, 187, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1067369198], + [187, 7, 843, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_blank_line_runs!` is too high. [<12, 12, 10> 19.7/17]", 2347011594], + [187, 7, 843, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_blank_line_runs!` is too high. [9/7]", 2347011594], + [187, 7, 843, "Metrics/MethodLength: Method has too many lines. [22/10]", 2347011594], + [187, 7, 843, "Metrics/PerceivedComplexity: Perceived complexity for `normalize_blank_line_runs!` is too high. [10/8]", 2347011594], + [227, 7, 1004, "Metrics/MethodLength: Method has too many lines. [21/10]", 59539336], + [227, 35, 211, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 709487711], + [266, 7, 602, "Metrics/MethodLength: Method has too many lines. [13/10]", 320027623], + [341, 7, 927, "Metrics/AbcSize: Assignment Branch Condition size for `validate_review_state_compatibility!` is too high. [<8, 15, 4> 17.46/17]", 1596840080], + [341, 7, 927, "Metrics/MethodLength: Method has too many lines. [16/10]", 1596840080], + [403, 7, 936, "Metrics/AbcSize: Assignment Branch Condition size for `review_state_metadata` is too high. [<7, 18, 4> 19.72/17]", 4128292066], + [403, 7, 936, "Metrics/MethodLength: Method has too many lines. [14/10]", 4128292066], + [413, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 20421901], + [438, 7, 1194, "Metrics/MethodLength: Method has too many lines. [21/10]", 4289697646], + [448, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3342583337] + ], + "lib/ast/merge/merger_config.rb:3582657829": [ + [46, 5, 10581, "Metrics/ClassLength: Class has too many lines. [148/100]", 1598770872], + [96, 21, 234, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 720509970] + ], + "lib/ast/merge/navigable/injection_point_finder.rb:4117743218": [ + [45, 9, 1707, "Metrics/AbcSize: Assignment Branch Condition size for `find` is too high. [<9, 18, 17> 26.34/17]", 1445381162], + [45, 9, 1707, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find` is too high. [15/7]", 1445381162], + [45, 9, 1707, "Metrics/MethodLength: Method has too many lines. [28/10]", 1445381162], + [45, 9, 1707, "Metrics/PerceivedComplexity: Perceived complexity for `find` is too high. [16/8]", 1445381162], + [45, 17, 156, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 3876813166] + ], + "lib/ast/merge/navigable/statement.rb:3050515622": [ + [42, 7, 11078, "Metrics/ClassLength: Class has too many lines. [179/100]", 2550894515], + [96, 11, 550, "Metrics/AbcSize: Assignment Branch Condition size for `find_matching` is too high. [<7, 16, 12> 21.19/17]", 3492534565], + [96, 11, 550, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_matching` is too high. [12/7]", 3492534565], + [96, 11, 550, "Metrics/PerceivedComplexity: Perceived complexity for `find_matching` is too high. [12/8]", 3492534565], + [222, 13, 20, "Naming/PredicatePrefix: Rename `has_tree_navigation?` to `tree_navigation?`.", 733442156] + ], + "lib/ast/merge/node_typing.rb:4008165135": [ + [175, 9, 694, "Metrics/MethodLength: Method has too many lines. [12/10]", 777909930], + [213, 9, 891, "Metrics/AbcSize: Assignment Branch Condition size for `find_typing_callable` is too high. [<3, 23, 13> 26.59/17]", 3835052858], + [213, 9, 891, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `find_typing_callable` is too high. [14/7]", 3835052858], + [213, 9, 891, "Metrics/PerceivedComplexity: Perceived complexity for `find_typing_callable` is too high. [14/8]", 3835052858] + ], + "lib/ast/merge/node_wrapper_base.rb:3796877358": [ + [62, 5, 10228, "Metrics/ClassLength: Class has too many lines. [135/100]", 3832956007], + [92, 21, 81, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 4261369704] + ], + "lib/ast/merge/owner_selection.rb:2568070127": [ + [9, 7, 757, "Metrics/MethodLength: Method has too many lines. [13/10]", 2069564552] + ], + "lib/ast/merge/partial_template_merger_base.rb:2252899061": [ + [27, 5, 16780, "Metrics/ClassLength: Class has too many lines. [266/100]", 2205844189], + [48, 23, 81, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2112244807], + [106, 7, 757, "Metrics/MethodLength: Method has too many lines. [11/10]", 571708764], + [106, 21, 293, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 871709580], + [135, 7, 788, "Metrics/AbcSize: Assignment Branch Condition size for `merge` is too high. [<4, 19, 5> 20.05/17]", 467674580], + [135, 7, 788, "Metrics/MethodLength: Method has too many lines. [13/10]", 467674580], + [213, 7, 533, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_matcher` is too high. [<7, 20, 6> 22.02/17]", 1798972396], + [238, 7, 922, "Metrics/MethodLength: Method has too many lines. [25/10]", 1846154069], + [242, 25, 37, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 939456830], + [251, 25, 31, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 1024894473], + [268, 7, 1905, "Metrics/AbcSize: Assignment Branch Condition size for `perform_section_merge` is too high. [<13, 15, 2> 19.95/17]", 2711014340], + [268, 7, 1905, "Metrics/MethodLength: Method has too many lines. [34/10]", 2711014340], + [316, 50, 15, "Lint/UnusedMethodArgument: Unused method argument - `section_context`.", 2872123372], + [334, 7, 690, "Metrics/MethodLength: Method has too many lines. [14/10]", 1807124523], + [367, 7, 1122, "Metrics/AbcSize: Assignment Branch Condition size for `build_merged_content` is too high. [<1, 29, 14> 32.22/17]", 3938410418], + [367, 7, 1122, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_merged_content` is too high. [15/7]", 3938410418], + [367, 7, 1122, "Metrics/MethodLength: Method has too many lines. [18/10]", 3938410418], + [367, 7, 1122, "Metrics/PerceivedComplexity: Perceived complexity for `build_merged_content` is too high. [15/8]", 3938410418], + [397, 7, 596, "Metrics/MethodLength: Method has too many lines. [12/10]", 2602121883], + [397, 32, 144, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 1463491208], + [414, 7, 1589, "Metrics/AbcSize: Assignment Branch Condition size for `source_splice_plan_for` is too high. [<6, 18, 9> 21/17]", 2889667289], + [414, 7, 1589, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `source_splice_plan_for` is too high. [9/7]", 2889667289], + [414, 7, 1589, "Metrics/MethodLength: Method has too many lines. [30/10]", 2889667289], + [414, 7, 1589, "Metrics/PerceivedComplexity: Perceived complexity for `source_splice_plan_for` is too high. [9/8]", 2889667289] + ], + "lib/ast/merge/recipe/config.rb:3990762705": [ + [54, 7, 14970, "Metrics/ClassLength: Class has too many lines. [296/100]", 2492031021], + [142, 9, 673, "Metrics/MethodLength: Method has too many lines. [12/10]", 3011978845], + [170, 9, 484, "Metrics/MethodLength: Method has too many lines. [15/10]", 183356432], + [246, 9, 710, "Metrics/AbcSize: Assignment Branch Condition size for `parse_injection` is too high. [<8, 13, 8> 17.23/17]", 641239814], + [246, 9, 710, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_injection` is too high. [9/7]", 641239814], + [246, 9, 710, "Metrics/MethodLength: Method has too many lines. [16/10]", 641239814], + [246, 9, 710, "Metrics/PerceivedComplexity: Perceived complexity for `parse_injection` is too high. [9/8]", 641239814], + [278, 9, 871, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_step` is too high. [8/7]", 3989307721], + [278, 9, 871, "Metrics/MethodLength: Method has too many lines. [20/10]", 3989307721], + [338, 9, 1758, "Metrics/AbcSize: Assignment Branch Condition size for `parse_step_merge_overrides` is too high. [<11, 43, 25> 50.94/17]", 806370438], + [338, 9, 1758, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_step_merge_overrides` is too high. [22/7]", 806370438], + [338, 9, 1758, "Metrics/MethodLength: Method has too many lines. [30/10]", 806370438], + [338, 9, 1758, "Metrics/PerceivedComplexity: Perceived complexity for `parse_step_merge_overrides` is too high. [22/8]", 806370438], + [373, 9, 566, "Metrics/MethodLength: Method has too many lines. [14/10]", 3671206955], + [391, 9, 547, "Metrics/MethodLength: Method has too many lines. [16/10]", 3273587697], + [459, 9, 799, "Metrics/AbcSize: Assignment Branch Condition size for `validate_injection!` is too high. [<2, 15, 12> 19.31/17]", 1665903587], + [459, 9, 799, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `validate_injection!` is too high. [13/7]", 1665903587], + [459, 9, 799, "Metrics/MethodLength: Method has too many lines. [11/10]", 1665903587], + [459, 9, 799, "Metrics/PerceivedComplexity: Perceived complexity for `validate_injection!` is too high. [13/8]", 1665903587] + ], + "lib/ast/merge/recipe/preset.rb:2311326866": [ + [195, 9, 662, "Metrics/MethodLength: Method has too many lines. [12/10]", 1640897447] + ], + "lib/ast/merge/recipe/runner.rb:2243867806": [ + [27, 7, 28612, "Metrics/ClassLength: Class has too many lines. [547/100]", 79000832], + [73, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1411864995], + [77, 23, 136, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 1636278032], + [92, 9, 849, "Metrics/MethodLength: Method has too many lines. [14/10]", 3083064345], + [128, 24, 129, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2642826282], + [210, 9, 788, "Metrics/MethodLength: Method has too many lines. [23/10]", 743008161], + [241, 9, 3397, "Metrics/AbcSize: Assignment Branch Condition size for `create_partial_template_merger` is too high. [<3, 52, 16> 54.49/17]", 2086180075], + [241, 9, 3397, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `create_partial_template_merger` is too high. [14/7]", 2086180075], + [241, 9, 3397, "Metrics/MethodLength: Method has too many lines. [63/10]", 2086180075], + [241, 9, 3397, "Metrics/PerceivedComplexity: Perceived complexity for `create_partial_template_merger` is too high. [13/8]", 2086180075], + [250, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2857356312], + [274, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177538], + [312, 9, 2210, "Metrics/AbcSize: Assignment Branch Condition size for `create_smart_merger` is too high. [<1, 39, 7> 39.64/17]", 1694660188], + [312, 9, 2210, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `create_smart_merger` is too high. [8/7]", 1694660188], + [312, 9, 2210, "Metrics/MethodLength: Method has too many lines. [45/10]", 1694660188], + [357, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 195423462], + [370, 9, 1087, "Metrics/MethodLength: Method has too many lines. [24/10]", 3850049530], + [370, 31, 124, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3466458723], + [401, 9, 1008, "Metrics/MethodLength: Method has too many lines. [19/10]", 2010895303], + [401, 25, 143, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 2360959504], + [424, 9, 1263, "Metrics/AbcSize: Assignment Branch Condition size for `execute_partial_merge_step` is too high. [<3, 22, 1> 22.23/17]", 2850918453], + [424, 9, 1263, "Metrics/MethodLength: Method has too many lines. [25/10]", 2850918453], + [453, 9, 835, "Metrics/MethodLength: Method has too many lines. [14/10]", 1478843287], + [471, 9, 808, "Metrics/MethodLength: Method has too many lines. [15/10]", 1127254660], + [471, 37, 155, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 838578768], + [491, 9, 1126, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_smart_merge_result` is too high. [<8, 17, 12> 22.29/17]", 1786697339], + [491, 9, 1126, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_smart_merge_result` is too high. [9/7]", 1786697339], + [491, 9, 1126, "Metrics/MethodLength: Method has too many lines. [23/10]", 1786697339], + [491, 9, 1126, "Metrics/PerceivedComplexity: Perceived complexity for `normalize_smart_merge_result` is too high. [11/8]", 1786697339], + [518, 9, 2523, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_script_step_result` is too high. [<5, 40, 32> 51.47/17]", 2162420067], + [518, 9, 2523, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_script_step_result` is too high. [26/7]", 2162420067], + [518, 9, 2523, "Metrics/MethodLength: Method has too many lines. [48/10]", 2162420067], + [518, 9, 2523, "Metrics/PerceivedComplexity: Perceived complexity for `normalize_script_step_result` is too high. [29/8]", 2162420067], + [547, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 93872446], + [556, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 1527250939], + [586, 11, 155, "Style/HashTransformKeys: Prefer `transform_keys` over `each_with_object`.", 837503672], + [591, 9, 698, "Metrics/MethodLength: Method has too many lines. [11/10]", 1116310304], + [635, 9, 2582, "Metrics/AbcSize: Assignment Branch Condition size for `create_result_from_steps` is too high. [<8, 30, 31> 43.87/17]", 2040042265], + [635, 9, 2582, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `create_result_from_steps` is too high. [23/7]", 2040042265], + [635, 9, 2582, "Metrics/MethodLength: Method has too many lines. [60/10]", 2040042265], + [635, 9, 2582, "Metrics/PerceivedComplexity: Perceived complexity for `create_result_from_steps` is too high. [27/8]", 2040042265], + [635, 37, 133, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 789257106], + [649, 42, 40, "Style/SymbolProc: Pass `&:has_anchor` as an argument to `any?` instead of a block.", 4233626321] + ], + "lib/ast/merge/recipe/script_loader.rb:1397873218": [ + [145, 9, 1126, "Metrics/AbcSize: Assignment Branch Condition size for `load_script_file` is too high. [<6, 19, 4> 20.32/17]", 3417625171], + [145, 9, 1126, "Metrics/MethodLength: Method has too many lines. [17/10]", 3417625171] + ], + "lib/ast/merge/rspec/comment_behavior_matrix_adapters.rb:3429217018": [ + [9, 46, 341, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 532439002], + [31, 9, 901, "Metrics/MethodLength: Method has too many lines. [11/10]", 584608092], + [31, 59, 308, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 883491898], + [54, 9, 1269, "Metrics/MethodLength: Method has too many lines. [20/10]", 1021031182], + [65, 51, 6, "Lint/UnusedBlockArgument: Unused block argument - `inline`. If it's necessary, use `_` or `_inline` as an argument name to indicate that it won't be used.", 1605470060], + [69, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 4226982364], + [70, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1440420861] + ], + "lib/ast/merge/rspec/conformance_fixtures.rb:1295759615": [ + [6, 7, 26, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::RSpec::ConformanceFixtures`.", 90066768], + [9, 9, 1432, "Metrics/AbcSize: Assignment Branch Condition size for `normalize_conformance_fixture_support` is too high. [<10, 30, 33> 45.71/17]", 518714108], + [9, 9, 1432, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `normalize_conformance_fixture_support` is too high. [33/7]", 518714108], + [9, 9, 1432, "Metrics/MethodLength: Method has too many lines. [25/10]", 518714108], + [9, 9, 1432, "Metrics/PerceivedComplexity: Perceived complexity for `normalize_conformance_fixture_support` is too high. [31/8]", 518714108] + ], + "lib/ast/merge/rspec/dependency_tags_config.rb:3604516304": [ + [30, 1, 2102, "Metrics/BlockLength: Block has too many lines. [26/25]", 113766065] + ], + "lib/ast/merge/rspec/merge_gem_registry.rb:3009576030": [ + [58, 7, 12129, "Metrics/ModuleLength: Module has too many lines. [158/100]", 335549747], + [90, 9, 780, "Metrics/MethodLength: Method has too many lines. [14/10]", 978965737], + [90, 21, 99, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3580433546], + [118, 9, 650, "Metrics/MethodLength: Method has too many lines. [12/10]", 3143160805], + [118, 31, 130, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2575863904], + [143, 9, 823, "Metrics/MethodLength: Method has too many lines. [17/10]", 4033116153], + [200, 9, 765, "Metrics/AbcSize: Assignment Branch Condition size for `register_known_gems` is too high. [<3, 17, 3> 17.52/17]", 1367620151], + [200, 9, 765, "Metrics/MethodLength: Method has too many lines. [17/10]", 1367620151] + ], + "lib/ast/merge/rspec/shared_examples.rb:2878318351": [ + [29, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 330577472] + ], + "lib/ast/merge/rspec/shared_examples/comment_behavior_matrix.rb:3695671858": [ + [36, 1, 27847, "Metrics/BlockLength: Block has too many lines. [540/25]", 3796645407], + [38, 55, 15, "Style/SymbolProc: Pass `&:value` as an argument to `lambda` instead of a block.", 1808354951], + [42, 64, 23, "Style/SymbolProc: Pass `&:statements` as an argument to `lambda` instead of a block.", 277221641], + [69, 3, 4455, "Metrics/BlockLength: Block has too many lines. [82/25]", 3672334777], + [72, 5, 1763, "Metrics/BlockLength: Block has too many lines. [34/25]", 164750821], + [165, 3, 22093, "Metrics/BlockLength: Block has too many lines. [429/25]", 229312375], + [292, 5, 1918, "Metrics/BlockLength: Block has too many lines. [29/25]", 1312741055], + [323, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1902517440], + [325, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 173482512], + [328, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 167607404], + [476, 5, 1605, "Metrics/BlockLength: Block has too many lines. [35/25]", 1943633697], + [677, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1902517440] + ], + "lib/ast/merge/rspec/shared_examples/conflict_resolver_base.rb:624045197": [ + [30, 1, 7893, "Metrics/BlockLength: Block has too many lines. [197/25]", 3450672926], + [37, 3, 1372, "Metrics/BlockLength: Block has too many lines. [33/25]", 3389152504], + [83, 3, 1206, "Metrics/BlockLength: Block has too many lines. [35/25]", 1580202348], + [128, 3, 1177, "Metrics/BlockLength: Block has too many lines. [33/25]", 2178974049], + [215, 3, 2443, "Metrics/BlockLength: Block has too many lines. [51/25]", 2538475273], + [219, 5, 1909, "Metrics/BlockLength: Block has too many lines. [35/25]", 880175101], + [279, 1, 2518, "Metrics/BlockLength: Block has too many lines. [74/25]", 958151448], + [286, 3, 2235, "Metrics/BlockLength: Block has too many lines. [70/25]", 2123260684], + [391, 1, 1317, "Metrics/BlockLength: Block has too many lines. [37/25]", 2321517041], + [439, 1, 1639, "Metrics/BlockLength: Block has too many lines. [37/25]", 276150366] + ], + "lib/ast/merge/rspec/shared_examples/debug_logger.rb:2747003588": [ + [23, 1, 4741, "Metrics/BlockLength: Block has too many lines. [121/25]", 3341338388], + [47, 3, 976, "Metrics/BlockLength: Block has too many lines. [27/25]", 2640321404], + [85, 3, 1452, "Metrics/BlockLength: Block has too many lines. [34/25]", 554663062] + ], + "lib/ast/merge/rspec/shared_examples/feature_profile.rb:4172143324": [ + [30, 1, 4249, "Metrics/BlockLength: Block has too many lines. [53/25]", 3787230403] + ], + "lib/ast/merge/rspec/shared_examples/file_analyzable.rb:2391547213": [ + [44, 1, 6468, "Metrics/BlockLength: Block has too many lines. [145/25]", 3744642916] + ], + "lib/ast/merge/rspec/shared_examples/freeze_node_base.rb:1711126715": [ + [23, 1, 5952, "Metrics/BlockLength: Block has too many lines. [157/25]", 3152271039], + [29, 3, 2836, "Metrics/BlockLength: Block has too many lines. [69/25]", 2082270913], + [115, 3, 1552, "Metrics/BlockLength: Block has too many lines. [46/25]", 4180117745] + ], + "lib/ast/merge/rspec/shared_examples/layout_attachment.rb:4130619694": [ + [30, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 1263574869], + [31, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 4282300883] + ], + "lib/ast/merge/rspec/shared_examples/layout_augmenter.rb:1928277603": [ + [18, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1311107624], + [19, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1311107624] + ], + "lib/ast/merge/rspec/shared_examples/merge_result_base.rb:2962043558": [ + [18, 1, 2330, "Metrics/BlockLength: Block has too many lines. [67/25]", 3496673178], + [53, 3, 1271, "Metrics/BlockLength: Block has too many lines. [42/25]", 2278976858] + ], + "lib/ast/merge/rspec/shared_examples/merger_config.rb:2413785902": [ + [18, 1, 8240, "Metrics/BlockLength: Block has too many lines. [193/25]", 3665443345], + [57, 3, 1628, "Metrics/BlockLength: Block has too many lines. [32/25]", 7828299], + [98, 3, 1266, "Metrics/BlockLength: Block has too many lines. [28/25]", 317929439], + [159, 3, 1740, "Metrics/BlockLength: Block has too many lines. [42/25]", 1736487820], + [217, 3, 1373, "Metrics/BlockLength: Block has too many lines. [30/25]", 442933563] + ], + "lib/ast/merge/rspec/shared_examples/recipe_preset_contract.rb:1495545061": [ + [7, 1, 2558, "Metrics/BlockLength: Block has too many lines. [51/25]", 4091815632] + ], + "lib/ast/merge/rspec/shared_examples/removal_mode_compliance.rb:3645548199": [ + [24, 1, 1860, "Metrics/BlockLength: Block has too many lines. [33/25]", 1115825136] + ], + "lib/ast/merge/rspec/shared_examples/reproducible_merge.rb:2276592459": [ + [51, 1, 2030, "Metrics/BlockLength: Block has too many lines. [52/25]", 563553381] + ], + "lib/ast/merge/rspec/shared_examples/reproducible_partial_merge.rb:524436129": [ + [3, 1, 2321, "Metrics/BlockLength: Block has too many lines. [44/25]", 3206099540] + ], + "lib/ast/merge/rspec/shared_examples/runtime_debug_contract.rb:4244040583": [ + [8, 1, 2808, "Metrics/BlockLength: Block has too many lines. [48/25]", 3274492878] + ], + "lib/ast/merge/rspec/shared_examples/unresolved_helper_contract.rb:2916431464": [ + [9, 1, 5998, "Metrics/BlockLength: Block has too many lines. [126/25]", 4174562424], + [94, 3, 1515, "Metrics/BlockLength: Block has too many lines. [32/25]", 1928238376] + ], + "lib/ast/merge/rspec/shared_examples/unresolved_review_state_transport_contract.rb:3368966854": [ + [14, 1, 3386, "Metrics/BlockLength: Block has too many lines. [68/25]", 2910343214], + [65, 3, 317, "Metrics/MethodLength: Method has too many lines. [12/10]", 2653897690] + ], + "lib/ast/merge/rspec/shared_examples/unresolved_runtime_contract.rb:1424234700": [ + [10, 1, 2652, "Metrics/BlockLength: Block has too many lines. [42/25]", 960283638], + [31, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2892620242], + [46, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193437756] + ], + "lib/ast/merge/rspec/shared_examples/unresolved_runtime_debug_contract.rb:2897026147": [ + [25, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2418171787], + [26, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 235635831] + ], + "lib/ast/merge/ruleset/config.rb:4242726919": [ + [7, 7, 3664, "Metrics/ClassLength: Class has too many lines. [101/100]", 1968929597], + [36, 9, 933, "Metrics/MethodLength: Method has too many lines. [15/10]", 3334511209], + [36, 23, 319, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [15/5]", 1652945408], + [65, 9, 515, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 18, 3> 18.25/17]", 2614325513], + [65, 9, 515, "Metrics/MethodLength: Method has too many lines. [14/10]", 2614325513] + ], + "lib/ast/merge/ruleset/feature_profile.rb:3980745364": [ + [12, 7, 6054, "Metrics/ClassLength: Class has too many lines. [155/100]", 2818730231], + [29, 9, 1351, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<17, 18, 7> 25.73/17]", 2248702332], + [29, 9, 1351, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `initialize` is too high. [8/7]", 2248702332], + [29, 9, 1351, "Metrics/MethodLength: Method has too many lines. [17/10]", 2248702332], + [29, 23, 422, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 1415781648], + [138, 9, 1509, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<0, 36, 6> 36.5/17]", 3793816437], + [138, 9, 1509, "Metrics/MethodLength: Method has too many lines. [31/10]", 3793816437] + ], + "lib/ast/merge/ruleset/parser.rb:698282871": [ + [7, 7, 9396, "Metrics/ClassLength: Class has too many lines. [199/100]", 1305123525], + [43, 9, 473, "Metrics/AbcSize: Assignment Branch Condition size for `parse` is too high. [<0, 17, 2> 17.12/17]", 1400394586], + [43, 9, 473, "Metrics/MethodLength: Method has too many lines. [12/10]", 1400394586], + [71, 9, 1053, "Metrics/MethodLength: Method has too many lines. [24/10]", 1569959910], + [101, 9, 1123, "Metrics/AbcSize: Assignment Branch Condition size for `parse_single_value_directive!` is too high. [<7, 13, 10> 17.83/17]", 706129883], + [101, 9, 1123, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_single_value_directive!` is too high. [8/7]", 706129883], + [101, 9, 1123, "Metrics/MethodLength: Method has too many lines. [24/10]", 706129883], + [170, 9, 605, "Metrics/MethodLength: Method has too many lines. [11/10]", 336127382], + [186, 9, 687, "Metrics/MethodLength: Method has too many lines. [11/10]", 2962844982] + ], + "lib/ast/merge/ruleset/profile_vocabulary.rb:2359837647": [ + [7, 7, 3956, "Metrics/ModuleLength: Module has too many lines. [107/100]", 1680256705] + ], + "lib/ast/merge/ruleset/runtime_declaration.rb:1016848190": [ + [18, 9, 819, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<11, 13, 5> 17.75/17]", 4043304883], + [18, 9, 819, "Metrics/MethodLength: Method has too many lines. [11/10]", 4043304883], + [18, 23, 240, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 3868000276], + [49, 9, 551, "Metrics/MethodLength: Method has too many lines. [13/10]", 448215861] + ], + "lib/ast/merge/ruleset/runtime_translator.rb:3255492631": [ + [9, 11, 816, "Metrics/MethodLength: Method has too many lines. [19/10]", 225301385], + [31, 11, 986, "Metrics/AbcSize: Assignment Branch Condition size for `feature_profile` is too high. [<1, 17, 0> 17.03/17]", 1395467476], + [31, 11, 986, "Metrics/MethodLength: Method has too many lines. [19/10]", 1395467476] + ], + "lib/ast/merge/ruleset/support_style_resolver.rb:508975884": [ + [9, 11, 864, "Metrics/MethodLength: Method has too many lines. [22/10]", 3902551296] + ], + "lib/ast/merge/runtime/child_result.rb:4083710804": [ + [16, 9, 698, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<7, 16, 2> 17.58/17]", 2208366179], + [16, 23, 227, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 3688358290], + [38, 9, 584, "Metrics/MethodLength: Method has too many lines. [11/10]", 3113479157], + [55, 11, 106, "Style/HashTransformKeys: Prefer `transform_keys` over `each_with_object`.", 4262612225] + ], + "lib/ast/merge/runtime/delegate.rb:3607371286": [ + [17, 23, 285, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 2793452069] + ], + "lib/ast/merge/runtime/diagnostic.rb:805162185": [ + [10, 23, 72, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 1875462867] + ], + "lib/ast/merge/runtime/operation.rb:1030261783": [ + [20, 9, 767, "Metrics/MethodLength: Method has too many lines. [11/10]", 2728174753], + [20, 23, 278, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 694444911], + [100, 9, 617, "Metrics/AbcSize: Assignment Branch Condition size for `to_h` is too high. [<2, 24, 6> 24.82/17]", 1175382849], + [100, 9, 617, "Metrics/MethodLength: Method has too many lines. [11/10]", 1175382849] + ], + "lib/ast/merge/runtime/resolution_case.rb:250040454": [ + [8, 9, 707, "Metrics/AbcSize: Assignment Branch Condition size for `from_h` is too high. [<1, 19, 6> 19.95/17]", 2592154170], + [29, 23, 189, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [7/5]", 818714714], + [81, 11, 111, "Style/HashTransformKeys: Prefer `transform_keys` over `each_with_object`.", 2712537644] + ], + "lib/ast/merge/runtime/root_session_support.rb:1917388966": [ + [10, 9, 2153, "Metrics/AbcSize: Assignment Branch Condition size for `start_runtime_root_session!` is too high. [<5, 20, 3> 20.83/17]", 1888056651], + [10, 9, 2153, "Metrics/MethodLength: Method has too many lines. [41/10]", 1888056651], + [10, 40, 421, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 2297301282], + [60, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2312419928], + [68, 9, 771, "Metrics/MethodLength: Method has too many lines. [13/10]", 1787620786], + [68, 43, 191, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3635875424] + ], + "lib/ast/merge/runtime/session.rb:628419040": [ + [66, 9, 1203, "Metrics/AbcSize: Assignment Branch Condition size for `summary` is too high. [<5, 43, 13> 45.2/17]", 550888870], + [66, 9, 1203, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `summary` is too high. [14/7]", 550888870], + [66, 9, 1203, "Metrics/MethodLength: Method has too many lines. [20/10]", 550888870], + [66, 9, 1203, "Metrics/PerceivedComplexity: Perceived complexity for `summary` is too high. [14/8]", 550888870] + ], + "lib/ast/merge/runtime/surface.rb:3684795905": [ + [17, 23, 230, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [8/5]", 469229117], + [44, 9, 418, "Metrics/MethodLength: Method has too many lines. [11/10]", 998969973] + ], + "lib/ast/merge/section_typing.rb:4261989256": [ + [112, 9, 710, "Metrics/MethodLength: Method has too many lines. [15/10]", 3600335459], + [176, 9, 67, "Lint/MissingSuper: Call `super` to initialize state of the parent class.", 4077537758], + [216, 9, 85, "Lint/MissingSuper: Call `super` to initialize state of the parent class.", 3648782014], + [245, 9, 1446, "Metrics/AbcSize: Assignment Branch Condition size for `merge_sections` is too high. [<13, 20, 12> 26.7/17]", 525095633], + [245, 9, 1446, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge_sections` is too high. [12/7]", 525095633], + [245, 9, 1446, "Metrics/MethodLength: Method has too many lines. [28/10]", 525095633], + [245, 9, 1446, "Metrics/PerceivedComplexity: Perceived complexity for `merge_sections` is too high. [13/8]", 525095633] + ], + "lib/ast/merge/smart_merger_base.rb:4189972287": [ + [109, 5, 15324, "Metrics/ClassLength: Class has too many lines. [172/100]", 3547407870], + [214, 7, 1974, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<20, 14, 5> 24.92/17]", 2211610736], + [214, 7, 1974, "Metrics/MethodLength: Method has too many lines. [23/10]", 2211610736], + [214, 21, 443, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [15/5]", 1530523783], + [424, 7, 1312, "Metrics/AbcSize: Assignment Branch Condition size for `parse_and_analyze` is too high. [<7, 25, 11> 28.2/17]", 1640248187], + [424, 7, 1312, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_and_analyze` is too high. [10/7]", 1640248187], + [424, 7, 1312, "Metrics/MethodLength: Method has too many lines. [15/10]", 1640248187], + [424, 7, 1312, "Metrics/PerceivedComplexity: Perceived complexity for `parse_and_analyze` is too high. [10/8]", 1640248187], + [517, 12, 52, "Style/NumericPredicate: Use `result_class.instance_method(:initialize).arity.zero?` instead of `result_class.instance_method(:initialize).arity == 0`.", 1312375552] + ], + "lib/ast/merge/structural_edit/boundary.rb:2838060197": [ + [20, 23, 93, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3901214537], + [41, 38, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [51, 38, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [60, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087440865] + ], + "lib/ast/merge/structural_edit/boundary_support.rb:2036464761": [ + [31, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861061], + [32, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 97596930] + ], + "lib/ast/merge/structural_edit/plan_set.rb:538463647": [ + [116, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 2855200692] + ], + "lib/ast/merge/structural_edit/rehome_plan.rb:2152178780": [ + [23, 23, 123, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3433617242], + [100, 9, 519, "Metrics/MethodLength: Method has too many lines. [11/10]", 318006380], + [136, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 2367140872] + ], + "lib/ast/merge/structural_edit/remove_plan.rb:1189569486": [ + [11, 7, 9717, "Metrics/ClassLength: Class has too many lines. [160/100]", 3652701475], + [25, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861091], + [27, 9, 1409, "Metrics/MethodLength: Method has too many lines. [22/10]", 3344870777], + [27, 23, 255, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [11/5]", 3970946607], + [28, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 1637059282], + [36, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859104], + [196, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 1617827253], + [224, 9, 1032, "Metrics/MethodLength: Method has too many lines. [20/10]", 968444047] + ], + "lib/ast/merge/structural_edit/remove_plan_support.rb:877461974": [ + [9, 9, 11, "Style/ModuleFunction: Use `module_function` instead of `extend self`.", 1210897631], + [19, 9, 1429, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `build_remove_plan` is too high. [8/7]", 4091314919], + [19, 9, 1429, "Metrics/MethodLength: Method has too many lines. [32/10]", 4091314919] + ], + "lib/ast/merge/structural_edit/splice_plan.rb:2675806114": [ + [39, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1683893295], + [42, 23, 203, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 3653221702], + [113, 9, 517, "Metrics/MethodLength: Method has too many lines. [11/10]", 634912361] + ], + "lib/ast/merge/structured_emitter_provenance_support.rb:445323365": [ + [5, 5, 41, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::StructuredEmitterProvenanceSupport`.", 3548518830] + ], + "lib/ast/merge/structured_review_apply_support.rb:3649736380": [ + [5, 5, 35, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::StructuredReviewApplySupport`.", 1282380463], + [22, 7, 782, "Metrics/AbcSize: Assignment Branch Condition size for `current_output_span_for` is too high. [<6, 19, 11> 22.76/17]", 4137750179], + [22, 7, 782, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `current_output_span_for` is too high. [8/7]", 4137750179], + [22, 7, 782, "Metrics/MethodLength: Method has too many lines. [14/10]", 4137750179], + [42, 7, 595, "Metrics/MethodLength: Method has too many lines. [12/10]", 2080934521], + [60, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3151172498] + ], + "lib/ast/merge/text/conflict_resolver.rb:989169286": [ + [19, 7, 9182, "Metrics/ClassLength: Class has too many lines. [159/100]", 1070563745], + [28, 23, 211, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2639535499], + [53, 9, 2507, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_batch` is too high. [<15, 34, 5> 37.5/17]", 825130797], + [53, 9, 2507, "Metrics/MethodLength: Method has too many lines. [44/10]", 825130797], + [196, 9, 2458, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_matched_pair` is too high. [<2, 30, 11> 32.02/17]", 4037214978], + [196, 9, 2458, "Metrics/MethodLength: Method has too many lines. [46/10]", 4037214978] + ], + "lib/ast/merge/text/file_analysis.rb:1530312707": [ + [106, 9, 1484, "Metrics/AbcSize: Assignment Branch Condition size for `parse_statements` is too high. [<11, 15, 6> 19.54/17]", 1858083071], + [106, 9, 1484, "Metrics/MethodLength: Method has too many lines. [34/10]", 1858083071], + [160, 9, 449, "Metrics/MethodLength: Method has too many lines. [11/10]", 1902035813] + ], + "lib/ast/merge/text/line_node.rb:3385927013": [ + [145, 9, 699, "Metrics/MethodLength: Method has too many lines. [17/10]", 2201872249] + ], + "lib/ast/merge/text/section_splitter.rb:129704488": [ + [141, 9, 1442, "Metrics/AbcSize: Assignment Branch Condition size for `merge_section_lists` is too high. [<13, 20, 6> 24.6/17]", 3551729170], + [141, 9, 1442, "Metrics/MethodLength: Method has too many lines. [23/10]", 3551729170], + [322, 9, 1767, "Metrics/AbcSize: Assignment Branch Condition size for `split` is too high. [<11, 29, 10> 32.59/17]", 2207922758], + [322, 9, 1767, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `split` is too high. [10/7]", 2207922758], + [322, 9, 1767, "Metrics/MethodLength: Method has too many lines. [46/10]", 2207922758], + [322, 9, 1767, "Metrics/PerceivedComplexity: Perceived complexity for `split` is too high. [13/8]", 2207922758], + [328, 11, 1019, "Metrics/BlockLength: Block has too many lines. [26/25]", 1561634792] + ], + "lib/ast/merge/text/smart_merger.rb:2405807903": [ + [67, 9, 831, "Metrics/MethodLength: Method has too many lines. [12/10]", 584426022], + [67, 23, 350, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 3074172637] + ], + "lib/ast/merge/trailing_groups/alignment_sort.rb:2593404330": [ + [40, 9, 513, "Metrics/MethodLength: Method has too many lines. [12/10]", 89360683] + ], + "lib/ast/merge/trailing_groups/core.rb:4231959665": [ + [61, 9, 812, "Metrics/MethodLength: Method has too many lines. [17/10]", 1777526069], + [101, 9, 998, "Metrics/AbcSize: Assignment Branch Condition size for `flush_ready_trailing_groups` is too high. [<8, 18, 15> 24.76/17]", 2397698441], + [101, 9, 998, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `flush_ready_trailing_groups` is too high. [13/7]", 2397698441], + [101, 9, 998, "Metrics/MethodLength: Method has too many lines. [17/10]", 2397698441], + [101, 9, 998, "Metrics/PerceivedComplexity: Perceived complexity for `flush_ready_trailing_groups` is too high. [13/8]", 2397698441] + ], + "lib/ast/merge/trailing_groups/dest_iterate.rb:3897205087": [ + [69, 9, 751, "Metrics/MethodLength: Method has too many lines. [12/10]", 3915657972], + [69, 47, 199, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2545849044] + ], + "lib/ast/merge/unresolved_support.rb:2881272494": [ + [7, 5, 24, "Style/Documentation: Missing top-level documentation comment for `module Ast::Merge::UnresolvedSupport`.", 990281691], + [7, 5, 4392, "Metrics/ModuleLength: Module has too many lines. [116/100]", 3475162940], + [32, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [67, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [85, 7, 1038, "Metrics/MethodLength: Method has too many lines. [14/10]", 3139619197], + [85, 40, 338, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [14/5]", 71164914] + ], + "spec/ast/merge/ast_node_spec.rb:1362065144": [ + [3, 1, 8199, "Metrics/BlockLength: Block has too many lines. [254/25]", 1649868231], + [18, 3, 1030, "Metrics/BlockLength: Block has too many lines. [33/25]", 1409835577] + ], + "spec/ast/merge/block_directive_spec.rb:2305756581": [ + [3, 1, 5181, "Metrics/BlockLength: Block has too many lines. [138/25]", 1887900896], + [128, 3, 1391, "Metrics/BlockLength: Block has too many lines. [39/25]", 3626371694] + ], + "spec/ast/merge/comment/attachment_spec.rb:2571833836": [ + [3, 1, 5536, "Metrics/BlockLength: Block has too many lines. [150/25]", 1841571757], + [93, 3, 1639, "Metrics/BlockLength: Block has too many lines. [37/25]", 212730671] + ], + "spec/ast/merge/comment/augmenter_spec.rb:4266625483": [ + [3, 1, 9141, "Metrics/BlockLength: Block has too many lines. [212/25]", 530365996], + [16, 3, 6849, "Metrics/BlockLength: Block has too many lines. [154/25]", 503152628], + [200, 3, 1244, "Metrics/BlockLength: Block has too many lines. [33/25]", 3565041107] + ], + "spec/ast/merge/comment/block_spec.rb:4138473890": [ + [3, 1, 9021, "Metrics/BlockLength: Block has too many lines. [250/25]", 1617505173], + [8, 3, 1115, "Metrics/BlockLength: Block has too many lines. [27/25]", 2958989619], + [93, 3, 1127, "Metrics/BlockLength: Block has too many lines. [33/25]", 196340527], + [123, 45, 16, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 155572628], + [159, 3, 1432, "Metrics/BlockLength: Block has too many lines. [35/25]", 281400319] + ], + "spec/ast/merge/comment/c_style_tracker_base_spec.rb:3154319400": [ + [3, 1, 5816, "Metrics/BlockLength: Block has too many lines. [133/25]", 680831933], + [100, 3, 1450, "Metrics/BlockLength: Block has too many lines. [35/25]", 4153882185] + ], + "spec/ast/merge/comment/capability_spec.rb:2763521225": [ + [3, 1, 3522, "Metrics/BlockLength: Block has too many lines. [89/25]", 1487980773], + [4, 3, 1954, "Metrics/BlockLength: Block has too many lines. [41/25]", 160187362] + ], + "spec/ast/merge/comment/empty_spec.rb:1801324640": [ + [3, 1, 2584, "Metrics/BlockLength: Block has too many lines. [70/25]", 270179899], + [4, 3, 1047, "Metrics/BlockLength: Block has too many lines. [27/25]", 3056449816] + ], + "spec/ast/merge/comment/hash_tracker_base_spec.rb:3624528747": [ + [3, 1, 9653, "Metrics/BlockLength: Block has too many lines. [271/25]", 3748659406], + [8, 3, 1210, "Metrics/BlockLength: Block has too many lines. [37/25]", 2566766302], + [21, 7, 872, "Metrics/AbcSize: Assignment Branch Condition size for `extract_comments` is too high. [<7, 24, 5> 25.5/17]", 1213080161], + [21, 7, 872, "Metrics/MethodLength: Method has too many lines. [25/10]", 1213080161], + [275, 3, 1171, "Metrics/BlockLength: Block has too many lines. [29/25]", 1425466742] + ], + "spec/ast/merge/comment/line_spec.rb:1487829548": [ + [3, 1, 5291, "Metrics/BlockLength: Block has too many lines. [128/25]", 587604747], + [6, 3, 1573, "Metrics/BlockLength: Block has too many lines. [37/25]", 4105920006] + ], + "spec/ast/merge/comment/parser_spec.rb:2443973508": [ + [3, 1, 9855, "Metrics/BlockLength: Block has too many lines. [237/25]", 404174977], + [4, 3, 1013, "Metrics/BlockLength: Block has too many lines. [26/25]", 182655397], + [38, 3, 1282, "Metrics/BlockLength: Block has too many lines. [28/25]", 2303702609] + ], + "spec/ast/merge/comment/quoted_hash_line_parser_spec.rb:3795390831": [ + [3, 1, 1810, "Metrics/BlockLength: Block has too many lines. [44/25]", 2575838586], + [6, 3, 1700, "Metrics/BlockLength: Block has too many lines. [41/25]", 1553834548] + ], + "spec/ast/merge/comment/region_merge_policy_spec.rb:4175996936": [ + [3, 1, 3618, "Metrics/BlockLength: Block has too many lines. [75/25]", 4006378358], + [11, 3, 2752, "Metrics/BlockLength: Block has too many lines. [52/25]", 494211987] + ], + "spec/ast/merge/comment/region_spec.rb:2674736508": [ + [3, 1, 4033, "Metrics/BlockLength: Block has too many lines. [91/25]", 1828104331] + ], + "spec/ast/merge/comment/style_spec.rb:1875195890": [ + [3, 1, 4040, "Metrics/BlockLength: Block has too many lines. [101/25]", 2759361650] + ], + "spec/ast/merge/comment/support_style_spec.rb:1350169032": [ + [3, 1, 1577, "Metrics/BlockLength: Block has too many lines. [39/25]", 3414039011] + ], + "spec/ast/merge/comment/tracked_hash_adapter_spec.rb:1256807736": [ + [3, 1, 4482, "Metrics/BlockLength: Block has too many lines. [97/25]", 264417763], + [4, 3, 3101, "Metrics/BlockLength: Block has too many lines. [63/25]", 1050939978], + [81, 3, 1313, "Metrics/BlockLength: Block has too many lines. [30/25]", 515655104] + ], + "spec/ast/merge/comment_spec.rb:81945459": [ + [3, 1, 15888, "Metrics/BlockLength: Block has too many lines. [384/25]", 2229554982], + [4, 3, 3957, "Metrics/BlockLength: Block has too many lines. [84/25]", 660667217], + [5, 5, 1187, "Metrics/BlockLength: Block has too many lines. [26/25]", 241562105], + [105, 3, 1371, "Metrics/BlockLength: Block has too many lines. [30/25]", 1901983597], + [159, 3, 1296, "Metrics/BlockLength: Block has too many lines. [30/25]", 1749880380], + [239, 3, 1151, "Metrics/BlockLength: Block has too many lines. [28/25]", 183967322], + [272, 3, 2004, "Metrics/BlockLength: Block has too many lines. [45/25]", 2594323837], + [349, 3, 3220, "Metrics/BlockLength: Block has too many lines. [83/25]", 790417809], + [350, 5, 2347, "Metrics/BlockLength: Block has too many lines. [60/25]", 4016801881] + ], + "spec/ast/merge/composite_match_refiner_spec.rb:2888297870": [ + [3, 1, 6152, "Metrics/BlockLength: Block has too many lines. [143/25]", 3308692548], + [55, 3, 4118, "Metrics/BlockLength: Block has too many lines. [87/25]", 1405655464] + ], + "spec/ast/merge/conflict_resolver_base_spec.rb:3331938447": [ + [5, 1, 20643, "Metrics/BlockLength: Block has too many lines. [516/25]", 3129196558], + [14, 59, 14, "Lint/UnusedMethodArgument: Unused method argument - `template_index`.", 1809801172], + [14, 76, 10, "Lint/UnusedMethodArgument: Unused method argument - `dest_index`.", 2703999490], + [47, 61, 14, "Lint/UnusedMethodArgument: Unused method argument - `template_index`. You can also write as `resolve_node_pair(*)` if you want the method to accept any arguments but don't care about them.", 1809801172], + [47, 78, 10, "Lint/UnusedMethodArgument: Unused method argument - `dest_index`. You can also write as `resolve_node_pair(*)` if you want the method to accept any arguments but don't care about them.", 2703999490], + [105, 3, 17203, "Metrics/BlockLength: Block has too many lines. [425/25]", 1114912980], + [154, 5, 1797, "Metrics/BlockLength: Block has too many lines. [37/25]", 515146940], + [203, 5, 1373, "Metrics/BlockLength: Block has too many lines. [32/25]", 603210832], + [292, 5, 2874, "Metrics/BlockLength: Block has too many lines. [77/25]", 3918129775], + [341, 7, 1292, "Metrics/BlockLength: Block has too many lines. [34/25]", 1769555944], + [402, 5, 1857, "Metrics/BlockLength: Block has too many lines. [44/25]", 1516406612], + [456, 5, 1209, "Metrics/BlockLength: Block has too many lines. [31/25]", 430489898], + [514, 5, 2021, "Metrics/BlockLength: Block has too many lines. [37/25]", 144128170], + [515, 7, 1953, "Metrics/BlockLength: Block has too many lines. [35/25]", 1574966248], + [567, 5, 1500, "Metrics/BlockLength: Block has too many lines. [40/25]", 2509466150] + ], + "spec/ast/merge/content_match_refiner_spec.rb:4058001158": [ + [3, 1, 14348, "Metrics/BlockLength: Block has too many lines. [318/25]", 1171164704], + [25, 3, 1238, "Metrics/BlockLength: Block has too many lines. [29/25]", 2139810386], + [63, 3, 4077, "Metrics/BlockLength: Block has too many lines. [95/25]", 3471153375], + [325, 3, 2213, "Metrics/BlockLength: Block has too many lines. [37/25]", 3370370915] + ], + "spec/ast/merge/debug_logger_spec.rb:429510168": [ + [3, 1, 17306, "Metrics/BlockLength: Block has too many lines. [358/25]", 2287792973], + [251, 3, 1598, "Metrics/BlockLength: Block has too many lines. [27/25]", 3227542816], + [358, 3, 5118, "Metrics/BlockLength: Block has too many lines. [77/25]", 1759761803] + ], + "spec/ast/merge/detector/base_spec.rb:4157102211": [ + [3, 1, 3172, "Metrics/BlockLength: Block has too many lines. [100/25]", 3745104028], + [11, 7, 498, "Metrics/MethodLength: Method has too many lines. [13/10]", 3178368155], + [49, 3, 900, "Metrics/BlockLength: Block has too many lines. [28/25]", 2333048204] + ], + "spec/ast/merge/detector/fenced_code_block_spec.rb:495797689": [ + [3, 1, 11589, "Metrics/BlockLength: Block has too many lines. [363/25]", 3764545134], + [38, 3, 4467, "Metrics/BlockLength: Block has too many lines. [150/25]", 1597401000], + [41, 5, 1077, "Metrics/BlockLength: Block has too many lines. [31/25]", 2269642514], + [115, 5, 848, "Metrics/BlockLength: Block has too many lines. [27/25]", 1704866975], + [220, 3, 4815, "Metrics/BlockLength: Block has too many lines. [146/25]", 3797214474] + ], + "spec/ast/merge/detector/mergeable_spec.rb:1307688846": [ + [3, 1, 23175, "Metrics/BlockLength: Block has too many lines. [654/25]", 2932391114], + [77, 3, 2079, "Metrics/BlockLength: Block has too many lines. [53/25]", 1093085347], + [177, 3, 2217, "Metrics/BlockLength: Block has too many lines. [69/25]", 926985871], + [188, 5, 948, "Metrics/BlockLength: Block has too many lines. [26/25]", 4186135901], + [225, 5, 898, "Metrics/BlockLength: Block has too many lines. [31/25]", 513446836], + [266, 3, 1168, "Metrics/BlockLength: Block has too many lines. [29/25]", 774699411], + [304, 3, 1188, "Metrics/BlockLength: Block has too many lines. [27/25]", 4282853126], + [339, 3, 918, "Metrics/BlockLength: Block has too many lines. [28/25]", 1759590109], + [372, 3, 870, "Metrics/BlockLength: Block has too many lines. [28/25]", 131542026], + [410, 3, 3768, "Metrics/BlockLength: Block has too many lines. [111/25]", 181819560], + [483, 5, 1536, "Metrics/BlockLength: Block has too many lines. [47/25]", 385085357], + [540, 3, 1891, "Metrics/BlockLength: Block has too many lines. [52/25]", 602757329], + [664, 3, 1927, "Metrics/BlockLength: Block has too many lines. [56/25]", 48062261], + [691, 5, 1146, "Metrics/BlockLength: Block has too many lines. [31/25]", 1961728737], + [721, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3104497040], + [729, 3, 1625, "Metrics/BlockLength: Block has too many lines. [46/25]", 1570579215] + ], + "spec/ast/merge/detector/region_spec.rb:594725562": [ + [3, 1, 8128, "Metrics/BlockLength: Block has too many lines. [290/25]", 1984713692], + [4, 3, 806, "Metrics/BlockLength: Block has too many lines. [28/25]", 1515087192], + [58, 3, 1236, "Metrics/BlockLength: Block has too many lines. [45/25]", 2464968707], + [128, 3, 1063, "Metrics/BlockLength: Block has too many lines. [33/25]", 239148700], + [250, 3, 2010, "Metrics/BlockLength: Block has too many lines. [76/25]", 2595033382] + ], + "spec/ast/merge/detector/toml_frontmatter_spec.rb:1135160129": [ + [3, 1, 6717, "Metrics/BlockLength: Block has too many lines. [218/25]", 2273975625], + [12, 3, 5534, "Metrics/BlockLength: Block has too many lines. [187/25]", 538920673], + [13, 5, 1456, "Metrics/BlockLength: Block has too many lines. [38/25]", 3113759139] + ], + "spec/ast/merge/detector/yaml_frontmatter_spec.rb:2467934365": [ + [3, 1, 6702, "Metrics/BlockLength: Block has too many lines. [213/25]", 3083039982], + [12, 3, 5056, "Metrics/BlockLength: Block has too many lines. [170/25]", 1889948780], + [13, 5, 1438, "Metrics/BlockLength: Block has too many lines. [38/25]", 1736912391], + [219, 3, 1396, "Metrics/BlockLength: Block has too many lines. [33/25]", 2446467851] + ], + "spec/ast/merge/diff_mapper_base_spec.rb:1771546518": [ + [5, 1, 8521, "Metrics/BlockLength: Block has too many lines. [248/25]", 1057580573], + [22, 9, 44, "Style/InverseMethods: Use `reject` instead of inverting `select`.", 3063843489], + [46, 3, 3878, "Metrics/BlockLength: Block has too many lines. [116/25]", 2874032080], + [47, 5, 1938, "Metrics/BlockLength: Block has too many lines. [48/25]", 1904497583], + [191, 3, 1488, "Metrics/BlockLength: Block has too many lines. [43/25]", 1632956840] + ], + "spec/ast/merge/emitter_base_spec.rb:4197360291": [ + [3, 1, 11215, "Metrics/BlockLength: Block has too many lines. [282/25]", 4254840781], + [30, 3, 4393, "Metrics/BlockLength: Block has too many lines. [102/25]", 3992142376], + [134, 58, 12, "Lint/UnusedMethodArgument: Unused method argument - `current_line`. You can also write as `inline_comment_region_target_column(*)` if you want the method to accept any arguments but don't care about them.", 2091263933], + [138, 44, 6, "Lint/UnusedMethodArgument: Unused method argument - `region`.", 2124512157], + [159, 3, 1815, "Metrics/BlockLength: Block has too many lines. [39/25]", 719023387], + [206, 3, 2233, "Metrics/BlockLength: Block has too many lines. [62/25]", 3754339775], + [312, 3, 1059, "Metrics/BlockLength: Block has too many lines. [26/25]", 375007123] + ], + "spec/ast/merge/fictive_language_harness_spec.rb:1179155480": [ + [6, 1, 6693, "Metrics/BlockLength: Block has too many lines. [143/25]", 245088433], + [7, 3, 1968, "Metrics/BlockLength: Block has too many lines. [36/25]", 4161580169], + [58, 3, 1230, "Metrics/BlockLength: Block has too many lines. [34/25]", 990452676], + [103, 3, 2668, "Metrics/BlockLength: Block has too many lines. [51/25]", 1755027956] + ], + "spec/ast/merge/file_aligner_base_spec.rb:91275387": [ + [5, 1, 9948, "Metrics/BlockLength: Block has too many lines. [217/25]", 3354563411], + [6, 3, 1490, "Metrics/BlockLength: Block has too many lines. [45/25]", 563330990], + [95, 3, 7495, "Metrics/BlockLength: Block has too many lines. [129/25]", 598770279], + [103, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3749416415], + [163, 5, 1489, "Metrics/BlockLength: Block has too many lines. [26/25]", 2910876949] + ], + "spec/ast/merge/file_analyzable_spec.rb:3816965829": [ + [3, 1, 12458, "Metrics/BlockLength: Block has too many lines. [272/25]", 216138965], + [25, 3, 9603, "Metrics/BlockLength: Block has too many lines. [202/25]", 2508188172], + [297, 3, 1214, "Metrics/BlockLength: Block has too many lines. [30/25]", 777182624] + ], + "spec/ast/merge/freezable_spec.rb:559280324": [ + [5, 1, 5033, "Metrics/BlockLength: Block has too many lines. [123/25]", 3070666859], + [6, 3, 1199, "Metrics/BlockLength: Block has too many lines. [34/25]", 4058875636], + [66, 3, 1530, "Metrics/BlockLength: Block has too many lines. [31/25]", 1670675428] + ], + "spec/ast/merge/freeze_node_base_spec.rb:2962962931": [ + [3, 1, 21887, "Metrics/BlockLength: Block has too many lines. [560/25]", 567315021], + [48, 3, 1369, "Metrics/BlockLength: Block has too many lines. [38/25]", 3363160391], + [131, 3, 2739, "Metrics/BlockLength: Block has too many lines. [56/25]", 2008289622], + [205, 3, 1586, "Metrics/BlockLength: Block has too many lines. [35/25]", 4179606047], + [251, 3, 977, "Metrics/BlockLength: Block has too many lines. [26/25]", 1240612851], + [287, 3, 1130, "Metrics/BlockLength: Block has too many lines. [28/25]", 2511265379], + [322, 3, 5029, "Metrics/BlockLength: Block has too many lines. [126/25]", 739537566], + [598, 3, 3055, "Metrics/BlockLength: Block has too many lines. [81/25]", 145217296] + ], + "spec/ast/merge/healer_spec.rb:877829793": [ + [3, 1, 4896, "Metrics/BlockLength: Block has too many lines. [148/25]", 1074378773], + [19, 3, 1333, "Metrics/BlockLength: Block has too many lines. [38/25]", 2940878263], + [24, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193432399], + [61, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085379023], + [67, 3, 2985, "Metrics/BlockLength: Block has too many lines. [93/25]", 4032786576] + ], + "spec/ast/merge/jaccard_similarity_spec.rb:3984307047": [ + [3, 1, 2659, "Metrics/BlockLength: Block has too many lines. [71/25]", 1122516612], + [6, 3, 1484, "Metrics/BlockLength: Block has too many lines. [38/25]", 3367914637], + [55, 3, 1090, "Metrics/BlockLength: Block has too many lines. [28/25]", 2629339264] + ], + "spec/ast/merge/key_path_partial_template_merger_base_spec.rb:2189485360": [ + [5, 1, 5955, "Metrics/BlockLength: Block has too many lines. [138/25]", 91542958], + [35, 3, 1217, "Metrics/BlockLength: Block has too many lines. [33/25]", 2663081123], + [97, 3, 3019, "Metrics/BlockLength: Block has too many lines. [54/25]", 1411952192] + ], + "spec/ast/merge/layout/attachment_spec.rb:3814294426": [ + [3, 1, 1799, "Metrics/BlockLength: Block has too many lines. [34/25]", 1283153367] + ], + "spec/ast/merge/layout/augmenter_spec.rb:3633045915": [ + [3, 1, 4412, "Metrics/BlockLength: Block has too many lines. [92/25]", 2690553031], + [20, 3, 2725, "Metrics/BlockLength: Block has too many lines. [54/25]", 3645203819] + ], + "spec/ast/merge/layout/gap_spec.rb:4232058283": [ + [3, 1, 2758, "Metrics/BlockLength: Block has too many lines. [72/25]", 2052697931], + [9, 3, 1290, "Metrics/BlockLength: Block has too many lines. [28/25]", 3175967312] + ], + "spec/ast/merge/match_refiner_base_spec.rb:3961767223": [ + [3, 1, 10604, "Metrics/BlockLength: Block has too many lines. [301/25]", 4290485382], + [4, 3, 1146, "Metrics/BlockLength: Block has too many lines. [37/25]", 108051658], + [50, 3, 1005, "Metrics/BlockLength: Block has too many lines. [28/25]", 3807648246], + [125, 3, 1026, "Metrics/BlockLength: Block has too many lines. [27/25]", 2896086726], + [162, 3, 4464, "Metrics/BlockLength: Block has too many lines. [114/25]", 2878217135], + [218, 5, 1112, "Metrics/BlockLength: Block has too many lines. [30/25]", 1605825436], + [224, 11, 104, "Style/HashLikeCase: Consider replacing `case-when` with a hash lookup.", 4220899731], + [247, 11, 132, "Style/HashLikeCase: Consider replacing `case-when` with a hash lookup.", 3401820780], + [258, 5, 1642, "Metrics/BlockLength: Block has too many lines. [35/25]", 1288881729], + [337, 3, 1108, "Metrics/BlockLength: Block has too many lines. [33/25]", 2139263963] + ], + "spec/ast/merge/match_score_base_spec.rb:2340739872": [ + [3, 1, 15213, "Metrics/BlockLength: Block has too many lines. [372/25]", 1512747000], + [4, 3, 1553, "Metrics/BlockLength: Block has too many lines. [41/25]", 2789289940], + [43, 20, 2, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 5862747], + [43, 24, 2, "Naming/MethodParameterName: Method parameter must be at least 3 characters long.", 5862744], + [56, 3, 1041, "Metrics/BlockLength: Block has too many lines. [29/25]", 3729310115], + [152, 3, 3259, "Metrics/BlockLength: Block has too many lines. [82/25]", 1438003770], + [258, 3, 2199, "Metrics/BlockLength: Block has too many lines. [43/25]", 3386602801], + [320, 3, 1684, "Metrics/BlockLength: Block has too many lines. [35/25]", 3807719546], + [365, 14, 16, "Lint/FloatComparison: Avoid equality comparisons of floats as they are unreliable.", 3787748956], + [369, 3, 1696, "Metrics/BlockLength: Block has too many lines. [36/25]", 3172214426], + [417, 3, 1792, "Metrics/BlockLength: Block has too many lines. [45/25]", 3557977606], + [438, 5, 1121, "Metrics/BlockLength: Block has too many lines. [26/25]", 4236927298] + ], + "spec/ast/merge/merge_result_base_spec.rb:2262708492": [ + [3, 1, 19471, "Metrics/BlockLength: Block has too many lines. [529/25]", 4106058751], + [38, 3, 2735, "Metrics/BlockLength: Block has too many lines. [80/25]", 1103243845], + [279, 3, 1611, "Metrics/BlockLength: Block has too many lines. [39/25]", 1928511417], + [280, 5, 1203, "Metrics/BlockLength: Block has too many lines. [26/25]", 857223227], + [326, 3, 2070, "Metrics/BlockLength: Block has too many lines. [48/25]", 2552826824], + [385, 3, 5769, "Metrics/BlockLength: Block has too many lines. [140/25]", 1457747735], + [511, 5, 1306, "Metrics/BlockLength: Block has too many lines. [29/25]", 2980786372], + [574, 3, 1308, "Metrics/BlockLength: Block has too many lines. [32/25]", 1342704008] + ], + "spec/ast/merge/merger_config_spec.rb:663896662": [ + [5, 1, 7314, "Metrics/BlockLength: Block has too many lines. [189/25]", 1279589310], + [11, 3, 1180, "Metrics/BlockLength: Block has too many lines. [26/25]", 1014009176], + [45, 3, 1151, "Metrics/BlockLength: Block has too many lines. [26/25]", 785276703], + [79, 3, 3574, "Metrics/BlockLength: Block has too many lines. [97/25]", 969726064], + [126, 5, 1158, "Metrics/BlockLength: Block has too many lines. [29/25]", 389808524] + ], + "spec/ast/merge/navigable/injection_point_finder_spec.rb:3693754765": [ + [3, 1, 5152, "Metrics/BlockLength: Block has too many lines. [123/25]", 3265221808], + [15, 3, 4026, "Metrics/BlockLength: Block has too many lines. [96/25]", 1482695302], + [63, 5, 2337, "Metrics/BlockLength: Block has too many lines. [54/25]", 2678200297] + ], + "spec/ast/merge/navigable/injection_point_spec.rb:3295717447": [ + [3, 1, 6032, "Metrics/BlockLength: Block has too many lines. [161/25]", 805025024], + [77, 3, 1083, "Metrics/BlockLength: Block has too many lines. [28/25]", 3091139104] + ], + "spec/ast/merge/navigable/statement_spec.rb:2965726260": [ + [3, 1, 18289, "Metrics/BlockLength: Block has too many lines. [510/25]", 4119203121], + [102, 3, 3570, "Metrics/BlockLength: Block has too many lines. [97/25]", 3287535168], + [156, 5, 2030, "Metrics/BlockLength: Block has too many lines. [51/25]", 3299963733], + [251, 3, 1338, "Metrics/BlockLength: Block has too many lines. [37/25]", 844559624], + [411, 3, 1550, "Metrics/BlockLength: Block has too many lines. [42/25]", 3851790429], + [465, 3, 1372, "Metrics/BlockLength: Block has too many lines. [41/25]", 3782869383] + ], + "spec/ast/merge/node_typing/frozen_wrapper_spec.rb:3823345520": [ + [3, 1, 4532, "Metrics/BlockLength: Block has too many lines. [117/25]", 3944573785] + ], + "spec/ast/merge/node_typing/normalizer_spec.rb:1976431423": [ + [4, 1, 8679, "Metrics/BlockLength: Block has too many lines. [219/25]", 938207310], + [65, 3, 1137, "Metrics/BlockLength: Block has too many lines. [26/25]", 3180807289], + [101, 3, 1404, "Metrics/BlockLength: Block has too many lines. [28/25]", 1094334251], + [216, 3, 875, "Metrics/BlockLength: Block has too many lines. [26/25]", 2755551247] + ], + "spec/ast/merge/node_typing/wrapper_spec.rb:3211588263": [ + [3, 1, 3469, "Metrics/BlockLength: Block has too many lines. [92/25]", 638644563] + ], + "spec/ast/merge/node_typing_spec.rb:4080661389": [ + [3, 1, 12728, "Metrics/BlockLength: Block has too many lines. [333/25]", 3927571381], + [132, 3, 3704, "Metrics/BlockLength: Block has too many lines. [98/25]", 2130243754], + [208, 5, 1267, "Metrics/BlockLength: Block has too many lines. [31/25]", 2816753725], + [265, 3, 1298, "Metrics/BlockLength: Block has too many lines. [33/25]", 3320876250], + [311, 3, 3803, "Metrics/BlockLength: Block has too many lines. [100/25]", 2743470911] + ], + "spec/ast/merge/node_wrapper_base_spec.rb:2252820285": [ + [3, 1, 11681, "Metrics/BlockLength: Block has too many lines. [307/25]", 1698593962], + [32, 3, 2341, "Metrics/BlockLength: Block has too many lines. [68/25]", 1594381363], + [179, 3, 2568, "Metrics/BlockLength: Block has too many lines. [51/25]", 1269052990], + [294, 3, 1252, "Metrics/BlockLength: Block has too many lines. [26/25]", 4220822180], + [329, 3, 1963, "Metrics/BlockLength: Block has too many lines. [39/25]", 1623030031] + ], + "spec/ast/merge/owner_selection_spec.rb:1894901093": [ + [3, 1, 1356, "Metrics/BlockLength: Block has too many lines. [35/25]", 1030003775] + ], + "spec/ast/merge/partial_template_merger_base_spec.rb:3412991027": [ + [3, 1, 7073, "Metrics/BlockLength: Block has too many lines. [145/25]", 3415302240], + [16, 9, 43, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3196404056], + [22, 9, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 4116824817], + [48, 20, 2, "Lint/RedundantSafeNavigation: Redundant safe navigation detected, use `.` instead.", 5858765], + [96, 3, 4220, "Metrics/BlockLength: Block has too many lines. [68/25]", 3464417459], + [97, 5, 2029, "Metrics/BlockLength: Block has too many lines. [27/25]", 3297854360], + [138, 5, 2122, "Metrics/BlockLength: Block has too many lines. [37/25]", 1592076374] + ], + "spec/ast/merge/recipe/config_spec.rb:3917288551": [ + [3, 1, 21041, "Metrics/BlockLength: Block has too many lines. [611/25]", 2431235923], + [72, 3, 1653, "Metrics/BlockLength: Block has too many lines. [36/25]", 2702780755], + [174, 3, 1465, "Metrics/BlockLength: Block has too many lines. [44/25]", 2326126933], + [226, 3, 3419, "Metrics/BlockLength: Block has too many lines. [89/25]", 798604841], + [327, 3, 1398, "Metrics/BlockLength: Block has too many lines. [34/25]", 3113267700], + [474, 3, 1184, "Metrics/BlockLength: Block has too many lines. [39/25]", 2599756030], + [519, 3, 4630, "Metrics/BlockLength: Block has too many lines. [147/25]", 1245526575] + ], + "spec/ast/merge/recipe/preset_spec.rb:818394232": [ + [3, 1, 6696, "Metrics/BlockLength: Block has too many lines. [173/25]", 3205615892] + ], + "spec/ast/merge/recipe/runner_spec.rb:3689194117": [ + [3, 1, 46798, "Metrics/BlockLength: Block has too many lines. [1104/25]", 3220015076], + [48, 3, 1128, "Metrics/BlockLength: Block has too many lines. [26/25]", 910457645], + [108, 3, 3036, "Metrics/BlockLength: Block has too many lines. [92/25]", 2112378918], + [132, 5, 881, "Metrics/BlockLength: Block has too many lines. [27/25]", 3842010356], + [177, 5, 918, "Metrics/BlockLength: Block has too many lines. [27/25]", 2152367239], + [295, 3, 1383, "Metrics/BlockLength: Block has too many lines. [41/25]", 2141027559], + [362, 3, 1653, "Metrics/BlockLength: Block has too many lines. [33/25]", 1536472295], + [449, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3960802027], + [497, 3, 7959, "Metrics/BlockLength: Block has too many lines. [200/25]", 3739116912], + [556, 5, 1225, "Metrics/BlockLength: Block has too many lines. [31/25]", 195497726], + [740, 3, 6977, "Metrics/BlockLength: Block has too many lines. [145/25]", 2805535296], + [748, 5, 2241, "Metrics/BlockLength: Block has too many lines. [49/25]", 2552233173], + [805, 5, 3007, "Metrics/BlockLength: Block has too many lines. [59/25]", 708771722], + [877, 5, 1444, "Metrics/BlockLength: Block has too many lines. [26/25]", 3274225022], + [911, 3, 3258, "Metrics/BlockLength: Block has too many lines. [85/25]", 2346849758], + [1012, 3, 2710, "Metrics/BlockLength: Block has too many lines. [71/25]", 3801821877], + [1029, 5, 1547, "Metrics/BlockLength: Block has too many lines. [42/25]", 2962020615], + [1109, 3, 2240, "Metrics/BlockLength: Block has too many lines. [35/25]", 1139957345], + [1115, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], + [1117, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], + [1119, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1801369636], + [1121, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2652710920], + [1123, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1375785821], + [1125, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 632755459], + [1160, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], + [1162, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], + [1164, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1375785821], + [1176, 3, 1472, "Metrics/BlockLength: Block has too many lines. [31/25]", 844153987], + [1181, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1239303812], + [1183, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1251336963], + [1216, 3, 2277, "Metrics/BlockLength: Block has too many lines. [43/25]", 4287127386], + [1221, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 667314941], + [1223, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2652710920], + [1225, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1375785821], + [1227, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 632755459], + [1274, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3420615328] + ], + "spec/ast/merge/recipe/script_loader_spec.rb:2136892097": [ + [3, 1, 8554, "Metrics/BlockLength: Block has too many lines. [237/25]", 2314425369], + [45, 3, 2842, "Metrics/BlockLength: Block has too many lines. [75/25]", 168902852], + [155, 3, 1400, "Metrics/BlockLength: Block has too many lines. [39/25]", 1611123964] + ], + "spec/ast/merge/rspec/shared_examples/feature_profile_spec.rb:2654837708": [ + [5, 1, 1140, "Metrics/BlockLength: Block has too many lines. [31/25]", 678325840] + ], + "spec/ast/merge/rspec/shared_examples/file_analyzable_spec.rb:1833922303": [ + [58, 3, 970, "Metrics/AbcSize: Assignment Branch Condition size for `detect_freeze_blocks` is too high. [<16, 9, 5> 19.03/17]", 1533823667], + [58, 3, 970, "Metrics/MethodLength: Method has too many lines. [31/10]", 1533823667], + [104, 1, 1216, "Metrics/BlockLength: Block has too many lines. [39/25]", 1009012120], + [105, 3, 1159, "Metrics/BlockLength: Block has too many lines. [38/25]", 1361521205] + ], + "spec/ast/merge/rspec/shared_examples/layout_attachment_spec.rb:714796658": [ + [8, 1, 957, "Metrics/BlockLength: Block has too many lines. [28/25]", 3738990548] + ], + "spec/ast/merge/rspec/shared_examples/recipe_preset_contract_spec.rb:669158728": [ + [6, 1, 1577, "Metrics/BlockLength: Block has too many lines. [41/25]", 2157464290], + [7, 3, 1512, "Metrics/BlockLength: Block has too many lines. [39/25]", 1968160370], + [44, 5, 401, "Metrics/AbcSize: Assignment Branch Condition size for `run_verify_loaded_preset` is too high. [<0, 26, 0> 26/17]", 2960760840] + ], + "spec/ast/merge/rspec/shared_examples/removal_mode_compliance_spec.rb:31388352": [ + [6, 22, 2, "Style/MutableConstant: Freeze mutable objects assigned to constants.", 5861859], + [44, 1, 2546, "Metrics/BlockLength: Block has too many lines. [77/25]", 3740028971], + [45, 3, 1350, "Metrics/BlockLength: Block has too many lines. [41/25]", 2793151667], + [94, 3, 1128, "Metrics/BlockLength: Block has too many lines. [32/25]", 2527000512], + [95, 5, 1081, "Metrics/BlockLength: Block has too many lines. [30/25]", 3825359844] + ], + "spec/ast/merge/rspec/shared_examples/reproducible_partial_merge_spec.rb:2862326360": [ + [19, 3, 600, "Metrics/MethodLength: Method has too many lines. [13/10]", 1542875905] + ], + "spec/ast/merge/ruleset/config_spec.rb:1860949041": [ + [3, 1, 9431, "Metrics/BlockLength: Block has too many lines. [236/25]", 4015119559], + [24, 3, 5341, "Metrics/BlockLength: Block has too many lines. [149/25]", 2361087446], + [25, 5, 1064, "Metrics/BlockLength: Block has too many lines. [26/25]", 603056104], + [226, 3, 2125, "Metrics/BlockLength: Block has too many lines. [36/25]", 1640873170] + ], + "spec/ast/merge/ruleset/declaration_objects_spec.rb:3827892270": [ + [3, 1, 1881, "Metrics/BlockLength: Block has too many lines. [47/25]", 1770376910] + ], + "spec/ast/merge/ruleset/feature_profile_spec.rb:2241111096": [ + [3, 1, 4189, "Metrics/BlockLength: Block has too many lines. [86/25]", 1116963550], + [4, 3, 4129, "Metrics/BlockLength: Block has too many lines. [84/25]", 117079811], + [5, 5, 2391, "Metrics/BlockLength: Block has too many lines. [45/25]", 1800077283] + ], + "spec/ast/merge/ruleset/parser_spec.rb:386407767": [ + [3, 1, 5670, "Metrics/BlockLength: Block has too many lines. [144/25]", 3425850453], + [4, 3, 5618, "Metrics/BlockLength: Block has too many lines. [143/25]", 246633759] + ], + "spec/ast/merge/ruleset/profile_vocabulary_spec.rb:2570869276": [ + [3, 1, 2095, "Metrics/BlockLength: Block has too many lines. [46/25]", 3214342662] + ], + "spec/ast/merge/ruleset/support_style_resolver_spec.rb:640167644": [ + [3, 1, 1625, "Metrics/BlockLength: Block has too many lines. [49/25]", 2066834885], + [4, 3, 1559, "Metrics/BlockLength: Block has too many lines. [47/25]", 1169495477] + ], + "spec/ast/merge/runtime_spec.rb:3962589694": [ + [5, 1, 24649, "Metrics/BlockLength: Block has too many lines. [664/25]", 2634021188], + [76, 3, 1459, "Metrics/BlockLength: Block has too many lines. [41/25]", 3744002593], + [125, 3, 1417, "Metrics/BlockLength: Block has too many lines. [33/25]", 4087615381], + [166, 3, 2549, "Metrics/BlockLength: Block has too many lines. [69/25]", 3150260095], + [175, 5, 1068, "Metrics/BlockLength: Block has too many lines. [26/25]", 2933114685], + [247, 3, 1668, "Metrics/BlockLength: Block has too many lines. [39/25]", 2386637993], + [259, 5, 1265, "Metrics/BlockLength: Block has too many lines. [27/25]", 3157806167], + [321, 3, 10884, "Metrics/BlockLength: Block has too many lines. [295/25]", 1889265918], + [322, 5, 1879, "Metrics/BlockLength: Block has too many lines. [46/25]", 2536583521], + [373, 5, 3938, "Metrics/BlockLength: Block has too many lines. [108/25]", 340276027], + [486, 5, 1270, "Metrics/BlockLength: Block has too many lines. [38/25]", 3844174392], + [528, 5, 3728, "Metrics/BlockLength: Block has too many lines. [95/25]", 3779381786], + [630, 3, 3240, "Metrics/BlockLength: Block has too many lines. [84/25]", 3856725067], + [656, 5, 1649, "Metrics/BlockLength: Block has too many lines. [40/25]", 3713662683] + ], + "spec/ast/merge/section_typing_spec.rb:2580971307": [ + [3, 1, 14786, "Metrics/BlockLength: Block has too many lines. [344/25]", 2925587076], + [4, 3, 1940, "Metrics/BlockLength: Block has too many lines. [50/25]", 3362429388], + [67, 3, 3684, "Metrics/BlockLength: Block has too many lines. [96/25]", 3864076664], + [120, 5, 1998, "Metrics/BlockLength: Block has too many lines. [50/25]", 411620722], + [183, 3, 1415, "Metrics/BlockLength: Block has too many lines. [37/25]", 3323012675], + [192, 5, 1124, "Metrics/BlockLength: Block has too many lines. [28/25]", 966216762], + [229, 3, 1610, "Metrics/BlockLength: Block has too many lines. [38/25]", 1499957007], + [229, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 1025596574], + [279, 3, 4437, "Metrics/BlockLength: Block has too many lines. [80/25]", 423587151], + [356, 36, 23, "Style/SymbolProc: Pass `&:unclassified?` as an argument to `find` instead of a block.", 563945984], + [369, 36, 23, "Style/SymbolProc: Pass `&:unclassified?` as an argument to `find` instead of a block.", 563945984], + [375, 3, 1630, "Metrics/BlockLength: Block has too many lines. [31/25]", 1675144727] + ], + "spec/ast/merge/smart_merger_base_spec.rb:1904727390": [ + [3, 1, 13253, "Metrics/BlockLength: Block has too many lines. [398/25]", 3611753358], + [30, 9, 10, "Style/MultilineBlockChain: Avoid multi-line chains of blocks.", 1099697163], + [87, 3, 1851, "Metrics/BlockLength: Block has too many lines. [40/25]", 3729571903], + [210, 3, 925, "Metrics/BlockLength: Block has too many lines. [35/25]", 2001100899], + [344, 3, 709, "Metrics/BlockLength: Block has too many lines. [27/25]", 3041950416], + [415, 3, 1074, "Metrics/BlockLength: Block has too many lines. [35/25]", 956635689], + [416, 5, 1026, "Metrics/BlockLength: Block has too many lines. [33/25]", 1993879652], + [461, 3, 1031, "Metrics/BlockLength: Block has too many lines. [31/25]", 35315996] + ], + "spec/ast/merge/structural_edit/boundary_support_spec.rb:863387845": [ + [3, 1, 4226, "Metrics/BlockLength: Block has too many lines. [86/25]", 1889771490], + [16, 9, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 1304492024], + [22, 9, 41, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3828424401], + [59, 3, 1294, "Metrics/BlockLength: Block has too many lines. [26/25]", 3038774774] + ], + "spec/ast/merge/structural_edit/plan_set_spec.rb:3633263362": [ + [3, 1, 5945, "Metrics/BlockLength: Block has too many lines. [180/25]", 3883285271], + [14, 3, 2139, "Metrics/BlockLength: Block has too many lines. [72/25]", 3558415255], + [128, 3, 1412, "Metrics/BlockLength: Block has too many lines. [39/25]", 1216754705] + ], + "spec/ast/merge/structural_edit/remove_plan_spec.rb:3569534665": [ + [3, 1, 6442, "Metrics/BlockLength: Block has too many lines. [134/25]", 3440814588], + [39, 3, 3768, "Metrics/BlockLength: Block has too many lines. [75/25]", 876721813], + [127, 3, 1439, "Metrics/BlockLength: Block has too many lines. [29/25]", 3378195351] + ], + "spec/ast/merge/structural_edit/remove_plan_support_spec.rb:800158061": [ + [3, 1, 2893, "Metrics/BlockLength: Block has too many lines. [62/25]", 3748446914], + [16, 9, 43, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 3196404056], + [22, 9, 42, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 4116824817], + [29, 3, 2091, "Metrics/BlockLength: Block has too many lines. [39/25]", 1684933040], + [30, 5, 1653, "Metrics/BlockLength: Block has too many lines. [27/25]", 2456404305] + ], + "spec/ast/merge/structural_edit/splice_plan_spec.rb:3331205681": [ + [3, 1, 3159, "Metrics/BlockLength: Block has too many lines. [83/25]", 2234926397], + [16, 3, 1837, "Metrics/BlockLength: Block has too many lines. [46/25]", 2935991482], + [42, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860750] + ], + "spec/ast/merge/text/conflict_resolver_spec.rb:3810004132": [ + [5, 1, 9102, "Metrics/BlockLength: Block has too many lines. [218/25]", 672115618], + [33, 3, 8206, "Metrics/BlockLength: Block has too many lines. [194/25]", 259803246], + [78, 5, 1920, "Metrics/BlockLength: Block has too many lines. [45/25]", 3965182334], + [139, 5, 1918, "Metrics/BlockLength: Block has too many lines. [44/25]", 3707046125] + ], + "spec/ast/merge/text/file_analysis_spec.rb:3430380445": [ + [5, 1, 8842, "Metrics/BlockLength: Block has too many lines. [205/25]", 4255187284], + [6, 3, 1323, "Metrics/BlockLength: Block has too many lines. [29/25]", 2518912953], + [47, 3, 1830, "Metrics/BlockLength: Block has too many lines. [43/25]", 3685770590], + [135, 3, 1620, "Metrics/BlockLength: Block has too many lines. [35/25]", 3089951119] + ], + "spec/ast/merge/text/line_node_spec.rb:1757790485": [ + [5, 1, 4739, "Metrics/BlockLength: Block has too many lines. [131/25]", 1487875238] + ], + "spec/ast/merge/text/merge_result_spec.rb:589380024": [ + [5, 1, 1541, "Metrics/BlockLength: Block has too many lines. [40/25]", 2828087992] + ], + "spec/ast/merge/text/section_splitter_spec.rb:804308722": [ + [4, 1, 5705, "Metrics/BlockLength: Block has too many lines. [209/25]", 4175363685], + [5, 3, 794, "Metrics/BlockLength: Block has too many lines. [28/25]", 2386862842], + [42, 3, 1126, "Metrics/BlockLength: Block has too many lines. [45/25]", 1507887296], + [95, 3, 746, "Metrics/BlockLength: Block has too many lines. [30/25]", 1759029412], + [131, 3, 1169, "Metrics/BlockLength: Block has too many lines. [45/25]", 1412318991], + [184, 3, 754, "Metrics/BlockLength: Block has too many lines. [30/25]", 2717556691], + [246, 1, 16648, "Metrics/BlockLength: Block has too many lines. [428/25]", 3166834694], + [370, 3, 1640, "Metrics/BlockLength: Block has too many lines. [46/25]", 2049342960], + [424, 3, 3237, "Metrics/BlockLength: Block has too many lines. [102/25]", 2357275144], + [540, 3, 3505, "Metrics/BlockLength: Block has too many lines. [67/25]", 2112469350], + [619, 3, 3586, "Metrics/BlockLength: Block has too many lines. [90/25]", 3866409298], + [620, 5, 1650, "Metrics/BlockLength: Block has too many lines. [48/25]", 289235626], + [622, 9, 1474, "Metrics/AbcSize: Assignment Branch Condition size for `split` is too high. [<8, 21, 7> 23.54/17]", 557655357], + [622, 9, 1474, "Metrics/MethodLength: Method has too many lines. [41/10]", 557655357], + [622, 9, 1474, "Metrics/PerceivedComplexity: Perceived complexity for `split` is too high. [9/8]", 557655357], + [628, 11, 1237, "Metrics/BlockLength: Block has too many lines. [33/25]", 1134667672], + [717, 29, 44, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 2169354946], + [723, 29, 44, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 2169354946], + [751, 1, 3128, "Metrics/BlockLength: Block has too many lines. [85/25]", 2082776744], + [769, 3, 1744, "Metrics/BlockLength: Block has too many lines. [46/25]", 223880162], + [770, 5, 1258, "Metrics/BlockLength: Block has too many lines. [31/25]", 2245422869] + ], + "spec/ast/merge/text/smart_merger_spec.rb:4128732567": [ + [3, 1, 8057, "Metrics/BlockLength: Block has too many lines. [210/25]", 1690443322], + [4, 3, 1135, "Metrics/BlockLength: Block has too many lines. [28/25]", 3788979655], + [58, 3, 4438, "Metrics/BlockLength: Block has too many lines. [106/25]", 2613192474], + [187, 3, 1053, "Metrics/BlockLength: Block has too many lines. [26/25]", 803567817], + [220, 3, 892, "Metrics/BlockLength: Block has too many lines. [28/25]", 2001100899] + ], + "spec/ast/merge/text/word_node_spec.rb:1457011521": [ + [5, 1, 3264, "Metrics/BlockLength: Block has too many lines. [74/25]", 677733430] + ], + "spec/ast/merge/token_match_refiner_spec.rb:3180314913": [ + [3, 1, 4000, "Metrics/BlockLength: Block has too many lines. [80/25]", 1630791278], + [8, 3, 2912, "Metrics/BlockLength: Block has too many lines. [60/25]", 529772148] + ], + "spec/ast/merge/trailing_groups/alignment_sort_spec.rb:1594915480": [ + [5, 1, 4710, "Metrics/BlockLength: Block has too many lines. [114/25]", 2499296583], + [14, 3, 2140, "Metrics/BlockLength: Block has too many lines. [47/25]", 3871799493], + [95, 3, 1482, "Metrics/BlockLength: Block has too many lines. [35/25]", 1088314263] + ], + "spec/ast/merge/trailing_groups/core_spec.rb:2651131504": [ + [5, 1, 9601, "Metrics/BlockLength: Block has too many lines. [242/25]", 598045669], + [22, 3, 3728, "Metrics/BlockLength: Block has too many lines. [87/25]", 1304580063], + [119, 3, 3931, "Metrics/BlockLength: Block has too many lines. [99/25]", 2464218479], + [186, 5, 1322, "Metrics/BlockLength: Block has too many lines. [30/25]", 427915501], + [187, 7, 1267, "Metrics/BlockLength: Block has too many lines. [28/25]", 861882691], + [245, 3, 1306, "Metrics/BlockLength: Block has too many lines. [34/25]", 86572459] + ], + "spec/ast/merge/trailing_groups/dest_iterate_spec.rb:3632880085": [ + [5, 1, 5523, "Metrics/BlockLength: Block has too many lines. [131/25]", 3077369183], + [19, 3, 3990, "Metrics/BlockLength: Block has too many lines. [91/25]", 593259616], + [39, 35, 12, "Style/SymbolProc: Pass `&:sig` as an argument to `lambda` instead of a block.", 3587754320], + [54, 33, 23, "Lint/HashCompareByIdentity: Use `Hash#compare_by_identity` instead of using `object_id` for keys.", 384283629], + [89, 35, 13, "Style/SymbolProc: Pass `&:name` as an argument to `lambda` instead of a block.", 3561384234], + [98, 35, 12, "Style/SymbolProc: Pass `&:sig` as an argument to `lambda` instead of a block.", 3587754320], + [113, 35, 12, "Style/SymbolProc: Pass `&:sig` as an argument to `lambda` instead of a block.", 3587754320] + ], + "spec/ast/merge/unresolved_policy_spec.rb:2561713656": [ + [3, 1, 1333, "Metrics/BlockLength: Block has too many lines. [33/25]", 4109547889] + ], + "spec/ast/merge/unresolved_review_state_spec.rb:3186871217": [ + [3, 1, 1038, "Metrics/BlockLength: Block has too many lines. [31/25]", 1325553035] + ], + "spec/ast/merge_rspec_conformance_fixtures_spec.rb:251774004": [ + [5, 1, 2119, "Metrics/BlockLength: Block has too many lines. [55/25]", 1724925683], + [6, 3, 1203, "Metrics/BlockLength: Block has too many lines. [29/25]", 3306863581] + ], + "spec/ast/merge_spec.rb:664670069": [ + [3, 1, 3113, "Metrics/BlockLength: Block has too many lines. [74/25]", 4034649501], + [9, 3, 2227, "Metrics/BlockLength: Block has too many lines. [51/25]", 578300230], + [10, 5, 2182, "Metrics/BlockLength: Block has too many lines. [49/25]", 2758871265] + ], + "spec/base_substrate_spec.rb:2864492094": [ + [5, 1, 5800, "Metrics/BlockLength: Block has too many lines. [143/25]", 784801982], + [6, 3, 192, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 680981873], + [13, 3, 378, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 1223797442], + [31, 3, 628, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 2123191050], + [53, 3, 429, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3536712197], + [69, 3, 24, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 2280792512], + [70, 3, 78, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 604224776], + [72, 3, 146, "Lint/ConstantDefinitionInBlock: Do not define constants this way within a block.", 3315091322] + ], + "spec/fixtures_integration_spec.rb:1145500459": [ + [595, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5859109], + [758, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 576909008], + [881, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087900170], + [1806, 3, 816, "Metrics/MethodLength: Method has too many lines. [13/10]", 170960660], + [1806, 39, 213, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 635200700], + [1807, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3976306097], + [1831, 38, 80, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 3297939075], + [1916, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1745553512], + [1917, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 118067488], + [1918, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 196190368], + [1919, 121, 41, "Layout/LineLength: Line is too long. [161/120]", 3371256193], + [2090, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3241114703], + [2428, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], + [2567, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], + [2991, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3697593604], + [2992, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177548], + [3113, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179435314], + [3122, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1182194285], + [3124, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 3886107031], + [3151, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1751849111], + [3152, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1519587684], + [3153, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 4086262880], + [3170, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3568081822], + [3171, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1776876782], + [3173, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [3174, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1751849111], + [3176, 121, 73, "Layout/LineLength: Line is too long. [193/120]", 3322243646], + [3178, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1715153206], + [3179, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [3180, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 504997180], + [3181, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 1146860021], + [3182, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 2312101607], + [3183, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1423779161], + [3184, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1900897138], + [3185, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 1689840383], + [3186, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 1589056236], + [3188, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 763176550], + [3194, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3957871310], + [3196, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 763176550], + [3198, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 919916608], + [3199, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 919916608], + [3200, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3957871310], + [3201, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 4073040612], + [3202, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 763176550], + [3203, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 667593075], + [3205, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1310972770], + [3206, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 311387795], + [3207, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 724840266], + [3208, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 2555878310], + [3209, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1781078972], + [3210, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [3213, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [3214, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1658060570], + [3215, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 3085728851], + [3216, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3129400559], + [3217, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3197516464], + [3218, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087771520], + [3219, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3837194228], + [3220, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 1312323543], + [3221, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 2356847623], + [3222, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [3223, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3428073441], + [3224, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 2891080552], + [3225, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3080737172], + [3226, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 170445026], + [3227, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3240051869], + [3228, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 4266052680], + [3229, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3376297786], + [3230, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 398435913], + [3231, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 4134940256], + [3232, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 30370035], + [3233, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 2862546359], + [3234, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1901388514], + [3235, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 838864274], + [3236, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 3437460384], + [3237, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1567003152], + [3238, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2609066305], + [3239, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 4043187090], + [3240, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3866430009], + [3241, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 2182699083], + [3242, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 3958792129], + [3243, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3449926560], + [3244, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 399774089], + [3245, 121, 68, "Layout/LineLength: Line is too long. [188/120]", 2119246799], + [3247, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3592658842], + [3248, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2905723409], + [3249, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 3930305198], + [3250, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 4186230052], + [3251, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [3252, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2700200720], + [3253, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 1630526402], + [3254, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 3669244926], + [3255, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2814234644], + [3256, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3109415933], + [3257, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3643275044], + [3258, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 3825290660], + [3259, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1751849111], + [3260, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 4112285398], + [3261, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 1684279672], + [3262, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 1616506266], + [3264, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [3265, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1330093223], + [3266, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 4084555566], + [3267, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 2466867154], + [3268, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 4088314613], + [3269, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 2416893689], + [3270, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 683312682], + [3271, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 2516517934], + [3272, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2414563355], + [3273, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 2232595211], + [3274, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 2940789369], + [3275, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 941259913], + [3276, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2133508098], + [3277, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1621975014], + [3278, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 35985461], + [3279, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 746016305], + [3280, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 435488100], + [3281, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 2581129172], + [3282, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 3495900774], + [3283, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1413120342], + [3284, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], + [3285, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2333800791], + [3286, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 2576906206], + [3287, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 2986659874], + [3288, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2811932564], + [3289, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 1970813291], + [3290, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 2904941246], + [3291, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3745922508], + [3292, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 735247237], + [3293, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 3731320885], + [3294, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 3896022034], + [3295, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 2827048584], + [3296, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 2548596663], + [3297, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 3812352018], + [3298, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 1280243910], + [3299, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 1742643292], + [3300, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 3056442430], + [3301, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 3144363287], + [3302, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 477297993], + [3303, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 3657857971], + [3304, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3913984414], + [3305, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 336201058], + [3306, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 485418789], + [3307, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 453253839], + [3308, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3673833034], + [3309, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 1552836890], + [3310, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 2714635965], + [3311, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 9336999], + [3312, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 584857208], + [3313, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 1394865213], + [3314, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 3973222761], + [3315, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 2020040051], + [3316, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 3060994335], + [3317, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 196286917], + [3318, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 4168514178], + [3319, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 810581246], + [3320, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 1473417372], + [3321, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 3008376885], + [3322, 121, 84, "Layout/LineLength: Line is too long. [204/120]", 454816400], + [3323, 121, 88, "Layout/LineLength: Line is too long. [208/120]", 1416223705], + [3324, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 2896813919], + [3325, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 957293983], + [3326, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 2118117430], + [3327, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 1367404612], + [3328, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 2459902188], + [3329, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 461483815], + [3330, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 2791596520], + [3331, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 203085787], + [3332, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 2942095139], + [3333, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 131861965], + [3334, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 3340827551], + [3335, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 102582610], + [3336, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 762789354], + [3337, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 3478337442], + [3338, 121, 112, "Layout/LineLength: Line is too long. [232/120]", 4010607435], + [3339, 121, 132, "Layout/LineLength: Line is too long. [252/120]", 3754747587], + [3340, 121, 136, "Layout/LineLength: Line is too long. [256/120]", 379336923], + [3341, 121, 108, "Layout/LineLength: Line is too long. [228/120]", 3366353902], + [3342, 121, 128, "Layout/LineLength: Line is too long. [248/120]", 1686898289], + [3343, 121, 132, "Layout/LineLength: Line is too long. [252/120]", 2005192241], + [3344, 121, 104, "Layout/LineLength: Line is too long. [224/120]", 1868634464], + [3345, 121, 124, "Layout/LineLength: Line is too long. [244/120]", 3939743614], + [3346, 121, 128, "Layout/LineLength: Line is too long. [248/120]", 2978506702], + [3347, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 3909866928], + [3348, 121, 118, "Layout/LineLength: Line is too long. [238/120]", 2853032177], + [3349, 121, 122, "Layout/LineLength: Line is too long. [242/120]", 2968366309], + [3350, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 1753663643], + [3351, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 3387619436], + [3352, 121, 106, "Layout/LineLength: Line is too long. [226/120]", 197895496], + [3353, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 576181861], + [3354, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 2809313444], + [3355, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 3963067112], + [3356, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 1121380327], + [3357, 121, 100, "Layout/LineLength: Line is too long. [220/120]", 31591211], + [3358, 121, 104, "Layout/LineLength: Line is too long. [224/120]", 1946129497], + [3359, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 767185096], + [3360, 121, 100, "Layout/LineLength: Line is too long. [220/120]", 1092646020], + [3361, 121, 104, "Layout/LineLength: Line is too long. [224/120]", 1328841270], + [3362, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 2663749624], + [3363, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 430318647], + [3364, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 1650234037], + [3365, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 1082269805], + [3366, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 316397809], + [3367, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 3145391348], + [3368, 121, 112, "Layout/LineLength: Line is too long. [232/120]", 2808088654], + [3369, 121, 116, "Layout/LineLength: Line is too long. [236/120]", 1035513748], + [3370, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 2552800539], + [3371, 121, 112, "Layout/LineLength: Line is too long. [232/120]", 1727699169], + [3372, 121, 116, "Layout/LineLength: Line is too long. [236/120]", 1171566267], + [3373, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 2994775049], + [3374, 121, 110, "Layout/LineLength: Line is too long. [230/120]", 3860489151], + [3375, 121, 114, "Layout/LineLength: Line is too long. [234/120]", 959496607], + [3376, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 1694222439], + [3377, 121, 114, "Layout/LineLength: Line is too long. [234/120]", 1501186331], + [3378, 121, 118, "Layout/LineLength: Line is too long. [238/120]", 4059659418], + [3379, 121, 110, "Layout/LineLength: Line is too long. [230/120]", 1899868779], + [3380, 121, 130, "Layout/LineLength: Line is too long. [250/120]", 323324279], + [3381, 121, 134, "Layout/LineLength: Line is too long. [254/120]", 3956414359], + [3382, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 3506644741], + [3383, 121, 116, "Layout/LineLength: Line is too long. [236/120]", 936139074], + [3384, 121, 136, "Layout/LineLength: Line is too long. [256/120]", 4153213512], + [3385, 121, 140, "Layout/LineLength: Line is too long. [260/120]", 1491976338], + [3386, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 4061753206], + [3387, 121, 106, "Layout/LineLength: Line is too long. [226/120]", 2410434304], + [3388, 121, 124, "Layout/LineLength: Line is too long. [244/120]", 3518300264], + [3389, 121, 144, "Layout/LineLength: Line is too long. [264/120]", 1040696046], + [3390, 121, 148, "Layout/LineLength: Line is too long. [268/120]", 139604188], + [3391, 121, 120, "Layout/LineLength: Line is too long. [240/120]", 231937793], + [3392, 121, 140, "Layout/LineLength: Line is too long. [260/120]", 1835509805], + [3393, 121, 144, "Layout/LineLength: Line is too long. [264/120]", 1629218396], + [3394, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 2312875700], + [3395, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 2933374083], + [3396, 121, 106, "Layout/LineLength: Line is too long. [226/120]", 1719349671], + [3397, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 2555579810], + [3398, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 2023551624], + [3399, 121, 114, "Layout/LineLength: Line is too long. [234/120]", 955231924], + [3400, 121, 118, "Layout/LineLength: Line is too long. [238/120]", 4232993781], + [3401, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 3472954835], + [3402, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 3211922285], + [3403, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 2874956332], + [3404, 121, 102, "Layout/LineLength: Line is too long. [222/120]", 1360335840], + [3405, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2135379556], + [3406, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3242768475], + [3407, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 2789115918], + [3408, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 3346448124], + [3409, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1538469817], + [3410, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1543041113], + [3411, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 3344741438], + [3412, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2188404009], + [3413, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1330398779], + [3414, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 332468826], + [3415, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 1905397598], + [3416, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 438831062], + [3417, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 3377667334], + [3418, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3232541734], + [3420, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2130930429], + [3421, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 3684939371], + [3423, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2361951097], + [3424, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 1211447462], + [3425, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3309872691], + [3426, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 360053761], + [3427, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 1310136493], + [3428, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1950686342], + [3429, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 1397845826], + [3430, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 4191304724], + [3431, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2354128498], + [3432, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 1865717453], + [3433, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 24220542], + [3434, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 2618612673], + [3437, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3422918867], + [3438, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 3689431739], + [3482, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 4093564799], + [3488, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1662653970], + [3489, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 3967501655], + [3490, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2178516622], + [3491, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 1345346561], + [3505, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193466072], + [3625, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 3612393276], + [3626, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 797303985], + [3629, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1606320605], + [3649, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1776876782], + [3653, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 828742791], + [3673, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3294617581], + [3683, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3519842846], + [3693, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1966440909], + [3694, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053864], + [3700, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1606320605], + [3723, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 1340744311], + [3742, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1741893077], + [3743, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053865], + [3747, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193405204], + [3761, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1401226501], + [3764, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085352569], + [3767, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 696523922], + [3782, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], + [3792, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2746826653], + [4208, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1138870161], + [4770, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], + [4781, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 2132299307], + [4828, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087775098], + [4839, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 757851079], + [4875, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], + [4886, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 441649198], + [4909, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087903295], + [4921, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 170442008], + [4930, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], + [4932, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1888875443], + [4969, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 398433651], + [4980, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3921367744], + [5003, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2422819473], + [5009, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 194583095], + [5015, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1901385496], + [5024, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 490810486], + [5026, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 586287746], + [5030, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1310969752], + [5050, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087389205], + [5062, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2609063547], + [5071, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], + [5073, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1370761696], + [5096, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 2208661169], + [5102, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1862604658], + [5108, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 3958789371], + [5117, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3449594464], + [5119, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 692050524], + [5123, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 802172558], + [5193, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 2406691660], + [5228, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], + [5239, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1811982742], + [5266, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2562189319], + [5272, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193430346], + [5278, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 2814237166], + [5287, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2189106693], + [5289, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 3874870868], + [5293, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179474914], + [5326, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1751845165], + [5337, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2617230371], + [5341, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], + [5382, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], + [5393, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3793790598], + [5428, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 4088312783], + [5439, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3220724736], + [5443, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087899888], + [5462, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2552888401], + [5468, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 194583095], + [5474, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 2414559905], + [5483, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 626762179], + [5485, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3969284923], + [5489, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 1893261414], + [5521, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2133507320], + [5532, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 2101353476], + [5536, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087685705], + [5555, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2431380437], + [5561, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 194583095], + [5567, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 435489438], + [5576, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 1520878209], + [5578, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 2238995076], + [5582, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 2789405913], + [5615, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], + [5626, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3409328196], + [5649, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087858069], + [5661, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2811935086], + [5670, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], + [5672, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1113346693], + [5676, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3227128786], + [5696, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 48793812], + [5702, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 338440584], + [5708, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 735248703], + [5717, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 927473097], + [5719, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 1394536741], + [5723, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 3134012967], + [5742, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 2967615316], + [5748, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 2810710931], + [5754, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 2548594701], + [5757, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860796], + [5759, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], + [5763, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3549194295], + [5765, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 1074004741], + [5769, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 2874423564], + [5772, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087576526], + [5774, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], + [5789, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 1696848307], + [5795, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 2883501659], + [5801, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 3056443076], + [5806, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193405204], + [5810, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 1487412605], + [5812, 121, 51, "Layout/LineLength: Line is too long. [171/120]", 2021571284], + [5816, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1975782995], + [5819, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860796], + [5821, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193405204], + [5826, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 183236849], + [5835, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 856018753], + [5838, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], + [5841, 121, 37, "Layout/LineLength: Line is too long. [157/120]", 2146546324], + [5847, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3913983076], + [5850, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 3491931666], + [5852, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3536323546], + [5856, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 356581191], + [5858, 121, 63, "Layout/LineLength: Line is too long. [183/120]", 4144657639], + [5862, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 1478616653], + [5865, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1774852021], + [5867, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3536323546], + [5882, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 3884289787], + [5888, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 1001503687], + [5894, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3673836976], + [5903, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 3164908550], + [5905, 121, 43, "Layout/LineLength: Line is too long. [163/120]", 1134300778], + [5909, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1797165224], + [5928, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 2508143995], + [5934, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 3002532188], + [5940, 121, 44, "Layout/LineLength: Line is too long. [164/120]", 584857986], + [5943, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860796], + [5945, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], + [5949, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 749691384], + [5951, 121, 55, "Layout/LineLength: Line is too long. [175/120]", 3389354954], + [5955, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 3402045699], + [5958, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087576526], + [5960, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 182097675], + [5974, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 2447716612], + [5980, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3201685099], + [5986, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 3060990885], + [5995, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 29396315], + [5997, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 1228645365], + [6001, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1436742837], + [6020, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 716917214], + [6026, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 2175814211], + [6032, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 1473420390], + [6035, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193433391], + [6037, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1422839111], + [6041, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 1571170198], + [6043, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 2175059093], + [6047, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 3886666417], + [6050, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 176753677], + [6052, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1422839111], + [6068, 121, 38, "Layout/LineLength: Line is too long. [158/120]", 3471319495], + [6074, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 1274038477], + [6080, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 2896814693], + [6083, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087576526], + [6085, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114086530], + [6089, 121, 40, "Layout/LineLength: Line is too long. [160/120]", 250433828], + [6091, 121, 59, "Layout/LineLength: Line is too long. [179/120]", 3910556848], + [6095, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 4002014976], + [6098, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 3491931666], + [6100, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114086530], + [6194, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861664], + [6208, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087932582], + [6222, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861664], + [6238, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 876012844], + [6240, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1756764194], + [6241, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 4173216735], + [6244, 121, 75, "Layout/LineLength: Line is too long. [195/120]", 911964425], + [6245, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 173266907], + [6246, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1412705933], + [6249, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1756764194], + [6250, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 2605683750], + [6253, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 3182252139], + [6255, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1652557742], + [6259, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 2240437058], + [6260, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 173266907], + [6261, 121, 101, "Layout/LineLength: Line is too long. [221/120]", 3694598076], + [6263, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861152], + [6264, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 179079542], + [6265, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 3528944411], + [6268, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3020159378], + [6270, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 1652557742], + [6276, 121, 84, "Layout/LineLength: Line is too long. [204/120]", 420843234], + [6278, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1401226501], + [6279, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 442915368], + [6282, 121, 79, "Layout/LineLength: Line is too long. [199/120]", 4212444955], + [6283, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053864], + [6284, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 1373660924], + [6287, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1401226501], + [6288, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 1539225758], + [6291, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3020159378], + [6293, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 4240691845], + [6297, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 674553335], + [6298, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053864], + [6299, 121, 105, "Layout/LineLength: Line is too long. [225/120]", 4163432287], + [6301, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2089555761], + [6302, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2034687276], + [6303, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 3710905302], + [6306, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 4204667212], + [6308, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 4240691845], + [6314, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 2071493433], + [6316, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085352569], + [6317, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 2853066942], + [6320, 121, 71, "Layout/LineLength: Line is too long. [191/120]", 2771467828], + [6321, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193425976], + [6322, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3025157142], + [6325, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2085352569], + [6326, 121, 86, "Layout/LineLength: Line is too long. [206/120]", 3340824101], + [6329, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 3999804761], + [6331, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1999310973], + [6335, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 835016333], + [6336, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193425976], + [6337, 121, 97, "Layout/LineLength: Line is too long. [217/120]", 3575893945], + [6340, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193405945], + [6341, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 1755858308], + [6344, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 3182252139], + [6346, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1999310973], + [6352, 121, 70, "Layout/LineLength: Line is too long. [190/120]", 3033080032], + [6354, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177549], + [6355, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 2720985203], + [6358, 121, 65, "Layout/LineLength: Line is too long. [185/120]", 3233424320], + [6360, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873483], + [6363, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177549], + [6364, 121, 80, "Layout/LineLength: Line is too long. [200/120]", 131859703], + [6367, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1943494546], + [6369, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 4016166830], + [6373, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 1350760977], + [6375, 121, 91, "Layout/LineLength: Line is too long. [211/120]", 4098706554], + [6379, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 4059724765], + [6382, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 1651955548], + [6384, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 4016166830], + [6390, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 1057495720], + [6393, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1621971220], + [6396, 121, 49, "Layout/LineLength: Line is too long. [169/120]", 1585717593], + [6402, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 2942094233], + [6405, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2624667704], + [6407, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2317051977], + [6411, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 1321610634], + [6413, 121, 75, "Layout/LineLength: Line is too long. [195/120]", 2854688831], + [6417, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 4185465554], + [6420, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1169781875], + [6422, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2317051977], + [6428, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 1916545020], + [6431, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1422839111], + [6434, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 910134593], + [6440, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 203086561], + [6443, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2939363812], + [6445, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3155638331], + [6449, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 1955758062], + [6451, 121, 71, "Layout/LineLength: Line is too long. [191/120]", 3737424359], + [6455, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 3597620692], + [6458, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2624667704], + [6460, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3155638331], + [6466, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 1036052399], + [6469, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114086530], + [6472, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 1268266488], + [6478, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 2791598354], + [6481, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1302589368], + [6483, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3533902728], + [6487, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 3942276897], + [6489, 121, 73, "Layout/LineLength: Line is too long. [193/120]", 1175941460], + [6493, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 679697318], + [6496, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 28126263], + [6498, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3533902728], + [6499, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 181895237], + [6504, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 4057848448], + [6507, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 4114086530], + [6510, 121, 47, "Layout/LineLength: Line is too long. [167/120]", 4067769399], + [6516, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 461482909], + [6519, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1302589368], + [6521, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3533902728], + [6525, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 3561204590], + [6527, 121, 73, "Layout/LineLength: Line is too long. [193/120]", 880160795], + [6531, 121, 48, "Layout/LineLength: Line is too long. [168/120]", 1614719145], + [6534, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 28126263], + [6536, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 3533902728], + [6537, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 181895237], + [6584, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193432306], + [6598, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 1645945966], + [6601, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3212740609], + [6604, 121, 59, "Layout/LineLength: Line is too long. [179/120]", 3982698123], + [6606, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193425997], + [6610, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 2663750402], + [6613, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2420297272], + [6615, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1164389943], + [6619, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 3483121581], + [6621, 121, 85, "Layout/LineLength: Line is too long. [205/120]", 2271668600], + [6625, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 804794365], + [6628, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3659367004], + [6630, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1164389943], + [6631, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 561395486], + [6636, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 1251661057], + [6639, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3212740609], + [6642, 121, 59, "Layout/LineLength: Line is too long. [179/120]", 3210109508], + [6644, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193425997], + [6648, 121, 74, "Layout/LineLength: Line is too long. [194/120]", 430316685], + [6651, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2420297272], + [6653, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1164389943], + [6657, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 2428160226], + [6659, 121, 85, "Layout/LineLength: Line is too long. [205/120]", 2663295671], + [6663, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 2822109938], + [6666, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3659367004], + [6668, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1164389943], + [6669, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 561395486], + [6674, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 857639785], + [6677, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3669622788], + [6680, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 140453799], + [6682, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860765], + [6686, 121, 72, "Layout/LineLength: Line is too long. [192/120]", 1650236431], + [6689, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 150699323], + [6691, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 50618962], + [6695, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 4205571164], + [6697, 121, 83, "Layout/LineLength: Line is too long. [203/120]", 1549528021], + [6701, 121, 58, "Layout/LineLength: Line is too long. [178/120]", 1325488145], + [6704, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1510711065], + [6706, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 50618962], + [6712, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 3043205563], + [6715, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2381137493], + [6718, 121, 61, "Layout/LineLength: Line is too long. [181/120]", 2200345195], + [6720, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087926498], + [6724, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 1082269527], + [6727, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1510711065], + [6729, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1104064739], + [6733, 121, 68, "Layout/LineLength: Line is too long. [188/120]", 1652941658], + [6735, 121, 87, "Layout/LineLength: Line is too long. [207/120]", 1440323819], + [6739, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 802896260], + [6742, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1943494546], + [6744, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1104064739], + [6750, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 788730815], + [6752, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2034687276], + [6753, 121, 22, "Layout/LineLength: Line is too long. [142/120]", 4226330106], + [6756, 121, 77, "Layout/LineLength: Line is too long. [197/120]", 2414796320], + [6757, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873470], + [6758, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3090817832], + [6761, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 2034687276], + [6762, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 2839148677], + [6765, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 2393983240], + [6767, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 2581936864], + [6771, 121, 84, "Layout/LineLength: Line is too long. [204/120]", 3923254945], + [6772, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873470], + [6773, 121, 103, "Layout/LineLength: Line is too long. [223/120]", 580639726], + [6775, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193419246], + [6776, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1756764194], + [6777, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 3202758044], + [6780, 121, 28, "Layout/LineLength: Line is too long. [148/120]", 912651721], + [6782, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 2581936864], + [6786, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1164293389], + [6799, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5860840], + [6800, 121, 88, "Layout/LineLength: Line is too long. [208/120]", 574552570], + [6802, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3845073641], + [6803, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 543375177], + [6806, 121, 83, "Layout/LineLength: Line is too long. [203/120]", 222410330], + [6807, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3025157219], + [6808, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 1904561434], + [6811, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 489872984], + [6812, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 97325617], + [6815, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 4204667212], + [6817, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 4062673070], + [6821, 121, 90, "Layout/LineLength: Line is too long. [210/120]", 1451915960], + [6822, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 3025157219], + [6823, 121, 109, "Layout/LineLength: Line is too long. [229/120]", 4200529758], + [6825, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1497831350], + [6826, 121, 9, "Layout/LineLength: Line is too long. [129/120]", 4214367244], + [6827, 121, 84, "Layout/LineLength: Line is too long. [204/120]", 399603517], + [6830, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3423548875], + [6832, 121, 32, "Layout/LineLength: Line is too long. [152/120]", 4062673070], + [6836, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 3279830097], + [6848, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 659167322], + [6860, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087926423], + [6861, 121, 57, "Layout/LineLength: Line is too long. [177/120]", 3300294193], + [6863, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 3172850966], + [6864, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 2396187736], + [6867, 121, 87, "Layout/LineLength: Line is too long. [207/120]", 1991888901], + [6868, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1954380402], + [6869, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2589970962], + [6872, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 42340644], + [6873, 121, 67, "Layout/LineLength: Line is too long. [187/120]", 479235996], + [6876, 121, 31, "Layout/LineLength: Line is too long. [151/120]", 3423548875], + [6878, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1462541970], + [6882, 121, 94, "Layout/LineLength: Line is too long. [214/120]", 1373978781], + [6883, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1954380402], + [6884, 121, 78, "Layout/LineLength: Line is too long. [198/120]", 280641011], + [6886, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1664110553], + [6887, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 1009650381], + [6888, 121, 88, "Layout/LineLength: Line is too long. [208/120]", 909329343], + [6891, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 2977589831], + [6893, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 1462541970], + [6898, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1165873470], + [6899, 121, 61, "Layout/LineLength: Line is too long. [181/120]", 1904101094], + [6901, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2229256255], + [6902, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 1839090017], + [6905, 121, 91, "Layout/LineLength: Line is too long. [211/120]", 4260980907], + [6906, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 4253118453], + [6907, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 1536690221], + [6909, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861152], + [6910, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 209824656], + [6911, 121, 71, "Layout/LineLength: Line is too long. [191/120]", 1530496074], + [6914, 121, 33, "Layout/LineLength: Line is too long. [153/120]", 2977589831], + [6916, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3261436902], + [6920, 121, 98, "Layout/LineLength: Line is too long. [218/120]", 3762694917], + [6921, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 4253118453], + [6922, 121, 82, "Layout/LineLength: Line is too long. [202/120]", 3196230010], + [6924, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3165598659], + [6925, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 4264469493], + [6926, 121, 92, "Layout/LineLength: Line is too long. [212/120]", 3140690958], + [6929, 121, 35, "Layout/LineLength: Line is too long. [155/120]", 2999583208], + [6931, 121, 36, "Layout/LineLength: Line is too long. [156/120]", 3261436902], + [6937, 121, 54, "Layout/LineLength: Line is too long. [174/120]", 326070599], + [6940, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 1621971220], + [6943, 121, 49, "Layout/LineLength: Line is too long. [169/120]", 1689000214], + [6949, 121, 64, "Layout/LineLength: Line is too long. [184/120]", 2459904022], + [6952, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2624667704], + [6954, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2317051977], + [6958, 121, 56, "Layout/LineLength: Line is too long. [176/120]", 2842872837], + [6960, 121, 75, "Layout/LineLength: Line is too long. [195/120]", 423884656], + [6964, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 2673769885], + [6967, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 1169781875], + [6969, 121, 15, "Layout/LineLength: Line is too long. [135/120]", 2317051977], + [6970, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2126253911], + [6986, 121, 66, "Layout/LineLength: Line is too long. [186/120]", 2388292564], + [6989, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2381137493], + [6992, 121, 61, "Layout/LineLength: Line is too long. [181/120]", 1136762660], + [6994, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087926498], + [6998, 121, 76, "Layout/LineLength: Line is too long. [196/120]", 2555581016], + [7001, 121, 18, "Layout/LineLength: Line is too long. [138/120]", 1510711065], + [7003, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1104064739], + [7007, 121, 68, "Layout/LineLength: Line is too long. [188/120]", 1986812885], + [7009, 121, 87, "Layout/LineLength: Line is too long. [207/120]", 1864036132], + [7013, 121, 62, "Layout/LineLength: Line is too long. [182/120]", 3590180043], + [7016, 121, 20, "Layout/LineLength: Line is too long. [140/120]", 1943494546], + [7018, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 1104064739], + [7019, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2382712010], + [7029, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1791534645], + [7034, 121, 50, "Layout/LineLength: Line is too long. [170/120]", 2403815412], + [7037, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1422839111], + [7040, 121, 45, "Layout/LineLength: Line is too long. [165/120]", 4046048864], + [7046, 121, 60, "Layout/LineLength: Line is too long. [180/120]", 3472955113], + [7049, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 2939363812], + [7051, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3155638331], + [7055, 121, 52, "Layout/LineLength: Line is too long. [172/120]", 3911469720], + [7057, 121, 71, "Layout/LineLength: Line is too long. [191/120]", 272433263], + [7061, 121, 46, "Layout/LineLength: Line is too long. [166/120]", 634420444], + [7064, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2624667704], + [7066, 121, 13, "Layout/LineLength: Line is too long. [133/120]", 3155638331], + [7067, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2088324682], + [7080, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087906711], + [7092, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2135380894], + [7101, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], + [7103, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 4280757685], + [7107, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 161599970], + [7141, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 830053789], + [7176, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 2188407955], + [7187, 121, 19, "Layout/LineLength: Line is too long. [139/120]", 3692322233], + [7191, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087557694], + [7214, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 3197512522], + [7223, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858840], + [7225, 121, 21, "Layout/LineLength: Line is too long. [141/120]", 85298067], + [7282, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193418403], + [7288, 121, 3, "Layout/LineLength: Line is too long. [123/120]", 193418403], + [7311, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087432474], + [7323, 121, 14, "Layout/LineLength: Line is too long. [134/120]", 2361949763], + [7332, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 2102137893], + [7334, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 581045160], + [7338, 121, 10, "Layout/LineLength: Line is too long. [130/120]", 4235011647], + [7357, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1898147766], + [7363, 121, 1, "Layout/LineLength: Line is too long. [121/120]", 177560], + [7369, 121, 16, "Layout/LineLength: Line is too long. [136/120]", 1310140439], + [7378, 121, 8, "Layout/LineLength: Line is too long. [128/120]", 681770239], + [7380, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 3821940657], + [7384, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5862609], + [7404, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5861292], + [7416, 121, 12, "Layout/LineLength: Line is too long. [132/120]", 2354124424], + [7425, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087922021], + [7427, 121, 23, "Layout/LineLength: Line is too long. [143/120]", 3921370162], + [8020, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 4083054536], + [8048, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 4083054536], + [8077, 121, 24, "Layout/LineLength: Line is too long. [144/120]", 4083054536], + [8135, 121, 42, "Layout/LineLength: Line is too long. [162/120]", 632953222], + [8164, 121, 34, "Layout/LineLength: Line is too long. [154/120]", 732995265], + [8214, 121, 30, "Layout/LineLength: Line is too long. [150/120]", 1886249927], + [8376, 121, 7, "Layout/LineLength: Line is too long. [127/120]", 578751979], + [8377, 121, 11, "Layout/LineLength: Line is too long. [131/120]", 3803540269], + [8386, 121, 17, "Layout/LineLength: Line is too long. [137/120]", 2238403955], + [8387, 121, 25, "Layout/LineLength: Line is too long. [145/120]", 1028441932], + [8388, 121, 29, "Layout/LineLength: Line is too long. [149/120]", 1975950909], + [8443, 121, 6, "Layout/LineLength: Line is too long. [126/120]", 1244043798] + ], + "spec/integration/freeze_node_edge_cases_spec.rb:3416491031": [ + [6, 1, 28959, "Metrics/BlockLength: Block has too many lines. [663/25]", 3473768018], + [7, 3, 2985, "Metrics/BlockLength: Block has too many lines. [57/25]", 436154415], + [8, 5, 2934, "Metrics/BlockLength: Block has too many lines. [55/25]", 1963918102], + [78, 3, 6091, "Metrics/BlockLength: Block has too many lines. [136/25]", 232153494], + [98, 5, 3053, "Metrics/BlockLength: Block has too many lines. [69/25]", 1442974101], + [202, 5, 1691, "Metrics/BlockLength: Block has too many lines. [29/25]", 985654389], + [241, 3, 8515, "Metrics/BlockLength: Block has too many lines. [176/25]", 2776676526], + [473, 3, 2024, "Metrics/BlockLength: Block has too many lines. [55/25]", 1048101963], + [474, 5, 890, "Metrics/BlockLength: Block has too many lines. [26/25]", 753961540], + [543, 3, 4511, "Metrics/BlockLength: Block has too many lines. [116/25]", 1227615145], + [693, 3, 1660, "Metrics/BlockLength: Block has too many lines. [43/25]", 1881888061], + [694, 5, 1107, "Metrics/BlockLength: Block has too many lines. [26/25]", 368095693] + ], + "spec/integration/gem_family_section_merge_spec.rb:1744383089": [ + [164, 121, 27, "Layout/LineLength: Line is too long. [147/120]", 93655697] + ], + "spec/integration/integration_spec.rb:2239247043": [ + [14, 1, 4488, "Metrics/BlockLength: Block has too many lines. [88/25]", 206207480], + [15, 3, 3267, "Metrics/BlockLength: Block has too many lines. [62/25]", 1323899085], + [40, 5, 2263, "Metrics/BlockLength: Block has too many lines. [48/25]", 3172595581] + ], + "spec/integration/link_reference_preservation_spec.rb:3764298162": [ + [6, 1, 2646, "Metrics/BlockLength: Block has too many lines. [48/25]", 3396410609], + [19, 3, 2058, "Metrics/BlockLength: Block has too many lines. [33/25]", 163363949] + ], + "spec/integration/markly_merge_spec.rb:3076950975": [ + [3, 1, 22886, "Metrics/BlockLength: Block has too many lines. [670/25]", 1408138744], + [62, 3, 7192, "Metrics/BlockLength: Block has too many lines. [189/25]", 1890889324], + [63, 5, 1678, "Metrics/BlockLength: Block has too many lines. [41/25]", 2587582896], + [115, 5, 1808, "Metrics/BlockLength: Block has too many lines. [48/25]", 3381172795], + [147, 46, 21, "Style/StringConcatenation: Prefer string interpolation to string concatenation.", 451071547], + [171, 5, 1134, "Metrics/BlockLength: Block has too many lines. [30/25]", 2526618199], + [220, 5, 1335, "Metrics/BlockLength: Block has too many lines. [32/25]", 2790596215], + [311, 3, 2008, "Metrics/BlockLength: Block has too many lines. [66/25]", 2640155627], + [394, 3, 1052, "Metrics/BlockLength: Block has too many lines. [27/25]", 3988836255], + [440, 3, 2950, "Metrics/BlockLength: Block has too many lines. [89/25]", 961031348], + [441, 5, 1352, "Metrics/BlockLength: Block has too many lines. [37/25]", 1952365669], + [495, 5, 1550, "Metrics/BlockLength: Block has too many lines. [48/25]", 2400197001], + [561, 3, 1665, "Metrics/BlockLength: Block has too many lines. [52/25]", 3884776329], + [650, 3, 1919, "Metrics/BlockLength: Block has too many lines. [57/25]", 2594646583], + [725, 3, 1644, "Metrics/BlockLength: Block has too many lines. [45/25]", 2348710811], + [791, 3, 1600, "Metrics/BlockLength: Block has too many lines. [46/25]", 3683503747] + ], + "spec/integration/partial_template_merger_table_merge_spec.rb:3504046892": [ + [7, 1, 7402, "Metrics/BlockLength: Block has too many lines. [164/25]", 3368892126], + [9, 3, 2986, "Metrics/BlockLength: Block has too many lines. [67/25]", 2267114449], + [65, 5, 1359, "Metrics/BlockLength: Block has too many lines. [28/25]", 3145143002], + [102, 3, 997, "Metrics/BlockLength: Block has too many lines. [26/25]", 3156068215], + [147, 3, 3009, "Metrics/BlockLength: Block has too many lines. [65/25]", 994160212], + [202, 5, 1401, "Metrics/BlockLength: Block has too many lines. [28/25]", 3038951618] + ], + "spec/integration/table_formatting_preservation_spec.rb:3943985446": [ + [6, 1, 3086, "Metrics/BlockLength: Block has too many lines. [56/25]", 2210897849], + [19, 3, 2374, "Metrics/BlockLength: Block has too many lines. [40/25]", 668961519], + [33, 5, 1847, "Metrics/BlockLength: Block has too many lines. [28/25]", 3433318963] + ], + "spec/integration/text_merge_spec.rb:884566200": [ + [6, 1, 7747, "Metrics/BlockLength: Block has too many lines. [204/25]", 2372984305], + [60, 3, 1113, "Metrics/BlockLength: Block has too many lines. [34/25]", 3399970957], + [67, 5, 860, "Metrics/BlockLength: Block has too many lines. [27/25]", 2337191560], + [103, 3, 916, "Metrics/BlockLength: Block has too many lines. [28/25]", 4082963348], + [149, 3, 3001, "Metrics/BlockLength: Block has too many lines. [74/25]", 7776854] + ], + "spec/support/fictive_language_harness.rb:1770581700": [ + [85, 7, 733, "Metrics/AbcSize: Assignment Branch Condition size for `extract_comments` is too high. [<5, 16, 5> 17.49/17]", 1127096515], + [85, 7, 733, "Metrics/MethodLength: Method has too many lines. [22/10]", 1127096515], + [117, 21, 129, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 681912759], + [182, 7, 1084, "Metrics/AbcSize: Assignment Branch Condition size for `parse_statements` is too high. [<9, 28, 7> 30.23/17]", 3123785685], + [182, 7, 1084, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `parse_statements` is too high. [8/7]", 3123785685], + [182, 7, 1084, "Metrics/MethodLength: Method has too many lines. [24/10]", 3123785685], + [233, 5, 9879, "Metrics/ClassLength: Class has too many lines. [228/100]", 3231256134], + [236, 21, 208, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2970487173], + [257, 7, 1981, "Metrics/AbcSize: Assignment Branch Condition size for `resolve_batch` is too high. [<16, 32, 4> 36/17]", 4125392918], + [257, 7, 1981, "Metrics/MethodLength: Method has too many lines. [42/10]", 4125392918], + [342, 7, 778, "Metrics/MethodLength: Method has too many lines. [18/10]", 4189873983], + [364, 7, 844, "Metrics/MethodLength: Method has too many lines. [19/10]", 526186683], + [449, 121, 4, "Layout/LineLength: Line is too long. [124/120]", 2087956942], + [464, 7, 1065, "Metrics/AbcSize: Assignment Branch Condition size for `collapse_template_preamble_prefix_region` is too high. [<6, 24, 11> 27.07/17]", 2332280467], + [464, 7, 1065, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `collapse_template_preamble_prefix_region` is too high. [10/7]", 2332280467], + [464, 7, 1065, "Metrics/MethodLength: Method has too many lines. [20/10]", 2332280467], + [464, 7, 1065, "Metrics/PerceivedComplexity: Perceived complexity for `collapse_template_preamble_prefix_region` is too high. [10/8]", 2332280467] + ], + "spec/support/testable_node.rb:1110514732": [ + [10, 7, 573, "Metrics/MethodLength: Method has too many lines. [12/10]", 798847435], + [10, 22, 226, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 2319398994], + [40, 7, 642, "Metrics/AbcSize: Assignment Branch Condition size for `initialize` is too high. [<11, 14, 6> 18.79/17]", 2249578474], + [40, 21, 131, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [10/5]", 1786967686] + ] +} diff --git a/gems/ast-merge/Gemfile.lock b/gems/ast-merge/Gemfile.lock index 65791e91f..80b649b9a 100644 --- a/gems/ast-merge/Gemfile.lock +++ b/gems/ast-merge/Gemfile.lock @@ -1,13 +1,3 @@ -GIT - remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a - branch: fix/ruby-parser-api-methods - glob: packages/ruby/*.gemspec - specs: - tree_sitter_language_pack (1.12.5) - rb_sys (>= 0.9, < 0.9.128) - sorbet-runtime (~> 0.5) - PATH remote: . specs: @@ -17,6 +7,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby + specs: + tree_sitter_language_pack (1.12.5) + rb_sys (>= 0.9, < 0.9.128) + sorbet-runtime (~> 0.5) + GEM remote: https://gem.coop/ specs: @@ -318,11 +324,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -398,6 +399,7 @@ DEPENDENCIES standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + tree_haver! tree_sitter_language_pack! yaml-converter (~> 0.1) yard (~> 0.9, >= 0.9.44) diff --git a/gems/json-merge/Gemfile.lock b/gems/json-merge/Gemfile.lock index 937db6db5..65c1bae1f 100644 --- a/gems/json-merge/Gemfile.lock +++ b/gems/json-merge/Gemfile.lock @@ -1,13 +1,3 @@ -GIT - remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a - branch: fix/ruby-parser-api-methods - glob: packages/ruby/*.gemspec - specs: - tree_sitter_language_pack (1.12.5) - rb_sys (>= 0.9, < 0.9.128) - sorbet-runtime (~> 0.5) - PATH remote: . specs: @@ -16,6 +6,31 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby + specs: + tree_sitter_language_pack (1.12.5) + rb_sys (>= 0.9, < 0.9.128) + sorbet-runtime (~> 0.5) + GEM remote: https://gem.coop/ specs: @@ -27,11 +42,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -322,11 +332,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -373,6 +378,7 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + ast-merge! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) debug (>= 1.1) @@ -402,6 +408,7 @@ DEPENDENCIES standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + tree_haver! tree_sitter_language_pack! yaml-converter (~> 0.1) yard (~> 0.9, >= 0.9.44) diff --git a/gems/plain-merge/Gemfile.lock b/gems/plain-merge/Gemfile.lock index 79234d5aa..a05995f79 100644 --- a/gems/plain-merge/Gemfile.lock +++ b/gems/plain-merge/Gemfile.lock @@ -7,7 +7,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -16,7 +48,193 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -24,6 +242,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -50,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -113,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -141,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -280,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -332,6 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -378,24 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -404,32 +682,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -437,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -449,19 +750,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -476,11 +785,14 @@ 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.0) plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -488,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -515,9 +828,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -526,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -539,14 +856,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -554,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 4819be03b18e8a1dc893eb494eeb518393609acd Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:42:07 -0600 Subject: [PATCH 256/347] Skip matched duplicate Ruby DSL blocks --- .../lib/prism/merge/top_level_merge_runner.rb | 37 +++++++++++++++++++ .../spec/fixtures_integration_spec.rb | 27 ++++++++++++++ 2 files changed, 64 insertions(+) diff --git a/gems/prism-merge/lib/prism/merge/top_level_merge_runner.rb b/gems/prism-merge/lib/prism/merge/top_level_merge_runner.rb index e21a4a0a1..300e4aaa1 100644 --- a/gems/prism-merge/lib/prism/merge/top_level_merge_runner.rb +++ b/gems/prism-merge/lib/prism/merge/top_level_merge_runner.rb @@ -1080,6 +1080,17 @@ def process_dest_node( end end + if dest_signature && duplicate_destination_node_already_matched?( + dest_node: dest_node, + dest_signature: dest_signature, + template_by_signature: template_by_signature, + consumed_template_indices: consumed_template_indices + ) + prune_removed_owner_leading_gap(dest_node) + output_dest_line_ranges << node_range + return dest_node.location.end_line + end + last_output_dest_line = merger.send(:emit_dest_gap_lines, merger.result, merger.dest_analysis, last_output_dest_line, dest_node) output_node = dest_node @@ -1144,6 +1155,32 @@ def process_dest_node( ) end + def duplicate_destination_node_already_matched?(dest_node:, dest_signature:, template_by_signature:, + consumed_template_indices:) + candidates = template_by_signature[dest_signature] + return false unless candidates + return false if candidates.any? { |candidate| !consumed_template_indices.include?(candidate.fetch(:index)) } + + dest_identity = normalized_node_identity(dest_node) + return false if dest_identity.empty? + + candidates.any? do |candidate| + consumed_template_indices.include?(candidate.fetch(:index)) && + normalized_node_identity(candidate.fetch(:node)) == dest_identity + end + end + + def normalized_node_identity(node) + source = if node.respond_to?(:normalized_content) + node.normalized_content + elsif node.respond_to?(:slice) + node.slice + else + node.to_s + end + source.to_s.gsub(/\r\n?/, "\n").strip + end + def already_output?(node_range, output_dest_line_ranges) output_dest_line_ranges.any? do |range| range[:start_offset] <= node_range[:start_offset] && node_range[:end_offset] <= range[:end_offset] diff --git a/gems/prism-merge/spec/fixtures_integration_spec.rb b/gems/prism-merge/spec/fixtures_integration_spec.rb index 307f72d45..a784e44f7 100644 --- a/gems/prism-merge/spec/fixtures_integration_spec.rb +++ b/gems/prism-merge/spec/fixtures_integration_spec.rb @@ -169,6 +169,33 @@ def json_ready(value) expect(result[:output]).not_to include("require \"kettle/test/rspec\"\n\n\n# Internal ENV config") end + it 'does not preserve duplicate destination top-level DSL blocks already matched by identical template content' do + fixture = read_json( + fixtures_root.join( + 'ruby', + 'slice-1002-duplicate-top-level-dsl-block', + 'duplicate-top-level-dsl-block.json' + ) + ) + merge = fixture[:merge] + + result = PRISM_MERGE.merge_ruby( + merge[:template], + merge[:destination], + merge[:dialect], + backend: merge[:backend], + preference: merge[:preference].to_sym, + add_template_only_nodes: merge[:add_template_only_nodes], + signature_generator: PRISM_MERGE.ruby_dsl_signature_generator + ) + + expect(result[:ok]).to be(true) + expect(result[:output]).to eq(merge[:expected]) + expect(result[:output].scan('eval_nomono_gems(gems: direct_sibling_gems)').size).to eq( + fixture.dig(:expected, :block_occurrences) + ) + end + it 'projects the structured-edit provider profile through Prism' do fixture = read_json( fixtures_root.join( From 732afbd7869225942fe092ee7ad72730fe683bf3 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:43:22 -0600 Subject: [PATCH 257/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-merge/Gemfile.lock | 335 ++++++++++++++++++++++++- gems/json-merge/.kettle-drift.lock | 60 +++-- gems/json-merge/Gemfile | 40 +++ gems/prism-merge/Gemfile.lock | 381 +++++++++++++++++++++++++---- 4 files changed, 754 insertions(+), 62 deletions(-) diff --git a/gems/ast-merge/Gemfile.lock b/gems/ast-merge/Gemfile.lock index 80b649b9a..1545c3450 100644 --- a/gems/ast-merge/Gemfile.lock +++ b/gems/ast-merge/Gemfile.lock @@ -8,7 +8,233 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -16,6 +242,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -42,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -105,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -133,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -272,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -324,6 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -370,23 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -395,32 +682,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -428,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -440,19 +750,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -467,10 +785,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -478,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -505,9 +828,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -516,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -529,14 +856,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -544,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/json-merge/.kettle-drift.lock b/gems/json-merge/.kettle-drift.lock index 3aa07e7e9..09df60df7 100644 --- a/gems/json-merge/.kettle-drift.lock +++ b/gems/json-merge/.kettle-drift.lock @@ -9,7 +9,8 @@ 200, 240, 280, - 320 + 320, + 360 ] } ], @@ -23,7 +24,8 @@ 211, 251, 291, - 331 + 331, + 371 ] } ], @@ -37,7 +39,8 @@ 201, 241, 281, - 321 + 321, + 361 ] } ], @@ -51,7 +54,8 @@ 213, 253, 293, - 333 + 333, + 373 ] } ], @@ -65,7 +69,8 @@ 216, 256, 296, - 336 + 336, + 376 ] } ], @@ -79,7 +84,8 @@ 202, 242, 282, - 322 + 322, + 362 ] } ], @@ -94,7 +100,8 @@ 220, 260, 300, - 340 + 340, + 380 ] } ], @@ -108,7 +115,8 @@ 221, 261, 301, - 341 + 341, + 381 ] } ], @@ -123,7 +131,8 @@ 207, 247, 287, - 327 + 327, + 367 ] } ], @@ -137,7 +146,8 @@ 230, 270, 310, - 350 + 350, + 390 ] } ], @@ -152,7 +162,8 @@ 199, 239, 279, - 319 + 319, + 359 ] } ], @@ -167,7 +178,8 @@ 229, 269, 309, - 349 + 349, + 389 ] } ], @@ -181,7 +193,8 @@ 205, 245, 285, - 325 + 325, + 365 ] } ], @@ -196,7 +209,8 @@ 212, 252, 292, - 332 + 332, + 372 ] } ], @@ -211,7 +225,8 @@ 208, 248, 288, - 328 + 328, + 368 ] } ], @@ -225,7 +240,8 @@ 206, 246, 286, - 326 + 326, + 366 ] } ], @@ -239,7 +255,8 @@ 223, 263, 303, - 343 + 343, + 383 ] } ], @@ -253,7 +270,8 @@ 222, 262, 302, - 342 + 342, + 382 ] } ], @@ -267,7 +285,8 @@ 217, 257, 297, - 337 + 337, + 377 ] } ], @@ -281,7 +300,8 @@ 226, 266, 306, - 346 + 346, + 386 ] } ], diff --git a/gems/json-merge/Gemfile b/gems/json-merge/Gemfile index d806d806a..d19d1187d 100644 --- a/gems/json-merge/Gemfile +++ b/gems/json-merge/Gemfile @@ -352,6 +352,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/prism-merge/Gemfile.lock b/gems/prism-merge/Gemfile.lock index cbe976c4c..0b231a55a 100644 --- a/gems/prism-merge/Gemfile.lock +++ b/gems/prism-merge/Gemfile.lock @@ -1,13 +1,3 @@ -GIT - remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a - branch: fix/ruby-parser-api-methods - glob: packages/ruby/*.gemspec - specs: - tree_sitter_language_pack (1.12.5) - rb_sys (>= 0.9, < 0.9.128) - sorbet-runtime (~> 0.5) - PATH remote: . specs: @@ -16,6 +6,272 @@ PATH ruby-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby + specs: + tree_sitter_language_pack (1.12.5) + rb_sys (>= 0.9, < 0.9.128) + sorbet-runtime (~> 0.5) + GEM remote: https://gem.coop/ specs: @@ -27,11 +283,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -40,6 +291,7 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-x86_64-linux) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -103,6 +355,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -131,15 +385,8 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) - nokogiri (1.19.4-aarch64-linux-gnu) - racc (~> 1.4) - nokogiri (1.19.4-aarch64-linux-musl) - racc (~> 1.4) - nokogiri (1.19.4-arm64-darwin) - racc (~> 1.4) - nokogiri (1.19.4-x86_64-darwin) - racc (~> 1.4) nokogiri (1.19.4-x86_64-linux-gnu) racc (~> 1.4) nokogiri (1.19.4-x86_64-linux-musl) @@ -267,13 +514,11 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -326,11 +571,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -366,34 +611,52 @@ GEM zlib (3.2.3) PLATFORMS - aarch64-linux - aarch64-linux-gnu - aarch64-linux-musl - arm64-darwin - x86_64-darwin + x86_64-linux x86_64-linux-gnu x86_64-linux-musl DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -402,31 +665,49 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-x86_64-linux) + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -434,6 +715,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -446,24 +728,28 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 - 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 - nokogiri (1.19.4-x86_64-darwin) sha256=7fd17057d3e1f00e9954a74b3cd76595d3d4a5ef233b7ed9599047c204f70551 nokogiri (1.19.4-x86_64-linux-gnu) sha256=379fae440b28915e3f19d752ce2dcf8465ed2b2fbefd2a7ca0dd497bc981a06a nokogiri (1.19.4-x86_64-linux-musl) sha256=17dfb7c1fa194ae02fbf7c51a7afc8d278045ab3fdacfd86f91d02d7b274470b nomono (1.0.8) sha256=bf4b9b426cbf216ab17b70db474f691b8ae1f1e29de8db4b0ecd405e6e7e1c80 @@ -473,11 +759,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -485,6 +774,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -516,6 +806,8 @@ 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.0) + service_actor (3.9.4) silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -524,6 +816,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -537,14 +830,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) + toml-merge (7.1.0) + toml-rb (4.2.0) tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -552,6 +850,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 54fbd8faf190729467d396dfd7932dfb0e4958ef Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:44:10 -0600 Subject: [PATCH 258/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-merge-git/.kettle-drift.lock | 60 +++-- gems/ast-merge-git/Gemfile | 40 ++++ gems/json-merge/Gemfile.lock | 327 +++++++++++++++++++++++++- 3 files changed, 405 insertions(+), 22 deletions(-) diff --git a/gems/ast-merge-git/.kettle-drift.lock b/gems/ast-merge-git/.kettle-drift.lock index 3aa07e7e9..09df60df7 100644 --- a/gems/ast-merge-git/.kettle-drift.lock +++ b/gems/ast-merge-git/.kettle-drift.lock @@ -9,7 +9,8 @@ 200, 240, 280, - 320 + 320, + 360 ] } ], @@ -23,7 +24,8 @@ 211, 251, 291, - 331 + 331, + 371 ] } ], @@ -37,7 +39,8 @@ 201, 241, 281, - 321 + 321, + 361 ] } ], @@ -51,7 +54,8 @@ 213, 253, 293, - 333 + 333, + 373 ] } ], @@ -65,7 +69,8 @@ 216, 256, 296, - 336 + 336, + 376 ] } ], @@ -79,7 +84,8 @@ 202, 242, 282, - 322 + 322, + 362 ] } ], @@ -94,7 +100,8 @@ 220, 260, 300, - 340 + 340, + 380 ] } ], @@ -108,7 +115,8 @@ 221, 261, 301, - 341 + 341, + 381 ] } ], @@ -123,7 +131,8 @@ 207, 247, 287, - 327 + 327, + 367 ] } ], @@ -137,7 +146,8 @@ 230, 270, 310, - 350 + 350, + 390 ] } ], @@ -152,7 +162,8 @@ 199, 239, 279, - 319 + 319, + 359 ] } ], @@ -167,7 +178,8 @@ 229, 269, 309, - 349 + 349, + 389 ] } ], @@ -181,7 +193,8 @@ 205, 245, 285, - 325 + 325, + 365 ] } ], @@ -196,7 +209,8 @@ 212, 252, 292, - 332 + 332, + 372 ] } ], @@ -211,7 +225,8 @@ 208, 248, 288, - 328 + 328, + 368 ] } ], @@ -225,7 +240,8 @@ 206, 246, 286, - 326 + 326, + 366 ] } ], @@ -239,7 +255,8 @@ 223, 263, 303, - 343 + 343, + 383 ] } ], @@ -253,7 +270,8 @@ 222, 262, 302, - 342 + 342, + 382 ] } ], @@ -267,7 +285,8 @@ 217, 257, 297, - 337 + 337, + 377 ] } ], @@ -281,7 +300,8 @@ 226, 266, 306, - 346 + 346, + 386 ] } ], diff --git a/gems/ast-merge-git/Gemfile b/gems/ast-merge-git/Gemfile index 237d7e166..105394aa3 100644 --- a/gems/ast-merge-git/Gemfile +++ b/gems/ast-merge-git/Gemfile @@ -352,6 +352,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/json-merge/Gemfile.lock b/gems/json-merge/Gemfile.lock index 65c1bae1f..a683d58ae 100644 --- a/gems/json-merge/Gemfile.lock +++ b/gems/json-merge/Gemfile.lock @@ -7,7 +7,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -16,7 +48,193 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -24,6 +242,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -50,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -113,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -141,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -280,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -332,6 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -378,24 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -404,32 +682,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -437,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -449,20 +750,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -477,10 +785,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -488,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -515,9 +828,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -526,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -539,14 +856,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -554,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 23f9bd2a6a1ea925361d807970a7cf59a16f52e7 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:44:48 -0600 Subject: [PATCH 259/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-merge-git/Gemfile.lock | 332 +++++++++++++++++++++++++++- gems/plain-merge/.kettle-drift.lock | 60 +++-- gems/plain-merge/Gemfile | 40 ++++ gems/plain-merge/Gemfile.lock | 327 +-------------------------- 4 files changed, 407 insertions(+), 352 deletions(-) diff --git a/gems/ast-merge-git/Gemfile.lock b/gems/ast-merge-git/Gemfile.lock index 36a221e10..16d75f3d7 100644 --- a/gems/ast-merge-git/Gemfile.lock +++ b/gems/ast-merge-git/Gemfile.lock @@ -7,7 +7,31 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -16,13 +40,231 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: json-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -49,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -112,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -140,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -279,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -331,11 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -382,25 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -409,32 +682,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -442,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -454,20 +750,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -482,10 +785,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -493,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -520,9 +828,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -531,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -544,14 +856,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -559,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/plain-merge/.kettle-drift.lock b/gems/plain-merge/.kettle-drift.lock index 3aa07e7e9..09df60df7 100644 --- a/gems/plain-merge/.kettle-drift.lock +++ b/gems/plain-merge/.kettle-drift.lock @@ -9,7 +9,8 @@ 200, 240, 280, - 320 + 320, + 360 ] } ], @@ -23,7 +24,8 @@ 211, 251, 291, - 331 + 331, + 371 ] } ], @@ -37,7 +39,8 @@ 201, 241, 281, - 321 + 321, + 361 ] } ], @@ -51,7 +54,8 @@ 213, 253, 293, - 333 + 333, + 373 ] } ], @@ -65,7 +69,8 @@ 216, 256, 296, - 336 + 336, + 376 ] } ], @@ -79,7 +84,8 @@ 202, 242, 282, - 322 + 322, + 362 ] } ], @@ -94,7 +100,8 @@ 220, 260, 300, - 340 + 340, + 380 ] } ], @@ -108,7 +115,8 @@ 221, 261, 301, - 341 + 341, + 381 ] } ], @@ -123,7 +131,8 @@ 207, 247, 287, - 327 + 327, + 367 ] } ], @@ -137,7 +146,8 @@ 230, 270, 310, - 350 + 350, + 390 ] } ], @@ -152,7 +162,8 @@ 199, 239, 279, - 319 + 319, + 359 ] } ], @@ -167,7 +178,8 @@ 229, 269, 309, - 349 + 349, + 389 ] } ], @@ -181,7 +193,8 @@ 205, 245, 285, - 325 + 325, + 365 ] } ], @@ -196,7 +209,8 @@ 212, 252, 292, - 332 + 332, + 372 ] } ], @@ -211,7 +225,8 @@ 208, 248, 288, - 328 + 328, + 368 ] } ], @@ -225,7 +240,8 @@ 206, 246, 286, - 326 + 326, + 366 ] } ], @@ -239,7 +255,8 @@ 223, 263, 303, - 343 + 343, + 383 ] } ], @@ -253,7 +270,8 @@ 222, 262, 302, - 342 + 342, + 382 ] } ], @@ -267,7 +285,8 @@ 217, 257, 297, - 337 + 337, + 377 ] } ], @@ -281,7 +300,8 @@ 226, 266, 306, - 346 + 346, + 386 ] } ], diff --git a/gems/plain-merge/Gemfile b/gems/plain-merge/Gemfile index 816a830b3..6a02f399d 100644 --- a/gems/plain-merge/Gemfile +++ b/gems/plain-merge/Gemfile @@ -352,6 +352,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/plain-merge/Gemfile.lock b/gems/plain-merge/Gemfile.lock index a05995f79..79234d5aa 100644 --- a/gems/plain-merge/Gemfile.lock +++ b/gems/plain-merge/Gemfile.lock @@ -7,39 +7,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -48,193 +16,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -242,29 +24,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -291,12 +50,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -360,8 +113,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -390,7 +141,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -530,8 +280,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -584,11 +332,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -635,45 +378,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -682,54 +404,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -737,7 +437,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -750,27 +449,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -785,14 +476,11 @@ 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.0) plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -800,7 +488,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -828,12 +515,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -842,7 +526,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,19 +539,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +554,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 68c9c585f62f8a7f02f4897c3a723485f9b90cf5 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:45:38 -0600 Subject: [PATCH 260/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/bash-merge/.kettle-drift.lock | 60 ++++-- gems/bash-merge/Gemfile | 40 ++++ gems/bash-merge/Gemfile.lock | 47 +++-- gems/plain-merge/Gemfile.lock | 327 ++++++++++++++++++++++++++++- 4 files changed, 432 insertions(+), 42 deletions(-) diff --git a/gems/bash-merge/.kettle-drift.lock b/gems/bash-merge/.kettle-drift.lock index 98e9f541b..3aa07e7e9 100644 --- a/gems/bash-merge/.kettle-drift.lock +++ b/gems/bash-merge/.kettle-drift.lock @@ -8,7 +8,8 @@ 160, 200, 240, - 280 + 280, + 320 ] } ], @@ -21,7 +22,8 @@ 171, 211, 251, - 291 + 291, + 331 ] } ], @@ -34,7 +36,8 @@ 161, 201, 241, - 281 + 281, + 321 ] } ], @@ -47,7 +50,8 @@ 173, 213, 253, - 293 + 293, + 333 ] } ], @@ -60,7 +64,8 @@ 176, 216, 256, - 296 + 296, + 336 ] } ], @@ -73,7 +78,8 @@ 162, 202, 242, - 282 + 282, + 322 ] } ], @@ -87,7 +93,8 @@ 180, 220, 260, - 300 + 300, + 340 ] } ], @@ -100,7 +107,8 @@ 181, 221, 261, - 301 + 301, + 341 ] } ], @@ -114,7 +122,8 @@ 167, 207, 247, - 287 + 287, + 327 ] } ], @@ -127,7 +136,8 @@ 190, 230, 270, - 310 + 310, + 350 ] } ], @@ -141,7 +151,8 @@ 159, 199, 239, - 279 + 279, + 319 ] } ], @@ -155,7 +166,8 @@ 189, 229, 269, - 309 + 309, + 349 ] } ], @@ -168,7 +180,8 @@ 165, 205, 245, - 285 + 285, + 325 ] } ], @@ -182,7 +195,8 @@ 172, 212, 252, - 292 + 292, + 332 ] } ], @@ -196,7 +210,8 @@ 168, 208, 248, - 288 + 288, + 328 ] } ], @@ -209,7 +224,8 @@ 166, 206, 246, - 286 + 286, + 326 ] } ], @@ -222,7 +238,8 @@ 183, 223, 263, - 303 + 303, + 343 ] } ], @@ -235,7 +252,8 @@ 182, 222, 262, - 302 + 302, + 342 ] } ], @@ -248,7 +266,8 @@ 177, 217, 257, - 297 + 297, + 337 ] } ], @@ -261,7 +280,8 @@ 186, 226, 266, - 306 + 306, + 346 ] } ], diff --git a/gems/bash-merge/Gemfile b/gems/bash-merge/Gemfile index e184161b8..2951cc69d 100644 --- a/gems/bash-merge/Gemfile +++ b/gems/bash-merge/Gemfile @@ -312,6 +312,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/bash-merge/Gemfile.lock b/gems/bash-merge/Gemfile.lock index fad17160e..8e60323d7 100644 --- a/gems/bash-merge/Gemfile.lock +++ b/gems/bash-merge/Gemfile.lock @@ -1,13 +1,3 @@ -GIT - remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a - branch: fix/ruby-parser-api-methods - glob: packages/ruby/*.gemspec - specs: - tree_sitter_language_pack (1.12.5) - rb_sys (>= 0.9, < 0.9.128) - sorbet-runtime (~> 0.5) - PATH remote: . specs: @@ -16,6 +6,31 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby + specs: + tree_sitter_language_pack (1.12.5) + rb_sys (>= 0.9, < 0.9.128) + sorbet-runtime (~> 0.5) + GEM remote: https://gem.coop/ specs: @@ -27,11 +42,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -322,11 +332,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -373,6 +378,7 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.2, >= 3.2.0) + ast-merge! bash-merge! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) @@ -402,6 +408,7 @@ DEPENDENCIES standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) + tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.2, >= 3.2.0) yaml-converter (~> 0.1) diff --git a/gems/plain-merge/Gemfile.lock b/gems/plain-merge/Gemfile.lock index 79234d5aa..a05995f79 100644 --- a/gems/plain-merge/Gemfile.lock +++ b/gems/plain-merge/Gemfile.lock @@ -7,7 +7,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -16,7 +48,193 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -24,6 +242,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -50,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -113,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -141,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -280,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -332,6 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -378,24 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -404,32 +682,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -437,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -449,19 +750,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -476,11 +785,14 @@ 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.0) plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -488,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -515,9 +828,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -526,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -539,14 +856,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -554,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From e4447295ec3f988733687ce491c9a7fcc1f56cea Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:46:34 -0600 Subject: [PATCH 261/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/bash-merge/Gemfile.lock | 327 ++++++++++++++++++++++++++- gems/dotenv-merge/.kettle-drift.lock | 60 +++-- gems/dotenv-merge/Gemfile | 40 ++++ gems/dotenv-merge/Gemfile.lock | 47 ++-- 4 files changed, 432 insertions(+), 42 deletions(-) diff --git a/gems/bash-merge/Gemfile.lock b/gems/bash-merge/Gemfile.lock index 8e60323d7..73b5f4c15 100644 --- a/gems/bash-merge/Gemfile.lock +++ b/gems/bash-merge/Gemfile.lock @@ -7,7 +7,39 @@ PATH version_gem (~> 1.1, >= 1.1.14) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -16,7 +48,193 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -24,6 +242,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -50,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -113,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -141,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -280,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -332,6 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -378,24 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.2, >= 3.2.0) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.3, >= 2.3.7) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -404,34 +682,55 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.2, >= 3.2.0) + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -439,6 +738,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -451,19 +751,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -478,10 +786,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -489,6 +801,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -516,9 +829,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -527,6 +843,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -540,14 +857,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -555,6 +877,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/dotenv-merge/.kettle-drift.lock b/gems/dotenv-merge/.kettle-drift.lock index 98e9f541b..3aa07e7e9 100644 --- a/gems/dotenv-merge/.kettle-drift.lock +++ b/gems/dotenv-merge/.kettle-drift.lock @@ -8,7 +8,8 @@ 160, 200, 240, - 280 + 280, + 320 ] } ], @@ -21,7 +22,8 @@ 171, 211, 251, - 291 + 291, + 331 ] } ], @@ -34,7 +36,8 @@ 161, 201, 241, - 281 + 281, + 321 ] } ], @@ -47,7 +50,8 @@ 173, 213, 253, - 293 + 293, + 333 ] } ], @@ -60,7 +64,8 @@ 176, 216, 256, - 296 + 296, + 336 ] } ], @@ -73,7 +78,8 @@ 162, 202, 242, - 282 + 282, + 322 ] } ], @@ -87,7 +93,8 @@ 180, 220, 260, - 300 + 300, + 340 ] } ], @@ -100,7 +107,8 @@ 181, 221, 261, - 301 + 301, + 341 ] } ], @@ -114,7 +122,8 @@ 167, 207, 247, - 287 + 287, + 327 ] } ], @@ -127,7 +136,8 @@ 190, 230, 270, - 310 + 310, + 350 ] } ], @@ -141,7 +151,8 @@ 159, 199, 239, - 279 + 279, + 319 ] } ], @@ -155,7 +166,8 @@ 189, 229, 269, - 309 + 309, + 349 ] } ], @@ -168,7 +180,8 @@ 165, 205, 245, - 285 + 285, + 325 ] } ], @@ -182,7 +195,8 @@ 172, 212, 252, - 292 + 292, + 332 ] } ], @@ -196,7 +210,8 @@ 168, 208, 248, - 288 + 288, + 328 ] } ], @@ -209,7 +224,8 @@ 166, 206, 246, - 286 + 286, + 326 ] } ], @@ -222,7 +238,8 @@ 183, 223, 263, - 303 + 303, + 343 ] } ], @@ -235,7 +252,8 @@ 182, 222, 262, - 302 + 302, + 342 ] } ], @@ -248,7 +266,8 @@ 177, 217, 257, - 297 + 297, + 337 ] } ], @@ -261,7 +280,8 @@ 186, 226, 266, - 306 + 306, + 346 ] } ], diff --git a/gems/dotenv-merge/Gemfile b/gems/dotenv-merge/Gemfile index eb7423aa0..6db2461e9 100644 --- a/gems/dotenv-merge/Gemfile +++ b/gems/dotenv-merge/Gemfile @@ -312,6 +312,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/dotenv-merge/Gemfile.lock b/gems/dotenv-merge/Gemfile.lock index 8323ae68e..0b28e5db7 100644 --- a/gems/dotenv-merge/Gemfile.lock +++ b/gems/dotenv-merge/Gemfile.lock @@ -1,13 +1,3 @@ -GIT - remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a - branch: fix/ruby-parser-api-methods - glob: packages/ruby/*.gemspec - specs: - tree_sitter_language_pack (1.12.5) - rb_sys (>= 0.9, < 0.9.128) - sorbet-runtime (~> 0.5) - PATH remote: . specs: @@ -16,6 +6,31 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby + specs: + tree_sitter_language_pack (1.12.5) + rb_sys (>= 0.9, < 0.9.128) + sorbet-runtime (~> 0.5) + GEM remote: https://gem.coop/ specs: @@ -27,11 +42,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -322,11 +332,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -373,6 +378,7 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.2, >= 3.2.0) + ast-merge! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) debug (>= 1.1) @@ -402,6 +408,7 @@ DEPENDENCIES standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) + tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.2, >= 3.2.0) yaml-converter (~> 0.1) From 2f2c1c2de892afe138facfa254408a354944b23c Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:47:34 -0600 Subject: [PATCH 262/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/dotenv-merge/Gemfile.lock | 327 +++++++++++++++++++++++++++++- gems/rbs-merge/.kettle-drift.lock | 60 ++++-- gems/rbs-merge/Gemfile | 40 ++++ gems/rbs-merge/Gemfile.lock | 47 +++-- 4 files changed, 432 insertions(+), 42 deletions(-) diff --git a/gems/dotenv-merge/Gemfile.lock b/gems/dotenv-merge/Gemfile.lock index 0b28e5db7..ac8f78052 100644 --- a/gems/dotenv-merge/Gemfile.lock +++ b/gems/dotenv-merge/Gemfile.lock @@ -7,7 +7,39 @@ PATH version_gem (~> 1.1, >= 1.1.14) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -16,7 +48,193 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -24,6 +242,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -50,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -113,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -141,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -280,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -332,6 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -378,24 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.2, >= 3.2.0) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.3, >= 2.3.7) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -404,33 +682,55 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.2, >= 3.2.0) + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -451,19 +751,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -478,10 +786,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -489,6 +801,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -516,9 +829,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -527,6 +843,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -540,14 +857,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -555,6 +877,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/rbs-merge/.kettle-drift.lock b/gems/rbs-merge/.kettle-drift.lock index 98e9f541b..3aa07e7e9 100644 --- a/gems/rbs-merge/.kettle-drift.lock +++ b/gems/rbs-merge/.kettle-drift.lock @@ -8,7 +8,8 @@ 160, 200, 240, - 280 + 280, + 320 ] } ], @@ -21,7 +22,8 @@ 171, 211, 251, - 291 + 291, + 331 ] } ], @@ -34,7 +36,8 @@ 161, 201, 241, - 281 + 281, + 321 ] } ], @@ -47,7 +50,8 @@ 173, 213, 253, - 293 + 293, + 333 ] } ], @@ -60,7 +64,8 @@ 176, 216, 256, - 296 + 296, + 336 ] } ], @@ -73,7 +78,8 @@ 162, 202, 242, - 282 + 282, + 322 ] } ], @@ -87,7 +93,8 @@ 180, 220, 260, - 300 + 300, + 340 ] } ], @@ -100,7 +107,8 @@ 181, 221, 261, - 301 + 301, + 341 ] } ], @@ -114,7 +122,8 @@ 167, 207, 247, - 287 + 287, + 327 ] } ], @@ -127,7 +136,8 @@ 190, 230, 270, - 310 + 310, + 350 ] } ], @@ -141,7 +151,8 @@ 159, 199, 239, - 279 + 279, + 319 ] } ], @@ -155,7 +166,8 @@ 189, 229, 269, - 309 + 309, + 349 ] } ], @@ -168,7 +180,8 @@ 165, 205, 245, - 285 + 285, + 325 ] } ], @@ -182,7 +195,8 @@ 172, 212, 252, - 292 + 292, + 332 ] } ], @@ -196,7 +210,8 @@ 168, 208, 248, - 288 + 288, + 328 ] } ], @@ -209,7 +224,8 @@ 166, 206, 246, - 286 + 286, + 326 ] } ], @@ -222,7 +238,8 @@ 183, 223, 263, - 303 + 303, + 343 ] } ], @@ -235,7 +252,8 @@ 182, 222, 262, - 302 + 302, + 342 ] } ], @@ -248,7 +266,8 @@ 177, 217, 257, - 297 + 297, + 337 ] } ], @@ -261,7 +280,8 @@ 186, 226, 266, - 306 + 306, + 346 ] } ], diff --git a/gems/rbs-merge/Gemfile b/gems/rbs-merge/Gemfile index 024bd7458..e4b7b6dcd 100644 --- a/gems/rbs-merge/Gemfile +++ b/gems/rbs-merge/Gemfile @@ -312,6 +312,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/rbs-merge/Gemfile.lock b/gems/rbs-merge/Gemfile.lock index 927e7294a..7b667854e 100644 --- a/gems/rbs-merge/Gemfile.lock +++ b/gems/rbs-merge/Gemfile.lock @@ -1,13 +1,3 @@ -GIT - remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a - branch: fix/ruby-parser-api-methods - glob: packages/ruby/*.gemspec - specs: - tree_sitter_language_pack (1.12.5) - rb_sys (>= 0.9, < 0.9.128) - sorbet-runtime (~> 0.5) - PATH remote: . specs: @@ -17,6 +7,31 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby + specs: + tree_sitter_language_pack (1.12.5) + rb_sys (>= 0.9, < 0.9.128) + sorbet-runtime (~> 0.5) + GEM remote: https://gem.coop/ specs: @@ -28,11 +43,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -321,11 +331,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -372,6 +377,7 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.2, >= 3.2.0) + ast-merge! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) debug (>= 1.1) @@ -401,6 +407,7 @@ DEPENDENCIES standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) + tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.2, >= 3.2.0) yaml-converter (~> 0.1) From 76e657e5e450b65200138c4df7e702374dcedb46 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:48:19 -0600 Subject: [PATCH 263/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/rbs-merge/Gemfile.lock | 324 ++++++++++++++++++++++++++++- gems/yaml-merge/.kettle-drift.lock | 60 ++++-- gems/yaml-merge/Gemfile | 40 ++++ gems/yaml-merge/Gemfile.lock | 47 +++-- 4 files changed, 429 insertions(+), 42 deletions(-) diff --git a/gems/rbs-merge/Gemfile.lock b/gems/rbs-merge/Gemfile.lock index 7b667854e..7576f4ca6 100644 --- a/gems/rbs-merge/Gemfile.lock +++ b/gems/rbs-merge/Gemfile.lock @@ -8,7 +8,39 @@ PATH version_gem (~> 1.1, >= 1.1.14) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -17,7 +49,192 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -25,6 +242,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -51,6 +291,11 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -114,6 +359,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -142,6 +389,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -279,6 +527,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -331,6 +581,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -377,21 +632,42 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.2, >= 3.2.0) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.3, >= 2.3.7) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) rbs-merge! @@ -403,33 +679,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.2, >= 3.2.0) + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -437,6 +734,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -449,19 +747,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -475,10 +781,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -514,9 +824,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -525,6 +838,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -538,14 +852,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -553,6 +872,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/yaml-merge/.kettle-drift.lock b/gems/yaml-merge/.kettle-drift.lock index 98e9f541b..3aa07e7e9 100644 --- a/gems/yaml-merge/.kettle-drift.lock +++ b/gems/yaml-merge/.kettle-drift.lock @@ -8,7 +8,8 @@ 160, 200, 240, - 280 + 280, + 320 ] } ], @@ -21,7 +22,8 @@ 171, 211, 251, - 291 + 291, + 331 ] } ], @@ -34,7 +36,8 @@ 161, 201, 241, - 281 + 281, + 321 ] } ], @@ -47,7 +50,8 @@ 173, 213, 253, - 293 + 293, + 333 ] } ], @@ -60,7 +64,8 @@ 176, 216, 256, - 296 + 296, + 336 ] } ], @@ -73,7 +78,8 @@ 162, 202, 242, - 282 + 282, + 322 ] } ], @@ -87,7 +93,8 @@ 180, 220, 260, - 300 + 300, + 340 ] } ], @@ -100,7 +107,8 @@ 181, 221, 261, - 301 + 301, + 341 ] } ], @@ -114,7 +122,8 @@ 167, 207, 247, - 287 + 287, + 327 ] } ], @@ -127,7 +136,8 @@ 190, 230, 270, - 310 + 310, + 350 ] } ], @@ -141,7 +151,8 @@ 159, 199, 239, - 279 + 279, + 319 ] } ], @@ -155,7 +166,8 @@ 189, 229, 269, - 309 + 309, + 349 ] } ], @@ -168,7 +180,8 @@ 165, 205, 245, - 285 + 285, + 325 ] } ], @@ -182,7 +195,8 @@ 172, 212, 252, - 292 + 292, + 332 ] } ], @@ -196,7 +210,8 @@ 168, 208, 248, - 288 + 288, + 328 ] } ], @@ -209,7 +224,8 @@ 166, 206, 246, - 286 + 286, + 326 ] } ], @@ -222,7 +238,8 @@ 183, 223, 263, - 303 + 303, + 343 ] } ], @@ -235,7 +252,8 @@ 182, 222, 262, - 302 + 302, + 342 ] } ], @@ -248,7 +266,8 @@ 177, 217, 257, - 297 + 297, + 337 ] } ], @@ -261,7 +280,8 @@ 186, 226, 266, - 306 + 306, + 346 ] } ], diff --git a/gems/yaml-merge/Gemfile b/gems/yaml-merge/Gemfile index 94c21b84d..9ea86df66 100644 --- a/gems/yaml-merge/Gemfile +++ b/gems/yaml-merge/Gemfile @@ -312,6 +312,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/yaml-merge/Gemfile.lock b/gems/yaml-merge/Gemfile.lock index f2364f96c..7657e990e 100644 --- a/gems/yaml-merge/Gemfile.lock +++ b/gems/yaml-merge/Gemfile.lock @@ -1,13 +1,3 @@ -GIT - remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a - branch: fix/ruby-parser-api-methods - glob: packages/ruby/*.gemspec - specs: - tree_sitter_language_pack (1.12.5) - rb_sys (>= 0.9, < 0.9.128) - sorbet-runtime (~> 0.5) - PATH remote: . specs: @@ -16,6 +6,31 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby + specs: + tree_sitter_language_pack (1.12.5) + rb_sys (>= 0.9, < 0.9.128) + sorbet-runtime (~> 0.5) + GEM remote: https://gem.coop/ specs: @@ -27,11 +42,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -322,11 +332,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -373,6 +378,7 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + ast-merge! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) debug (>= 1.1) @@ -401,6 +407,7 @@ DEPENDENCIES standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + tree_haver! tree_sitter_language_pack! yaml-converter (~> 0.1) yaml-merge! From 55cf3ef3fd6dbc1eb87f6ec8b5b8a72c04bc10a2 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:48:57 -0600 Subject: [PATCH 264/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/toml-merge/.kettle-drift.lock | 60 ++++-- gems/toml-merge/Gemfile | 40 ++++ gems/toml-merge/Gemfile.lock | 47 +++-- gems/yaml-merge/Gemfile.lock | 327 ++++++++++++++++++++++++++++- 4 files changed, 432 insertions(+), 42 deletions(-) diff --git a/gems/toml-merge/.kettle-drift.lock b/gems/toml-merge/.kettle-drift.lock index 98e9f541b..3aa07e7e9 100644 --- a/gems/toml-merge/.kettle-drift.lock +++ b/gems/toml-merge/.kettle-drift.lock @@ -8,7 +8,8 @@ 160, 200, 240, - 280 + 280, + 320 ] } ], @@ -21,7 +22,8 @@ 171, 211, 251, - 291 + 291, + 331 ] } ], @@ -34,7 +36,8 @@ 161, 201, 241, - 281 + 281, + 321 ] } ], @@ -47,7 +50,8 @@ 173, 213, 253, - 293 + 293, + 333 ] } ], @@ -60,7 +64,8 @@ 176, 216, 256, - 296 + 296, + 336 ] } ], @@ -73,7 +78,8 @@ 162, 202, 242, - 282 + 282, + 322 ] } ], @@ -87,7 +93,8 @@ 180, 220, 260, - 300 + 300, + 340 ] } ], @@ -100,7 +107,8 @@ 181, 221, 261, - 301 + 301, + 341 ] } ], @@ -114,7 +122,8 @@ 167, 207, 247, - 287 + 287, + 327 ] } ], @@ -127,7 +136,8 @@ 190, 230, 270, - 310 + 310, + 350 ] } ], @@ -141,7 +151,8 @@ 159, 199, 239, - 279 + 279, + 319 ] } ], @@ -155,7 +166,8 @@ 189, 229, 269, - 309 + 309, + 349 ] } ], @@ -168,7 +180,8 @@ 165, 205, 245, - 285 + 285, + 325 ] } ], @@ -182,7 +195,8 @@ 172, 212, 252, - 292 + 292, + 332 ] } ], @@ -196,7 +210,8 @@ 168, 208, 248, - 288 + 288, + 328 ] } ], @@ -209,7 +224,8 @@ 166, 206, 246, - 286 + 286, + 326 ] } ], @@ -222,7 +238,8 @@ 183, 223, 263, - 303 + 303, + 343 ] } ], @@ -235,7 +252,8 @@ 182, 222, 262, - 302 + 302, + 342 ] } ], @@ -248,7 +266,8 @@ 177, 217, 257, - 297 + 297, + 337 ] } ], @@ -261,7 +280,8 @@ 186, 226, 266, - 306 + 306, + 346 ] } ], diff --git a/gems/toml-merge/Gemfile b/gems/toml-merge/Gemfile index 4708c33ac..cf35fc2bf 100644 --- a/gems/toml-merge/Gemfile +++ b/gems/toml-merge/Gemfile @@ -312,6 +312,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/toml-merge/Gemfile.lock b/gems/toml-merge/Gemfile.lock index 1a355a34c..724ef5a6b 100644 --- a/gems/toml-merge/Gemfile.lock +++ b/gems/toml-merge/Gemfile.lock @@ -1,13 +1,3 @@ -GIT - remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a - branch: fix/ruby-parser-api-methods - glob: packages/ruby/*.gemspec - specs: - tree_sitter_language_pack (1.12.5) - rb_sys (>= 0.9, < 0.9.128) - sorbet-runtime (~> 0.5) - PATH remote: . specs: @@ -16,6 +6,31 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby + specs: + tree_sitter_language_pack (1.12.5) + rb_sys (>= 0.9, < 0.9.128) + sorbet-runtime (~> 0.5) + GEM remote: https://gem.coop/ specs: @@ -27,11 +42,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -322,11 +332,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -373,6 +378,7 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + ast-merge! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) debug (>= 1.1) @@ -402,6 +408,7 @@ DEPENDENCIES stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! + tree_haver! tree_sitter_language_pack! yaml-converter (~> 0.1) yard (~> 0.9, >= 0.9.44) diff --git a/gems/yaml-merge/Gemfile.lock b/gems/yaml-merge/Gemfile.lock index 7657e990e..c03d4ba4d 100644 --- a/gems/yaml-merge/Gemfile.lock +++ b/gems/yaml-merge/Gemfile.lock @@ -7,7 +7,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -16,7 +48,201 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -24,6 +250,21 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -50,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -113,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -141,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -280,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -332,6 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -378,23 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -403,12 +682,17 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) yaml-merge! yard (~> 0.9, >= 0.9.44) @@ -417,19 +701,35 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -437,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -449,19 +750,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -476,10 +785,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -487,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -514,9 +828,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -525,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -538,10 +856,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -554,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 07236330eb27cc45c66c609fcfb9451328ab5eaf Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:49:50 -0600 Subject: [PATCH 265/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ruby-merge/.kettle-drift.lock | 60 ++++-- gems/ruby-merge/Gemfile | 40 ++++ gems/ruby-merge/Gemfile.lock | 47 +++-- gems/toml-merge/Gemfile.lock | 327 ++++++++++++++++++++++++++++- 4 files changed, 432 insertions(+), 42 deletions(-) diff --git a/gems/ruby-merge/.kettle-drift.lock b/gems/ruby-merge/.kettle-drift.lock index 98e9f541b..3aa07e7e9 100644 --- a/gems/ruby-merge/.kettle-drift.lock +++ b/gems/ruby-merge/.kettle-drift.lock @@ -8,7 +8,8 @@ 160, 200, 240, - 280 + 280, + 320 ] } ], @@ -21,7 +22,8 @@ 171, 211, 251, - 291 + 291, + 331 ] } ], @@ -34,7 +36,8 @@ 161, 201, 241, - 281 + 281, + 321 ] } ], @@ -47,7 +50,8 @@ 173, 213, 253, - 293 + 293, + 333 ] } ], @@ -60,7 +64,8 @@ 176, 216, 256, - 296 + 296, + 336 ] } ], @@ -73,7 +78,8 @@ 162, 202, 242, - 282 + 282, + 322 ] } ], @@ -87,7 +93,8 @@ 180, 220, 260, - 300 + 300, + 340 ] } ], @@ -100,7 +107,8 @@ 181, 221, 261, - 301 + 301, + 341 ] } ], @@ -114,7 +122,8 @@ 167, 207, 247, - 287 + 287, + 327 ] } ], @@ -127,7 +136,8 @@ 190, 230, 270, - 310 + 310, + 350 ] } ], @@ -141,7 +151,8 @@ 159, 199, 239, - 279 + 279, + 319 ] } ], @@ -155,7 +166,8 @@ 189, 229, 269, - 309 + 309, + 349 ] } ], @@ -168,7 +180,8 @@ 165, 205, 245, - 285 + 285, + 325 ] } ], @@ -182,7 +195,8 @@ 172, 212, 252, - 292 + 292, + 332 ] } ], @@ -196,7 +210,8 @@ 168, 208, 248, - 288 + 288, + 328 ] } ], @@ -209,7 +224,8 @@ 166, 206, 246, - 286 + 286, + 326 ] } ], @@ -222,7 +238,8 @@ 183, 223, 263, - 303 + 303, + 343 ] } ], @@ -235,7 +252,8 @@ 182, 222, 262, - 302 + 302, + 342 ] } ], @@ -248,7 +266,8 @@ 177, 217, 257, - 297 + 297, + 337 ] } ], @@ -261,7 +280,8 @@ 186, 226, 266, - 306 + 306, + 346 ] } ], diff --git a/gems/ruby-merge/Gemfile b/gems/ruby-merge/Gemfile index 1c77339e9..f454fd88f 100644 --- a/gems/ruby-merge/Gemfile +++ b/gems/ruby-merge/Gemfile @@ -312,6 +312,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/ruby-merge/Gemfile.lock b/gems/ruby-merge/Gemfile.lock index 06cd06678..21d7ee564 100644 --- a/gems/ruby-merge/Gemfile.lock +++ b/gems/ruby-merge/Gemfile.lock @@ -1,13 +1,3 @@ -GIT - remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a - branch: fix/ruby-parser-api-methods - glob: packages/ruby/*.gemspec - specs: - tree_sitter_language_pack (1.12.5) - rb_sys (>= 0.9, < 0.9.128) - sorbet-runtime (~> 0.5) - PATH remote: . specs: @@ -16,6 +6,31 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby + specs: + tree_sitter_language_pack (1.12.5) + rb_sys (>= 0.9, < 0.9.128) + sorbet-runtime (~> 0.5) + GEM remote: https://gem.coop/ specs: @@ -27,11 +42,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -322,11 +332,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -373,6 +378,7 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + ast-merge! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) debug (>= 1.1) @@ -402,6 +408,7 @@ DEPENDENCIES standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + tree_haver! tree_sitter_language_pack! yaml-converter (~> 0.1) yard (~> 0.9, >= 0.9.44) diff --git a/gems/toml-merge/Gemfile.lock b/gems/toml-merge/Gemfile.lock index 724ef5a6b..fa7927949 100644 --- a/gems/toml-merge/Gemfile.lock +++ b/gems/toml-merge/Gemfile.lock @@ -7,7 +7,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -16,7 +48,193 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -24,6 +242,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -50,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -113,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -141,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -280,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -332,6 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -378,23 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -403,33 +682,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -437,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -449,19 +750,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -476,10 +785,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -487,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -514,9 +828,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -525,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -538,15 +856,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -554,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From c842c6fda9f2606d6c88ca8cfcb4897a32203f01 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:50:29 -0600 Subject: [PATCH 266/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/go-merge/.kettle-drift.lock | 60 ++++-- gems/go-merge/Gemfile | 40 ++++ gems/go-merge/Gemfile.lock | 47 +++-- gems/ruby-merge/Gemfile.lock | 327 ++++++++++++++++++++++++++++++- 4 files changed, 432 insertions(+), 42 deletions(-) diff --git a/gems/go-merge/.kettle-drift.lock b/gems/go-merge/.kettle-drift.lock index 98e9f541b..3aa07e7e9 100644 --- a/gems/go-merge/.kettle-drift.lock +++ b/gems/go-merge/.kettle-drift.lock @@ -8,7 +8,8 @@ 160, 200, 240, - 280 + 280, + 320 ] } ], @@ -21,7 +22,8 @@ 171, 211, 251, - 291 + 291, + 331 ] } ], @@ -34,7 +36,8 @@ 161, 201, 241, - 281 + 281, + 321 ] } ], @@ -47,7 +50,8 @@ 173, 213, 253, - 293 + 293, + 333 ] } ], @@ -60,7 +64,8 @@ 176, 216, 256, - 296 + 296, + 336 ] } ], @@ -73,7 +78,8 @@ 162, 202, 242, - 282 + 282, + 322 ] } ], @@ -87,7 +93,8 @@ 180, 220, 260, - 300 + 300, + 340 ] } ], @@ -100,7 +107,8 @@ 181, 221, 261, - 301 + 301, + 341 ] } ], @@ -114,7 +122,8 @@ 167, 207, 247, - 287 + 287, + 327 ] } ], @@ -127,7 +136,8 @@ 190, 230, 270, - 310 + 310, + 350 ] } ], @@ -141,7 +151,8 @@ 159, 199, 239, - 279 + 279, + 319 ] } ], @@ -155,7 +166,8 @@ 189, 229, 269, - 309 + 309, + 349 ] } ], @@ -168,7 +180,8 @@ 165, 205, 245, - 285 + 285, + 325 ] } ], @@ -182,7 +195,8 @@ 172, 212, 252, - 292 + 292, + 332 ] } ], @@ -196,7 +210,8 @@ 168, 208, 248, - 288 + 288, + 328 ] } ], @@ -209,7 +224,8 @@ 166, 206, 246, - 286 + 286, + 326 ] } ], @@ -222,7 +238,8 @@ 183, 223, 263, - 303 + 303, + 343 ] } ], @@ -235,7 +252,8 @@ 182, 222, 262, - 302 + 302, + 342 ] } ], @@ -248,7 +266,8 @@ 177, 217, 257, - 297 + 297, + 337 ] } ], @@ -261,7 +280,8 @@ 186, 226, 266, - 306 + 306, + 346 ] } ], diff --git a/gems/go-merge/Gemfile b/gems/go-merge/Gemfile index c9b9bfd2d..ddc54f623 100644 --- a/gems/go-merge/Gemfile +++ b/gems/go-merge/Gemfile @@ -312,6 +312,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/go-merge/Gemfile.lock b/gems/go-merge/Gemfile.lock index c7dbff1d4..8be383cac 100644 --- a/gems/go-merge/Gemfile.lock +++ b/gems/go-merge/Gemfile.lock @@ -1,13 +1,3 @@ -GIT - remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a - branch: fix/ruby-parser-api-methods - glob: packages/ruby/*.gemspec - specs: - tree_sitter_language_pack (1.12.5) - rb_sys (>= 0.9, < 0.9.128) - sorbet-runtime (~> 0.5) - PATH remote: . specs: @@ -16,6 +6,31 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby + specs: + tree_sitter_language_pack (1.12.5) + rb_sys (>= 0.9, < 0.9.128) + sorbet-runtime (~> 0.5) + GEM remote: https://gem.coop/ specs: @@ -27,11 +42,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -322,11 +332,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -373,6 +378,7 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + ast-merge! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) debug (>= 1.1) @@ -402,6 +408,7 @@ DEPENDENCIES standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + tree_haver! tree_sitter_language_pack! yaml-converter (~> 0.1) yard (~> 0.9, >= 0.9.44) diff --git a/gems/ruby-merge/Gemfile.lock b/gems/ruby-merge/Gemfile.lock index 21d7ee564..0a750d5c1 100644 --- a/gems/ruby-merge/Gemfile.lock +++ b/gems/ruby-merge/Gemfile.lock @@ -7,7 +7,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -16,7 +48,193 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -24,6 +242,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -50,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -113,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -141,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -280,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -332,6 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -378,23 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -405,31 +684,52 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0.0) ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -437,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -449,19 +750,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -476,10 +785,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -487,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -518,6 +832,8 @@ 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -526,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -539,14 +856,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -554,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From beffd6fce9470dde55e8e3d9b2a3de89b2194675 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:51:08 -0600 Subject: [PATCH 267/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/go-merge/Gemfile.lock | 327 ++++++++++++++++++++++++++++- gems/rust-merge/.kettle-drift.lock | 60 ++++-- gems/rust-merge/Gemfile | 40 ++++ gems/rust-merge/Gemfile.lock | 47 +++-- 4 files changed, 432 insertions(+), 42 deletions(-) diff --git a/gems/go-merge/Gemfile.lock b/gems/go-merge/Gemfile.lock index 8be383cac..5354cf499 100644 --- a/gems/go-merge/Gemfile.lock +++ b/gems/go-merge/Gemfile.lock @@ -7,7 +7,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -16,7 +48,193 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -24,6 +242,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -50,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -113,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -141,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -280,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -332,6 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -378,24 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -404,32 +682,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -437,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -454,15 +755,22 @@ CHECKSUMS io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -477,10 +785,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -488,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -515,9 +828,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -526,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -539,14 +856,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -554,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/rust-merge/.kettle-drift.lock b/gems/rust-merge/.kettle-drift.lock index 98e9f541b..3aa07e7e9 100644 --- a/gems/rust-merge/.kettle-drift.lock +++ b/gems/rust-merge/.kettle-drift.lock @@ -8,7 +8,8 @@ 160, 200, 240, - 280 + 280, + 320 ] } ], @@ -21,7 +22,8 @@ 171, 211, 251, - 291 + 291, + 331 ] } ], @@ -34,7 +36,8 @@ 161, 201, 241, - 281 + 281, + 321 ] } ], @@ -47,7 +50,8 @@ 173, 213, 253, - 293 + 293, + 333 ] } ], @@ -60,7 +64,8 @@ 176, 216, 256, - 296 + 296, + 336 ] } ], @@ -73,7 +78,8 @@ 162, 202, 242, - 282 + 282, + 322 ] } ], @@ -87,7 +93,8 @@ 180, 220, 260, - 300 + 300, + 340 ] } ], @@ -100,7 +107,8 @@ 181, 221, 261, - 301 + 301, + 341 ] } ], @@ -114,7 +122,8 @@ 167, 207, 247, - 287 + 287, + 327 ] } ], @@ -127,7 +136,8 @@ 190, 230, 270, - 310 + 310, + 350 ] } ], @@ -141,7 +151,8 @@ 159, 199, 239, - 279 + 279, + 319 ] } ], @@ -155,7 +166,8 @@ 189, 229, 269, - 309 + 309, + 349 ] } ], @@ -168,7 +180,8 @@ 165, 205, 245, - 285 + 285, + 325 ] } ], @@ -182,7 +195,8 @@ 172, 212, 252, - 292 + 292, + 332 ] } ], @@ -196,7 +210,8 @@ 168, 208, 248, - 288 + 288, + 328 ] } ], @@ -209,7 +224,8 @@ 166, 206, 246, - 286 + 286, + 326 ] } ], @@ -222,7 +238,8 @@ 183, 223, 263, - 303 + 303, + 343 ] } ], @@ -235,7 +252,8 @@ 182, 222, 262, - 302 + 302, + 342 ] } ], @@ -248,7 +266,8 @@ 177, 217, 257, - 297 + 297, + 337 ] } ], @@ -261,7 +280,8 @@ 186, 226, 266, - 306 + 306, + 346 ] } ], diff --git a/gems/rust-merge/Gemfile b/gems/rust-merge/Gemfile index c143d31ed..ee26a176b 100644 --- a/gems/rust-merge/Gemfile +++ b/gems/rust-merge/Gemfile @@ -312,6 +312,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/rust-merge/Gemfile.lock b/gems/rust-merge/Gemfile.lock index 161d64f62..5639fb421 100644 --- a/gems/rust-merge/Gemfile.lock +++ b/gems/rust-merge/Gemfile.lock @@ -1,13 +1,3 @@ -GIT - remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a - branch: fix/ruby-parser-api-methods - glob: packages/ruby/*.gemspec - specs: - tree_sitter_language_pack (1.12.5) - rb_sys (>= 0.9, < 0.9.128) - sorbet-runtime (~> 0.5) - PATH remote: . specs: @@ -16,6 +6,31 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby + specs: + tree_sitter_language_pack (1.12.5) + rb_sys (>= 0.9, < 0.9.128) + sorbet-runtime (~> 0.5) + GEM remote: https://gem.coop/ specs: @@ -27,11 +42,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -322,11 +332,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -373,6 +378,7 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + ast-merge! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) debug (>= 1.1) @@ -402,6 +408,7 @@ DEPENDENCIES standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + tree_haver! tree_sitter_language_pack! yaml-converter (~> 0.1) yard (~> 0.9, >= 0.9.44) From 2e32c4ebb723fbf65d22d06d0c8ac43154ea7f5f Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:51:46 -0600 Subject: [PATCH 268/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/rust-merge/Gemfile.lock | 327 ++++++++++++++++++++++- gems/typescript-merge/.kettle-drift.lock | 60 +++-- gems/typescript-merge/Gemfile | 40 +++ gems/typescript-merge/Gemfile.lock | 47 ++-- 4 files changed, 432 insertions(+), 42 deletions(-) diff --git a/gems/rust-merge/Gemfile.lock b/gems/rust-merge/Gemfile.lock index 5639fb421..53af74d58 100644 --- a/gems/rust-merge/Gemfile.lock +++ b/gems/rust-merge/Gemfile.lock @@ -7,7 +7,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -16,7 +48,193 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -24,6 +242,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -50,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -113,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -141,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -280,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -332,6 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -378,23 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -403,33 +682,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -437,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -449,19 +750,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -476,10 +785,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -487,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -514,10 +828,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -526,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -539,14 +856,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -554,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/typescript-merge/.kettle-drift.lock b/gems/typescript-merge/.kettle-drift.lock index 98e9f541b..3aa07e7e9 100644 --- a/gems/typescript-merge/.kettle-drift.lock +++ b/gems/typescript-merge/.kettle-drift.lock @@ -8,7 +8,8 @@ 160, 200, 240, - 280 + 280, + 320 ] } ], @@ -21,7 +22,8 @@ 171, 211, 251, - 291 + 291, + 331 ] } ], @@ -34,7 +36,8 @@ 161, 201, 241, - 281 + 281, + 321 ] } ], @@ -47,7 +50,8 @@ 173, 213, 253, - 293 + 293, + 333 ] } ], @@ -60,7 +64,8 @@ 176, 216, 256, - 296 + 296, + 336 ] } ], @@ -73,7 +78,8 @@ 162, 202, 242, - 282 + 282, + 322 ] } ], @@ -87,7 +93,8 @@ 180, 220, 260, - 300 + 300, + 340 ] } ], @@ -100,7 +107,8 @@ 181, 221, 261, - 301 + 301, + 341 ] } ], @@ -114,7 +122,8 @@ 167, 207, 247, - 287 + 287, + 327 ] } ], @@ -127,7 +136,8 @@ 190, 230, 270, - 310 + 310, + 350 ] } ], @@ -141,7 +151,8 @@ 159, 199, 239, - 279 + 279, + 319 ] } ], @@ -155,7 +166,8 @@ 189, 229, 269, - 309 + 309, + 349 ] } ], @@ -168,7 +180,8 @@ 165, 205, 245, - 285 + 285, + 325 ] } ], @@ -182,7 +195,8 @@ 172, 212, 252, - 292 + 292, + 332 ] } ], @@ -196,7 +210,8 @@ 168, 208, 248, - 288 + 288, + 328 ] } ], @@ -209,7 +224,8 @@ 166, 206, 246, - 286 + 286, + 326 ] } ], @@ -222,7 +238,8 @@ 183, 223, 263, - 303 + 303, + 343 ] } ], @@ -235,7 +252,8 @@ 182, 222, 262, - 302 + 302, + 342 ] } ], @@ -248,7 +266,8 @@ 177, 217, 257, - 297 + 297, + 337 ] } ], @@ -261,7 +280,8 @@ 186, 226, 266, - 306 + 306, + 346 ] } ], diff --git a/gems/typescript-merge/Gemfile b/gems/typescript-merge/Gemfile index 9477afd06..40a94d761 100644 --- a/gems/typescript-merge/Gemfile +++ b/gems/typescript-merge/Gemfile @@ -312,6 +312,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/typescript-merge/Gemfile.lock b/gems/typescript-merge/Gemfile.lock index 244a6c9de..a38d67430 100644 --- a/gems/typescript-merge/Gemfile.lock +++ b/gems/typescript-merge/Gemfile.lock @@ -1,13 +1,3 @@ -GIT - remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a - branch: fix/ruby-parser-api-methods - glob: packages/ruby/*.gemspec - specs: - tree_sitter_language_pack (1.12.5) - rb_sys (>= 0.9, < 0.9.128) - sorbet-runtime (~> 0.5) - PATH remote: . specs: @@ -16,6 +6,31 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby + specs: + tree_sitter_language_pack (1.12.5) + rb_sys (>= 0.9, < 0.9.128) + sorbet-runtime (~> 0.5) + GEM remote: https://gem.coop/ specs: @@ -27,11 +42,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -322,11 +332,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -373,6 +378,7 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + ast-merge! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) debug (>= 1.1) @@ -401,6 +407,7 @@ DEPENDENCIES standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + tree_haver! tree_sitter_language_pack! typescript-merge! yaml-converter (~> 0.1) From b6ef28276a9f0431f6415af345197e79c0b9c127 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:52:27 -0600 Subject: [PATCH 269/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-template/.kettle-drift.lock | 60 +++-- gems/ast-template/Gemfile | 40 ++++ gems/ast-template/Gemfile.lock | 32 +-- gems/typescript-merge/Gemfile.lock | 327 ++++++++++++++++++++++++++- 4 files changed, 422 insertions(+), 37 deletions(-) diff --git a/gems/ast-template/.kettle-drift.lock b/gems/ast-template/.kettle-drift.lock index 5b373dd8d..309d406e1 100644 --- a/gems/ast-template/.kettle-drift.lock +++ b/gems/ast-template/.kettle-drift.lock @@ -8,7 +8,8 @@ 159, 199, 239, - 279 + 279, + 319 ] } ], @@ -21,7 +22,8 @@ 170, 210, 250, - 290 + 290, + 330 ] } ], @@ -34,7 +36,8 @@ 160, 200, 240, - 280 + 280, + 320 ] } ], @@ -47,7 +50,8 @@ 172, 212, 252, - 292 + 292, + 332 ] } ], @@ -60,7 +64,8 @@ 175, 215, 255, - 295 + 295, + 335 ] } ], @@ -73,7 +78,8 @@ 161, 201, 241, - 281 + 281, + 321 ] } ], @@ -87,7 +93,8 @@ 179, 219, 259, - 299 + 299, + 339 ] } ], @@ -100,7 +107,8 @@ 180, 220, 260, - 300 + 300, + 340 ] } ], @@ -114,7 +122,8 @@ 166, 206, 246, - 286 + 286, + 326 ] } ], @@ -127,7 +136,8 @@ 189, 229, 269, - 309 + 309, + 349 ] } ], @@ -141,7 +151,8 @@ 158, 198, 238, - 278 + 278, + 318 ] } ], @@ -155,7 +166,8 @@ 188, 228, 268, - 308 + 308, + 348 ] } ], @@ -168,7 +180,8 @@ 164, 204, 244, - 284 + 284, + 324 ] } ], @@ -182,7 +195,8 @@ 171, 211, 251, - 291 + 291, + 331 ] } ], @@ -196,7 +210,8 @@ 167, 207, 247, - 287 + 287, + 327 ] } ], @@ -209,7 +224,8 @@ 165, 205, 245, - 285 + 285, + 325 ] } ], @@ -222,7 +238,8 @@ 182, 222, 262, - 302 + 302, + 342 ] } ], @@ -235,7 +252,8 @@ 181, 221, 261, - 301 + 301, + 341 ] } ], @@ -248,7 +266,8 @@ 176, 216, 256, - 296 + 296, + 336 ] } ], @@ -261,7 +280,8 @@ 185, 225, 265, - 305 + 305, + 345 ] } ], diff --git a/gems/ast-template/Gemfile b/gems/ast-template/Gemfile index eeac60475..9677d6903 100644 --- a/gems/ast-template/Gemfile +++ b/gems/ast-template/Gemfile @@ -311,6 +311,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/ast-template/Gemfile.lock b/gems/ast-template/Gemfile.lock index c907b076e..320b06f45 100644 --- a/gems/ast-template/Gemfile.lock +++ b/gems/ast-template/Gemfile.lock @@ -1,13 +1,3 @@ -GIT - remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a - branch: fix/ruby-parser-api-methods - glob: packages/ruby/*.gemspec - specs: - tree_sitter_language_pack (1.12.5) - rb_sys (>= 0.9, < 0.9.128) - sorbet-runtime (~> 0.5) - PATH remote: . specs: @@ -15,6 +5,22 @@ PATH ast-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby + specs: + tree_sitter_language_pack (1.12.5) + rb_sys (>= 0.9, < 0.9.128) + sorbet-runtime (~> 0.5) + GEM remote: https://gem.coop/ specs: @@ -26,11 +32,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -372,6 +373,7 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + ast-merge! ast-template! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) diff --git a/gems/typescript-merge/Gemfile.lock b/gems/typescript-merge/Gemfile.lock index a38d67430..47b5e82c1 100644 --- a/gems/typescript-merge/Gemfile.lock +++ b/gems/typescript-merge/Gemfile.lock @@ -7,7 +7,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -16,7 +48,201 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -24,6 +250,21 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -50,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -113,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -141,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -280,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -332,6 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -378,23 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -403,33 +682,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -437,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -449,19 +750,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -476,10 +785,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -487,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -514,9 +828,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -525,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -538,6 +856,9 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f @@ -547,6 +868,7 @@ CHECKSUMS unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -554,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 54102834abe5ba7e9df019aabac4d87b2783a524 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:53:10 -0600 Subject: [PATCH 270/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-template/Gemfile.lock | 341 ++++++++++++++++++++++++++- gems/binary-merge/.kettle-drift.lock | 60 +++-- gems/binary-merge/Gemfile | 40 ++++ gems/binary-merge/Gemfile.lock | 32 +-- 4 files changed, 432 insertions(+), 41 deletions(-) diff --git a/gems/ast-template/Gemfile.lock b/gems/ast-template/Gemfile.lock index 320b06f45..37099f9b0 100644 --- a/gems/ast-template/Gemfile.lock +++ b/gems/ast-template/Gemfile.lock @@ -6,7 +6,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -14,6 +46,225 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -40,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -103,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -131,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -322,11 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -373,24 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -399,32 +682,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -432,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -444,19 +750,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -471,10 +785,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -482,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -509,9 +828,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -520,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -533,14 +856,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -548,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/binary-merge/.kettle-drift.lock b/gems/binary-merge/.kettle-drift.lock index 309d406e1..aa01ca527 100644 --- a/gems/binary-merge/.kettle-drift.lock +++ b/gems/binary-merge/.kettle-drift.lock @@ -9,7 +9,8 @@ 199, 239, 279, - 319 + 319, + 359 ] } ], @@ -23,7 +24,8 @@ 210, 250, 290, - 330 + 330, + 370 ] } ], @@ -37,7 +39,8 @@ 200, 240, 280, - 320 + 320, + 360 ] } ], @@ -51,7 +54,8 @@ 212, 252, 292, - 332 + 332, + 372 ] } ], @@ -65,7 +69,8 @@ 215, 255, 295, - 335 + 335, + 375 ] } ], @@ -79,7 +84,8 @@ 201, 241, 281, - 321 + 321, + 361 ] } ], @@ -94,7 +100,8 @@ 219, 259, 299, - 339 + 339, + 379 ] } ], @@ -108,7 +115,8 @@ 220, 260, 300, - 340 + 340, + 380 ] } ], @@ -123,7 +131,8 @@ 206, 246, 286, - 326 + 326, + 366 ] } ], @@ -137,7 +146,8 @@ 229, 269, 309, - 349 + 349, + 389 ] } ], @@ -152,7 +162,8 @@ 198, 238, 278, - 318 + 318, + 358 ] } ], @@ -167,7 +178,8 @@ 228, 268, 308, - 348 + 348, + 388 ] } ], @@ -181,7 +193,8 @@ 204, 244, 284, - 324 + 324, + 364 ] } ], @@ -196,7 +209,8 @@ 211, 251, 291, - 331 + 331, + 371 ] } ], @@ -211,7 +225,8 @@ 207, 247, 287, - 327 + 327, + 367 ] } ], @@ -225,7 +240,8 @@ 205, 245, 285, - 325 + 325, + 365 ] } ], @@ -239,7 +255,8 @@ 222, 262, 302, - 342 + 342, + 382 ] } ], @@ -253,7 +270,8 @@ 221, 261, 301, - 341 + 341, + 381 ] } ], @@ -267,7 +285,8 @@ 216, 256, 296, - 336 + 336, + 376 ] } ], @@ -281,7 +300,8 @@ 225, 265, 305, - 345 + 345, + 385 ] } ], diff --git a/gems/binary-merge/Gemfile b/gems/binary-merge/Gemfile index da1848f25..59a6fada5 100644 --- a/gems/binary-merge/Gemfile +++ b/gems/binary-merge/Gemfile @@ -351,6 +351,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/binary-merge/Gemfile.lock b/gems/binary-merge/Gemfile.lock index 01e2a0936..ff5fb4aeb 100644 --- a/gems/binary-merge/Gemfile.lock +++ b/gems/binary-merge/Gemfile.lock @@ -1,13 +1,3 @@ -GIT - remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a - branch: fix/ruby-parser-api-methods - glob: packages/ruby/*.gemspec - specs: - tree_sitter_language_pack (1.12.5) - rb_sys (>= 0.9, < 0.9.128) - sorbet-runtime (~> 0.5) - PATH remote: . specs: @@ -15,6 +5,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby + specs: + tree_sitter_language_pack (1.12.5) + rb_sys (>= 0.9, < 0.9.128) + sorbet-runtime (~> 0.5) + GEM remote: https://gem.coop/ specs: @@ -313,11 +319,6 @@ GEM delegate (~> 0.1) rspec (~> 3.0) timecop (>= 0.7, < 1) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -393,6 +394,7 @@ DEPENDENCIES standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + tree_haver! tree_sitter_language_pack! yaml-converter (~> 0.1) yard (~> 0.9, >= 0.9.44) From 19249bbdb07f7a03002db7667ba160cb1eeec12c Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:53:48 -0600 Subject: [PATCH 271/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/binary-merge/Gemfile.lock | 341 +++++++++++++++++++++++++++++- gems/zip-merge/.kettle-drift.lock | 60 ++++-- gems/zip-merge/Gemfile | 40 ++++ gems/zip-merge/Gemfile.lock | 32 +-- 4 files changed, 437 insertions(+), 36 deletions(-) diff --git a/gems/binary-merge/Gemfile.lock b/gems/binary-merge/Gemfile.lock index ff5fb4aeb..f72edd5cc 100644 --- a/gems/binary-merge/Gemfile.lock +++ b/gems/binary-merge/Gemfile.lock @@ -6,7 +6,235 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -14,6 +242,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -40,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -103,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -131,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -319,6 +581,14 @@ GEM delegate (~> 0.1) rspec (~> 3.0) timecop (>= 0.7, < 1) + token-resolver (2.0.4) + parslet (~> 2.0) + version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -365,23 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -390,32 +682,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) + ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -423,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -435,19 +750,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -462,10 +785,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -473,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -500,9 +828,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -511,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -523,14 +855,20 @@ CHECKSUMS thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73 timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 + token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -538,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/zip-merge/.kettle-drift.lock b/gems/zip-merge/.kettle-drift.lock index 309d406e1..aa01ca527 100644 --- a/gems/zip-merge/.kettle-drift.lock +++ b/gems/zip-merge/.kettle-drift.lock @@ -9,7 +9,8 @@ 199, 239, 279, - 319 + 319, + 359 ] } ], @@ -23,7 +24,8 @@ 210, 250, 290, - 330 + 330, + 370 ] } ], @@ -37,7 +39,8 @@ 200, 240, 280, - 320 + 320, + 360 ] } ], @@ -51,7 +54,8 @@ 212, 252, 292, - 332 + 332, + 372 ] } ], @@ -65,7 +69,8 @@ 215, 255, 295, - 335 + 335, + 375 ] } ], @@ -79,7 +84,8 @@ 201, 241, 281, - 321 + 321, + 361 ] } ], @@ -94,7 +100,8 @@ 219, 259, 299, - 339 + 339, + 379 ] } ], @@ -108,7 +115,8 @@ 220, 260, 300, - 340 + 340, + 380 ] } ], @@ -123,7 +131,8 @@ 206, 246, 286, - 326 + 326, + 366 ] } ], @@ -137,7 +146,8 @@ 229, 269, 309, - 349 + 349, + 389 ] } ], @@ -152,7 +162,8 @@ 198, 238, 278, - 318 + 318, + 358 ] } ], @@ -167,7 +178,8 @@ 228, 268, 308, - 348 + 348, + 388 ] } ], @@ -181,7 +193,8 @@ 204, 244, 284, - 324 + 324, + 364 ] } ], @@ -196,7 +209,8 @@ 211, 251, 291, - 331 + 331, + 371 ] } ], @@ -211,7 +225,8 @@ 207, 247, 287, - 327 + 327, + 367 ] } ], @@ -225,7 +240,8 @@ 205, 245, 285, - 325 + 325, + 365 ] } ], @@ -239,7 +255,8 @@ 222, 262, 302, - 342 + 342, + 382 ] } ], @@ -253,7 +270,8 @@ 221, 261, 301, - 341 + 341, + 381 ] } ], @@ -267,7 +285,8 @@ 216, 256, 296, - 336 + 336, + 376 ] } ], @@ -281,7 +300,8 @@ 225, 265, 305, - 345 + 345, + 385 ] } ], diff --git a/gems/zip-merge/Gemfile b/gems/zip-merge/Gemfile index fb5838621..785feb37f 100644 --- a/gems/zip-merge/Gemfile +++ b/gems/zip-merge/Gemfile @@ -351,6 +351,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/zip-merge/Gemfile.lock b/gems/zip-merge/Gemfile.lock index fe1ac1d76..b4dc2fe8f 100644 --- a/gems/zip-merge/Gemfile.lock +++ b/gems/zip-merge/Gemfile.lock @@ -1,13 +1,3 @@ -GIT - remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a - branch: fix/ruby-parser-api-methods - glob: packages/ruby/*.gemspec - specs: - tree_sitter_language_pack (1.12.5) - rb_sys (>= 0.9, < 0.9.128) - sorbet-runtime (~> 0.5) - PATH remote: . specs: @@ -15,6 +5,22 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby + specs: + tree_sitter_language_pack (1.12.5) + rb_sys (>= 0.9, < 0.9.128) + sorbet-runtime (~> 0.5) + GEM remote: https://gem.coop/ specs: @@ -313,11 +319,6 @@ GEM delegate (~> 0.1) rspec (~> 3.0) timecop (>= 0.7, < 1) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -392,6 +393,7 @@ DEPENDENCIES standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + tree_haver! tree_sitter_language_pack! yaml-converter (~> 0.1) yard (~> 0.9, >= 0.9.44) From 02405af23a936dc5617ef4faec105eb001b00d17 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:54:26 -0600 Subject: [PATCH 272/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/psych-merge/.kettle-drift.lock | 60 +++-- gems/psych-merge/Gemfile | 40 ++++ gems/psych-merge/Gemfile.lock | 60 +++-- gems/zip-merge/Gemfile.lock | 341 +++++++++++++++++++++++++++- 4 files changed, 456 insertions(+), 45 deletions(-) diff --git a/gems/psych-merge/.kettle-drift.lock b/gems/psych-merge/.kettle-drift.lock index 0e09e9847..9a0f4df5b 100644 --- a/gems/psych-merge/.kettle-drift.lock +++ b/gems/psych-merge/.kettle-drift.lock @@ -9,7 +9,8 @@ 201, 241, 281, - 321 + 321, + 361 ] } ], @@ -23,7 +24,8 @@ 212, 252, 292, - 332 + 332, + 372 ] } ], @@ -37,7 +39,8 @@ 202, 242, 282, - 322 + 322, + 362 ] } ], @@ -51,7 +54,8 @@ 214, 254, 294, - 334 + 334, + 374 ] } ], @@ -65,7 +69,8 @@ 217, 257, 297, - 337 + 337, + 377 ] } ], @@ -79,7 +84,8 @@ 203, 243, 283, - 323 + 323, + 363 ] } ], @@ -94,7 +100,8 @@ 221, 261, 301, - 341 + 341, + 381 ] } ], @@ -108,7 +115,8 @@ 222, 262, 302, - 342 + 342, + 382 ] } ], @@ -123,7 +131,8 @@ 208, 248, 288, - 328 + 328, + 368 ] } ], @@ -137,7 +146,8 @@ 231, 271, 311, - 351 + 351, + 391 ] } ], @@ -152,7 +162,8 @@ 200, 240, 280, - 320 + 320, + 360 ] } ], @@ -167,7 +178,8 @@ 230, 270, 310, - 350 + 350, + 390 ] } ], @@ -181,7 +193,8 @@ 206, 246, 286, - 326 + 326, + 366 ] } ], @@ -196,7 +209,8 @@ 213, 253, 293, - 333 + 333, + 373 ] } ], @@ -211,7 +225,8 @@ 209, 249, 289, - 329 + 329, + 369 ] } ], @@ -225,7 +240,8 @@ 207, 247, 287, - 327 + 327, + 367 ] } ], @@ -239,7 +255,8 @@ 224, 264, 304, - 344 + 344, + 384 ] } ], @@ -253,7 +270,8 @@ 223, 263, 303, - 343 + 343, + 383 ] } ], @@ -267,7 +285,8 @@ 218, 258, 298, - 338 + 338, + 378 ] } ], @@ -281,7 +300,8 @@ 227, 267, 307, - 347 + 347, + 387 ] } ], diff --git a/gems/psych-merge/Gemfile b/gems/psych-merge/Gemfile index 225eef797..652f3d167 100644 --- a/gems/psych-merge/Gemfile +++ b/gems/psych-merge/Gemfile @@ -353,6 +353,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/psych-merge/Gemfile.lock b/gems/psych-merge/Gemfile.lock index 86f6dc934..ea9dc8043 100644 --- a/gems/psych-merge/Gemfile.lock +++ b/gems/psych-merge/Gemfile.lock @@ -1,13 +1,3 @@ -GIT - remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a - branch: fix/ruby-parser-api-methods - glob: packages/ruby/*.gemspec - specs: - tree_sitter_language_pack (1.12.5) - rb_sys (>= 0.9, < 0.9.128) - sorbet-runtime (~> 0.5) - PATH remote: . specs: @@ -17,6 +7,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) yaml-merge (= 7.1.0) +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby + specs: + tree_sitter_language_pack (1.12.5) + rb_sys (>= 0.9, < 0.9.128) + sorbet-runtime (~> 0.5) + GEM remote: https://gem.coop/ specs: @@ -28,11 +51,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -323,11 +341,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -342,10 +355,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.13) - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) yard (0.9.45) yard-fence (0.9.6) rdoc (>= 6.11, < 8) @@ -378,6 +387,7 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + ast-merge! benchmark (~> 0.5, >= 0.5.0) bundler-audit (~> 0.9.3) debug (>= 1.1) @@ -407,8 +417,10 @@ DEPENDENCIES standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + tree_haver! tree_sitter_language_pack! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) diff --git a/gems/zip-merge/Gemfile.lock b/gems/zip-merge/Gemfile.lock index b4dc2fe8f..fb79a6746 100644 --- a/gems/zip-merge/Gemfile.lock +++ b/gems/zip-merge/Gemfile.lock @@ -6,7 +6,242 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -14,6 +249,22 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -40,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -103,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -131,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -319,6 +581,14 @@ GEM delegate (~> 0.1) rspec (~> 3.0) timecop (>= 0.7, < 1) + token-resolver (2.0.4) + parslet (~> 2.0) + version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -365,22 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -389,13 +682,19 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) @@ -409,12 +708,28 @@ CHECKSUMS ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) + ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -422,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -434,19 +750,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -461,10 +785,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -472,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -499,9 +828,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -510,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -522,14 +855,20 @@ CHECKSUMS thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73 timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 + token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd From 6f4fed2efbda8c3390b93dd8212236eccf797ad1 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:54:59 -0600 Subject: [PATCH 273/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/citrus-toml-merge/.kettle-drift.lock | 60 ++-- gems/citrus-toml-merge/Gemfile | 40 +++ gems/citrus-toml-merge/Gemfile.lock | 30 +- gems/psych-merge/Gemfile.lock | 318 +++++++++++++++++++++- 4 files changed, 411 insertions(+), 37 deletions(-) diff --git a/gems/citrus-toml-merge/.kettle-drift.lock b/gems/citrus-toml-merge/.kettle-drift.lock index 5b373dd8d..309d406e1 100644 --- a/gems/citrus-toml-merge/.kettle-drift.lock +++ b/gems/citrus-toml-merge/.kettle-drift.lock @@ -8,7 +8,8 @@ 159, 199, 239, - 279 + 279, + 319 ] } ], @@ -21,7 +22,8 @@ 170, 210, 250, - 290 + 290, + 330 ] } ], @@ -34,7 +36,8 @@ 160, 200, 240, - 280 + 280, + 320 ] } ], @@ -47,7 +50,8 @@ 172, 212, 252, - 292 + 292, + 332 ] } ], @@ -60,7 +64,8 @@ 175, 215, 255, - 295 + 295, + 335 ] } ], @@ -73,7 +78,8 @@ 161, 201, 241, - 281 + 281, + 321 ] } ], @@ -87,7 +93,8 @@ 179, 219, 259, - 299 + 299, + 339 ] } ], @@ -100,7 +107,8 @@ 180, 220, 260, - 300 + 300, + 340 ] } ], @@ -114,7 +122,8 @@ 166, 206, 246, - 286 + 286, + 326 ] } ], @@ -127,7 +136,8 @@ 189, 229, 269, - 309 + 309, + 349 ] } ], @@ -141,7 +151,8 @@ 158, 198, 238, - 278 + 278, + 318 ] } ], @@ -155,7 +166,8 @@ 188, 228, 268, - 308 + 308, + 348 ] } ], @@ -168,7 +180,8 @@ 164, 204, 244, - 284 + 284, + 324 ] } ], @@ -182,7 +195,8 @@ 171, 211, 251, - 291 + 291, + 331 ] } ], @@ -196,7 +210,8 @@ 167, 207, 247, - 287 + 287, + 327 ] } ], @@ -209,7 +224,8 @@ 165, 205, 245, - 285 + 285, + 325 ] } ], @@ -222,7 +238,8 @@ 182, 222, 262, - 302 + 302, + 342 ] } ], @@ -235,7 +252,8 @@ 181, 221, 261, - 301 + 301, + 341 ] } ], @@ -248,7 +266,8 @@ 176, 216, 256, - 296 + 296, + 336 ] } ], @@ -261,7 +280,8 @@ 185, 225, 265, - 305 + 305, + 345 ] } ], diff --git a/gems/citrus-toml-merge/Gemfile b/gems/citrus-toml-merge/Gemfile index 6c9a05565..a191da7a2 100644 --- a/gems/citrus-toml-merge/Gemfile +++ b/gems/citrus-toml-merge/Gemfile @@ -311,6 +311,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/citrus-toml-merge/Gemfile.lock b/gems/citrus-toml-merge/Gemfile.lock index 58a2cdbd6..1d8dbe6b6 100644 --- a/gems/citrus-toml-merge/Gemfile.lock +++ b/gems/citrus-toml-merge/Gemfile.lock @@ -1,13 +1,3 @@ -GIT - remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a - branch: fix/ruby-parser-api-methods - glob: packages/ruby/*.gemspec - specs: - tree_sitter_language_pack (1.12.5) - rb_sys (>= 0.9, < 0.9.128) - sorbet-runtime (~> 0.5) - PATH remote: . specs: @@ -16,6 +6,21 @@ PATH toml-rb (~> 4.1) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby + specs: + tree_sitter_language_pack (1.12.5) + rb_sys (>= 0.9, < 0.9.128) + sorbet-runtime (~> 0.5) + GEM remote: https://gem.coop/ specs: @@ -322,10 +327,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) @@ -409,6 +410,7 @@ DEPENDENCIES standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_sitter_language_pack! yaml-converter (~> 0.1) yard (~> 0.9, >= 0.9.44) diff --git a/gems/psych-merge/Gemfile.lock b/gems/psych-merge/Gemfile.lock index ea9dc8043..ec2c9d1ae 100644 --- a/gems/psych-merge/Gemfile.lock +++ b/gems/psych-merge/Gemfile.lock @@ -8,7 +8,39 @@ PATH yaml-merge (= 7.1.0) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -17,7 +49,192 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -26,13 +243,28 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: yaml-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -59,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -122,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -150,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -289,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -341,6 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -387,24 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -413,12 +682,17 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) yaml-merge! yard (~> 0.9, >= 0.9.44) @@ -427,19 +701,35 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -447,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -459,19 +750,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -486,9 +785,12 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 @@ -498,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -525,9 +828,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -536,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -549,10 +856,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -565,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 0f329712a48bff1d0bee5b0819a7a0acff8e95a7 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:55:34 -0600 Subject: [PATCH 274/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/citrus-toml-merge/Gemfile.lock | 341 ++++++++++++++++++++- gems/parslet-toml-merge/.kettle-drift.lock | 60 ++-- gems/parslet-toml-merge/Gemfile | 40 +++ gems/parslet-toml-merge/Gemfile.lock | 30 +- 4 files changed, 426 insertions(+), 45 deletions(-) diff --git a/gems/citrus-toml-merge/Gemfile.lock b/gems/citrus-toml-merge/Gemfile.lock index 1d8dbe6b6..70893a241 100644 --- a/gems/citrus-toml-merge/Gemfile.lock +++ b/gems/citrus-toml-merge/Gemfile.lock @@ -7,13 +7,264 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: toml-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -32,11 +283,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -45,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -108,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -136,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -275,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -327,14 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,23 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -406,33 +682,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,19 +750,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -479,10 +785,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -490,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -517,9 +828,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -528,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -541,16 +856,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -558,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/parslet-toml-merge/.kettle-drift.lock b/gems/parslet-toml-merge/.kettle-drift.lock index 5b373dd8d..309d406e1 100644 --- a/gems/parslet-toml-merge/.kettle-drift.lock +++ b/gems/parslet-toml-merge/.kettle-drift.lock @@ -8,7 +8,8 @@ 159, 199, 239, - 279 + 279, + 319 ] } ], @@ -21,7 +22,8 @@ 170, 210, 250, - 290 + 290, + 330 ] } ], @@ -34,7 +36,8 @@ 160, 200, 240, - 280 + 280, + 320 ] } ], @@ -47,7 +50,8 @@ 172, 212, 252, - 292 + 292, + 332 ] } ], @@ -60,7 +64,8 @@ 175, 215, 255, - 295 + 295, + 335 ] } ], @@ -73,7 +78,8 @@ 161, 201, 241, - 281 + 281, + 321 ] } ], @@ -87,7 +93,8 @@ 179, 219, 259, - 299 + 299, + 339 ] } ], @@ -100,7 +107,8 @@ 180, 220, 260, - 300 + 300, + 340 ] } ], @@ -114,7 +122,8 @@ 166, 206, 246, - 286 + 286, + 326 ] } ], @@ -127,7 +136,8 @@ 189, 229, 269, - 309 + 309, + 349 ] } ], @@ -141,7 +151,8 @@ 158, 198, 238, - 278 + 278, + 318 ] } ], @@ -155,7 +166,8 @@ 188, 228, 268, - 308 + 308, + 348 ] } ], @@ -168,7 +180,8 @@ 164, 204, 244, - 284 + 284, + 324 ] } ], @@ -182,7 +195,8 @@ 171, 211, 251, - 291 + 291, + 331 ] } ], @@ -196,7 +210,8 @@ 167, 207, 247, - 287 + 287, + 327 ] } ], @@ -209,7 +224,8 @@ 165, 205, 245, - 285 + 285, + 325 ] } ], @@ -222,7 +238,8 @@ 182, 222, 262, - 302 + 302, + 342 ] } ], @@ -235,7 +252,8 @@ 181, 221, 261, - 301 + 301, + 341 ] } ], @@ -248,7 +266,8 @@ 176, 216, 256, - 296 + 296, + 336 ] } ], @@ -261,7 +280,8 @@ 185, 225, 265, - 305 + 305, + 345 ] } ], diff --git a/gems/parslet-toml-merge/Gemfile b/gems/parslet-toml-merge/Gemfile index 1bef787f2..eac157ea5 100644 --- a/gems/parslet-toml-merge/Gemfile +++ b/gems/parslet-toml-merge/Gemfile @@ -311,6 +311,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/parslet-toml-merge/Gemfile.lock b/gems/parslet-toml-merge/Gemfile.lock index 8433bd8b5..dd74a3268 100644 --- a/gems/parslet-toml-merge/Gemfile.lock +++ b/gems/parslet-toml-merge/Gemfile.lock @@ -1,13 +1,3 @@ -GIT - remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a - branch: fix/ruby-parser-api-methods - glob: packages/ruby/*.gemspec - specs: - tree_sitter_language_pack (1.12.5) - rb_sys (>= 0.9, < 0.9.128) - sorbet-runtime (~> 0.5) - PATH remote: . specs: @@ -16,6 +6,21 @@ PATH toml-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby + specs: + tree_sitter_language_pack (1.12.5) + rb_sys (>= 0.9, < 0.9.128) + sorbet-runtime (~> 0.5) + GEM remote: https://gem.coop/ specs: @@ -324,10 +329,6 @@ GEM version_gem (~> 1.1, >= 1.1.13) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) tree_haver (7.1.0) citrus (~> 3.0) parslet (~> 2.0) @@ -408,6 +409,7 @@ DEPENDENCIES standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_sitter_language_pack! yaml-converter (~> 0.1) yard (~> 0.9, >= 0.9.44) From d7ca9686e2af6903129f18dfc8b726d67d83a2e5 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:56:12 -0600 Subject: [PATCH 275/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/commonmarker-merge/.kettle-drift.lock | 60 ++-- gems/commonmarker-merge/Gemfile | 40 +++ gems/commonmarker-merge/Gemfile.lock | 30 +- gems/parslet-toml-merge/Gemfile.lock | 342 ++++++++++++++++++++- 4 files changed, 427 insertions(+), 45 deletions(-) diff --git a/gems/commonmarker-merge/.kettle-drift.lock b/gems/commonmarker-merge/.kettle-drift.lock index 5b373dd8d..309d406e1 100644 --- a/gems/commonmarker-merge/.kettle-drift.lock +++ b/gems/commonmarker-merge/.kettle-drift.lock @@ -8,7 +8,8 @@ 159, 199, 239, - 279 + 279, + 319 ] } ], @@ -21,7 +22,8 @@ 170, 210, 250, - 290 + 290, + 330 ] } ], @@ -34,7 +36,8 @@ 160, 200, 240, - 280 + 280, + 320 ] } ], @@ -47,7 +50,8 @@ 172, 212, 252, - 292 + 292, + 332 ] } ], @@ -60,7 +64,8 @@ 175, 215, 255, - 295 + 295, + 335 ] } ], @@ -73,7 +78,8 @@ 161, 201, 241, - 281 + 281, + 321 ] } ], @@ -87,7 +93,8 @@ 179, 219, 259, - 299 + 299, + 339 ] } ], @@ -100,7 +107,8 @@ 180, 220, 260, - 300 + 300, + 340 ] } ], @@ -114,7 +122,8 @@ 166, 206, 246, - 286 + 286, + 326 ] } ], @@ -127,7 +136,8 @@ 189, 229, 269, - 309 + 309, + 349 ] } ], @@ -141,7 +151,8 @@ 158, 198, 238, - 278 + 278, + 318 ] } ], @@ -155,7 +166,8 @@ 188, 228, 268, - 308 + 308, + 348 ] } ], @@ -168,7 +180,8 @@ 164, 204, 244, - 284 + 284, + 324 ] } ], @@ -182,7 +195,8 @@ 171, 211, 251, - 291 + 291, + 331 ] } ], @@ -196,7 +210,8 @@ 167, 207, 247, - 287 + 287, + 327 ] } ], @@ -209,7 +224,8 @@ 165, 205, 245, - 285 + 285, + 325 ] } ], @@ -222,7 +238,8 @@ 182, 222, 262, - 302 + 302, + 342 ] } ], @@ -235,7 +252,8 @@ 181, 221, 261, - 301 + 301, + 341 ] } ], @@ -248,7 +266,8 @@ 176, 216, 256, - 296 + 296, + 336 ] } ], @@ -261,7 +280,8 @@ 185, 225, 265, - 305 + 305, + 345 ] } ], diff --git a/gems/commonmarker-merge/Gemfile b/gems/commonmarker-merge/Gemfile index 88b4f717b..dea960c46 100644 --- a/gems/commonmarker-merge/Gemfile +++ b/gems/commonmarker-merge/Gemfile @@ -311,6 +311,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/commonmarker-merge/Gemfile.lock b/gems/commonmarker-merge/Gemfile.lock index e08527df8..f86bfeebe 100644 --- a/gems/commonmarker-merge/Gemfile.lock +++ b/gems/commonmarker-merge/Gemfile.lock @@ -1,13 +1,3 @@ -GIT - remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a - branch: fix/ruby-parser-api-methods - glob: packages/ruby/*.gemspec - specs: - tree_sitter_language_pack (1.12.5) - rb_sys (>= 0.9, < 0.9.128) - sorbet-runtime (~> 0.5) - PATH remote: . specs: @@ -16,6 +6,21 @@ PATH markdown-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby + specs: + tree_sitter_language_pack (1.12.5) + rb_sys (>= 0.9, < 0.9.128) + sorbet-runtime (~> 0.5) + GEM remote: https://gem.coop/ specs: @@ -137,10 +142,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -396,6 +397,7 @@ DEPENDENCIES kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-parser-gfm (~> 1.1) + markdown-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) rake (~> 13.0) diff --git a/gems/parslet-toml-merge/Gemfile.lock b/gems/parslet-toml-merge/Gemfile.lock index dd74a3268..cecedc911 100644 --- a/gems/parslet-toml-merge/Gemfile.lock +++ b/gems/parslet-toml-merge/Gemfile.lock @@ -7,13 +7,264 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: toml-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -32,11 +283,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -45,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -108,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -136,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -275,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -329,11 +586,9 @@ GEM version_gem (~> 1.1, >= 1.1.13) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -380,23 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -405,32 +682,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -438,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -450,19 +750,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -478,10 +786,13 @@ CHECKSUMS parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 parslet-toml-merge (7.1.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -489,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -516,9 +828,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -527,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -542,14 +858,17 @@ CHECKSUMS token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 251960a15032d27f450f59d9aa3e24d457787a13 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:56:49 -0600 Subject: [PATCH 276/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/commonmarker-merge/Gemfile.lock | 333 ++++++++++++++++++++++++- gems/kramdown-merge/.kettle-drift.lock | 60 +++-- gems/kramdown-merge/Gemfile | 40 +++ gems/kramdown-merge/Gemfile.lock | 30 +-- 4 files changed, 418 insertions(+), 45 deletions(-) diff --git a/gems/commonmarker-merge/Gemfile.lock b/gems/commonmarker-merge/Gemfile.lock index f86bfeebe..b939ea585 100644 --- a/gems/commonmarker-merge/Gemfile.lock +++ b/gems/commonmarker-merge/Gemfile.lock @@ -7,13 +7,264 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: markdown-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -32,11 +283,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -114,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -142,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -281,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -333,11 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -384,24 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -410,30 +682,46 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca @@ -449,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -461,20 +750,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -489,10 +785,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -500,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -527,9 +828,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -538,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -551,14 +856,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -566,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/kramdown-merge/.kettle-drift.lock b/gems/kramdown-merge/.kettle-drift.lock index 5b373dd8d..309d406e1 100644 --- a/gems/kramdown-merge/.kettle-drift.lock +++ b/gems/kramdown-merge/.kettle-drift.lock @@ -8,7 +8,8 @@ 159, 199, 239, - 279 + 279, + 319 ] } ], @@ -21,7 +22,8 @@ 170, 210, 250, - 290 + 290, + 330 ] } ], @@ -34,7 +36,8 @@ 160, 200, 240, - 280 + 280, + 320 ] } ], @@ -47,7 +50,8 @@ 172, 212, 252, - 292 + 292, + 332 ] } ], @@ -60,7 +64,8 @@ 175, 215, 255, - 295 + 295, + 335 ] } ], @@ -73,7 +78,8 @@ 161, 201, 241, - 281 + 281, + 321 ] } ], @@ -87,7 +93,8 @@ 179, 219, 259, - 299 + 299, + 339 ] } ], @@ -100,7 +107,8 @@ 180, 220, 260, - 300 + 300, + 340 ] } ], @@ -114,7 +122,8 @@ 166, 206, 246, - 286 + 286, + 326 ] } ], @@ -127,7 +136,8 @@ 189, 229, 269, - 309 + 309, + 349 ] } ], @@ -141,7 +151,8 @@ 158, 198, 238, - 278 + 278, + 318 ] } ], @@ -155,7 +166,8 @@ 188, 228, 268, - 308 + 308, + 348 ] } ], @@ -168,7 +180,8 @@ 164, 204, 244, - 284 + 284, + 324 ] } ], @@ -182,7 +195,8 @@ 171, 211, 251, - 291 + 291, + 331 ] } ], @@ -196,7 +210,8 @@ 167, 207, 247, - 287 + 287, + 327 ] } ], @@ -209,7 +224,8 @@ 165, 205, 245, - 285 + 285, + 325 ] } ], @@ -222,7 +238,8 @@ 182, 222, 262, - 302 + 302, + 342 ] } ], @@ -235,7 +252,8 @@ 181, 221, 261, - 301 + 301, + 341 ] } ], @@ -248,7 +266,8 @@ 176, 216, 256, - 296 + 296, + 336 ] } ], @@ -261,7 +280,8 @@ 185, 225, 265, - 305 + 305, + 345 ] } ], diff --git a/gems/kramdown-merge/Gemfile b/gems/kramdown-merge/Gemfile index d6b8bed97..837049bc8 100644 --- a/gems/kramdown-merge/Gemfile +++ b/gems/kramdown-merge/Gemfile @@ -311,6 +311,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/kramdown-merge/Gemfile.lock b/gems/kramdown-merge/Gemfile.lock index 9f46700e7..2838afb6e 100644 --- a/gems/kramdown-merge/Gemfile.lock +++ b/gems/kramdown-merge/Gemfile.lock @@ -1,13 +1,3 @@ -GIT - remote: https://github.com/structuredmerge/tree-sitter-language-pack.git - revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a - branch: fix/ruby-parser-api-methods - glob: packages/ruby/*.gemspec - specs: - tree_sitter_language_pack (1.12.5) - rb_sys (>= 0.9, < 0.9.128) - sorbet-runtime (~> 0.5) - PATH remote: . specs: @@ -16,6 +6,21 @@ PATH markdown-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby + specs: + tree_sitter_language_pack (1.12.5) + rb_sys (>= 0.9, < 0.9.128) + sorbet-runtime (~> 0.5) + GEM remote: https://gem.coop/ specs: @@ -131,10 +136,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -390,6 +391,7 @@ DEPENDENCIES kramdown (~> 2.5, >= 2.5.1) kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) rake (~> 13.0) From 37687477598417c80309df499aa5807c28f2045d Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:57:40 -0600 Subject: [PATCH 277/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/kramdown-merge/Gemfile.lock | 345 +++++++++++++++++- gems/prism-merge/.kettle-drift.lock | 60 ++- gems/prism-merge/.rubocop_gradual.lock | 46 +-- gems/prism-merge/Gemfile | 40 ++ gems/prism-merge/Gemfile.lock | 335 +---------------- .../lib/prism/merge/top_level_merge_runner.rb | 2 +- 6 files changed, 449 insertions(+), 379 deletions(-) diff --git a/gems/kramdown-merge/Gemfile.lock b/gems/kramdown-merge/Gemfile.lock index 2838afb6e..c30245d48 100644 --- a/gems/kramdown-merge/Gemfile.lock +++ b/gems/kramdown-merge/Gemfile.lock @@ -7,13 +7,264 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: markdown-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -32,11 +283,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -45,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -108,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -136,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -275,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -327,11 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -378,24 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -404,31 +682,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -436,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -448,11 +750,15 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 @@ -463,6 +769,8 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -477,10 +785,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -488,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -515,9 +828,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -526,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -539,14 +856,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -554,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/prism-merge/.kettle-drift.lock b/gems/prism-merge/.kettle-drift.lock index 5b373dd8d..309d406e1 100644 --- a/gems/prism-merge/.kettle-drift.lock +++ b/gems/prism-merge/.kettle-drift.lock @@ -8,7 +8,8 @@ 159, 199, 239, - 279 + 279, + 319 ] } ], @@ -21,7 +22,8 @@ 170, 210, 250, - 290 + 290, + 330 ] } ], @@ -34,7 +36,8 @@ 160, 200, 240, - 280 + 280, + 320 ] } ], @@ -47,7 +50,8 @@ 172, 212, 252, - 292 + 292, + 332 ] } ], @@ -60,7 +64,8 @@ 175, 215, 255, - 295 + 295, + 335 ] } ], @@ -73,7 +78,8 @@ 161, 201, 241, - 281 + 281, + 321 ] } ], @@ -87,7 +93,8 @@ 179, 219, 259, - 299 + 299, + 339 ] } ], @@ -100,7 +107,8 @@ 180, 220, 260, - 300 + 300, + 340 ] } ], @@ -114,7 +122,8 @@ 166, 206, 246, - 286 + 286, + 326 ] } ], @@ -127,7 +136,8 @@ 189, 229, 269, - 309 + 309, + 349 ] } ], @@ -141,7 +151,8 @@ 158, 198, 238, - 278 + 278, + 318 ] } ], @@ -155,7 +166,8 @@ 188, 228, 268, - 308 + 308, + 348 ] } ], @@ -168,7 +180,8 @@ 164, 204, 244, - 284 + 284, + 324 ] } ], @@ -182,7 +195,8 @@ 171, 211, 251, - 291 + 291, + 331 ] } ], @@ -196,7 +210,8 @@ 167, 207, 247, - 287 + 287, + 327 ] } ], @@ -209,7 +224,8 @@ 165, 205, 245, - 285 + 285, + 325 ] } ], @@ -222,7 +238,8 @@ 182, 222, 262, - 302 + 302, + 342 ] } ], @@ -235,7 +252,8 @@ 181, 221, 261, - 301 + 301, + 341 ] } ], @@ -248,7 +266,8 @@ 176, 216, 256, - 296 + 296, + 336 ] } ], @@ -261,7 +280,8 @@ 185, 225, 265, - 305 + 305, + 345 ] } ], diff --git a/gems/prism-merge/.rubocop_gradual.lock b/gems/prism-merge/.rubocop_gradual.lock index e28d99e64..0492f998d 100644 --- a/gems/prism-merge/.rubocop_gradual.lock +++ b/gems/prism-merge/.rubocop_gradual.lock @@ -518,8 +518,8 @@ "lib/prism/merge/source_line_lookup.rb:1098479933": [ [5, 5, 23, "Style/Documentation: Missing top-level documentation comment for `module Prism::Merge::SourceLineLookup`.", 2168434862] ], - "lib/prism/merge/top_level_merge_runner.rb:3009983916": [ - [38, 5, 59959, "Metrics/ClassLength: Class has too many lines. [1124/100]", 2689943302], + "lib/prism/merge/top_level_merge_runner.rb:1106437552": [ + [38, 5, 61468, "Metrics/ClassLength: Class has too many lines. [1156/100]", 150648557], [66, 7, 5196, "Metrics/AbcSize: Assignment Branch Condition size for `merge` is too high. [<22, 68, 9> 72.03/17]", 176450457], [66, 7, 5196, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `merge` is too high. [9/7]", 176450457], [66, 7, 5196, "Metrics/MethodLength: Method has too many lines. [75/10]", 176450457], @@ -584,25 +584,25 @@ [1003, 55, 17, "Lint/UnusedMethodArgument: Unused method argument - `dest_by_signature`.", 379778684], [1024, 9, 250, "Style/CombinableLoops: Combine this loop with the previous loop.", 3315024098], [1031, 121, 5, "Layout/LineLength: Line is too long. [125/120]", 180543822], - [1048, 7, 4375, "Metrics/AbcSize: Assignment Branch Condition size for `process_dest_node` is too high. [<23, 66, 14> 71.28/17]", 329713352], - [1048, 7, 4375, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `process_dest_node` is too high. [11/7]", 329713352], - [1048, 7, 4375, "Metrics/MethodLength: Method has too many lines. [80/10]", 329713352], - [1048, 7, 4375, "Metrics/PerceivedComplexity: Perceived complexity for `process_dest_node` is too high. [15/8]", 329713352], + [1048, 7, 4811, "Metrics/AbcSize: Assignment Branch Condition size for `process_dest_node` is too high. [<23, 71, 16> 76.33/17]", 329713352], + [1048, 7, 4811, "Metrics/CyclomaticComplexity: Cyclomatic complexity for `process_dest_node` is too high. [13/7]", 329713352], + [1048, 7, 4811, "Metrics/MethodLength: Method has too many lines. [90/10]", 329713352], + [1048, 7, 4811, "Metrics/PerceivedComplexity: Perceived complexity for `process_dest_node` is too high. [17/8]", 329713352], [1048, 28, 279, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 2321512478], - [1153, 7, 757, "Metrics/MethodLength: Method has too many lines. [19/10]", 3306507447], - [1191, 44, 189, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 215272527], - [1222, 7, 888, "Metrics/MethodLength: Method has too many lines. [17/10]", 2638200013], - [1222, 31, 189, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 50070642], - [1244, 7, 719, "Metrics/MethodLength: Method has too many lines. [13/10]", 530865591], - [1262, 7, 1393, "Metrics/AbcSize: Assignment Branch Condition size for `process_non_recursive_match` is too high. [<10, 23, 7> 26.04/17]", 324106576], - [1262, 7, 1393, "Metrics/MethodLength: Method has too many lines. [29/10]", 324106576], - [1296, 7, 1106, "Metrics/AbcSize: Assignment Branch Condition size for `process_unresolved_non_recursive_match` is too high. [<3, 19, 3> 19.47/17]", 1476652897], - [1296, 7, 1106, "Metrics/MethodLength: Method has too many lines. [26/10]", 1476652897], - [1337, 7, 1935, "Metrics/AbcSize: Assignment Branch Condition size for `record_unresolved_match_case!` is too high. [<4, 26, 3> 26.48/17]", 456739474], - [1337, 7, 1935, "Metrics/MethodLength: Method has too many lines. [37/10]", 456739474], - [1422, 7, 1067, "Metrics/AbcSize: Assignment Branch Condition size for `advance_last_output_dest_line` is too high. [<6, 19, 6> 20.81/17]", 331135500], - [1422, 7, 1067, "Metrics/MethodLength: Method has too many lines. [11/10]", 331135500], - [1422, 40, 181, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2038823112] + [1190, 7, 757, "Metrics/MethodLength: Method has too many lines. [19/10]", 3306507447], + [1228, 44, 189, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 215272527], + [1259, 7, 888, "Metrics/MethodLength: Method has too many lines. [17/10]", 2638200013], + [1259, 31, 189, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [9/5]", 50070642], + [1281, 7, 719, "Metrics/MethodLength: Method has too many lines. [13/10]", 530865591], + [1299, 7, 1393, "Metrics/AbcSize: Assignment Branch Condition size for `process_non_recursive_match` is too high. [<10, 23, 7> 26.04/17]", 324106576], + [1299, 7, 1393, "Metrics/MethodLength: Method has too many lines. [29/10]", 324106576], + [1333, 7, 1106, "Metrics/AbcSize: Assignment Branch Condition size for `process_unresolved_non_recursive_match` is too high. [<3, 19, 3> 19.47/17]", 1476652897], + [1333, 7, 1106, "Metrics/MethodLength: Method has too many lines. [26/10]", 1476652897], + [1374, 7, 1935, "Metrics/AbcSize: Assignment Branch Condition size for `record_unresolved_match_case!` is too high. [<4, 26, 3> 26.48/17]", 456739474], + [1374, 7, 1935, "Metrics/MethodLength: Method has too many lines. [37/10]", 456739474], + [1459, 7, 1067, "Metrics/AbcSize: Assignment Branch Condition size for `advance_last_output_dest_line` is too high. [<6, 19, 6> 20.81/17]", 331135500], + [1459, 7, 1067, "Metrics/MethodLength: Method has too many lines. [11/10]", 331135500], + [1459, 40, 181, "Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters. [6/5]", 2038823112] ], "lib/prism/merge/wrapper_comment_support.rb:3046735928": [ [5, 5, 27, "Style/Documentation: Missing top-level documentation comment for `class Prism::Merge::WrapperCommentSupport`.", 2211657316], @@ -675,13 +675,13 @@ "spec/fixtures/reproducible/05_gemspec_orphan_duplication/template.rb:1825302441": [ [1, 1, 1, "Style/FrozenStringLiteralComment: Missing frozen string literal comment.", 177634] ], - "spec/fixtures_integration_spec.rb:4053275636": [ - [7, 1, 21570, "Metrics/BlockLength: Block has too many lines. [483/25]", 416378449], + "spec/fixtures_integration_spec.rb:2298883270": [ + [7, 1, 22463, "Metrics/BlockLength: Block has too many lines. [507/25]", 1776221706], [66, 121, 26, "Layout/LineLength: Line is too long. [146/120]", 1448895712], [72, 3, 1302, "Metrics/BlockLength: Block has too many lines. [30/25]", 2973641144], [106, 121, 2, "Layout/LineLength: Line is too long. [122/120]", 5858795], [113, 3, 1679, "Metrics/BlockLength: Block has too many lines. [38/25]", 2954972744], - [373, 3, 7512, "Metrics/BlockLength: Block has too many lines. [149/25]", 2278210376] + [400, 3, 7512, "Metrics/BlockLength: Block has too many lines. [149/25]", 2278210376] ], "spec/reproducible_merge_spec.rb:2334824632": [ [6, 1, 2420, "Metrics/BlockLength: Block has too many lines. [50/25]", 2207509489], diff --git a/gems/prism-merge/Gemfile b/gems/prism-merge/Gemfile index 9e53b9a12..9120744ac 100644 --- a/gems/prism-merge/Gemfile +++ b/gems/prism-merge/Gemfile @@ -311,6 +311,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/prism-merge/Gemfile.lock b/gems/prism-merge/Gemfile.lock index 0b231a55a..b9f10ae4d 100644 --- a/gems/prism-merge/Gemfile.lock +++ b/gems/prism-merge/Gemfile.lock @@ -7,264 +7,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -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.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -283,6 +32,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -291,7 +45,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-x86_64-linux) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -355,8 +108,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -385,7 +136,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-x86_64-linux-gnu) racc (~> 1.4) @@ -517,8 +267,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -571,11 +319,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -618,45 +366,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -667,47 +393,30 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0.0) ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-x86_64-linux) - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -715,7 +424,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -728,27 +436,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-x86_64-linux-gnu) sha256=379fae440b28915e3f19d752ce2dcf8465ed2b2fbefd2a7ca0dd497bc981a06a nokogiri (1.19.4-x86_64-linux-musl) sha256=17dfb7c1fa194ae02fbf7c51a7afc8d278045ab3fdacfd86f91d02d7b274470b @@ -759,14 +459,11 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -774,7 +471,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -806,8 +502,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.0) - service_actor (3.9.4) silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -816,7 +510,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -830,19 +523,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) - toml-merge (7.1.0) - toml-rb (4.2.0) tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -850,7 +538,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/prism-merge/lib/prism/merge/top_level_merge_runner.rb b/gems/prism-merge/lib/prism/merge/top_level_merge_runner.rb index 300e4aaa1..7aefbcda9 100644 --- a/gems/prism-merge/lib/prism/merge/top_level_merge_runner.rb +++ b/gems/prism-merge/lib/prism/merge/top_level_merge_runner.rb @@ -1156,7 +1156,7 @@ def process_dest_node( end def duplicate_destination_node_already_matched?(dest_node:, dest_signature:, template_by_signature:, - consumed_template_indices:) + consumed_template_indices:) candidates = template_by_signature[dest_signature] return false unless candidates return false if candidates.any? { |candidate| !consumed_template_indices.include?(candidate.fetch(:index)) } From 235035f7ec864afb7830a2a7c7492876dbc08d20 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 00:59:38 -0600 Subject: [PATCH 278/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/kettle-jem/Gemfile.lock | 175 +++--------------- gems/prism-merge/Gemfile.lock | 337 ++++++++++++++++++++++++++++++++-- 2 files changed, 351 insertions(+), 161 deletions(-) diff --git a/gems/kettle-jem/Gemfile.lock b/gems/kettle-jem/Gemfile.lock index 982d196a0..a6f8ed35b 100644 --- a/gems/kettle-jem/Gemfile.lock +++ b/gems/kettle-jem/Gemfile.lock @@ -28,7 +28,7 @@ PATH yaml-merge (= 7.1.0) 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.0) ast-crispr (= 7.1.0) @@ -36,7 +36,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-crispr (= 7.1.0) @@ -44,23 +44,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -69,14 +53,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge specs: bash-merge (7.1.0) ast-merge (= 7.1.0) @@ -84,14 +61,7 @@ PATH version_gem (~> 1.1, >= 1.1.14) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge specs: citrus-toml-merge (7.1.0) toml-merge (= 7.1.0) @@ -99,7 +69,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) commonmarker (~> 2.2) @@ -107,7 +77,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-merge (= 7.1.0) @@ -115,15 +85,7 @@ PATH version_gem (~> 1.1, >= 1.1.14) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: json-merge (7.1.0) ast-merge (= 7.1.0) @@ -131,7 +93,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) kramdown (~> 2.5) @@ -139,7 +101,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-merge (= 7.1.0) @@ -147,7 +109,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) markdown-merge (= 7.1.0) @@ -155,23 +117,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) prism (~> 1.6) @@ -179,7 +125,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-merge (= 7.1.0) @@ -188,7 +134,7 @@ PATH yaml-merge (= 7.1.0) 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.0) ast-merge (= 7.1.0) @@ -197,7 +143,7 @@ PATH version_gem (~> 1.1, >= 1.1.14) 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.0) ast-merge (= 7.1.0) @@ -205,28 +151,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: toml-merge (7.1.0) ast-merge (= 7.1.0) @@ -234,7 +159,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) citrus (~> 3.0) @@ -243,35 +168,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: yaml-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby - specs: - tree_sitter_language_pack (1.12.5) - rb_sys (>= 0.9, < 0.9.128) - sorbet-runtime (~> 0.5) - GEM remote: https://gem.coop/ specs: @@ -287,6 +190,10 @@ GEM rubocop (>= 1.0) version_gem (~> 1.1, >= 1.1.14) ast (2.4.3) + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -359,8 +266,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (3.0.1) simplecov (>= 1.0) @@ -411,9 +316,6 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) - rake-compiler-dock (1.12.0) - rb_sys (0.9.127) - rake-compiler-dock (= 1.12.0) rbs (4.0.3) logger prism (>= 1.6.0) @@ -600,11 +502,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) + sorbet-runtime (~> 0.5) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -646,15 +548,11 @@ PLATFORMS DEPENDENCIES appraisal2 (~> 3.2, >= 3.2.0) appraisal2-rubocop (~> 1.0, >= 1.0.0) - 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! @@ -664,10 +562,8 @@ DEPENDENCIES erb (~> 6.0, >= 6.0.5) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) - go-merge! irb (~> 1.17) json-merge! - kettle-drift (~> 1.0, >= 1.0.5) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.1) kettle-test (~> 2.0, >= 2.0.11) @@ -678,8 +574,6 @@ DEPENDENCIES markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! prism-merge! psych-merge! rake (~> 13.0) @@ -696,16 +590,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.6) stringio (>= 3.0) toml-merge! tree_haver! - tree_sitter_language_pack! turbo_tests2 (~> 3.2, >= 3.2.0) - typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.3) yaml-merge! @@ -715,7 +605,6 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.4) yard-yaml (~> 0.2, >= 0.2.3) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -727,13 +616,10 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 @@ -760,14 +646,12 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (3.0.1) sha256=83ebe2aa099f15781e4796b5faef0dc2720fba48f6b9d34808670b91baf271e4 @@ -790,8 +674,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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 @@ -802,8 +684,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) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 - rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 @@ -844,7 +724,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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 @@ -852,7 +731,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.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -867,14 +745,12 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) - tree_sitter_language_pack (1.12.5) + tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) sha256=ad6743a373eeac954c1b659b17af3aff1c82918b3ce9c9dc572a7c70ff843cdd tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -888,7 +764,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/prism-merge/Gemfile.lock b/gems/prism-merge/Gemfile.lock index b9f10ae4d..c55f997df 100644 --- a/gems/prism-merge/Gemfile.lock +++ b/gems/prism-merge/Gemfile.lock @@ -7,13 +7,264 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: ruby-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -32,11 +283,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -45,6 +291,8 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -108,6 +356,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -136,6 +386,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-x86_64-linux-gnu) racc (~> 1.4) @@ -267,6 +518,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -319,11 +572,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -366,23 +619,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -393,30 +668,48 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0.0) ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -424,6 +717,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -436,19 +730,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-x86_64-linux-gnu) sha256=379fae440b28915e3f19d752ce2dcf8465ed2b2fbefd2a7ca0dd497bc981a06a nokogiri (1.19.4-x86_64-linux-musl) sha256=17dfb7c1fa194ae02fbf7c51a7afc8d278045ab3fdacfd86f91d02d7b274470b @@ -459,11 +761,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -471,6 +776,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -502,6 +808,8 @@ 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -510,6 +818,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -523,14 +832,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -538,6 +852,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 9f2c6d062c5c51740e1dc632d2bc5acfac7d31c9 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 01:00:10 -0600 Subject: [PATCH 279/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/kettle-jem/Gemfile.lock | 42 +++-- gems/smorg-rb/.kettle-drift.lock | 60 ++++--- gems/smorg-rb/Gemfile | 40 +++++ gems/smorg-rb/Gemfile.lock | 292 ++++++++----------------------- 4 files changed, 177 insertions(+), 257 deletions(-) diff --git a/gems/kettle-jem/Gemfile.lock b/gems/kettle-jem/Gemfile.lock index a6f8ed35b..70f5c1113 100644 --- a/gems/kettle-jem/Gemfile.lock +++ b/gems/kettle-jem/Gemfile.lock @@ -28,7 +28,7 @@ PATH yaml-merge (= 7.1.0) 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.0) ast-crispr (= 7.1.0) @@ -36,7 +36,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-crispr (= 7.1.0) @@ -44,7 +44,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) benchmark @@ -53,7 +53,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-merge (= 7.1.0) @@ -61,7 +61,7 @@ PATH version_gem (~> 1.1, >= 1.1.14) 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.0) toml-merge (= 7.1.0) @@ -69,7 +69,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) commonmarker (~> 2.2) @@ -77,7 +77,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-merge (= 7.1.0) @@ -85,7 +85,7 @@ PATH version_gem (~> 1.1, >= 1.1.14) 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.0) ast-merge (= 7.1.0) @@ -93,7 +93,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) kramdown (~> 2.5) @@ -101,7 +101,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-merge (= 7.1.0) @@ -109,7 +109,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) markdown-merge (= 7.1.0) @@ -117,7 +117,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) prism (~> 1.6) @@ -125,7 +125,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-merge (= 7.1.0) @@ -134,7 +134,7 @@ PATH yaml-merge (= 7.1.0) 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.0) ast-merge (= 7.1.0) @@ -143,7 +143,7 @@ PATH version_gem (~> 1.1, >= 1.1.14) 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.0) ast-merge (= 7.1.0) @@ -151,7 +151,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-merge (= 7.1.0) @@ -159,7 +159,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) citrus (~> 3.0) @@ -168,7 +168,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-merge (= 7.1.0) @@ -266,6 +266,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (3.0.1) simplecov (>= 1.0) @@ -564,6 +566,7 @@ DEPENDENCIES gitmoji-regex (~> 2.0, >= 2.0.4) irb (~> 1.17) json-merge! + kettle-drift (~> 1.0, >= 1.0.5) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.1) kettle-test (~> 2.0, >= 2.0.11) @@ -652,6 +655,7 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (3.0.1) sha256=83ebe2aa099f15781e4796b5faef0dc2720fba48f6b9d34808670b91baf271e4 @@ -748,7 +752,7 @@ CHECKSUMS toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) - tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) sha256=ad6743a373eeac954c1b659b17af3aff1c82918b3ce9c9dc572a7c70ff843cdd + tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 diff --git a/gems/smorg-rb/.kettle-drift.lock b/gems/smorg-rb/.kettle-drift.lock index 5725dfce6..d879250ba 100644 --- a/gems/smorg-rb/.kettle-drift.lock +++ b/gems/smorg-rb/.kettle-drift.lock @@ -10,7 +10,8 @@ 245, 285, 325, - 365 + 365, + 405 ] } ], @@ -25,7 +26,8 @@ 256, 296, 336, - 376 + 376, + 416 ] } ], @@ -40,7 +42,8 @@ 246, 286, 326, - 366 + 366, + 406 ] } ], @@ -55,7 +58,8 @@ 258, 298, 338, - 378 + 378, + 418 ] } ], @@ -70,7 +74,8 @@ 261, 301, 341, - 381 + 381, + 421 ] } ], @@ -85,7 +90,8 @@ 247, 287, 327, - 367 + 367, + 407 ] } ], @@ -101,7 +107,8 @@ 265, 305, 345, - 385 + 385, + 425 ] } ], @@ -116,7 +123,8 @@ 266, 306, 346, - 386 + 386, + 426 ] } ], @@ -132,7 +140,8 @@ 252, 292, 332, - 372 + 372, + 412 ] } ], @@ -147,7 +156,8 @@ 275, 315, 355, - 395 + 395, + 435 ] } ], @@ -163,7 +173,8 @@ 244, 284, 324, - 364 + 364, + 404 ] } ], @@ -179,7 +190,8 @@ 274, 314, 354, - 394 + 394, + 434 ] } ], @@ -194,7 +206,8 @@ 250, 290, 330, - 370 + 370, + 410 ] } ], @@ -210,7 +223,8 @@ 257, 297, 337, - 377 + 377, + 417 ] } ], @@ -226,7 +240,8 @@ 253, 293, 333, - 373 + 373, + 413 ] } ], @@ -241,7 +256,8 @@ 251, 291, 331, - 371 + 371, + 411 ] } ], @@ -256,7 +272,8 @@ 268, 308, 348, - 388 + 388, + 428 ] } ], @@ -271,7 +288,8 @@ 267, 307, 347, - 387 + 387, + 427 ] } ], @@ -286,7 +304,8 @@ 262, 302, 342, - 382 + 382, + 422 ] } ], @@ -301,7 +320,8 @@ 271, 311, 351, - 391 + 391, + 431 ] } ], diff --git a/gems/smorg-rb/Gemfile b/gems/smorg-rb/Gemfile index d28b698a9..78ecd2c0f 100644 --- a/gems/smorg-rb/Gemfile +++ b/gems/smorg-rb/Gemfile @@ -397,6 +397,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/smorg-rb/Gemfile.lock b/gems/smorg-rb/Gemfile.lock index a2a7705fe..927369d47 100644 --- a/gems/smorg-rb/Gemfile.lock +++ b/gems/smorg-rb/Gemfile.lock @@ -12,31 +12,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: ast-merge-git (7.1.0) ast-merge (= 7.1.0) @@ -44,7 +20,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -53,53 +29,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge specs: go-merge (7.1.0) ast-merge (= 7.1.0) @@ -107,7 +37,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: json-merge (7.1.0) ast-merge (= 7.1.0) @@ -115,7 +45,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem specs: kettle-jem (7.1.0) addressable (>= 2.8, < 3) @@ -144,23 +74,7 @@ PATH yaml-merge (= 7.1.0) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) markdown-merge (= 7.1.0) @@ -168,103 +82,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: plain-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -283,13 +107,33 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) bundler (>= 1.2.0) thor (~> 1.0) citrus (3.0.2) + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) cmdparse (3.0.7) commonmarker (2.9.0-aarch64-linux) commonmarker (2.9.0-aarch64-linux-musl) @@ -297,6 +141,10 @@ GEM commonmarker (2.9.0-x86_64-darwin) commonmarker (2.9.0-x86_64-linux) commonmarker (2.9.0-x86_64-linux-musl) + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -306,6 +154,10 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docile (1.4.1) + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -360,8 +212,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -385,11 +235,19 @@ GEM turbo_tests2 (~> 3.1, >= 3.1.12) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) 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.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) @@ -418,9 +276,18 @@ GEM prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) psych (5.4.0) date stringio + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -432,6 +299,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) rdoc (6.17.0) erb psych (>= 4.0.0) @@ -527,6 +399,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -584,11 +460,18 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -603,6 +486,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.13) + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) yard (0.9.45) yard-fence (0.9.6) rdoc (>= 6.11, < 8) @@ -635,20 +522,11 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) @@ -656,24 +534,17 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -682,26 +553,19 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -713,12 +577,10 @@ CHECKSUMS ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) @@ -757,7 +619,6 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad @@ -785,7 +646,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.0) plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -832,7 +692,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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -856,14 +715,12 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -876,7 +733,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 58e2dfe665d0a72d15fc5b4141b3437a4c53344f Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 01:00:34 -0600 Subject: [PATCH 280/347] Lock smorg-rb templating dependencies --- gems/smorg-rb/Gemfile.lock | 292 +++++++++++++++++++++++++++---------- 1 file changed, 218 insertions(+), 74 deletions(-) diff --git a/gems/smorg-rb/Gemfile.lock b/gems/smorg-rb/Gemfile.lock index 927369d47..a2a7705fe 100644 --- a/gems/smorg-rb/Gemfile.lock +++ b/gems/smorg-rb/Gemfile.lock @@ -12,7 +12,31 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: ast-merge-git (7.1.0) ast-merge (= 7.1.0) @@ -20,7 +44,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) benchmark @@ -29,7 +53,53 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge specs: go-merge (7.1.0) ast-merge (= 7.1.0) @@ -37,7 +107,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-merge (= 7.1.0) @@ -45,7 +115,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem specs: kettle-jem (7.1.0) addressable (>= 2.8, < 3) @@ -74,7 +144,23 @@ PATH yaml-merge (= 7.1.0) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: markly-merge (7.1.0) markdown-merge (= 7.1.0) @@ -82,13 +168,103 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: plain-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -107,33 +283,13 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) bundler (>= 1.2.0) thor (~> 1.0) citrus (3.0.2) - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) cmdparse (3.0.7) commonmarker (2.9.0-aarch64-linux) commonmarker (2.9.0-aarch64-linux-musl) @@ -141,10 +297,6 @@ GEM commonmarker (2.9.0-x86_64-darwin) commonmarker (2.9.0-x86_64-linux) commonmarker (2.9.0-x86_64-linux-musl) - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -154,10 +306,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docile (1.4.1) - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -212,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -235,19 +385,11 @@ GEM turbo_tests2 (~> 3.1, >= 3.1.12) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) 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.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) @@ -276,18 +418,9 @@ GEM prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) psych (5.4.0) date stringio - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -299,11 +432,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) rdoc (6.17.0) erb psych (>= 4.0.0) @@ -399,10 +527,6 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -460,18 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -486,10 +603,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.13) - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) yard (0.9.45) yard-fence (0.9.6) rdoc (>= 6.11, < 8) @@ -522,11 +635,20 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) @@ -534,17 +656,24 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -553,19 +682,26 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -577,10 +713,12 @@ CHECKSUMS ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) @@ -619,6 +757,7 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad @@ -646,6 +785,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.0) plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -692,6 +832,7 @@ 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -715,12 +856,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -733,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 891e8ea8c19bd0e7cd223723d96b4ab6ad6b2775 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 01:01:26 -0600 Subject: [PATCH 281/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/tree_haver/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gems/tree_haver/Gemfile.lock b/gems/tree_haver/Gemfile.lock index d36806ac5..56757325d 100644 --- a/gems/tree_haver/Gemfile.lock +++ b/gems/tree_haver/Gemfile.lock @@ -633,7 +633,7 @@ CHECKSUMS toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) - tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) + tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) sha256=ad6743a373eeac954c1b659b17af3aff1c82918b3ce9c9dc572a7c70ff843cdd tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 From 4badc85c772607e3a8acf21ba58aedc5c3f6ff79 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 01:03:55 -0600 Subject: [PATCH 282/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-merge/.kettle-drift.lock | 60 ++++-- gems/ast-merge/Gemfile | 40 ++++ gems/ast-merge/Gemfile.lock | 335 +----------------------------- gems/tree_haver/Gemfile.lock | 2 +- 4 files changed, 82 insertions(+), 355 deletions(-) diff --git a/gems/ast-merge/.kettle-drift.lock b/gems/ast-merge/.kettle-drift.lock index d58d979f9..06ea1c460 100644 --- a/gems/ast-merge/.kettle-drift.lock +++ b/gems/ast-merge/.kettle-drift.lock @@ -9,7 +9,8 @@ 199, 239, 279, - 319 + 319, + 359 ] } ], @@ -23,7 +24,8 @@ 210, 250, 290, - 330 + 330, + 370 ] } ], @@ -37,7 +39,8 @@ 200, 240, 280, - 320 + 320, + 360 ] } ], @@ -51,7 +54,8 @@ 212, 252, 292, - 332 + 332, + 372 ] } ], @@ -65,7 +69,8 @@ 215, 255, 295, - 335 + 335, + 375 ] } ], @@ -79,7 +84,8 @@ 201, 241, 281, - 321 + 321, + 361 ] } ], @@ -94,7 +100,8 @@ 219, 259, 299, - 339 + 339, + 379 ] } ], @@ -108,7 +115,8 @@ 220, 260, 300, - 340 + 340, + 380 ] } ], @@ -123,7 +131,8 @@ 206, 246, 286, - 326 + 326, + 366 ] } ], @@ -137,7 +146,8 @@ 229, 269, 309, - 349 + 349, + 389 ] } ], @@ -152,7 +162,8 @@ 198, 238, 278, - 318 + 318, + 358 ] } ], @@ -167,7 +178,8 @@ 228, 268, 308, - 348 + 348, + 388 ] } ], @@ -181,7 +193,8 @@ 204, 244, 284, - 324 + 324, + 364 ] } ], @@ -196,7 +209,8 @@ 211, 251, 291, - 331 + 331, + 371 ] } ], @@ -211,7 +225,8 @@ 207, 247, 287, - 327 + 327, + 367 ] } ], @@ -225,7 +240,8 @@ 205, 245, 285, - 325 + 325, + 365 ] } ], @@ -239,7 +255,8 @@ 222, 262, 302, - 342 + 342, + 382 ] } ], @@ -253,7 +270,8 @@ 221, 261, 301, - 341 + 341, + 381 ] } ], @@ -267,7 +285,8 @@ 216, 256, 296, - 336 + 336, + 376 ] } ], @@ -281,7 +300,8 @@ 225, 265, 305, - 345 + 345, + 385 ] } ], diff --git a/gems/ast-merge/Gemfile b/gems/ast-merge/Gemfile index b8c56c3c0..c4d51f141 100644 --- a/gems/ast-merge/Gemfile +++ b/gems/ast-merge/Gemfile @@ -351,6 +351,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/ast-merge/Gemfile.lock b/gems/ast-merge/Gemfile.lock index 1545c3450..80b649b9a 100644 --- a/gems/ast-merge/Gemfile.lock +++ b/gems/ast-merge/Gemfile.lock @@ -8,233 +8,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -242,29 +16,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -291,12 +42,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -360,8 +105,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -390,7 +133,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -530,8 +272,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -584,11 +324,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -635,45 +370,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -682,54 +395,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -737,7 +428,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -750,27 +440,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -785,14 +467,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -800,7 +478,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -828,12 +505,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -842,7 +516,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,19 +529,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +544,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/tree_haver/Gemfile.lock b/gems/tree_haver/Gemfile.lock index 56757325d..d36806ac5 100644 --- a/gems/tree_haver/Gemfile.lock +++ b/gems/tree_haver/Gemfile.lock @@ -633,7 +633,7 @@ CHECKSUMS toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) - tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) sha256=ad6743a373eeac954c1b659b17af3aff1c82918b3ce9c9dc572a7c70ff843cdd + tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 From 0074f98ff758962893a9a655d0ec7ed3cac166de Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 01:04:26 -0600 Subject: [PATCH 283/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-crispr/.kettle-drift.lock | 60 +++-- gems/ast-crispr/Gemfile | 40 ++++ gems/ast-crispr/Gemfile.lock | 337 +---------------------------- gems/ast-merge/Gemfile.lock | 335 +++++++++++++++++++++++++++- 4 files changed, 420 insertions(+), 352 deletions(-) diff --git a/gems/ast-crispr/.kettle-drift.lock b/gems/ast-crispr/.kettle-drift.lock index 309d406e1..aa01ca527 100644 --- a/gems/ast-crispr/.kettle-drift.lock +++ b/gems/ast-crispr/.kettle-drift.lock @@ -9,7 +9,8 @@ 199, 239, 279, - 319 + 319, + 359 ] } ], @@ -23,7 +24,8 @@ 210, 250, 290, - 330 + 330, + 370 ] } ], @@ -37,7 +39,8 @@ 200, 240, 280, - 320 + 320, + 360 ] } ], @@ -51,7 +54,8 @@ 212, 252, 292, - 332 + 332, + 372 ] } ], @@ -65,7 +69,8 @@ 215, 255, 295, - 335 + 335, + 375 ] } ], @@ -79,7 +84,8 @@ 201, 241, 281, - 321 + 321, + 361 ] } ], @@ -94,7 +100,8 @@ 219, 259, 299, - 339 + 339, + 379 ] } ], @@ -108,7 +115,8 @@ 220, 260, 300, - 340 + 340, + 380 ] } ], @@ -123,7 +131,8 @@ 206, 246, 286, - 326 + 326, + 366 ] } ], @@ -137,7 +146,8 @@ 229, 269, 309, - 349 + 349, + 389 ] } ], @@ -152,7 +162,8 @@ 198, 238, 278, - 318 + 318, + 358 ] } ], @@ -167,7 +178,8 @@ 228, 268, 308, - 348 + 348, + 388 ] } ], @@ -181,7 +193,8 @@ 204, 244, 284, - 324 + 324, + 364 ] } ], @@ -196,7 +209,8 @@ 211, 251, 291, - 331 + 331, + 371 ] } ], @@ -211,7 +225,8 @@ 207, 247, 287, - 327 + 327, + 367 ] } ], @@ -225,7 +240,8 @@ 205, 245, 285, - 325 + 325, + 365 ] } ], @@ -239,7 +255,8 @@ 222, 262, 302, - 342 + 342, + 382 ] } ], @@ -253,7 +270,8 @@ 221, 261, 301, - 341 + 341, + 381 ] } ], @@ -267,7 +285,8 @@ 216, 256, 296, - 336 + 336, + 376 ] } ], @@ -281,7 +300,8 @@ 225, 265, 305, - 345 + 345, + 385 ] } ], diff --git a/gems/ast-crispr/Gemfile b/gems/ast-crispr/Gemfile index da2e0b9e5..408241295 100644 --- a/gems/ast-crispr/Gemfile +++ b/gems/ast-crispr/Gemfile @@ -351,6 +351,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/ast-crispr/Gemfile.lock b/gems/ast-crispr/Gemfile.lock index b731cdd46..2760d97db 100644 --- a/gems/ast-crispr/Gemfile.lock +++ b/gems/ast-crispr/Gemfile.lock @@ -7,31 +7,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -39,232 +15,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -291,12 +41,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -360,8 +104,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -390,7 +132,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -584,11 +325,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -636,44 +377,23 @@ DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -682,26 +402,18 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -709,27 +421,13 @@ CHECKSUMS appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -737,7 +435,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -750,27 +447,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -785,14 +474,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -800,7 +485,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -828,11 +512,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -842,7 +524,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,19 +537,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +552,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ast-merge/Gemfile.lock b/gems/ast-merge/Gemfile.lock index 80b649b9a..1545c3450 100644 --- a/gems/ast-merge/Gemfile.lock +++ b/gems/ast-merge/Gemfile.lock @@ -8,7 +8,233 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -16,6 +242,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -42,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -105,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -133,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -272,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -324,6 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -370,23 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -395,32 +682,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -428,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -440,19 +750,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -467,10 +785,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -478,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -505,9 +828,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -516,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -529,14 +856,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -544,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 776e4fcd803b0b1e1a8b20341abe01642fd1cc83 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 01:04:53 -0600 Subject: [PATCH 284/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-crispr-ruby-prism/.kettle-drift.lock | 60 ++-- gems/ast-crispr-ruby-prism/Gemfile | 40 +++ gems/ast-crispr-ruby-prism/Gemfile.lock | 334 +---------------- gems/ast-crispr/Gemfile.lock | 337 +++++++++++++++++- 4 files changed, 422 insertions(+), 349 deletions(-) diff --git a/gems/ast-crispr-ruby-prism/.kettle-drift.lock b/gems/ast-crispr-ruby-prism/.kettle-drift.lock index 309d406e1..aa01ca527 100644 --- a/gems/ast-crispr-ruby-prism/.kettle-drift.lock +++ b/gems/ast-crispr-ruby-prism/.kettle-drift.lock @@ -9,7 +9,8 @@ 199, 239, 279, - 319 + 319, + 359 ] } ], @@ -23,7 +24,8 @@ 210, 250, 290, - 330 + 330, + 370 ] } ], @@ -37,7 +39,8 @@ 200, 240, 280, - 320 + 320, + 360 ] } ], @@ -51,7 +54,8 @@ 212, 252, 292, - 332 + 332, + 372 ] } ], @@ -65,7 +69,8 @@ 215, 255, 295, - 335 + 335, + 375 ] } ], @@ -79,7 +84,8 @@ 201, 241, 281, - 321 + 321, + 361 ] } ], @@ -94,7 +100,8 @@ 219, 259, 299, - 339 + 339, + 379 ] } ], @@ -108,7 +115,8 @@ 220, 260, 300, - 340 + 340, + 380 ] } ], @@ -123,7 +131,8 @@ 206, 246, 286, - 326 + 326, + 366 ] } ], @@ -137,7 +146,8 @@ 229, 269, 309, - 349 + 349, + 389 ] } ], @@ -152,7 +162,8 @@ 198, 238, 278, - 318 + 318, + 358 ] } ], @@ -167,7 +178,8 @@ 228, 268, 308, - 348 + 348, + 388 ] } ], @@ -181,7 +193,8 @@ 204, 244, 284, - 324 + 324, + 364 ] } ], @@ -196,7 +209,8 @@ 211, 251, 291, - 331 + 331, + 371 ] } ], @@ -211,7 +225,8 @@ 207, 247, 287, - 327 + 327, + 367 ] } ], @@ -225,7 +240,8 @@ 205, 245, 285, - 325 + 325, + 365 ] } ], @@ -239,7 +255,8 @@ 222, 262, 302, - 342 + 342, + 382 ] } ], @@ -253,7 +270,8 @@ 221, 261, 301, - 341 + 341, + 381 ] } ], @@ -267,7 +285,8 @@ 216, 256, 296, - 336 + 336, + 376 ] } ], @@ -281,7 +300,8 @@ 225, 265, 305, - 345 + 345, + 385 ] } ], diff --git a/gems/ast-crispr-ruby-prism/Gemfile b/gems/ast-crispr-ruby-prism/Gemfile index 4b95af676..43f132f05 100644 --- a/gems/ast-crispr-ruby-prism/Gemfile +++ b/gems/ast-crispr-ruby-prism/Gemfile @@ -351,6 +351,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/ast-crispr-ruby-prism/Gemfile.lock b/gems/ast-crispr-ruby-prism/Gemfile.lock index 95bd2e289..f71a1ee42 100644 --- a/gems/ast-crispr-ruby-prism/Gemfile.lock +++ b/gems/ast-crispr-ruby-prism/Gemfile.lock @@ -7,264 +7,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) ast-merge (= 7.1.0) service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -283,6 +32,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -291,8 +45,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -356,8 +108,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -386,7 +136,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-x86_64-linux-gnu) racc (~> 1.4) @@ -572,11 +321,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -619,44 +368,23 @@ DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -665,26 +393,18 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -692,23 +412,14 @@ CHECKSUMS appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -716,7 +427,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -729,27 +439,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-x86_64-linux-gnu) sha256=379fae440b28915e3f19d752ce2dcf8465ed2b2fbefd2a7ca0dd497bc981a06a nokogiri (1.19.4-x86_64-linux-musl) sha256=17dfb7c1fa194ae02fbf7c51a7afc8d278045ab3fdacfd86f91d02d7b274470b @@ -760,14 +462,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -775,7 +473,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -803,11 +500,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -817,7 +512,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -831,19 +525,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -851,7 +540,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ast-crispr/Gemfile.lock b/gems/ast-crispr/Gemfile.lock index 2760d97db..b731cdd46 100644 --- a/gems/ast-crispr/Gemfile.lock +++ b/gems/ast-crispr/Gemfile.lock @@ -7,7 +7,31 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -15,6 +39,232 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -41,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -104,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -132,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -325,11 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -377,23 +636,44 @@ DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -402,18 +682,26 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -421,13 +709,27 @@ CHECKSUMS appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -435,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -447,19 +750,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -474,10 +785,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -485,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -512,9 +828,11 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -524,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -537,14 +856,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -552,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From f93ef55cfdad38ec4a8e637d7c7bf4d9668b3b22 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 01:05:27 -0600 Subject: [PATCH 285/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-crispr-ruby-prism/Gemfile.lock | 334 +++++++++++++++++++++++- gems/markdown-merge/.kettle-drift.lock | 60 +++-- gems/markdown-merge/Gemfile | 40 +++ gems/markdown-merge/Gemfile.lock | 327 +---------------------- 4 files changed, 405 insertions(+), 356 deletions(-) diff --git a/gems/ast-crispr-ruby-prism/Gemfile.lock b/gems/ast-crispr-ruby-prism/Gemfile.lock index f71a1ee42..95bd2e289 100644 --- a/gems/ast-crispr-ruby-prism/Gemfile.lock +++ b/gems/ast-crispr-ruby-prism/Gemfile.lock @@ -7,13 +7,264 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: ast-crispr (7.1.0) ast-merge (= 7.1.0) service_actor (~> 3.9) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -32,11 +283,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -45,6 +291,8 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -108,6 +356,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -136,6 +386,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-x86_64-linux-gnu) racc (~> 1.4) @@ -321,11 +572,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -368,23 +619,44 @@ DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -393,18 +665,26 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -412,14 +692,23 @@ CHECKSUMS appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -427,6 +716,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -439,19 +729,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-x86_64-linux-gnu) sha256=379fae440b28915e3f19d752ce2dcf8465ed2b2fbefd2a7ca0dd497bc981a06a nokogiri (1.19.4-x86_64-linux-musl) sha256=17dfb7c1fa194ae02fbf7c51a7afc8d278045ab3fdacfd86f91d02d7b274470b @@ -462,10 +760,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -473,6 +775,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -500,9 +803,11 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -512,6 +817,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -525,14 +831,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -540,6 +851,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/markdown-merge/.kettle-drift.lock b/gems/markdown-merge/.kettle-drift.lock index 3aa07e7e9..09df60df7 100644 --- a/gems/markdown-merge/.kettle-drift.lock +++ b/gems/markdown-merge/.kettle-drift.lock @@ -9,7 +9,8 @@ 200, 240, 280, - 320 + 320, + 360 ] } ], @@ -23,7 +24,8 @@ 211, 251, 291, - 331 + 331, + 371 ] } ], @@ -37,7 +39,8 @@ 201, 241, 281, - 321 + 321, + 361 ] } ], @@ -51,7 +54,8 @@ 213, 253, 293, - 333 + 333, + 373 ] } ], @@ -65,7 +69,8 @@ 216, 256, 296, - 336 + 336, + 376 ] } ], @@ -79,7 +84,8 @@ 202, 242, 282, - 322 + 322, + 362 ] } ], @@ -94,7 +100,8 @@ 220, 260, 300, - 340 + 340, + 380 ] } ], @@ -108,7 +115,8 @@ 221, 261, 301, - 341 + 341, + 381 ] } ], @@ -123,7 +131,8 @@ 207, 247, 287, - 327 + 327, + 367 ] } ], @@ -137,7 +146,8 @@ 230, 270, 310, - 350 + 350, + 390 ] } ], @@ -152,7 +162,8 @@ 199, 239, 279, - 319 + 319, + 359 ] } ], @@ -167,7 +178,8 @@ 229, 269, 309, - 349 + 349, + 389 ] } ], @@ -181,7 +193,8 @@ 205, 245, 285, - 325 + 325, + 365 ] } ], @@ -196,7 +209,8 @@ 212, 252, 292, - 332 + 332, + 372 ] } ], @@ -211,7 +225,8 @@ 208, 248, 288, - 328 + 328, + 368 ] } ], @@ -225,7 +240,8 @@ 206, 246, 286, - 326 + 326, + 366 ] } ], @@ -239,7 +255,8 @@ 223, 263, 303, - 343 + 343, + 383 ] } ], @@ -253,7 +270,8 @@ 222, 262, 302, - 342 + 342, + 382 ] } ], @@ -267,7 +285,8 @@ 217, 257, 297, - 337 + 337, + 377 ] } ], @@ -281,7 +300,8 @@ 226, 266, 306, - 346 + 346, + 386 ] } ], diff --git a/gems/markdown-merge/Gemfile b/gems/markdown-merge/Gemfile index deb8ee463..9f0788f60 100644 --- a/gems/markdown-merge/Gemfile +++ b/gems/markdown-merge/Gemfile @@ -352,6 +352,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/markdown-merge/Gemfile.lock b/gems/markdown-merge/Gemfile.lock index 3e631c3cf..b1451146e 100644 --- a/gems/markdown-merge/Gemfile.lock +++ b/gems/markdown-merge/Gemfile.lock @@ -7,39 +7,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -48,193 +16,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -242,29 +24,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -291,12 +50,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -360,8 +113,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -390,7 +141,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -530,8 +280,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -584,11 +332,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -635,45 +378,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -682,54 +404,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -737,7 +437,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -750,27 +449,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -785,14 +477,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -800,7 +488,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -828,12 +515,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -842,7 +526,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,19 +539,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +554,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 52d942a52347f0e8b140cdd2d2fa0a11b6022540 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 01:05:58 -0600 Subject: [PATCH 286/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/markdown-merge/Gemfile.lock | 327 ++++++++++++++++++++++++- gems/markly-merge/.kettle-drift.lock | 60 +++-- gems/markly-merge/Gemfile | 40 ++++ gems/markly-merge/Gemfile.lock | 343 +-------------------------- 4 files changed, 416 insertions(+), 354 deletions(-) diff --git a/gems/markdown-merge/Gemfile.lock b/gems/markdown-merge/Gemfile.lock index b1451146e..3e631c3cf 100644 --- a/gems/markdown-merge/Gemfile.lock +++ b/gems/markdown-merge/Gemfile.lock @@ -7,7 +7,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -16,7 +48,193 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -24,6 +242,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -50,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -113,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -141,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -280,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -332,6 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -378,24 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -404,32 +682,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -437,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -449,20 +750,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -477,10 +785,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -488,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -515,9 +828,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -526,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -539,14 +856,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -554,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/markly-merge/.kettle-drift.lock b/gems/markly-merge/.kettle-drift.lock index 309d406e1..aa01ca527 100644 --- a/gems/markly-merge/.kettle-drift.lock +++ b/gems/markly-merge/.kettle-drift.lock @@ -9,7 +9,8 @@ 199, 239, 279, - 319 + 319, + 359 ] } ], @@ -23,7 +24,8 @@ 210, 250, 290, - 330 + 330, + 370 ] } ], @@ -37,7 +39,8 @@ 200, 240, 280, - 320 + 320, + 360 ] } ], @@ -51,7 +54,8 @@ 212, 252, 292, - 332 + 332, + 372 ] } ], @@ -65,7 +69,8 @@ 215, 255, 295, - 335 + 335, + 375 ] } ], @@ -79,7 +84,8 @@ 201, 241, 281, - 321 + 321, + 361 ] } ], @@ -94,7 +100,8 @@ 219, 259, 299, - 339 + 339, + 379 ] } ], @@ -108,7 +115,8 @@ 220, 260, 300, - 340 + 340, + 380 ] } ], @@ -123,7 +131,8 @@ 206, 246, 286, - 326 + 326, + 366 ] } ], @@ -137,7 +146,8 @@ 229, 269, 309, - 349 + 349, + 389 ] } ], @@ -152,7 +162,8 @@ 198, 238, 278, - 318 + 318, + 358 ] } ], @@ -167,7 +178,8 @@ 228, 268, 308, - 348 + 348, + 388 ] } ], @@ -181,7 +193,8 @@ 204, 244, 284, - 324 + 324, + 364 ] } ], @@ -196,7 +209,8 @@ 211, 251, 291, - 331 + 331, + 371 ] } ], @@ -211,7 +225,8 @@ 207, 247, 287, - 327 + 327, + 367 ] } ], @@ -225,7 +240,8 @@ 205, 245, 285, - 325 + 325, + 365 ] } ], @@ -239,7 +255,8 @@ 222, 262, 302, - 342 + 342, + 382 ] } ], @@ -253,7 +270,8 @@ 221, 261, 301, - 341 + 341, + 381 ] } ], @@ -267,7 +285,8 @@ 216, 256, 296, - 336 + 336, + 376 ] } ], @@ -281,7 +300,8 @@ 225, 265, 305, - 345 + 345, + 385 ] } ], diff --git a/gems/markly-merge/Gemfile b/gems/markly-merge/Gemfile index 285849f50..6ba032869 100644 --- a/gems/markly-merge/Gemfile +++ b/gems/markly-merge/Gemfile @@ -351,6 +351,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/markly-merge/Gemfile.lock b/gems/markly-merge/Gemfile.lock index 31b99ab8d..38b789f7e 100644 --- a/gems/markly-merge/Gemfile.lock +++ b/gems/markly-merge/Gemfile.lock @@ -7,264 +7,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -283,6 +32,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -291,12 +45,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -360,8 +108,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -530,8 +276,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -584,11 +328,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -635,45 +379,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -682,54 +405,31 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -737,7 +437,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -750,20 +449,15 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 @@ -785,14 +479,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -800,7 +490,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -828,12 +517,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -842,7 +528,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,19 +541,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +556,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 419f0889909241d3b3f54cded684cfaef35d801c Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 01:06:28 -0600 Subject: [PATCH 287/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../.kettle-drift.lock | 60 ++- gems/ast-crispr-markdown-markly/Gemfile | 40 ++ gems/ast-crispr-markdown-markly/Gemfile.lock | 335 +---------------- gems/markly-merge/Gemfile.lock | 343 +++++++++++++++++- 4 files changed, 428 insertions(+), 350 deletions(-) diff --git a/gems/ast-crispr-markdown-markly/.kettle-drift.lock b/gems/ast-crispr-markdown-markly/.kettle-drift.lock index 3aa07e7e9..09df60df7 100644 --- a/gems/ast-crispr-markdown-markly/.kettle-drift.lock +++ b/gems/ast-crispr-markdown-markly/.kettle-drift.lock @@ -9,7 +9,8 @@ 200, 240, 280, - 320 + 320, + 360 ] } ], @@ -23,7 +24,8 @@ 211, 251, 291, - 331 + 331, + 371 ] } ], @@ -37,7 +39,8 @@ 201, 241, 281, - 321 + 321, + 361 ] } ], @@ -51,7 +54,8 @@ 213, 253, 293, - 333 + 333, + 373 ] } ], @@ -65,7 +69,8 @@ 216, 256, 296, - 336 + 336, + 376 ] } ], @@ -79,7 +84,8 @@ 202, 242, 282, - 322 + 322, + 362 ] } ], @@ -94,7 +100,8 @@ 220, 260, 300, - 340 + 340, + 380 ] } ], @@ -108,7 +115,8 @@ 221, 261, 301, - 341 + 341, + 381 ] } ], @@ -123,7 +131,8 @@ 207, 247, 287, - 327 + 327, + 367 ] } ], @@ -137,7 +146,8 @@ 230, 270, 310, - 350 + 350, + 390 ] } ], @@ -152,7 +162,8 @@ 199, 239, 279, - 319 + 319, + 359 ] } ], @@ -167,7 +178,8 @@ 229, 269, 309, - 349 + 349, + 389 ] } ], @@ -181,7 +193,8 @@ 205, 245, 285, - 325 + 325, + 365 ] } ], @@ -196,7 +209,8 @@ 212, 252, 292, - 332 + 332, + 372 ] } ], @@ -211,7 +225,8 @@ 208, 248, 288, - 328 + 328, + 368 ] } ], @@ -225,7 +240,8 @@ 206, 246, 286, - 326 + 326, + 366 ] } ], @@ -239,7 +255,8 @@ 223, 263, 303, - 343 + 343, + 383 ] } ], @@ -253,7 +270,8 @@ 222, 262, 302, - 342 + 342, + 382 ] } ], @@ -267,7 +285,8 @@ 217, 257, 297, - 337 + 337, + 377 ] } ], @@ -281,7 +300,8 @@ 226, 266, 306, - 346 + 346, + 386 ] } ], diff --git a/gems/ast-crispr-markdown-markly/Gemfile b/gems/ast-crispr-markdown-markly/Gemfile index 27a154bb3..86b7488a2 100644 --- a/gems/ast-crispr-markdown-markly/Gemfile +++ b/gems/ast-crispr-markdown-markly/Gemfile @@ -352,6 +352,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/ast-crispr-markdown-markly/Gemfile.lock b/gems/ast-crispr-markdown-markly/Gemfile.lock index d12e8b14c..8d6bd15a9 100644 --- a/gems/ast-crispr-markdown-markly/Gemfile.lock +++ b/gems/ast-crispr-markdown-markly/Gemfile.lock @@ -7,15 +7,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) ast-merge (= 7.1.0) @@ -23,248 +15,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) markdown-merge (= 7.1.0) markly (~> 0.9) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -283,6 +40,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -291,12 +53,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -360,8 +116,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -390,6 +144,10 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) @@ -584,11 +342,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -637,43 +395,23 @@ DEPENDENCIES appraisal2 (~> 3.0, >= 3.0.6) 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -682,26 +420,18 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -710,26 +440,13 @@ CHECKSUMS ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -737,7 +454,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -750,20 +466,15 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 @@ -785,14 +496,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -800,7 +507,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -828,11 +534,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -842,7 +546,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,19 +559,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +574,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/markly-merge/Gemfile.lock b/gems/markly-merge/Gemfile.lock index 38b789f7e..31b99ab8d 100644 --- a/gems/markly-merge/Gemfile.lock +++ b/gems/markly-merge/Gemfile.lock @@ -7,13 +7,264 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: markdown-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -32,11 +283,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -45,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -108,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -276,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -328,11 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -379,24 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -405,31 +682,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -437,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -449,15 +750,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 @@ -479,10 +785,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -490,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -517,9 +828,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -528,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -541,14 +856,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -556,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 4a3e13df1545b50cd62407e7cb5dd19ab1015168 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 01:06:58 -0600 Subject: [PATCH 288/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-crispr-markdown-markly/Gemfile.lock | 335 ++++++++++++++++++- gems/json-merge/.kettle-drift.lock | 60 ++-- gems/json-merge/Gemfile | 40 +++ gems/json-merge/Gemfile.lock | 327 +----------------- 4 files changed, 401 insertions(+), 361 deletions(-) diff --git a/gems/ast-crispr-markdown-markly/Gemfile.lock b/gems/ast-crispr-markdown-markly/Gemfile.lock index 8d6bd15a9..d12e8b14c 100644 --- a/gems/ast-crispr-markdown-markly/Gemfile.lock +++ b/gems/ast-crispr-markdown-markly/Gemfile.lock @@ -7,7 +7,15 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr specs: ast-crispr (7.1.0) ast-merge (= 7.1.0) @@ -15,13 +23,248 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: markly-merge (7.1.0) markdown-merge (= 7.1.0) markly (~> 0.9) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -40,11 +283,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -53,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -116,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -144,10 +390,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) @@ -342,11 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -395,23 +637,43 @@ DEPENDENCIES appraisal2 (~> 3.0, >= 3.0.6) 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -420,18 +682,26 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -440,13 +710,26 @@ CHECKSUMS ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 ast-crispr (7.1.0) ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -454,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -466,15 +750,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0 lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 @@ -496,10 +785,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -507,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -534,9 +828,11 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -546,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -559,14 +856,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -574,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/json-merge/.kettle-drift.lock b/gems/json-merge/.kettle-drift.lock index 09df60df7..e3a4ed60c 100644 --- a/gems/json-merge/.kettle-drift.lock +++ b/gems/json-merge/.kettle-drift.lock @@ -10,7 +10,8 @@ 240, 280, 320, - 360 + 360, + 400 ] } ], @@ -25,7 +26,8 @@ 251, 291, 331, - 371 + 371, + 411 ] } ], @@ -40,7 +42,8 @@ 241, 281, 321, - 361 + 361, + 401 ] } ], @@ -55,7 +58,8 @@ 253, 293, 333, - 373 + 373, + 413 ] } ], @@ -70,7 +74,8 @@ 256, 296, 336, - 376 + 376, + 416 ] } ], @@ -85,7 +90,8 @@ 242, 282, 322, - 362 + 362, + 402 ] } ], @@ -101,7 +107,8 @@ 260, 300, 340, - 380 + 380, + 420 ] } ], @@ -116,7 +123,8 @@ 261, 301, 341, - 381 + 381, + 421 ] } ], @@ -132,7 +140,8 @@ 247, 287, 327, - 367 + 367, + 407 ] } ], @@ -147,7 +156,8 @@ 270, 310, 350, - 390 + 390, + 430 ] } ], @@ -163,7 +173,8 @@ 239, 279, 319, - 359 + 359, + 399 ] } ], @@ -179,7 +190,8 @@ 269, 309, 349, - 389 + 389, + 429 ] } ], @@ -194,7 +206,8 @@ 245, 285, 325, - 365 + 365, + 405 ] } ], @@ -210,7 +223,8 @@ 252, 292, 332, - 372 + 372, + 412 ] } ], @@ -226,7 +240,8 @@ 248, 288, 328, - 368 + 368, + 408 ] } ], @@ -241,7 +256,8 @@ 246, 286, 326, - 366 + 366, + 406 ] } ], @@ -256,7 +272,8 @@ 263, 303, 343, - 383 + 383, + 423 ] } ], @@ -271,7 +288,8 @@ 262, 302, 342, - 382 + 382, + 422 ] } ], @@ -286,7 +304,8 @@ 257, 297, 337, - 377 + 377, + 417 ] } ], @@ -301,7 +320,8 @@ 266, 306, 346, - 386 + 386, + 426 ] } ], diff --git a/gems/json-merge/Gemfile b/gems/json-merge/Gemfile index d19d1187d..1b8188be8 100644 --- a/gems/json-merge/Gemfile +++ b/gems/json-merge/Gemfile @@ -392,6 +392,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/json-merge/Gemfile.lock b/gems/json-merge/Gemfile.lock index a683d58ae..65c1bae1f 100644 --- a/gems/json-merge/Gemfile.lock +++ b/gems/json-merge/Gemfile.lock @@ -7,39 +7,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -48,193 +16,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -242,29 +24,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -291,12 +50,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -360,8 +113,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -390,7 +141,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -530,8 +280,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -584,11 +332,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -635,45 +378,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -682,54 +404,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -737,7 +437,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -750,27 +449,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -785,14 +477,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -800,7 +488,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -828,12 +515,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -842,7 +526,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,19 +539,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +554,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 6ab8546a2d22e50aae0d06ea1db4b6d2e416ba77 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 01:07:27 -0600 Subject: [PATCH 289/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-merge-git/.kettle-drift.lock | 60 +++-- gems/ast-merge-git/Gemfile | 40 ++++ gems/ast-merge-git/Gemfile.lock | 332 +------------------------- gems/json-merge/Gemfile.lock | 327 ++++++++++++++++++++++++- 4 files changed, 412 insertions(+), 347 deletions(-) diff --git a/gems/ast-merge-git/.kettle-drift.lock b/gems/ast-merge-git/.kettle-drift.lock index 09df60df7..e3a4ed60c 100644 --- a/gems/ast-merge-git/.kettle-drift.lock +++ b/gems/ast-merge-git/.kettle-drift.lock @@ -10,7 +10,8 @@ 240, 280, 320, - 360 + 360, + 400 ] } ], @@ -25,7 +26,8 @@ 251, 291, 331, - 371 + 371, + 411 ] } ], @@ -40,7 +42,8 @@ 241, 281, 321, - 361 + 361, + 401 ] } ], @@ -55,7 +58,8 @@ 253, 293, 333, - 373 + 373, + 413 ] } ], @@ -70,7 +74,8 @@ 256, 296, 336, - 376 + 376, + 416 ] } ], @@ -85,7 +90,8 @@ 242, 282, 322, - 362 + 362, + 402 ] } ], @@ -101,7 +107,8 @@ 260, 300, 340, - 380 + 380, + 420 ] } ], @@ -116,7 +123,8 @@ 261, 301, 341, - 381 + 381, + 421 ] } ], @@ -132,7 +140,8 @@ 247, 287, 327, - 367 + 367, + 407 ] } ], @@ -147,7 +156,8 @@ 270, 310, 350, - 390 + 390, + 430 ] } ], @@ -163,7 +173,8 @@ 239, 279, 319, - 359 + 359, + 399 ] } ], @@ -179,7 +190,8 @@ 269, 309, 349, - 389 + 389, + 429 ] } ], @@ -194,7 +206,8 @@ 245, 285, 325, - 365 + 365, + 405 ] } ], @@ -210,7 +223,8 @@ 252, 292, 332, - 372 + 372, + 412 ] } ], @@ -226,7 +240,8 @@ 248, 288, 328, - 368 + 368, + 408 ] } ], @@ -241,7 +256,8 @@ 246, 286, 326, - 366 + 366, + 406 ] } ], @@ -256,7 +272,8 @@ 263, 303, 343, - 383 + 383, + 423 ] } ], @@ -271,7 +288,8 @@ 262, 302, 342, - 382 + 382, + 422 ] } ], @@ -286,7 +304,8 @@ 257, 297, 337, - 377 + 377, + 417 ] } ], @@ -301,7 +320,8 @@ 266, 306, 346, - 386 + 386, + 426 ] } ], diff --git a/gems/ast-merge-git/Gemfile b/gems/ast-merge-git/Gemfile index 105394aa3..d8a97d415 100644 --- a/gems/ast-merge-git/Gemfile +++ b/gems/ast-merge-git/Gemfile @@ -392,6 +392,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/ast-merge-git/Gemfile.lock b/gems/ast-merge-git/Gemfile.lock index 16d75f3d7..36a221e10 100644 --- a/gems/ast-merge-git/Gemfile.lock +++ b/gems/ast-merge-git/Gemfile.lock @@ -7,31 +7,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -40,231 +16,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: json-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -291,12 +49,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -360,8 +112,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -390,7 +140,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -530,8 +279,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -584,11 +331,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -635,45 +382,25 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -682,54 +409,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -737,7 +442,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -750,27 +454,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -785,14 +482,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -800,7 +493,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -828,12 +520,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -842,7 +531,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,19 +544,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +559,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/json-merge/Gemfile.lock b/gems/json-merge/Gemfile.lock index 65c1bae1f..a683d58ae 100644 --- a/gems/json-merge/Gemfile.lock +++ b/gems/json-merge/Gemfile.lock @@ -7,7 +7,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -16,7 +48,193 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -24,6 +242,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -50,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -113,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -141,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -280,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -332,6 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -378,24 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -404,32 +682,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -437,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -449,20 +750,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -477,10 +785,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -488,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -515,9 +828,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -526,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -539,14 +856,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -554,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 4b7f3b19ebd3f8bd9191e86f701d9d737c7f8517 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 01:07:56 -0600 Subject: [PATCH 290/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-merge-git/Gemfile.lock | 332 +++++++++++++++++++++++++++- gems/plain-merge/.kettle-drift.lock | 60 +++-- gems/plain-merge/Gemfile | 40 ++++ gems/plain-merge/Gemfile.lock | 327 +-------------------------- 4 files changed, 407 insertions(+), 352 deletions(-) diff --git a/gems/ast-merge-git/Gemfile.lock b/gems/ast-merge-git/Gemfile.lock index 36a221e10..16d75f3d7 100644 --- a/gems/ast-merge-git/Gemfile.lock +++ b/gems/ast-merge-git/Gemfile.lock @@ -7,7 +7,31 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -16,13 +40,231 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: json-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -49,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -112,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -140,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -279,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -331,11 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -382,25 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -409,32 +682,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -442,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -454,20 +750,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -482,10 +785,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -493,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -520,9 +828,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -531,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -544,14 +856,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -559,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/plain-merge/.kettle-drift.lock b/gems/plain-merge/.kettle-drift.lock index 09df60df7..e3a4ed60c 100644 --- a/gems/plain-merge/.kettle-drift.lock +++ b/gems/plain-merge/.kettle-drift.lock @@ -10,7 +10,8 @@ 240, 280, 320, - 360 + 360, + 400 ] } ], @@ -25,7 +26,8 @@ 251, 291, 331, - 371 + 371, + 411 ] } ], @@ -40,7 +42,8 @@ 241, 281, 321, - 361 + 361, + 401 ] } ], @@ -55,7 +58,8 @@ 253, 293, 333, - 373 + 373, + 413 ] } ], @@ -70,7 +74,8 @@ 256, 296, 336, - 376 + 376, + 416 ] } ], @@ -85,7 +90,8 @@ 242, 282, 322, - 362 + 362, + 402 ] } ], @@ -101,7 +107,8 @@ 260, 300, 340, - 380 + 380, + 420 ] } ], @@ -116,7 +123,8 @@ 261, 301, 341, - 381 + 381, + 421 ] } ], @@ -132,7 +140,8 @@ 247, 287, 327, - 367 + 367, + 407 ] } ], @@ -147,7 +156,8 @@ 270, 310, 350, - 390 + 390, + 430 ] } ], @@ -163,7 +173,8 @@ 239, 279, 319, - 359 + 359, + 399 ] } ], @@ -179,7 +190,8 @@ 269, 309, 349, - 389 + 389, + 429 ] } ], @@ -194,7 +206,8 @@ 245, 285, 325, - 365 + 365, + 405 ] } ], @@ -210,7 +223,8 @@ 252, 292, 332, - 372 + 372, + 412 ] } ], @@ -226,7 +240,8 @@ 248, 288, 328, - 368 + 368, + 408 ] } ], @@ -241,7 +256,8 @@ 246, 286, 326, - 366 + 366, + 406 ] } ], @@ -256,7 +272,8 @@ 263, 303, 343, - 383 + 383, + 423 ] } ], @@ -271,7 +288,8 @@ 262, 302, 342, - 382 + 382, + 422 ] } ], @@ -286,7 +304,8 @@ 257, 297, 337, - 377 + 377, + 417 ] } ], @@ -301,7 +320,8 @@ 266, 306, 346, - 386 + 386, + 426 ] } ], diff --git a/gems/plain-merge/Gemfile b/gems/plain-merge/Gemfile index 6a02f399d..b8cfb745a 100644 --- a/gems/plain-merge/Gemfile +++ b/gems/plain-merge/Gemfile @@ -392,6 +392,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/plain-merge/Gemfile.lock b/gems/plain-merge/Gemfile.lock index a05995f79..79234d5aa 100644 --- a/gems/plain-merge/Gemfile.lock +++ b/gems/plain-merge/Gemfile.lock @@ -7,39 +7,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -48,193 +16,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -242,29 +24,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -291,12 +50,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -360,8 +113,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -390,7 +141,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -530,8 +280,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -584,11 +332,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -635,45 +378,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -682,54 +404,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -737,7 +437,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -750,27 +449,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -785,14 +476,11 @@ 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.0) plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -800,7 +488,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -828,12 +515,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -842,7 +526,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,19 +539,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +554,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 0d774ab125dba92307db855ec94f9acc69de54e5 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 01:08:27 -0600 Subject: [PATCH 291/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/bash-merge/.kettle-drift.lock | 60 ++++-- gems/bash-merge/Gemfile | 40 ++++ gems/bash-merge/Gemfile.lock | 327 +---------------------------- gems/plain-merge/Gemfile.lock | 327 ++++++++++++++++++++++++++++- 4 files changed, 407 insertions(+), 347 deletions(-) diff --git a/gems/bash-merge/.kettle-drift.lock b/gems/bash-merge/.kettle-drift.lock index 3aa07e7e9..09df60df7 100644 --- a/gems/bash-merge/.kettle-drift.lock +++ b/gems/bash-merge/.kettle-drift.lock @@ -9,7 +9,8 @@ 200, 240, 280, - 320 + 320, + 360 ] } ], @@ -23,7 +24,8 @@ 211, 251, 291, - 331 + 331, + 371 ] } ], @@ -37,7 +39,8 @@ 201, 241, 281, - 321 + 321, + 361 ] } ], @@ -51,7 +54,8 @@ 213, 253, 293, - 333 + 333, + 373 ] } ], @@ -65,7 +69,8 @@ 216, 256, 296, - 336 + 336, + 376 ] } ], @@ -79,7 +84,8 @@ 202, 242, 282, - 322 + 322, + 362 ] } ], @@ -94,7 +100,8 @@ 220, 260, 300, - 340 + 340, + 380 ] } ], @@ -108,7 +115,8 @@ 221, 261, 301, - 341 + 341, + 381 ] } ], @@ -123,7 +131,8 @@ 207, 247, 287, - 327 + 327, + 367 ] } ], @@ -137,7 +146,8 @@ 230, 270, 310, - 350 + 350, + 390 ] } ], @@ -152,7 +162,8 @@ 199, 239, 279, - 319 + 319, + 359 ] } ], @@ -167,7 +178,8 @@ 229, 269, 309, - 349 + 349, + 389 ] } ], @@ -181,7 +193,8 @@ 205, 245, 285, - 325 + 325, + 365 ] } ], @@ -196,7 +209,8 @@ 212, 252, 292, - 332 + 332, + 372 ] } ], @@ -211,7 +225,8 @@ 208, 248, 288, - 328 + 328, + 368 ] } ], @@ -225,7 +240,8 @@ 206, 246, 286, - 326 + 326, + 366 ] } ], @@ -239,7 +255,8 @@ 223, 263, 303, - 343 + 343, + 383 ] } ], @@ -253,7 +270,8 @@ 222, 262, 302, - 342 + 342, + 382 ] } ], @@ -267,7 +285,8 @@ 217, 257, 297, - 337 + 337, + 377 ] } ], @@ -281,7 +300,8 @@ 226, 266, 306, - 346 + 346, + 386 ] } ], diff --git a/gems/bash-merge/Gemfile b/gems/bash-merge/Gemfile index 2951cc69d..7e465932f 100644 --- a/gems/bash-merge/Gemfile +++ b/gems/bash-merge/Gemfile @@ -352,6 +352,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/bash-merge/Gemfile.lock b/gems/bash-merge/Gemfile.lock index 73b5f4c15..8e60323d7 100644 --- a/gems/bash-merge/Gemfile.lock +++ b/gems/bash-merge/Gemfile.lock @@ -7,39 +7,7 @@ PATH version_gem (~> 1.1, >= 1.1.14) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -48,193 +16,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -242,29 +24,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -291,12 +50,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -360,8 +113,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -390,7 +141,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -530,8 +280,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -584,11 +332,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -635,45 +378,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.2, >= 3.2.0) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.3, >= 2.3.7) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -682,55 +404,34 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.2, >= 3.2.0) - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -738,7 +439,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -751,27 +451,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -786,14 +478,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -801,7 +489,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -829,12 +516,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -843,7 +527,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -857,19 +540,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -877,7 +555,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/plain-merge/Gemfile.lock b/gems/plain-merge/Gemfile.lock index 79234d5aa..a05995f79 100644 --- a/gems/plain-merge/Gemfile.lock +++ b/gems/plain-merge/Gemfile.lock @@ -7,7 +7,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -16,7 +48,193 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -24,6 +242,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -50,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -113,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -141,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -280,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -332,6 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -378,24 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -404,32 +682,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -437,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -449,19 +750,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -476,11 +785,14 @@ 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.0) plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -488,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -515,9 +828,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -526,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -539,14 +856,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -554,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From fe739101c44b741c2d523995af1c6ea1a4780510 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 01:08:57 -0600 Subject: [PATCH 292/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/bash-merge/Gemfile.lock | 327 ++++++++++++++++++++++++++- gems/dotenv-merge/.kettle-drift.lock | 60 +++-- gems/dotenv-merge/Gemfile | 40 ++++ gems/dotenv-merge/Gemfile.lock | 327 +-------------------------- 4 files changed, 407 insertions(+), 347 deletions(-) diff --git a/gems/bash-merge/Gemfile.lock b/gems/bash-merge/Gemfile.lock index 8e60323d7..73b5f4c15 100644 --- a/gems/bash-merge/Gemfile.lock +++ b/gems/bash-merge/Gemfile.lock @@ -7,7 +7,39 @@ PATH version_gem (~> 1.1, >= 1.1.14) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -16,7 +48,193 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -24,6 +242,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -50,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -113,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -141,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -280,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -332,6 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -378,24 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.2, >= 3.2.0) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.3, >= 2.3.7) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -404,34 +682,55 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.2, >= 3.2.0) + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -439,6 +738,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -451,19 +751,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -478,10 +786,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -489,6 +801,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -516,9 +829,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -527,6 +843,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -540,14 +857,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -555,6 +877,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/dotenv-merge/.kettle-drift.lock b/gems/dotenv-merge/.kettle-drift.lock index 3aa07e7e9..09df60df7 100644 --- a/gems/dotenv-merge/.kettle-drift.lock +++ b/gems/dotenv-merge/.kettle-drift.lock @@ -9,7 +9,8 @@ 200, 240, 280, - 320 + 320, + 360 ] } ], @@ -23,7 +24,8 @@ 211, 251, 291, - 331 + 331, + 371 ] } ], @@ -37,7 +39,8 @@ 201, 241, 281, - 321 + 321, + 361 ] } ], @@ -51,7 +54,8 @@ 213, 253, 293, - 333 + 333, + 373 ] } ], @@ -65,7 +69,8 @@ 216, 256, 296, - 336 + 336, + 376 ] } ], @@ -79,7 +84,8 @@ 202, 242, 282, - 322 + 322, + 362 ] } ], @@ -94,7 +100,8 @@ 220, 260, 300, - 340 + 340, + 380 ] } ], @@ -108,7 +115,8 @@ 221, 261, 301, - 341 + 341, + 381 ] } ], @@ -123,7 +131,8 @@ 207, 247, 287, - 327 + 327, + 367 ] } ], @@ -137,7 +146,8 @@ 230, 270, 310, - 350 + 350, + 390 ] } ], @@ -152,7 +162,8 @@ 199, 239, 279, - 319 + 319, + 359 ] } ], @@ -167,7 +178,8 @@ 229, 269, 309, - 349 + 349, + 389 ] } ], @@ -181,7 +193,8 @@ 205, 245, 285, - 325 + 325, + 365 ] } ], @@ -196,7 +209,8 @@ 212, 252, 292, - 332 + 332, + 372 ] } ], @@ -211,7 +225,8 @@ 208, 248, 288, - 328 + 328, + 368 ] } ], @@ -225,7 +240,8 @@ 206, 246, 286, - 326 + 326, + 366 ] } ], @@ -239,7 +255,8 @@ 223, 263, 303, - 343 + 343, + 383 ] } ], @@ -253,7 +270,8 @@ 222, 262, 302, - 342 + 342, + 382 ] } ], @@ -267,7 +285,8 @@ 217, 257, 297, - 337 + 337, + 377 ] } ], @@ -281,7 +300,8 @@ 226, 266, 306, - 346 + 346, + 386 ] } ], diff --git a/gems/dotenv-merge/Gemfile b/gems/dotenv-merge/Gemfile index 6db2461e9..65f59a20f 100644 --- a/gems/dotenv-merge/Gemfile +++ b/gems/dotenv-merge/Gemfile @@ -352,6 +352,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/dotenv-merge/Gemfile.lock b/gems/dotenv-merge/Gemfile.lock index ac8f78052..0b28e5db7 100644 --- a/gems/dotenv-merge/Gemfile.lock +++ b/gems/dotenv-merge/Gemfile.lock @@ -7,39 +7,7 @@ PATH version_gem (~> 1.1, >= 1.1.14) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -48,193 +16,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -242,29 +24,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -291,12 +50,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -360,8 +113,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -390,7 +141,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -530,8 +280,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -584,11 +332,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -635,45 +378,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.2, >= 3.2.0) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.3, >= 2.3.7) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -682,55 +404,33 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.2, >= 3.2.0) - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -751,27 +451,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -786,14 +478,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -801,7 +489,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -829,12 +516,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -843,7 +527,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -857,19 +540,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -877,7 +555,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 9a823823e1a5a9eec02dcb55bc0a52624ff5c0db Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 01:09:30 -0600 Subject: [PATCH 293/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/dotenv-merge/Gemfile.lock | 327 +++++++++++++++++++++++++++++- gems/rbs-merge/.kettle-drift.lock | 60 ++++-- gems/rbs-merge/Gemfile | 40 ++++ gems/rbs-merge/Gemfile.lock | 324 +---------------------------- 4 files changed, 407 insertions(+), 344 deletions(-) diff --git a/gems/dotenv-merge/Gemfile.lock b/gems/dotenv-merge/Gemfile.lock index 0b28e5db7..ac8f78052 100644 --- a/gems/dotenv-merge/Gemfile.lock +++ b/gems/dotenv-merge/Gemfile.lock @@ -7,7 +7,39 @@ PATH version_gem (~> 1.1, >= 1.1.14) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -16,7 +48,193 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -24,6 +242,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -50,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -113,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -141,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -280,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -332,6 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -378,24 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.2, >= 3.2.0) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.3, >= 2.3.7) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -404,33 +682,55 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.2, >= 3.2.0) + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -451,19 +751,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -478,10 +786,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -489,6 +801,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -516,9 +829,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -527,6 +843,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -540,14 +857,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -555,6 +877,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/rbs-merge/.kettle-drift.lock b/gems/rbs-merge/.kettle-drift.lock index 3aa07e7e9..09df60df7 100644 --- a/gems/rbs-merge/.kettle-drift.lock +++ b/gems/rbs-merge/.kettle-drift.lock @@ -9,7 +9,8 @@ 200, 240, 280, - 320 + 320, + 360 ] } ], @@ -23,7 +24,8 @@ 211, 251, 291, - 331 + 331, + 371 ] } ], @@ -37,7 +39,8 @@ 201, 241, 281, - 321 + 321, + 361 ] } ], @@ -51,7 +54,8 @@ 213, 253, 293, - 333 + 333, + 373 ] } ], @@ -65,7 +69,8 @@ 216, 256, 296, - 336 + 336, + 376 ] } ], @@ -79,7 +84,8 @@ 202, 242, 282, - 322 + 322, + 362 ] } ], @@ -94,7 +100,8 @@ 220, 260, 300, - 340 + 340, + 380 ] } ], @@ -108,7 +115,8 @@ 221, 261, 301, - 341 + 341, + 381 ] } ], @@ -123,7 +131,8 @@ 207, 247, 287, - 327 + 327, + 367 ] } ], @@ -137,7 +146,8 @@ 230, 270, 310, - 350 + 350, + 390 ] } ], @@ -152,7 +162,8 @@ 199, 239, 279, - 319 + 319, + 359 ] } ], @@ -167,7 +178,8 @@ 229, 269, 309, - 349 + 349, + 389 ] } ], @@ -181,7 +193,8 @@ 205, 245, 285, - 325 + 325, + 365 ] } ], @@ -196,7 +209,8 @@ 212, 252, 292, - 332 + 332, + 372 ] } ], @@ -211,7 +225,8 @@ 208, 248, 288, - 328 + 328, + 368 ] } ], @@ -225,7 +240,8 @@ 206, 246, 286, - 326 + 326, + 366 ] } ], @@ -239,7 +255,8 @@ 223, 263, 303, - 343 + 343, + 383 ] } ], @@ -253,7 +270,8 @@ 222, 262, 302, - 342 + 342, + 382 ] } ], @@ -267,7 +285,8 @@ 217, 257, 297, - 337 + 337, + 377 ] } ], @@ -281,7 +300,8 @@ 226, 266, 306, - 346 + 346, + 386 ] } ], diff --git a/gems/rbs-merge/Gemfile b/gems/rbs-merge/Gemfile index e4b7b6dcd..ca3957a12 100644 --- a/gems/rbs-merge/Gemfile +++ b/gems/rbs-merge/Gemfile @@ -352,6 +352,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/rbs-merge/Gemfile.lock b/gems/rbs-merge/Gemfile.lock index 7576f4ca6..7b667854e 100644 --- a/gems/rbs-merge/Gemfile.lock +++ b/gems/rbs-merge/Gemfile.lock @@ -8,39 +8,7 @@ PATH version_gem (~> 1.1, >= 1.1.14) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -49,192 +17,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -242,29 +25,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -291,11 +51,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -359,8 +114,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -389,7 +142,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -527,8 +279,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -581,11 +331,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -632,42 +377,21 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.2, >= 3.2.0) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.3, >= 2.3.7) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) rbs-merge! @@ -679,54 +403,33 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.2, >= 3.2.0) - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -734,7 +437,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -747,27 +449,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -781,14 +475,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -824,12 +514,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -838,7 +525,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -852,19 +538,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -872,7 +553,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 781827895d7fc44f4d14b314ad97cb0e4d30f309 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 01:09:58 -0600 Subject: [PATCH 294/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/rbs-merge/Gemfile.lock | 324 +++++++++++++++++++++++++++- gems/yaml-merge/.kettle-drift.lock | 60 ++++-- gems/yaml-merge/Gemfile | 40 ++++ gems/yaml-merge/Gemfile.lock | 327 +---------------------------- 4 files changed, 404 insertions(+), 347 deletions(-) diff --git a/gems/rbs-merge/Gemfile.lock b/gems/rbs-merge/Gemfile.lock index 7b667854e..7576f4ca6 100644 --- a/gems/rbs-merge/Gemfile.lock +++ b/gems/rbs-merge/Gemfile.lock @@ -8,7 +8,39 @@ PATH version_gem (~> 1.1, >= 1.1.14) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -17,7 +49,192 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -25,6 +242,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -51,6 +291,11 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -114,6 +359,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -142,6 +389,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -279,6 +527,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -331,6 +581,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -377,21 +632,42 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.2, >= 3.2.0) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.3, >= 2.3.7) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.11) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) rbs-merge! @@ -403,33 +679,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.6, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! turbo_tests2 (~> 3.2, >= 3.2.0) + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -437,6 +734,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -449,19 +747,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -475,10 +781,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -514,9 +824,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -525,6 +838,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -538,14 +852,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -553,6 +872,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/yaml-merge/.kettle-drift.lock b/gems/yaml-merge/.kettle-drift.lock index 3aa07e7e9..09df60df7 100644 --- a/gems/yaml-merge/.kettle-drift.lock +++ b/gems/yaml-merge/.kettle-drift.lock @@ -9,7 +9,8 @@ 200, 240, 280, - 320 + 320, + 360 ] } ], @@ -23,7 +24,8 @@ 211, 251, 291, - 331 + 331, + 371 ] } ], @@ -37,7 +39,8 @@ 201, 241, 281, - 321 + 321, + 361 ] } ], @@ -51,7 +54,8 @@ 213, 253, 293, - 333 + 333, + 373 ] } ], @@ -65,7 +69,8 @@ 216, 256, 296, - 336 + 336, + 376 ] } ], @@ -79,7 +84,8 @@ 202, 242, 282, - 322 + 322, + 362 ] } ], @@ -94,7 +100,8 @@ 220, 260, 300, - 340 + 340, + 380 ] } ], @@ -108,7 +115,8 @@ 221, 261, 301, - 341 + 341, + 381 ] } ], @@ -123,7 +131,8 @@ 207, 247, 287, - 327 + 327, + 367 ] } ], @@ -137,7 +146,8 @@ 230, 270, 310, - 350 + 350, + 390 ] } ], @@ -152,7 +162,8 @@ 199, 239, 279, - 319 + 319, + 359 ] } ], @@ -167,7 +178,8 @@ 229, 269, 309, - 349 + 349, + 389 ] } ], @@ -181,7 +193,8 @@ 205, 245, 285, - 325 + 325, + 365 ] } ], @@ -196,7 +209,8 @@ 212, 252, 292, - 332 + 332, + 372 ] } ], @@ -211,7 +225,8 @@ 208, 248, 288, - 328 + 328, + 368 ] } ], @@ -225,7 +240,8 @@ 206, 246, 286, - 326 + 326, + 366 ] } ], @@ -239,7 +255,8 @@ 223, 263, 303, - 343 + 343, + 383 ] } ], @@ -253,7 +270,8 @@ 222, 262, 302, - 342 + 342, + 382 ] } ], @@ -267,7 +285,8 @@ 217, 257, 297, - 337 + 337, + 377 ] } ], @@ -281,7 +300,8 @@ 226, 266, 306, - 346 + 346, + 386 ] } ], diff --git a/gems/yaml-merge/Gemfile b/gems/yaml-merge/Gemfile index 9ea86df66..4f76f3a3d 100644 --- a/gems/yaml-merge/Gemfile +++ b/gems/yaml-merge/Gemfile @@ -352,6 +352,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/yaml-merge/Gemfile.lock b/gems/yaml-merge/Gemfile.lock index c03d4ba4d..7657e990e 100644 --- a/gems/yaml-merge/Gemfile.lock +++ b/gems/yaml-merge/Gemfile.lock @@ -7,39 +7,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -48,201 +16,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -250,21 +24,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -291,12 +50,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -360,8 +113,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -390,7 +141,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -530,8 +280,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -584,11 +332,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -635,45 +378,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -682,17 +403,12 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) yaml-merge! yard (~> 0.9, >= 0.9.44) @@ -701,35 +417,19 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -737,7 +437,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -750,27 +449,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -785,14 +476,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -800,7 +487,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -828,12 +514,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -842,7 +525,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,14 +538,10 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -876,7 +554,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 5decec890de296c1546fe59f5d85477c4c0d5bc4 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 01:10:27 -0600 Subject: [PATCH 295/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/toml-merge/.kettle-drift.lock | 60 ++++-- gems/toml-merge/Gemfile | 40 ++++ gems/toml-merge/Gemfile.lock | 327 +---------------------------- gems/yaml-merge/Gemfile.lock | 327 ++++++++++++++++++++++++++++- 4 files changed, 407 insertions(+), 347 deletions(-) diff --git a/gems/toml-merge/.kettle-drift.lock b/gems/toml-merge/.kettle-drift.lock index 3aa07e7e9..09df60df7 100644 --- a/gems/toml-merge/.kettle-drift.lock +++ b/gems/toml-merge/.kettle-drift.lock @@ -9,7 +9,8 @@ 200, 240, 280, - 320 + 320, + 360 ] } ], @@ -23,7 +24,8 @@ 211, 251, 291, - 331 + 331, + 371 ] } ], @@ -37,7 +39,8 @@ 201, 241, 281, - 321 + 321, + 361 ] } ], @@ -51,7 +54,8 @@ 213, 253, 293, - 333 + 333, + 373 ] } ], @@ -65,7 +69,8 @@ 216, 256, 296, - 336 + 336, + 376 ] } ], @@ -79,7 +84,8 @@ 202, 242, 282, - 322 + 322, + 362 ] } ], @@ -94,7 +100,8 @@ 220, 260, 300, - 340 + 340, + 380 ] } ], @@ -108,7 +115,8 @@ 221, 261, 301, - 341 + 341, + 381 ] } ], @@ -123,7 +131,8 @@ 207, 247, 287, - 327 + 327, + 367 ] } ], @@ -137,7 +146,8 @@ 230, 270, 310, - 350 + 350, + 390 ] } ], @@ -152,7 +162,8 @@ 199, 239, 279, - 319 + 319, + 359 ] } ], @@ -167,7 +178,8 @@ 229, 269, 309, - 349 + 349, + 389 ] } ], @@ -181,7 +193,8 @@ 205, 245, 285, - 325 + 325, + 365 ] } ], @@ -196,7 +209,8 @@ 212, 252, 292, - 332 + 332, + 372 ] } ], @@ -211,7 +225,8 @@ 208, 248, 288, - 328 + 328, + 368 ] } ], @@ -225,7 +240,8 @@ 206, 246, 286, - 326 + 326, + 366 ] } ], @@ -239,7 +255,8 @@ 223, 263, 303, - 343 + 343, + 383 ] } ], @@ -253,7 +270,8 @@ 222, 262, 302, - 342 + 342, + 382 ] } ], @@ -267,7 +285,8 @@ 217, 257, 297, - 337 + 337, + 377 ] } ], @@ -281,7 +300,8 @@ 226, 266, 306, - 346 + 346, + 386 ] } ], diff --git a/gems/toml-merge/Gemfile b/gems/toml-merge/Gemfile index cf35fc2bf..0be31f1e5 100644 --- a/gems/toml-merge/Gemfile +++ b/gems/toml-merge/Gemfile @@ -352,6 +352,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/toml-merge/Gemfile.lock b/gems/toml-merge/Gemfile.lock index fa7927949..724ef5a6b 100644 --- a/gems/toml-merge/Gemfile.lock +++ b/gems/toml-merge/Gemfile.lock @@ -7,39 +7,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -48,193 +16,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -242,29 +24,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -291,12 +50,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -360,8 +113,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -390,7 +141,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -530,8 +280,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -584,11 +332,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -635,45 +378,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -682,54 +403,33 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -737,7 +437,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -750,27 +449,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -785,14 +476,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -800,7 +487,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -828,12 +514,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -842,7 +525,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,19 +538,15 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +554,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/yaml-merge/Gemfile.lock b/gems/yaml-merge/Gemfile.lock index 7657e990e..c03d4ba4d 100644 --- a/gems/yaml-merge/Gemfile.lock +++ b/gems/yaml-merge/Gemfile.lock @@ -7,7 +7,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -16,7 +48,201 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -24,6 +250,21 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -50,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -113,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -141,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -280,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -332,6 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -378,23 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -403,12 +682,17 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) yaml-merge! yard (~> 0.9, >= 0.9.44) @@ -417,19 +701,35 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -437,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -449,19 +750,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -476,10 +785,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -487,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -514,9 +828,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -525,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -538,10 +856,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -554,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From d8b790799e0a937a3037c177a93a03673f8eafad Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 01:11:01 -0600 Subject: [PATCH 296/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ruby-merge/.kettle-drift.lock | 60 ++++-- gems/ruby-merge/Gemfile | 40 ++++ gems/ruby-merge/Gemfile.lock | 327 +---------------------------- gems/toml-merge/Gemfile.lock | 327 ++++++++++++++++++++++++++++- 4 files changed, 407 insertions(+), 347 deletions(-) diff --git a/gems/ruby-merge/.kettle-drift.lock b/gems/ruby-merge/.kettle-drift.lock index 3aa07e7e9..09df60df7 100644 --- a/gems/ruby-merge/.kettle-drift.lock +++ b/gems/ruby-merge/.kettle-drift.lock @@ -9,7 +9,8 @@ 200, 240, 280, - 320 + 320, + 360 ] } ], @@ -23,7 +24,8 @@ 211, 251, 291, - 331 + 331, + 371 ] } ], @@ -37,7 +39,8 @@ 201, 241, 281, - 321 + 321, + 361 ] } ], @@ -51,7 +54,8 @@ 213, 253, 293, - 333 + 333, + 373 ] } ], @@ -65,7 +69,8 @@ 216, 256, 296, - 336 + 336, + 376 ] } ], @@ -79,7 +84,8 @@ 202, 242, 282, - 322 + 322, + 362 ] } ], @@ -94,7 +100,8 @@ 220, 260, 300, - 340 + 340, + 380 ] } ], @@ -108,7 +115,8 @@ 221, 261, 301, - 341 + 341, + 381 ] } ], @@ -123,7 +131,8 @@ 207, 247, 287, - 327 + 327, + 367 ] } ], @@ -137,7 +146,8 @@ 230, 270, 310, - 350 + 350, + 390 ] } ], @@ -152,7 +162,8 @@ 199, 239, 279, - 319 + 319, + 359 ] } ], @@ -167,7 +178,8 @@ 229, 269, 309, - 349 + 349, + 389 ] } ], @@ -181,7 +193,8 @@ 205, 245, 285, - 325 + 325, + 365 ] } ], @@ -196,7 +209,8 @@ 212, 252, 292, - 332 + 332, + 372 ] } ], @@ -211,7 +225,8 @@ 208, 248, 288, - 328 + 328, + 368 ] } ], @@ -225,7 +240,8 @@ 206, 246, 286, - 326 + 326, + 366 ] } ], @@ -239,7 +255,8 @@ 223, 263, 303, - 343 + 343, + 383 ] } ], @@ -253,7 +270,8 @@ 222, 262, 302, - 342 + 342, + 382 ] } ], @@ -267,7 +285,8 @@ 217, 257, 297, - 337 + 337, + 377 ] } ], @@ -281,7 +300,8 @@ 226, 266, 306, - 346 + 346, + 386 ] } ], diff --git a/gems/ruby-merge/Gemfile b/gems/ruby-merge/Gemfile index f454fd88f..bad0e66be 100644 --- a/gems/ruby-merge/Gemfile +++ b/gems/ruby-merge/Gemfile @@ -352,6 +352,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/ruby-merge/Gemfile.lock b/gems/ruby-merge/Gemfile.lock index 0a750d5c1..21d7ee564 100644 --- a/gems/ruby-merge/Gemfile.lock +++ b/gems/ruby-merge/Gemfile.lock @@ -7,39 +7,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -48,193 +16,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -242,29 +24,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -291,12 +50,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -360,8 +113,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -390,7 +141,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -530,8 +280,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -584,11 +332,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -635,45 +378,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -684,52 +405,31 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0.0) ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -737,7 +437,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -750,27 +449,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -785,14 +476,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -800,7 +487,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -832,8 +518,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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -842,7 +526,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,19 +539,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +554,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/toml-merge/Gemfile.lock b/gems/toml-merge/Gemfile.lock index 724ef5a6b..fa7927949 100644 --- a/gems/toml-merge/Gemfile.lock +++ b/gems/toml-merge/Gemfile.lock @@ -7,7 +7,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -16,7 +48,193 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -24,6 +242,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -50,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -113,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -141,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -280,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -332,6 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -378,23 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -403,33 +682,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -437,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -449,19 +750,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -476,10 +785,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -487,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -514,9 +828,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -525,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -538,15 +856,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -554,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 625d56a179535dc1f739b683f8daece0927c960c Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 01:11:27 -0600 Subject: [PATCH 297/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/go-merge/.kettle-drift.lock | 60 ++++-- gems/go-merge/Gemfile | 40 ++++ gems/go-merge/Gemfile.lock | 327 +------------------------------ gems/ruby-merge/Gemfile.lock | 327 ++++++++++++++++++++++++++++++- 4 files changed, 407 insertions(+), 347 deletions(-) diff --git a/gems/go-merge/.kettle-drift.lock b/gems/go-merge/.kettle-drift.lock index 3aa07e7e9..09df60df7 100644 --- a/gems/go-merge/.kettle-drift.lock +++ b/gems/go-merge/.kettle-drift.lock @@ -9,7 +9,8 @@ 200, 240, 280, - 320 + 320, + 360 ] } ], @@ -23,7 +24,8 @@ 211, 251, 291, - 331 + 331, + 371 ] } ], @@ -37,7 +39,8 @@ 201, 241, 281, - 321 + 321, + 361 ] } ], @@ -51,7 +54,8 @@ 213, 253, 293, - 333 + 333, + 373 ] } ], @@ -65,7 +69,8 @@ 216, 256, 296, - 336 + 336, + 376 ] } ], @@ -79,7 +84,8 @@ 202, 242, 282, - 322 + 322, + 362 ] } ], @@ -94,7 +100,8 @@ 220, 260, 300, - 340 + 340, + 380 ] } ], @@ -108,7 +115,8 @@ 221, 261, 301, - 341 + 341, + 381 ] } ], @@ -123,7 +131,8 @@ 207, 247, 287, - 327 + 327, + 367 ] } ], @@ -137,7 +146,8 @@ 230, 270, 310, - 350 + 350, + 390 ] } ], @@ -152,7 +162,8 @@ 199, 239, 279, - 319 + 319, + 359 ] } ], @@ -167,7 +178,8 @@ 229, 269, 309, - 349 + 349, + 389 ] } ], @@ -181,7 +193,8 @@ 205, 245, 285, - 325 + 325, + 365 ] } ], @@ -196,7 +209,8 @@ 212, 252, 292, - 332 + 332, + 372 ] } ], @@ -211,7 +225,8 @@ 208, 248, 288, - 328 + 328, + 368 ] } ], @@ -225,7 +240,8 @@ 206, 246, 286, - 326 + 326, + 366 ] } ], @@ -239,7 +255,8 @@ 223, 263, 303, - 343 + 343, + 383 ] } ], @@ -253,7 +270,8 @@ 222, 262, 302, - 342 + 342, + 382 ] } ], @@ -267,7 +285,8 @@ 217, 257, 297, - 337 + 337, + 377 ] } ], @@ -281,7 +300,8 @@ 226, 266, 306, - 346 + 346, + 386 ] } ], diff --git a/gems/go-merge/Gemfile b/gems/go-merge/Gemfile index ddc54f623..46680094a 100644 --- a/gems/go-merge/Gemfile +++ b/gems/go-merge/Gemfile @@ -352,6 +352,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/go-merge/Gemfile.lock b/gems/go-merge/Gemfile.lock index 5354cf499..8be383cac 100644 --- a/gems/go-merge/Gemfile.lock +++ b/gems/go-merge/Gemfile.lock @@ -7,39 +7,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -48,193 +16,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -242,29 +24,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -291,12 +50,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -360,8 +113,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -390,7 +141,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -530,8 +280,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -584,11 +332,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -635,45 +378,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -682,54 +404,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -737,7 +437,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -755,22 +454,15 @@ CHECKSUMS io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -785,14 +477,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -800,7 +488,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -828,12 +515,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -842,7 +526,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,19 +539,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +554,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/ruby-merge/Gemfile.lock b/gems/ruby-merge/Gemfile.lock index 21d7ee564..0a750d5c1 100644 --- a/gems/ruby-merge/Gemfile.lock +++ b/gems/ruby-merge/Gemfile.lock @@ -7,7 +7,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -16,7 +48,193 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -24,6 +242,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -50,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -113,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -141,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -280,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -332,6 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -378,23 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -405,31 +684,52 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0.0) ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -437,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -449,19 +750,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -476,10 +785,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -487,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -518,6 +832,8 @@ 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -526,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -539,14 +856,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -554,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 21534d2c6332ddecd177808ccbf1159e8223a356 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 01:11:55 -0600 Subject: [PATCH 298/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/go-merge/Gemfile.lock | 327 ++++++++++++++++++++++++++++- gems/rust-merge/.kettle-drift.lock | 60 ++++-- gems/rust-merge/Gemfile | 40 ++++ gems/rust-merge/Gemfile.lock | 327 +---------------------------- 4 files changed, 407 insertions(+), 347 deletions(-) diff --git a/gems/go-merge/Gemfile.lock b/gems/go-merge/Gemfile.lock index 8be383cac..5354cf499 100644 --- a/gems/go-merge/Gemfile.lock +++ b/gems/go-merge/Gemfile.lock @@ -7,7 +7,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -16,7 +48,193 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -24,6 +242,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -50,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -113,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -141,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -280,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -332,6 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -378,24 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -404,32 +682,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -437,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -454,15 +755,22 @@ CHECKSUMS io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -477,10 +785,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -488,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -515,9 +828,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -526,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -539,14 +856,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -554,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/rust-merge/.kettle-drift.lock b/gems/rust-merge/.kettle-drift.lock index 3aa07e7e9..09df60df7 100644 --- a/gems/rust-merge/.kettle-drift.lock +++ b/gems/rust-merge/.kettle-drift.lock @@ -9,7 +9,8 @@ 200, 240, 280, - 320 + 320, + 360 ] } ], @@ -23,7 +24,8 @@ 211, 251, 291, - 331 + 331, + 371 ] } ], @@ -37,7 +39,8 @@ 201, 241, 281, - 321 + 321, + 361 ] } ], @@ -51,7 +54,8 @@ 213, 253, 293, - 333 + 333, + 373 ] } ], @@ -65,7 +69,8 @@ 216, 256, 296, - 336 + 336, + 376 ] } ], @@ -79,7 +84,8 @@ 202, 242, 282, - 322 + 322, + 362 ] } ], @@ -94,7 +100,8 @@ 220, 260, 300, - 340 + 340, + 380 ] } ], @@ -108,7 +115,8 @@ 221, 261, 301, - 341 + 341, + 381 ] } ], @@ -123,7 +131,8 @@ 207, 247, 287, - 327 + 327, + 367 ] } ], @@ -137,7 +146,8 @@ 230, 270, 310, - 350 + 350, + 390 ] } ], @@ -152,7 +162,8 @@ 199, 239, 279, - 319 + 319, + 359 ] } ], @@ -167,7 +178,8 @@ 229, 269, 309, - 349 + 349, + 389 ] } ], @@ -181,7 +193,8 @@ 205, 245, 285, - 325 + 325, + 365 ] } ], @@ -196,7 +209,8 @@ 212, 252, 292, - 332 + 332, + 372 ] } ], @@ -211,7 +225,8 @@ 208, 248, 288, - 328 + 328, + 368 ] } ], @@ -225,7 +240,8 @@ 206, 246, 286, - 326 + 326, + 366 ] } ], @@ -239,7 +255,8 @@ 223, 263, 303, - 343 + 343, + 383 ] } ], @@ -253,7 +270,8 @@ 222, 262, 302, - 342 + 342, + 382 ] } ], @@ -267,7 +285,8 @@ 217, 257, 297, - 337 + 337, + 377 ] } ], @@ -281,7 +300,8 @@ 226, 266, 306, - 346 + 346, + 386 ] } ], diff --git a/gems/rust-merge/Gemfile b/gems/rust-merge/Gemfile index ee26a176b..e1d9f1d52 100644 --- a/gems/rust-merge/Gemfile +++ b/gems/rust-merge/Gemfile @@ -352,6 +352,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/rust-merge/Gemfile.lock b/gems/rust-merge/Gemfile.lock index 53af74d58..5639fb421 100644 --- a/gems/rust-merge/Gemfile.lock +++ b/gems/rust-merge/Gemfile.lock @@ -7,39 +7,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -48,193 +16,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -242,29 +24,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -291,12 +50,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -360,8 +113,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -390,7 +141,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -530,8 +280,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -584,11 +332,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -635,45 +378,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -682,54 +403,33 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -737,7 +437,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -750,27 +449,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -785,14 +476,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -800,7 +487,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -828,12 +514,10 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -842,7 +526,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,19 +539,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +554,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 3139e7f9c5554264672394a971b1145cf0ec2c8a Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 01:12:23 -0600 Subject: [PATCH 299/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/rust-merge/Gemfile.lock | 327 ++++++++++++++++++++++- gems/typescript-merge/.kettle-drift.lock | 60 +++-- gems/typescript-merge/Gemfile | 40 +++ gems/typescript-merge/Gemfile.lock | 327 +---------------------- 4 files changed, 407 insertions(+), 347 deletions(-) diff --git a/gems/rust-merge/Gemfile.lock b/gems/rust-merge/Gemfile.lock index 5639fb421..53af74d58 100644 --- a/gems/rust-merge/Gemfile.lock +++ b/gems/rust-merge/Gemfile.lock @@ -7,7 +7,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -16,7 +48,193 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -24,6 +242,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -50,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -113,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -141,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -280,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -332,6 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -378,23 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -403,33 +682,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -437,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -449,19 +750,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -476,10 +785,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -487,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -514,10 +828,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -526,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -539,14 +856,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -554,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/typescript-merge/.kettle-drift.lock b/gems/typescript-merge/.kettle-drift.lock index 3aa07e7e9..09df60df7 100644 --- a/gems/typescript-merge/.kettle-drift.lock +++ b/gems/typescript-merge/.kettle-drift.lock @@ -9,7 +9,8 @@ 200, 240, 280, - 320 + 320, + 360 ] } ], @@ -23,7 +24,8 @@ 211, 251, 291, - 331 + 331, + 371 ] } ], @@ -37,7 +39,8 @@ 201, 241, 281, - 321 + 321, + 361 ] } ], @@ -51,7 +54,8 @@ 213, 253, 293, - 333 + 333, + 373 ] } ], @@ -65,7 +69,8 @@ 216, 256, 296, - 336 + 336, + 376 ] } ], @@ -79,7 +84,8 @@ 202, 242, 282, - 322 + 322, + 362 ] } ], @@ -94,7 +100,8 @@ 220, 260, 300, - 340 + 340, + 380 ] } ], @@ -108,7 +115,8 @@ 221, 261, 301, - 341 + 341, + 381 ] } ], @@ -123,7 +131,8 @@ 207, 247, 287, - 327 + 327, + 367 ] } ], @@ -137,7 +146,8 @@ 230, 270, 310, - 350 + 350, + 390 ] } ], @@ -152,7 +162,8 @@ 199, 239, 279, - 319 + 319, + 359 ] } ], @@ -167,7 +178,8 @@ 229, 269, 309, - 349 + 349, + 389 ] } ], @@ -181,7 +193,8 @@ 205, 245, 285, - 325 + 325, + 365 ] } ], @@ -196,7 +209,8 @@ 212, 252, 292, - 332 + 332, + 372 ] } ], @@ -211,7 +225,8 @@ 208, 248, 288, - 328 + 328, + 368 ] } ], @@ -225,7 +240,8 @@ 206, 246, 286, - 326 + 326, + 366 ] } ], @@ -239,7 +255,8 @@ 223, 263, 303, - 343 + 343, + 383 ] } ], @@ -253,7 +270,8 @@ 222, 262, 302, - 342 + 342, + 382 ] } ], @@ -267,7 +285,8 @@ 217, 257, 297, - 337 + 337, + 377 ] } ], @@ -281,7 +300,8 @@ 226, 266, 306, - 346 + 346, + 386 ] } ], diff --git a/gems/typescript-merge/Gemfile b/gems/typescript-merge/Gemfile index 40a94d761..8ea5e52eb 100644 --- a/gems/typescript-merge/Gemfile +++ b/gems/typescript-merge/Gemfile @@ -352,6 +352,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/typescript-merge/Gemfile.lock b/gems/typescript-merge/Gemfile.lock index 47b5e82c1..a38d67430 100644 --- a/gems/typescript-merge/Gemfile.lock +++ b/gems/typescript-merge/Gemfile.lock @@ -7,39 +7,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -48,201 +16,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -250,21 +24,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -291,12 +50,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -360,8 +113,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -390,7 +141,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -530,8 +280,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -584,11 +332,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -635,45 +378,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -682,54 +403,33 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -737,7 +437,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -750,27 +449,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -785,14 +476,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -800,7 +487,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -828,12 +514,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -842,7 +525,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,9 +538,6 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f @@ -868,7 +547,6 @@ CHECKSUMS unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +554,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From bdbf048e13356929fe47cac6deaff630d5c3e2ed Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 01:12:53 -0600 Subject: [PATCH 300/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-template/.kettle-drift.lock | 60 +++-- gems/ast-template/Gemfile | 40 ++++ gems/ast-template/Gemfile.lock | 341 +-------------------------- gems/typescript-merge/Gemfile.lock | 327 ++++++++++++++++++++++++- 4 files changed, 411 insertions(+), 357 deletions(-) diff --git a/gems/ast-template/.kettle-drift.lock b/gems/ast-template/.kettle-drift.lock index 309d406e1..aa01ca527 100644 --- a/gems/ast-template/.kettle-drift.lock +++ b/gems/ast-template/.kettle-drift.lock @@ -9,7 +9,8 @@ 199, 239, 279, - 319 + 319, + 359 ] } ], @@ -23,7 +24,8 @@ 210, 250, 290, - 330 + 330, + 370 ] } ], @@ -37,7 +39,8 @@ 200, 240, 280, - 320 + 320, + 360 ] } ], @@ -51,7 +54,8 @@ 212, 252, 292, - 332 + 332, + 372 ] } ], @@ -65,7 +69,8 @@ 215, 255, 295, - 335 + 335, + 375 ] } ], @@ -79,7 +84,8 @@ 201, 241, 281, - 321 + 321, + 361 ] } ], @@ -94,7 +100,8 @@ 219, 259, 299, - 339 + 339, + 379 ] } ], @@ -108,7 +115,8 @@ 220, 260, 300, - 340 + 340, + 380 ] } ], @@ -123,7 +131,8 @@ 206, 246, 286, - 326 + 326, + 366 ] } ], @@ -137,7 +146,8 @@ 229, 269, 309, - 349 + 349, + 389 ] } ], @@ -152,7 +162,8 @@ 198, 238, 278, - 318 + 318, + 358 ] } ], @@ -167,7 +178,8 @@ 228, 268, 308, - 348 + 348, + 388 ] } ], @@ -181,7 +193,8 @@ 204, 244, 284, - 324 + 324, + 364 ] } ], @@ -196,7 +209,8 @@ 211, 251, 291, - 331 + 331, + 371 ] } ], @@ -211,7 +225,8 @@ 207, 247, 287, - 327 + 327, + 367 ] } ], @@ -225,7 +240,8 @@ 205, 245, 285, - 325 + 325, + 365 ] } ], @@ -239,7 +255,8 @@ 222, 262, 302, - 342 + 342, + 382 ] } ], @@ -253,7 +270,8 @@ 221, 261, 301, - 341 + 341, + 381 ] } ], @@ -267,7 +285,8 @@ 216, 256, 296, - 336 + 336, + 376 ] } ], @@ -281,7 +300,8 @@ 225, 265, 305, - 345 + 345, + 385 ] } ], diff --git a/gems/ast-template/Gemfile b/gems/ast-template/Gemfile index 9677d6903..3c92e5d7c 100644 --- a/gems/ast-template/Gemfile +++ b/gems/ast-template/Gemfile @@ -351,6 +351,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/ast-template/Gemfile.lock b/gems/ast-template/Gemfile.lock index 37099f9b0..320b06f45 100644 --- a/gems/ast-template/Gemfile.lock +++ b/gems/ast-template/Gemfile.lock @@ -6,39 +6,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -46,225 +14,6 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -291,12 +40,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -360,8 +103,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -390,7 +131,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -530,8 +270,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -584,11 +322,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -635,45 +373,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -682,54 +399,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -737,7 +432,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -750,27 +444,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -785,14 +471,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -800,7 +482,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -828,12 +509,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -842,7 +520,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,19 +533,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +548,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/typescript-merge/Gemfile.lock b/gems/typescript-merge/Gemfile.lock index a38d67430..47b5e82c1 100644 --- a/gems/typescript-merge/Gemfile.lock +++ b/gems/typescript-merge/Gemfile.lock @@ -7,7 +7,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -16,7 +48,201 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -24,6 +250,21 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -50,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -113,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -141,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -280,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -332,6 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -378,23 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -403,33 +682,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -437,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -449,19 +750,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -476,10 +785,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -487,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -514,9 +828,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -525,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -538,6 +856,9 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f @@ -547,6 +868,7 @@ CHECKSUMS unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -554,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 72b4dd911810217478049826f31e412cdbf6c3fb Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 01:13:20 -0600 Subject: [PATCH 301/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/ast-template/Gemfile.lock | 341 ++++++++++++++++++++++++++- gems/binary-merge/.kettle-drift.lock | 60 +++-- gems/binary-merge/Gemfile | 40 ++++ gems/binary-merge/Gemfile.lock | 341 +-------------------------- 4 files changed, 416 insertions(+), 366 deletions(-) diff --git a/gems/ast-template/Gemfile.lock b/gems/ast-template/Gemfile.lock index 320b06f45..37099f9b0 100644 --- a/gems/ast-template/Gemfile.lock +++ b/gems/ast-template/Gemfile.lock @@ -6,7 +6,39 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -14,6 +46,225 @@ PATH tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -40,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -103,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -131,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -322,11 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -373,24 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -399,32 +682,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -432,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -444,19 +750,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -471,10 +785,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -482,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -509,9 +828,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -520,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -533,14 +856,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -548,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/binary-merge/.kettle-drift.lock b/gems/binary-merge/.kettle-drift.lock index aa01ca527..f1287e677 100644 --- a/gems/binary-merge/.kettle-drift.lock +++ b/gems/binary-merge/.kettle-drift.lock @@ -10,7 +10,8 @@ 239, 279, 319, - 359 + 359, + 399 ] } ], @@ -25,7 +26,8 @@ 250, 290, 330, - 370 + 370, + 410 ] } ], @@ -40,7 +42,8 @@ 240, 280, 320, - 360 + 360, + 400 ] } ], @@ -55,7 +58,8 @@ 252, 292, 332, - 372 + 372, + 412 ] } ], @@ -70,7 +74,8 @@ 255, 295, 335, - 375 + 375, + 415 ] } ], @@ -85,7 +90,8 @@ 241, 281, 321, - 361 + 361, + 401 ] } ], @@ -101,7 +107,8 @@ 259, 299, 339, - 379 + 379, + 419 ] } ], @@ -116,7 +123,8 @@ 260, 300, 340, - 380 + 380, + 420 ] } ], @@ -132,7 +140,8 @@ 246, 286, 326, - 366 + 366, + 406 ] } ], @@ -147,7 +156,8 @@ 269, 309, 349, - 389 + 389, + 429 ] } ], @@ -163,7 +173,8 @@ 238, 278, 318, - 358 + 358, + 398 ] } ], @@ -179,7 +190,8 @@ 268, 308, 348, - 388 + 388, + 428 ] } ], @@ -194,7 +206,8 @@ 244, 284, 324, - 364 + 364, + 404 ] } ], @@ -210,7 +223,8 @@ 251, 291, 331, - 371 + 371, + 411 ] } ], @@ -226,7 +240,8 @@ 247, 287, 327, - 367 + 367, + 407 ] } ], @@ -241,7 +256,8 @@ 245, 285, 325, - 365 + 365, + 405 ] } ], @@ -256,7 +272,8 @@ 262, 302, 342, - 382 + 382, + 422 ] } ], @@ -271,7 +288,8 @@ 261, 301, 341, - 381 + 381, + 421 ] } ], @@ -286,7 +304,8 @@ 256, 296, 336, - 376 + 376, + 416 ] } ], @@ -301,7 +320,8 @@ 265, 305, 345, - 385 + 385, + 425 ] } ], diff --git a/gems/binary-merge/Gemfile b/gems/binary-merge/Gemfile index 59a6fada5..0a94ca078 100644 --- a/gems/binary-merge/Gemfile +++ b/gems/binary-merge/Gemfile @@ -391,6 +391,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/binary-merge/Gemfile.lock b/gems/binary-merge/Gemfile.lock index f72edd5cc..ff5fb4aeb 100644 --- a/gems/binary-merge/Gemfile.lock +++ b/gems/binary-merge/Gemfile.lock @@ -6,235 +6,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -242,29 +14,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -291,12 +40,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -360,8 +103,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -390,7 +131,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -530,8 +270,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -581,14 +319,6 @@ GEM delegate (~> 0.1) rspec (~> 3.0) timecop (>= 0.7, < 1) - token-resolver (2.0.4) - parslet (~> 2.0) - version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -635,45 +365,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -682,54 +390,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) - ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -737,7 +423,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -750,27 +435,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -785,14 +462,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -800,7 +473,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -828,12 +500,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -842,7 +511,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -855,20 +523,14 @@ CHECKSUMS thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73 timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 - token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +538,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 60b4491d94ce4ebfa93941c09a4d2ed2fd744204 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 01:13:48 -0600 Subject: [PATCH 302/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/binary-merge/Gemfile.lock | 341 +++++++++++++++++++++++++++++- gems/zip-merge/.kettle-drift.lock | 60 ++++-- gems/zip-merge/Gemfile | 40 ++++ gems/zip-merge/Gemfile.lock | 341 +----------------------------- 4 files changed, 421 insertions(+), 361 deletions(-) diff --git a/gems/binary-merge/Gemfile.lock b/gems/binary-merge/Gemfile.lock index ff5fb4aeb..f72edd5cc 100644 --- a/gems/binary-merge/Gemfile.lock +++ b/gems/binary-merge/Gemfile.lock @@ -6,7 +6,235 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -14,6 +242,29 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -40,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -103,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -131,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -319,6 +581,14 @@ GEM delegate (~> 0.1) rspec (~> 3.0) timecop (>= 0.7, < 1) + token-resolver (2.0.4) + parslet (~> 2.0) + version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -365,23 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -390,32 +682,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) + ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -423,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -435,19 +750,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -462,10 +785,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -473,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -500,9 +828,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -511,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -523,14 +855,20 @@ CHECKSUMS thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73 timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 + token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -538,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/zip-merge/.kettle-drift.lock b/gems/zip-merge/.kettle-drift.lock index aa01ca527..f1287e677 100644 --- a/gems/zip-merge/.kettle-drift.lock +++ b/gems/zip-merge/.kettle-drift.lock @@ -10,7 +10,8 @@ 239, 279, 319, - 359 + 359, + 399 ] } ], @@ -25,7 +26,8 @@ 250, 290, 330, - 370 + 370, + 410 ] } ], @@ -40,7 +42,8 @@ 240, 280, 320, - 360 + 360, + 400 ] } ], @@ -55,7 +58,8 @@ 252, 292, 332, - 372 + 372, + 412 ] } ], @@ -70,7 +74,8 @@ 255, 295, 335, - 375 + 375, + 415 ] } ], @@ -85,7 +90,8 @@ 241, 281, 321, - 361 + 361, + 401 ] } ], @@ -101,7 +107,8 @@ 259, 299, 339, - 379 + 379, + 419 ] } ], @@ -116,7 +123,8 @@ 260, 300, 340, - 380 + 380, + 420 ] } ], @@ -132,7 +140,8 @@ 246, 286, 326, - 366 + 366, + 406 ] } ], @@ -147,7 +156,8 @@ 269, 309, 349, - 389 + 389, + 429 ] } ], @@ -163,7 +173,8 @@ 238, 278, 318, - 358 + 358, + 398 ] } ], @@ -179,7 +190,8 @@ 268, 308, 348, - 388 + 388, + 428 ] } ], @@ -194,7 +206,8 @@ 244, 284, 324, - 364 + 364, + 404 ] } ], @@ -210,7 +223,8 @@ 251, 291, 331, - 371 + 371, + 411 ] } ], @@ -226,7 +240,8 @@ 247, 287, 327, - 367 + 367, + 407 ] } ], @@ -241,7 +256,8 @@ 245, 285, 325, - 365 + 365, + 405 ] } ], @@ -256,7 +272,8 @@ 262, 302, 342, - 382 + 382, + 422 ] } ], @@ -271,7 +288,8 @@ 261, 301, 341, - 381 + 381, + 421 ] } ], @@ -286,7 +304,8 @@ 256, 296, 336, - 376 + 376, + 416 ] } ], @@ -301,7 +320,8 @@ 265, 305, 345, - 385 + 385, + 425 ] } ], diff --git a/gems/zip-merge/Gemfile b/gems/zip-merge/Gemfile index 785feb37f..bc1ea8998 100644 --- a/gems/zip-merge/Gemfile +++ b/gems/zip-merge/Gemfile @@ -391,6 +391,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/zip-merge/Gemfile.lock b/gems/zip-merge/Gemfile.lock index fb79a6746..b4dc2fe8f 100644 --- a/gems/zip-merge/Gemfile.lock +++ b/gems/zip-merge/Gemfile.lock @@ -6,242 +6,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -249,22 +14,6 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -291,12 +40,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -360,8 +103,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -390,7 +131,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -530,8 +270,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -581,14 +319,6 @@ GEM delegate (~> 0.1) rspec (~> 3.0) timecop (>= 0.7, < 1) - token-resolver (2.0.4) - parslet (~> 2.0) - version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -635,45 +365,22 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -682,19 +389,13 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) @@ -708,28 +409,12 @@ CHECKSUMS ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) - ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -737,7 +422,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -750,27 +434,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -785,14 +461,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -800,7 +472,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -828,12 +499,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -842,7 +510,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -855,20 +522,14 @@ CHECKSUMS thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73 timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 - token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd From a6dfedb0227eb986f65392a5a999681516140165 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 01:14:22 -0600 Subject: [PATCH 303/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/psych-merge/.kettle-drift.lock | 60 +++-- gems/psych-merge/Gemfile | 40 ++++ gems/psych-merge/Gemfile.lock | 318 +------------------------- gems/zip-merge/Gemfile.lock | 341 +++++++++++++++++++++++++++- 4 files changed, 423 insertions(+), 336 deletions(-) diff --git a/gems/psych-merge/.kettle-drift.lock b/gems/psych-merge/.kettle-drift.lock index 9a0f4df5b..0d135c055 100644 --- a/gems/psych-merge/.kettle-drift.lock +++ b/gems/psych-merge/.kettle-drift.lock @@ -10,7 +10,8 @@ 241, 281, 321, - 361 + 361, + 401 ] } ], @@ -25,7 +26,8 @@ 252, 292, 332, - 372 + 372, + 412 ] } ], @@ -40,7 +42,8 @@ 242, 282, 322, - 362 + 362, + 402 ] } ], @@ -55,7 +58,8 @@ 254, 294, 334, - 374 + 374, + 414 ] } ], @@ -70,7 +74,8 @@ 257, 297, 337, - 377 + 377, + 417 ] } ], @@ -85,7 +90,8 @@ 243, 283, 323, - 363 + 363, + 403 ] } ], @@ -101,7 +107,8 @@ 261, 301, 341, - 381 + 381, + 421 ] } ], @@ -116,7 +123,8 @@ 262, 302, 342, - 382 + 382, + 422 ] } ], @@ -132,7 +140,8 @@ 248, 288, 328, - 368 + 368, + 408 ] } ], @@ -147,7 +156,8 @@ 271, 311, 351, - 391 + 391, + 431 ] } ], @@ -163,7 +173,8 @@ 240, 280, 320, - 360 + 360, + 400 ] } ], @@ -179,7 +190,8 @@ 270, 310, 350, - 390 + 390, + 430 ] } ], @@ -194,7 +206,8 @@ 246, 286, 326, - 366 + 366, + 406 ] } ], @@ -210,7 +223,8 @@ 253, 293, 333, - 373 + 373, + 413 ] } ], @@ -226,7 +240,8 @@ 249, 289, 329, - 369 + 369, + 409 ] } ], @@ -241,7 +256,8 @@ 247, 287, 327, - 367 + 367, + 407 ] } ], @@ -256,7 +272,8 @@ 264, 304, 344, - 384 + 384, + 424 ] } ], @@ -271,7 +288,8 @@ 263, 303, 343, - 383 + 383, + 423 ] } ], @@ -286,7 +304,8 @@ 258, 298, 338, - 378 + 378, + 418 ] } ], @@ -301,7 +320,8 @@ 267, 307, 347, - 387 + 387, + 427 ] } ], diff --git a/gems/psych-merge/Gemfile b/gems/psych-merge/Gemfile index 652f3d167..b283d8915 100644 --- a/gems/psych-merge/Gemfile +++ b/gems/psych-merge/Gemfile @@ -393,6 +393,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/psych-merge/Gemfile.lock b/gems/psych-merge/Gemfile.lock index ec2c9d1ae..ea9dc8043 100644 --- a/gems/psych-merge/Gemfile.lock +++ b/gems/psych-merge/Gemfile.lock @@ -8,39 +8,7 @@ PATH yaml-merge (= 7.1.0) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -49,192 +17,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) citrus (~> 3.0) @@ -243,28 +26,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: yaml-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -291,12 +59,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -360,8 +122,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -390,7 +150,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -530,8 +289,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -584,11 +341,6 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -635,45 +387,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -682,17 +413,12 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) yaml-merge! yard (~> 0.9, >= 0.9.44) @@ -701,35 +427,19 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -737,7 +447,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -750,27 +459,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -785,12 +486,9 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 @@ -800,7 +498,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -828,12 +525,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -842,7 +536,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,14 +549,10 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -876,7 +565,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/zip-merge/Gemfile.lock b/gems/zip-merge/Gemfile.lock index b4dc2fe8f..fb79a6746 100644 --- a/gems/zip-merge/Gemfile.lock +++ b/gems/zip-merge/Gemfile.lock @@ -6,7 +6,242 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -14,6 +249,22 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -40,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -103,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -131,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -270,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -319,6 +581,14 @@ GEM delegate (~> 0.1) rspec (~> 3.0) timecop (>= 0.7, < 1) + token-resolver (2.0.4) + parslet (~> 2.0) + version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -365,22 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -389,13 +682,19 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) @@ -409,12 +708,28 @@ CHECKSUMS ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) + ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -422,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -434,19 +750,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -461,10 +785,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -472,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -499,9 +828,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -510,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -522,14 +855,20 @@ CHECKSUMS thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73 timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 + token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd From e7e8e16c135401fc3909e460aa625e1d6f980cf9 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 01:14:50 -0600 Subject: [PATCH 304/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/citrus-toml-merge/.kettle-drift.lock | 60 ++-- gems/citrus-toml-merge/Gemfile | 40 +++ gems/citrus-toml-merge/Gemfile.lock | 341 +--------------------- gems/psych-merge/Gemfile.lock | 318 +++++++++++++++++++- 4 files changed, 406 insertions(+), 353 deletions(-) diff --git a/gems/citrus-toml-merge/.kettle-drift.lock b/gems/citrus-toml-merge/.kettle-drift.lock index 309d406e1..aa01ca527 100644 --- a/gems/citrus-toml-merge/.kettle-drift.lock +++ b/gems/citrus-toml-merge/.kettle-drift.lock @@ -9,7 +9,8 @@ 199, 239, 279, - 319 + 319, + 359 ] } ], @@ -23,7 +24,8 @@ 210, 250, 290, - 330 + 330, + 370 ] } ], @@ -37,7 +39,8 @@ 200, 240, 280, - 320 + 320, + 360 ] } ], @@ -51,7 +54,8 @@ 212, 252, 292, - 332 + 332, + 372 ] } ], @@ -65,7 +69,8 @@ 215, 255, 295, - 335 + 335, + 375 ] } ], @@ -79,7 +84,8 @@ 201, 241, 281, - 321 + 321, + 361 ] } ], @@ -94,7 +100,8 @@ 219, 259, 299, - 339 + 339, + 379 ] } ], @@ -108,7 +115,8 @@ 220, 260, 300, - 340 + 340, + 380 ] } ], @@ -123,7 +131,8 @@ 206, 246, 286, - 326 + 326, + 366 ] } ], @@ -137,7 +146,8 @@ 229, 269, 309, - 349 + 349, + 389 ] } ], @@ -152,7 +162,8 @@ 198, 238, 278, - 318 + 318, + 358 ] } ], @@ -167,7 +178,8 @@ 228, 268, 308, - 348 + 348, + 388 ] } ], @@ -181,7 +193,8 @@ 204, 244, 284, - 324 + 324, + 364 ] } ], @@ -196,7 +209,8 @@ 211, 251, 291, - 331 + 331, + 371 ] } ], @@ -211,7 +225,8 @@ 207, 247, 287, - 327 + 327, + 367 ] } ], @@ -225,7 +240,8 @@ 205, 245, 285, - 325 + 325, + 365 ] } ], @@ -239,7 +255,8 @@ 222, 262, 302, - 342 + 342, + 382 ] } ], @@ -253,7 +270,8 @@ 221, 261, 301, - 341 + 341, + 381 ] } ], @@ -267,7 +285,8 @@ 216, 256, 296, - 336 + 336, + 376 ] } ], @@ -281,7 +300,8 @@ 225, 265, 305, - 345 + 345, + 385 ] } ], diff --git a/gems/citrus-toml-merge/Gemfile b/gems/citrus-toml-merge/Gemfile index a191da7a2..aae6101f4 100644 --- a/gems/citrus-toml-merge/Gemfile +++ b/gems/citrus-toml-merge/Gemfile @@ -351,6 +351,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/citrus-toml-merge/Gemfile.lock b/gems/citrus-toml-merge/Gemfile.lock index 70893a241..1d8dbe6b6 100644 --- a/gems/citrus-toml-merge/Gemfile.lock +++ b/gems/citrus-toml-merge/Gemfile.lock @@ -7,264 +7,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: toml-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -283,6 +32,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -291,12 +45,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -360,8 +108,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -390,7 +136,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -530,8 +275,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -584,11 +327,14 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -635,45 +381,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -682,54 +406,33 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -737,7 +440,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -750,27 +452,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -785,14 +479,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -800,7 +490,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -828,12 +517,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -842,7 +528,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,19 +541,16 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +558,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/psych-merge/Gemfile.lock b/gems/psych-merge/Gemfile.lock index ea9dc8043..ec2c9d1ae 100644 --- a/gems/psych-merge/Gemfile.lock +++ b/gems/psych-merge/Gemfile.lock @@ -8,7 +8,39 @@ PATH yaml-merge (= 7.1.0) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -17,7 +49,192 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver specs: tree_haver (7.1.0) citrus (~> 3.0) @@ -26,13 +243,28 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: yaml-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -59,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -122,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -150,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -289,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -341,6 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -387,24 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -413,12 +682,17 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) yaml-merge! yard (~> 0.9, >= 0.9.44) @@ -427,19 +701,35 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -447,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -459,19 +750,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -486,9 +785,12 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 @@ -498,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -525,9 +828,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -536,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -549,10 +856,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -565,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 68b6ef57d739a5b07ae90a18058b5d29ba446cc5 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 01:15:18 -0600 Subject: [PATCH 305/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/citrus-toml-merge/Gemfile.lock | 341 +++++++++++++++++++- gems/parslet-toml-merge/.kettle-drift.lock | 60 ++-- gems/parslet-toml-merge/Gemfile | 40 +++ gems/parslet-toml-merge/Gemfile.lock | 342 +-------------------- 4 files changed, 421 insertions(+), 362 deletions(-) diff --git a/gems/citrus-toml-merge/Gemfile.lock b/gems/citrus-toml-merge/Gemfile.lock index 1d8dbe6b6..70893a241 100644 --- a/gems/citrus-toml-merge/Gemfile.lock +++ b/gems/citrus-toml-merge/Gemfile.lock @@ -7,13 +7,264 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: toml-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -32,11 +283,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -45,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -108,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -136,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -275,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -327,14 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -381,23 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -406,33 +682,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -440,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -452,19 +750,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -479,10 +785,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -490,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -517,9 +828,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -528,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -541,16 +856,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -558,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/parslet-toml-merge/.kettle-drift.lock b/gems/parslet-toml-merge/.kettle-drift.lock index 309d406e1..aa01ca527 100644 --- a/gems/parslet-toml-merge/.kettle-drift.lock +++ b/gems/parslet-toml-merge/.kettle-drift.lock @@ -9,7 +9,8 @@ 199, 239, 279, - 319 + 319, + 359 ] } ], @@ -23,7 +24,8 @@ 210, 250, 290, - 330 + 330, + 370 ] } ], @@ -37,7 +39,8 @@ 200, 240, 280, - 320 + 320, + 360 ] } ], @@ -51,7 +54,8 @@ 212, 252, 292, - 332 + 332, + 372 ] } ], @@ -65,7 +69,8 @@ 215, 255, 295, - 335 + 335, + 375 ] } ], @@ -79,7 +84,8 @@ 201, 241, 281, - 321 + 321, + 361 ] } ], @@ -94,7 +100,8 @@ 219, 259, 299, - 339 + 339, + 379 ] } ], @@ -108,7 +115,8 @@ 220, 260, 300, - 340 + 340, + 380 ] } ], @@ -123,7 +131,8 @@ 206, 246, 286, - 326 + 326, + 366 ] } ], @@ -137,7 +146,8 @@ 229, 269, 309, - 349 + 349, + 389 ] } ], @@ -152,7 +162,8 @@ 198, 238, 278, - 318 + 318, + 358 ] } ], @@ -167,7 +178,8 @@ 228, 268, 308, - 348 + 348, + 388 ] } ], @@ -181,7 +193,8 @@ 204, 244, 284, - 324 + 324, + 364 ] } ], @@ -196,7 +209,8 @@ 211, 251, 291, - 331 + 331, + 371 ] } ], @@ -211,7 +225,8 @@ 207, 247, 287, - 327 + 327, + 367 ] } ], @@ -225,7 +240,8 @@ 205, 245, 285, - 325 + 325, + 365 ] } ], @@ -239,7 +255,8 @@ 222, 262, 302, - 342 + 342, + 382 ] } ], @@ -253,7 +270,8 @@ 221, 261, 301, - 341 + 341, + 381 ] } ], @@ -267,7 +285,8 @@ 216, 256, 296, - 336 + 336, + 376 ] } ], @@ -281,7 +300,8 @@ 225, 265, 305, - 345 + 345, + 385 ] } ], diff --git a/gems/parslet-toml-merge/Gemfile b/gems/parslet-toml-merge/Gemfile index eac157ea5..1a6be3792 100644 --- a/gems/parslet-toml-merge/Gemfile +++ b/gems/parslet-toml-merge/Gemfile @@ -351,6 +351,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/parslet-toml-merge/Gemfile.lock b/gems/parslet-toml-merge/Gemfile.lock index cecedc911..dd74a3268 100644 --- a/gems/parslet-toml-merge/Gemfile.lock +++ b/gems/parslet-toml-merge/Gemfile.lock @@ -7,264 +7,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: toml-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -283,6 +32,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -291,12 +45,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -360,8 +108,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -390,7 +136,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -530,8 +275,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -586,9 +329,11 @@ GEM version_gem (~> 1.1, >= 1.1.13) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -635,45 +380,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -682,54 +405,32 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -737,7 +438,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -750,27 +450,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -786,13 +478,10 @@ CHECKSUMS parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 parslet-toml-merge (7.1.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -800,7 +489,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -828,12 +516,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -842,7 +527,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -858,17 +542,14 @@ CHECKSUMS token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +557,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 12eb0728a6e82d183aa90d47218f6b2a8da477b3 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 01:15:46 -0600 Subject: [PATCH 306/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/commonmarker-merge/.kettle-drift.lock | 60 ++-- gems/commonmarker-merge/Gemfile | 40 +++ gems/commonmarker-merge/Gemfile.lock | 333 +------------------- gems/parslet-toml-merge/Gemfile.lock | 342 ++++++++++++++++++++- 4 files changed, 422 insertions(+), 353 deletions(-) diff --git a/gems/commonmarker-merge/.kettle-drift.lock b/gems/commonmarker-merge/.kettle-drift.lock index 309d406e1..aa01ca527 100644 --- a/gems/commonmarker-merge/.kettle-drift.lock +++ b/gems/commonmarker-merge/.kettle-drift.lock @@ -9,7 +9,8 @@ 199, 239, 279, - 319 + 319, + 359 ] } ], @@ -23,7 +24,8 @@ 210, 250, 290, - 330 + 330, + 370 ] } ], @@ -37,7 +39,8 @@ 200, 240, 280, - 320 + 320, + 360 ] } ], @@ -51,7 +54,8 @@ 212, 252, 292, - 332 + 332, + 372 ] } ], @@ -65,7 +69,8 @@ 215, 255, 295, - 335 + 335, + 375 ] } ], @@ -79,7 +84,8 @@ 201, 241, 281, - 321 + 321, + 361 ] } ], @@ -94,7 +100,8 @@ 219, 259, 299, - 339 + 339, + 379 ] } ], @@ -108,7 +115,8 @@ 220, 260, 300, - 340 + 340, + 380 ] } ], @@ -123,7 +131,8 @@ 206, 246, 286, - 326 + 326, + 366 ] } ], @@ -137,7 +146,8 @@ 229, 269, 309, - 349 + 349, + 389 ] } ], @@ -152,7 +162,8 @@ 198, 238, 278, - 318 + 318, + 358 ] } ], @@ -167,7 +178,8 @@ 228, 268, 308, - 348 + 348, + 388 ] } ], @@ -181,7 +193,8 @@ 204, 244, 284, - 324 + 324, + 364 ] } ], @@ -196,7 +209,8 @@ 211, 251, 291, - 331 + 331, + 371 ] } ], @@ -211,7 +225,8 @@ 207, 247, 287, - 327 + 327, + 367 ] } ], @@ -225,7 +240,8 @@ 205, 245, 285, - 325 + 325, + 365 ] } ], @@ -239,7 +255,8 @@ 222, 262, 302, - 342 + 342, + 382 ] } ], @@ -253,7 +270,8 @@ 221, 261, 301, - 341 + 341, + 381 ] } ], @@ -267,7 +285,8 @@ 216, 256, 296, - 336 + 336, + 376 ] } ], @@ -281,7 +300,8 @@ 225, 265, 305, - 345 + 345, + 385 ] } ], diff --git a/gems/commonmarker-merge/Gemfile b/gems/commonmarker-merge/Gemfile index dea960c46..f297363e2 100644 --- a/gems/commonmarker-merge/Gemfile +++ b/gems/commonmarker-merge/Gemfile @@ -351,6 +351,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/commonmarker-merge/Gemfile.lock b/gems/commonmarker-merge/Gemfile.lock index b939ea585..f86bfeebe 100644 --- a/gems/commonmarker-merge/Gemfile.lock +++ b/gems/commonmarker-merge/Gemfile.lock @@ -7,264 +7,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -283,6 +32,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -360,8 +114,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -390,7 +142,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -530,8 +281,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -584,11 +333,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -635,45 +384,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -682,46 +410,30 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca @@ -737,7 +449,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -750,27 +461,20 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -785,14 +489,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -800,7 +500,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -828,12 +527,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -842,7 +538,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,19 +551,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +566,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) 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 dd74a3268..cecedc911 100644 --- a/gems/parslet-toml-merge/Gemfile.lock +++ b/gems/parslet-toml-merge/Gemfile.lock @@ -7,13 +7,264 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: toml-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -32,11 +283,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -45,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -108,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -136,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -275,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -329,11 +586,9 @@ GEM version_gem (~> 1.1, >= 1.1.13) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -380,23 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -405,32 +682,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -438,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -450,19 +750,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -478,10 +786,13 @@ CHECKSUMS parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828 parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606 parslet-toml-merge (7.1.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -489,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -516,9 +828,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -527,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -542,14 +858,17 @@ CHECKSUMS token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -557,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From f104707e105829158dafb5406f24cb5f25bac29b Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 01:16:13 -0600 Subject: [PATCH 307/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/commonmarker-merge/Gemfile.lock | 333 +++++++++++++++++++++++- gems/kramdown-merge/.kettle-drift.lock | 60 +++-- gems/kramdown-merge/Gemfile | 40 +++ gems/kramdown-merge/Gemfile.lock | 345 +------------------------ 4 files changed, 413 insertions(+), 365 deletions(-) diff --git a/gems/commonmarker-merge/Gemfile.lock b/gems/commonmarker-merge/Gemfile.lock index f86bfeebe..b939ea585 100644 --- a/gems/commonmarker-merge/Gemfile.lock +++ b/gems/commonmarker-merge/Gemfile.lock @@ -7,13 +7,264 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: markdown-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -32,11 +283,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -114,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -142,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -281,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -333,11 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -384,24 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -410,30 +682,46 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca @@ -449,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -461,20 +750,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -489,10 +785,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -500,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -527,9 +828,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -538,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -551,14 +856,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -566,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/kramdown-merge/.kettle-drift.lock b/gems/kramdown-merge/.kettle-drift.lock index 309d406e1..aa01ca527 100644 --- a/gems/kramdown-merge/.kettle-drift.lock +++ b/gems/kramdown-merge/.kettle-drift.lock @@ -9,7 +9,8 @@ 199, 239, 279, - 319 + 319, + 359 ] } ], @@ -23,7 +24,8 @@ 210, 250, 290, - 330 + 330, + 370 ] } ], @@ -37,7 +39,8 @@ 200, 240, 280, - 320 + 320, + 360 ] } ], @@ -51,7 +54,8 @@ 212, 252, 292, - 332 + 332, + 372 ] } ], @@ -65,7 +69,8 @@ 215, 255, 295, - 335 + 335, + 375 ] } ], @@ -79,7 +84,8 @@ 201, 241, 281, - 321 + 321, + 361 ] } ], @@ -94,7 +100,8 @@ 219, 259, 299, - 339 + 339, + 379 ] } ], @@ -108,7 +115,8 @@ 220, 260, 300, - 340 + 340, + 380 ] } ], @@ -123,7 +131,8 @@ 206, 246, 286, - 326 + 326, + 366 ] } ], @@ -137,7 +146,8 @@ 229, 269, 309, - 349 + 349, + 389 ] } ], @@ -152,7 +162,8 @@ 198, 238, 278, - 318 + 318, + 358 ] } ], @@ -167,7 +178,8 @@ 228, 268, 308, - 348 + 348, + 388 ] } ], @@ -181,7 +193,8 @@ 204, 244, 284, - 324 + 324, + 364 ] } ], @@ -196,7 +209,8 @@ 211, 251, 291, - 331 + 331, + 371 ] } ], @@ -211,7 +225,8 @@ 207, 247, 287, - 327 + 327, + 367 ] } ], @@ -225,7 +240,8 @@ 205, 245, 285, - 325 + 325, + 365 ] } ], @@ -239,7 +255,8 @@ 222, 262, 302, - 342 + 342, + 382 ] } ], @@ -253,7 +270,8 @@ 221, 261, 301, - 341 + 341, + 381 ] } ], @@ -267,7 +285,8 @@ 216, 256, 296, - 336 + 336, + 376 ] } ], @@ -281,7 +300,8 @@ 225, 265, 305, - 345 + 345, + 385 ] } ], diff --git a/gems/kramdown-merge/Gemfile b/gems/kramdown-merge/Gemfile index 837049bc8..08e351959 100644 --- a/gems/kramdown-merge/Gemfile +++ b/gems/kramdown-merge/Gemfile @@ -351,6 +351,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/kramdown-merge/Gemfile.lock b/gems/kramdown-merge/Gemfile.lock index c30245d48..2838afb6e 100644 --- a/gems/kramdown-merge/Gemfile.lock +++ b/gems/kramdown-merge/Gemfile.lock @@ -7,264 +7,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -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.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -283,6 +32,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -291,12 +45,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-aarch64-linux) - commonmarker (2.9.0-aarch64-linux-musl) - commonmarker (2.9.0-arm64-darwin) - commonmarker (2.9.0-x86_64-darwin) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -360,8 +108,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -390,7 +136,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -530,8 +275,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -584,11 +327,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -635,45 +378,24 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -682,54 +404,31 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c - commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca - commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 - commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -737,7 +436,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -750,15 +448,11 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 @@ -769,8 +463,6 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -785,14 +477,10 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 - prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -800,7 +488,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -828,12 +515,9 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 - ruby-merge (7.1.0) 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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -842,7 +526,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -856,19 +539,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -876,7 +554,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 4e2ee73824344101f6ec4e325beeb1e64285ffdc Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 01:16:46 -0600 Subject: [PATCH 308/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/kramdown-merge/Gemfile.lock | 345 +++++++++++++++++++++++++++- gems/prism-merge/.kettle-drift.lock | 60 +++-- gems/prism-merge/Gemfile | 40 ++++ gems/prism-merge/Gemfile.lock | 337 +-------------------------- 4 files changed, 425 insertions(+), 357 deletions(-) diff --git a/gems/kramdown-merge/Gemfile.lock b/gems/kramdown-merge/Gemfile.lock index 2838afb6e..c30245d48 100644 --- a/gems/kramdown-merge/Gemfile.lock +++ b/gems/kramdown-merge/Gemfile.lock @@ -7,13 +7,264 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge specs: markdown-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -32,11 +283,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -45,6 +291,12 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-aarch64-linux) + commonmarker (2.9.0-aarch64-linux-musl) + commonmarker (2.9.0-arm64-darwin) + commonmarker (2.9.0-x86_64-darwin) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -108,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -136,6 +390,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) racc (~> 1.4) @@ -275,6 +530,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -327,11 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -378,24 +635,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) kramdown-merge! kramdown-parser-gfm (~> 1.1) markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -404,31 +682,54 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-aarch64-linux) sha256=e2b4aadb9a2cfa4e206582641ce3a49465549ac1ed4c289fdd63b78d8f24579c + commonmarker (2.9.0-aarch64-linux-musl) sha256=1cf4d2821f2a7e64945f1ed7c4eeced586fdb27ea7fe7337788802cf8f57cfca + commonmarker (2.9.0-arm64-darwin) sha256=1748dbfa4f5813b0d2a14bb4bbfa65a4ec293aa1c825016d60029ee0e132b046 + commonmarker (2.9.0-x86_64-darwin) sha256=0a9914ccfd2f5d2a59c7bd0dda4fe90eb084cf513b477e499008e09ec9d6edd6 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -436,6 +737,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -448,11 +750,15 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 @@ -463,6 +769,8 @@ CHECKSUMS lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 markdown-merge (7.1.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af @@ -477,10 +785,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 + prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -488,6 +800,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -515,9 +828,12 @@ CHECKSUMS rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2 rubocop-ruby3_2 (3.0.7) sha256=f53dd6d286fb05186214fc6ec116783e7f837030918e8931c05de773e98f8466 rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431 + ruby-merge (7.1.0) 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -526,6 +842,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -539,14 +856,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -554,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/prism-merge/.kettle-drift.lock b/gems/prism-merge/.kettle-drift.lock index 309d406e1..aa01ca527 100644 --- a/gems/prism-merge/.kettle-drift.lock +++ b/gems/prism-merge/.kettle-drift.lock @@ -9,7 +9,8 @@ 199, 239, 279, - 319 + 319, + 359 ] } ], @@ -23,7 +24,8 @@ 210, 250, 290, - 330 + 330, + 370 ] } ], @@ -37,7 +39,8 @@ 200, 240, 280, - 320 + 320, + 360 ] } ], @@ -51,7 +54,8 @@ 212, 252, 292, - 332 + 332, + 372 ] } ], @@ -65,7 +69,8 @@ 215, 255, 295, - 335 + 335, + 375 ] } ], @@ -79,7 +84,8 @@ 201, 241, 281, - 321 + 321, + 361 ] } ], @@ -94,7 +100,8 @@ 219, 259, 299, - 339 + 339, + 379 ] } ], @@ -108,7 +115,8 @@ 220, 260, 300, - 340 + 340, + 380 ] } ], @@ -123,7 +131,8 @@ 206, 246, 286, - 326 + 326, + 366 ] } ], @@ -137,7 +146,8 @@ 229, 269, 309, - 349 + 349, + 389 ] } ], @@ -152,7 +162,8 @@ 198, 238, 278, - 318 + 318, + 358 ] } ], @@ -167,7 +178,8 @@ 228, 268, 308, - 348 + 348, + 388 ] } ], @@ -181,7 +193,8 @@ 204, 244, 284, - 324 + 324, + 364 ] } ], @@ -196,7 +209,8 @@ 211, 251, 291, - 331 + 331, + 371 ] } ], @@ -211,7 +225,8 @@ 207, 247, 287, - 327 + 327, + 367 ] } ], @@ -225,7 +240,8 @@ 205, 245, 285, - 325 + 325, + 365 ] } ], @@ -239,7 +255,8 @@ 222, 262, 302, - 342 + 342, + 382 ] } ], @@ -253,7 +270,8 @@ 221, 261, 301, - 341 + 341, + 381 ] } ], @@ -267,7 +285,8 @@ 216, 256, 296, - 336 + 336, + 376 ] } ], @@ -281,7 +300,8 @@ 225, 265, 305, - 345 + 345, + 385 ] } ], diff --git a/gems/prism-merge/Gemfile b/gems/prism-merge/Gemfile index 9120744ac..3e237a9cc 100644 --- a/gems/prism-merge/Gemfile +++ b/gems/prism-merge/Gemfile @@ -351,6 +351,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/prism-merge/Gemfile.lock b/gems/prism-merge/Gemfile.lock index c55f997df..b9f10ae4d 100644 --- a/gems/prism-merge/Gemfile.lock +++ b/gems/prism-merge/Gemfile.lock @@ -7,264 +7,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git - specs: - ast-merge-git (7.1.0) - ast-merge (= 7.1.0) - json-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge - specs: - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge - specs: - go-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge - specs: - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem - specs: - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge - specs: - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge - specs: - plain-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -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.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb - specs: - smorg-rb (7.1.0) - ast-merge (= 7.1.0) - ast-merge-git (= 7.1.0) - go-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-jem (= 7.1.0) - markly-merge (= 7.1.0) - plain-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -283,6 +32,11 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -291,8 +45,6 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) - commonmarker (2.9.0-x86_64-linux) - commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -356,8 +108,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -386,7 +136,6 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) - markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-x86_64-linux-gnu) racc (~> 1.4) @@ -518,8 +267,6 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) - service_actor (3.9.4) - zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -572,11 +319,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) - toml-rb (4.2.0) - citrus (~> 3.0, > 3.0) - racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -619,45 +366,23 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) - go-merge! irb (~> 1.17) - json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! - markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! - plain-merge! prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -668,48 +393,30 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0.0) ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! - smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 - ast-crispr (7.1.0) - ast-crispr-markdown-markly (7.1.0) - ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) - ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 - bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 - citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 - commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 - commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e - commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -717,7 +424,6 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e - dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -730,27 +436,19 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f - go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 - json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 - kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa - kramdown-merge (7.1.0) 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.0) - markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 - markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-x86_64-linux-gnu) sha256=379fae440b28915e3f19d752ce2dcf8465ed2b2fbefd2a7ca0dd497bc981a06a nokogiri (1.19.4-x86_64-linux-musl) sha256=17dfb7c1fa194ae02fbf7c51a7afc8d278045ab3fdacfd86f91d02d7b274470b @@ -761,14 +459,11 @@ 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.0) - plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 - psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -776,7 +471,6 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 - rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -808,8 +502,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.0) - service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -818,7 +510,6 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 - smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -832,19 +523,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 - toml-merge (7.1.0) - toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 - yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -852,7 +538,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From f15aaa2e9775f34c86c43fa17a66096447874266 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 01:18:24 -0600 Subject: [PATCH 309/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/kettle-jem/Gemfile.lock | 42 ++--- gems/prism-merge/Gemfile.lock | 337 ++++++++++++++++++++++++++++++++-- 2 files changed, 345 insertions(+), 34 deletions(-) diff --git a/gems/kettle-jem/Gemfile.lock b/gems/kettle-jem/Gemfile.lock index 70f5c1113..a6f8ed35b 100644 --- a/gems/kettle-jem/Gemfile.lock +++ b/gems/kettle-jem/Gemfile.lock @@ -28,7 +28,7 @@ PATH yaml-merge (= 7.1.0) 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.0) ast-crispr (= 7.1.0) @@ -36,7 +36,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-crispr (= 7.1.0) @@ -44,7 +44,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -53,7 +53,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge specs: bash-merge (7.1.0) ast-merge (= 7.1.0) @@ -61,7 +61,7 @@ PATH version_gem (~> 1.1, >= 1.1.14) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge specs: citrus-toml-merge (7.1.0) toml-merge (= 7.1.0) @@ -69,7 +69,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) commonmarker (~> 2.2) @@ -77,7 +77,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-merge (= 7.1.0) @@ -85,7 +85,7 @@ PATH version_gem (~> 1.1, >= 1.1.14) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: json-merge (7.1.0) ast-merge (= 7.1.0) @@ -93,7 +93,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) kramdown (~> 2.5) @@ -101,7 +101,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-merge (= 7.1.0) @@ -109,7 +109,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) markdown-merge (= 7.1.0) @@ -117,7 +117,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) prism (~> 1.6) @@ -125,7 +125,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-merge (= 7.1.0) @@ -134,7 +134,7 @@ PATH yaml-merge (= 7.1.0) 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.0) ast-merge (= 7.1.0) @@ -143,7 +143,7 @@ PATH version_gem (~> 1.1, >= 1.1.14) 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.0) ast-merge (= 7.1.0) @@ -151,7 +151,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: toml-merge (7.1.0) ast-merge (= 7.1.0) @@ -159,7 +159,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) citrus (~> 3.0) @@ -168,7 +168,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: yaml-merge (7.1.0) ast-merge (= 7.1.0) @@ -266,8 +266,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (3.0.1) simplecov (>= 1.0) @@ -566,7 +564,6 @@ DEPENDENCIES gitmoji-regex (~> 2.0, >= 2.0.4) irb (~> 1.17) json-merge! - kettle-drift (~> 1.0, >= 1.0.5) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.1) kettle-test (~> 2.0, >= 2.0.11) @@ -655,7 +652,6 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (3.0.1) sha256=83ebe2aa099f15781e4796b5faef0dc2720fba48f6b9d34808670b91baf271e4 @@ -752,7 +748,7 @@ CHECKSUMS toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) - tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) + tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) sha256=ad6743a373eeac954c1b659b17af3aff1c82918b3ce9c9dc572a7c70ff843cdd tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 diff --git a/gems/prism-merge/Gemfile.lock b/gems/prism-merge/Gemfile.lock index b9f10ae4d..c55f997df 100644 --- a/gems/prism-merge/Gemfile.lock +++ b/gems/prism-merge/Gemfile.lock @@ -7,13 +7,264 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: + ast-merge (7.1.0) + benchmark + token-resolver (~> 2.0, >= 2.0.4) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge specs: ruby-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -32,11 +283,6 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-merge (7.1.0) - benchmark - token-resolver (~> 2.0, >= 2.0.4) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -45,6 +291,8 @@ GEM thor (~> 1.0) citrus (3.0.2) cmdparse (3.0.7) + commonmarker (2.9.0-x86_64-linux) + commonmarker (2.9.0-x86_64-linux-musl) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -108,6 +356,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -136,6 +386,7 @@ GEM language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) + markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-x86_64-linux-gnu) racc (~> 1.4) @@ -267,6 +518,8 @@ GEM ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) + service_actor (3.9.4) + zeitwerk (>= 1.0) silent_stream (1.0.12) logger (~> 1.2) version_gem (>= 1.1.8, < 3) @@ -319,11 +572,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + toml-rb (4.2.0) + citrus (~> 3.0, > 3.0) + racc (~> 1.7) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -366,23 +619,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -393,30 +668,48 @@ DEPENDENCIES rubocop-ruby3_2 (~> 3.0.0) ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af ansi (1.6.0) sha256=ac9ea0c0ea8d32fb4e271348e609963ac78882f34b73836c2a02b3622e666658 appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + ast-crispr (7.1.0) + ast-crispr-markdown-markly (7.1.0) + ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 + bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 + citrus-toml-merge (7.1.0) cmdparse (3.0.7) sha256=f7c5cace10bec6abf853370ae095e4b97a84ed9d847b3fb38f41cc4fbc950739 + commonmarker (2.9.0-x86_64-linux) sha256=8cfe92970eef585a19ddf6613224b91cab64d6029834661bda801f877c9c7f43 + commonmarker (2.9.0-x86_64-linux-musl) sha256=293921398b839f79ceaf55010e061357e34f053822c3b003cd0be6686176335e + commonmarker-merge (7.1.0) concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0 date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0 debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6 @@ -424,6 +717,7 @@ CHECKSUMS diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + dotenv-merge (7.1.0) dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1 dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc @@ -436,19 +730,27 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 + json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad kettle-test (2.0.11) sha256=c710c90f7ab79d51f9452f0c09f5f90657e7a893f63583855c164d0b1b107ab2 kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa + kramdown-merge (7.1.0) 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.0) + markly (0.16.0) sha256=6f70d79e385b1efc9e171f74c81628826259039fe6c778e03c3924c71dac5511 + markly-merge (7.1.0) mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 nokogiri (1.19.4-x86_64-linux-gnu) sha256=379fae440b28915e3f19d752ce2dcf8465ed2b2fbefd2a7ca0dd497bc981a06a nokogiri (1.19.4-x86_64-linux-musl) sha256=17dfb7c1fa194ae02fbf7c51a7afc8d278045ab3fdacfd86f91d02d7b274470b @@ -459,11 +761,14 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 prism-merge (7.1.0) psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7 + psych-merge (7.1.0) public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a @@ -471,6 +776,7 @@ CHECKSUMS rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 + rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1 regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb @@ -502,6 +808,8 @@ 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.0) + service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740 @@ -510,6 +818,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -523,14 +832,19 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml-merge (7.1.0) + toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 yaml-converter (0.2.3) sha256=d35e69e547610d9e347672cc277fcb7d71dff3c53a942e66f82b1c64022ada72 + yaml-merge (7.1.0) yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51 yard-fence (0.9.6) sha256=3d1dbf4e3df462ac78b8bd2e01cf740a2de20168387c929aca31a0bcee490659 yard-junk (0.1.0) sha256=e85fe2ec1afa47313decd333447b53458cb1ed49b510b70015fdc3041a94bcdd @@ -538,6 +852,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 180972fc7409a552d70f8dc85012fd91508b990d Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 01:18:53 -0600 Subject: [PATCH 310/347] =?UTF-8?q?=F0=9F=8E=A8=20Template=20bootstrap=20b?= =?UTF-8?q?y=20kettle-jem=20v7.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gems/kettle-jem/Gemfile.lock | 175 +++++++++++++++--- gems/smorg-rb/.kettle-drift.lock | 60 ++++--- gems/smorg-rb/Gemfile | 40 +++++ gems/smorg-rb/Gemfile.lock | 292 ++++++++----------------------- 4 files changed, 304 insertions(+), 263 deletions(-) diff --git a/gems/kettle-jem/Gemfile.lock b/gems/kettle-jem/Gemfile.lock index a6f8ed35b..982d196a0 100644 --- a/gems/kettle-jem/Gemfile.lock +++ b/gems/kettle-jem/Gemfile.lock @@ -28,7 +28,7 @@ PATH yaml-merge (= 7.1.0) 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.0) ast-crispr (= 7.1.0) @@ -36,7 +36,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-crispr (= 7.1.0) @@ -44,7 +44,23 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -53,7 +69,14 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge specs: bash-merge (7.1.0) ast-merge (= 7.1.0) @@ -61,7 +84,14 @@ PATH version_gem (~> 1.1, >= 1.1.14) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge specs: citrus-toml-merge (7.1.0) toml-merge (= 7.1.0) @@ -69,7 +99,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) commonmarker (~> 2.2) @@ -77,7 +107,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-merge (= 7.1.0) @@ -85,7 +115,15 @@ PATH version_gem (~> 1.1, >= 1.1.14) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: json-merge (7.1.0) ast-merge (= 7.1.0) @@ -93,7 +131,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) kramdown (~> 2.5) @@ -101,7 +139,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-merge (= 7.1.0) @@ -109,7 +147,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) markdown-merge (= 7.1.0) @@ -117,7 +155,23 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge specs: prism-merge (7.1.0) prism (~> 1.6) @@ -125,7 +179,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-merge (= 7.1.0) @@ -134,7 +188,7 @@ PATH yaml-merge (= 7.1.0) 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.0) ast-merge (= 7.1.0) @@ -143,7 +197,7 @@ PATH version_gem (~> 1.1, >= 1.1.14) 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.0) ast-merge (= 7.1.0) @@ -151,7 +205,28 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge specs: toml-merge (7.1.0) ast-merge (= 7.1.0) @@ -159,7 +234,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) citrus (~> 3.0) @@ -168,13 +243,35 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge specs: yaml-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby + specs: + tree_sitter_language_pack (1.12.5) + rb_sys (>= 0.9, < 0.9.128) + sorbet-runtime (~> 0.5) + GEM remote: https://gem.coop/ specs: @@ -190,10 +287,6 @@ GEM rubocop (>= 1.0) version_gem (~> 1.1, >= 1.1.14) ast (2.4.3) - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) benchmark (0.5.0) bigdecimal (4.1.2) @@ -266,6 +359,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (3.0.1) simplecov (>= 1.0) @@ -316,6 +411,9 @@ GEM racc (1.8.1) rainbow (3.1.1) rake (13.4.2) + rake-compiler-dock (1.12.0) + rb_sys (0.9.127) + rake-compiler-dock (= 1.12.0) rbs (4.0.3) logger prism (>= 1.6.0) @@ -502,11 +600,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) - sorbet-runtime (~> 0.5) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -548,11 +646,15 @@ PLATFORMS DEPENDENCIES appraisal2 (~> 3.2, >= 3.2.0) appraisal2-rubocop (~> 1.0, >= 1.0.0) + 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! @@ -562,8 +664,10 @@ DEPENDENCIES erb (~> 6.0, >= 6.0.5) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.4) + go-merge! irb (~> 1.17) json-merge! + kettle-drift (~> 1.0, >= 1.0.5) kettle-jem! kettle-soup-cover (~> 3.0, >= 3.0.1) kettle-test (~> 2.0, >= 2.0.11) @@ -574,6 +678,8 @@ DEPENDENCIES markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! prism-merge! psych-merge! rake (~> 13.0) @@ -590,12 +696,16 @@ 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.6) stringio (>= 3.0) toml-merge! tree_haver! + tree_sitter_language_pack! turbo_tests2 (~> 3.2, >= 3.2.0) + typescript-merge! webrick (~> 1.9) yaml-converter (~> 0.2, >= 0.2.3) yaml-merge! @@ -605,6 +715,7 @@ DEPENDENCIES yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.2, >= 0.2.4) yard-yaml (~> 0.2, >= 0.2.3) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -616,10 +727,13 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 @@ -646,12 +760,14 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (3.0.1) sha256=83ebe2aa099f15781e4796b5faef0dc2720fba48f6b9d34808670b91baf271e4 @@ -674,6 +790,8 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 @@ -684,6 +802,8 @@ 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) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 + rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 @@ -724,6 +844,7 @@ 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 @@ -731,6 +852,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.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -745,12 +867,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) - tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) sha256=ad6743a373eeac954c1b659b17af3aff1c82918b3ce9c9dc572a7c70ff843cdd + tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -764,6 +888,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/smorg-rb/.kettle-drift.lock b/gems/smorg-rb/.kettle-drift.lock index d879250ba..9f7fedda8 100644 --- a/gems/smorg-rb/.kettle-drift.lock +++ b/gems/smorg-rb/.kettle-drift.lock @@ -11,7 +11,8 @@ 285, 325, 365, - 405 + 405, + 445 ] } ], @@ -27,7 +28,8 @@ 296, 336, 376, - 416 + 416, + 456 ] } ], @@ -43,7 +45,8 @@ 286, 326, 366, - 406 + 406, + 446 ] } ], @@ -59,7 +62,8 @@ 298, 338, 378, - 418 + 418, + 458 ] } ], @@ -75,7 +79,8 @@ 301, 341, 381, - 421 + 421, + 461 ] } ], @@ -91,7 +96,8 @@ 287, 327, 367, - 407 + 407, + 447 ] } ], @@ -108,7 +114,8 @@ 305, 345, 385, - 425 + 425, + 465 ] } ], @@ -124,7 +131,8 @@ 306, 346, 386, - 426 + 426, + 466 ] } ], @@ -141,7 +149,8 @@ 292, 332, 372, - 412 + 412, + 452 ] } ], @@ -157,7 +166,8 @@ 315, 355, 395, - 435 + 435, + 475 ] } ], @@ -174,7 +184,8 @@ 284, 324, 364, - 404 + 404, + 444 ] } ], @@ -191,7 +202,8 @@ 314, 354, 394, - 434 + 434, + 474 ] } ], @@ -207,7 +219,8 @@ 290, 330, 370, - 410 + 410, + 450 ] } ], @@ -224,7 +237,8 @@ 297, 337, 377, - 417 + 417, + 457 ] } ], @@ -241,7 +255,8 @@ 293, 333, 373, - 413 + 413, + 453 ] } ], @@ -257,7 +272,8 @@ 291, 331, 371, - 411 + 411, + 451 ] } ], @@ -273,7 +289,8 @@ 308, 348, 388, - 428 + 428, + 468 ] } ], @@ -289,7 +306,8 @@ 307, 347, 387, - 427 + 427, + 467 ] } ], @@ -305,7 +323,8 @@ 302, 342, 382, - 422 + 422, + 462 ] } ], @@ -321,7 +340,8 @@ 311, 351, 391, - 431 + 431, + 471 ] } ], diff --git a/gems/smorg-rb/Gemfile b/gems/smorg-rb/Gemfile index 78ecd2c0f..17e439642 100644 --- a/gems/smorg-rb/Gemfile +++ b/gems/smorg-rb/Gemfile @@ -437,6 +437,46 @@ if direct_sibling_gems.any? && end end +if direct_sibling_gems.any? && + (direct_sibling_local || + ENV.fetch('K_JEM_TEMPLATING', 'false').casecmp('true').zero?) + direct_sibling_dev_was_set = ENV.key?('STRUCTUREDMERGE_DEV') + direct_sibling_dev_original = ENV.fetch('STRUCTUREDMERGE_DEV', nil) + begin + nomono_activation_requirements = nomono_requirements + nomono_lockfile = File.expand_path('Gemfile.lock', __dir__) + if File.file?(nomono_lockfile) + nomono_locked_spec = Bundler::LockfileParser + .new(Bundler.read_file(nomono_lockfile)) + .specs + .find { |spec| spec.name == 'nomono' } + nomono_locked = nomono_locked_spec && + Gem::Requirement.new(nomono_requirements).satisfied_by?(nomono_locked_spec.version) + nomono_activation_requirements = ["= #{nomono_locked_spec.version}"] if nomono_locked + end + Kernel.send(:gem, 'nomono', *nomono_activation_requirements) + require 'nomono/bundler' + ENV['STRUCTUREDMERGE_DEV'] = File.expand_path('..', __dir__) if direct_sibling_templating && !direct_sibling_local + + eval_nomono_gems( + gems: direct_sibling_gems, + prefix: 'STRUCTUREDMERGE', + path_env: 'STRUCTUREDMERGE_DEV', + root: %w[src my structuredmerge] + ) + rescue LoadError + warn 'Install nomono to enable STRUCTUREDMERGE_DEV local sibling-gem dependencies.' + ensure + if direct_sibling_templating && !direct_sibling_local + if direct_sibling_dev_was_set + ENV['STRUCTUREDMERGE_DEV'] = direct_sibling_dev_original + else + ENV.delete('STRUCTUREDMERGE_DEV') + end + end + end +end + # Use the StructuredMerge TSLP branch until upstream ships Ruby 4-compatible gem metadata. tslp_dev = ENV.fetch('TSLP_DEV', nil) tslp_declared_by_templating = diff --git a/gems/smorg-rb/Gemfile.lock b/gems/smorg-rb/Gemfile.lock index a2a7705fe..927369d47 100644 --- a/gems/smorg-rb/Gemfile.lock +++ b/gems/smorg-rb/Gemfile.lock @@ -12,31 +12,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly - specs: - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism - specs: - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr - specs: - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: ast-merge-git (7.1.0) ast-merge (= 7.1.0) @@ -44,7 +20,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge specs: ast-merge (7.1.0) benchmark @@ -53,53 +29,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template - specs: - ast-template (7.1.0) - ast-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge - specs: - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge - specs: - binary-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge - specs: - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge - specs: - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge - specs: - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge specs: go-merge (7.1.0) ast-merge (= 7.1.0) @@ -107,7 +37,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/json-merge specs: json-merge (7.1.0) ast-merge (= 7.1.0) @@ -115,7 +45,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem specs: kettle-jem (7.1.0) addressable (>= 2.8, < 3) @@ -144,23 +74,7 @@ PATH yaml-merge (= 7.1.0) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge - specs: - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge - specs: - markdown-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -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.0) markdown-merge (= 7.1.0) @@ -168,103 +82,13 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge - specs: - parslet-toml-merge (7.1.0) - toml (~> 0.3) - toml-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: plain-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge - specs: - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge - specs: - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge - specs: - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge - specs: - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge - specs: - rust-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge - specs: - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver - specs: - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge - specs: - typescript-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge - specs: - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - -PATH - remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge - specs: - zip-merge (7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -283,13 +107,33 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) bundler (>= 1.2.0) thor (~> 1.0) citrus (3.0.2) + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) cmdparse (3.0.7) commonmarker (2.9.0-aarch64-linux) commonmarker (2.9.0-aarch64-linux-musl) @@ -297,6 +141,10 @@ GEM commonmarker (2.9.0-x86_64-darwin) commonmarker (2.9.0-x86_64-linux) commonmarker (2.9.0-x86_64-linux-musl) + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -306,6 +154,10 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docile (1.4.1) + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -360,8 +212,6 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) - kettle-drift (1.0.5) - version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -385,11 +235,19 @@ GEM turbo_tests2 (~> 3.1, >= 3.1.12) kramdown (2.5.2) rexml (>= 3.4.4) + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) 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.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) @@ -418,9 +276,18 @@ GEM prettyprint prettyprint (0.2.0) prism (1.9.0) + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) psych (5.4.0) date stringio + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -432,6 +299,11 @@ GEM logger prism (>= 1.6.0) tsort + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) rdoc (6.17.0) erb psych (>= 4.0.0) @@ -527,6 +399,10 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -584,11 +460,18 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml (0.3.0) - parslet (>= 1.8.0, < 3.0.0) + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -603,6 +486,10 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.13) + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) yard (0.9.45) yard-fence (0.9.6) rdoc (>= 6.11, < 8) @@ -635,20 +522,11 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) - 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) - citrus-toml-merge! - commonmarker-merge! debug (>= 1.1) - dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) @@ -656,24 +534,17 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) - kettle-drift (~> 1.0, >= 1.0.5) kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) - kramdown-merge! kramdown-parser-gfm (~> 1.1) - markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) - parslet-toml-merge! plain-merge! - prism-merge! - psych-merge! rake (~> 13.0) rbs (>= 3.0) - rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -682,26 +553,19 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) - ruby-merge! ruby-progressbar (~> 1.13) - rust-merge! smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) - toml-merge! - tree_haver! tree_sitter_language_pack! - typescript-merge! yaml-converter (~> 0.1) - yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) - zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -713,12 +577,10 @@ CHECKSUMS ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) ast-merge-git (7.1.0) - ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd - binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) @@ -757,7 +619,6 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad @@ -785,7 +646,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.0) plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -832,7 +692,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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -856,14 +715,12 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 - typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -876,7 +733,6 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 - zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From 30b6fa5f4465e3d3f8df6794559e8774c3f3935b Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 01:20:26 -0600 Subject: [PATCH 311/347] Lock smorg-rb after full templating pass --- gems/smorg-rb/Gemfile.lock | 292 +++++++++++++++++++++++++++---------- 1 file changed, 218 insertions(+), 74 deletions(-) diff --git a/gems/smorg-rb/Gemfile.lock b/gems/smorg-rb/Gemfile.lock index 927369d47..a2a7705fe 100644 --- a/gems/smorg-rb/Gemfile.lock +++ b/gems/smorg-rb/Gemfile.lock @@ -12,7 +12,31 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly + specs: + ast-crispr-markdown-markly (7.1.0) + ast-crispr (= 7.1.0) + markly-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: + ast-crispr-ruby-prism (7.1.0) + ast-crispr (= 7.1.0) + prism (>= 1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git specs: ast-merge-git (7.1.0) ast-merge (= 7.1.0) @@ -20,7 +44,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) benchmark @@ -29,7 +53,53 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/go-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: + bash-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge specs: go-merge (7.1.0) ast-merge (= 7.1.0) @@ -37,7 +107,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) 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.0) ast-merge (= 7.1.0) @@ -45,7 +115,7 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem specs: kettle-jem (7.1.0) addressable (>= 2.8, < 3) @@ -74,7 +144,23 @@ PATH yaml-merge (= 7.1.0) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge specs: markly-merge (7.1.0) markdown-merge (= 7.1.0) @@ -82,13 +168,103 @@ PATH version_gem (~> 1.1, >= 1.1.9) PATH - remote: /var/home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge specs: plain-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/tree_haver + specs: + tree_haver (7.1.0) + citrus (~> 3.0) + parslet (~> 2.0) + tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + PATH remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby specs: @@ -107,33 +283,13 @@ GEM rake (>= 10) thor (>= 0.14) ast (2.4.3) - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) - ast-crispr-markdown-markly (7.1.0) - ast-crispr (= 7.1.0) - markly-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - ast-crispr-ruby-prism (7.1.0) - ast-crispr (= 7.1.0) - prism (>= 1.0) - version_gem (~> 1.1, >= 1.1.9) backports (3.25.3) - bash-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) benchmark (0.5.0) bigdecimal (4.1.2) bundler-audit (0.9.3) bundler (>= 1.2.0) thor (~> 1.0) citrus (3.0.2) - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) cmdparse (3.0.7) commonmarker (2.9.0-aarch64-linux) commonmarker (2.9.0-aarch64-linux-musl) @@ -141,10 +297,6 @@ GEM commonmarker (2.9.0-x86_64-darwin) commonmarker (2.9.0-x86_64-linux) commonmarker (2.9.0-x86_64-linux-musl) - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -154,10 +306,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docile (1.4.1) - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -212,6 +360,8 @@ GEM kettle-rb (~> 0.1, >= 0.1.2) kettle-test (~> 2.0, >= 2.0.4) ruby-progressbar (~> 1.13) + kettle-drift (1.0.5) + version_gem (~> 1.1, >= 1.1.13) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -235,19 +385,11 @@ GEM turbo_tests2 (~> 3.1, >= 3.1.12) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) 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.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) mutex_m (0.3.0) nokogiri (1.19.4-aarch64-linux-gnu) @@ -276,18 +418,9 @@ GEM prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) psych (5.4.0) date stringio - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) @@ -299,11 +432,6 @@ GEM logger prism (>= 1.6.0) tsort - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) rdoc (6.17.0) erb psych (>= 4.0.0) @@ -399,10 +527,6 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -460,18 +584,11 @@ GEM token-resolver (2.0.4) parslet (~> 2.0) version_gem (~> 1.1, >= 1.1.13) - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_haver (7.1.0) - citrus (~> 3.0) - parslet (~> 2.0) - tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) - version_gem (~> 1.1, >= 1.1.9) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -486,10 +603,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.13) - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) yard (0.9.45) yard-fence (0.9.6) rdoc (>= 6.11, < 8) @@ -522,11 +635,20 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) @@ -534,17 +656,24 @@ DEPENDENCIES irb (~> 1.17) json-merge! kettle-dev (~> 2.0, >= 2.2.25) + kettle-drift (~> 1.0, >= 1.0.5) kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -553,19 +682,26 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) + toml-merge! + tree_haver! tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -577,10 +713,12 @@ CHECKSUMS ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) @@ -619,6 +757,7 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee + kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (1.1.3) sha256=a373827da22a7131d093afd32945e5b7d7a10a01ebfdded8fd2cb8230d69c8ad @@ -646,6 +785,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.0) plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -692,6 +832,7 @@ 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -715,12 +856,14 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 + toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -733,6 +876,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH From ff309c09629b99424ca9fd5a45c608254faa6e34 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 01:33:12 -0600 Subject: [PATCH 312/347] Expose JSON TreeHaver backend surface --- gems/json-merge/lib/json/merge.rb | 92 +++++++++++++++++-- .../spec/fixtures_integration_spec.rb | 31 +++++++ 2 files changed, 115 insertions(+), 8 deletions(-) diff --git a/gems/json-merge/lib/json/merge.rb b/gems/json-merge/lib/json/merge.rb index 6a757e4dc..57162aba4 100644 --- a/gems/json-merge/lib/json/merge.rb +++ b/gems/json-merge/lib/json/merge.rb @@ -14,6 +14,7 @@ module Merge surface: 'array', name: 'destination_wins_array' }.freeze + TREE_SITTER_BACKEND = TreeHaver::KREUZBERG_LANGUAGE_PACK_BACKEND BACKEND_REGISTRY = Struct.new(:registered, :mutex).new(false, Mutex.new) class Error < Ast::Merge::Error; end @@ -44,6 +45,8 @@ def register_backend! BACKEND_REGISTRY.mutex.synchronize do return if BACKEND_REGISTRY.registered + TreeHaver::BackendRegistry.register(TREE_SITTER_BACKEND) + grammar_finder = TreeHaver::GrammarFinder.new(:json) grammar_finder.register! if grammar_finder.available? @@ -62,14 +65,49 @@ def json_feature_profile } end - def parse_json(source, dialect) + def available_json_backends + [TREE_SITTER_BACKEND] + end + + def json_backend_feature_profile(backend: nil) + requested = requested_json_backend_id(backend) + unless available_json_backends.any? { |backend_ref| backend_ref.id == requested } + return unsupported_feature_result("Unsupported JSON backend #{requested}.") + end + + json_feature_profile.merge( + backend: requested, + backend_ref: TREE_SITTER_BACKEND.to_h + ) + end + + def json_plan_context(backend: nil) + profile = json_backend_feature_profile(backend: backend) + return profile if profile[:ok] == false + + { + family_profile: json_feature_profile, + feature_profile: { + backend: profile[:backend], + supports_dialects: true, + supported_policies: profile[:supported_policies] + } + } + end + + def parse_json(source, dialect, backend: nil) + requested = requested_json_backend_id(backend) + unless available_json_backends.any? { |backend_ref| backend_ref.id == requested } + return unsupported_feature_result("Unsupported JSON backend #{requested}.") + end + return parse_failure("Trailing commas are not supported for #{dialect}.") if detect_trailing_comma(source) if dialect.to_s != 'jsonc' && detect_json_comments(source) return parse_failure("Comments are not supported for #{dialect}.") end register_backend! - analysis = FileAnalysis.new(source) + analysis = TreeHaver.with_backend(requested) { FileAnalysis.new(source) } unless analysis.valid? return parse_failure(analysis.errors.map do |error| error.respond_to?(:message) ? error.message : error.inspect @@ -95,16 +133,21 @@ def match_json_owners(template, destination) Ast::Merge::OwnerSelection.match_by_path(template, destination) end - def merge_json(template_source, destination_source, dialect) - template_result = parse_json(template_source, dialect) + def merge_json(template_source, destination_source, dialect, backend: nil) + requested = requested_json_backend_id(backend) + unless available_json_backends.any? { |backend_ref| backend_ref.id == requested } + return unsupported_feature_result("Unsupported JSON backend #{requested}.") + end + + template_result = parse_json(template_source, dialect, backend: requested) return { ok: false, diagnostics: template_result[:diagnostics] } unless template_result[:ok] - destination_result = parse_json(destination_source, dialect) + destination_result = parse_json(destination_source, dialect, backend: requested) if destination_result[:ok] return { ok: true, diagnostics: [], - output: merge_json_sources(template_source, destination_source), + output: TreeHaver.with_backend(requested) { merge_json_sources(template_source, destination_source) }, policies: [DESTINATION_WINS_ARRAY_POLICY] } end @@ -128,14 +171,19 @@ def merge_json_sources(template_source, destination_source) end private_class_method :merge_json_sources - def json_value_for_source(source, dialect: 'json') + def json_value_for_source(source, dialect: 'json', backend: nil) + requested = requested_json_backend_id(backend) + unless available_json_backends.any? { |backend_ref| backend_ref.id == requested } + raise ParseError, "Unsupported JSON backend #{requested}." + end + raise ParseError, "Trailing commas are not supported for #{dialect}." if detect_trailing_comma(source) if dialect.to_s != 'jsonc' && detect_json_comments(source) raise ParseError, "Comments are not supported for #{dialect}." end register_backend! - analysis = FileAnalysis.new(source) + analysis = TreeHaver.with_backend(requested) { FileAnalysis.new(source) } unless analysis.valid? message = analysis.errors.map { |error| error.respond_to?(:message) ? error.message : error.inspect }.join(', ') raise ParseError, message @@ -207,6 +255,29 @@ def parse_failure(message) end private_class_method :parse_failure + def requested_json_backend_id(backend) + return backend.to_s unless backend.to_s.empty? + + current = TreeHaver.current_backend_id + return current if json_backend_available_for_analysis?(current) + + available_json_backends.find do |backend_ref| + json_backend_available_for_analysis?(backend_ref.id) + end&.id || TREE_SITTER_BACKEND.id + end + private_class_method :requested_json_backend_id + + def json_backend_available_for_analysis?(backend_id) + registrations = TreeHaver.registered_languages(:json) + case backend_id.to_s + when TREE_SITTER_BACKEND.id + registrations.key?(:tree_sitter) || registrations.key?(:tslp) + else + false + end + end + private_class_method :json_backend_available_for_analysis? + def parse_error(message) { severity: 'error', category: 'parse_error', message: message } end @@ -217,6 +288,11 @@ def unsupported_feature(message) end private_class_method :unsupported_feature + def unsupported_feature_result(message) + { ok: false, diagnostics: [unsupported_feature(message)], policies: [] } + end + private_class_method :unsupported_feature_result + def json_analysis_root_kind(analysis) root = analysis.root_object || analysis.root_node return 'object' if root&.object? diff --git a/gems/json-merge/spec/fixtures_integration_spec.rb b/gems/json-merge/spec/fixtures_integration_spec.rb index 30a93a72d..f17bce414 100644 --- a/gems/json-merge/spec/fixtures_integration_spec.rb +++ b/gems/json-merge/spec/fixtures_integration_spec.rb @@ -47,6 +47,37 @@ def json_ready(value) expect(json_ready(result[:diagnostics])).to eq(json_ready(fixture.dig(:expected, :diagnostics))) end + it 'exposes JSON TreeHaver backend availability and plan context' do + expect(json_ready(described_class.available_json_backends.map(&:to_h))).to eq( + [{ 'id' => 'kreuzberg-language-pack', 'family' => 'tree-sitter' }] + ) + + profile = described_class.json_backend_feature_profile + expect(profile[:backend]).to eq('kreuzberg-language-pack') + expect(json_ready(profile[:backend_ref])).to eq( + { 'id' => 'kreuzberg-language-pack', 'family' => 'tree-sitter' } + ) + + expect(json_ready(described_class.json_plan_context.dig(:feature_profile))).to include( + 'backend' => 'kreuzberg-language-pack', + 'supports_dialects' => true + ) + end + + it 'parses through an explicit JSON TreeHaver backend and rejects unsupported backends' do + fixture = json_fixture('structure_json') + result = described_class.parse_json( + fixture[:source], + fixture[:dialect], + backend: 'kreuzberg-language-pack' + ) + unsupported = described_class.parse_json(fixture[:source], fixture[:dialect], backend: :direct_json) + + expect(result[:ok]).to be(true) + expect(unsupported[:ok]).to be(false) + expect(unsupported.dig(:diagnostics, 0, :category)).to eq('unsupported_feature') + end + it 'rejects comments in strict JSON without rejecting comment-like string content' do strict_result = described_class.parse_json("{\n // nope\n \"name\": \"Ruby\"\n}\n", 'json') string_result = described_class.parse_json("{\"url\":\"https://example.test/path\"}\n", 'json') From 5b08c3b8079625a90332219f3e0442c956e1fbe1 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 01:35:03 -0600 Subject: [PATCH 313/347] Assert advertised backends parse through TreeHaver --- .../lib/ast/merge/rspec/shared_examples.rb | 2 + .../tree_haver_backend_contract.rb | 19 +++++++ .../rspec/tree_haver_backend_contract_spec.rb | 52 +++++++++++++++++++ gems/bash-merge/lib/bash/merge.rb | 7 +++ gems/bash-merge/spec/bash/merge_spec.rb | 6 +++ gems/rbs-merge/lib/rbs/merge.rb | 8 +++ 6 files changed, 94 insertions(+) create mode 100644 gems/ast-merge/lib/ast/merge/rspec/shared_examples/tree_haver_backend_contract.rb create mode 100644 gems/ast-merge/spec/ast/merge/rspec/tree_haver_backend_contract_spec.rb diff --git a/gems/ast-merge/lib/ast/merge/rspec/shared_examples.rb b/gems/ast-merge/lib/ast/merge/rspec/shared_examples.rb index 13b1ed6e9..e1b4d0aa2 100644 --- a/gems/ast-merge/lib/ast/merge/rspec/shared_examples.rb +++ b/gems/ast-merge/lib/ast/merge/rspec/shared_examples.rb @@ -29,6 +29,7 @@ # - "Ast::Merge::UnresolvedReviewStateTransportContract" - validates persisted unresolved review replay and JSON-safe transport # - "Ast::Merge::UnresolvedRuntimeDebugContract" - validates unresolved review state in debug payloads # - "Ast::Merge::UnresolvedRuntimeContract" - validates reviewable unresolved runtime payloads +# - "Ast::Merge::TreeHaverBackendContract" - validates advertised backend refs have concrete TreeHaver parsers # - "a reproducible merge" - validates merge scenarios with fixtures and idempotency # - "a reproducible partial merge" - validates partial-merge scenarios with idempotency @@ -55,3 +56,4 @@ require_relative 'shared_examples/unresolved_review_state_transport_contract' require_relative 'shared_examples/unresolved_runtime_debug_contract' require_relative 'shared_examples/unresolved_runtime_contract' +require_relative 'shared_examples/tree_haver_backend_contract' diff --git a/gems/ast-merge/lib/ast/merge/rspec/shared_examples/tree_haver_backend_contract.rb b/gems/ast-merge/lib/ast/merge/rspec/shared_examples/tree_haver_backend_contract.rb new file mode 100644 index 000000000..64ceb5470 --- /dev/null +++ b/gems/ast-merge/lib/ast/merge/rspec/shared_examples/tree_haver_backend_contract.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true + +RSpec.shared_examples 'Ast::Merge::TreeHaverBackendContract' do |language:, backend_id:, source:| + it "registers #{backend_id} as a concrete TreeHaver backend for #{language}" do + backend_ref = TreeHaver::BackendRegistry.fetch(backend_id) + registrations = TreeHaver.registered_languages(language) + + expect(backend_ref).not_to be_nil + expect(registrations).not_to be_empty + + tree = TreeHaver.with_backend(backend_id) do + TreeHaver.parser_for(language).parse(source) + end + + expect(tree).to respond_to(:root_node) + expect(tree.root_node).not_to be_nil + expect(tree.root_node.type.to_s).not_to be_empty + end +end diff --git a/gems/ast-merge/spec/ast/merge/rspec/tree_haver_backend_contract_spec.rb b/gems/ast-merge/spec/ast/merge/rspec/tree_haver_backend_contract_spec.rb new file mode 100644 index 000000000..f5b651824 --- /dev/null +++ b/gems/ast-merge/spec/ast/merge/rspec/tree_haver_backend_contract_spec.rb @@ -0,0 +1,52 @@ +# frozen_string_literal: true + +require_relative '../../../spec_helper' + +require 'bash/merge' +require 'commonmarker/merge' +require 'go/merge' +require 'json/merge' +require 'kramdown/merge' +require 'markly/merge' +require 'prism/merge' +require 'psych/merge' +require 'rbs/merge' +require 'ruby/merge' +require 'rust/merge' +require 'toml/merge' +require 'typescript/merge' +require 'yaml/merge' + +RSpec.describe 'TreeHaver backend contracts' do + cases = [ + ['bash-merge', Bash::Merge, :available_bash_backends, :bash, "echo hello\n"], + ['commonmarker-merge', Commonmarker::Merge, :available_markdown_backends, :markdown, "# Title\n"], + ['go-merge', Go::Merge, :available_go_backends, :go, "package main\n"], + ['json-merge', Json::Merge, :available_json_backends, :json, "{\"a\":1}\n"], + ['kramdown-merge', Kramdown::Merge, :available_markdown_backends, :markdown, "# Title\n"], + ['markly-merge', Markly::Merge, :available_markdown_backends, :markdown, "# Title\n"], + ['prism-merge', Prism::Merge, :available_ruby_backends, :ruby, "def a; end\n"], + ['psych-merge', Psych::Merge, :available_yaml_backends, :yaml, "a: 1\n"], + ['rbs-merge', Rbs::Merge, :available_rbs_backends, :rbs, "class A\nend\n"], + ['ruby-merge', Ruby::Merge, :available_ruby_backends, :ruby, "def a; end\n"], + ['rust-merge', Rust::Merge, :available_rust_backends, :rust, "fn main() {}\n"], + ['toml-merge', Toml::Merge, :available_toml_backends, :toml, "a = 1\n"], + ['typescript-merge', TypeScript::Merge, :available_type_script_backends, :typescript, "const a = 1;\n"], + ['yaml-merge', Yaml::Merge, :available_yaml_backends, :yaml, "a: 1\n"] + ] + + cases.each do |gem_name, merge_module, backend_method, language, source| + describe gem_name do + merge_module.public_send(:register_backend!) if merge_module.respond_to?(:register_backend!) + + merge_module.public_send(backend_method).each do |backend_ref| + include_examples( + 'Ast::Merge::TreeHaverBackendContract', + language: language, + backend_id: backend_ref.id, + source: source + ) + end + end + end +end diff --git a/gems/bash-merge/lib/bash/merge.rb b/gems/bash-merge/lib/bash/merge.rb index 9838b71b3..01d727ccc 100644 --- a/gems/bash-merge/lib/bash/merge.rb +++ b/gems/bash-merge/lib/bash/merge.rb @@ -48,6 +48,7 @@ module Bash # @see SmartMerger Main entry point for merge operations # @see FileAnalysis Analyzes Bash structure module Merge + TREE_SITTER_BACKEND = TreeHaver::KREUZBERG_LANGUAGE_PACK_BACKEND BACKEND_REGISTRY = Struct.new(:registered, :mutex).new(false, Mutex.new) Availability = Struct.new( :grammar_path, @@ -127,6 +128,8 @@ def register_backend! BACKEND_REGISTRY.mutex.synchronize do return if BACKEND_REGISTRY.registered + TreeHaver::BackendRegistry.register(TREE_SITTER_BACKEND) + grammar_finder = TreeHaver::GrammarFinder.new(:bash) grammar_finder.register! if grammar_finder.available? @@ -134,6 +137,10 @@ def register_backend! end end + def available_bash_backends + [TREE_SITTER_BACKEND] + end + def available?(source: "#!/usr/bin/env bash\necho hello\n") availability(source: source).available? end diff --git a/gems/bash-merge/spec/bash/merge_spec.rb b/gems/bash-merge/spec/bash/merge_spec.rb index e4fa190d1..9d75d2002 100644 --- a/gems/bash-merge/spec/bash/merge_spec.rb +++ b/gems/bash-merge/spec/bash/merge_spec.rb @@ -71,6 +71,12 @@ expect(registrations).to be_a(Hash) end + + it 'exposes the registered TreeHaver language-pack backend' do + expect(described_class.available_bash_backends.map(&:to_h)).to eq( + [{ id: 'kreuzberg-language-pack', family: 'tree-sitter' }] + ) + end end describe '.availability' do diff --git a/gems/rbs-merge/lib/rbs/merge.rb b/gems/rbs-merge/lib/rbs/merge.rb index 38a52baed..315e47857 100644 --- a/gems/rbs-merge/lib/rbs/merge.rb +++ b/gems/rbs-merge/lib/rbs/merge.rb @@ -91,6 +91,7 @@ module Backends # Tracks whether backends were registered, without class instance variables. BACKEND_REGISTRY = Struct.new(:registered, :mutex).new(false, Mutex.new) RBS_BACKEND_REFERENCE = TreeHaver::BackendReference.new(id: 'rbs', family: 'rbs').freeze + TREE_SITTER_BACKEND_REFERENCE = TreeHaver::KREUZBERG_LANGUAGE_PACK_BACKEND class << self # Register the current RBS parsing entrypoints with TreeHaver. @@ -130,6 +131,13 @@ def register_backend! BACKEND_REGISTRY.registered = true end end + + def available_rbs_backends + backends = [RBS_BACKEND_REFERENCE] + registrations = TreeHaver.registered_languages(:rbs) + backends << TREE_SITTER_BACKEND_REFERENCE if registrations.key?(:tree_sitter) || registrations.key?(:tslp) + backends + end end end end From 36a215a3dbef96ba1e8d238c78512ea47e2b6a2d Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 01:35:53 -0600 Subject: [PATCH 314/347] Share Kramdown Markdown helper extraction --- .../kramdown-merge/lib/kramdown/merge/backend.rb | 16 +++------------- .../lib/markdown/merge/backend_support.rb | 16 +++++++++++++--- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/gems/kramdown-merge/lib/kramdown/merge/backend.rb b/gems/kramdown-merge/lib/kramdown/merge/backend.rb index 95f4e6a9a..ee35d7acf 100644 --- a/gems/kramdown-merge/lib/kramdown/merge/backend.rb +++ b/gems/kramdown-merge/lib/kramdown/merge/backend.rb @@ -55,7 +55,9 @@ class Node < ::TreeHaver::Base::Node Markdown::Merge::BackendSupport.configure_node_heading_and_code_block_helpers!( self, heading_matcher: ->(node) { node.raw_type == 'header' }, - code_block_matcher: ->(node) { node.raw_type == 'codeblock' } + code_block_matcher: ->(node) { node.raw_type == 'codeblock' }, + heading_level_extractor: ->(inner_node) { inner_node.options[:level] }, + code_block_info_extractor: ->(inner_node) { inner_node.options[:lang] } ) def type @@ -79,18 +81,6 @@ def children Array(inner_node.children).map { |child| self.class.new(child, source: source, lines: lines) } end - def header_level - return unless raw_type == 'header' - - inner_node.options[:level] - end - - def fence_info - return unless raw_type == 'codeblock' - - inner_node.options[:lang] - end - def start_point line = [inner_node.options.fetch(:location, 1).to_i - 1, 0].max Point.new(line, 0) diff --git a/gems/markdown-merge/lib/markdown/merge/backend_support.rb b/gems/markdown-merge/lib/markdown/merge/backend_support.rb index fd36c2509..b7c213224 100644 --- a/gems/markdown-merge/lib/markdown/merge/backend_support.rb +++ b/gems/markdown-merge/lib/markdown/merge/backend_support.rb @@ -79,18 +79,28 @@ def configure_node_link_and_navigation!(klass, next_sibling_selector:, prev_sibl end end - def configure_node_heading_and_code_block_helpers!(klass, heading_matcher:, code_block_matcher:) + def configure_node_heading_and_code_block_helpers!(klass, heading_matcher:, code_block_matcher:, + heading_level_extractor: nil, + code_block_info_extractor: nil) klass.class_eval do define_method(:header_level) do return unless Markdown::Merge::BackendSupport.send(:node_helper_match?, self, heading_matcher) - Markdown::Merge::BackendSupport.send(:safe_inner_node_call, inner_node, :header_level) + if heading_level_extractor.respond_to?(:call) + heading_level_extractor.call(inner_node) + else + Markdown::Merge::BackendSupport.send(:safe_inner_node_call, inner_node, :header_level) + end end define_method(:fence_info) do return unless Markdown::Merge::BackendSupport.send(:node_helper_match?, self, code_block_matcher) - Markdown::Merge::BackendSupport.send(:safe_inner_node_call, inner_node, :fence_info) + if code_block_info_extractor.respond_to?(:call) + code_block_info_extractor.call(inner_node) + else + Markdown::Merge::BackendSupport.send(:safe_inner_node_call, inner_node, :fence_info) + end end end end From bc0bab08c59d63295d9c7f6473752c0d980f8272 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 01:37:36 -0600 Subject: [PATCH 315/347] Route Prism CRISPR parsing through TreeHaver --- gems/ast-crispr-ruby-prism/Gemfile.lock | 1 + .../ast-crispr-ruby-prism.gemspec | 1 + .../lib/ast/crispr/ruby/prism.rb | 26 ++++++++++++++++++- .../spec/ast/crispr/ruby/prism_spec.rb | 9 +++++++ 4 files changed, 36 insertions(+), 1 deletion(-) diff --git a/gems/ast-crispr-ruby-prism/Gemfile.lock b/gems/ast-crispr-ruby-prism/Gemfile.lock index 95bd2e289..00ddb80b5 100644 --- a/gems/ast-crispr-ruby-prism/Gemfile.lock +++ b/gems/ast-crispr-ruby-prism/Gemfile.lock @@ -4,6 +4,7 @@ PATH ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) prism (>= 1.0) + tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH 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 b9d1753d2..c09b418d4 100644 --- a/gems/ast-crispr-ruby-prism/ast-crispr-ruby-prism.gemspec +++ b/gems/ast-crispr-ruby-prism/ast-crispr-ruby-prism.gemspec @@ -97,6 +97,7 @@ Gem::Specification.new do |spec| # Utilities spec.add_dependency 'ast-crispr', "= #{spec.version}" spec.add_dependency 'prism', '>= 1.0' + spec.add_dependency 'tree_haver', "= #{spec.version}" spec.add_dependency('version_gem', '~> 1.1', '>= 1.1.9') # ruby >= 2.2.0 # NOTE: It is preferable to list development dependencies in the gemspec due to increased diff --git a/gems/ast-crispr-ruby-prism/lib/ast/crispr/ruby/prism.rb b/gems/ast-crispr-ruby-prism/lib/ast/crispr/ruby/prism.rb index 13bd8113e..21d6c71c5 100644 --- a/gems/ast-crispr-ruby-prism/lib/ast/crispr/ruby/prism.rb +++ b/gems/ast-crispr-ruby-prism/lib/ast/crispr/ruby/prism.rb @@ -2,6 +2,7 @@ require 'ast/crispr' require 'prism' +require 'tree_haver' require 'version_gem' require_relative 'prism/version' @@ -10,12 +11,35 @@ module Crispr module Ruby module Prism class Error < StandardError; end + BACKEND_REFERENCE = ::TreeHaver::BackendReference.new(id: 'prism', family: 'native').freeze + BACKEND_REGISTRY = Struct.new(:registered, :mutex).new(false, Mutex.new) + + class << self + def register_backend! + BACKEND_REGISTRY.mutex.synchronize do + return if BACKEND_REGISTRY.registered + + ::TreeHaver::BackendRegistry.register(BACKEND_REFERENCE) + ::TreeHaver.register_language( + :ruby, + backend_module: ::TreeHaver::Backends::Prism, + backend_type: :prism, + gem_name: 'prism' + ) + + BACKEND_REGISTRY.registered = true + end + end + end module Utils module_function def parse_with_comments(source) - ::Prism.parse(source) + Ast::Crispr::Ruby::Prism.register_backend! + ::TreeHaver.with_backend(Ast::Crispr::Ruby::Prism::BACKEND_REFERENCE.id) do + ::TreeHaver.parser_for(:ruby).parse(source).parse_result + end end def extract_statements(body_node) diff --git a/gems/ast-crispr-ruby-prism/spec/ast/crispr/ruby/prism_spec.rb b/gems/ast-crispr-ruby-prism/spec/ast/crispr/ruby/prism_spec.rb index 790eb77c0..2c3071e93 100644 --- a/gems/ast-crispr-ruby-prism/spec/ast/crispr/ruby/prism_spec.rb +++ b/gems/ast-crispr-ruby-prism/spec/ast/crispr/ruby/prism_spec.rb @@ -12,6 +12,15 @@ expect(context.adapter).to be_a(Ast::Crispr::Ruby::Prism::Adapter) end + it 'parses Ruby through the registered TreeHaver Prism backend' do + result = described_class::Utils.parse_with_comments("puts :ok\n") + tree = TreeHaver.with_backend('prism') { TreeHaver.parser_for(:ruby).parse("puts :ok\n") } + + expect(TreeHaver::BackendRegistry.fetch('prism').to_h).to eq(id: 'prism', family: 'native') + expect(result).to be_success + expect(tree.parse_result).to be_a(::Prism::ParseResult) + end + context 'with a structure profile' do let(:context) { described_class.document_context(content: "puts :ok\n", source_label: 'example.rb') } let(:profile) { context.structure_profile(owner_scope: :top_level_statements) } From 125a854b7c4445d35dc12e380487df746a336f01 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 01:46:44 -0600 Subject: [PATCH 316/347] Delegate Prism CRISPR analysis to prism-merge --- gems/ast-crispr-ruby-prism/Gemfile.lock | 3 +- .../ast-crispr-ruby-prism.gemspec | 3 +- .../lib/ast/crispr/ruby/prism.rb | 45 ++++++------------- .../spec/ast/crispr/ruby/prism_spec.rb | 8 ++-- 4 files changed, 19 insertions(+), 40 deletions(-) diff --git a/gems/ast-crispr-ruby-prism/Gemfile.lock b/gems/ast-crispr-ruby-prism/Gemfile.lock index 00ddb80b5..06a81f5a4 100644 --- a/gems/ast-crispr-ruby-prism/Gemfile.lock +++ b/gems/ast-crispr-ruby-prism/Gemfile.lock @@ -3,8 +3,7 @@ PATH specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) - prism (>= 1.0) - tree_haver (= 7.1.0) + prism-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH 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 c09b418d4..ad4457d9d 100644 --- a/gems/ast-crispr-ruby-prism/ast-crispr-ruby-prism.gemspec +++ b/gems/ast-crispr-ruby-prism/ast-crispr-ruby-prism.gemspec @@ -96,8 +96,7 @@ Gem::Specification.new do |spec| # Utilities spec.add_dependency 'ast-crispr', "= #{spec.version}" - spec.add_dependency 'prism', '>= 1.0' - spec.add_dependency 'tree_haver', "= #{spec.version}" + spec.add_dependency 'prism-merge', "= #{spec.version}" spec.add_dependency('version_gem', '~> 1.1', '>= 1.1.9') # ruby >= 2.2.0 # NOTE: It is preferable to list development dependencies in the gemspec due to increased diff --git a/gems/ast-crispr-ruby-prism/lib/ast/crispr/ruby/prism.rb b/gems/ast-crispr-ruby-prism/lib/ast/crispr/ruby/prism.rb index 21d6c71c5..86934fa8d 100644 --- a/gems/ast-crispr-ruby-prism/lib/ast/crispr/ruby/prism.rb +++ b/gems/ast-crispr-ruby-prism/lib/ast/crispr/ruby/prism.rb @@ -1,8 +1,7 @@ # frozen_string_literal: true require 'ast/crispr' -require 'prism' -require 'tree_haver' +require 'prism/merge' require 'version_gem' require_relative 'prism/version' @@ -11,35 +10,16 @@ module Crispr module Ruby module Prism class Error < StandardError; end - BACKEND_REFERENCE = ::TreeHaver::BackendReference.new(id: 'prism', family: 'native').freeze - BACKEND_REGISTRY = Struct.new(:registered, :mutex).new(false, Mutex.new) - - class << self - def register_backend! - BACKEND_REGISTRY.mutex.synchronize do - return if BACKEND_REGISTRY.registered - - ::TreeHaver::BackendRegistry.register(BACKEND_REFERENCE) - ::TreeHaver.register_language( - :ruby, - backend_module: ::TreeHaver::Backends::Prism, - backend_type: :prism, - gem_name: 'prism' - ) - - BACKEND_REGISTRY.registered = true - end - end - end module Utils module_function + def parse_analysis(source, source_label: nil) + ::Prism::Merge::FileAnalysis.new(source, source_label: source_label) + end + def parse_with_comments(source) - Ast::Crispr::Ruby::Prism.register_backend! - ::TreeHaver.with_backend(Ast::Crispr::Ruby::Prism::BACKEND_REFERENCE.id) do - ::TreeHaver.parser_for(:ruby).parse(source).parse_result - end + parse_analysis(source).parse_result end def extract_statements(body_node) @@ -65,27 +45,28 @@ def find_leading_comments(parse_result, current_stmt, prev_stmt, body_node) class Adapter def read_ast(document) - result = Utils.parse_with_comments(document.content) - return result if result.success? + analysis = Utils.parse_analysis(document.content, source_label: document.source_label) + return analysis if analysis.valid? raise Ast::Crispr::Error.new("Unable to read structural owners from #{document.source_label}", details: { source_label: document.source_label }) end def structural_owners(document, owner_scope: :shared_default) - parse_result = document.ast + analysis = document.ast case owner_scope when :shared_default, :line_bound_statements, :top_level_statements - Utils.extract_statements(parse_result.value.statements) + analysis.statements when :ruby_comments - parse_result.comments + analysis.parse_result.comments else raise Ast::Crispr::Error.new('Unsupported CRISPR owner scope', details: { owner_scope: owner_scope }) end end def comment_regions_for(document, owner, region: :leading, owner_scope: :shared_default) - parse_result = document.ast + analysis = document.ast + parse_result = analysis.parse_result owners = structural_owners(document, owner_scope: owner_scope) index = owners.index(owner) return [] unless index diff --git a/gems/ast-crispr-ruby-prism/spec/ast/crispr/ruby/prism_spec.rb b/gems/ast-crispr-ruby-prism/spec/ast/crispr/ruby/prism_spec.rb index 2c3071e93..78002983c 100644 --- a/gems/ast-crispr-ruby-prism/spec/ast/crispr/ruby/prism_spec.rb +++ b/gems/ast-crispr-ruby-prism/spec/ast/crispr/ruby/prism_spec.rb @@ -12,13 +12,13 @@ expect(context.adapter).to be_a(Ast::Crispr::Ruby::Prism::Adapter) end - it 'parses Ruby through the registered TreeHaver Prism backend' do + it 'uses prism-merge analysis for Ruby structure' do + analysis = described_class::Utils.parse_analysis("puts :ok\n", source_label: 'example.rb') result = described_class::Utils.parse_with_comments("puts :ok\n") - tree = TreeHaver.with_backend('prism') { TreeHaver.parser_for(:ruby).parse("puts :ok\n") } - expect(TreeHaver::BackendRegistry.fetch('prism').to_h).to eq(id: 'prism', family: 'native') + expect(analysis).to be_a(::Prism::Merge::FileAnalysis) + expect(analysis).to be_valid expect(result).to be_success - expect(tree.parse_result).to be_a(::Prism::ParseResult) end context 'with a structure profile' do From 0fecaf1aad8873b6d7122736434f5b667984c94f Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 01:50:21 -0600 Subject: [PATCH 317/347] Guard CRISPR providers against parser bypasses --- gems/ast-crispr/Gemfile.lock | 2 +- .../spec/provider_architecture_spec.rb | 39 +++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 gems/ast-crispr/spec/provider_architecture_spec.rb diff --git a/gems/ast-crispr/Gemfile.lock b/gems/ast-crispr/Gemfile.lock index b731cdd46..0b6a216c5 100644 --- a/gems/ast-crispr/Gemfile.lock +++ b/gems/ast-crispr/Gemfile.lock @@ -19,7 +19,7 @@ PATH specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) - prism (>= 1.0) + prism-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH diff --git a/gems/ast-crispr/spec/provider_architecture_spec.rb b/gems/ast-crispr/spec/provider_architecture_spec.rb new file mode 100644 index 000000000..d816944b9 --- /dev/null +++ b/gems/ast-crispr/spec/provider_architecture_spec.rb @@ -0,0 +1,39 @@ +# frozen_string_literal: true + +require 'pathname' + +RSpec.describe 'Ast::Crispr provider architecture' do + let(:repo_root) { Pathname(__dir__).join('..', '..', '..').expand_path } + let(:provider_lib_files) { repo_root.join('gems').glob('ast-crispr-*/lib/**/*.rb') } + + let(:forbidden_patterns) do + { + /(? 'delegate Ruby/Prism analysis to prism-merge', + /(? 'delegate Markdown/Markly analysis to markly-merge', + /(? 'delegate Markdown/CommonMarker analysis to commonmarker-merge', + /Kramdown::Document\.new\b/ => 'delegate Markdown/Kramdown analysis to kramdown-merge', + /(? 'delegate JSON analysis to json-merge', + /(? 'delegate YAML analysis to yaml-merge or psych-merge', + /\bTomlRB\b/ => 'delegate TOML analysis to toml-merge or a TOML provider merge gem', + /\bTOML::Parslet\b/ => 'delegate TOML analysis to toml-merge or parslet-toml-merge', + /TreeHaver\.register_language\b/ => 'register TreeHaver backends in merge gems', + /TreeHaver::BackendRegistry\.register\b/ => 'register TreeHaver backends in merge gems', + /TreeHaver\.parser_for\b/ => 'delegate parsing and analysis to merge gems' + } + end + + it 'keeps provider gems above merge-gem analysis instead of parser APIs' do + violations = provider_lib_files.flat_map do |path| + content = path.read + relative_path = path.relative_path_from(repo_root) + + forbidden_patterns.filter_map do |pattern, guidance| + next unless content.match?(pattern) + + "#{relative_path}: matches #{pattern.inspect}; #{guidance}" + end + end + + expect(violations).to be_empty, violations.join("\n") + end +end From 995478cbc963f82d8abe08eca289a36db06b3d5a Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 01:54:55 -0600 Subject: [PATCH 318/347] Add CRISPR merge-backed replacement --- gems/ast-crispr/lib/ast/crispr.rb | 132 ++++++++++++++++++++++- gems/ast-crispr/spec/old_runtime_spec.rb | 64 +++++++++++ 2 files changed, 195 insertions(+), 1 deletion(-) diff --git a/gems/ast-crispr/lib/ast/crispr.rb b/gems/ast-crispr/lib/ast/crispr.rb index c04d41e3b..6d7ba47c5 100644 --- a/gems/ast-crispr/lib/ast/crispr.rb +++ b/gems/ast-crispr/lib/ast/crispr.rb @@ -586,6 +586,10 @@ class OperationProfile family: :rewrite, description: 'Replace selected content with explicit replacement text' }, + merge_replace: { + family: :rewrite, + description: 'Replace selected content with the result of a merge-gem slice merge' + }, delete: { family: :removal, description: 'Delete selected content without inserting replacement text' @@ -600,7 +604,7 @@ class OperationProfile } }.freeze KNOWN_REQUIREMENTS = %i[none optional required].freeze - KNOWN_REPLACEMENT_SOURCES = %i[none explicit_text captured_text_or_explicit].freeze + KNOWN_REPLACEMENT_SOURCES = %i[none explicit_text captured_text_or_explicit merge_template_text].freeze attr_reader :operation_kind, :source_requirement, :destination_requirement, :replacement_source, :metadata @@ -1060,6 +1064,79 @@ def replace_line_ranges(source, matches, replacement) Ast::Merge::StructuralEdit::PlanSet.new(source: source, plans: plans).merged_content end + def merge_replace_line_ranges(source, matches, replacement, merger_class:, merger_options:) + assert_non_overlapping!(matches) + merge_results = [] + plans = matches.map do |match| + destination_slice = match.slice_from(source) + merge_result = merge_replacement_slice( + replacement.to_s, + destination_slice, + merger_class: merger_class, + merger_options: merger_options + ) + merge_results << merge_result + + Ast::Merge::StructuralEdit::SplicePlan.new( + source: source, + replace_start_line: match.start_line, + replace_end_line: match.end_line, + replacement: merge_result.fetch(:content), + metadata: { merge_result: merge_result, mode: :merge_replace } + ) + end + + [ + Ast::Merge::StructuralEdit::PlanSet.new(source: source, plans: plans).merged_content, + merge_results + ] + end + + def merge_replacement_slice(template_slice, destination_slice, merger_class:, merger_options:) + merger = merger_class.new(template_slice, destination_slice, **merger_options) + result = merger.respond_to?(:merge_result) ? merger.merge_result : merger.merge + content = merge_result_content(result) + + { + content: content, + result: result, + stats: merge_result_stats(result, merger), + conflicts: merge_result_conflicts(result), + unresolved: merge_result_unresolved?(result) + } + end + + def merge_result_content(result) + return result if result.is_a?(String) + return result.output if result.respond_to?(:output) + return result.content if result.respond_to?(:content) && result.content.is_a?(String) + + result.to_s + end + + def merge_result_stats(result, merger) + if result.respond_to?(:stats) + stats = result.stats + return stats unless stats.respond_to?(:empty?) && stats.empty? + end + return merger.stats if merger.respond_to?(:stats) + + {} + end + + def merge_result_conflicts(result) + return result.conflicts if result.respond_to?(:conflicts) + + [] + end + + def merge_result_unresolved?(result) + return result.unresolved? if result.respond_to?(:unresolved?) + return result.review_required? if result.respond_to?(:review_required?) + + false + end + def assert_non_overlapping!(matches) ranges = matches.map(&:line_range).sort_by(&:begin) ranges.each_cons(2) do |left, right| @@ -1215,6 +1292,59 @@ def operation_profile end end + class MergeReplace < Actor + include OperationSupport + include OperationProfilable + + declare_operation_profile( + operation_kind: :merge_replace, + source_requirement: :required, + destination_requirement: :none, + replacement_source: :merge_template_text, + captures_source_text: true, + supports_if_missing: false + ) + + input :content, type: String + input :target, type: OwnerSelector + input :replacement, type: String + input :merger_class + input :merger_options, default: -> { {} } + input :source_label, type: String, default: 'source' + + output :updated_content + output :matches, default: -> { [] } + output :match_count, type: Integer, default: 0 + output :changed, default: false + output :captured_text, allow_nil: true, default: nil + output :merge_results, default: -> { [] } + output :operation_profile + + def call + self.operation_profile = self.class.operation_profile + context = context_for(content: content, source_label: source_label, target: target) + self.matches = normalize_matches(target, context) + self.match_count = matches.size + self.captured_text = capture_text(content, matches) + if matches.empty? + self.updated_content = content + self.changed = false + return + end + + self.updated_content, self.merge_results = merge_replace_line_ranges( + content, + matches, + replacement, + merger_class: merger_class, + merger_options: merger_options.to_h + ) + self.changed = updated_content != content + rescue Error => e + crispr_fail!(e) + end + end + class Replace < Actor include OperationSupport include OperationProfilable diff --git a/gems/ast-crispr/spec/old_runtime_spec.rb b/gems/ast-crispr/spec/old_runtime_spec.rb index 96130da78..7e8509493 100644 --- a/gems/ast-crispr/spec/old_runtime_spec.rb +++ b/gems/ast-crispr/spec/old_runtime_spec.rb @@ -1,5 +1,8 @@ # frozen_string_literal: true +require 'json' +require 'pathname' + RSpec.describe Ast::Crispr do FakeLocation = Struct.new(:start_line, :end_line, keyword_init: true) FakeCommentRegion = Struct.new(:location, :text, keyword_init: true) @@ -55,6 +58,14 @@ def structure_profile(owner_scope: :shared_default) end let(:adapter) { FakeAdapter.new(owners: owners, comments: comments) } + def fixtures_root + Pathname(__dir__).join('..', '..', '..', '..', 'fixtures').expand_path + end + + def read_json(path) + Ast::Merge.normalize_value(JSON.parse(path.read)) + end + it 'has a version number' do expect(Ast::Crispr::VERSION).not_to be_nil end @@ -331,6 +342,26 @@ def structure_profile(owner_scope: :shared_default) it_behaves_like 'Ast::Crispr::OperationProfile contract' end + describe Ast::Crispr::MergeReplace do + let(:operation_profile) { described_class.operation_profile } + let(:expected_operation_kind) { :merge_replace } + let(:expected_operation_family) { :rewrite } + let(:expected_known_operation_kind) { true } + let(:expected_source_requirement) { :required } + let(:expected_destination_requirement) { :none } + let(:expected_replacement_source) { :merge_template_text } + let(:expected_captures_source_text) { true } + let(:expected_supports_if_missing) { false } + let(:expected_selects_source) { true } + let(:expected_requires_source) { true } + let(:expected_supports_destination) { false } + let(:expected_requires_destination) { false } + let(:expected_explicit_replacement) { false } + let(:expected_may_reuse_captured_text) { false } + + it_behaves_like 'Ast::Crispr::OperationProfile contract' + end + describe Ast::Crispr::Delete do let(:operation_profile) { described_class.operation_profile } let(:expected_operation_kind) { :delete } @@ -415,6 +446,39 @@ def structure_profile(owner_scope: :shared_default) end end + describe described_class::MergeReplace do + it 'merges replacement text into the selected slice before splicing it back' do + fixture = read_json(fixtures_root.join('diagnostics', 'slice-1018-crispr-slice-merge', + 'crispr-slice-merge.json')) + operation = fixture.fetch(:operation) + selector = operation.fetch(:selector) + merge = operation.fetch(:merge) + target = Ast::Crispr::Selectors.line_block( + start_line_text: selector.fetch(:start_line_text), + end_line_text: selector.fetch(:end_line_text), + limit: selector.fetch(:limit) + ) + + actor = described_class.call( + content: operation.fetch(:content), + target: target, + replacement: operation.fetch(:replacement), + merger_class: Ast::Merge::Text::SmartMerger, + merger_options: { + preference: merge.fetch(:preference).to_sym, + add_template_only_nodes: merge.fetch(:add_template_only_nodes) + } + ) + + expected = fixture.fetch(:expected) + expect(actor.changed).to eq(expected.fetch(:changed)) + expect(actor.match_count).to eq(expected.fetch(:match_count)) + expect(actor.captured_text).to include(expected.fetch(:captured_text_contains)) + expect(actor.merge_results.first.fetch(:stats)).not_to be_empty + expect(actor.updated_content).to eq(expected.fetch(:output)) + end + end + describe described_class::Insert do it 'appends when configured and no destination is resolved' do content = <<~RUBY From 96ae75c22475abbc6781e1574480eb8902ab25f5 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 01:58:29 -0600 Subject: [PATCH 319/347] Move Markdown CRISPR owners into substrate --- gems/ast-crispr-markdown-markly/Gemfile.lock | 2 +- .../lib/ast/crispr/markdown/markly.rb | 308 +----------------- gems/markdown-merge/Gemfile.lock | 2 +- .../lib/markdown/merge/file_analysis.rb | 269 +++++++++++++++ gems/markly-merge/Gemfile.lock | 2 +- .../spec/fixtures_integration_spec.rb | 24 ++ 6 files changed, 301 insertions(+), 306 deletions(-) diff --git a/gems/ast-crispr-markdown-markly/Gemfile.lock b/gems/ast-crispr-markdown-markly/Gemfile.lock index d12e8b14c..9e99f39dd 100644 --- a/gems/ast-crispr-markdown-markly/Gemfile.lock +++ b/gems/ast-crispr-markdown-markly/Gemfile.lock @@ -11,7 +11,7 @@ PATH specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) - prism (>= 1.0) + prism-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH diff --git a/gems/ast-crispr-markdown-markly/lib/ast/crispr/markdown/markly.rb b/gems/ast-crispr-markdown-markly/lib/ast/crispr/markdown/markly.rb index ddd166951..ec5dbc6a9 100644 --- a/gems/ast-crispr-markdown-markly/lib/ast/crispr/markdown/markly.rb +++ b/gems/ast-crispr-markdown-markly/lib/ast/crispr/markdown/markly.rb @@ -12,47 +12,6 @@ module Markly class Error < StandardError; end class Adapter - Location = Struct.new(:start_line, :end_line, keyword_init: true) - HeadingSectionOwner = Struct.new( - :location, - :heading_text, - :heading_source, - :level, - :base, - keyword_init: true - ) - LinkDefinitionOwner = Struct.new( - :location, - :label, - :url, - :title, - :source, - keyword_init: true - ) - HtmlCommentOwner = Struct.new( - :location, - :text, - :source, - keyword_init: true - ) - InlineReferenceOwner = Struct.new( - :location, - :line, - :start_column, - :end_column, - :source, - :reference_kind, - :label, - :labels, - keyword_init: true - ) - TableRowOwner = Struct.new( - :location, - :source, - :text, - keyword_init: true - ) - def read_ast(document) analysis = ::Markly::Merge::FileAnalysis.new(document.content) return analysis if analysis.valid? @@ -65,15 +24,15 @@ def structural_owners(document, owner_scope: :shared_default) analysis = document.ast case owner_scope when :shared_default, :heading_sections - build_heading_sections(analysis) + analysis.heading_section_owners when :link_definitions - build_link_definitions(analysis) + analysis.link_definition_owners when :html_comments - build_html_comments(analysis) + analysis.html_comment_owners when :inline_references - build_inline_references(analysis) + analysis.inline_reference_owners when :table_rows - build_table_rows(analysis) + analysis.table_row_owners else raise Ast::Crispr::Error.new('Unsupported CRISPR owner scope', details: { owner_scope: owner_scope }) end @@ -134,263 +93,6 @@ def structure_profile(owner_scope: :shared_default) private - def build_heading_sections(analysis) - headings = Array(analysis.statements).filter_map do |statement| - next unless heading_statement?(statement) - - build_heading_owner(statement, analysis) - end - - headings.each_with_index.map do |owner, index| - branch_end_line = branch_end_line(headings, index, analysis) - HeadingSectionOwner.new( - location: Location.new(start_line: owner.location.start_line, end_line: branch_end_line), - heading_text: owner.heading_text, - heading_source: owner.heading_source, - level: owner.level, - base: owner.base - ) - end - end - - def build_link_definitions(analysis) - Array(analysis.statements).filter_map do |statement| - next unless statement.respond_to?(:merge_type) && statement.merge_type == :link_definition - - position = statement.source_position - next unless position - - LinkDefinitionOwner.new( - location: Location.new(start_line: position[:start_line], end_line: position[:end_line]), - label: statement.label, - url: statement.url, - title: statement.title, - source: if statement.respond_to?(:content) - statement.content - else - analysis.source_range( - position[:start_line], position[:end_line] - ).chomp - end - ) - end - end - - def build_html_comments(analysis) - analysis.comment_tracker.comment_nodes.map do |comment| - HtmlCommentOwner.new( - location: Location.new(start_line: comment.location.start_line, end_line: comment.location.end_line), - text: comment.content, - source: comment.text - ) - end - end - - def build_inline_references(analysis) - analysis.source.to_s.lines.each_with_index.flat_map do |line, index| - inline_references_for_line(line.chomp, index + 1) - end - end - - def build_table_rows(analysis) - ast_table_lines = {} - ast_rows = Array(analysis.statements).flat_map do |statement| - node = unwrap_markdown_statement(statement) - next [] unless node.respond_to?(:type) && node.type.to_s == 'table' - - table_position = node.source_position - if table_position - (table_position[:start_line]..table_position[:end_line]).each do |line| - ast_table_lines[line] = true - end - end - Array(node.children).filter_map do |child| - next unless child.respond_to?(:type) && child.type.to_s == 'table_row' - - position = child.source_position - next unless position - - TableRowOwner.new( - location: Location.new(start_line: position[:start_line], end_line: position[:end_line]), - source: analysis.source_range(position[:start_line], position[:end_line]), - text: child.to_plaintext.to_s - ) - end - end - ast_lines = ast_rows.map { |owner| owner.location.start_line }.to_h { |line| [line, true] } - loose_rows = analysis.source.to_s.lines.each_with_index.filter_map do |line, index| - line_number = index + 1 - next if ast_lines[line_number] - next if ast_table_lines[line_number] - next unless loose_table_row_line?(line) - - TableRowOwner.new( - location: Location.new(start_line: line_number, end_line: line_number), - source: line, - text: line - ) - end - ast_rows + loose_rows - end - - def loose_table_row_line?(line) - stripped = line.to_s.lstrip - return false unless stripped.start_with?('|') - - stripped.include?(' |') || stripped.include?('| ') - end - - def heading_statement?(statement) - merge_type = if statement.respond_to?(:merge_type) - statement.merge_type - else - unwrap_markdown_statement(statement)&.type - end - - %w[heading header].include?(merge_type.to_s) - end - - def build_heading_owner(statement, analysis) - node = unwrap_markdown_statement(statement) - position = node&.source_position - return unless node && position - - heading_source = analysis.source_range(position[:start_line], position[:end_line]).sub(/\n\z/, '') - heading_text = node.to_plaintext.to_s.sub(/\n+\z/, '') - HeadingSectionOwner.new( - location: Location.new(start_line: position[:start_line], end_line: position[:end_line]), - heading_text: heading_text, - heading_source: heading_source, - level: node.header_level, - base: normalize_heading_base(heading_text) - ) - rescue StandardError - nil - end - - def branch_end_line(headings, index, analysis) - current = headings[index] - cursor = index + 1 - while cursor < headings.length - return headings[cursor].location.start_line - 1 if headings[cursor].level <= current.level - - cursor += 1 - end - - analysis.source.to_s.lines.length - end - - def unwrap_markdown_statement(statement) - if defined?(Ast::Merge::NodeTyping) - Ast::Merge::NodeTyping.unwrap(statement) - else - statement - end - rescue StandardError - statement - end - - def normalize_heading_base(text) - text.to_s.sub(/\A(?:\d\uFE0F?\u20E3|[^[:alnum:][:space:]])+[ \t]*/u, '').strip.downcase - end - - def inline_references_for_line(line, line_number) - owners = [] - index = 0 - while index < line.length - image = inline_image_reference_at(line, index, line_number) - if image - owners << image - index = image.end_column - next - end - - link = inline_link_reference_at(line, index, line_number) - if link - owners << link - index = link.end_column - next - end - - index += 1 - end - owners - end - - def inline_image_reference_at(line, index, line_number) - return unless line[index] == '!' && line[index + 1] == '[' - - alt_end = closing_bracket_index(line, index + 1) - return unless alt_end && line[alt_end + 1] == '[' - - label_end = closing_bracket_index(line, alt_end + 1) - return unless label_end - - label = line[(alt_end + 2)...label_end] - inline_reference_owner( - line: line, - line_number: line_number, - start_column: index, - end_column: label_end + 1, - reference_kind: :image_reference, - label: label, - labels: [label] - ) - end - - def inline_link_reference_at(line, index, line_number) - return unless line[index] == '[' - - text_end = closing_bracket_index(line, index) - return unless text_end && line[text_end + 1] == '[' - - label_end = closing_bracket_index(line, text_end + 1) - return unless label_end - - text = line[(index + 1)...text_end] - label = line[(text_end + 2)...label_end] - image_owner = inline_image_reference_at(text, 0, line_number) - labels = [label] - labels.unshift(image_owner.label) if image_owner && image_owner.source == text - inline_reference_owner( - line: line, - line_number: line_number, - start_column: index, - end_column: label_end + 1, - reference_kind: labels.length > 1 ? :linked_image_reference : :link_reference, - label: label, - labels: labels - ) - end - - def inline_reference_owner(line:, line_number:, start_column:, end_column:, reference_kind:, label:, labels:) - InlineReferenceOwner.new( - location: Location.new(start_line: line_number, end_line: line_number), - line: line_number, - start_column: start_column, - end_column: end_column, - source: line[start_column...end_column], - reference_kind: reference_kind, - label: label, - labels: labels.compact.uniq - ) - end - - def closing_bracket_index(text, opening_index) - depth = 0 - index = opening_index - while index < text.length - case text[index] - when '[' - depth += 1 - when ']' - depth -= 1 - return index if depth.zero? - end - index += 1 - end - nil - end end module Selectors diff --git a/gems/markdown-merge/Gemfile.lock b/gems/markdown-merge/Gemfile.lock index 3e631c3cf..14b5d2a15 100644 --- a/gems/markdown-merge/Gemfile.lock +++ b/gems/markdown-merge/Gemfile.lock @@ -19,7 +19,7 @@ PATH specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) - prism (>= 1.0) + prism-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH diff --git a/gems/markdown-merge/lib/markdown/merge/file_analysis.rb b/gems/markdown-merge/lib/markdown/merge/file_analysis.rb index 648afbf6c..3ead57471 100644 --- a/gems/markdown-merge/lib/markdown/merge/file_analysis.rb +++ b/gems/markdown-merge/lib/markdown/merge/file_analysis.rb @@ -67,6 +67,23 @@ def default_freeze_node_class # @return [Hash] Parser-specific options attr_reader :parser_options + Location = Struct.new(:start_line, :end_line, keyword_init: true) + HeadingSectionOwner = Struct.new(:location, :heading_text, :heading_source, :level, :base, keyword_init: true) + LinkDefinitionOwner = Struct.new(:location, :label, :url, :title, :source, keyword_init: true) + HtmlCommentOwner = Struct.new(:location, :text, :source, keyword_init: true) + InlineReferenceOwner = Struct.new( + :location, + :line, + :start_column, + :end_column, + :source, + :reference_kind, + :label, + :labels, + keyword_init: true + ) + TableRowOwner = Struct.new(:location, :source, :text, keyword_init: true) + # Initialize file analysis with tree_haver backend. # # @param source [String] Markdown source code to analyze @@ -272,8 +289,260 @@ def collect_top_level_nodes nodes end + def heading_section_owners + headings = Array(statements).filter_map do |statement| + next unless heading_statement?(statement) + + build_heading_owner(statement) + end + + headings.each_with_index.map do |owner, index| + branch_end_line = branch_end_line(headings, index) + HeadingSectionOwner.new( + location: Location.new(start_line: owner.location.start_line, end_line: branch_end_line), + heading_text: owner.heading_text, + heading_source: owner.heading_source, + level: owner.level, + base: owner.base + ) + end + end + + def link_definition_owners + Array(statements).filter_map do |statement| + next unless statement.respond_to?(:merge_type) && statement.merge_type == :link_definition + + position = statement.source_position + next unless position + + LinkDefinitionOwner.new( + location: Location.new(start_line: position[:start_line], end_line: position[:end_line]), + label: statement.label, + url: statement.url, + title: statement.title, + source: if statement.respond_to?(:content) + statement.content + else + source_range(position[:start_line], position[:end_line]).chomp + end + ) + end + end + + def html_comment_owners + comment_tracker.comment_nodes.map do |comment| + HtmlCommentOwner.new( + location: Location.new(start_line: comment.location.start_line, end_line: comment.location.end_line), + text: comment.content, + source: comment.text + ) + end + end + + def inline_reference_owners + source.to_s.lines.each_with_index.flat_map do |line, index| + inline_references_for_line(line.chomp, index + 1) + end + end + + def table_row_owners + ast_table_lines = {} + ast_rows = Array(statements).flat_map do |statement| + node = unwrap_markdown_statement(statement) + next [] unless node.respond_to?(:type) && node.type.to_s == 'table' + + table_position = node.source_position + if table_position + (table_position[:start_line]..table_position[:end_line]).each do |line| + ast_table_lines[line] = true + end + end + Array(node.children).filter_map do |child| + next unless child.respond_to?(:type) && child.type.to_s == 'table_row' + + position = child.source_position + next unless position + + TableRowOwner.new( + location: Location.new(start_line: position[:start_line], end_line: position[:end_line]), + source: source_range(position[:start_line], position[:end_line]), + text: child.to_plaintext.to_s + ) + end + end + ast_lines = ast_rows.map { |owner| owner.location.start_line }.to_h { |line| [line, true] } + loose_rows = source.to_s.lines.each_with_index.filter_map do |line, index| + line_number = index + 1 + next if ast_lines[line_number] + next if ast_table_lines[line_number] + next unless loose_table_row_line?(line) + + TableRowOwner.new( + location: Location.new(start_line: line_number, end_line: line_number), + source: line, + text: line + ) + end + ast_rows + loose_rows + end + private + def loose_table_row_line?(line) + stripped = line.to_s.lstrip + return false unless stripped.start_with?('|') + + stripped.include?(' |') || stripped.include?('| ') + end + + def heading_statement?(statement) + merge_type = if statement.respond_to?(:merge_type) + statement.merge_type + else + unwrap_markdown_statement(statement)&.type + end + + %w[heading header].include?(merge_type.to_s) + end + + def build_heading_owner(statement) + node = unwrap_markdown_statement(statement) + position = node&.source_position + return unless node && position + + heading_source = source_range(position[:start_line], position[:end_line]).sub(/\n\z/, '') + heading_text = node.to_plaintext.to_s.sub(/\n+\z/, '') + HeadingSectionOwner.new( + location: Location.new(start_line: position[:start_line], end_line: position[:end_line]), + heading_text: heading_text, + heading_source: heading_source, + level: node.header_level, + base: normalize_heading_base(heading_text) + ) + rescue StandardError + nil + end + + def branch_end_line(headings, index) + current = headings[index] + cursor = index + 1 + while cursor < headings.length + return headings[cursor].location.start_line - 1 if headings[cursor].level <= current.level + + cursor += 1 + end + + source.to_s.lines.length + end + + def unwrap_markdown_statement(statement) + Ast::Merge::NodeTyping.unwrap(statement) + rescue StandardError + statement + end + + def normalize_heading_base(text) + text.to_s.sub(/\A(?:\d\uFE0F?\u20E3|[^[:alnum:][:space:]])+[ \t]*/u, '').strip.downcase + end + + def inline_references_for_line(line, line_number) + owners = [] + index = 0 + while index < line.length + image = inline_image_reference_at(line, index, line_number) + if image + owners << image + index = image.end_column + next + end + + link = inline_link_reference_at(line, index, line_number) + if link + owners << link + index = link.end_column + next + end + + index += 1 + end + owners + end + + def inline_image_reference_at(line, index, line_number) + return unless line[index] == '!' && line[index + 1] == '[' + + alt_end = closing_bracket_index(line, index + 1) + return unless alt_end && line[alt_end + 1] == '[' + + label_end = closing_bracket_index(line, alt_end + 1) + return unless label_end + + label = line[(alt_end + 2)...label_end] + inline_reference_owner( + line: line, + line_number: line_number, + start_column: index, + end_column: label_end + 1, + reference_kind: :image_reference, + label: label, + labels: [label] + ) + end + + def inline_link_reference_at(line, index, line_number) + return unless line[index] == '[' + + text_end = closing_bracket_index(line, index) + return unless text_end && line[text_end + 1] == '[' + + label_end = closing_bracket_index(line, text_end + 1) + return unless label_end + + text = line[(index + 1)...text_end] + label = line[(text_end + 2)...label_end] + image_owner = inline_image_reference_at(text, 0, line_number) + labels = [label] + labels.unshift(image_owner.label) if image_owner && image_owner.source == text + inline_reference_owner( + line: line, + line_number: line_number, + start_column: index, + end_column: label_end + 1, + reference_kind: labels.length > 1 ? :linked_image_reference : :link_reference, + label: label, + labels: labels + ) + end + + def inline_reference_owner(line:, line_number:, start_column:, end_column:, reference_kind:, label:, labels:) + InlineReferenceOwner.new( + location: Location.new(start_line: line_number, end_line: line_number), + line: line_number, + start_column: start_column, + end_column: end_column, + source: line[start_column...end_column], + reference_kind: reference_kind, + label: label, + labels: labels.compact.uniq + ) + end + + def closing_bracket_index(text, opening_index) + depth = 0 + index = opening_index + while index < text.length + case text[index] + when '[' + depth += 1 + when ']' + depth -= 1 + return index if depth.zero? + end + index += 1 + end + nil + end + # Recursively collect text content from a node and its descendants. # # Uses NodeTypeNormalizer to map backend-specific types to canonical types, diff --git a/gems/markly-merge/Gemfile.lock b/gems/markly-merge/Gemfile.lock index 31b99ab8d..b6b3eb1cf 100644 --- a/gems/markly-merge/Gemfile.lock +++ b/gems/markly-merge/Gemfile.lock @@ -19,7 +19,7 @@ PATH specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) - prism (>= 1.0) + prism-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH diff --git a/gems/markly-merge/spec/fixtures_integration_spec.rb b/gems/markly-merge/spec/fixtures_integration_spec.rb index 4ca14d480..16422f97f 100644 --- a/gems/markly-merge/spec/fixtures_integration_spec.rb +++ b/gems/markly-merge/spec/fixtures_integration_spec.rb @@ -45,6 +45,30 @@ def json_ready(value) expect(json_ready(described_class.markdown_plan_context)).to eq(json_ready(plan_fixture.dig(:providers, :markly))) end + it 'inherits shared Markdown structured-edit owner projections' do + source = <<~MARKDOWN + # Title + + ## Synopsis + + [docs]: README.md + + + [Docs][docs] ![Build][build] + + | Feature | Badge | + | --- | --- | + | Works | [Docs][docs] | + MARKDOWN + analysis = described_class::FileAnalysis.new(source) + + expect(analysis.heading_section_owners.map(&:heading_text)).to include('Synopsis') + expect(analysis.link_definition_owners.map(&:label)).to include('docs') + expect(analysis.html_comment_owners.map(&:text)).to include('KJ:START') + expect(analysis.inline_reference_owners.map(&:label)).to include('docs', 'build') + expect(analysis.table_row_owners.map(&:source)).to include("| Works | [Docs][docs] |\n") + end + it 'projects the structured-edit provider profile through Markly' do fixture = read_json( fixtures_root.join( From 89aef5df2bdf1a22bfde8fdcd9670b1b867f3934 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 02:00:36 -0600 Subject: [PATCH 320/347] Delegate Ruby CRISPR comment ownership --- .../lib/ast/crispr/ruby/prism.rb | 30 +------------------ gems/prism-merge/Gemfile.lock | 2 +- .../lib/prism/merge/file_analysis.rb | 26 ++++++++++++++++ .../spec/fixtures_integration_spec.rb | 19 ++++++++++++ 4 files changed, 47 insertions(+), 30 deletions(-) diff --git a/gems/ast-crispr-ruby-prism/lib/ast/crispr/ruby/prism.rb b/gems/ast-crispr-ruby-prism/lib/ast/crispr/ruby/prism.rb index 86934fa8d..41025a28f 100644 --- a/gems/ast-crispr-ruby-prism/lib/ast/crispr/ruby/prism.rb +++ b/gems/ast-crispr-ruby-prism/lib/ast/crispr/ruby/prism.rb @@ -21,26 +21,6 @@ def parse_analysis(source, source_label: nil) def parse_with_comments(source) parse_analysis(source).parse_result end - - def extract_statements(body_node) - return [] unless body_node - - if body_node.is_a?(::Prism::StatementsNode) - body_node.body.compact - else - [body_node].compact - end - end - - def find_leading_comments(parse_result, current_stmt, prev_stmt, body_node) - start_line = prev_stmt ? prev_stmt.location.end_line : body_node.location.start_line - end_line = current_stmt.location.start_line - - parse_result.comments.select do |comment| - comment.location.start_line > start_line && - comment.location.start_line < end_line - end - end end class Adapter @@ -66,19 +46,11 @@ def structural_owners(document, owner_scope: :shared_default) def comment_regions_for(document, owner, region: :leading, owner_scope: :shared_default) analysis = document.ast - parse_result = analysis.parse_result owners = structural_owners(document, owner_scope: owner_scope) - index = owners.index(owner) - return [] unless index case region when :leading - previous_owner = index.positive? ? owners[index - 1] : nil - if previous_owner - Utils.find_leading_comments(parse_result, owner, previous_owner, parse_result.value.statements) - else - parse_result.comments.select { |comment| comment.location.start_line < owner.location.start_line } - end + analysis.leading_comments_for_owner(owner, owners: owners) else raise Ast::Crispr::Error.new('Unsupported CRISPR comment region', details: { region: region }) end diff --git a/gems/prism-merge/Gemfile.lock b/gems/prism-merge/Gemfile.lock index c55f997df..a271a6b5a 100644 --- a/gems/prism-merge/Gemfile.lock +++ b/gems/prism-merge/Gemfile.lock @@ -19,7 +19,7 @@ PATH specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) - prism (>= 1.0) + prism-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH diff --git a/gems/prism-merge/lib/prism/merge/file_analysis.rb b/gems/prism-merge/lib/prism/merge/file_analysis.rb index c80ac7e7d..fb8324069 100644 --- a/gems/prism-merge/lib/prism/merge/file_analysis.rb +++ b/gems/prism-merge/lib/prism/merge/file_analysis.rb @@ -337,6 +337,32 @@ def comment_region_for_range(range, kind:, full_line_only: false) build_comment_region(kind, entries, metadata: { range: range, full_line_only: full_line_only }) end + # Return comments that lead +owner+ within the provided top-level owner set. + # + # CRISPR adapters use this as a parser-provider-owned projection: CRISPR + # selects and splices, while prism-merge owns Ruby comment attachment. + # + # @param owner [Object] owner node from this analysis + # @param owners [Array] ordered owner set containing +owner+ + # @return [Array] + def leading_comments_for_owner(owner, owners: statements) + ordered_owners = Array(owners) + index = ordered_owners.index(owner) + return [] unless index + + previous_owner = index.positive? ? ordered_owners[index - 1] : nil + if previous_owner + start_line = previous_owner.location.end_line + end_line = owner.location.start_line + return parse_result.comments.select do |comment| + comment.location.start_line > start_line && + comment.location.start_line < end_line + end + end + + parse_result.comments.select { |comment| comment.location.start_line < owner.location.start_line } + end + # Build a native shared comment attachment for an owner. # # @param owner [Object] Structural owner for the attachment diff --git a/gems/prism-merge/spec/fixtures_integration_spec.rb b/gems/prism-merge/spec/fixtures_integration_spec.rb index a784e44f7..1e1cb5629 100644 --- a/gems/prism-merge/spec/fixtures_integration_spec.rb +++ b/gems/prism-merge/spec/fixtures_integration_spec.rb @@ -329,6 +329,25 @@ def json_ready(value) ) end + it 'projects leading comments for Ruby structured-edit owners' do + source = <<~RUBY + # first owner + task :one do + puts "one" + end + + # second owner + task :two do + puts "two" + end + RUBY + analysis = PRISM_MERGE::FileAnalysis.new(source, source_label: 'Rakefile') + first_owner, second_owner = analysis.statements + + expect(analysis.leading_comments_for_owner(first_owner).map(&:slice)).to eq(['# first owner']) + expect(analysis.leading_comments_for_owner(second_owner).map(&:slice)).to eq(['# second owner']) + end + it 'projects Prism parse errors into the normalized parse failure shape' do fixture = read_json( fixtures_root.join( From f88a012a961251810218b158578a619990023dec Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 02:04:28 -0600 Subject: [PATCH 321/347] Remove CRISPR profile redefinition warnings --- gems/ast-crispr/lib/ast/crispr.rb | 128 ++++-------------------------- 1 file changed, 15 insertions(+), 113 deletions(-) diff --git a/gems/ast-crispr/lib/ast/crispr.rb b/gems/ast-crispr/lib/ast/crispr.rb index 6d7ba47c5..04d239161 100644 --- a/gems/ast-crispr/lib/ast/crispr.rb +++ b/gems/ast-crispr/lib/ast/crispr.rb @@ -290,24 +290,15 @@ def to_h private def normalize_start_boundary(value) - boundary = value&.to_sym - return boundary if KNOWN_START_BOUNDARIES.include?(boundary) - - raise Error.new('Unsupported CRISPR match start boundary', details: { start_boundary: value.inspect }) + value&.to_sym end def normalize_end_boundary(value) - boundary = value&.to_sym - return boundary if KNOWN_END_BOUNDARIES.include?(boundary) - - raise Error.new('Unsupported CRISPR match end boundary', details: { end_boundary: value.inspect }) + value&.to_sym end def normalize_payload_kind(value) - kind = value&.to_sym - return kind if KNOWN_PAYLOAD_KINDS.include?(kind) - - raise Error.new('Unsupported CRISPR match payload kind', details: { payload_kind: value.inspect }) + value&.to_sym end end @@ -435,25 +426,15 @@ def to_h private def normalize_resolution_kind(value) - kind = value&.to_sym - return kind if KNOWN_RESOLUTION_KINDS.include?(kind) - - raise Error.new('Unsupported CRISPR destination resolution kind', details: { resolution_kind: value.inspect }) + value&.to_sym end def normalize_resolution_source(value) - source = value&.to_sym - return source if KNOWN_RESOLUTION_SOURCES.include?(source) - - raise Error.new('Unsupported CRISPR destination resolution source', - details: { resolution_source: value.inspect }) + value&.to_sym end def normalize_anchor_boundary(value) - boundary = value&.to_sym - return boundary if KNOWN_ANCHOR_BOUNDARIES.include?(boundary) - - raise Error.new('Unsupported CRISPR destination anchor boundary', details: { anchor_boundary: value.inspect }) + value&.to_sym end end @@ -528,14 +509,19 @@ class SelectionProfile attr_reader :owner_scope, :selector_kind, :selection_intent, :comment_region, :include_trailing_gap, :structure_profile, :metadata - def initialize(owner_scope:, selector_kind:, selection_intent:, structure_profile:, comment_region: nil, + def initialize(owner_scope:, selector_kind:, selection_intent:, structure_profile: nil, owner_selector: nil, + comment_region: nil, include_trailing_gap: false, metadata: {}, **options) @owner_scope = owner_scope&.to_sym @selector_kind = selector_kind&.to_sym @selection_intent = selection_intent&.to_sym @comment_region = comment_region&.to_sym @include_trailing_gap = include_trailing_gap ? true : false - @structure_profile = structure_profile + @structure_profile = structure_profile || StructureProfile.new( + owner_scope: owner_scope, + owner_selector: owner_selector || :line_bound_statements, + supported_comment_regions: [comment_region].compact + ) @metadata = metadata.merge(options).freeze end @@ -680,18 +666,11 @@ def to_h private def normalize_requirement(value, field_name) - requirement = value&.to_sym - return requirement if KNOWN_REQUIREMENTS.include?(requirement) - - raise Error.new('Unsupported CRISPR operation requirement', - details: { field: field_name, value: value.inspect }) + value&.to_sym end def normalize_replacement_source(value) - replacement = value&.to_sym - return replacement if KNOWN_REPLACEMENT_SOURCES.include?(replacement) - - raise Error.new('Unsupported CRISPR replacement source', details: { replacement_source: value.inspect }) + value&.to_sym end end @@ -1557,18 +1536,6 @@ def report ) stringified_report(data) end - - def normalize_start_boundary(value) - value&.to_sym - end - - def normalize_end_boundary(value) - value&.to_sym - end - - def normalize_payload_kind(value) - value&.to_sym - end end class SelectionProfile @@ -1593,21 +1560,6 @@ class SelectionProfile section_heading: :section }.freeze - def initialize(owner_scope:, selector_kind:, selection_intent:, structure_profile: nil, owner_selector: nil, - comment_region: nil, include_trailing_gap: false, metadata: {}, **options) - @owner_scope = owner_scope&.to_sym - @selector_kind = selector_kind&.to_sym - @selection_intent = selection_intent&.to_sym - @comment_region = comment_region&.to_sym - @include_trailing_gap = include_trailing_gap ? true : false - @structure_profile = structure_profile || StructureProfile.new( - owner_scope: owner_scope, - owner_selector: owner_selector || :line_bound_statements, - supported_comment_regions: [comment_region].compact - ) - @metadata = metadata.merge(options).freeze - end - def report data = to_h selector_kind_family = KNOWN_SELECTOR_KINDS[selector_kind]&.fetch(:family, nil) @@ -1627,24 +1579,6 @@ def report ) stringified_report(data) end - - def normalize_owner_selector(value) - value&.to_sym - end - - def normalize_selector_kind(value) - value&.to_sym - end - - def normalize_selection_intent(value) - value&.to_sym - end - - def normalize_comment_region(value) - return nil if value.nil? - - value&.to_sym - end end class DestinationProfile @@ -1660,18 +1594,6 @@ def report ) stringified_report(data) end - - def normalize_resolution_kind(value) - value&.to_sym - end - - def normalize_resolution_source(value) - value&.to_sym - end - - def normalize_anchor_boundary(value) - value&.to_sym - end end class OperationProfile @@ -1692,18 +1614,6 @@ def report ) stringified_report(data) end - - def normalize_operation_kind(value) - value&.to_sym - end - - def normalize_requirement(value, *) - value&.to_sym - end - - def normalize_replacement_source(value) - value&.to_sym - end end class StructureProfile @@ -1712,14 +1622,6 @@ class StructureProfile def report stringified_report(to_h) end - - def normalize_owner_selector(value) - value&.to_sym - end - - def normalize_comment_region(value) - value&.to_sym - end end class << self From 522b1cce52415d03d0a4a2b96b78060161e93610 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 02:06:27 -0600 Subject: [PATCH 322/347] Register Markdown TSLP backend from substrate --- gems/markdown-merge/lib/markdown/merge.rb | 17 +++++++++++++++++ .../spec/fixtures_integration_spec.rb | 4 +--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/gems/markdown-merge/lib/markdown/merge.rb b/gems/markdown-merge/lib/markdown/merge.rb index a98e0ad73..d2c8d4fc1 100644 --- a/gems/markdown-merge/lib/markdown/merge.rb +++ b/gems/markdown-merge/lib/markdown/merge.rb @@ -16,6 +16,7 @@ module Merge 'markly' => TreeHaver::BackendReference.new(id: 'markly', family: 'native').freeze, 'kramdown' => TreeHaver::BackendReference.new(id: 'kramdown', family: 'native').freeze }.freeze + BACKEND_REGISTRY = Struct.new(:registered, :mutex).new(false, Mutex.new) class Error < Ast::Merge::Error; end @@ -63,6 +64,19 @@ class CorruptionDetectedError < Error; end autoload :WhitespaceNormalizer, 'markdown/merge/whitespace_normalizer' autoload :WrapperSupport, 'markdown/merge/wrapper_support' + def register_backend! + BACKEND_REGISTRY.mutex.synchronize do + return if BACKEND_REGISTRY.registered + + TreeHaver::BackendRegistry.register(BACKEND_REFERENCES.fetch('kreuzberg-language-pack')) + + grammar_finder = TreeHaver::GrammarFinder.new(:markdown) + grammar_finder.register! if grammar_finder.available? + + BACKEND_REGISTRY.registered = true + end + end + def markdown_feature_profile { family: 'markdown', @@ -109,6 +123,7 @@ def parse_markdown(source, dialect, backend: nil) return unsupported_feature_result("Unsupported Markdown backend #{resolved_backend}.") end + register_backend! parser = TreeHaver.with_backend(resolved_backend) { TreeHaver.parser_for(:markdown) } tree = parser.parse(source) collect_parse_errors(tree.root_node) @@ -587,6 +602,7 @@ def resolve_backend(backend) end def markdown_backend_available_for_analysis?(backend_id) + register_backend! registrations = TreeHaver.registered_languages(:markdown) case backend_id.to_s when 'commonmarker', 'markly', 'kramdown' @@ -625,6 +641,7 @@ def unsupported_feature_result(message) end module_function( + :register_backend!, :markdown_feature_profile, :available_markdown_backends, :markdown_backend_feature_profile, diff --git a/gems/markdown-merge/spec/fixtures_integration_spec.rb b/gems/markdown-merge/spec/fixtures_integration_spec.rb index 4241240aa..17d3dcc2b 100644 --- a/gems/markdown-merge/spec/fixtures_integration_spec.rb +++ b/gems/markdown-merge/spec/fixtures_integration_spec.rb @@ -36,9 +36,7 @@ def json_ready(value) ) expect(json_ready(markdown_merge.available_markdown_backends.map(&:to_h))).to eq( - json_ready([ - { id: 'kreuzberg-language-pack', family: 'tree-sitter' } - ]) + json_ready(fixture[:available_backends]) ) expect(json_ready(TreeHaver::BackendRegistry.fetch('kreuzberg-language-pack')&.to_h)).to eq( json_ready({ id: 'kreuzberg-language-pack', family: 'tree-sitter' }) From 5959379b6b0e8a6f5f51ba0b4a807ee7d4c8436a Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 02:07:38 -0600 Subject: [PATCH 323/347] Report only available Markdown backends --- gems/markdown-merge/lib/markdown/merge.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gems/markdown-merge/lib/markdown/merge.rb b/gems/markdown-merge/lib/markdown/merge.rb index d2c8d4fc1..6ca10ba81 100644 --- a/gems/markdown-merge/lib/markdown/merge.rb +++ b/gems/markdown-merge/lib/markdown/merge.rb @@ -86,7 +86,9 @@ def markdown_feature_profile end def available_markdown_backends - BACKEND_REFERENCES.values + BACKEND_REFERENCES.filter_map do |backend_id, reference| + reference if markdown_backend_available_for_analysis?(backend_id) + end end def markdown_backend_feature_profile(backend: nil) From ffe137ee4362634c4ea830a9fc68f8d58ab02303 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 02:08:31 -0600 Subject: [PATCH 324/347] Require registered YAML backend availability --- gems/yaml-merge/lib/yaml/merge.rb | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/gems/yaml-merge/lib/yaml/merge.rb b/gems/yaml-merge/lib/yaml/merge.rb index bf903394a..1a65fb0c2 100644 --- a/gems/yaml-merge/lib/yaml/merge.rb +++ b/gems/yaml-merge/lib/yaml/merge.rb @@ -22,6 +22,8 @@ def register_backend! BACKEND_REGISTRY.mutex.synchronize do return if BACKEND_REGISTRY.registered + TreeHaver::BackendRegistry.register(BACKEND_REFERENCE) + grammar_finder = TreeHaver::GrammarFinder.new(:yaml) grammar_finder.register! if grammar_finder.available? @@ -38,12 +40,12 @@ def yaml_feature_profile end def available_yaml_backends - [BACKEND_REFERENCE] + yaml_backend_available_for_analysis?(BACKEND_REFERENCE.id) ? [BACKEND_REFERENCE] : [] end def yaml_backend_feature_profile(backend: nil) resolved_backend = resolve_backend(backend) - unless resolved_backend == BACKEND_REFERENCE.id + unless resolved_backend == BACKEND_REFERENCE.id && yaml_backend_available_for_analysis?(resolved_backend) return unsupported_feature_result("Unsupported YAML backend #{resolved_backend}.") end @@ -71,7 +73,7 @@ def parse_yaml(source, dialect, backend: nil) return unsupported_feature_parse_result("Unsupported YAML dialect #{dialect}.") unless dialect == 'yaml' resolved_backend = resolve_backend(backend) - unless resolved_backend == BACKEND_REFERENCE.id + unless resolved_backend == BACKEND_REFERENCE.id && yaml_backend_available_for_analysis?(resolved_backend) return unsupported_feature_parse_result("Unsupported YAML backend #{resolved_backend}.") end @@ -120,7 +122,7 @@ def match_yaml_owners(template, destination) def merge_yaml(template_source, destination_source, dialect, backend: nil) resolved_backend = resolve_backend(backend) - unless resolved_backend == BACKEND_REFERENCE.id + unless resolved_backend == BACKEND_REFERENCE.id && yaml_backend_available_for_analysis?(resolved_backend) return unsupported_feature_merge_result("Unsupported YAML backend #{resolved_backend}.") end @@ -169,6 +171,15 @@ def resolve_backend(backend) end private_class_method :resolve_backend + def yaml_backend_available_for_analysis?(backend_id) + register_backend! + return false unless backend_id.to_s == BACKEND_REFERENCE.id + + registrations = TreeHaver.registered_languages(:yaml) + registrations.key?(:tree_sitter) || registrations.key?(:tslp) + end + private_class_method :yaml_backend_available_for_analysis? + def collect_parse_errors(node) raise TreeHaver::NotAvailable, 'YAML parse returned no root node' unless node return unless node.respond_to?(:has_error?) && node.has_error? From 5893995a47c9461e39eaf73336edce9b0ed82375 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 02:09:06 -0600 Subject: [PATCH 325/347] Require registered TOML backend availability --- gems/toml-merge/lib/toml/merge.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gems/toml-merge/lib/toml/merge.rb b/gems/toml-merge/lib/toml/merge.rb index db9b54112..3c07dd473 100644 --- a/gems/toml-merge/lib/toml/merge.rb +++ b/gems/toml-merge/lib/toml/merge.rb @@ -121,7 +121,7 @@ def toml_feature_profile end def available_toml_backends - [TREE_SITTER_BACKEND_REFERENCE] + toml_backend_available_for_analysis?(TREE_SITTER_BACKEND_REFERENCE.id) ? [TREE_SITTER_BACKEND_REFERENCE] : [] end def toml_backend_feature_profile(backend: nil) @@ -300,6 +300,7 @@ def normalize_toml_source(source) end def toml_backend_available_for_analysis?(backend_id) + register_backend! registrations = TreeHaver.registered_languages(:toml) case backend_id.to_s when TREE_SITTER_BACKEND_REFERENCE.id From 0ec5aadb87b7e21c77a5b3ece4dc248244265d37 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 02:09:34 -0600 Subject: [PATCH 326/347] Require registered JSON backend availability --- gems/json-merge/lib/json/merge.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gems/json-merge/lib/json/merge.rb b/gems/json-merge/lib/json/merge.rb index 57162aba4..d4cfc4ed0 100644 --- a/gems/json-merge/lib/json/merge.rb +++ b/gems/json-merge/lib/json/merge.rb @@ -66,7 +66,7 @@ def json_feature_profile end def available_json_backends - [TREE_SITTER_BACKEND] + json_backend_available_for_analysis?(TREE_SITTER_BACKEND.id) ? [TREE_SITTER_BACKEND] : [] end def json_backend_feature_profile(backend: nil) @@ -268,6 +268,7 @@ def requested_json_backend_id(backend) private_class_method :requested_json_backend_id def json_backend_available_for_analysis?(backend_id) + register_backend! registrations = TreeHaver.registered_languages(:json) case backend_id.to_s when TREE_SITTER_BACKEND.id From b11b12f0678c33edd44e98cde971db4e23997578 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 02:10:40 -0600 Subject: [PATCH 327/347] Require registered Ruby TSLP backend availability --- gems/ruby-merge/lib/ruby/merge.rb | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/gems/ruby-merge/lib/ruby/merge.rb b/gems/ruby-merge/lib/ruby/merge.rb index 3920b6cfa..888f3360f 100644 --- a/gems/ruby-merge/lib/ruby/merge.rb +++ b/gems/ruby-merge/lib/ruby/merge.rb @@ -47,6 +47,8 @@ def register_backend! BACKEND_REGISTRY.mutex.synchronize do return if BACKEND_REGISTRY.registered + TreeHaver::BackendRegistry.register(TREE_SITTER_BACKEND) + grammar_finder = TreeHaver::GrammarFinder.new(:ruby) grammar_finder.register! if grammar_finder.available? @@ -63,7 +65,7 @@ def ruby_feature_profile end def available_ruby_backends - [TREE_SITTER_BACKEND] + ruby_backend_available_for_analysis?(TREE_SITTER_BACKEND.id) ? [TREE_SITTER_BACKEND] : [] end def ruby_tslp_capability_profile @@ -75,7 +77,7 @@ def ruby_tslp_capability_profile def ruby_backend_feature_profile(backend: nil) requested = backend.to_s.empty? ? TREE_SITTER_BACKEND.id : backend.to_s - unless requested == TREE_SITTER_BACKEND.id + unless requested == TREE_SITTER_BACKEND.id && ruby_backend_available_for_analysis?(requested) return unsupported_feature_result("Unsupported Ruby backend #{requested}.") end @@ -100,10 +102,18 @@ def ruby_plan_context(backend: nil) } end + def ruby_backend_available_for_analysis?(backend_id) + register_backend! + return false unless backend_id.to_s == TREE_SITTER_BACKEND.id + + registrations = TreeHaver.registered_languages(:ruby) + registrations.key?(:tree_sitter) || registrations.key?(:tslp) + end + def parse_ruby(source, dialect, backend: nil) requested = backend.to_s.empty? ? TREE_SITTER_BACKEND.id : backend.to_s return unsupported_feature_result("Unsupported Ruby dialect #{dialect}.") unless dialect == 'ruby' - unless requested == TREE_SITTER_BACKEND.id + unless requested == TREE_SITTER_BACKEND.id && ruby_backend_available_for_analysis?(requested) return unsupported_feature_result("Unsupported Ruby backend #{requested}.") end From 399c1e5e1f080833a723f8fb5bc72bfc3b23a645 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 02:11:59 -0600 Subject: [PATCH 328/347] Require registered TSLP language backend availability --- gems/bash-merge/lib/bash/merge.rb | 10 +++++++++- gems/go-merge/lib/go/merge.rb | 16 +++++++++++++--- gems/rust-merge/lib/rust/merge.rb | 18 ++++++++++++++++-- gems/typescript-merge/lib/typescript/merge.rb | 16 +++++++++++++--- 4 files changed, 51 insertions(+), 9 deletions(-) diff --git a/gems/bash-merge/lib/bash/merge.rb b/gems/bash-merge/lib/bash/merge.rb index 01d727ccc..5589ffdf2 100644 --- a/gems/bash-merge/lib/bash/merge.rb +++ b/gems/bash-merge/lib/bash/merge.rb @@ -138,7 +138,7 @@ def register_backend! end def available_bash_backends - [TREE_SITTER_BACKEND] + bash_backend_available_for_analysis?(TREE_SITTER_BACKEND.id) ? [TREE_SITTER_BACKEND] : [] end def available?(source: "#!/usr/bin/env bash\necho hello\n") @@ -179,6 +179,14 @@ def node_parser_available_for?(source, grammar_path, diagnostics) diagnostics << { kind: 'bash_node_parser_unavailable', message: e.message } false end + + def bash_backend_available_for_analysis?(backend_id) + register_backend! + return false unless backend_id.to_s == TREE_SITTER_BACKEND.id + + registrations = TreeHaver.registered_languages(:bash) + registrations.key?(:tree_sitter) || registrations.key?(:tslp) + end end end end diff --git a/gems/go-merge/lib/go/merge.rb b/gems/go-merge/lib/go/merge.rb index c1eee4d76..0d7bb1be6 100644 --- a/gems/go-merge/lib/go/merge.rb +++ b/gems/go-merge/lib/go/merge.rb @@ -19,6 +19,8 @@ def register_backend! BACKEND_REGISTRY.mutex.synchronize do return if BACKEND_REGISTRY.registered + TreeHaver::BackendRegistry.register(TREE_SITTER_BACKEND) + grammar_finder = TreeHaver::GrammarFinder.new(:go) grammar_finder.register! if grammar_finder.available? @@ -31,12 +33,12 @@ def go_feature_profile end def available_go_backends - [TREE_SITTER_BACKEND] + go_backend_available_for_analysis?(TREE_SITTER_BACKEND.id) ? [TREE_SITTER_BACKEND] : [] end def go_backend_feature_profile(backend: nil) requested = backend.to_s.empty? ? TREE_SITTER_BACKEND.id : backend.to_s - unless requested == TREE_SITTER_BACKEND.id + unless requested == TREE_SITTER_BACKEND.id && go_backend_available_for_analysis?(requested) return unsupported_feature_result("Unsupported Go backend #{requested}.") end @@ -63,7 +65,7 @@ def go_plan_context(backend: nil) def parse_go(source, dialect) requested = TREE_SITTER_BACKEND.id - unless requested == TREE_SITTER_BACKEND.id + unless requested == TREE_SITTER_BACKEND.id && go_backend_available_for_analysis?(requested) return unsupported_feature_result("Unsupported Go backend #{requested}.") end return analyze_go_module(source) if dialect == 'go' @@ -72,6 +74,14 @@ def parse_go(source, dialect) diagnostics: [{ severity: 'error', category: 'unsupported_feature', message: "Unsupported Go dialect #{dialect}." }], policies: [] } end + def go_backend_available_for_analysis?(backend_id) + register_backend! + return false unless backend_id.to_s == TREE_SITTER_BACKEND.id + + registrations = TreeHaver.registered_languages(:go) + registrations.key?(:tree_sitter) || registrations.key?(:tslp) + end + def match_go_owners(template, destination) Ast::Merge::OwnerSelection.match_by_path(template, destination) end diff --git a/gems/rust-merge/lib/rust/merge.rb b/gems/rust-merge/lib/rust/merge.rb index b95093c73..d99d808f5 100644 --- a/gems/rust-merge/lib/rust/merge.rb +++ b/gems/rust-merge/lib/rust/merge.rb @@ -19,6 +19,8 @@ def register_backend! BACKEND_REGISTRY.mutex.synchronize do return if BACKEND_REGISTRY.registered + TreeHaver::BackendRegistry.register(TREE_SITTER_BACKEND) + grammar_finder = TreeHaver::GrammarFinder.new(:rust) grammar_finder.register! if grammar_finder.available? @@ -31,12 +33,12 @@ def rust_feature_profile end def available_rust_backends - [TREE_SITTER_BACKEND] + rust_backend_available_for_analysis?(TREE_SITTER_BACKEND.id) ? [TREE_SITTER_BACKEND] : [] end def rust_backend_feature_profile(backend: nil) requested = backend.to_s.empty? ? TREE_SITTER_BACKEND.id : backend.to_s - unless requested == TREE_SITTER_BACKEND.id + unless requested == TREE_SITTER_BACKEND.id && rust_backend_available_for_analysis?(requested) return unsupported_feature_result("Unsupported Rust backend #{requested}.") end @@ -62,12 +64,24 @@ def rust_plan_context(backend: nil) end def parse_rust(source, dialect) + unless rust_backend_available_for_analysis?(TREE_SITTER_BACKEND.id) + return unsupported_feature_result("Unsupported Rust backend #{TREE_SITTER_BACKEND.id}.") + end + return analyze_rust_module(source) if dialect == 'rust' { ok: false, diagnostics: [{ severity: 'error', category: 'unsupported_feature', message: "Unsupported Rust dialect #{dialect}." }], policies: [] } end + def rust_backend_available_for_analysis?(backend_id) + register_backend! + return false unless backend_id.to_s == TREE_SITTER_BACKEND.id + + registrations = TreeHaver.registered_languages(:rust) + registrations.key?(:tree_sitter) || registrations.key?(:tslp) + end + def match_rust_owners(template, destination) Ast::Merge::OwnerSelection.match_by_path(template, destination) end diff --git a/gems/typescript-merge/lib/typescript/merge.rb b/gems/typescript-merge/lib/typescript/merge.rb index 462027220..d1854360e 100644 --- a/gems/typescript-merge/lib/typescript/merge.rb +++ b/gems/typescript-merge/lib/typescript/merge.rb @@ -19,6 +19,8 @@ def register_backend! BACKEND_REGISTRY.mutex.synchronize do return if BACKEND_REGISTRY.registered + TreeHaver::BackendRegistry.register(TREE_SITTER_BACKEND) + grammar_finder = TreeHaver::GrammarFinder.new(:typescript) grammar_finder.register! if grammar_finder.available? @@ -31,12 +33,12 @@ def type_script_feature_profile end def available_type_script_backends - [TREE_SITTER_BACKEND] + type_script_backend_available_for_analysis?(TREE_SITTER_BACKEND.id) ? [TREE_SITTER_BACKEND] : [] end def type_script_backend_feature_profile(backend: nil) requested = backend.to_s.empty? ? TREE_SITTER_BACKEND.id : backend.to_s - unless requested == TREE_SITTER_BACKEND.id + unless requested == TREE_SITTER_BACKEND.id && type_script_backend_available_for_analysis?(requested) return unsupported_feature_result("Unsupported TypeScript backend #{requested}.") end @@ -63,7 +65,7 @@ def type_script_plan_context(backend: nil) def parse_type_script(source, dialect) requested = TREE_SITTER_BACKEND.id - unless requested == TREE_SITTER_BACKEND.id + unless requested == TREE_SITTER_BACKEND.id && type_script_backend_available_for_analysis?(requested) return unsupported_feature_result("Unsupported TypeScript backend #{requested}.") end return analyze_type_script_module(source) if dialect == 'typescript' @@ -72,6 +74,14 @@ def parse_type_script(source, dialect) diagnostics: [{ severity: 'error', category: 'unsupported_feature', message: "Unsupported TypeScript dialect #{dialect}." }], policies: [] } end + def type_script_backend_available_for_analysis?(backend_id) + register_backend! + return false unless backend_id.to_s == TREE_SITTER_BACKEND.id + + registrations = TreeHaver.registered_languages(:typescript) + registrations.key?(:tree_sitter) || registrations.key?(:tslp) + end + def match_type_script_owners(template, destination) Ast::Merge::OwnerSelection.match_by_path(template, destination) end From 33b11dce0f49c49d7e8046f08efc6ce9ce69a561 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 02:12:29 -0600 Subject: [PATCH 329/347] Refresh generated test artifacts --- gems/bash-merge/Gemfile.lock | 2 +- gems/citrus-toml-merge/Gemfile.lock | 2 +- .../results/test_results.html | 14 +++++-- .../results/test_results.xml | 10 +++-- gems/go-merge/Gemfile.lock | 2 +- gems/json-merge/Gemfile.lock | 2 +- gems/kramdown-merge/Gemfile.lock | 2 +- gems/parslet-toml-merge/Gemfile.lock | 2 +- .../results/test_results.html | 14 +++++-- .../results/test_results.xml | 10 +++-- gems/ruby-merge/Gemfile.lock | 2 +- gems/rust-merge/Gemfile.lock | 2 +- gems/toml-merge/Gemfile.lock | 2 +- gems/toml-merge/results/test_results.html | 37 ++++++++++++++++++- gems/toml-merge/results/test_results.xml | 19 +++++++++- gems/typescript-merge/Gemfile.lock | 2 +- gems/yaml-merge/Gemfile.lock | 2 +- 17 files changed, 99 insertions(+), 27 deletions(-) diff --git a/gems/bash-merge/Gemfile.lock b/gems/bash-merge/Gemfile.lock index 73b5f4c15..c7941d078 100644 --- a/gems/bash-merge/Gemfile.lock +++ b/gems/bash-merge/Gemfile.lock @@ -19,7 +19,7 @@ PATH specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) - prism (>= 1.0) + prism-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH diff --git a/gems/citrus-toml-merge/Gemfile.lock b/gems/citrus-toml-merge/Gemfile.lock index 70893a241..417371cb2 100644 --- a/gems/citrus-toml-merge/Gemfile.lock +++ b/gems/citrus-toml-merge/Gemfile.lock @@ -19,7 +19,7 @@ PATH specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) - prism (>= 1.0) + prism-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH diff --git a/gems/citrus-toml-merge/results/test_results.html b/gems/citrus-toml-merge/results/test_results.html index e1be3f02e..e0581a04b 100644 --- a/gems/citrus-toml-merge/results/test_results.html +++ b/gems/citrus-toml-merge/results/test_results.html @@ -282,12 +282,20 @@

    RSpec Code Examples

    Citrus::Toml::Merge
    + +
    exposes the TOML family through the Citrus provider backend0.00103s
    + +
    merges comment-free arrays of tables through the Citrus parser provider0.09477s
    + +
    conforms to the shared TOML analysis, matching, and merge fixtures0.04536s
    + +
    rejects unsupported provider backend overrides0.00017s
    -
    merges comment-free arrays of tables through the Citrus parser provider0.09518s
    +
    conforms to the provider named-suite plan and manifest-report fixtures0.00077s
    - - + + diff --git a/gems/citrus-toml-merge/results/test_results.xml b/gems/citrus-toml-merge/results/test_results.xml index cc051209f..0a3cd4854 100644 --- a/gems/citrus-toml-merge/results/test_results.xml +++ b/gems/citrus-toml-merge/results/test_results.xml @@ -1,7 +1,11 @@ - + - + - + + + + + diff --git a/gems/go-merge/Gemfile.lock b/gems/go-merge/Gemfile.lock index 5354cf499..83023846e 100644 --- a/gems/go-merge/Gemfile.lock +++ b/gems/go-merge/Gemfile.lock @@ -19,7 +19,7 @@ PATH specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) - prism (>= 1.0) + prism-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH diff --git a/gems/json-merge/Gemfile.lock b/gems/json-merge/Gemfile.lock index a683d58ae..9a62cb25c 100644 --- a/gems/json-merge/Gemfile.lock +++ b/gems/json-merge/Gemfile.lock @@ -19,7 +19,7 @@ PATH specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) - prism (>= 1.0) + prism-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH diff --git a/gems/kramdown-merge/Gemfile.lock b/gems/kramdown-merge/Gemfile.lock index c30245d48..4da75c6b0 100644 --- a/gems/kramdown-merge/Gemfile.lock +++ b/gems/kramdown-merge/Gemfile.lock @@ -19,7 +19,7 @@ PATH specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) - prism (>= 1.0) + prism-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH diff --git a/gems/parslet-toml-merge/Gemfile.lock b/gems/parslet-toml-merge/Gemfile.lock index cecedc911..07b1507b3 100644 --- a/gems/parslet-toml-merge/Gemfile.lock +++ b/gems/parslet-toml-merge/Gemfile.lock @@ -19,7 +19,7 @@ PATH specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) - prism (>= 1.0) + prism-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH diff --git a/gems/parslet-toml-merge/results/test_results.html b/gems/parslet-toml-merge/results/test_results.html index f5122db92..587a5cf69 100644 --- a/gems/parslet-toml-merge/results/test_results.html +++ b/gems/parslet-toml-merge/results/test_results.html @@ -282,12 +282,20 @@

    RSpec Code Examples

    Parslet::Toml::Merge
    + +
    conforms to the provider named-suite plan and manifest-report fixtures0.00154s
    + +
    merges comment-free arrays of tables through the Parslet parser provider0.10260s
    + +
    exposes the TOML family through the Parslet provider backend0.00062s
    + +
    conforms to the shared TOML analysis, matching, and merge fixtures0.02582s
    -
    merges comment-free arrays of tables through the Parslet parser provider0.08028s
    +
    rejects unsupported provider backend overrides0.00016s
    - - + + diff --git a/gems/parslet-toml-merge/results/test_results.xml b/gems/parslet-toml-merge/results/test_results.xml index 1d020e673..1b7dc6091 100644 --- a/gems/parslet-toml-merge/results/test_results.xml +++ b/gems/parslet-toml-merge/results/test_results.xml @@ -1,7 +1,11 @@ - + - + - + + + + + diff --git a/gems/ruby-merge/Gemfile.lock b/gems/ruby-merge/Gemfile.lock index 0a750d5c1..9158dc070 100644 --- a/gems/ruby-merge/Gemfile.lock +++ b/gems/ruby-merge/Gemfile.lock @@ -19,7 +19,7 @@ PATH specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) - prism (>= 1.0) + prism-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH diff --git a/gems/rust-merge/Gemfile.lock b/gems/rust-merge/Gemfile.lock index 53af74d58..98ef57049 100644 --- a/gems/rust-merge/Gemfile.lock +++ b/gems/rust-merge/Gemfile.lock @@ -19,7 +19,7 @@ PATH specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) - prism (>= 1.0) + prism-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH diff --git a/gems/toml-merge/Gemfile.lock b/gems/toml-merge/Gemfile.lock index fa7927949..a15d42c66 100644 --- a/gems/toml-merge/Gemfile.lock +++ b/gems/toml-merge/Gemfile.lock @@ -19,7 +19,7 @@ PATH specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) - prism (>= 1.0) + prism-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH diff --git a/gems/toml-merge/results/test_results.html b/gems/toml-merge/results/test_results.html index 8417a132c..461d720dc 100644 --- a/gems/toml-merge/results/test_results.html +++ b/gems/toml-merge/results/test_results.html @@ -279,10 +279,43 @@

    RSpec Code Examples

    +
    +
    +
    Toml::Merge
    + +
    rejects unsupported provider backend overrides0.00720s
    + +
    conforms to the slice-137 TOML family manifest fixture0.00038s
    + +
    conforms to the slice-139 family named-suite plan fixture0.00090s
    + +
    parses mise-style dotted env keys and inline tables0.01521s
    + +
    records emitter source provenance line metadata for raw source rendering0.00343s
    + +
    conforms to the slice-140 family manifest report fixture0.00110s
    + +
    keeps the shared family feature fixture stable while exposing the substrate backend feature profile0.00032s
    + +
    exposes non-overlapping effective table ranges and source fragments through the TOML substrate0.00228s
    + +
    conforms to the slice-135 TOML backend feature profile fixtures0.00034s
    + +
    preserves destination TOML comments and blank lines while adding template-only keys0.03392s
    + +
    conforms to the TOML parse, structure, matching, and merge fixtures with the tree-sitter substrate0.00515s
    + +
    merges comment-free TOML arrays of tables with destination preference0.00273s
    + +
    projects arrays of tables through the TOML substrate0.00059s
    + +
    conforms to the slice-136 TOML plan-context fixtures0.00027s
    + +
    resolves TOML paths through the canonical manifest0.00099s
    - - + +
    diff --git a/gems/toml-merge/results/test_results.xml b/gems/toml-merge/results/test_results.xml index 7ad52561c..a4540ec3f 100644 --- a/gems/toml-merge/results/test_results.xml +++ b/gems/toml-merge/results/test_results.xml @@ -1,6 +1,21 @@ - + - + + + + + + + + + + + + + + + + diff --git a/gems/typescript-merge/Gemfile.lock b/gems/typescript-merge/Gemfile.lock index 47b5e82c1..b0f1dce9d 100644 --- a/gems/typescript-merge/Gemfile.lock +++ b/gems/typescript-merge/Gemfile.lock @@ -19,7 +19,7 @@ PATH specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) - prism (>= 1.0) + prism-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH diff --git a/gems/yaml-merge/Gemfile.lock b/gems/yaml-merge/Gemfile.lock index c03d4ba4d..5568bc028 100644 --- a/gems/yaml-merge/Gemfile.lock +++ b/gems/yaml-merge/Gemfile.lock @@ -19,7 +19,7 @@ PATH specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) - prism (>= 1.0) + prism-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH From 60204dc921ef5f89180fa6babe2a6bc2af991631 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 02:13:18 -0600 Subject: [PATCH 330/347] Refresh ast-merge lockfile --- gems/ast-merge/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gems/ast-merge/Gemfile.lock b/gems/ast-merge/Gemfile.lock index 1545c3450..ad09d9372 100644 --- a/gems/ast-merge/Gemfile.lock +++ b/gems/ast-merge/Gemfile.lock @@ -20,7 +20,7 @@ PATH specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) - prism (>= 1.0) + prism-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH From a7e810a20089dadaed5c59bf27ea84aa0d58741e Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 02:15:17 -0600 Subject: [PATCH 331/347] Guard TSLP registration against cache dependency --- gems/tree_haver/Gemfile.lock | 405 +++++++++++++++----- gems/tree_haver/spec/grammar_finder_spec.rb | 18 + 2 files changed, 324 insertions(+), 99 deletions(-) diff --git a/gems/tree_haver/Gemfile.lock b/gems/tree_haver/Gemfile.lock index d36806ac5..9b3b994de 100644 --- a/gems/tree_haver/Gemfile.lock +++ b/gems/tree_haver/Gemfile.lock @@ -7,56 +7,292 @@ PATH tree_sitter_language_pack (>= 1.9.0.pre.rc.40, < 2.0) version_gem (~> 1.1, >= 1.1.9) -GEM - remote: https://gem.coop/ +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-markdown-markly specs: - addressable (2.9.0) - public_suffix (>= 2.0.2, < 8.0) - ansi (1.6.0) - appraisal2 (3.2.0) - bundler (>= 1.17.3) - rake (>= 10) - thor (>= 0.14) - ast (2.4.3) - ast-crispr (7.1.0) - ast-merge (= 7.1.0) - service_actor (~> 3.9) - version_gem (~> 1.1, >= 1.1.9) ast-crispr-markdown-markly (7.1.0) ast-crispr (= 7.1.0) markly-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr-ruby-prism + specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) - prism (>= 1.0) + prism-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-crispr + specs: + ast-crispr (7.1.0) + ast-merge (= 7.1.0) + service_actor (~> 3.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge-git + specs: + ast-merge-git (7.1.0) + ast-merge (= 7.1.0) + json-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-merge + specs: ast-merge (7.1.0) benchmark token-resolver (~> 2.0, >= 2.0.4) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) - backports (3.25.3) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ast-template + specs: + ast-template (7.1.0) + ast-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/bash-merge + specs: bash-merge (7.1.0) ast-merge (= 7.1.0) tree_haver (= 7.1.0) version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/binary-merge + specs: + binary-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/citrus-toml-merge + specs: + citrus-toml-merge (7.1.0) + toml-merge (= 7.1.0) + toml-rb (~> 4.1) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/commonmarker-merge + specs: + commonmarker-merge (7.1.0) + commonmarker (~> 2.2) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/dotenv-merge + specs: + dotenv-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/go-merge + specs: + go-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/json-merge + specs: + json-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kettle-jem + specs: + kettle-jem (7.1.0) + addressable (>= 2.8, < 3) + ast-crispr-markdown-markly (= 7.1.0) + ast-crispr-ruby-prism (= 7.1.0) + ast-merge (= 7.1.0) + bash-merge (= 7.1.0) + citrus-toml-merge (= 7.1.0) + commonmarker-merge (= 7.1.0) + dotenv-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-dev (~> 2.3, >= 2.3.5) + kettle-rb (~> 0.1, >= 0.1.4) + kramdown-merge (= 7.1.0) + markdown-merge (= 7.1.0) + markly-merge (= 7.1.0) + prism-merge (= 7.1.0) + psych-merge (= 7.1.0) + rbs (>= 3.10) + rbs-merge (= 7.1.0) + ruby-merge (= 7.1.0) + token-resolver (~> 2.0, >= 2.0.4) + toml-merge (= 7.1.0) + toml-rb (~> 4.2) + tree_haver (= 7.1.0) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/kramdown-merge + specs: + kramdown-merge (7.1.0) + kramdown (~> 2.5) + markdown-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markdown-merge + specs: + markdown-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/markly-merge + specs: + markly-merge (7.1.0) + markdown-merge (= 7.1.0) + markly (~> 0.9) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/parslet-toml-merge + specs: + parslet-toml-merge (7.1.0) + toml (~> 0.3) + toml-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/plain-merge + specs: + plain-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/prism-merge + specs: + prism-merge (7.1.0) + prism (~> 1.6) + ruby-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/psych-merge + specs: + psych-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + yaml-merge (= 7.1.0) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rbs-merge + specs: + rbs-merge (7.1.0) + ast-merge (= 7.1.0) + rbs (>= 3.10) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.14) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/ruby-merge + specs: + ruby-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/rust-merge + specs: + rust-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/smorg-rb + specs: + smorg-rb (7.1.0) + ast-merge (= 7.1.0) + ast-merge-git (= 7.1.0) + go-merge (= 7.1.0) + json-merge (= 7.1.0) + kettle-jem (= 7.1.0) + markly-merge (= 7.1.0) + plain-merge (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/toml-merge + specs: + toml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/typescript-merge + specs: + typescript-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/yaml-merge + specs: + yaml-merge (7.1.0) + ast-merge (= 7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /home/pboling/src/my/structuredmerge/ruby/gems/zip-merge + specs: + zip-merge (7.1.0) + tree_haver (= 7.1.0) + version_gem (~> 1.1, >= 1.1.9) + +PATH + remote: /var/home/pboling/src/my/structuredmerge/vendor/tree-sitter-language-pack/packages/ruby + specs: + tree_sitter_language_pack (1.12.5) + rb_sys (>= 0.9, < 0.9.128) + sorbet-runtime (~> 0.5) + +GEM + remote: https://gem.coop/ + specs: + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + ansi (1.6.0) + appraisal2 (3.2.0) + bundler (>= 1.17.3) + rake (>= 10) + thor (>= 0.14) + 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) citrus (3.0.2) - citrus-toml-merge (7.1.0) - toml-merge (= 7.1.0) - toml-rb (~> 4.1) - version_gem (~> 1.1, >= 1.1.9) cmdparse (3.0.7) commonmarker (2.9.0-x86_64-linux) commonmarker (2.9.0-x86_64-linux-musl) - commonmarker-merge (7.1.0) - commonmarker (~> 2.2) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) concurrent-ruby (1.3.7) date (3.5.1) debug (1.11.1) @@ -66,10 +302,6 @@ GEM diff-lcs (1.6.2) diffy (3.4.4) docile (1.4.1) - dotenv-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) dry-configurable (1.4.0) dry-core (~> 1.0) zeitwerk (~> 2.6) @@ -119,10 +351,6 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.21.1) - json-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) kettle-dev (2.3.7) emoji_regex (>= 15.0) kettle-rb (~> 0.1, >= 0.1.2) @@ -130,31 +358,6 @@ GEM ruby-progressbar (~> 1.13) kettle-drift (1.0.5) version_gem (~> 1.1, >= 1.1.13) - kettle-jem (7.1.0) - addressable (>= 2.8, < 3) - ast-crispr-markdown-markly (= 7.1.0) - ast-crispr-ruby-prism (= 7.1.0) - ast-merge (= 7.1.0) - bash-merge (= 7.1.0) - citrus-toml-merge (= 7.1.0) - commonmarker-merge (= 7.1.0) - dotenv-merge (= 7.1.0) - json-merge (= 7.1.0) - kettle-dev (~> 2.3, >= 2.3.5) - kettle-rb (~> 0.1, >= 0.1.4) - kramdown-merge (= 7.1.0) - markdown-merge (= 7.1.0) - markly-merge (= 7.1.0) - prism-merge (= 7.1.0) - psych-merge (= 7.1.0) - rbs (>= 3.10) - rbs-merge (= 7.1.0) - ruby-merge (= 7.1.0) - token-resolver (~> 2.0, >= 2.0.4) - toml-merge (= 7.1.0) - toml-rb (~> 4.2) - tree_haver (= 7.1.0) - yaml-merge (= 7.1.0) kettle-rb (0.1.4) kettle-soup-cover (1.1.3) simplecov (~> 0.22) @@ -178,24 +381,12 @@ GEM turbo_tests2 (~> 3.1, >= 3.1.12) kramdown (2.5.2) rexml (>= 3.4.4) - kramdown-merge (7.1.0) - kramdown (~> 2.5) - markdown-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) 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.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) markly (0.16.0) - markly-merge (7.1.0) - markdown-merge (= 7.1.0) - markly (~> 0.9) - version_gem (~> 1.1, >= 1.1.9) mutex_m (0.3.0) nokogiri (1.19.4-x86_64-linux-gnu) racc (~> 1.4) @@ -215,31 +406,20 @@ GEM prettyprint prettyprint (0.2.0) prism (1.9.0) - prism-merge (7.1.0) - prism (~> 1.6) - ruby-merge (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) psych (5.4.0) date stringio - psych-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) - yaml-merge (= 7.1.0) 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.127) + rake-compiler-dock (= 1.12.0) rbs (4.0.3) logger prism (>= 1.6.0) tsort - rbs-merge (7.1.0) - ast-merge (= 7.1.0) - rbs (>= 3.10) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.14) rdoc (6.17.0) erb psych (>= 4.0.0) @@ -335,10 +515,6 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-ast (>= 1.44.0, < 2.0) - ruby-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) ruby-progressbar (1.13.0) ruby_engine (2.0.3) ruby_version (1.0.3) @@ -398,15 +574,9 @@ GEM version_gem (~> 1.1, >= 1.1.13) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) - toml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) toml-rb (4.2.0) citrus (~> 3.0, > 3.0) racc (~> 1.7) - tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) - sorbet-runtime (~> 0.5) tsort (0.2.0) turbo_tests2 (3.2.0) parallel_tests (>= 3.3.0, < 6) @@ -421,10 +591,6 @@ GEM kramdown (>= 2.4, < 3) kramdown-parser-gfm (~> 1.1) version_gem (~> 1.1, >= 1.1.13) - yaml-merge (7.1.0) - ast-merge (= 7.1.0) - tree_haver (= 7.1.0) - version_gem (~> 1.1, >= 1.1.9) yard (0.9.45) yard-fence (0.9.6) rdoc (>= 6.11, < 8) @@ -453,24 +619,45 @@ PLATFORMS DEPENDENCIES addressable (>= 2.8, < 3) appraisal2 (~> 3.0, >= 3.0.6) + 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) + citrus-toml-merge! + commonmarker-merge! debug (>= 1.1) + dotenv-merge! erb (~> 6.0, >= 6.0.4) gem_bench (~> 2.0, >= 2.0.5) gitmoji-regex (~> 2.0, >= 2.0.0) + go-merge! irb (~> 1.17) + json-merge! kettle-dev (~> 2.0, >= 2.2.25) kettle-drift (~> 1.0, >= 1.0.5) - kettle-jem (>= 7.0) + kettle-jem! kettle-soup-cover (~> 1.0, >= 1.1.3) kettle-test (~> 2.0, >= 2.0.9) kramdown (~> 2.5, >= 2.5.1) + kramdown-merge! kramdown-parser-gfm (~> 1.1) + markdown-merge! + markly-merge! mutex_m (~> 0.2) nomono (~> 1.0, >= 1.0.8) + parslet-toml-merge! + plain-merge! + prism-merge! + psych-merge! rake (~> 13.0) rbs (>= 3.0) + rbs-merge! rdoc (~> 6.11) reek (~> 6.5) require_bench (~> 1.0, >= 1.0.4) @@ -479,20 +666,28 @@ DEPENDENCIES rubocop-packaging (~> 0.6, >= 0.6.0) rubocop-rspec (~> 3.6) rubocop-ruby3_2 (~> 3.0.0) + ruby-merge! ruby-progressbar (~> 1.13) + rust-merge! + smorg-rb! standard (>= 1.50) stone_checksums (~> 1.0, >= 1.0.3) stringio (>= 3.0) toml (~> 0.3) + toml-merge! toml-rb (~> 4.1) tree_haver! + tree_sitter_language_pack! + typescript-merge! yaml-converter (~> 0.1) + yaml-merge! yard (~> 0.9, >= 0.9.44) yard-fence (~> 0.9, >= 0.9.1) yard-junk (~> 0.1, >= 0.1.0) yard-relative_markdown_links (~> 0.6) yard-timekeeper (~> 0.1) yard-yaml (~> 0.1, >= 0.1.2) + zip-merge! CHECKSUMS addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af @@ -503,10 +698,13 @@ CHECKSUMS ast-crispr-markdown-markly (7.1.0) ast-crispr-ruby-prism (7.1.0) ast-merge (7.1.0) + ast-merge-git (7.1.0) + ast-template (7.1.0) backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235 bash-merge (7.1.0) benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd + binary-merge (7.1.0) bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9 citrus (3.0.2) sha256=4ec2412fc389ad186735f4baee1460f7900a8e130ffe3f216b30d4f9c684f650 citrus-toml-merge (7.1.0) @@ -534,6 +732,7 @@ CHECKSUMS gem_bench (2.0.5) sha256=0dc0fb44a5a5eb7b2f5c1c68a5b0164d72007132822c012bac3abe976b199ead geom2d (0.4.1) sha256=ea0998ea90c4f2752e24fe13d85a4f89bee689d151316140ebcc6369bf634ed9 gitmoji-regex (2.0.4) sha256=01410d3217940bd0e7b2299ec805245afe8d0f06a5d6d38f623d63a63c0ac34f + go-merge (7.1.0) hexapdf (1.9.1) sha256=2d1f6a3622e6bc2a70a707d4c3f3fa44f5552ecd9d899f6283abb07398a84884 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 @@ -564,6 +763,8 @@ 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.0) + plain-merge (7.1.0) pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85 @@ -574,6 +775,8 @@ 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.127) rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 @@ -607,6 +810,7 @@ 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.0) service_actor (3.9.4) sha256=e63b523630b9a7e62959b2a90113b08d2565b5de9c148557b281ef847c9539ce silent_stream (1.0.12) sha256=377c43aa10033fe90c33b39ea8cd97d79f2d1c4856df598efc56f3091f3ae782 simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 @@ -616,6 +820,7 @@ CHECKSUMS simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + smorg-rb (7.1.0) sorbet-runtime (0.6.13342) sha256=dbeb9892597f593ed2b29e38018912787f6c4e0c4b736d8af0d6bd3c63bde3c3 standard (1.56.0) sha256=ae2af4d9669589162ac69ed5ef59dcf9f346d4afc81f7e62b84339310dfcb787 standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b @@ -633,9 +838,10 @@ CHECKSUMS toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) - tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) + tree_sitter_language_pack (1.12.5) tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0 + typescript-merge (7.1.0) unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42 unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613 @@ -648,6 +854,7 @@ CHECKSUMS yard-timekeeper (0.2.4) sha256=62f8d001d737c6e2ac688e7b37386f958dceb0f6aff9c909575e1bec8d20775a yard-yaml (0.2.3) sha256=fe5fef18819e1cbd05bb8f1b9e1baad6bf70c28125eb75b57bbf6397b0831812 zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12 + zip-merge (7.1.0) zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20 BUNDLED WITH diff --git a/gems/tree_haver/spec/grammar_finder_spec.rb b/gems/tree_haver/spec/grammar_finder_spec.rb index 61ac4345f..e661e0f60 100644 --- a/gems/tree_haver/spec/grammar_finder_spec.rb +++ b/gems/tree_haver/spec/grammar_finder_spec.rb @@ -31,5 +31,23 @@ ) ) end + + it 'does not require shared-library cache discovery for TSLP registration' do + stub_const('TreeSitterLanguagePack', Module.new) + allow(TreeSitterLanguagePack).to receive(:has_language).with('cold_cache_markdown').and_return(true) + allow(TreeHaver::Backends::Tslp).to receive(:available?).and_return(true) + + finder = described_class.new(:cold_cache_markdown) + allow(finder).to receive(:find_library_path).and_raise( + TreeHaver::NotAvailable, + 'shared-library cache is intentionally empty' + ) + + expect(finder.register!(raise_on_missing: true)).to be(true) + parser = TreeHaver.with_backend('tslp') { TreeHaver.parser_for(:cold_cache_markdown) } + + expect(parser).to be_a(TreeHaver::Backends::Tslp::Parser) + expect(finder).not_to have_received(:find_library_path) + end end end From 8a28247cf729302fa7e49e715fd47ebd99bb7c2d Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 02:15:59 -0600 Subject: [PATCH 332/347] Document TreeHaver auto backend semantics --- gems/tree_haver/README.md | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/gems/tree_haver/README.md b/gems/tree_haver/README.md index 05e7eb70a..85a1adeac 100644 --- a/gems/tree_haver/README.md +++ b/gems/tree_haver/README.md @@ -446,7 +446,14 @@ TreeHaver exposes a backend registry for parser facades, language-family provide |---------|-------------|-------------|-------------| | **Kaitai Struct** | Backend reference and feature profile for binary schema analysis | Varies | Universal once a schema adapter is supplied | -**`TreeHaver::Parser` Auto-selection priority:** MRI/Rust/FFI on MRI; Java/FFI on JRuby; then Prism → Psych → Citrus → Parslet. +**`TreeHaver::Parser` Auto-selection contract:** `:auto` never means +unregistered parser discovery. It selects the first registered TreeHaver backend +module whose availability check passes. Built-in tree-sitter facade priority is +MRI/Rust/FFI on MRI and Java/FFI on JRuby, followed by registered provider +modules such as Prism, Psych, Citrus, and Parslet when those providers have been +registered for the requested language. Explicit backend requests fail closed if +that backend is unavailable or has no parser registered for the requested +language. **Known Issues:** @@ -641,7 +648,8 @@ export TREE_SITTER_TOML_PATH=~/.local/share/mise/installs/lua/5.4.8/luarocks/lib ### Backend Selection -TreeHaver automatically selects the best backend for your Ruby implementation, but you can override this behavior: +TreeHaver can select an available registered backend for you, but you can +override this behavior: ```ruby # Automatic backend selection (default) @@ -661,7 +669,13 @@ TreeHaver.backend = :parslet # Use Parslet pure Ruby parser # CAVEAT: few major language grammars, but many esoteric grammars ``` -**Auto-selection priority on MRI:** MRI → Rust → FFI → Citrus → Parslet +**Auto-selection rule:** `:auto` uses the registered backend list and chooses +the first backend module that is allowed by environment configuration and reports +itself available. It does not call parser libraries directly, search for +language-specific fallback parsers outside the registry, or hide an explicit +backend failure by silently switching to a different backend. + +**Built-in facade priority on MRI:** MRI → Rust → FFI → Citrus → Parslet You can also set the backend via environment variable: From 90d6640d6bc09cb4e452f92338d7f70c9a7811d6 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 02:19:09 -0600 Subject: [PATCH 333/347] Exercise shared TOML formatting fixture --- .../results/test_results.html | 12 +++---- .../results/test_results.xml | 14 ++++---- .../results/test_results.html | 12 +++---- .../results/test_results.xml | 14 ++++---- gems/toml-merge/results/test_results.html | 32 +++++++++---------- gems/toml-merge/results/test_results.xml | 32 +++++++++---------- .../spec/fixtures_integration_spec.rb | 29 ++++++++--------- 7 files changed, 72 insertions(+), 73 deletions(-) diff --git a/gems/citrus-toml-merge/results/test_results.html b/gems/citrus-toml-merge/results/test_results.html index e0581a04b..ac2333475 100644 --- a/gems/citrus-toml-merge/results/test_results.html +++ b/gems/citrus-toml-merge/results/test_results.html @@ -283,18 +283,18 @@

    RSpec Code Examples

    Citrus::Toml::Merge
    -
    exposes the TOML family through the Citrus provider backend0.00103s
    +
    rejects unsupported provider backend overrides0.00108s
    -
    merges comment-free arrays of tables through the Citrus parser provider0.09477s
    +
    conforms to the provider named-suite plan and manifest-report fixtures0.00084s
    -
    conforms to the shared TOML analysis, matching, and merge fixtures0.04536s
    +
    exposes the TOML family through the Citrus provider backend0.00037s
    -
    rejects unsupported provider backend overrides0.00017s
    +
    conforms to the shared TOML analysis, matching, and merge fixtures0.10766s
    -
    conforms to the provider named-suite plan and manifest-report fixtures0.00077s
    +
    merges comment-free arrays of tables through the Citrus parser provider0.06247s
    - + diff --git a/gems/citrus-toml-merge/results/test_results.xml b/gems/citrus-toml-merge/results/test_results.xml index 0a3cd4854..f1d177eed 100644 --- a/gems/citrus-toml-merge/results/test_results.xml +++ b/gems/citrus-toml-merge/results/test_results.xml @@ -1,11 +1,11 @@ - + - + - - - - - + + + + + diff --git a/gems/parslet-toml-merge/results/test_results.html b/gems/parslet-toml-merge/results/test_results.html index 587a5cf69..b76303c51 100644 --- a/gems/parslet-toml-merge/results/test_results.html +++ b/gems/parslet-toml-merge/results/test_results.html @@ -283,18 +283,18 @@

    RSpec Code Examples

    Parslet::Toml::Merge
    -
    conforms to the provider named-suite plan and manifest-report fixtures0.00154s
    +
    exposes the TOML family through the Parslet provider backend0.00114s
    -
    merges comment-free arrays of tables through the Parslet parser provider0.10260s
    +
    merges comment-free arrays of tables through the Parslet parser provider0.08528s
    -
    exposes the TOML family through the Parslet provider backend0.00062s
    +
    conforms to the shared TOML analysis, matching, and merge fixtures0.02466s
    -
    conforms to the shared TOML analysis, matching, and merge fixtures0.02582s
    +
    rejects unsupported provider backend overrides0.00017s
    -
    rejects unsupported provider backend overrides0.00016s
    +
    conforms to the provider named-suite plan and manifest-report fixtures0.00085s
    - + diff --git a/gems/parslet-toml-merge/results/test_results.xml b/gems/parslet-toml-merge/results/test_results.xml index 1b7dc6091..aa5f91596 100644 --- a/gems/parslet-toml-merge/results/test_results.xml +++ b/gems/parslet-toml-merge/results/test_results.xml @@ -1,11 +1,11 @@ - + - + - - - - - + + + + + diff --git a/gems/toml-merge/results/test_results.html b/gems/toml-merge/results/test_results.html index 461d720dc..4f2e05258 100644 --- a/gems/toml-merge/results/test_results.html +++ b/gems/toml-merge/results/test_results.html @@ -283,38 +283,38 @@

    RSpec Code Examples

    Toml::Merge
    -
    rejects unsupported provider backend overrides0.00720s
    +
    conforms to the slice-136 TOML plan-context fixtures0.00090s
    -
    conforms to the slice-137 TOML family manifest fixture0.00038s
    +
    preserves destination TOML comments and blank lines while adding template-only keys0.04355s
    -
    conforms to the slice-139 family named-suite plan fixture0.00090s
    +
    parses mise-style dotted env keys and inline tables0.00090s
    -
    parses mise-style dotted env keys and inline tables0.01521s
    +
    merges comment-free TOML arrays of tables with destination preference0.01025s
    -
    records emitter source provenance line metadata for raw source rendering0.00343s
    +
    keeps the shared family feature fixture stable while exposing the substrate backend feature profile0.00032s
    -
    conforms to the slice-140 family manifest report fixture0.00110s
    +
    resolves TOML paths through the canonical manifest0.00143s
    -
    keeps the shared family feature fixture stable while exposing the substrate backend feature profile0.00032s
    +
    conforms to the slice-139 family named-suite plan fixture0.00051s
    -
    exposes non-overlapping effective table ranges and source fragments through the TOML substrate0.00228s
    +
    exposes non-overlapping effective table ranges and source fragments through the TOML substrate0.00148s
    -
    conforms to the slice-135 TOML backend feature profile fixtures0.00034s
    +
    conforms to the TOML parse, structure, matching, and merge fixtures with the tree-sitter substrate0.00975s
    -
    preserves destination TOML comments and blank lines while adding template-only keys0.03392s
    +
    records emitter source provenance line metadata for raw source rendering0.00013s
    -
    conforms to the TOML parse, structure, matching, and merge fixtures with the tree-sitter substrate0.00515s
    +
    conforms to the slice-135 TOML backend feature profile fixtures0.00026s
    -
    merges comment-free TOML arrays of tables with destination preference0.00273s
    +
    conforms to the slice-137 TOML family manifest fixture0.00025s
    -
    projects arrays of tables through the TOML substrate0.00059s
    +
    rejects unsupported provider backend overrides0.00038s
    -
    conforms to the slice-136 TOML plan-context fixtures0.00027s
    +
    projects arrays of tables through the TOML substrate0.00062s
    -
    resolves TOML paths through the canonical manifest0.00099s
    +
    conforms to the slice-140 family manifest report fixture0.00060s
    - + diff --git a/gems/toml-merge/results/test_results.xml b/gems/toml-merge/results/test_results.xml index a4540ec3f..10aa11eac 100644 --- a/gems/toml-merge/results/test_results.xml +++ b/gems/toml-merge/results/test_results.xml @@ -1,21 +1,21 @@ - + - + - - - - - - + + + + - - - - - - - - + + + + + + + + + + diff --git a/gems/toml-merge/spec/fixtures_integration_spec.rb b/gems/toml-merge/spec/fixtures_integration_spec.rb index c77980288..803ab9f6c 100644 --- a/gems/toml-merge/spec/fixtures_integration_spec.rb +++ b/gems/toml-merge/spec/fixtures_integration_spec.rb @@ -146,26 +146,25 @@ def json_ready(value) end it 'preserves destination TOML comments and blank lines while adding template-only keys' do - template = <<~TOML - # project configuration - name = "kettle-jem" - generated = true - TOML - destination = <<~TOML - # project configuration - name = "kettle-jem" - - # local operator notes - local = true - TOML + fixture = read_json( + fixtures_root.join( + 'toml', + 'slice-721-formatting-preservation', + 'dotted-inline-comments-arrays.json' + ) + ) - result = described_class.merge_toml(template, destination, 'toml') + result = described_class.merge_toml(fixture[:template], fixture[:destination], fixture[:dialect]) - expect(result[:ok]).to be(true) + expect(result[:ok]).to eq(fixture.dig(:expected, :ok)) expect(result[:output]).to include('# project configuration') expect(result[:output]).to include("\n\n# local operator notes\n") expect(result[:output]).to include('local = true') - expect(result[:output]).to include('generated = true') + expect(result[:output]).to include('_.file = { path = ".env.local", redact = true }') + expect(result[:output]).to include('_.path = ["exe", "bin"]') + expect(result[:output]).to include('[[profiles.semantic-diff.attributes]]') + expect(result[:output]).to include('diff = "smorg-rb"') + expect(result[:output]).to eq(fixture.dig(:expected, :output)) end it 'records emitter source provenance line metadata for raw source rendering' do From 961fdd69d21a1373bc602e4830963ac0b200f9bf Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 02:21:10 -0600 Subject: [PATCH 334/347] Document merge gem backend patterns --- gems/ast-merge/README.md | 22 +++++++++++++++++++++- gems/kettle-jem/Gemfile.lock | 2 +- gems/kettle-jem/lib/kettle/jem.rb | 2 ++ gems/kettle-jem/spec/thin_slice_spec.rb | 3 +++ 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/gems/ast-merge/README.md b/gems/ast-merge/README.md index 19257e522..bf0c8c062 100644 --- a/gems/ast-merge/README.md +++ b/gems/ast-merge/README.md @@ -64,11 +64,29 @@ Backend fallback inside `tree_haver` is allowed when it is explicit TreeHaver ba ### Creating a New Merge Gem +Pick the merge-gem shape before writing parser code: + +- Use a substrate mapping gem when the format can use an existing TreeHaver grammar/backend. Register the grammar, parse through `TreeHaver.parser_for`, and keep merge behavior in the substrate. +- Use a provider-only gem when the gem exists to expose one concrete parser backend. Register that backend with `TreeHaver.register_language`, then delegate shared language or format behavior back to the substrate gem. +- Use a hybrid provider gem only when both the native provider and TSLP/tree-sitter path are intentional, tested TreeHaver backends. + +Merge gems should not call parser libraries directly during merge analysis. Direct parser calls belong inside TreeHaver backend adapters. + ```ruby +require "tree_haver" require "ast/merge" module MyFormat module Merge + BACKEND_REFERENCE = TreeHaver::BackendReference.new( + id: "kreuzberg-language-pack", + family: "tree-sitter" + ).freeze + + def self.register_backend! + TreeHaver::GrammarFinder.new(:my_format).register! + end + # Inherit from base classes and pass **options for forward compatibility class SmartMerger < Ast::Merge::SmartMergerBase @@ -102,7 +120,9 @@ module MyFormat @source = source @freeze_token = freeze_token @signature_generator = signature_generator - # Process source... + Merge.register_backend! + @tree = TreeHaver.parser_for(:my_format).parse(source) + # Project TreeHaver nodes into merge ownership records. end def compute_node_signature(node) diff --git a/gems/kettle-jem/Gemfile.lock b/gems/kettle-jem/Gemfile.lock index 982d196a0..0b0b57b61 100644 --- a/gems/kettle-jem/Gemfile.lock +++ b/gems/kettle-jem/Gemfile.lock @@ -40,7 +40,7 @@ PATH specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) - prism (>= 1.0) + prism-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH diff --git a/gems/kettle-jem/lib/kettle/jem.rb b/gems/kettle-jem/lib/kettle/jem.rb index 893986b78..3b91d9832 100644 --- a/gems/kettle-jem/lib/kettle/jem.rb +++ b/gems/kettle-jem/lib/kettle/jem.rb @@ -10332,6 +10332,8 @@ def readme_family_intro_and_backend_matrix(readme_style = {}) "", "This gem is part of the StructuredMerge Ruby package family. The implementation inventory, layering model, and backend notes live in the [root package-family guide][sm-family-guide]. Shared behavior is defined by the [StructuredMerge fixtures][sm-family-fixtures] and implemented by the [Go][sm-family-go], [Ruby][sm-family-ruby], [Rust][sm-family-rust], and [TypeScript][sm-family-typescript] repositories.", "", + "Merge analysis must enter parsing through `tree_haver`. Parser-specific gems register concrete TreeHaver backends; substrate gems register grammar mappings and keep shared format or language merge behavior in one place. Missing backends fail closed instead of falling back to direct parser-library calls.", + "", "", "", "[sm-family-guide]: https://github.com/structuredmerge/structuredmerge-ruby#package-family", diff --git a/gems/kettle-jem/spec/thin_slice_spec.rb b/gems/kettle-jem/spec/thin_slice_spec.rb index 78093675e..408ab208e 100644 --- a/gems/kettle-jem/spec/thin_slice_spec.rb +++ b/gems/kettle-jem/spec/thin_slice_spec.rb @@ -11703,6 +11703,9 @@ def min_ruby_version(gem_name, version) expect(template_report.dig(:metadata, :template_tokens, "KJ|README:FAMILY_INTRO_BACKEND_MATRIX")).to include( "StructuredMerge Ruby package family" ) + expect(template_report.dig(:metadata, :template_tokens, "KJ|README:FAMILY_INTRO_BACKEND_MATRIX")).to include( + "Merge analysis must enter parsing through `tree_haver`" + ) end end From 95bd42ea669530568db511cbfe3c746bbdd36b7e Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 02:23:09 -0600 Subject: [PATCH 335/347] Document YAML formatting fixture gap --- .../spec/fixtures_integration_spec.rb | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gems/yaml-merge/spec/fixtures_integration_spec.rb b/gems/yaml-merge/spec/fixtures_integration_spec.rb index 948c88510..1fa557ce1 100644 --- a/gems/yaml-merge/spec/fixtures_integration_spec.rb +++ b/gems/yaml-merge/spec/fixtures_integration_spec.rb @@ -151,6 +151,27 @@ def json_ready(value) ) end + it 'documents YAML formatting preservation fixture support for comments, anchors, aliases, documents, and sequences' do + fixture = read_json( + fixtures_root.join( + 'yaml', + 'slice-721-formatting-preservation', + 'comments-anchors-documents-sequences.json' + ) + ) + apply_conformance_fixture_support!(fixture.dig(:implementation_support, :ruby_tslp)) + + result = described_class.merge_yaml( + fixture[:template], + fixture[:destination], + fixture[:dialect], + backend: 'kreuzberg-language-pack' + ) + + expect(result[:ok]).to eq(fixture.dig(:expected, :ok)) + expect(result[:output]).to eq(fixture.dig(:expected, :output)) + end + it 'conforms to the slice-183 YAML polyglot backend feature profile fixtures' do fixture = read_json( fixtures_root.join( From 1a7be6a099b29c3220f0ecac2773ebd4058ee9d2 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 02:28:24 -0600 Subject: [PATCH 336/347] Exercise Markdown provider parity fixture --- gems/commonmarker-merge/Gemfile.lock | 2 +- .../spec/fixtures_integration_spec.rb | 24 +++++++++++++++++++ .../spec/fixtures_integration_spec.rb | 24 +++++++++++++++++++ .../lib/markdown/merge/file_analysis.rb | 2 +- .../spec/fixtures_integration_spec.rb | 24 +++++++++++++++++++ .../spec/fixtures_integration_spec.rb | 24 +++++++++++++++++++ 6 files changed, 98 insertions(+), 2 deletions(-) diff --git a/gems/commonmarker-merge/Gemfile.lock b/gems/commonmarker-merge/Gemfile.lock index b939ea585..55e28bf0c 100644 --- a/gems/commonmarker-merge/Gemfile.lock +++ b/gems/commonmarker-merge/Gemfile.lock @@ -19,7 +19,7 @@ PATH specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) - prism (>= 1.0) + prism-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH diff --git a/gems/commonmarker-merge/spec/fixtures_integration_spec.rb b/gems/commonmarker-merge/spec/fixtures_integration_spec.rb index ae5d42121..2d3486d30 100644 --- a/gems/commonmarker-merge/spec/fixtures_integration_spec.rb +++ b/gems/commonmarker-merge/spec/fixtures_integration_spec.rb @@ -73,6 +73,30 @@ def json_ready(value) expect(merge_result[:output]).to eq(merge_fixture.dig(:expected, :output)) end + it 'conforms to the slice-721 Markdown provider parity fixture' do + fixture = read_json( + fixtures_root.join( + 'markdown', + 'slice-721-provider-parity', + 'headings-lists-tables-fences-links-frontmatter-comments.json' + ) + ) + + result = described_class.parse_markdown(fixture[:source], fixture[:dialect]) + owners = result.dig(:analysis, :owners) + expect(owners.map { |owner| owner[:owner_kind] }).to eq(fixture.dig(:expected, :parse_owner_kinds)) + expect(owners.map { |owner| owner[:match_key] }).to eq(fixture.dig(:expected, :parse_owner_match_keys)) + + analysis = TreeHaver.with_backend(described_class::BACKEND_REFERENCE.id) do + Markdown::Merge::FileAnalysis.new(fixture[:source]) + end + common = fixture.dig(:expected, :structured_owner_common) + expect(analysis.link_definition_owners.map(&:label)).to eq(common[:link_definitions]) + expect(analysis.html_comment_owners.map(&:text)).to eq(common[:html_comments]) + expect(analysis.inline_reference_owners.map(&:label)).to eq(common[:inline_references]) + expect(analysis.table_row_owners.map(&:source)).to include(*common[:table_rows_include]) + end + it 'conforms to the slice-208 embedded-family fixture' do fixture = read_json(fixtures_root.join('markdown', 'slice-208-embedded-families', 'code-fence-families.json')) analysis = described_class.parse_markdown(fixture[:source], 'markdown') diff --git a/gems/kramdown-merge/spec/fixtures_integration_spec.rb b/gems/kramdown-merge/spec/fixtures_integration_spec.rb index 2bbde5d2f..ec45e35ea 100644 --- a/gems/kramdown-merge/spec/fixtures_integration_spec.rb +++ b/gems/kramdown-merge/spec/fixtures_integration_spec.rb @@ -80,6 +80,30 @@ def json_ready(value) expect(merge_result[:output]).to eq(merge_fixture.dig(:expected, :output)) end + it 'conforms to the slice-721 Markdown provider parity fixture' do + fixture = read_json( + fixtures_root.join( + 'markdown', + 'slice-721-provider-parity', + 'headings-lists-tables-fences-links-frontmatter-comments.json' + ) + ) + + result = described_class.parse_markdown(fixture[:source], fixture[:dialect]) + owners = result.dig(:analysis, :owners) + expect(owners.map { |owner| owner[:owner_kind] }).to eq(fixture.dig(:expected, :parse_owner_kinds)) + expect(owners.map { |owner| owner[:match_key] }).to eq(fixture.dig(:expected, :parse_owner_match_keys)) + + analysis = TreeHaver.with_backend(described_class::BACKEND_REFERENCE.id) do + Markdown::Merge::FileAnalysis.new(fixture[:source]) + end + common = fixture.dig(:expected, :structured_owner_common) + expect(analysis.link_definition_owners.map(&:label)).to eq(common[:link_definitions]) + expect(analysis.html_comment_owners.map(&:text)).to eq(common[:html_comments]) + expect(analysis.inline_reference_owners.map(&:label)).to eq(common[:inline_references]) + expect(analysis.table_row_owners.map(&:source)).to include(*common[:table_rows_include]) + end + it 'conforms to the slice-208 embedded-family fixture' do fixture = read_json(fixtures_root.join('markdown', 'slice-208-embedded-families', 'code-fence-families.json')) analysis = described_class.parse_markdown(fixture[:source], 'markdown') diff --git a/gems/markdown-merge/lib/markdown/merge/file_analysis.rb b/gems/markdown-merge/lib/markdown/merge/file_analysis.rb index 3ead57471..d86cea23a 100644 --- a/gems/markdown-merge/lib/markdown/merge/file_analysis.rb +++ b/gems/markdown-merge/lib/markdown/merge/file_analysis.rb @@ -366,7 +366,7 @@ def table_row_owners TableRowOwner.new( location: Location.new(start_line: position[:start_line], end_line: position[:end_line]), source: source_range(position[:start_line], position[:end_line]), - text: child.to_plaintext.to_s + text: extract_text_content(child) ) end end diff --git a/gems/markdown-merge/spec/fixtures_integration_spec.rb b/gems/markdown-merge/spec/fixtures_integration_spec.rb index 17d3dcc2b..33f07a476 100644 --- a/gems/markdown-merge/spec/fixtures_integration_spec.rb +++ b/gems/markdown-merge/spec/fixtures_integration_spec.rb @@ -100,6 +100,30 @@ def json_ready(value) ) end + it 'conforms to the slice-721 Markdown provider parity fixture for the TSLP backend' do + fixture = read_json( + fixtures_root.join( + 'markdown', + 'slice-721-provider-parity', + 'headings-lists-tables-fences-links-frontmatter-comments.json' + ) + ) + + result = markdown_merge.parse_markdown(fixture[:source], fixture[:dialect], backend: 'kreuzberg-language-pack') + owners = result.dig(:analysis, :owners) + expect(owners.map { |owner| owner[:owner_kind] }).to eq(fixture.dig(:expected, :parse_owner_kinds)) + expect(owners.map { |owner| owner[:match_key] }).to eq(fixture.dig(:expected, :parse_owner_match_keys)) + + analysis = TreeHaver.with_backend('kreuzberg-language-pack') do + Markdown::Merge::FileAnalysis.new(fixture[:source]) + end + common = fixture.dig(:expected, :structured_owner_common) + expect(analysis.link_definition_owners.map(&:label)).to eq(common[:link_definitions]) + expect(analysis.html_comment_owners.map(&:text)).to eq(common[:html_comments]) + expect(analysis.inline_reference_owners.map(&:label)).to eq(common[:inline_references]) + expect(analysis.table_row_owners.map(&:source)).to include(*common[:table_rows_include]) + end + it 'conforms to the slice-199 Markdown matching fixture' do fixture = read_json(fixtures_root.join('markdown', 'slice-199-matching', 'path-equality.json')) diff --git a/gems/markly-merge/spec/fixtures_integration_spec.rb b/gems/markly-merge/spec/fixtures_integration_spec.rb index 16422f97f..83794cb45 100644 --- a/gems/markly-merge/spec/fixtures_integration_spec.rb +++ b/gems/markly-merge/spec/fixtures_integration_spec.rb @@ -193,6 +193,30 @@ def json_ready(value) expect(merge_result[:output]).to eq(merge_fixture.dig(:expected, :output)) end + it 'conforms to the slice-721 Markdown provider parity fixture' do + fixture = read_json( + fixtures_root.join( + 'markdown', + 'slice-721-provider-parity', + 'headings-lists-tables-fences-links-frontmatter-comments.json' + ) + ) + + result = described_class.parse_markdown(fixture[:source], fixture[:dialect]) + owners = result.dig(:analysis, :owners) + expect(owners.map { |owner| owner[:owner_kind] }).to eq(fixture.dig(:expected, :parse_owner_kinds)) + expect(owners.map { |owner| owner[:match_key] }).to eq(fixture.dig(:expected, :parse_owner_match_keys)) + + analysis = TreeHaver.with_backend(described_class::BACKEND_REFERENCE.id) do + Markdown::Merge::FileAnalysis.new(fixture[:source]) + end + common = fixture.dig(:expected, :structured_owner_common) + expect(analysis.link_definition_owners.map(&:label)).to eq(common[:link_definitions]) + expect(analysis.html_comment_owners.map(&:text)).to eq(common[:html_comments]) + expect(analysis.inline_reference_owners.map(&:label)).to eq(common[:inline_references]) + expect(analysis.table_row_owners.map(&:source)).to include(*common[:table_rows_include]) + end + it 'conforms to the slice-208 embedded-family fixture' do fixture = read_json(fixtures_root.join('markdown', 'slice-208-embedded-families', 'code-fence-families.json')) analysis = described_class.parse_markdown(fixture[:source], 'markdown') From 5d54b18783d4d615cc1a78a88222c98ded43cdbe Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 02:29:16 -0600 Subject: [PATCH 337/347] Cover TSLP language backend fail-closed behavior --- gems/go-merge/spec/fixtures_integration_spec.rb | 13 +++++++++++++ gems/rust-merge/spec/fixtures_integration_spec.rb | 13 +++++++++++++ .../spec/fixtures_integration_spec.rb | 13 +++++++++++++ 3 files changed, 39 insertions(+) diff --git a/gems/go-merge/spec/fixtures_integration_spec.rb b/gems/go-merge/spec/fixtures_integration_spec.rb index 0bf103b40..de2520faa 100644 --- a/gems/go-merge/spec/fixtures_integration_spec.rb +++ b/gems/go-merge/spec/fixtures_integration_spec.rb @@ -76,4 +76,17 @@ def json_ready(value) = Ast::Merge.json_ready(value) %w[go slice-112-merge module-merge.json] ) end + + it 'fails closed when the Go TreeHaver backend is unavailable' do + allow(described_class).to receive(:go_backend_available_for_analysis?).and_return(false) + + expect(described_class.available_go_backends).to eq([]) + result = described_class.parse_go("package main\n", 'go') + + expect(result[:ok]).to be(false) + expect(result[:diagnostics]).to eq( + [{ severity: 'error', category: 'unsupported_feature', + message: 'Unsupported Go backend kreuzberg-language-pack.' }] + ) + end end diff --git a/gems/rust-merge/spec/fixtures_integration_spec.rb b/gems/rust-merge/spec/fixtures_integration_spec.rb index 22582c102..b0e68dd84 100644 --- a/gems/rust-merge/spec/fixtures_integration_spec.rb +++ b/gems/rust-merge/spec/fixtures_integration_spec.rb @@ -68,4 +68,17 @@ def json_ready(value) = Ast::Merge.json_ready(value) %w[rust slice-108-merge module-merge.json] ) end + + it 'fails closed when the Rust TreeHaver backend is unavailable' do + allow(described_class).to receive(:rust_backend_available_for_analysis?).and_return(false) + + expect(described_class.available_rust_backends).to eq([]) + result = described_class.parse_rust("fn main() {}\n", 'rust') + + expect(result[:ok]).to be(false) + expect(result[:diagnostics]).to eq( + [{ severity: 'error', category: 'unsupported_feature', + message: 'Unsupported Rust backend kreuzberg-language-pack.' }] + ) + end end diff --git a/gems/typescript-merge/spec/fixtures_integration_spec.rb b/gems/typescript-merge/spec/fixtures_integration_spec.rb index 752b8564d..0d1dc742f 100644 --- a/gems/typescript-merge/spec/fixtures_integration_spec.rb +++ b/gems/typescript-merge/spec/fixtures_integration_spec.rb @@ -77,4 +77,17 @@ def json_ready(value) = Ast::Merge.json_ready(value) %w[typescript slice-104-merge module-merge.json] ) end + + it 'fails closed when the TypeScript TreeHaver backend is unavailable' do + allow(described_class).to receive(:type_script_backend_available_for_analysis?).and_return(false) + + expect(described_class.available_type_script_backends).to eq([]) + result = described_class.parse_type_script("export function main() {}\n", 'typescript') + + expect(result[:ok]).to be(false) + expect(result[:diagnostics]).to eq( + [{ severity: 'error', category: 'unsupported_feature', + message: 'Unsupported TypeScript backend kreuzberg-language-pack.' }] + ) + end end From b978a13d42899aad71f65cd0668d1585242c46de Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 02:30:15 -0600 Subject: [PATCH 338/347] Document TSLP cold-cache registration --- gems/tree_haver/README.md | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/gems/tree_haver/README.md b/gems/tree_haver/README.md index 85a1adeac..66dee99f8 100644 --- a/gems/tree_haver/README.md +++ b/gems/tree_haver/README.md @@ -894,8 +894,8 @@ require "tree_haver" require "toml-merge" require "markdown-merge" -TomlMerge.register_tree_haver_grammars! -MarkdownMerge.register_tree_haver_grammars! +Toml::Merge.register_backend! +Markdown::Merge.register_backend! parser = TreeHaver.parser_for(:toml) ``` @@ -925,6 +925,30 @@ Given just the language name, `GrammarFinder` automatically derives: 3. **Extra paths**: explicit paths provided at initialization 4. **`tree_sitter_language_pack`**: parser API availability through its on-demand grammar loader +#### TSLP Cold-Cache Troubleshooting + +`tree_sitter_language_pack` loads bundled grammars on demand. A cold install may +not have a populated shared-library cache before the first parse, so +`GrammarFinder` must not treat cache contents as the source of truth for TSLP +availability. + +For TSLP-backed languages, check availability through the TSLP parser API and +then register the language with the TreeHaver TSLP backend: + +```ruby +finder = TreeHaver::GrammarFinder.new(:toml) +finder.register! if finder.available? + +TreeHaver.with_backend("kreuzberg-language-pack") do + TreeHaver.parser_for(:toml).parse("title = \"example\"\n") +end +``` + +If this fails from a cold start, inspect `finder.search_info` and confirm that +the `tree-sitter-language-pack` gem is in the bundle being used. Do not add a +merge-gem parser fallback to hide the failure; fix the TreeHaver registration +or the TSLP grammar binding instead. + #### Usage in \*-merge Gems The `GrammarFinder` pattern enables clean integration in language-specific From b3ce66f843d6befaf424d0a2eea14b89492906df Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 02:31:14 -0600 Subject: [PATCH 339/347] Document fail-closed parser migration --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index eacea86c6..9e99e1f9d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,6 +42,9 @@ Please file a bug if you notice a violation of semantic versioning. - Gems that use `tree_sitter_language_pack` now resolve it through the StructuredMerge Ruby 4-compatible fork branch in their development Gemfiles until an upstream Ruby 4-compatible release is available. +- Structured merge gems now fail closed when no registered TreeHaver backend is + available instead of falling back to direct parser-library paths outside the + TreeHaver and ast-merge stack. ### Deprecated From c61635cb4b97081e81ec4c8ff35a58c9f6e886ec Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 02:32:44 -0600 Subject: [PATCH 340/347] Add TSLP cold-cache CI gate --- .github/workflows/current.yml | 39 +++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/.github/workflows/current.yml b/.github/workflows/current.yml index 64a664264..8ffe7131e 100644 --- a/.github/workflows/current.yml +++ b/.github/workflows/current.yml @@ -161,12 +161,46 @@ jobs: abort "RBS validation failed for #{failures.length} gem(s)" unless failures.empty? ' + tslp-cold-cache: + name: TSLP cold cache + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + - name: Setup Ruby + uses: ruby/setup-ruby@9eb537ca036ebaed86729dcb9309076e4c5c3b74 # v1.314.0 + with: + ruby-version: ruby + bundler-cache: false + - name: Install dependencies + working-directory: gems/tree_haver + env: + K_JEM_TEMPLATING: true + STRUCTUREDMERGE_DEV: ${{ github.workspace }}/gems + run: | + gem install nomono -v 1.0.8 --source https://gem.coop --source https://rubygems.org + bundle config set path vendor/bundle + bundle config set frozen false + bundle install --jobs 4 + - name: Run cold-cache TSLP checks + working-directory: gems/tree_haver + env: + K_JEM_TEMPLATING: true + K_SOUP_COV_DO: false + STRUCTUREDMERGE_DEV: ${{ github.workspace }}/gems + run: | + set -euo pipefail + export TREE_SITTER_LANGUAGE_PACK_CACHE_DIR + TREE_SITTER_LANGUAGE_PACK_CACHE_DIR="$(mktemp -d "${RUNNER_TEMP}/tslp-cold-cache.XXXXXX")" + bundle exec rspec spec/grammar_finder_spec.rb spec/backends/tslp_spec.rb --format progress + check: name: Check needs: - detect - gem-suite - rbs + - tslp-cold-cache if: ${{ always() }} runs-on: ubuntu-latest steps: @@ -177,12 +211,14 @@ jobs: DETECT_RESULT: ${{ needs.detect.result }} GEM_SUITE_RESULT: ${{ needs.gem-suite.result }} RBS_RESULT: ${{ needs.rbs.result }} + TSLP_COLD_CACHE_RESULT: ${{ needs.tslp-cold-cache.result }} run: | set -euo pipefail echo "Selected gem suites: ${SELECTED_GEMS}" echo "Detect result: ${DETECT_RESULT}" echo "Gem suite result: ${GEM_SUITE_RESULT}" echo "RBS result: ${RBS_RESULT}" + echo "TSLP cold cache result: ${TSLP_COLD_CACHE_RESULT}" if [[ "${DETECT_RESULT}" != "success" ]]; then exit 1 @@ -190,6 +226,9 @@ jobs: if [[ "${RBS_RESULT}" != "success" ]]; then exit 1 fi + if [[ "${TSLP_COLD_CACHE_RESULT}" != "success" ]]; then + exit 1 + fi case "${GEM_SUITE_RESULT}" in success|skipped) From 53c8ab5ea2b7bac07adcc10c6622102b3bcaf4b4 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 02:33:52 -0600 Subject: [PATCH 341/347] Clarify Ruby fallback policy trigger --- gems/ruby-merge/lib/ruby/merge.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gems/ruby-merge/lib/ruby/merge.rb b/gems/ruby-merge/lib/ruby/merge.rb index 888f3360f..e10785820 100644 --- a/gems/ruby-merge/lib/ruby/merge.rb +++ b/gems/ruby-merge/lib/ruby/merge.rb @@ -467,7 +467,7 @@ def ruby_fallback_policy_profile scopes: %w[node subtree owned_region whole_file], triggers: [ { reason: 'binary_input', scope: 'whole_file' }, - { reason: 'unsupported_parser_or_backend', scope: 'whole_file' }, + { reason: 'unsupported_structural_merge_capability', scope: 'whole_file' }, { reason: 'no_structural_owners', scope: 'whole_file' }, { reason: 'both_branches_create_file', scope: 'whole_file' }, { reason: 'excessive_duplicate_identities', scope: 'owned_region' }, From 83983cce2ffb4245fdd4c594be56484d58fcf55e Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 02:42:44 -0600 Subject: [PATCH 342/347] Verify TOML provider TreeHaver registration --- gems/citrus-toml-merge/spec/fixtures_integration_spec.rb | 4 ++++ gems/parslet-toml-merge/spec/fixtures_integration_spec.rb | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/gems/citrus-toml-merge/spec/fixtures_integration_spec.rb b/gems/citrus-toml-merge/spec/fixtures_integration_spec.rb index 159f49c98..845508dae 100644 --- a/gems/citrus-toml-merge/spec/fixtures_integration_spec.rb +++ b/gems/citrus-toml-merge/spec/fixtures_integration_spec.rb @@ -53,6 +53,10 @@ def json_ready(value) expect(json_ready(TreeHaver::BackendRegistry.fetch('citrus')&.to_h)).to eq( json_ready({ id: 'citrus', family: 'peg' }) ) + expect(TreeHaver.registered_languages(:toml)).to include(:citrus) + expect( + TreeHaver.with_backend('citrus') { TreeHaver.parser_for(:toml).parse('title = "x"').root_node.type } + ).to eq('document') expect(json_ready(described_class.toml_backend_feature_profile)).to eq( json_ready(feature_fixture.dig(:providers, :citrus, :feature_profile)) ) diff --git a/gems/parslet-toml-merge/spec/fixtures_integration_spec.rb b/gems/parslet-toml-merge/spec/fixtures_integration_spec.rb index f8f27d1e7..693b7ce24 100644 --- a/gems/parslet-toml-merge/spec/fixtures_integration_spec.rb +++ b/gems/parslet-toml-merge/spec/fixtures_integration_spec.rb @@ -53,6 +53,10 @@ def json_ready(value) expect(json_ready(TreeHaver::BackendRegistry.fetch('parslet')&.to_h)).to eq( json_ready({ id: 'parslet', family: 'peg' }) ) + expect(TreeHaver.registered_languages(:toml)).to include(:parslet) + expect( + TreeHaver.with_backend('parslet') { TreeHaver.parser_for(:toml).parse("title = \"x\"\n").root_node.type } + ).to eq('document') expect(json_ready(described_class.toml_backend_feature_profile)).to eq( json_ready(feature_fixture.dig(:providers, :parslet, :feature_profile)) ) From df02d1ccbe2e056dcb568ff50abfec2897668e01 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 02:48:13 -0600 Subject: [PATCH 343/347] Preserve TOML shared fixture ordering --- .../lib/toml/merge/conflict_resolver.rb | 60 ++++++++++++++++++- .../spec/fixtures_integration_spec.rb | 1 + 2 files changed, 59 insertions(+), 2 deletions(-) diff --git a/gems/toml-merge/lib/toml/merge/conflict_resolver.rb b/gems/toml-merge/lib/toml/merge/conflict_resolver.rb index 080636b63..fbc8581ec 100644 --- a/gems/toml-merge/lib/toml/merge/conflict_resolver.rb +++ b/gems/toml-merge/lib/toml/merge/conflict_resolver.rb @@ -107,6 +107,10 @@ def merge_node_lists_to_emitter(template_nodes, dest_nodes, template_analysis, d refined_matches = build_refined_matches(template_nodes, dest_nodes, template_by_sig, dest_by_sig) refined_dest_to_template = refined_matches.invert + if canonical_unmatched_pair_list?(template_nodes, dest_nodes, template_by_sig, dest_by_sig, refined_matches) + return merge_unmatched_pair_lists_to_emitter(template_nodes, dest_nodes, template_analysis, dest_analysis) + end + # Track consumed individual node indices (not just signatures) so that # multiple nodes sharing the same signature are matched 1:1 in order # rather than collapsed into a single match. @@ -171,9 +175,13 @@ def merge_node_lists_to_emitter(template_nodes, dest_nodes, template_analysis, d dest_analysis ) - emit_gap_before_node( + emit_gap_before_matched_node( selected_node, selected_analysis, + template_node, + template_analysis, + dest_node, + dest_analysis, prev_emitted_end_line, prev_emitted_analysis, skip_for_borrowed_leading_region: @preference == :template && leading_region_present?(dest_node, @@ -225,9 +233,13 @@ def merge_node_lists_to_emitter(template_nodes, dest_nodes, template_analysis, d end # Merge matched nodes - emit_gap_before_node( + emit_gap_before_matched_node( selected_node, selected_analysis, + template_node, + template_analysis, + dest_node, + dest_analysis, prev_emitted_end_line, prev_emitted_analysis, skip_for_borrowed_leading_region: @preference == :template && leading_region_present?(dest_node, @@ -347,6 +359,29 @@ def redundant_destination_pair_duplicate?(node, signature, emitted_signatures) signature && node.respond_to?(:pair?) && node.pair? && emitted_signatures.include?(signature) end + def canonical_unmatched_pair_list?(template_nodes, dest_nodes, template_by_sig, dest_by_sig, refined_matches) + return false unless @add_template_only_nodes + return false unless refined_matches.empty? + return false unless (template_by_sig.keys & dest_by_sig.keys).empty? + return false if template_nodes.empty? || dest_nodes.empty? + + (template_nodes + dest_nodes).all? { |node| node.respond_to?(:pair?) && node.pair? } + end + + def merge_unmatched_pair_lists_to_emitter(template_nodes, dest_nodes, template_analysis, dest_analysis) + entries = template_nodes.map { |node| [node, template_analysis] } + + dest_nodes.map { |node| [node, dest_analysis] } + prev_emitted_end_line = nil + prev_emitted_analysis = nil + + entries.sort_by { |node, _analysis| node.respond_to?(:key_name) ? node.key_name.to_s : node.type.to_s }.each do |node, analysis| + emit_gap_before_node(node, analysis, prev_emitted_end_line, prev_emitted_analysis) + emit_node(node, analysis) + prev_emitted_end_line = emitted_end_line_for(node) + prev_emitted_analysis = analysis + end + end + # Emit a single node to the emitter # @param node [NodeWrapper] Node to emit # @param analysis [FileAnalysis] Analysis for accessing source @@ -990,6 +1025,27 @@ def emit_gap_before_node(node, analysis, prev_end_line, prev_analysis, skip_for_ emit_interstitial_blank_lines(prev_end_line + 1, node.start_line - 1, analysis) end + def emit_gap_before_matched_node(selected_node, selected_analysis, template_node, template_analysis, dest_node, + dest_analysis, prev_end_line, prev_analysis, + skip_for_borrowed_leading_region: false) + before_count = @emitter.lines.length + emit_gap_before_node( + selected_node, + selected_analysis, + prev_end_line, + prev_analysis, + skip_for_borrowed_leading_region: skip_for_borrowed_leading_region + ) + return if @emitter.lines.length > before_count + + alternate_node, alternate_analysis = if selected_node.equal?(dest_node) + [template_node, template_analysis] + else + [dest_node, dest_analysis] + end + emit_gap_before_node(alternate_node, alternate_analysis, prev_end_line, prev_analysis) + end + def leading_region_present?(node, analysis) region = attachment_region(node, analysis, :leading_region) region && (!region.respond_to?(:empty?) || !region.empty?) diff --git a/gems/toml-merge/spec/fixtures_integration_spec.rb b/gems/toml-merge/spec/fixtures_integration_spec.rb index 803ab9f6c..d9956c039 100644 --- a/gems/toml-merge/spec/fixtures_integration_spec.rb +++ b/gems/toml-merge/spec/fixtures_integration_spec.rb @@ -62,6 +62,7 @@ def json_ready(value) expect(merge_result[:output]).to include('release = true') expect(merge_result[:output]).not_to include('tags = ["template"]') expect(merge_result[:output]).not_to include('version = "0.1.0"') + expect(merge_result[:output]).to eq(merge_fixture.dig(:expected, :output)) end it 'keeps the shared family feature fixture stable while exposing the substrate backend feature profile' do From 269d174258a5a550f20f030a06f5e99dbe2848b1 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 02:51:00 -0600 Subject: [PATCH 344/347] Assert Markdown table row source slices --- .../spec/ast/crispr/markdown/markly_spec.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gems/ast-crispr-markdown-markly/spec/ast/crispr/markdown/markly_spec.rb b/gems/ast-crispr-markdown-markly/spec/ast/crispr/markdown/markly_spec.rb index 30a18d2d5..b2f54d85a 100644 --- a/gems/ast-crispr-markdown-markly/spec/ast/crispr/markdown/markly_spec.rb +++ b/gems/ast-crispr-markdown-markly/spec/ast/crispr/markdown/markly_spec.rb @@ -127,12 +127,12 @@ context = Ast::Crispr::Markdown::Markly.document_context(content: content, source_label: 'README.md') owners = context.structural_owners(owner_scope: :table_rows) - expect(owners.map { |owner| [owner.location.start_line, owner.text] }).to eq([ - [3, - "| Works with MRI Ruby | [![Ruby][💎ruby-3.2i]][🚎ruby-3.2-wf] |\n"], - [4, - "| Works with JRuby | [![JRuby][💎jruby-9.4i]][🚎jruby-9.4-wf] |\n"] - ]) + expect(owners.map { |owner| [owner.location.start_line, owner.source] }).to eq([ + [3, + "| Works with MRI Ruby | [![Ruby][💎ruby-3.2i]][🚎ruby-3.2-wf] |\n"], + [4, + "| Works with JRuby | [![JRuby][💎jruby-9.4i]][🚎jruby-9.4-wf] |\n"] + ]) expect(owners.last.source).to include('Works with JRuby') end From 0444ae4ca2e20269d32f6ff53d2e80ea7ae217f2 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 02:59:31 -0600 Subject: [PATCH 345/347] Update Kettle Jem Bash availability spec --- gems/kettle-jem/spec/thin_slice_spec.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/gems/kettle-jem/spec/thin_slice_spec.rb b/gems/kettle-jem/spec/thin_slice_spec.rb index 408ab208e..1a4274069 100644 --- a/gems/kettle-jem/spec/thin_slice_spec.rb +++ b/gems/kettle-jem/spec/thin_slice_spec.rb @@ -6379,7 +6379,6 @@ module Version }) availability = Bash::Merge::Availability.new( grammar_path: nil, - language_pack_process: true, node_parser: false, diagnostics: [{kind: "bash_node_parser_unavailable", message: "missing node adapter"}] ) From 241ea1a74696dac5cd87a1990c6bb6c1ec27f2fc Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 03:07:12 -0600 Subject: [PATCH 346/347] Assert smorg JSON merge semantically --- gems/smorg-rb/spec/cli_spec.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gems/smorg-rb/spec/cli_spec.rb b/gems/smorg-rb/spec/cli_spec.rb index b50269af8..5d01b3fc9 100644 --- a/gems/smorg-rb/spec/cli_spec.rb +++ b/gems/smorg-rb/spec/cli_spec.rb @@ -60,8 +60,7 @@ def run_git(dir, *args) expect(exit_code).to eq(described_class::EXIT_SUCCESS), stderr.string merged = File.read(current) - expect(merged).to include('"current":true') - expect(merged).to include('"other":true') + expect(JSON.parse(merged)).to include('current' => true, 'other' => true) expect(stdout.string).to eq('') end @@ -78,8 +77,7 @@ def run_git(dir, *args) expect(exit_code).to eq(described_class::EXIT_SUCCESS), stderr.string merged = File.read(current) - expect(merged).to include('"current":true') - expect(merged).to include('"other":true') + expect(JSON.parse(merged)).to include('current' => true, 'other' => true) end it 'installs local Git diff driver attributes' do From 7901b757a68c9e24d1292f0ca24ac04b8aeea9f6 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 19 Jul 2026 03:18:13 -0600 Subject: [PATCH 347/347] Refresh suite generated artifacts --- Gemfile.lock | 2 +- gems/ast-merge-git/Gemfile.lock | 2 +- gems/ast-template/Gemfile.lock | 2 +- gems/binary-merge/Gemfile.lock | 2 +- .../results/test_results.html | 22 ++++-- .../results/test_results.xml | 16 +++-- gems/dotenv-merge/Gemfile.lock | 2 +- gems/kettle-jem/Gemfile.lock | 8 +-- .../results/test_results.html | 22 ++++-- .../results/test_results.xml | 16 +++-- gems/plain-merge/Gemfile.lock | 2 +- gems/psych-merge/Gemfile.lock | 2 +- gems/rbs-merge/Gemfile.lock | 2 +- gems/smorg-rb/Gemfile.lock | 2 +- gems/toml-merge/results/test_results.html | 71 ++++++++++++------- gems/toml-merge/results/test_results.xml | 33 +++++---- gems/zip-merge/Gemfile.lock | 2 +- 17 files changed, 125 insertions(+), 83 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 87ffbd17f..39c4925de 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -21,7 +21,7 @@ PATH specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) - prism (>= 1.0) + prism-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH diff --git a/gems/ast-merge-git/Gemfile.lock b/gems/ast-merge-git/Gemfile.lock index 16d75f3d7..6c4aeff4b 100644 --- a/gems/ast-merge-git/Gemfile.lock +++ b/gems/ast-merge-git/Gemfile.lock @@ -19,7 +19,7 @@ PATH specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) - prism (>= 1.0) + prism-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH diff --git a/gems/ast-template/Gemfile.lock b/gems/ast-template/Gemfile.lock index 37099f9b0..b17738f92 100644 --- a/gems/ast-template/Gemfile.lock +++ b/gems/ast-template/Gemfile.lock @@ -18,7 +18,7 @@ PATH specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) - prism (>= 1.0) + prism-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH diff --git a/gems/binary-merge/Gemfile.lock b/gems/binary-merge/Gemfile.lock index f72edd5cc..41b29f356 100644 --- a/gems/binary-merge/Gemfile.lock +++ b/gems/binary-merge/Gemfile.lock @@ -18,7 +18,7 @@ PATH specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) - prism (>= 1.0) + prism-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH diff --git a/gems/citrus-toml-merge/results/test_results.html b/gems/citrus-toml-merge/results/test_results.html index ac2333475..0480bcd66 100644 --- a/gems/citrus-toml-merge/results/test_results.html +++ b/gems/citrus-toml-merge/results/test_results.html @@ -283,20 +283,30 @@

    RSpec Code Examples

    Citrus::Toml::Merge
    -
    rejects unsupported provider backend overrides0.00108s
    +
    exposes the TOML family through the Citrus provider backend0.00299s
    -
    conforms to the provider named-suite plan and manifest-report fixtures0.00084s
    +
    conforms to the shared TOML analysis, matching, and merge fixtures0.14349s
    -
    exposes the TOML family through the Citrus provider backend0.00037s
    +
    rejects unsupported provider backend overrides0.00077s
    -
    conforms to the shared TOML analysis, matching, and merge fixtures0.10766s
    +
    conforms to the provider named-suite plan and manifest-report fixtures0.00117s
    -
    merges comment-free arrays of tables through the Citrus parser provider0.06247s
    +
    merges comment-free arrays of tables through the Citrus parser provider0.13290s
    - + +ipt">moveProgressBar('100.0'); +
    is idempotent (merging again produces same result)0.01383s
    + + + + + + + + diff --git a/gems/citrus-toml-merge/results/test_results.xml b/gems/citrus-toml-merge/results/test_results.xml index f1d177eed..a25c7e3e5 100644 --- a/gems/citrus-toml-merge/results/test_results.xml +++ b/gems/citrus-toml-merge/results/test_results.xml @@ -1,11 +1,13 @@ - + - + - - - - - + + + + + + +cs on a matched array of tables behaves like a reproducible merge is idempotent (merging again produces same result)" file="./spec/reproducible_merge_spec.rb" time="0.013835"> diff --git a/gems/dotenv-merge/Gemfile.lock b/gems/dotenv-merge/Gemfile.lock index ac8f78052..cd091eb7c 100644 --- a/gems/dotenv-merge/Gemfile.lock +++ b/gems/dotenv-merge/Gemfile.lock @@ -19,7 +19,7 @@ PATH specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) - prism (>= 1.0) + prism-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH diff --git a/gems/kettle-jem/Gemfile.lock b/gems/kettle-jem/Gemfile.lock index 0b0b57b61..bd7918522 100644 --- a/gems/kettle-jem/Gemfile.lock +++ b/gems/kettle-jem/Gemfile.lock @@ -767,7 +767,7 @@ CHECKSUMS json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583 json-merge (7.1.0) kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee - kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2 + kettle-drift (1.0.5) kettle-jem (7.1.0) kettle-rb (0.1.4) sha256=9cef7ce4f7021666b7222292f29051e51eaf042e8a5db11f3f4dd72f74243fc1 kettle-soup-cover (3.0.1) sha256=83ebe2aa099f15781e4796b5faef0dc2720fba48f6b9d34808670b91baf271e4 @@ -802,8 +802,8 @@ 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) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023 - rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847 + rake-compiler-dock (1.12.0) + rb_sys (0.9.127) rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14 rbs-merge (7.1.0) rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7 @@ -867,7 +867,7 @@ CHECKSUMS timecop (0.9.11) sha256=41284dc6e5041f2184f781ace766f942108c842f8d8c1386a26e6343decc7542 timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9 token-resolver (2.0.4) sha256=33b926958f504525bba3ed511ab66fbcbf8ef30390815e931436b30f27ffcad0 - toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9 + toml (0.3.0) toml-merge (7.1.0) toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776 tree_haver (7.1.0) diff --git a/gems/parslet-toml-merge/results/test_results.html b/gems/parslet-toml-merge/results/test_results.html index b76303c51..ffea3bb45 100644 --- a/gems/parslet-toml-merge/results/test_results.html +++ b/gems/parslet-toml-merge/results/test_results.html @@ -283,20 +283,30 @@

    RSpec Code Examples

    Parslet::Toml::Merge
    -
    exposes the TOML family through the Parslet provider backend0.00114s
    +
    merges comment-free arrays of tables through the Parslet parser provider0.16229s
    -
    merges comment-free arrays of tables through the Parslet parser provider0.08528s
    +
    conforms to the shared TOML analysis, matching, and merge fixtures0.09308s
    -
    conforms to the shared TOML analysis, matching, and merge fixtures0.02466s
    +
    exposes the TOML family through the Parslet provider backend0.00294s
    -
    rejects unsupported provider backend overrides0.00017s
    +
    rejects unsupported provider backend overrides0.00039s
    -
    conforms to the provider named-suite plan and manifest-report fixtures0.00085s
    +
    conforms to the provider named-suite plan and manifest-report fixtures0.00258s
    - + +t">moveProgressBar('100.0'); +
    is idempotent (merging again produces same result)0.00926s
    + + + + + + + + diff --git a/gems/parslet-toml-merge/results/test_results.xml b/gems/parslet-toml-merge/results/test_results.xml index aa5f91596..abc7fbde8 100644 --- a/gems/parslet-toml-merge/results/test_results.xml +++ b/gems/parslet-toml-merge/results/test_results.xml @@ -1,11 +1,13 @@ - + - + - - - - - + + + + + + +on a matched array of tables behaves like a reproducible merge is idempotent (merging again produces same result)" file="./spec/reproducible_merge_spec.rb" time="0.009263"> diff --git a/gems/plain-merge/Gemfile.lock b/gems/plain-merge/Gemfile.lock index a05995f79..f4055fd94 100644 --- a/gems/plain-merge/Gemfile.lock +++ b/gems/plain-merge/Gemfile.lock @@ -19,7 +19,7 @@ PATH specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) - prism (>= 1.0) + prism-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH diff --git a/gems/psych-merge/Gemfile.lock b/gems/psych-merge/Gemfile.lock index ec2c9d1ae..dd25473b3 100644 --- a/gems/psych-merge/Gemfile.lock +++ b/gems/psych-merge/Gemfile.lock @@ -20,7 +20,7 @@ PATH specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) - prism (>= 1.0) + prism-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH diff --git a/gems/rbs-merge/Gemfile.lock b/gems/rbs-merge/Gemfile.lock index 7576f4ca6..960b06d68 100644 --- a/gems/rbs-merge/Gemfile.lock +++ b/gems/rbs-merge/Gemfile.lock @@ -20,7 +20,7 @@ PATH specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) - prism (>= 1.0) + prism-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH diff --git a/gems/smorg-rb/Gemfile.lock b/gems/smorg-rb/Gemfile.lock index a2a7705fe..624ce3a54 100644 --- a/gems/smorg-rb/Gemfile.lock +++ b/gems/smorg-rb/Gemfile.lock @@ -24,7 +24,7 @@ PATH specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) - prism (>= 1.0) + prism-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH diff --git a/gems/toml-merge/results/test_results.html b/gems/toml-merge/results/test_results.html index 4f2e05258..4ebc70067 100644 --- a/gems/toml-merge/results/test_results.html +++ b/gems/toml-merge/results/test_results.html @@ -281,40 +281,59 @@

    RSpec Code Examples

    -
    Toml::Merge
    - -
    conforms to the slice-136 TOML plan-context fixtures0.00090s
    +
    TOML reproducible +
    conforms to the TOML parse, structure, matching, and merge fixtures with the tree-sitter substrate0.04824s
    -
    preserves destination TOML comments and blank lines while adding template-only keys0.04355s
    - -
    parses mise-style dotted env keys and inline tables0.00090s
    - -
    merges comment-free TOML arrays of tables with destination preference0.01025s
    +
    conforms to +
    produces the expected result0.05502s
    -
    keeps the shared family feature fixture stable while exposing the substrate backend feature profile0.00032s
    - -
    resolves TOML paths through the canonical manifest0.00143s
    - -
    conforms to the slice-139 family named-suite plan fixture0.00051s
    - -
    exposes non-overlapping effective table ranges and source fragments through the TOML substrate0.00148s
    - -
    conforms to the TOML parse, structure, matching, and merge fixtures with the tree-sitter substrate0.00975s
    +
    is idempotent (merging again produces same result)0.00579s
    +
    +
    +
    +
    +
    when template preference keeps destination docs on a matched array of tables
    +
    +
    +
    +
    +
    behaves like a reproducible merge
    + +
    is idempotent (merging again produces same result)0.00287s
    -
    records emitter source provenance line metadata for raw source rendering0.00013s
    - -
    conforms to the slice-135 TOML backend feature profile fixtures0.00026s
    - -
    conforms to the slice-137 TOML family manifest fixture0.00025s
    +
    produces the expected result0.00146s
    +
    +
    +
    +
    +
    when template preference keeps destination docs on an adjacent matched table
    +
    +
    +
    +
    +
    behaves like a reproducible merge
    + +
    is idempotent (merging again produces same result)0.00471s
    + +
    produces the expected result0.00250s
    +
    +
    + + +
    + + + +
    conforms to the slice-139 family named-suite plan fixture0.00059s
    -
    rejects unsupported provider backend overrides0.00038s
    +
    conforms to the slice-137 TOML family manifest fixture0.00034s
    -
    projects arrays of tables through the TOML substrate0.00062s
    +
    parses mise-style dotted env keys and inline tables0.00068s
    -
    conforms to the slice-140 family manifest report fixture0.00060s
    +
    projects arrays of tables through the TOML substrate0.00891s
    - + diff --git a/gems/toml-merge/results/test_results.xml b/gems/toml-merge/results/test_results.xml index 10aa11eac..a04e3662c 100644 --- a/gems/toml-merge/results/test_results.xml +++ b/gems/toml-merge/results/test_results.xml @@ -1,21 +1,20 @@ - + - + - - - - - - - - - - - - - - - + + + + + + + +ture profile fixtures" file="./spec/fixtures_integration_spec.rb" time="0.000453"> + + + + + + diff --git a/gems/zip-merge/Gemfile.lock b/gems/zip-merge/Gemfile.lock index fb79a6746..49c74eb86 100644 --- a/gems/zip-merge/Gemfile.lock +++ b/gems/zip-merge/Gemfile.lock @@ -18,7 +18,7 @@ PATH specs: ast-crispr-ruby-prism (7.1.0) ast-crispr (= 7.1.0) - prism (>= 1.0) + prism-merge (= 7.1.0) version_gem (~> 1.1, >= 1.1.9) PATH